Clear resources on plan branch (#1530)

allow `null` in subscribable store
NASA-AMMOS · Oct 30, 2024 · 6a4afaa · 6a4afaa
1 parent cd7c918
commit 6a4afaa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/src/components/timeline/Row.svelte b/src/components/timeline/Row.svelte
@@ -314,6 +314,11 @@
         }
       });
     }
+  } else if (simulationDataset === null) {
+    Object.entries(resourceRequestMap).forEach(([_key, value]) => {
+      value.controller?.abort();
+    });
+    resourceRequestMap = {};
   }
 
   $: onDragenter(dragenter);

diff --git a/src/routes/plans/[id]/+page.svelte b/src/routes/plans/[id]/+page.svelte
@@ -244,6 +244,7 @@
     $planEndTimeMs = getUnixEpochTime(data.initialPlan.end_time_doy);
     $planStartTimeMs = getUnixEpochTime(data.initialPlan.start_time_doy);
     $maxTimeRange = { end: $planEndTimeMs, start: $planStartTimeMs };
+    $simulationDatasetId = -1;
 
     const querySimulationDatasetId = $page.url.searchParams.get(SearchParameters.SIMULATION_DATASET_ID);
     if (querySimulationDatasetId) {
@@ -346,12 +347,7 @@
     selectActivity(null, null);
   }
 
-  $: if (
-    $initialPlan &&
-    $simulationDataset !== null &&
-    (getSimulationStatus($simulationDataset) === Status.Complete ||
-      getSimulationStatus($simulationDataset) === Status.Complete)
-  ) {
+  $: if ($initialPlan && $simulationDataset !== null && getSimulationStatus($simulationDataset) === Status.Complete) {
     const datasetId = $simulationDataset.dataset_id;
     simulationDataAbortController?.abort();
     simulationDataAbortController = new AbortController();

diff --git a/src/stores/subscribable.ts b/src/stores/subscribable.ts
@@ -44,9 +44,7 @@ export function gqlSubscribable<T>(
               await logout(EXPIRED_JWT);
             } else {
               subscribers.forEach(({ next }) => {
-                if (initialValue !== null) {
-                  next(initialValue);
-                }
+                next(initialValue as T);
               });
             }
           },
@@ -57,9 +55,7 @@ export function gqlSubscribable<T>(
               if (!isEqual(value, newValue)) {
                 value = transformer(newValue);
                 subscribers.forEach(({ next }) => {
-                  if (value !== null) {
-                    next(value);
-                  }
+                  next(value as T);
                 });
               }
             }
@@ -182,9 +178,7 @@ export function gqlSubscribable<T>(
     const unsubscribe = clientSubscribe();
     const subscriber: Subscription<T> = { next, unsubscribe };
     subscribers.add(subscriber);
-    if (value !== null) {
-      next(value);
-    }
+    next(value as T);
 
     return () => {
       subscriber.unsubscribe();
@@ -200,13 +194,9 @@ export function gqlSubscribable<T>(
   }
 
   function updateValue(fn: Updater<T>): void {
-    if (value !== null) {
-      value = fn(value);
-    }
+    value = fn(value as T);
     subscribers.forEach(({ next }) => {
-      if (value !== null) {
-        next(value);
-      }
+      next(value as T);
     });
   }