PR feedback and fixed issue with activity selection

NASA-AMMOS · Oct 9, 2023 · 1df4e14 · 1df4e14
1 parent 22a5b0a
commit 1df4e14
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/src/components/timeline/TimelineViewControls.svelte b/src/components/timeline/TimelineViewControls.svelte
@@ -8,9 +8,10 @@
   import { createEventDispatcher } from 'svelte';
   import { SearchParameters } from '../../enums/searchParameters';
   import { selectedActivityDirective } from '../../stores/activities';
-  import { simulationDatasetId } from '../../stores/simulation';
+  import { selectedSpan, simulationDatasetId } from '../../stores/simulation';
   import { viewIsModified } from '../../stores/views';
   import type { DirectiveVisibilityToggleMap, TimeRange } from '../../types/timeline';
+  import { showFailureToast, showSuccessToast } from '../../utilities/toast';
   import { tooltip } from '../../utilities/tooltip';
   import TimelineViewDirectiveControls from './TimelineViewDirectiveControls.svelte';
 
@@ -112,18 +113,26 @@
     dispatch('toggleDirectiveVisibility', !allDirectivesVisible);
   }
 
-  function onCopyViewportURL() {
+  async function onCopyViewportURL() {
     const targetUrl = new URL(window.location.href);
     targetUrl.searchParams.set(SearchParameters.START_TIME, new Date(viewTimeRange.start).toISOString());
     targetUrl.searchParams.set(SearchParameters.END_TIME, new Date(viewTimeRange.end).toISOString());
     if ($selectedActivityDirective) {
       targetUrl.searchParams.set(SearchParameters.ACTIVITY_ID, $selectedActivityDirective.id.toFixed());
     }
+    if ($selectedSpan) {
+      targetUrl.searchParams.set(SearchParameters.SPAN_ID, $selectedSpan.id.toFixed());
+    }
     if ($simulationDatasetId) {
       targetUrl.searchParams.set(SearchParameters.SIMULATION_DATASET_ID, $simulationDatasetId.toFixed());
     }
 
-    navigator.clipboard.writeText(targetUrl.href);
+    try {
+      await navigator.clipboard.writeText(targetUrl.href);
+      showSuccessToast('URL of plan and view copied to clipboard');
+    } catch {
+      showFailureToast('Error copying URL to clipboard');
+    }
   }
 </script>
 

diff --git a/src/enums/searchParameters.ts b/src/enums/searchParameters.ts
@@ -4,6 +4,7 @@ export enum SearchParameters {
   REASON = 'reason',
   SIMULATION_DATASET_ID = 'simulationDatasetId',
   SNAPSHOT_ID = 'snapshotId',
+  SPAN_ID = 'spanId',
   SPEC_ID = 'specId',
   VIEW_ID = 'viewId',
   START_TIME = 'startTime',

diff --git a/src/routes/plans/[id]/+page.svelte b/src/routes/plans/[id]/+page.svelte
@@ -66,7 +66,6 @@
     resetSimulationStores,
     resourceTypes,
     resources,
-    selectedSpanId,
     simulationDataset,
     simulationDatasetId,
     simulationDatasetLatest,
@@ -86,7 +85,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 } from '../../../utilities/generic';
   import { isSaveEvent } from '../../../utilities/keyboardEvents';
   import { closeActiveModal, showPlanLockedModal } from '../../../utilities/modal';
   import { featurePermissions } from '../../../utilities/permissions';
@@ -143,10 +142,12 @@
       $simulationDatasetId = data.initialPlan.simulations[0]?.simulation_datasets[0]?.id ?? -1;
     }
 
-    const queryActivityId = $page.url.searchParams.get(SearchParameters.ACTIVITY_ID);
-    if (queryActivityId) {
-      $selectedSpanId = parseInt(queryActivityId);
+    const queryActivityId = getSearchParameterNumber(SearchParameters.ACTIVITY_ID, $page.url.searchParams);
+    const querySpanId = getSearchParameterNumber(SearchParameters.SPAN_ID, $page.url.searchParams);
+    if (queryActivityId !== null || querySpanId !== null) {
+      setTimeout(() => selectActivity(queryActivityId, querySpanId));
       removeQueryParam(SearchParameters.ACTIVITY_ID);
+      removeQueryParam(SearchParameters.SPAN_ID);
     }
 
     let start = NaN;
@@ -163,15 +164,10 @@
       removeQueryParam(SearchParameters.END_TIME);
     }
 
-    if (isNaN(start) && isNaN(end)) {
-      $viewTimeRange = $maxTimeRange;
-    } else if (!isNaN(start) && !isNaN(end)) {
-      viewTimeRange.set({ end, start });
-    } else if (!isNaN(start)) {
-      viewTimeRange.set({ ...$maxTimeRange, start });
-    } else if (!isNaN(end)) {
-      viewTimeRange.set({ ...$maxTimeRange, end });
-    }
+    viewTimeRange.set({
+      end: !isNaN(end) ? end : $maxTimeRange.end,
+      start: !isNaN(start) ? start : $maxTimeRange.start,
+    });
 
     activityTypes.updateValue(() => data.initialActivityTypes);
     planTags.updateValue(() => data.initialPlanTags);