updated schema; typing fixes for new InversionSolutionUnion; legacy S…

…SL support;
GNS-Science · Jul 1, 2024 · 651ff9a · 651ff9a
1 parent f4593e4
commit 651ff9a
Show file tree

Hide file tree

Showing 14 changed files with 351 additions and 190 deletions.
diff --git a/package.json b/package.json
@@ -56,8 +56,8 @@
     "@mui/styled-engine": "npm:@mui/styled-engine-sc@latest"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
+    "start": "react-scripts --openssl-legacy-provider start",
+    "build": "react-scripts --openssl-legacy-provider build",
     "test": "react-scripts test --watchAll=false --coverage",
     "eject": "react-scripts eject",
     "relay": "relay-compiler --src ./src --schema ./schema.graphql --language typescript",

diff --git a/schema.graphql b/schema.graphql
@@ -119,8 +119,11 @@ type AutomationTask implements Node & Thing & AutomationTaskInterface {
   model_type: ModelType
   task_type: TaskSubType
 
-  """the primary result of this task (only for task_type == INVERSION."""
-  inversion_solution: InversionSolution
+  """
+  the result of this task. NB only available for task_types:INVERSION,
+  SCALE_SOLUTION, AGGREGATE_SOLUTION, TIME_DEPENDENT_SOLUTION.
+  """
+  inversion_solution: InversionSolutionUnion
 }
 
 input AutomationTaskInput {
@@ -846,6 +849,8 @@ type InversionSolutionNrml implements Node & FileInterface & PredecessorsInterfa
   source_solution: SourceSolutionUnion
 }
 
