From e3b9f376f249eccc206d88a046593d6bfd4b3851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Codron?= <remy.codron@axa.fr>
Date: Mon, 8 Mar 2021 14:41:33 +0100
Subject: [PATCH 1/4] fix(account): fix refresh list on add repo

---
 package-lock.json                             | 13 -----------
 src/components/AzureDevOps/AzureDevOps.svelte | 22 ++++++++++---------
 src/components/Github/Github.svelte           | 11 +++++++---
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8f72fce..bad3701 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1750,11 +1750,6 @@
 				}
 			}
 		},
-		"cache-service-cache-module": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/cache-service-cache-module/-/cache-service-cache-module-2.0.1.tgz",
-			"integrity": "sha512-Woh8hheJs6m0Mm5kuqtji/8S/Lh5vyE9hh3E4nCp3ah85CJ4Y4/yegjcUe0kEzW14ZjAE46UJBp3FOsZNVmmGA=="
-		},
 		"cacheable-request": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
@@ -6244,14 +6239,6 @@
 				}
 			}
 		},
-		"superagent-cache": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/superagent-cache/-/superagent-cache-3.1.1.tgz",
-			"integrity": "sha512-jNGCNfj6nSQhiSNNqmhOvwFzsizc1Wd4eioHKH4lmgJptkTKBcq5oaBEGQPWsHiF5RtvIbcOXN/wvur7O1xaug==",
-			"requires": {
-				"cache-service-cache-module": "2.x"
-			}
-		},
 		"superagent-proxy": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.1.0.tgz",
diff --git a/src/components/AzureDevOps/AzureDevOps.svelte b/src/components/AzureDevOps/AzureDevOps.svelte
index 48c9d00..b7dd889 100644
--- a/src/components/AzureDevOps/AzureDevOps.svelte
+++ b/src/components/AzureDevOps/AzureDevOps.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Service } from 'services/Service';
 	import { clientAuthenticated } from 'shared/stores/authentication.store';
-	import { isFetchingData, isLoading } from 'shared/stores/default.store';
+	import { isLoading } from 'shared/stores/default.store';
 	import { authorize } from 'shared/token';
 	import { ProviderEnum } from 'models/skizzle/ProviderEnum';
 	import AccountTitle from 'components/AccountTitle';
@@ -14,18 +14,22 @@
 
 	let search: string = '';
 
