dashboard client: align default value of campaigns store to the same …

…as the rest (null)
stratosphereips · Dec 17, 2024 · 7b35015 · 7b35015
1 parent 9011ef1
commit 7b35015
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/dashboard/client/src/SideNavBar.svelte b/dashboard/client/src/SideNavBar.svelte
@@ -85,23 +85,25 @@
             {/each}
           </CollapsibleSection>
 
-          <CollapsibleSection id="campaignList" label="Campaigns">
-            {#each $campaigns as campaign}
-              <CollapsibleSection id={campaign.id} label={campaign.name} level={2}>
-                <span slot="labelExtra">
-                  <span
-                    role="button"
-                    tabindex="0"
-                    class="badge bg-black"
-                    on:keypress={() => chooseCampaignDetail(campaign.id)}
-                    on:click={() => chooseCampaignDetail(campaign.id)}
-                    title="Show campaign details">i</span
-                  >
-                </span>
-                <CampaignStepList id={campaign.id} />
-              </CollapsibleSection>
-            {/each}
-          </CollapsibleSection>
+          {#if $campaigns}
+            <CollapsibleSection id="campaignList" label="Campaigns">
+              {#each $campaigns as campaign}
+                <CollapsibleSection id={campaign.id} label={campaign.name} level={2}>
+                  <span slot="labelExtra">
+                    <span
+                      role="button"
+                      tabindex="0"
+                      class="badge bg-black"
+                      on:keypress={() => chooseCampaignDetail(campaign.id)}
+                      on:click={() => chooseCampaignDetail(campaign.id)}
+                      title="Show campaign details">i</span
+                    >
+                  </span>
+                  <CampaignStepList id={campaign.id} />
+                </CollapsibleSection>
+              {/each}
+            </CollapsibleSection>
+          {/if}
         </ul>
       {/if}
     </div>

diff --git a/dashboard/client/src/campaigns/CampaignStepList.svelte b/dashboard/client/src/campaigns/CampaignStepList.svelte
@@ -7,7 +7,7 @@
   export let id;
 
   let root;
-  let campaign = derived([campaigns], ([campaigns]) => campaigns.find((camp) => camp.id === id));
+  let campaign = derived([campaigns], ([campaigns]) => campaigns?.find((camp) => camp.id === id));
 
   const load = () => loadSingleCampaign(id).then();
 

diff --git a/dashboard/client/src/routing.js b/dashboard/client/src/routing.js
@@ -39,7 +39,7 @@ export const chosenCampaignStep = derived([campaigns, path], ([campaigns, path])
 
   const [, campaignId, stepId] = match;
 
-  const step = campaigns.find((camp) => camp.id === campaignId)?.steps?.find((step) => step.id === stepId) ?? null;
+  const step = campaigns?.find((camp) => camp.id === campaignId)?.steps?.find((step) => step.id === stepId) ?? null;
   return step === null
     ? null
     : {
@@ -52,5 +52,5 @@ export const chosenCampaignDetail = derived([campaigns, path], ([campaigns, path
   const match = path.match(/^#campaign\/(.+)$/);
   if (!match) return null;
 
-  return campaigns.find((camp) => camp.id === match[1]) ?? null;
+  return campaigns?.find((camp) => camp.id === match[1]) ?? null;
 });
diff --git a/dashboard/client/src/stores.js b/dashboard/client/src/stores.js
@@ -5,7 +5,7 @@ export const isLoading = writable(false);
 
 export const classes = writable(null);
 export const challenges = writable(null);
-export const campaigns = writable([]);
+export const campaigns = writable(null);
 
 export const storageBackedWritable = (key, defaultData) => {
   const store = writable(localStorage.getItem(key) ?? defaultData);
@@ -26,7 +26,7 @@ export const storageBackedWritable = (key, defaultData) => {
 export const loadSingleCampaign = async (id) => {
   const campaign = await fetchSingleCampaign(id);
   campaigns.update((old) => {
-    const neu = [...old];
+    const neu = old === null ? [] : [...old];
     const index = neu.findIndex((camp) => camp.id === campaign.id);
     neu[index] = {
       ...neu[index],
@@ -39,12 +39,16 @@ export const loadSingleCampaign = async (id) => {
 export const setChallengeRunning = (challengeId, campaignId, running) => {
   if (campaignId) {
     campaigns.update((campaigns) => {
+      if (!campaigns) return campaigns;
+
       campaigns.find((camp) => camp.id === campaignId).steps.find((chall) => chall.id === challengeId).running =
         running;
       return campaigns;
     });
   } else {
     challenges.update((challs) => {
+      if (!challs) return challs;
+
       challs.find((chall) => chall.id === challengeId).running = running;
       return challs;
     });