fix(Organizations): Handle error on projects fetch

AxaFrance · Jun 2, 2020 · 90fbe94 · 90fbe94
1 parent a1d07db
commit 90fbe94
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 20 deletions.
diff --git a/src/components/Settings/Settings.scss b/src/components/Settings/Settings.scss
@@ -248,6 +248,11 @@
     top: 0;
     visibility: hidden;
 
+    &:disabled,
+    &:disabled + label {
+      opacity: 0.5;
+    }
+
     &:before {
       visibility: visible;
       content: '';

diff --git a/src/components/Settings/SettingsOrganizations.svelte b/src/components/Settings/SettingsOrganizations.svelte
@@ -4,6 +4,8 @@
   export let init;
   import { updateOrganization, isOffline } from '../../shared/store';
 
+  const getIsDisabled = organization => $isOffline || organization.isBroken;
+  const getIsChecked = organization => organization.checked && !organization.isBroken;
 </script>
 
 <style src="./Settings.scss"></style>
@@ -13,7 +15,7 @@
   <ul class="skz-organizations__list">
     {#each $organizations as organization}
       <li>
-        <input disabled={$isOffline} type="checkbox" id={organization.accountName} on:change={e => updateOrganization(e, organization)} checked={organization.checked} />
+        <input disabled={getIsDisabled(organization)} type="checkbox" id={organization.accountName} on:change={e => updateOrganization(e, organization)} checked={getIsChecked(organization)} />
         <label for={organization.accountName}>{organization.accountName}</label>
       </li>
     {/each}

diff --git a/src/shared/requester.js b/src/shared/requester.js
@@ -21,6 +21,7 @@ let data = [];
 let loadedRepositories = 0;
 let loadedOrganizations = 0;
 let loadedPullRequests = [];
+let brokenOrganizations = [];
 let refreshing = false;
 
 export const getHeader = () => {
@@ -203,37 +204,44 @@ export const getProjects = async ({ organization, numberOfOrganizations }) => {
     `https://dev.azure.com/${organization.accountName}/_apis/projects?$top=1000&api-version=5.1`,
   );
 
+  let result = {
+    value: [],
+  };
+
   if (res.ok) {
-    const result = await res.json();
+    result = await res.json();
+  } else {
+    brokenOrganizations.push(organization.accountName);
+  }
 
-    data = data.map(organizationItem => ({
-      ...organizationItem,
-      projects:
-        organizationItem.accountId === organization.accountId
-          ? result.value
-          : organizationItem.projects,
-    }));
+  loadedOrganizations += 1;
 
-    loadedOrganizations += 1;
+  data = data.map(organizationItem => ({
+    ...organizationItem,
+    isBroken: brokenOrganizations.includes(organizationItem.accountName),
+    projects:
+      organizationItem.accountId === organization.accountId
+        ? result.value
+        : organizationItem.projects,
+  }));
 
-    if (loadedOrganizations === numberOfOrganizations) {
-      const numberOfProjects = data.reduce((acc, curr) => {
-        acc += curr.projects.length;
-        return acc;
-      }, 0);
+  if (loadedOrganizations === numberOfOrganizations) {
+    const numberOfProjects = data.reduce((acc, curr) => {
+      acc += curr.projects ? curr.projects.length : 0;
+      return acc;
+    }, 0);
 
-      data.forEach(organizationItem => {
+    data.forEach(organizationItem => {
+      if (organizationItem.projects) {
         organizationItem.projects.forEach(({ id: projectId }) =>
           getRepositories({
             projectId,
             organizationName: organizationItem.accountName,
             numberOfProjects,
           }),
         );
-      });
-    }
-  } else {
-    throw new Error(res);
+      }
+    });
   }
 };
 
@@ -242,6 +250,7 @@ export const getRepositories = async ({
   organizationName,
   numberOfProjects,
 }) => {
+  console.log('Im fetching repos !');
   const res = await customFetch(
     `https://dev.azure.com/${organizationName}/${projectId}/_apis/git/repositories?includeLinks=true&api-version=5.0`,
   );