fix unique profile names

Author: duranb

e2e-tests/data/external-dataset.json

@@ -1,43 +1,51 @@
 {
   "datasetStart": "2024-245T14:00:00",
   "profileSet": {
-    "/orientation": {
+    "/awake": {
+      "schema": {
+        "type": "string"
+      },
+      "segments": [
+        {
+          "duration": 3000000000,
+          "dynamics": "foo"
+        },
+        {
+          "duration": 3000000000,
+          "dynamics": "bar"
+        }
+      ],
+      "type": "discrete"
+    },
+    "/batteryEnergy": {
       "schema": {
         "items": {
-          "x": {
-            "type": "real"
-          },
-          "y": {
+          "initial": {
             "type": "real"
           },
-          "z": {
+          "rate": {
             "type": "real"
           }
         },
         "type": "struct"
       },
       "segments": [
         {
-          "duration": 3600000000,
+          "duration": 40000000,
           "dynamics": {
-            "x": 0,
-            "y": 0,
-            "z": 1
+            "initial": 100,
+            "rate": -0.5
           }
         },
         {
-          "duration": 3600000000
-        },
-        {
-          "duration": 3600000000,
+          "duration": 30000000,
           "dynamics": {
-            "x": 1,
-            "y": 1,
-            "z": 0
+            "initial": 35,
+            "rate": -0.1
           }
         }
       ],
-      "type": "discrete"
+      "type": "real"
     }
   }
-}
+}

src/components/ResourceList.svelte

@@ -4,7 +4,7 @@
   import CloseIcon from '@nasa-jpl/stellar/icons/close.svg?component';
   import UploadIcon from '@nasa-jpl/stellar/icons/upload.svg?component';
   import { plan } from '../stores/plan';
-  import { resourceTypes, simulationDatasetId } from '../stores/simulation';
+  import { allResourceTypes, simulationDatasetId } from '../stores/simulation';
   import type { User } from '../types/app';
   import type { ResourceType } from '../types/simulation';
   import type { TimelineItemType } from '../types/timeline';
@@ -27,7 +27,7 @@
   let uploadFiles: FileList | undefined;
   let uploadFileInput: HTMLInputElement;
 
-  $: resourceDataTypes = [...new Set($resourceTypes.map(t => t.schema.type))];
+  $: resourceDataTypes = $allResourceTypes.map(({ name }) => name);
   $: if (user !== null && $plan !== null) {
     hasUploadPermission = featurePermissions.externalResources.canCreate(user, $plan);
   }
@@ -61,7 +61,7 @@
 </script>
 
 <TimelineItemList
-  items={$resourceTypes}
+  items={$allResourceTypes}
   chartType="line"
   typeName="resource"
   typeNamePlural="Resources"

src/routes/plans/[id]/+page.svelte

@@ -119,7 +119,6 @@
   import type { ActivityErrorCounts } from '../../../types/errors';
   import type { Extension } from '../../../types/extension';
   import type { PlanSnapshot } from '../../../types/plan-snapshot';
-  import type { ResourceType } from '../../../types/simulation';
   import type { View, ViewSaveEvent, ViewToggleEvent } from '../../../types/view';
   import { getConstraintStatus } from '../../../utilities/constraint';
   import effects from '../../../utilities/effects';
@@ -415,17 +414,7 @@
   $: if ($initialPlan && browser) {
     // Asynchronously fetch resource types
     effects.getResourceTypes($initialPlan.model_id, data.user).then(initialResourceTypes => {
-      const uniqueLookup: Set<string> = new Set();
-      $resourceTypes = [...initialResourceTypes, ...$externalResources].reduce(
-        (prevExternalResources: ResourceType[], { name, schema }) => {
-          if (!uniqueLookup.has(name)) {
-            uniqueLookup.add(name);
-            prevExternalResources.push({ name, schema });
-          }
-          return prevExternalResources;
-        },
-        [],
-      );
+      $resourceTypes = initialResourceTypes;
       $resourceTypesLoading = false;
     });
   }

src/stores/simulation.ts

@@ -100,6 +100,15 @@ export const selectedSimulationEventId: Writable<number | null> = writable(null)
 
 /* Derived. */
 
+export const allResourceTypes: Readable<ResourceType[]> = derived(
+  [resourceTypes, externalResources],
+  ([$resourceTypes, $externalResources]) => {
+    return $resourceTypes
+      .map(({ name, schema }) => ({ name, schema }))
+      .concat($externalResources.map(({ name, schema }) => ({ name, schema })));
+  },
+);
+
 export const spansMap: Readable<SpansMap> = derived(spans, $spans => keyBy($spans, 'span_id'));
 
 export const spanUtilityMaps: Readable<SpanUtilityMaps> = derived(spans, $spans => {

src/types/simulation.ts

@@ -7,6 +7,7 @@ import type { Subscription } from './subscribable';
 
 export type PlanDataset = {
   dataset: { profiles: Profile[] };
+  dataset_id: number;
   offset_from_plan_start: string;
 };
 

src/utilities/effects.ts

@@ -213,7 +213,7 @@ import type {
 import type { Row, Timeline } from '../types/timeline';
 import type { View, ViewDefinition, ViewInsertInput, ViewSlim, ViewUpdateInput } from '../types/view';
 import { ActivityDeletionAction } from './activities';
-import { convertToQuery, getSearchParameterNumber, setQueryParam } from './generic';
+import { compare, convertToQuery, getSearchParameterNumber, setQueryParam } from './generic';
 import gql, { convertToGQLArray } from './gql';
 import {
   showConfirmModal,
@@ -4225,12 +4225,26 @@ const effects = {
       const { plan_dataset: plan_datasets } = data;
       if (plan_datasets != null) {
         let resources: Resource[] = [];
+
+        const profileMap: Set<string> = new Set();
+        plan_datasets.sort(({ dataset_id: datasetIdA }, { dataset_id: datasetIdB }) => {
+          return compare(datasetIdA, datasetIdB, false);
+        });
+
         for (const dataset of plan_datasets) {
           const {
             dataset: { profiles },
             offset_from_plan_start,
           } = dataset;
-          const sampledResources: Resource[] = sampleProfiles(profiles, startTimeYmd, offset_from_plan_start);
+          const uniqueProfiles: Profile[] = profiles.filter(profile => {
+            if (!profileMap.has(profile.name)) {
+              profileMap.add(profile.name);
+              return true;
+            }
+            return false;
+          });
+
+          const sampledResources: Resource[] = sampleProfiles(uniqueProfiles, startTimeYmd, offset_from_plan_start);
           resources = [...resources, ...sampledResources];
         }
         return { aborted: false, resources };

src/utilities/gql.ts

@@ -1803,6 +1803,7 @@ const gql = {
             type
           }
         }
+        dataset_id
         offset_from_plan_start
       }
     }