From 7f0d8a5ffde06cd529be856bcdd08ffc5d8cf6a8 Mon Sep 17 00:00:00 2001
From: DE BAERDEMAEKER Mathieu <mathieu.debaerdemaeker@axa.fr>
Date: Wed, 17 Feb 2021 13:48:04 +0100
Subject: [PATCH] fix(projects): unified azure dev ops and github repositories

---
 package-lock.json                             |  11 ++
 package.json                                  |   2 +
 public/global.css                             |  17 +-
 .../AccountSummary/AccountSummary.svelte      | 105 ++----------
 src/components/AddAccount/AddAccount.svelte   |   4 +-
 src/components/AzureDevOps/AzureDevOps.svelte |  71 +++++----
 src/components/Comment/Comment.svelte         |  31 ++--
 .../CustomListSettings.svelte                 |   2 -
 .../FollowedRepositories.svelte               |   2 +-
 src/components/Header/Header.svelte           |   6 +-
 src/components/Header/MacosBar.svelte         |   2 +-
 src/components/Header/WindowsBar.svelte       |   2 +-
 .../ImportExport/ImportExport.svelte          |  79 +++++----
 src/components/Main/Main.svelte               |   2 +-
 src/components/Pullrequest/Pullrequest.svelte | 118 +++++++++-----
 .../SearchResults/SearchResults.svelte        | 121 +-------------
 src/components/Tabs/Tabs.svelte               |  48 +++---
 src/electron/electron.ts                      |   2 +
 src/mappers/Organization.mapper.ts            |   7 -
 src/mappers/Project.mapper.ts                 |   5 -
 src/mappers/PullRequest.mapper.ts             |   3 +
 src/mappers/Repository.mapper.ts              |  11 +-
 src/models/api/PullRequestsApiType.ts         |   4 +
 src/models/skizzle/OrganizationType.ts        |   4 +-
 src/models/skizzle/ProjectType.ts             |   1 -
 src/models/skizzle/PullRequestType.ts         |   3 +
 src/models/skizzle/RepositoryType.ts          |   1 -
 src/requesters/Requester.ts                   |  15 +-
 src/services/OAuthAzureDevOps.service.ts      |  76 ++++-----
 src/services/Service.ts                       |  24 ---
 src/shared/stores/default.store.ts            | 150 +++++++-----------
 src/utils.ts                                  | 116 ++------------
 tsconfig.json                                 |   2 +-
 33 files changed, 370 insertions(+), 677 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bc89c72..d214dba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1061,6 +1061,12 @@
 				"@types/node": "*"
 			}
 		},
+		"@types/marked": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@types/marked/-/marked-1.2.2.tgz",
+			"integrity": "sha512-wLfw1hnuuDYrFz97IzJja0pdVsC0oedtS4QsKH1/inyW9qkLQbXgMUqEQT0MVtUBx3twjWeInUfjQbhBVLECXw==",
+			"dev": true
+		},
 		"@types/minimatch": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@@ -4141,6 +4147,11 @@
 			"integrity": "sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==",
 			"dev": true
 		},
+		"marked": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/marked/-/marked-2.0.0.tgz",
+			"integrity": "sha512-NqRSh2+LlN2NInpqTQnS614Y/3NkVMFFU6sJlRFEpxJ/LHuK/qJECH7/fXZjk4VZstPW/Pevjil/VtSONsLc7Q=="
+		},
 		"matcher": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
diff --git a/package.json b/package.json
index 845ddf8..2d7cfb7 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
 		"@rollup/plugin-node-resolve": "^11.0.0",
 		"@rollup/plugin-typescript": "^8.0.0",
 		"@tsconfig/svelte": "^1.0.10",
+		"@types/marked": "^1.2.2",
 		"@types/node": "^14.14.13",
 		"@types/superagent": "^4.1.10",
 		"@types/superagent-proxy": "^2.0.0",
@@ -73,6 +74,7 @@
 		"electron-log": "^4.3.0",
 		"electron-updater": "4.3.5",
 		"ky": "^0.26.0",
+		"marked": "^2.0.0",
 		"sirv-cli": "^1.0.10",
 		"superagent": "^6.1.0",
 		"superagent-proxy": "^2.1.0",