-	const onSearchSubmit = (profile: ProfileType) => async (
-		query: string,
-	) => {
+	let isLoadingRepositories = false;
+	const onSearchSubmit = (profile: ProfileType) => async (query: string) => {
 		search = query;
 
-		const result = await Service.getRepositories(ProviderEnum.AzureDevOps, { profile });
+		isLoadingRepositories = true;
+		const result = await Service.getRepositories(ProviderEnum.AzureDevOps, {
+			profile,
+		});
 
 		fetchedAzureDevOpsRepositories = result.filter(
 			({ projectName, name }) =>
 				name.toLocaleLowerCase().includes(search.toLocaleLowerCase()) ||
 				projectName.toLocaleLowerCase().includes(search.toLocaleLowerCase()),
 		);
+
+		isLoadingRepositories = false;
 	};
 
 	const onSearchCancel = (): void => {
@@ -48,18 +52,16 @@
 		<div class="content">
 			<section>
 				<AccountTitle>Suivre un nouveau repository</AccountTitle>
-				<p class="intro">
-					Cherchez le nom de son projet et/ou repository associé.
-				</p>
+				<p class="intro">Cherchez le nom de son projet et/ou repository associé.</p>
 				<Search
 					onSubmit={onSearchSubmit(profile)}
 					onCancel={onSearchCancel}
-					disabled={$isFetchingData}
+					disabled={isLoadingRepositories}
 					placeholder="Rechercher un projet ou un repos"
 				/>
 
 				{#if search}
-					{#if $isFetchingData}
+					{#if isLoadingRepositories}
 						<p>Recherche en cours...</p>
 					{:else}
 						<SearchResults {search} repos={fetchedAzureDevOpsRepositories} />
diff --git a/src/components/Github/Github.svelte b/src/components/Github/Github.svelte
index a55d427..96340ba 100644
--- a/src/components/Github/Github.svelte
+++ b/src/components/Github/Github.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Service } from 'services/Service';
 	import { clientAuthenticated } from 'shared/stores/authentication.store';
-	import { isFetchingData, isLoading } from 'shared/stores/default.store';
+	import { isLoading } from 'shared/stores/default.store';
 	import { authorize } from 'shared/token';
 	import { ProviderEnum } from 'models/skizzle/ProviderEnum';
 	import AccountTitle from 'components/AccountTitle';
@@ -13,10 +13,13 @@
 	import type { RepositoryType } from 'models/skizzle';
 
 	let search: string = '';
+	let isLoadingRepositories = false;
 
 	$: fetchedGithubRepositories = [] as RepositoryType[];
 
 	const onSearchSubmit = async (query: string) => {
+		isLoadingRepositories = true;
+
 		search = query;
 		fetchedGithubRepositories = await Service.getRepositories(
 			ProviderEnum.Github,
@@ -24,6 +27,8 @@
 				query,
 			},
 		);
+
+		isLoadingRepositories = false;
 	};
 
 	const onSearchCancel = () => {
@@ -49,12 +54,12 @@
 				<Search
 					onSubmit={onSearchSubmit}
 					onCancel={onSearchCancel}
-					disabled={$isFetchingData}
+					disabled={isLoadingRepositories}
 					placeholder="Rechercher un repository"
 				/>
 
 				{#if search}
-					{#if $isFetchingData}
+					{#if isLoadingRepositories}
 						<p>Recherche en cours...</p>
 					{:else}
 						<SearchResults {search} repos={fetchedGithubRepositories} />

From 4b9b2ca6753ceb8fc1ad0c2002ffefff519a0b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Codron?= <remy.codron@axa.fr>
Date: Mon, 8 Mar 2021 15:50:05 +0100
Subject: [PATCH 2/4] feat(tags): add multiple tags on pull request filter

---
 .../CustomListSettings.svelte                 | 38 ++++++++++++++++++-
 src/components/Main/Main.svelte               | 30 +++++++++++----
 src/models/skizzle/CustomListType.ts          |  2 +-
 3 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/src/components/CustomListSettings/CustomListSettings.svelte b/src/components/CustomListSettings/CustomListSettings.svelte
index f2b7f73..ccc4bce 100644
--- a/src/components/CustomListSettings/CustomListSettings.svelte
+++ b/src/components/CustomListSettings/CustomListSettings.svelte
@@ -15,6 +15,8 @@
 	export let onDone: () => void;
 	export let id: string;
 
+	let tags: string[] = $customLists.find(list => list.id === id)?.tags ?? [];
+
 	let listName: string = $customLists.find(list => list.id === id)
 		? $customLists.find(list => list.id === id).name
 		: null;
@@ -24,6 +26,8 @@
 		? $customLists.find(list => list.id === id).repositoriesIds
 		: [];
 
+	let tag: string;
+
 	const onImport = async () => {
 		const result: any = await app.invoke('file-import');
 
@@ -58,6 +62,7 @@
 					id,
 					name: listName,
 					repositoriesIds,
+					tags,
 				};
 
 				customLists.update(_list =>
@@ -74,6 +79,7 @@
 					id: uuidv4(),
 					name: listName,
 					repositoriesIds,
+					tags,
 				};
 
 				customLists.update(_list => [..._list, list]);
@@ -89,6 +95,25 @@
 		}
 	};
 
+	const onAddTag = (event: KeyboardEvent): void => {
+		event.preventDefault();
+
+		if (event.key === ';') {
+			console.log(tag, tags, event.key);
+			const result = tag.substring(0, tag.indexOf(';'));
+
+			if (result) {
+				tags = [...tags, result];
+			}
+
+			tag = '';
+		} else if (event.key === 'Backspace' && !tag) {
+			const result = tags.slice(0, tags.length - 1);
+
+			tags = [...result];
+		}
+	};
+
 	const deleteRepository = (id: string): void => {
 		const newRepositoriesIds = repositoriesIds.filter(repo => repo !== id);
 		repositoriesIds = [...newRepositoriesIds];
@@ -163,7 +188,9 @@
 					on:click={() => {
 						repositoriesIds = [...repositoriesIds, selectedRepoId];
 					}}
-				>Ajouter</button>
+				>
+					Ajouter
+				</button>
 			</div>
 			{#if repositoriesIds.length}
 				<p class="intro">
@@ -187,7 +214,9 @@
 									e.preventDefault();
 									deleteRepository(repo);
 								}}
-							><Icons.Delete /></button>
+							>
+								<Icons.Delete />
+							</button>
 						</li>
 					{/each}
 				</ul>
@@ -196,6 +225,11 @@
 			{/if}
 		</Fieldset>
 	{/if}
+
+	<Fieldset title="Tag" intro="Choisissez un tag, il apparaitra dans l'onglet.">
+		<input id="list-name" type="text" bind:value={tag} on:keyup={onAddTag} />
+	</Fieldset>
+
 	<div class="bar">
 		<input
 			disabled={!listName}
diff --git a/src/components/Main/Main.svelte b/src/components/Main/Main.svelte
index 857e14b..7827877 100644
--- a/src/components/Main/Main.svelte
+++ b/src/components/Main/Main.svelte
@@ -9,7 +9,7 @@
 	import Tabs from 'components/Tabs';
 	import Modale from 'components/Modale';
 	import CustomListSettings from 'components/CustomListSettings';
-	import type { CustomListType, ExportType } from 'models/skizzle';
+	import type { CustomListType, ExportType, LabelType } from 'models/skizzle';
 	const app = require('electron').ipcRenderer;
 
 	let creatingList: boolean = false;
@@ -57,11 +57,25 @@
 	};
 
 	const filterList = (customList: CustomListType) => {
-		return $pullRequests.filter(pullRequest =>
-			customList.repositoriesIds
-				.map(String)
-				.includes(String(pullRequest.repositoryId)),
-		);
+		let filteredPullRequests = $pullRequests;
+
+		if (customList.repositoriesIds.length) {
+			filteredPullRequests = filteredPullRequests.filter(pullRequest =>
+				customList.repositoriesIds
+					.map(String)
+					.includes(String(pullRequest.repositoryId)),
+			);
+		}
+
+		if (customList.tags) {
+			// filteredPullRequests = filteredPullRequests.filter(pullRequest =>
+			// 	pullRequest.labels
+			// 		?.map(label => label.name.toLocaleLowerCase())
+			// 		.includes(customList.tags.map(tag => tag.toLocaleLowerCase())),
+			// );
+		}
+
+		return filteredPullRequests;
 	};
 
 	const getTabs = lists => {
@@ -107,7 +121,9 @@
 				on:click={() => {
 					modifyingListId = currentTab;
 				}}
-			>Modifier</button>
+			>
+				Modifier
+			</button>
 			<button on:click={deleteList}>Supprimer</button>
 			<button on:click={exportList}>Exporter</button>
 		</div>
diff --git a/src/models/skizzle/CustomListType.ts b/src/models/skizzle/CustomListType.ts
index 3d68be2..93b2ad7 100644
--- a/src/models/skizzle/CustomListType.ts
+++ b/src/models/skizzle/CustomListType.ts
@@ -1,7 +1,7 @@
 export type CustomListType = {
 	id: string;
 	name: string;
-	tags?: string[];
+	tags: string[];
 	projectsIds?: string[];
 	repositoriesIds?: string[];
 	hiddenPullRequestsIds?: string[];

From a69cc9057c8bf9889416dab4ab3a3c9186ba5e86 Mon Sep 17 00:00:00 2001
From: itupix <jerome.boukorras@axa.fr>
Date: Thu, 11 Mar 2021 16:05:54 +0100
Subject: [PATCH 3/4] feat(ui): list tags settings display

---
 .../CustomListSettings.svelte                  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/CustomListSettings/CustomListSettings.svelte b/src/components/CustomListSettings/CustomListSettings.svelte
index ccc4bce..942185a 100644
--- a/src/components/CustomListSettings/CustomListSettings.svelte
+++ b/src/components/CustomListSettings/CustomListSettings.svelte
@@ -123,7 +123,7 @@
 <!-- svelte-ignore a11y-no-onchange a11y-autofocus -->
 <form on:submit={onSubmit}>
 	<AccountTitle>
-		{id ? 'Modifier la liste' : 'Nouvelle liste'}
+		{id ? `Modifier la liste "${listName}"` : 'Nouvelle liste'}
 		<input
 			id="import"
 			on:click={onImport}
@@ -188,9 +188,7 @@
 					on:click={() => {
 						repositoriesIds = [...repositoriesIds, selectedRepoId];
 					}}
-				>
-					Ajouter
-				</button>
+				>Ajouter</button>
 			</div>
 			{#if repositoriesIds.length}
 				<p class="intro">
@@ -226,8 +224,16 @@
 		</Fieldset>
 	{/if}
 
-	<Fieldset title="Tag" intro="Choisissez un tag, il apparaitra dans l'onglet.">
-		<input id="list-name" type="text" bind:value={tag} on:keyup={onAddTag} />
+	<Fieldset
+		title="Tags"
+		intro="Saisissez un ou plusieurs tag, Skizzle affichera uniquement les pull requests comportant les tags sélectionnés."
+		outro={tag
+			? `Skizzle n'affichera que les pull requests contenant le tag "${tag}"`
+			: 'Skizzle affichera toutes les pull requests quelque soit leur tag'}
+	>
+		<div class="field">
+			<input id="list-name" type="text" bind:value={tag} on:keyup={onAddTag} />
+		</div>
 	</Fieldset>
 
 	<div class="bar">

From 8e36317f7f2fe68f31cb10b1334e5b1ead9a938f Mon Sep 17 00:00:00 2001
From: itupix <jerome.boukorras@axa.fr>
Date: Thu, 11 Mar 2021 16:06:11 +0100
Subject: [PATCH 4/4] feat(ui): pullrequest display

---
 src/components/Pullrequest/Pullrequest.svelte | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/Pullrequest/Pullrequest.svelte b/src/components/Pullrequest/Pullrequest.svelte
index 34c12de..3732e7f 100644
--- a/src/components/Pullrequest/Pullrequest.svelte
+++ b/src/components/Pullrequest/Pullrequest.svelte
@@ -27,14 +27,16 @@
 			<h2 class="author">
 				{pullRequest.user.name} - {getDateStr(new Date(pullRequest.date))}
 			</h2>
-			{#if pullRequest.projectName}
-				<span class="project">{pullRequest.projectName}</span>
-			{/if}
 		</header>
 		<h3 class="title">
 			{pullRequest.title}
 		</h3>
-		<p class="repo">{pullRequest.repositoryName}</p>
+		<p class="repo">
+			{#if pullRequest.projectName}
+				{pullRequest.projectName}&nbsp;/
+			{/if}
+			{pullRequest.repositoryName}
+		</p>
 	</div>
 	<footer>
 		{#if pullRequest.isAutoComplete}
@@ -90,8 +92,6 @@
 	}
 
 	header {
-		display: flex;
-		align-items: center;
 		margin-bottom: 0.5rem;
 		font-size: 0.8rem;
 		color: #aaa;