update to match units schema

NASA-AMMOS · Aug 31, 2023 · 1ec5a02 · 1ec5a02
1 parent 583c428
commit 1ec5a02
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 18 deletions.
diff --git a/e2e-tests/data/banananation-develop.jar b/e2e-tests/data/banananation-develop.jar
diff --git a/src/components/parameters/ParameterBaseBoolean.svelte b/src/components/parameters/ParameterBaseBoolean.svelte
@@ -34,7 +34,7 @@
       use:useActions={use}
     />
     <div class="parameter-right" slot="right">
-      <ParameterUnits units={formParameter.units} />
+      <ParameterUnits unit={formParameter.unit} />
       <ParameterBaseRightAdornments
         {disabled}
         hidden={hideRightAdornments}

diff --git a/src/components/parameters/ParameterBaseNumber.svelte b/src/components/parameters/ParameterBaseNumber.svelte
@@ -36,7 +36,7 @@
       on:change={() => dispatch('change', formParameter)}
     />
     <div class="parameter-right" slot="right">
-      <ParameterUnits units={formParameter.units} />
+      <ParameterUnits unit={formParameter.unit} />
       <ParameterBaseRightAdornments
         {disabled}
         hidden={hideRightAdornments}

diff --git a/src/components/parameters/ParameterBaseString.svelte b/src/components/parameters/ParameterBaseString.svelte
@@ -36,7 +36,7 @@
       on:change={() => dispatch('change', formParameter)}
     />
     <div class="parameter-right" slot="right">
-      <ParameterUnits units={formParameter.units} />
+      <ParameterUnits unit={formParameter.unit} />
       <ParameterBaseRightAdornments
         {disabled}
         hidden={hideRightAdornments}

diff --git a/src/components/parameters/ParameterInfo.svelte b/src/components/parameters/ParameterInfo.svelte
@@ -16,11 +16,11 @@
   let isTooltipHovered: boolean = false;
   let leaveTimeout: NodeJS.Timeout | null = null;
   let source: ValueSource;
-  let units: string | undefined = undefined;
+  let unit: string | undefined = undefined;
 
   $: if (formParameter) {
     source = formParameter.valueSource;
-    units = formParameter.units;
+    unit = formParameter.unit;
   }
 
   function leaveCallback() {
@@ -71,16 +71,16 @@
   }
 </script>
 
-{#if units || source !== 'none'}
+{#if unit || source !== 'none'}
   <div class="parameter-info-container" role="contentinfo" on:mouseenter={onIconOver} on:mouseleave={onIconOut}>
     <div><InfoIcon /></div>
     <ContextMenu hideAfterClick={false} bind:this={contextMenu}>
       <!-- svelte-ignore a11y-no-static-element-interactions -->
       <div class="parameter-info-tooltip" on:mouseenter={onTooltipOver} on:mouseleave={onTooltipOut}>
         <div class="parameter-info-values">
-          {#if units}
+          {#if unit}
             <div class="parameter-info-label">Units</div>
-            <div class="parameter-info-value">{units}</div>
+            <div class="parameter-info-value">{unit}</div>
           {/if}
           {#if source !== 'none'}
             <div class="parameter-info-label">Source</div>
@@ -102,6 +102,7 @@
   .parameter-info-values {
     display: grid;
     grid-template-columns: 1fr 1fr;
+    row-gap: 12px;
   }
 
   .parameter-info-label {

diff --git a/src/components/parameters/ParameterRecSeries.svelte b/src/components/parameters/ParameterRecSeries.svelte
@@ -42,7 +42,7 @@
         name: `[${i}]`,
         order: i,
         schema: schema.items,
-        units: formParameter.units,
+        unit: formParameter.unit,
         value: getArgument(value[i], schema.items).value,
         valueSource: formParameter.valueSource,
       };

diff --git a/src/components/parameters/ParameterRecStruct.svelte b/src/components/parameters/ParameterRecStruct.svelte
@@ -38,7 +38,7 @@
         name: key,
         order: index,
         schema: schema.items[key],
-        units: formParameter.units,
+        unit: formParameter.unit,
         value: value !== null ? value[key] : null,
         valueSource: formParameter.valueSource,
       };

diff --git a/src/components/parameters/ParameterUnits.svelte b/src/components/parameters/ParameterUnits.svelte
@@ -1,11 +1,11 @@
 <svelte:options immutable={true} />
 
 <script lang="ts">
-  export let units: string | undefined = undefined;
+  export let unit: string | undefined = undefined;
 </script>
 
-{#if units}
-  <span class="parameter-units">{units}</span>
+{#if unit}
+  <span class="parameter-units">{unit}</span>
 {/if}
 
 <style>

diff --git a/src/types/parameter.ts b/src/types/parameter.ts
@@ -15,7 +15,7 @@ export type FormParameter<T = ValueSchema> = {
   order: number;
   required?: boolean;
   schema: T;
-  units?: string;
+  unit?: string;
   value: Argument;
   valueSource: ValueSource;
 };
@@ -24,7 +24,7 @@ export type Argument = any;
 
 export type ArgumentsMap = Record<ParameterName, Argument>;
 
-export type Parameter = { order: number; schema: ValueSchema; units?: string };
+export type Parameter = { order: number; schema: ValueSchema; unit?: string };
 
 export type ParameterError = { message: string; schema: ValueSchema };
 

diff --git a/src/utilities/gql.ts b/src/utilities/gql.ts
@@ -793,7 +793,7 @@ const gql = {
           jar_id
           name
           parameters {
-            parameters
+            parameter_definitions
           }
           version
         }

diff --git a/src/utilities/parameters.ts b/src/utilities/parameters.ts
@@ -64,7 +64,7 @@ export function getFormParameters(
   presetArgumentsMap: ArgumentsMap = {},
   defaultArgumentsMap: ArgumentsMap = {},
 ): FormParameter[] {
-  const formParameters = Object.entries(parametersMap).map(([name, { order, schema, units }]) => {
+  const formParameters = Object.entries(parametersMap).map(([name, { order, schema, unit }]) => {
     const arg: Argument = argumentsMap[name];
     const preset: Argument = presetArgumentsMap[name];
     const defaultArg: Argument | undefined = defaultArgumentsMap[name];
@@ -76,7 +76,7 @@ export function getFormParameters(
       order,
       required,
       schema,
-      units,
+      unit,
       value,
       valueSource,
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -793,7 +793,7 @@ const gql = { @@
               jar_id
               name
               parameters {
-                parameters
+                parameter_definitions
               }
               version
             }
@@ Expand Down @@