diff --git a/public/global.css b/public/global.css
index b9a5f07..de0b51d 100644
--- a/public/global.css
+++ b/public/global.css
@@ -54,14 +54,15 @@ input:disabled {
 
 ::-webkit-scrollbar {
 	width: 10px;
+	background-color: #333;
 }
 
 ::-webkit-scrollbar-thumb {
-	background: #ccc;
+	background: #666;
 }
 
 ::-webkit-scrollbar-corner {
-	background-color: #fff;
+	background-color: #444;
 }
 
 .btn {
@@ -105,16 +106,4 @@ button.link:hover {
 	.skz-splashscreen__label {
 		color: #fff;
 	}
-
-	::-webkit-scrollbar-thumb {
-		background: #666;
-	}
-
-	::-webkit-scrollbar-corner {
-		background-color: #444;
-	}
-
-	::-webkit-scrollbar {
-		background-color: #333;
-	}
 }
diff --git a/src/components/AccountSummary/AccountSummary.svelte b/src/components/AccountSummary/AccountSummary.svelte
index f39c922..94c91af 100644
--- a/src/components/AccountSummary/AccountSummary.svelte
+++ b/src/components/AccountSummary/AccountSummary.svelte
@@ -1,29 +1,17 @@
 <script>
-	import { Service } from 'services/Service';
 	import {
-		isFetchingData,
-		organizations,
-		projects,
+		offline,
 		pullRequests,
 		repositories,
 	} from 'shared/stores/default.store';
-	import Modale from 'components/Modale';
-	import AccountTitle from 'components/AccountTitle';
 	import Icons from 'components/icons';
-	import { checkOrganization } from 'utils';
 	import type { ProviderEnum } from 'models/skizzle/ProviderEnum';
 	import { client } from 'shared/stores/authentication.store';
 	import type { ProfileType } from 'models/skizzle/ProfileType';
 
 	export let profile: ProfileType;
-	export let withSettings:boolean = false;
-	let isSettingsDisplayed = false;
-
-	const onModaleClose = () => (isSettingsDisplayed = false);
 
 	const logout = (provider: ProviderEnum) => {
-		organizations.reset(provider);
-		projects.reset(provider);
 		repositories.reset(provider);
 		pullRequests.reset(provider);
 		client.update(n => ({
@@ -33,6 +21,17 @@
 	};
 </script>
 
+<div class="container">
+	<div class="avatar">
+		<img width="64" height="64" src={profile.avatar} alt={profile.name} />
+	</div>
+	<div class="user">
+		<span class="name">{profile.name}</span>
+		{#if profile.email}<span class="email">{profile.email}</span>{/if}
+	</div>
+	<button on:click={() => logout(profile.provider)} title="Déconnexion" disabled={$offline}><Icons.Delete /></button>
+</div>
+
 <style>
 	.container {
 		display: flex;
@@ -83,85 +82,7 @@
 		opacity: 0.5;
 	}
 
-	button + button {
-		margin-left: 1rem;
-	}
-
 	.user {
 		margin-right: auto;
 	}
-
-	.big {
-		width: 6rem;
-		height: 6rem;
-	}
-
-	.header {
-		margin: -2rem -2rem 2rem;
-		padding: 2rem 2rem 1rem;
-		border-bottom-right-radius: 0;
-		border-bottom-left-radius: 0;
-		background-color: #444;
-	}
-
-	.header .avatar {
-		margin-top: -2.5rem;
-	}
-
-	.organizations {
-		list-style: none;
-	}
-
-	.organizations li {
-		margin-bottom: 0.5rem;
-	}
-</style>
-
-<div class="container">
-	<div class="avatar">
-		<img width="64" height="64" src={profile.avatar} alt={profile.name} />
-	</div>
-	<div class="user">
-		<span class="name">{profile.name}</span>
-		{#if profile.email}<span class="email">{profile.email}</span>{/if}
-	</div>
-	{#if withSettings}
-		<button on:click={() => (isSettingsDisplayed = !isSettingsDisplayed)} title="Configuration"><Icons.AccountSettings /></button>
-	{/if}
-	<button on:click={() => logout(profile.provider)} title="Déconnexion"><Icons.Delete /></button>
-</div>
-{#if isSettingsDisplayed}
-	<Modale onClose={onModaleClose}>
-		{#await Service.getOrganizations(profile.provider, { profile })}
-			<p>Chargement...</p>
-		{:then organizations}
-			<div class="container header">
-				<div class="avatar big">
-					{#await Service.getAvatar(profile.provider, profile.descriptor, organizations[0].organizationName) then avatar}
-						<img width="64" height="64" src={avatar} alt={profile.name} />
-					{/await}
-				</div>
-				<div class="user">
-					<span class="name">{profile.name}</span>
-					<span class="email">{profile.email}</span>
-				</div>
-			</div>
-			<AccountTitle>Organisations</AccountTitle>
-			<ul class="organizations">
-				{#each organizations as organization}
-					<li>
-						<input
-							type="checkbox"
-							id={organization.organizationName}
-							checked={organization.checked}
-							on:change={event => checkOrganization(event, organization)}
-							disabled={$isFetchingData} />
-						<label for={organization.organizationName}>
-							{organization.organizationName}
-						</label>
-					</li>
-				{/each}
-			</ul>
-		{/await}
-	</Modale>
-{/if}
+</style>
\ No newline at end of file
diff --git a/src/components/AddAccount/AddAccount.svelte b/src/components/AddAccount/AddAccount.svelte
index 248ed41..d24079f 100644
--- a/src/components/AddAccount/AddAccount.svelte
+++ b/src/components/AddAccount/AddAccount.svelte
@@ -1,6 +1,6 @@
 <script>
 	import Icons from 'components/icons';
-	import { isFetchingData } from 'shared/stores/default.store';
+	import { isFetchingData, offline } from 'shared/stores/default.store';
 	
 	export let onClick: () => void;
 	export let text: string;
@@ -33,5 +33,5 @@
 </style>
 
 <div>
-	<button on:click={onClick} disabled={$isFetchingData}><Icons.AddAccount />{text}</button>
+	<button on:click={onClick} disabled={$isFetchingData || $offline}><Icons.AddAccount />{text}</button>
 </div>
diff --git a/src/components/AzureDevOps/AzureDevOps.svelte b/src/components/AzureDevOps/AzureDevOps.svelte
index 273196c..ccc40cd 100644
--- a/src/components/AzureDevOps/AzureDevOps.svelte
+++ b/src/components/AzureDevOps/AzureDevOps.svelte
@@ -3,8 +3,7 @@
 	import { clientAuthenticated } from 'shared/stores/authentication.store';
 	import {
 		isFetchingData,
-		isLoading,
-		projects
+		isLoading
 	} from 'shared/stores/default.store';
 	import { authorize } from 'shared/token';
 	import { ProviderEnum } from 'models/skizzle/ProviderEnum';
@@ -14,20 +13,24 @@
 	import SearchResults from 'components/SearchResults';
 	import FollowedRepositories from 'components/FollowedRepositories';
 	import Search from 'components/Search';
+	import type { RepositoryType } from 'models/skizzle';
 
 	let search: string = '';
 
-	$: fetchedProjects = $projects.filter(x =>
-		x.name.toLocaleLowerCase().includes(search.toLocaleLowerCase()),
-	);
-
-	const onSearchSubmit = (query: string): void => {
+	const onSearchSubmit = (repositories: RepositoryType[]) => (query: string): void => {
 		search = query;
+
+		fetchedAzureDevOpsRepositories = repositories.filter(({projectName, name}) =>
+			name.toLocaleLowerCase().includes(search.toLocaleLowerCase()) ||
+			projectName.toLocaleLowerCase().includes(search.toLocaleLowerCase())
+		)
 	};
 
 	const onSearchCancel = (): void => {
 		search = '';
 	};
+	
+	$: fetchedAzureDevOpsRepositories = [] as RepositoryType[];
 </script>
 
 <style>
@@ -61,35 +64,41 @@
 </style>
 
 {#if $isLoading}
-	<p>Chargement...</p>
+	<p>Chargement de l'application...</p>
 {:else if $clientAuthenticated.isAzureDevOpsAuthenticated}
 	{#await Service.getProfile(ProviderEnum.AzureDevOps)}
-		<p>Chargement...</p>
+		<p>Chargement du profile</p>
 	{:then profile}
-		<section>
-			<AccountTitle>Votre compte Azure DevOps</AccountTitle>
-			<AccountSummary {profile} withSettings={true} />
-		</section>
-		<div>
-			<section>
-				<AccountTitle>Suivre un nouveau repository</AccountTitle>
-				<p class="intro">Cherchez le nom de son projet associé.</p>
-				<Search
-					onSubmit={onSearchSubmit}
-					onCancel={onSearchCancel}
-					disabled={$isFetchingData}
-					placeholder="Rechercher un projet" />
-
-				{#if search}
-					<SearchResults
-						{search}
-						projects={fetchedProjects} />
-				{/if}
-			</section>
+		{#await Service.getRepositories(ProviderEnum.AzureDevOps, { profile })}
+			<p>Chargement de la liste des repositories</p>
+		{:then repositories}
 			<section>
-				<FollowedRepositories {profile} />
+				<AccountTitle>Votre compte Azure DevOps</AccountTitle>
+				<AccountSummary {profile} />
 			</section>
-		</div>
+			<div>
+				<section>
+					<AccountTitle>Suivre un nouveau repository</AccountTitle>
+					<p class="intro">Cherchez le nom de son projet et/ou repository associé.</p>
+					<Search
+						onSubmit={onSearchSubmit(repositories)}
+						onCancel={onSearchCancel}
+						disabled={$isFetchingData}
+						placeholder="Rechercher un projet ou un repos" />
+
+					{#if search}
+						<SearchResults
+							{search}
+							repos={fetchedAzureDevOpsRepositories} />
+					{/if}
+				</section>
+				<section>
+					<FollowedRepositories {profile} />
+				</section>
+			</div>
+		{:catch}
+			<p>Fetching profile failed.</p>
+		{/await}
 	{:catch}
 		<p>Fetching profile failed.</p>
 	{/await}
diff --git a/src/components/Comment/Comment.svelte b/src/components/Comment/Comment.svelte
index 853a90d..5e91b1e 100644
--- a/src/components/Comment/Comment.svelte
+++ b/src/components/Comment/Comment.svelte
@@ -1,8 +1,23 @@
 <script lang="ts">
+  import marked from 'marked'
 	import { Service } from 'services/Service';
-	export let comment;
+	import type { CommentType } from 'models/skizzle';
+
+	export let comment: CommentType;
 </script>
 
+<div class="comment">
+	{#await Service.getAvatar(comment.provider, comment.author.avatar, comment.organizationName) then avatar}
+		<div class="avatar">
+			<img width="64" height="64" src={avatar} alt={comment.author.displayName} />
+		</div>
+	{/await}
+	<div class="content">
+		<h2>{comment.author.displayName} <small>{comment.date}</small></h2>
+		<div>{@html marked(comment.text)}</div>
+	</div>
+</div>
+
 <style>
 	.avatar {
 		margin-right: 1rem;
@@ -51,21 +66,9 @@
 		font-weight: normal;
 	}
 
-	p {
+	h2 + div {
 		font-size: 0.9rem;
 		line-height: 1.3;
 		color: #ddd;
 	}
 </style>
-
-<div class="comment">
-	{#await Service.getAvatar(comment.provider, comment.author.avatar, comment.organizationName) then avatar}
-		<div class="avatar">
-			<img width="64" height="64" src={avatar} alt={comment.author.displayName} />
-		</div>
-	{/await}
-	<div class="content">
-		<h2>{comment.author.displayName} <small>{comment.date}</small></h2>
-		<p>{comment.text}</p>
-	</div>
-</div>
diff --git a/src/components/CustomListSettings/CustomListSettings.svelte b/src/components/CustomListSettings/CustomListSettings.svelte
index f2472de..641220d 100644
--- a/src/components/CustomListSettings/CustomListSettings.svelte
+++ b/src/components/CustomListSettings/CustomListSettings.svelte
@@ -122,7 +122,6 @@
 					{#if $repositories.filter(repo => repo.provider === ProviderEnum.AzureDevOps).length}
 						<optgroup label="Azure Devops">
 							{#each $repositories
-								.filter(({ checked }) => checked)
 								.filter(
 									repo => repo.provider === ProviderEnum.AzureDevOps,
 								) as repository}
@@ -140,7 +139,6 @@
 					{#if $repositories.filter(repo => repo.provider === ProviderEnum.Github).length}
 						<optgroup label="Github">
 							{#each $repositories
-								.filter(({ checked }) => checked)
 								.filter(repo => repo.provider === ProviderEnum.Github) as repository}
 								<option
 									disabled={repositoriesIds.includes(repository.repositoryId)}
diff --git a/src/components/FollowedRepositories/FollowedRepositories.svelte b/src/components/FollowedRepositories/FollowedRepositories.svelte
index 2ec92e4..d41d8ae 100644
--- a/src/components/FollowedRepositories/FollowedRepositories.svelte
+++ b/src/components/FollowedRepositories/FollowedRepositories.svelte
@@ -14,7 +14,7 @@
 	let shareDisplayed:boolean = false;
 	
 	$: followedRepositories = $repositories.filter(
-		({ checked, provider }) => checked && provider === profile.provider,
+		({ provider }) => provider === profile.provider,
 	);
 </script>
 
diff --git a/src/components/Header/Header.svelte b/src/components/Header/Header.svelte
index 86d018e..f46c116 100644
--- a/src/components/Header/Header.svelte
+++ b/src/components/Header/Header.svelte
@@ -4,9 +4,11 @@
 	import MacosBar from './MacosBar.svelte';
 
 	let currentPlatform: string = navigator.platform === 'Win32' ? 'windows' : 'others';
-	let isMaximized: boolean;
+	let isMaximized: boolean = app.invoke('isMaximized') as boolean;
 
-	app.on('change-maximisze', (event: any, args: boolean) => isMaximized = args);
+	app.on('change-maximisze', (event: any, args: boolean) => {
+		isMaximized = args
+	});
 </script>
 
 <style src="./Header.scss"></style>
diff --git a/src/components/Header/MacosBar.svelte b/src/components/Header/MacosBar.svelte
index 5e502f7..4318434 100644
--- a/src/components/Header/MacosBar.svelte
+++ b/src/components/Header/MacosBar.svelte
@@ -2,7 +2,7 @@
 	import { WindowEnum } from "models/skizzle";
 	const app = require('electron').ipcRenderer;
 
-	export let isMaximized: boolean;
+	export let isMaximized: boolean = false;
 </script>
 
 <style src="./MacosBar.scss">
diff --git a/src/components/Header/WindowsBar.svelte b/src/components/Header/WindowsBar.svelte
index bae7b69..5979db2 100644
--- a/src/components/Header/WindowsBar.svelte
+++ b/src/components/Header/WindowsBar.svelte
@@ -2,7 +2,7 @@
 	import { WindowEnum } from "models/skizzle";
 	const app = require('electron').ipcRenderer;
 
-	export let isMaximized: boolean;
+	export let isMaximized: boolean = false;
 </script>
 
 <style src="./WindowsBar.scss">
diff --git a/src/components/ImportExport/ImportExport.svelte b/src/components/ImportExport/ImportExport.svelte
index 1640da0..2037e14 100644
--- a/src/components/ImportExport/ImportExport.svelte
+++ b/src/components/ImportExport/ImportExport.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
-  import { isFetchingData, repositories, organizations, projects } from 'shared/stores/default.store';
+  import { isFetchingData, repositories } from 'shared/stores/default.store';
 	import { HighlightSvelte } from "svelte-highlight";
-	import { a11yDark } from "svelte-highlight/styles";
   import { json } from "svelte-highlight/languages";
 	import Tabs from 'components/Tabs';
   import AccountTitle from 'components/AccountTitle';
@@ -9,6 +8,8 @@
   import Icons from 'components/icons';
   import type { RepositoryType } from 'models/skizzle';
   import { ProviderEnum } from 'models/skizzle';
+  
+  import 'svelte-highlight/styles/github.css';
 
   export let followedRepositories: RepositoryType[];
   export let provider: ProviderEnum;
@@ -22,7 +23,6 @@
   const importCode = () => {
     let repositoriesImported = JSON.parse(code) as RepositoryType[];
     repositoriesImported = repositoriesImported
-      .map(x => ({ ...x, checked: true }))
       .filter((repository) => {
         let result = repository.repositoryId && 
           repository.gitUrl && 
@@ -32,9 +32,7 @@
         if (provider === ProviderEnum.AzureDevOps) {
           result = result && repository.organizationName && 
             repository.projectId && 
-            repository.projectName && 
-            $projects.some(project => project.projectId === repository.projectId) &&
-            $organizations.some(organization => organization.organizationName === repository.organizationName);
+            !!repository.projectName
         }
 
         if (provider === ProviderEnum.Github) {
@@ -46,8 +44,7 @@
 
 		repositories.update(x => {
       const values = x.map(repository => ({
-        ...repository,
-        checked: repository.checked || repositoriesImported.some(z => z.repositoryId === repository.repositoryId)
+        ...repository
       }));
 
       return ([...values, ...repositoriesImported.filter(y => !x.some(z => z.repositoryId === y.repositoryId))])
@@ -57,47 +54,43 @@
 
   const getExportCode = (): RepositoryType[] => {
     return followedRepositories.map(repository => ({
-      ...repository,
-      checked: undefined
+      ...repository
     }));
   }
 </script>
 
-<svelte:head>
-  {@html a11yDark}
-</svelte:head>
-  <AccountTitle>Importer / Exporter une liste de repositories.</AccountTitle>
-  <p class="intro">Skizzle permet d'importer et d'exporter une liste de repositories suivis. Vous pouvez partager votre liste avec les autres membres de votre équipe.</p>
-  <Tabs
-    onChange={changeTab}
-    current={currentTab}
-    data={{ import: { order: 0, label: 'Importer' }, export : { order: 1, label: 'Exporter' }}}
-  />
-  <div class="container">
-    {#if currentTab === 'export'}
-    <p class="intro">Copiez le code JSON et importez-le dans une autre instance de Skizzle.</p>
-    <div class="code">
+<AccountTitle>Importer / Exporter une liste de repositories.</AccountTitle>
+<p class="intro">Skizzle permet d'importer et d'exporter une liste de repositories suivis. Vous pouvez partager votre liste avec les autres membres de votre équipe.</p>
+<Tabs
+  onChange={changeTab}
+  current={currentTab}
+  data={{ import: { order: 0, label: 'Importer' }, export : { order: 1, label: 'Exporter' }}}
+/>
+<div class="container">
+  {#if currentTab === 'export'}
+  <p class="intro">Copiez le code JSON et importez-le dans une autre instance de Skizzle.</p>
+  <div class="code">
 
-      <HighlightSvelte language={json} code={JSON.stringify(getExportCode(), undefined, 2)} />
-      <button
-      class="copy"
-          on:click={() => copyToClipboard(JSON.stringify(getExportCode(), undefined, 2), 'Code copié dans le presse-papier.')}
-          disabled={$isFetchingData}
-          title="Copier l'url de ce repository"
-        >
-        <Icons.Copy />
-      </button>
-    </div>
-    {:else}
-      <form on:submit|preventDefault={importCode}>
-        <p class="intro">Collez le code JSON provenant d'une autre instance de Skizzle. <b>Attention</b> Skizzle remplacera les repositories que vous suivez actuellement.</p>
-        <textarea bind:value={code} placeholder="Collez ici votre code JSON"></textarea>
-        <div class="bar">
-          <input disabled={!isJson(code)} type="submit" class="import-button" value="Importer les repositories" />
-        </div>
-      </form>
-    {/if}
+    <HighlightSvelte language={json} code={JSON.stringify(getExportCode(), undefined, 2)} />
+    <button
+    class="copy"
+        on:click={() => copyToClipboard(JSON.stringify(getExportCode(), undefined, 2), 'Code copié dans le presse-papier.')}
+        disabled={$isFetchingData}
+        title="Copier l'url de ce repository"
+      >
+      <Icons.Copy />
+    </button>
   </div>
+  {:else}
+    <form on:submit|preventDefault={importCode}>
+      <p class="intro">Collez le code JSON provenant d'une autre instance de Skizzle. <b>Attention</b> Skizzle remplacera les repositories que vous suivez actuellement.</p>
+      <textarea bind:value={code} placeholder="Collez ici votre code JSON"></textarea>
+      <div class="bar">
+        <input disabled={!isJson(code)} type="submit" class="import-button" value="Importer les repositories" />
+      </div>
+    </form>
+  {/if}
+</div>
 
   <style>
     textarea {
diff --git a/src/components/Main/Main.svelte b/src/components/Main/Main.svelte
index daf140b..35f13c8 100644
--- a/src/components/Main/Main.svelte
+++ b/src/components/Main/Main.svelte
@@ -5,7 +5,7 @@
 	import Tabs from 'components/Tabs';
 	import Modale from 'components/Modale';
 	import CustomListSettings from 'components/CustomListSettings';
-	import type { CustomListType, ExportType, RepositoryType } from 'models/skizzle';
+	import type { CustomListType, ExportType } from 'models/skizzle';
 	const app = require('electron').ipcRenderer;
 
 	let creatingList: boolean = false;
diff --git a/src/components/Pullrequest/Pullrequest.svelte b/src/components/Pullrequest/Pullrequest.svelte
index 40868bf..b998bfd 100644
--- a/src/components/Pullrequest/Pullrequest.svelte
+++ b/src/components/Pullrequest/Pullrequest.svelte
@@ -18,6 +18,60 @@
 	const closeModale = () => detailsModal = false;
 </script>
 
+<div class="pr">
+	<button class="link" on:click={openLink} />
+	<Avatar className="pr__avatar" {pullRequest} />
+	<div class="details">
+		<header>
+			<h2 class="author">{pullRequest.user.name} - {pullRequest.dateStr}</h2>
+			{#if pullRequest.projectName}
+				<span class="project">{pullRequest.projectName}</span>
+			{/if}
+		</header>
+		<h3 class="title">
+			{#if pullRequest.isAutoComplete}
+				<span
+					class="skz-pullrequest__status skz-pullrequest__status--auto-complete">
+					Auto-complete
+				</span>
+			{/if}
+			{#if pullRequest.isDraft}
+				<span class="skz-pullrequest__status skz-pullrequest__status--draft">
+					Draft
+				</span>
+			{/if}
+			{#if pullRequest.isConflict}
+				<span class="skz-pullrequest__status skz-pullrequest__status--conflicts">
+					Conflits
+				</span>
+			{/if}
+			{pullRequest.title}
+		</h3>
+		<p class="repo">{pullRequest.repositoryName}</p>
+	</div>
+	<footer>
+		{#if pullRequest.reviewers}
+			<Reviews reviews={pullRequest.reviewers} />
+		{/if}
+		<Labels labels={pullRequest.labels} />
+		<button
+			class="more"
+			on:click={openModale}
+			disabled={$isFetchingData}>
+			<Icons.Ellipsis />
+		</button>
+	</footer>
+</div>
+{#if detailsModal}
+	<Modale onClose={closeModale}>
+		{#each pullRequest.comments as comment}
+			<Comment {comment} />
+		{:else}
+			<p class="no-comment">Il n'y a aucun commentaire sur cette pull request.</p>
+		{/each}
+	</Modale>
+{/if}
+
 <style>
 	.pr {
 		position: relative;
@@ -61,6 +115,8 @@
 		font-size: 1rem;
 		line-height: 1;
 		font-weight: normal;
+    display: flex;
+    align-items: center;
 	}
 
 	.repo {
@@ -115,40 +171,30 @@
 		text-align: center;
 		transform: translateY(-50%);
 	}
-</style>
 
-<div class="pr">
-	<button class="link" on:click={openLink} />
-	<Avatar className="pr__avatar" {pullRequest} />
-	<div class="details">
-		<header>
-			<h2 class="author">{pullRequest.user.name} - {pullRequest.dateStr}</h2>
-			{#if pullRequest.projectName}
-				<span class="project">{pullRequest.projectName}</span>
-			{/if}
-		</header>
-		<h3 class="title">{pullRequest.title}</h3>
-		<p class="repo">{pullRequest.repositoryName}</p>
-	</div>
-	<footer>
-		{#if pullRequest.reviewers}
-			<Reviews reviews={pullRequest.reviewers} />
-		{/if}
-		<Labels labels={pullRequest.labels} />
-		<button
-			class="more"
-			on:click={openModale}
-			disabled={$isFetchingData}>
-			<Icons.Ellipsis />
-		</button>
-	</footer>
-</div>
-{#if detailsModal}
-	<Modale onClose={closeModale}>
-		{#each pullRequest.comments as comment}
-			<Comment {comment} />
-		{:else}
-			<p class="no-comment">Il n'y a aucun commentaire sur cette pull request.</p>
-		{/each}
-	</Modale>
-{/if}
+	.skz-pullrequest__status {
+		display: inline-block;
+		margin-right: 0.2rem;
+		padding: 0 0.2rem;
+		font-size: 0.8rem;
+		font-weight: normal;
+		border-width: 1px;
+		border-style: solid;
+		border-radius: 4px;
+		vertical-align: bottom;
+		line-height: 1.5;
+	}
+
+	.skz-pullrequest__status--draft {
+		border-color: #777;
+		color: #777;
+	}
+	.skz-pullrequest__status--conflicts {
+		border-color: red;
+			color: red;
+	}
+	.skz-pullrequest__status--auto-complete {
+		border-color: green;
+			color: green;
+	}
+</style>
\ No newline at end of file
diff --git a/src/components/SearchResults/SearchResults.svelte b/src/components/SearchResults/SearchResults.svelte
index 83263a1..5c94e1a 100644
--- a/src/components/SearchResults/SearchResults.svelte
+++ b/src/components/SearchResults/SearchResults.svelte
@@ -1,14 +1,10 @@
 <script lang="ts">
-	import { checkProject, checkRepository } from 'utils';
+	import { checkRepository } from 'utils';
 	import { isFetchingData, repositories } from 'shared/stores/default.store';
-	import type { ProjectType } from 'models/skizzle/ProjectType';
-	import Icons from 'components/icons';
 	import type { RepositoryType } from 'models/skizzle/RepositoryType';
 
 	export let search: string;
-	export let projects: ProjectType[];
 	export let repos: RepositoryType[];
-	
 </script>
 
 <style>
@@ -32,81 +28,6 @@
 		background-color: #5c5c5c;
 	}
 
-	.projects > li {
-		margin-bottom: 0.5rem;
-	}
-
-	.project {
-		position: relative;
-	}
-
-	.project label {
-		display: block;
-		padding: 1rem;
-		cursor: pointer;
-		border-radius: 8px;
-		background-color: #6b6b6b;
-		transition: background-color linear 0.2s;
-	}
-
-	.project label:hover {
-		background-color: #7d7d7d;
-	}
-
-	.project input {
-		display: none;
-	}
-
-	.project :global(svg) {
-		position: absolute;
-		right: 1rem;
-		top: 50%;
-		transform: translateY(-50%);
-		transition: transform linear 0.2s;
-	}
-
-	.open :global(svg) {
-		transform: translateY(-50%) rotate(180deg);
-	}
-
-	.repos {
-		padding-left: 1rem;
-	}
-
-	.repo {
-		position: relative;
-		display: flex;
-		padding: 0.5rem 0.5rem 0.5rem 1rem;
-		border-left: 4px solid var(--color);
-	}
-
-	.repo:before {
-		content: '';
-		position: absolute;
-		left: 0;
-		top: 50%;
-		width: 8px;
-		height: 4px;
-		border-radius: 0 8px 8px 0;
-		background-color: var(--color);
-		transform: translateY(-50%);
-	}
-
-	.repo input {
-		display: none;
-	}
-
-	.repo label {
-		font-size: 0.8rem;
-		text-decoration: underline;
-		color: var(--color);
-		cursor: pointer;
-	}
-
-	.repo label:hover {
-		text-decoration: none;
-	}
-
 	.name {
 		margin-right: auto;
 	}
@@ -140,54 +61,20 @@
 
 <div class="container">
 	<h2>Résultats pour "<b>{search}</b>"</h2>
-	{#if projects}
-		<ul class="projects">
-			{#each projects as project}
-				<li>
-					<div class="project" class:open={project.checked}>
-						<input
-							type="checkbox"
-							id={project.projectId}
-							checked={project.checked}
-							on:change={event => checkProject(event, project)}
-							disabled={$isFetchingData} />
-						<label for={project.projectId}> {project.name} </label>
-						<Icons.ArrowDown />
-					</div>
-					<ul class="repos">
-						{#each $repositories.filter(x => x.projectId === project.projectId) as repository}
-							<li class="repo">
-								<span class="name">{repository.name}</span>
-								<input
-									type="checkbox"
-									id={repository.repositoryId}
-									checked={repository.checked}
-									on:change={event => checkRepository(event, repository)}
-									disabled={$isFetchingData} />
-								<label
-									for={repository.repositoryId}>{repository.checked ? 'Ne plus suivre' : 'Suivre'}</label>
-							</li>
-						{/each}
-					</ul>
-				</li>
-			{/each}
-		</ul>
-	{/if}
-
 	{#if repos}
 		<ul class="repo-projects">
 			{#each repos as repository}
 				<li class="repo-project">
-					<span class="name">{repository.fullName || repository.name}</span>
+					<span class="name">{repository.fullName || (repository.projectName ? repository.projectName + ' / ' : '') + repository.name}</span>
 					<input
 						type="checkbox"
 						id={repository.repositoryId}
-						checked={$repositories.some(x => x.repositoryId === repository.repositoryId && x.checked)}
+						checked={$repositories.some(x => x.repositoryId === repository.repositoryId)}
 						on:change={event => checkRepository(event, repository)}
 						disabled={$isFetchingData} />
 					<label
 						class="follow"
-						for={repository.repositoryId}>{$repositories.some(x => x.repositoryId === repository.repositoryId && x.checked) ? 'Ne plus suivre' : 'Suivre'}</label>
+						for={repository.repositoryId}>{$repositories.some(x => x.repositoryId === repository.repositoryId) ? 'Ne plus suivre' : 'Suivre'}</label>
 				</li>
 			{/each}
 		</ul>
diff --git a/src/components/Tabs/Tabs.svelte b/src/components/Tabs/Tabs.svelte
index 7b4e763..32204e7 100644
--- a/src/components/Tabs/Tabs.svelte
+++ b/src/components/Tabs/Tabs.svelte
@@ -1,11 +1,36 @@
 <script lang="ts">
 	import Icons from 'components/icons';
+	import { isFetchingData } from 'shared/stores/default.store';
 	export let data: any;
 	export let onChange: (value: any) => void;
 	export let current: any;
 	export let onCreation: () => void;
 </script>
 
+<nav>
+	{#each Object.keys(data).sort((a, b) =>
+		data[a].order < data[b].order ? -1 : 1,
+	) as tab}
+		<button
+			class="tab"
+			class:current={current === tab || Object.keys(data).length === 1}
+			on:click={() => onChange(tab)}
+			disabled={$isFetchingData}>
+			{#if data[tab].icon}
+				<svelte:component this={data[tab].icon} />
+			{/if}
+			{data[tab].label}
+			{#if data[tab].counter}<small>({data[tab].counter})</small>{/if}
+		</button>
+	{/each}
+	{#if onCreation}
+		<button
+			on:click={onCreation}
+			title="Créer une nouvelle liste"
+			class="add"><Icons.Plus /></button>
+	{/if}
+</nav>
+
 <style>
 	nav {
 		display: flex;
@@ -68,26 +93,3 @@
 		color: var(--color);
 	}
 </style>
-
-<nav>
-	{#each Object.keys(data).sort((a, b) =>
-		data[a].order < data[b].order ? -1 : 1,
-	) as tab}
-		<button
-			class="tab"
-			class:current={current === tab || Object.keys(data).length === 1}
-			on:click={() => onChange(tab)}>
-			{#if data[tab].icon}
-				<svelte:component this={data[tab].icon} />
-			{/if}
-			{data[tab].label}
-			{#if data[tab].counter}<small>({data[tab].counter})</small>{/if}
-		</button>
-	{/each}
-	{#if onCreation}
-		<button
-			on:click={onCreation}
-			title="Créer une nouvelle liste"
-			class="add"><Icons.Plus /></button>
-	{/if}
-</nav>
diff --git a/src/electron/electron.ts b/src/electron/electron.ts
index 879ffb3..950d094 100644
--- a/src/electron/electron.ts
+++ b/src/electron/electron.ts
@@ -215,6 +215,8 @@ ipcMain.handle('copy-to-clipboard', async (event, url: string) => {
 	return true;
 });
 
+ipcMain.handle('isMaximized', async event => window.isMaximized());
+
 ipcMain.handle(
 	'file-export',
 	async (
diff --git a/src/mappers/Organization.mapper.ts b/src/mappers/Organization.mapper.ts
index eb31e3a..dd1815a 100644
--- a/src/mappers/Organization.mapper.ts
+++ b/src/mappers/Organization.mapper.ts
@@ -3,8 +3,6 @@ import type {
 	GithubOrganizationApiType,
 } from 'models/api';
 import type { OrganizationType } from 'models/skizzle';
-import { organizations } from 'shared/stores/default.store';
-import { get } from 'svelte/store';
 import { From, Mapper } from './Mapper';
 
 export type OrganizationMapperType = From<
@@ -18,8 +16,6 @@ export class OrganizationMapper extends Mapper<
 > {
 	public to(data: OrganizationMapperType[], params: any): OrganizationType[] {
 		return data.map(value => {
-			const store = get(organizations);
-
 			const data = {
 				organizationName: value.accountName || value.login,
 				...params,
@@ -27,9 +23,6 @@ export class OrganizationMapper extends Mapper<
 
 			return {
 				...data,
-				checked: store.some(
-					x => x.organizationName === data.organizationName && x.checked,
-				),
 			};
 		});
 	}
diff --git a/src/mappers/Project.mapper.ts b/src/mappers/Project.mapper.ts
index 500d8ac..b00c6b1 100644
--- a/src/mappers/Project.mapper.ts
+++ b/src/mappers/Project.mapper.ts
@@ -3,8 +3,6 @@ import type {
 	GithubProjectApiType,
 } from 'models/api';
 import type { ProjectType } from 'models/skizzle';
-import { projects } from 'shared/stores/default.store';
-import { get } from 'svelte/store';
 import { From, Mapper } from './Mapper';
 
 export type ProjectMapperType = From<
@@ -15,8 +13,6 @@ export type ProjectMapperType = From<
 export class ProjectMapper extends Mapper<ProjectMapperType, ProjectType> {
 	public to(data: ProjectMapperType[], params: any): ProjectType[] {
 		return data.map(value => {
-			const store = get(projects);
-
 			const data = {
 				projectId: value.id,
 				name: value.name,
@@ -25,7 +21,6 @@ export class ProjectMapper extends Mapper<ProjectMapperType, ProjectType> {
 
 			return {
 				...data,
-				checked: store.some(x => x.projectId === data.projectId && x.checked),
 			};
 		});
 	}
diff --git a/src/mappers/PullRequest.mapper.ts b/src/mappers/PullRequest.mapper.ts
index d0c75e8..c800694 100644
--- a/src/mappers/PullRequest.mapper.ts
+++ b/src/mappers/PullRequest.mapper.ts
@@ -54,6 +54,9 @@ export class PullRequestMapper extends Mapper<
 				url:
 					value.html_url ||
 					`https://dev.azure.com/${params.organizationName}/${params.projectName}/_git/${params.repositoryName}/pullrequest/${value.pullRequestId}`,
+				isDraft: value.isDraft || value.draft,
+				isConflict: value.mergeStatus && value.mergeStatus === 'conflicts',
+				isAutoComplete: !!value.autoCompleteSetBy,
 				...params,
 			};
 
diff --git a/src/mappers/Repository.mapper.ts b/src/mappers/Repository.mapper.ts
index 6487314..06808d5 100644
--- a/src/mappers/Repository.mapper.ts
+++ b/src/mappers/Repository.mapper.ts
@@ -3,8 +3,6 @@ import type {
 	GithubRepositoryApiType,
 } from 'models/api';
 import type { RepositoryType } from 'models/skizzle';
-import { repositories } from 'shared/stores/default.store';
-import { get } from 'svelte/store';
 import { From, Mapper } from './Mapper';
 
 export type RepositoryMapperType = From<
@@ -18,9 +16,7 @@ export class RepositoryMapper extends Mapper<
 > {
 	public to(data: RepositoryMapperType[], params: any): RepositoryType[] {
 		return data.map(value => {
-			const store = get(repositories);
-
-			const data = {
+			return {
 				repositoryId: value.id,
 				name: value.name,
 				fullName: value.full_name,
@@ -30,11 +26,6 @@ export class RepositoryMapper extends Mapper<
 					`https://dev.azure.com/${params.organizationName}/${params.projectName}/_git/${value.name}.git`,
 				...params,
 			};
-
-			return {
-				...data,
-				checked: store.some(x => x.repositoryId === data.repositoryId && x.checked),
-			};
 		});
 	}
 }
diff --git a/src/models/api/PullRequestsApiType.ts b/src/models/api/PullRequestsApiType.ts
index c120e6b..c957238 100644
--- a/src/models/api/PullRequestsApiType.ts
+++ b/src/models/api/PullRequestsApiType.ts
@@ -25,6 +25,9 @@ type AzureDevOpsPullRequestApiType = {
 	title?: string;
 	description?: string;
 	creationDate?: string;
+	isDraft?: boolean;
+	mergeStatus?: string;
+	autoCompleteSetBy?: any;
 	reviewers?: AzureDevOpsReviewApiType[];
 	createdBy?: CreatedByApiType;
 	repository?: AzureDevOpsRepositoryApiType;
@@ -60,6 +63,7 @@ type GithubPullRequestApiType = {
 	user?: UserApiType;
 	updated_at?: string;
 	number?: number;
+	draft?: boolean;
 	labels?: GithubLabelsApiType[];
 	base?: GithubBaseApiType;
 	html_url?: string;
diff --git a/src/models/skizzle/OrganizationType.ts b/src/models/skizzle/OrganizationType.ts
index 2d83a44..dc93d89 100644
--- a/src/models/skizzle/OrganizationType.ts
+++ b/src/models/skizzle/OrganizationType.ts
@@ -1,5 +1,3 @@
 import type { CommonType } from './CommonType';
 
-export type OrganizationType = {
-	checked?: boolean;
-} & CommonType;
+export type OrganizationType = {} & CommonType;
diff --git a/src/models/skizzle/ProjectType.ts b/src/models/skizzle/ProjectType.ts
index ae03b8d..037e776 100644
--- a/src/models/skizzle/ProjectType.ts
+++ b/src/models/skizzle/ProjectType.ts
@@ -2,5 +2,4 @@ import type { CommonType } from './CommonType';
 
 export type ProjectType = {
 	name: string;
-	checked: boolean;
 } & CommonType;
diff --git a/src/models/skizzle/PullRequestType.ts b/src/models/skizzle/PullRequestType.ts
index 643d3f6..9883666 100644
--- a/src/models/skizzle/PullRequestType.ts
+++ b/src/models/skizzle/PullRequestType.ts
@@ -16,6 +16,9 @@ type PullRequestType = {
 	description: string;
 	date: string;
 	dateStr: string;
+	isDraft: boolean;
+	isConflict: boolean;
+	isAutoComplete: boolean;
 	user: UserType;
 	owner?: string;
 	labels: LabelType[];
diff --git a/src/models/skizzle/RepositoryType.ts b/src/models/skizzle/RepositoryType.ts
index 30deb6d..d40e1f2 100644
--- a/src/models/skizzle/RepositoryType.ts
+++ b/src/models/skizzle/RepositoryType.ts
@@ -4,6 +4,5 @@ export type RepositoryType = {
 	name: string;
 	fullName?: string;
 	owner?: string;
-	checked?: boolean;
 	gitUrl?: string;
 } & CommonType;
diff --git a/src/requesters/Requester.ts b/src/requesters/Requester.ts
index 2175699..8738ba9 100644
--- a/src/requesters/Requester.ts
+++ b/src/requesters/Requester.ts
@@ -1,13 +1,15 @@
 import type { ProviderEnum } from 'models/skizzle';
 import type { OAuthConfigType } from 'providers';
 import { client, clientHasProvider } from 'shared/stores/authentication.store';
-import { isLoading } from 'shared/stores/default.store';
+import { isLoading, offline } from 'shared/stores/default.store';
 import { authorize } from 'shared/token';
 import { get } from 'svelte/store';
 import ky from 'ky';
+import type { Dictionary } from 'shared/utils';
 
 export abstract class Requester<T extends OAuthConfigType> {
 	private readonly provider: ProviderEnum;
+	private caches: Dictionary<any> = {};
 
 	constructor(provider: ProviderEnum) {
 		this.provider = provider;
@@ -21,10 +23,11 @@ export abstract class Requester<T extends OAuthConfigType> {
 		url: string,
 		options?: { cache: boolean },
 	): Promise<S> {
+		const isOffline = get(offline);
 		const isFetchingToken = get(isLoading);
 		const config = get(client)[this.provider] as T;
 
-		if (this.clientHasProvider(config) && !isFetchingToken) {
+		if (!isOffline && this.clientHasProvider(config) && !isFetchingToken) {
 			const headers = this.getHeader(config);
 
 			const result = ky.get(url, {
@@ -53,7 +56,13 @@ export abstract class Requester<T extends OAuthConfigType> {
 				headers,
 			});
 
-			return result.json<S>();
+			const data = await result.json<S>();
+
+			this.caches[url] = data;
+
+			return data;
+		} else {
+			return this.caches[url];
 		}
 	}
 
diff --git a/src/services/OAuthAzureDevOps.service.ts b/src/services/OAuthAzureDevOps.service.ts
index e5a2d88..2801c74 100644
--- a/src/services/OAuthAzureDevOps.service.ts
+++ b/src/services/OAuthAzureDevOps.service.ts
@@ -1,25 +1,18 @@
 import {
-	CommentMapper,
 	OrganizationMapper,
 	ProfileMapper,
 	ProjectMapper,
 	PullRequestMapper,
 	RepositoryMapper,
-	ReviewMapper,
 } from 'mappers';
 import {
 	AzureDevOpsCommentApiEnum,
 	AzureDevOpsCommentStatusApiEnum,
-	AzureDevOpsCommentType,
 } from 'models/api';
 import type {
-	CommentType,
-	OrganizationType,
 	ProfileType,
-	ProjectType,
 	PullRequestType,
 	RepositoryType,
-	ReviewType,
 } from 'models/skizzle';
 import { ProviderEnum } from 'models/skizzle';
 import { OAuthAzureDevOpsRequester } from 'requesters/OAuthAzureDevOps.requester';
@@ -61,19 +54,6 @@ export class OAuthAzureDevOpsService implements IService {
 
 		return profileMapped;
 	}
-
-	public async getOrganizations({
-		profile,
-	}: ServiceParams): Promise<OrganizationType[]> {
-		const { id } = profile;
-
-		const result = await this.requester.getOrganizations(id);
-
-		const mapper = new OrganizationMapper();
-
-		return mapper.to(result, { provider: this.provider });
-	}
-
 	public async getAvatar(
 		descriptor: string,
 		organizationName?: string,
@@ -83,36 +63,44 @@ export class OAuthAzureDevOpsService implements IService {
 		return `data:image/png;base64,${avatar}`;
 	}
 
-	public async getProjects({
-		organization,
-	}: ServiceParams): Promise<ProjectType[]> {
-		const { organizationName } = organization;
-
-		const result = await this.requester.getProjects(organizationName);
-
-		const mapper = new ProjectMapper();
-
-		return mapper.to(result, { organizationName, provider: this.provider });
-	}
-
 	public async getRepositories({
-		project,
+		profile,
 	}: ServiceParams): Promise<RepositoryType[]> {
-		const { organizationName, projectId, name } = project;
+		const { id } = profile;
 
-		const result = await this.requester.getRepositories(
-			organizationName,
-			projectId,
+		const organizations = new OrganizationMapper().to(
+			await this.requester.getOrganizations(id),
+			{ provider: this.provider },
 		);
 
-		const mapper = new RepositoryMapper();
+		const projects = (
+			await Promise.all(
+				organizations.map(async ({ organizationName }) => {
+					return new ProjectMapper().to(
+						await this.requester.getProjects(organizationName),
+						{ organizationName, provider: this.provider },
+					);
+				}),
+			)
+		).reduce((prev, curr) => prev.concat(curr), []);
+
+		const repositories = (
+			await Promise.all(
+				projects.map(async ({ organizationName, projectId, name }) => {
+					return new RepositoryMapper().to(
+						await this.requester.getRepositories(organizationName, projectId),
+						{
+							organizationName,
+							projectId,
+							projectName: name,
+							provider: this.provider,
+						},
+					);
+				}),
+			)
+		).reduce((prev, curr) => prev.concat(curr), []);
 
-		return mapper.to(result, {
-			organizationName,
-			projectId,
-			projectName: name,
-			provider: this.provider,
-		});
+		return repositories;
 	}
 
 	public async getPullRequests({
diff --git a/src/services/Service.ts b/src/services/Service.ts
index f8b0560..ba2548b 100644
--- a/src/services/Service.ts
+++ b/src/services/Service.ts
@@ -1,11 +1,9 @@
 import type {
-	CommentType,
 	OrganizationType,
 	ProfileType,
 	ProjectType,
 	PullRequestType,
 	RepositoryType,
-	ReviewType,
 } from 'models/skizzle';
 import { ProviderEnum } from 'models/skizzle';
 import { isFetchingData } from 'shared/stores/default.store';
@@ -26,8 +24,6 @@ export interface IService {
 	isLogged(): boolean;
 	getProfile(userId?: string): Promise<ProfileType>;
 	getAvatar(params: string, organizationName?: string): Promise<string>;
-	getOrganizations?(params: ServiceParams): Promise<OrganizationType[]>;
-	getProjects?(params: ServiceParams): Promise<ProjectType[]>;
 	getRepositories(params: ServiceParams): Promise<RepositoryType[]>;
 	getPullRequests(params: ServiceParams): Promise<PullRequestType[]>;
 }
@@ -62,26 +58,6 @@ export class Service {
 		return result;
 	}
 
-	public static async getOrganizations(
-		provider: ProviderEnum,
-		params: ServiceParams,
-	): Promise<OrganizationType[]> {
-		isFetchingData.set(true);
-		const result = await Service.INSTANCES[provider].getOrganizations(params);
-		isFetchingData.set(false);
-		return result;
-	}
-
-	public static async getProjects(
-		provider: ProviderEnum,
-		params: ServiceParams,
-	): Promise<ProjectType[]> {
-		isFetchingData.set(true);
-		const result = await Service.INSTANCES[provider].getProjects(params);
-		isFetchingData.set(false);
-		return result;
-	}
-
 	public static async getRepositories(
 		provider: ProviderEnum,
 		params: ServiceParams,
diff --git a/src/shared/stores/default.store.ts b/src/shared/stores/default.store.ts
index 3e60ca6..41d3648 100644
--- a/src/shared/stores/default.store.ts
+++ b/src/shared/stores/default.store.ts
@@ -1,8 +1,6 @@
 import type {
 	CommonType,
 	CustomListType,
-	OrganizationType,
-	ProjectType,
 	PullRequestType,
 	RepositoryType,
 	SettingsType,
@@ -13,6 +11,7 @@ import { ThemeEnum } from 'models/skizzle';
 import { Service } from 'services/Service';
 import { get } from 'svelte/store';
 import { createStore } from './store';
+import { v4 as uuidv4 } from 'uuid';
 const app = require('electron').ipcRenderer;
 
 const predicate = <T extends CommonType>(
@@ -25,52 +24,56 @@ const predicate = <T extends CommonType>(
 let timer: NodeJS.Timeout;
 
 export const refreshPullRequests = async () => {
-	const values = get(repositories).filter(x => x.checked);
+	const isOffline = get(offline);
 
-	if (values.length > 0) {
-		let oldValues = get(pullRequests);
+	if (!isOffline) {
+		const values = get(repositories);
 
-		let result: PullRequestType[] = [];
+		if (values.length > 0) {
+			let oldValues = get(pullRequests);
 
-		try {
-			for (const repository of values) {
-				result = result.concat(
-					await Service.getPullRequests(repository.provider, { repository }),
-				);
+			let result: PullRequestType[] = [];
+
+			try {
+				for (const repository of values) {
+					result = result.concat(
+						await Service.getPullRequests(repository.provider, { repository }),
+					);
+				}
+			} catch {
+				return;
 			}
-		} catch {
-			return;
-		}
 
-		const newValues = result.filter(
-			pullRequest =>
-				!oldValues.some(
-					({ pullRequestId }) => pullRequest.pullRequestId === pullRequestId,
-				),
-		);
-
-		if (newValues.length > 0) {
-			let title =
-				newValues.length > 1
-					? 'De nouvelles pull requests sont disponibles'
-					: 'Une nouvelle pull request est disponible';
-
-			let body =
-				newValues.length > 1
-					? 'Plusieurs repositories ont étés mis à jour'
-					: `Le repo ${newValues[0].repositoryName} a une nouvelle pull request`;
-
-			app.send('notifier', {
-				title,
-				body,
-			});
-		}
-		0;
+			const newValues = result.filter(
+				pullRequest =>
+					!oldValues.some(
+						({ pullRequestId }) => pullRequest.pullRequestId === pullRequestId,
+					),
+			);
+
+			if (newValues.length > 0) {
+				let title =
+					newValues.length > 1
+						? 'De nouvelles pull requests sont disponibles'
+						: 'Une nouvelle pull request est disponible';
+
+				let body =
+					newValues.length > 1
+						? 'Plusieurs repositories ont étés mis à jour'
+						: `Le repo ${newValues[0].repositoryName} a une nouvelle pull request`;
 
-		pullRequests.reset();
-		pullRequests.set(
-			result.sort((a, b) => Date.parse(b.date) - Date.parse(a.date)),
-		);
+				app.send('notifier', {
+					title,
+					body,
+				});
+			}
+			0;
+
+			pullRequests.reset();
+			pullRequests.set(
+				result.sort((a, b) => Date.parse(b.date) - Date.parse(a.date)),
+			);
+		}
 	}
 };
 
@@ -82,58 +85,23 @@ export const repositories = createStore<RepositoryType[]>([], {
 	key: 'repositories',
 	predicate,
 });
-export const projects = createStore<ProjectType[]>([], {
-	key: 'projects',
-	predicate,
-	subscriber: () => async projects => {
-		for (const project of projects) {
-			if (project.checked) {
-				const values = get(repositories);
-				const exist = values.some(
-					x =>
-						x.organizationName === project.organizationName &&
-						x.projectId === project.projectId,
-				);
-
-				if (!exist) {
-					const values = await Service.getRepositories(project.provider, {
-						project,
-					});
-
-					repositories.update(x =>
-						[...x, ...values].sort((a, b) => a.name.localeCompare(b.name)),
-					);
-				}
-			}
-		}
-	},
-});
-export const organizations = createStore<OrganizationType[]>([], {
-	key: 'organizations',
-	predicate,
-	subscriber: () => async organizations => {
-		for (const organization of organizations) {
-			const values = get(projects);
-			const exist = values.some(
-				x => x.organizationName === organization.organizationName,
-			);
-
-			if (!exist) {
-				const values = await Service.getProjects(organization.provider, {
-					organization,
-				});
-
-				projects.update(x =>
-					[...x, ...values].sort((a, b) => a.name.localeCompare(b.name)),
-				);
-			}
-		}
-	},
-});
 export const isLoading = createStore<boolean>(false, {});
 export const isFetchingData = createStore<boolean>(false, {});
 export const notifications = createStore<NotificationType[]>([], {});
-export const offline = createStore<boolean>(false, {});
+export const offline = createStore<boolean>(false, {
+	key: 'offline',
+	subscriber: () => (offline: boolean) => {
+		if (offline) {
+			notifications.update(notifications => [
+				...notifications,
+				{
+					text: 'Vous êtes actuellement deconnecté',
+					id: uuidv4(),
+				},
+			]);
+		}
+	},
+});
 export const settings = createStore<SettingsType>(
 	{
 		refresh_delay: 5,
diff --git a/src/utils.ts b/src/utils.ts
index 2759654..f374606 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,92 +1,17 @@
-import type {
-	OrganizationType,
-	ProjectType,
-	RepositoryType,
-} from 'models/skizzle';
-import { ProviderEnum } from 'models/skizzle';
+import type { RepositoryType } from 'models/skizzle';
 import { Service } from 'services/Service';
-import {
-	organizations,
-	projects,
-	pullRequests,
-	repositories,
-} from 'shared/stores/default.store';
-
-export const checkOrganization = async (
-	{ target },
-	organization: OrganizationType,
-) => {
-	const { checked } = target as HTMLInputElement;
-
-	organization.checked = checked;
-
-	if (checked) {
-		organizations.update((x: OrganizationType[]) => {
-			return [...x, organization].sort((a, b) =>
-				a.organizationName.localeCompare(b.organizationName),
-			);
-		});
-	} else {
-		organizations.update(x =>
-			x.filter(y => y.organizationName !== organization.organizationName),
-		);
-		projects.update(x =>
-			x.filter(y => y.organizationName !== organization.organizationName),
-		);
-		repositories.update(x =>
-			x.filter(y => y.organizationName !== organization.organizationName),
-		);
-		pullRequests.update(x =>
-			x.filter(y => y.organizationName !== organization.organizationName),
-		);
-	}
-};
-
-export const checkProject = async ({ target }, project: ProjectType) => {
-	const { checked } = target as HTMLInputElement;
-
-	project.checked = checked;
-
-	projects.update(projects => {
-		for (const value of projects) {
-			if (value.projectId === project.projectId) {
-				value.checked = checked;
-			}
-		}
-
-		return projects;
-	});
-
-	if (!checked) {
-		repositories.update(x => x.filter(y => y.projectId !== project.projectId));
-		pullRequests.update(x => x.filter(y => y.projectId !== project.projectId));
-	}
-};
+import { pullRequests, repositories } from 'shared/stores/default.store';
 
 export const checkRepository = async (
 	{ target },
 	repository: RepositoryType,
 ) => {
-	const { checked } = target as HTMLInputElement;
-
-	repository.checked = checked;
+	console.log({ repository });
 
-	if (repository.provider === ProviderEnum.AzureDevOps) {
-		repositories.update(repositories => {
-			for (const value of repositories) {
-				if (value.repositoryId === repository.repositoryId) {
-					repository.checked = checked;
-				}
-			}
-
-			return repositories;
-		});
-	}
+	const { checked } = target as HTMLInputElement;
 
 	if (checked) {
-		if (repository.provider === ProviderEnum.Github) {
-			repositories.update(x => [...x, repository]);
-		}
+		repositories.update(x => [...x, repository]);
 
 		const values = await Service.getPullRequests(repository.provider, {
 			repository,
@@ -96,37 +21,14 @@ export const checkRepository = async (
 			[...x, ...values].sort((a, b) => Date.parse(b.date) - Date.parse(a.date)),
 		);
 	} else {
-		if (repository.provider === ProviderEnum.Github) {
-			repositories.update(x =>
-				x.filter(y => y.repositoryId !== repository.repositoryId),
-			);
-		}
-		pullRequests.update(x =>
-			x.filter(y => y.repositoryId !== repository.repositoryId),
-		);
+		deleteRepository(repository);
 	}
 };
 
 export const deleteRepository = async (repository: RepositoryType) => {
-	repository.checked = false;
-
-	if (repository.provider === ProviderEnum.AzureDevOps) {
-		repositories.update(repositories => {
-			for (const value of repositories) {
-				if (value.repositoryId === repository.repositoryId) {
-					repository.checked = repository.checked;
-				}
-			}
-
-			return repositories;
-		});
-	}
-
-	if (repository.provider === ProviderEnum.Github) {
-		repositories.update(x =>
-			x.filter(y => y.repositoryId !== repository.repositoryId),
-		);
-	}
+	repositories.update(x =>
+		x.filter(y => y.repositoryId !== repository.repositoryId),
+	);
 
 	pullRequests.update(x =>
 		x.filter(y => y.repositoryId !== repository.repositoryId),
diff --git a/tsconfig.json b/tsconfig.json
index 28526d4..f6a3d11 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
 	"extends": "@tsconfig/svelte/tsconfig.json",
 	"compilerOptions": {
-		"types": ["node", "jest", "superagent", "superagent-proxy", "uuid"],
+		"types": ["node", "jest", "superagent", "superagent-proxy", "uuid", "marked"],
 		"baseUrl": "src",
 		"allowSyntheticDefaultImports": true,
 		"esModuleInterop": true