load simulation datasets relevant to snapshot

auto select latest available simulation add simulation dataset id to URL when choosing dataset or snapshot
NASA-AMMOS · Sep 18, 2023 · 3937cba · 3937cba
1 parent 6ea0acf
commit 3937cba
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 9 deletions.
diff --git a/src/components/modals/CreatePlanSnapshotModal.svelte b/src/components/modals/CreatePlanSnapshotModal.svelte
@@ -14,7 +14,7 @@
 
   const dispatch = createEventDispatcher();
 
-  let snapshotName: string = `${plan.name} - Snapshot`;
+  let snapshotName: string = '';
   let createButtonDisabled: boolean = true;
 
   $: createButtonDisabled = snapshotName === '';
@@ -44,7 +44,7 @@
       <label for="name">Name of snapshot</label>
       <input
         bind:value={snapshotName}
-        placeholder="Name of snapshot"
+        placeholder={`${plan.name} - Snapshot`}
         autocomplete="off"
         class="st-input w-100"
         name="name"

diff --git a/src/components/plan/PlanMergeReview.test.ts b/src/components/plan/PlanMergeReview.test.ts
@@ -61,7 +61,7 @@ const mockInitialPlan: Plan = {
   parent_plan: null,
   revision: 3,
   scheduling_specifications: [{ id: 1 }],
-  simulations: [{ simulation_datasets: [{ id: 1 }] }],
+  simulations: [{ simulation_datasets: [{ id: 1, plan_revision: 3 }] }],
   start_time: '2023-02-16T00:00:00',
   start_time_doy: '2023-047T00:00:00',
   tags: [],

diff --git a/src/components/simulation/SimulationPanel.svelte b/src/components/simulation/SimulationPanel.svelte
@@ -3,8 +3,10 @@
 <script lang="ts">
   import PlanLeftArrow from '@nasa-jpl/stellar/icons/plan_with_left_arrow.svg?component';
   import PlanRightArrow from '@nasa-jpl/stellar/icons/plan_with_right_arrow.svg?component';
+  import { SearchParameters } from '../../enums/searchParameters';
   import { field } from '../../stores/form';
   import { plan, planEndTimeMs, planStartTimeMs } from '../../stores/plan';
+  import { planSnapshot } from '../../stores/planSnapshots';
   import {
     enableSimulation,
     simulation,
@@ -25,6 +27,7 @@
   import type { GqlSubscribable } from '../../types/subscribable';
   import type { ViewGridSection } from '../../types/view';
   import effects from '../../utilities/effects';
+  import { setQueryParam } from '../../utilities/generic';
   import gql from '../../utilities/gql';
   import { getArguments, getFormParameters } from '../../utilities/parameters';
   import { permissionHandler } from '../../utilities/permissionHandler';
@@ -59,6 +62,7 @@
   let startTimeDoyField: FieldStore<string>;
   let modelParametersMap: ParametersMap = {};
   let simulationDatasets: GqlSubscribable<SimulationDataset[]>;
+  let filteredSimulationDatasets: SimulationDataset[] = [];
 
   $: if (user !== null && $plan !== null) {
     hasRunPermission = featurePermissions.simulation.canRun(user, $plan);
@@ -116,6 +120,18 @@
     );
   }
 
+  $: if ($simulationDatasets?.length) {
+    if ($planSnapshot) {
+      filteredSimulationDatasets = $simulationDatasets.filter(
+        simulationDataset => simulationDataset.plan_revision === $planSnapshot?.revision,
+      );
+    } else {
+      filteredSimulationDatasets = $simulationDatasets;
+    }
+  } else {
+    filteredSimulationDatasets = [];
+  }
+
   async function onChangeFormParameters(event: CustomEvent<FormParameter>) {
     if ($simulation !== null) {
       const { detail: formParameter } = event;
@@ -367,10 +383,10 @@
     <fieldset>
       <Collapse title="Simulation History">
         <div class="simulation-history">
-          {#if !$simulationDatasets || !$simulationDatasets.length}
+          {#if !filteredSimulationDatasets || !filteredSimulationDatasets.length}
             <div>No Simulation Datasets</div>
           {:else}
-            {#each $simulationDatasets as simDataset (simDataset.id)}
+            {#each filteredSimulationDatasets as simDataset (simDataset.id)}
               <SimulationHistoryDataset
                 queuePosition={getSimulationQueuePosition(simDataset, $simulationDatasetsAll)}
                 simulationDataset={simDataset}
@@ -379,6 +395,7 @@
                 checked={simDataset.id === $simulationDatasetId}
                 on:click={() => {
                   simulationDatasetId.set(simDataset.id);
+                  setQueryParam(SearchParameters.SIMULATION_DATASET_ID, `${$simulationDatasetId}`);
                 }}
                 on:cancel={onCancelSimulation}
               />

diff --git a/src/routes/plans/[id]/+page.svelte b/src/routes/plans/[id]/+page.svelte
@@ -86,7 +86,7 @@
   import type { ActivityDirective } from '../../../types/activity';
   import type { ViewSaveEvent, ViewToggleEvent } from '../../../types/view';
   import effects from '../../../utilities/effects';
-  import { removeQueryParam } from '../../../utilities/generic';
+  import { getSearchParameterNumber, removeQueryParam, setQueryParam } from '../../../utilities/generic';
   import { isSaveEvent } from '../../../utilities/keyboardEvents';
   import { closeActiveModal, showPlanLockedModal } from '../../../utilities/modal';
   import { featurePermissions } from '../../../utilities/permissions';
@@ -138,7 +138,6 @@
     const querySimulationDatasetId = $page.url.searchParams.get(SearchParameters.SIMULATION_DATASET_ID);
     if (querySimulationDatasetId) {
       $simulationDatasetId = parseInt(querySimulationDatasetId);
-      removeQueryParam(SearchParameters.SIMULATION_DATASET_ID);
     } else {
       $simulationDatasetId = data.initialPlan.simulations[0]?.simulation_datasets[0]?.id ?? -1;
     }
@@ -167,6 +166,18 @@
         planSnapshotActivityDirectives = directives;
       }
     });
+
+    const currentPlanSnapshotSimulation = data.initialPlan.simulations[0]?.simulation_datasets.find(simulation => {
+      return simulation.id === getSearchParameterNumber(SearchParameters.SIMULATION_DATASET_ID);
+    });
+    const latestPlanSnapshotSimulation = data.initialPlan.simulations[0]?.simulation_datasets.find(simulation => {
+      return simulation.plan_revision === $planSnapshot?.revision;
+    });
+
+    if (!currentPlanSnapshotSimulation && latestPlanSnapshotSimulation) {
+      $simulationDatasetId = latestPlanSnapshotSimulation.id;
+      setQueryParam(SearchParameters.SIMULATION_DATASET_ID, `${$simulationDatasetId}`);
+    }
   }
 
   $: if (data.initialView) {

diff --git a/src/types/plan.ts b/src/types/plan.ts
@@ -87,7 +87,7 @@ export type PlanSchema = {
   parent_plan: Pick<PlanSchema, 'id' | 'name'> | null;
   revision: number;
   scheduling_specifications: Pick<SchedulingSpec, 'id'>[];
-  simulations: [{ simulation_datasets: [{ id: number }] }];
+  simulations: [{ simulation_datasets: [{ id: number; plan_revision: number }] }];
   start_time: string;
   tags: { tag: Tag }[];
   updated_at: string;

diff --git a/src/utilities/gql.ts b/src/utilities/gql.ts
@@ -845,8 +845,9 @@ const gql = {
           id
         }
         simulations(order_by: { id: desc }, limit: 1) {
-          simulation_datasets(order_by: { id: desc }, limit: 1) {
+          simulation_datasets(order_by: { id: desc }) {
             id
+            plan_revision
           }
         }
         start_time
@@ -1844,6 +1845,7 @@ const gql = {
         simulation_datasets(order_by: { id: desc }) {
           canceled
           id
+          plan_revision
           requested_at
           requested_by
           simulation_end_time