Feature/seq editor cleanup

e2e-tests/fixtures/Sequence.ts

@@ -167,7 +167,7 @@ export class Sequence {
     this.editor = page.locator('.cm-activeLine').first();
     this.command = this.editor.getByText(/C\s+FSW_CMD_0.*/);
     this.jsonEditor = page.getByText(`{ "id": "${this.sequenceName}`);
-    this.jsonImport = page.locator('input[name="seqJsonFile"]');
+    this.jsonImport = page.locator('input[name="outputFile"]');
     this.linter = page.locator('.cm-lint-marker');
     this.page = page;
     this.parcel = page.locator('select[name="parcel"]');

src/app.d.ts

@@ -1,9 +1,5 @@
 /* eslint-disable no-var */
 /* eslint @typescript-eslint/no-unused-vars: 0 */
-import type { ParameterDictionary } from '@nasa-jpl/aerie-ampcs';
-import type { SeqJson } from '@nasa-jpl/seq-json-schema/types';
-import type { GlobalType } from './types/global-type';
-import type { ArgDelegator } from './utilities/new-sequence-editor/extension-points';
 
 declare global {
   namespace App {
@@ -49,28 +45,43 @@ declare global {
     export default content;
   }
 
-  var CONDITIONAL_KEYWORDS: { ELSE: string; ELSE_IF?: string[]; END_IF: string; IF: string[] } | undefined;
-  var LOOP_KEYWORDS:
+  var SequenceAdaptation:
     | {
-        BREAK: string;
-        CONTINUE: string;
-        END_WHILE_LOOP: string;
-        WHILE_LOOP: string[];
+        ARG_DELEGATOR?: ArgDelegator;
+        CONDITIONAL_KEYWORDS?: { ELSE?: string; ELSE_IF?: string[]; END_IF?: string; IF: string[] };
+        GLOBALS?: GlobalType[];
+        INPUT_FORMAT?: {
+          NAME: string;
+          TO_INPUT_FORMAT?: (input: string) => Promise<string>;
+        };
+        LINT?: (commandDictionary, view, node) => any;
+        LOOP_KEYWORDS?: {
+          BREAK: string;
+          CONTINUE: string;
+          END_WHILE_LOOP: string;
+          WHILE_LOOP: string[];
+        };
+        MODFIY_OUTPUT?: (
+          output: SeqJson | any,
+          parameterDictionaries: ParameterDictionary[],
+          channelDictionary: ChannelDictionary | null,
+        ) => any;
+        MODIFY_OUTPUT_PARSE?: (
+          output: SeqJson | any,
+          parameterDictionaries: ParameterDictionary[],
+          channelDictionary: ChannelDictionary | null,
+        ) => any;
+        OUTPUT_FORMAT?: {
+          NAME: string;
+          TO_OUTPUT_FORMAT?: (
+            tree: Tree | any,
+            sequence: string,
+            commandDictionary: CommandDictionary | null,
+            sequenceName: string,
+          ) => Promise<string>;
+        };
       }
     | undefined;
-  var GLOBALS: GlobalType[] | undefined;
-  var ARG_DELEGATOR: ArgDelegator | undefined;
-  function LINT(commandDictionary, view, node);
-  function TO_SEQ_JSON(
-    seqJson: SeqJson,
-    parameterDictionaries: ParameterDictionary[],
-    channelDictionary: ChannelDictionary | null,
-  );
-  function FROM_SEQ_JSON(
-    seqJson: SeqJson,
-    parameterDictionaries: ParameterDictionary[],
-    channelDictionary: ChannelDictionary | null,
-  );
 }
 
 export {};

src/components/expansion/ExpansionRuns.svelte

@@ -4,11 +4,12 @@
   import { base } from '$app/paths';
   import type { ICellRendererParams } from 'ag-grid-community';
   import { expansionRunsColumns } from '../../stores/expansion';
-  import { parcel, parcelId } from '../../stores/sequencing';
+  import { parcels } from '../../stores/sequencing';
   import type { User } from '../../types/app';
   import type { DataGridColumnDef, DataGridRowSelection } from '../../types/data-grid';
   import type { ActivityInstanceJoin, ExpandedSequence, ExpansionRun } from '../../types/expansion';
-  import { seqJsonToSequence } from '../../utilities/new-sequence-editor/from-seq-json';
+  import type { Parcel } from '../../types/sequencing';
+  import { seqJsonToSequence } from '../../utilities/sequence-editor/from-seq-json';
   import SequenceEditor from '../sequencing/SequenceEditor.svelte';
   import CssGrid from '../ui/CssGrid.svelte';
   import CssGridGutter from '../ui/CssGridGutter.svelte';
@@ -20,6 +21,18 @@
   export let expansionRuns: ExpansionRun[] = [];
   export let user: User | null;
 
+  let parcel: Parcel | null;
+  let selectedSequence: ExpandedSequence | null = null;
+  let selectedSequenceIds: number[] = [];
+  let selectedExpansionRun: ExpansionRun | null = null;
+  let sequenceDefinition: string;
+
+  $: convertOutputToSequence(selectedSequence);
+
+  async function convertOutputToSequence(sequence: ExpandedSequence | null): Promise<void> {
+    sequenceDefinition = (await seqJsonToSequence(sequence?.expanded_sequence)) ?? 'No Sequence Selected';
+  }
+
   const columnDefs: DataGridColumnDef[] = [
     {
       field: 'id',
@@ -91,10 +104,7 @@
     },
   ];
 
-  let selectedSequence: ExpandedSequence | null = null;
-  let selectedSequenceIds: number[] = [];
-  let selectedExpansionRun: ExpansionRun | null = null;
-
+  $: parcel = $parcels.find(p => p.id === selectedExpansionRun?.expansion_set.parcel_id) ?? null;
   $: selectedSequenceIds = selectedSequence ? [selectedSequence.id] : [];
 
   function toggleRun(event: CustomEvent<DataGridRowSelection<ExpansionRun>>) {
@@ -106,11 +116,8 @@
 
     if (isSelected) {
       selectedExpansionRun = clickedRun;
-
-      $parcelId = selectedExpansionRun.expansion_set.parcel_id;
     } else if (selectedExpansionRun?.id === clickedRun.id) {
       selectedExpansionRun = null;
-      $parcelId = null;
     }
   }
 
@@ -177,10 +184,10 @@
   <CssGridGutter track={1} type="column" />
 
   <SequenceEditor
-    parcel={$parcel}
-    sequenceDefinition={seqJsonToSequence(selectedSequence?.expanded_sequence, [], null) ?? 'No Sequence Selected'}
+    {parcel}
+    {sequenceDefinition}
     sequenceName={selectedSequence?.seq_id}
-    sequenceSeqJson={selectedSequence ? JSON.stringify(selectedSequence.expanded_sequence, null, 2) : undefined}
+    sequenceOutput={selectedSequence ? JSON.stringify(selectedSequence.expanded_sequence, null, 2) : undefined}
     readOnly={true}
     title="Sequence - Definition Editor (Read-only)"
     {user}