Feature/remove sequence lang specifics (#1372)

* Moved to a more general seq editor and adaptation

* Fixed an issue where you could save a parcel without a name, fixed being able to upload multiple dictionaries at a time

* Fix plan metadata name input reset on snapshot preview (#1358)

* fix table action icons staying disabled when no longer in snapshot preview
* make table components less plan specific

* Add plan JSON export (#1357)

* add plan JSON export

* Hide plan export button (#1374)

* Release v2.15.0 (#1377)

Co-authored-by: joswig <[email protected]>

* Cleanup NumEditor and convert value to a number

Added tooltip support for repeat args

Removed utils.ts again

Cleaned up DictionaryTable so theres only one selection type now

Cleaned up dictionary permissions

Removed aerie-phoenix-wordmark

Disable seqn and seqjson exports when there is no sequence

Added styles to the selected command section

Converted fswCommandArgDefault to use a switch

Renamed parcel to parameter dictionaries

Some more cleanup

Fixed toggling by clicking a row on the parcel page

Fixed an issue where changing selected parameter dictionaries for a parcel wasn't enabling the save button

Fixed an issue where selecting remove in the command editor panel didn't remove the broken argument

Added st-typography-body to the no selected command text

Fixed an issue where the delete button was showing on dictionaries on the parcel page

Added some hint text to the Selected Command panel when there isn't a parcel selected

Fixed an issue with the selected command panel wasn't propagating changes

Removed the shared dictionary permission for creation

Changed permissions for the dictionary create button to check every upload permission

Fixed one more permission issue and added a div to support selected command testing

Added back in the missing seq adaptation name field

Removed unnecessary part of a regex

Fixed some styling issues with the selected command panel

Fixed an issue where the upload file button wasn't being disabled after
upload

allow for panel body to show up when SeqJson editor is "hidden"

Cleaned up the sequence store and removed all the parcel and parcel id weirdness

Fixed an issue when creating a new parcel is another user adds one it reset changes

Fixed an issue where parcels never became saveable

Moved to a more general seq editor and adaptation

Added more generic calling of to output and from input, tried to remove most of the referencs to seqjson

Renamed new-sequence-editor dir to sequence-editor

Fixed a whole bunch of broken imports

Added a helper function to get sequence adaptation globals

---------

Co-authored-by: Bryan <[email protected]>
Co-authored-by: Chet Joswig <[email protected]>
Co-authored-by: joswig <[email protected]>

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

@@ -9,7 +9,7 @@
   import type { DataGridColumnDef, DataGridRowSelection } from '../../types/data-grid';
   import type { ActivityInstanceJoin, ExpandedSequence, ExpansionRun } from '../../types/expansion';
   import type { Parcel } from '../../types/sequencing';
-  import { seqJsonToSequence } from '../../utilities/new-sequence-editor/from-seq-json';
+  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';
@@ -22,6 +22,16 @@
   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[] = [
     {
@@ -94,10 +104,6 @@
     },
   ];
 
-  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] : [];
 
@@ -179,9 +185,9 @@
 
   <SequenceEditor
     {parcel}
-    sequenceDefinition={seqJsonToSequence(selectedSequence?.expanded_sequence, [], null) ?? 'No Sequence Selected'}
+    {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}

src/components/parcels/ParcelForm.svelte

@@ -4,12 +4,12 @@
   import { goto } from '$app/navigation';
   import { base } from '$app/paths';
   import { createEventDispatcher, onMount } from 'svelte';
+  import { sequenceAdaptations } from '../../stores/sequence-adaptation';
   import {
     channelDictionaries,
     commandDictionaries,
     parameterDictionaries,
     parcelToParameterDictionaries,
-    sequenceAdaptations,
   } from '../../stores/sequencing';
   import type { User, UserId } from '../../types/app';
   import type { Parcel, ParcelInsertInput, ParcelToParameterDictionary } from '../../types/sequencing';
@@ -65,7 +65,7 @@
   );
 
   $: saveButtonClass = parcelModified && saveButtonEnabled ? 'primary' : 'secondary';
-  $: saveButtonEnabled = parcelCommandDictionaryId !== null && parcelName !== '';
+  $: saveButtonEnabled = parcelCommandDictionaryId !== null && parcelName !== undefined && parcelName !== '';
   $: parcelModified =
     parcelChannelDictionaryId !== savedParcelChannelDictionaryId ||
     parcelCommandDictionaryId !== savedParcelCommandDictionaryId ||

src/components/sequencing/ArgumentTooltip.svelte

@@ -2,7 +2,7 @@
 
 <script lang="ts">
   import type { CommandDictionary, FswCommandArgument } from '@nasa-jpl/aerie-ampcs';
-  import { getAllEnumSymbols } from '../../utilities/new-sequence-editor/sequence-linter';
+  import { getAllEnumSymbols } from '../../utilities/sequence-editor/sequence-linter';
 
   export let arg: FswCommandArgument;
   export let commandDictionary: CommandDictionary;