+union InversionSolutionUnion = InversionSolution | ScaledInversionSolution | AggregateInversionSolution | TimeDependentInversionSolution
+
 """Simple container for KVL lists of strings"""
 type KeyValueListPair {
   """key"""

diff --git a/src/components/common/MetaToolTip.tsx b/src/components/common/MetaToolTip.tsx
@@ -12,7 +12,7 @@ const Info = styled(Typography)(() => ({
   alignContent: 'space-between',
 }));
 
-export const tagToolTip = (v: string | null): JSX.Element | undefined => {
+export const tagToolTip = (v: string | null | undefined): JSX.Element | undefined => {
   if (v) {
     try {
       const cleanedJson = JSON.parse(v?.replaceAll("'", '"').replaceAll('False', 'false').replaceAll('True', 'true'));
@@ -41,11 +41,14 @@ interface MetaToolTipProps {
 export const MetaToolTip: React.FC<MetaToolTipProps> = ({ meta }: MetaToolTipProps) => {
   return (
     <Info>
-      {meta.map((kv) => (
-        <p style={{ padding: 0, margin: 0 }} key={kv?.k}>
-          <strong>{kv?.k}:</strong> {tagToolTip(kv?.v)} &nbsp;
-        </p>
-      ))}
+      {meta.map(
+        (kv) =>
+          kv && (
+            <p style={{ padding: 0, margin: 0 }} key={kv?.k}>
+              <strong>{kv?.k}:</strong> {tagToolTip(kv?.v)} &nbsp;
+            </p>
+          ),
+      )}
     </Info>
   );
 };
diff --git a/src/components/diagnosticReportView/DiagnosticReportCard.tsx b/src/components/diagnosticReportView/DiagnosticReportCard.tsx
@@ -53,8 +53,8 @@ const Root = styled('div')(() => ({
 interface DiagnosticReportCardProps {
   unifiedInversionSolutions: UnifiedInversionSolution[];
   sweepArgs?: SweepArguments;
-  sweepList?: string[];
-  modelType: string;
+  sweepList?: readonly (string | null)[] | null | undefined;
+  modelType: string | null | undefined;
   generalViews: string[];
   setGeneralViews: (selection: string[]) => void;
   namedFaultsView: string;
@@ -215,7 +215,7 @@ const DiagnosticReportCard: React.FC<DiagnosticReportCardProps> = ({
     return () => window.removeEventListener('keyup', hotkeyHandler);
   });
 
-  if (!unifiedInversionSolutions[currentImage]) {
+  if (!unifiedInversionSolutions[currentImage] || !unifiedInversionSolutions[currentImage].solution.id) {
     return <Typography> There are no valid reports to show. </Typography>;
   }
 
@@ -225,7 +225,7 @@ const DiagnosticReportCard: React.FC<DiagnosticReportCardProps> = ({
         return (
           <DiagnosticReportTabPanel value={currentTab} index={0}>
             <GeneralView
-              id={unifiedInversionSolutions[currentImage].solution.id}
+              id={unifiedInversionSolutions[currentImage].solution.id || ''}
               mfdTableId={unifiedInversionSolutions[currentImage].solution.mfdTableId as string}
               meta={unifiedInversionSolutions[currentImage].solution.meta}
               filteredMeta={filteredMeta}
@@ -241,7 +241,7 @@ const DiagnosticReportCard: React.FC<DiagnosticReportCardProps> = ({
         return (
           <DiagnosticReportTabPanel value={currentTab} index={1}>
             <RegionalMfdView
-              id={unifiedInversionSolutions[currentImage].solution.id}
+              id={unifiedInversionSolutions[currentImage].solution.id || ''}
               regionalViews={regionalViews}
               setRegionalViews={setRegionalViews}
               nonRegionalViews={nonRegionalViews}
@@ -254,7 +254,7 @@ const DiagnosticReportCard: React.FC<DiagnosticReportCardProps> = ({
         return (
           <DiagnosticReportTabPanel value={currentTab} index={2}>
             <NamedFaultsView
-              id={unifiedInversionSolutions[currentImage].solution.id}
+              id={unifiedInversionSolutions[currentImage].solution.id || ''}
               namedFaultsView={namedFaultsView}
               setNamedFaultsView={setNamedFaultsView}
               namedFaultsLocations={namedFaultsLocations}
@@ -267,7 +267,7 @@ const DiagnosticReportCard: React.FC<DiagnosticReportCardProps> = ({
         return (
           <DiagnosticReportTabPanel value={currentTab} index={3}>
             <ParentFaultView
-              id={unifiedInversionSolutions[currentImage].solution.id}
+              id={unifiedInversionSolutions[currentImage].solution.id || ''}
               parentFaultViews={parentFaultViews}
               setParentFaultViews={setParentFaultViews}
               parentFault={parentFault}
@@ -292,7 +292,7 @@ const DiagnosticReportCard: React.FC<DiagnosticReportCardProps> = ({
         return (
           <DiagnosticReportTabPanel value={currentTab} index={5}>
             <SolutionAnalysisTab
-              id={unifiedInversionSolutions[currentImage].solution.id}
+              id={unifiedInversionSolutions[currentImage].solution.id || ''}
               setDisableHotkey={setDisableHotkey}
             />
           </DiagnosticReportTabPanel>
@@ -326,8 +326,8 @@ const DiagnosticReportCard: React.FC<DiagnosticReportCardProps> = ({
           </h4>
           <MetaToolTip meta={filteredMeta} />
           <FlipChartControls
-            id={unifiedInversionSolutions[currentImage].solution.id}
-            producedBy={unifiedInversionSolutions[currentImage].id}
+            id={unifiedInversionSolutions[currentImage].solution.id || ''}
+            producedBy={unifiedInversionSolutions[currentImage].id || ''}
             currentImage={currentImage}
             handlePrev={prevImage}
             handleNext={nextImage}

diff --git a/src/components/generalTask/InversionSolutionDiagnosticContainer.tsx b/src/components/generalTask/InversionSolutionDiagnosticContainer.tsx
@@ -186,16 +186,22 @@ export const inversionSolutionDiagnosticContainerQuery = graphql`
                 }
               }
               inversion_solution {
-                id
-                file_name
-                mfd_table_id
-                meta {
-                  k
-                  v
+                ... on Node {
+                  id
                 }
-                tables {
-                  table_id
-                  table_type
+                ... on FileInterface {
+                  file_name
+                  meta {
+                    k
+                    v
+                  }
+                }
+                ... on InversionSolutionInterface {
+                  mfd_table_id
+                  tables {
+                    table_id
+                    table_type
+                  }
                 }
               }
             }