Feature/401 meta data (#402)

* meta with tag shows for TDIS & SIS; * alias predecessor node ids; remove console logs; * make enum type more clear;
GNS-Science · Jul 26, 2022 · c3a08c9 · c3a08c9
1 parent 40514e7
commit c3a08c9
Show file tree

Hide file tree

Showing 9 changed files with 866 additions and 218 deletions.
diff --git a/src/components/diagnosticReportView/DiagnosticReportCard.tsx b/src/components/diagnosticReportView/DiagnosticReportCard.tsx
@@ -9,7 +9,12 @@ import NamedFaultsView from './NamedFaultsView';
 import RegionalMfdView from './RegionalMfdView';
 import InversionSolutionHazardCharts from '../inversionSolution/InversionSolutionHazardCharts';
 import ParentFaultView from './ParentFaultViews';
-import { SweepArguments, UnifiedInversionSolution, UnifiedInversionSolutionType } from '../../interfaces/generaltask';
+import {
+  SweepArgument,
+  SweepArguments,
+  UnifiedInversionSolution,
+  UnifiedInversionSolutionType,
+} from '../../interfaces/generaltask';
 import { MetaArguments } from '../../interfaces/mySolutions';
 import { filteredMetaGT, filterMetaArguments } from '../../service/diagnosticReports.service';
 import SolutionAnalysisTab from '../inversionSolution/SolutionAnalysisTab';
@@ -152,11 +157,29 @@ const DiagnosticReportCard: React.FC<DiagnosticReportCardProps> = ({
       const hazardTableId = unifiedInversionSolutions[currentImage].solution.hazardId;
       hazardTableId ? setHazardId(hazardTableId) : setHazardId('');
       let metaList: MetaArguments = [];
+
       if (sweepArgs) {
         metaList = filteredMetaGT(unifiedInversionSolutions[currentImage].solution.meta, sweepArgs);
       } else if (sweepList) {
         metaList = filterMetaArguments(unifiedInversionSolutions[currentImage].solution.meta, sweepList);
       }
+
+      if (
+        [
+          UnifiedInversionSolutionType.SCALED_INVERSION_SOLUTION,
+          UnifiedInversionSolutionType.TIME_DEPENDENT_SOLUTION,
+        ].includes(unifiedInversionSolutions[currentImage].type) &&
+        unifiedInversionSolutions[currentImage]?.solution?.source_solution?.meta !== undefined
+      ) {
+        const sourceMeta = unifiedInversionSolutions[currentImage]?.solution?.source_solution?.meta;
+        const sweepArgs: (SweepArgument | null)[] = [];
+        sourceMeta?.map((kv) => {
+          kv?.v && kv?.v.includes('tag') && sweepArgs.push(kv as SweepArgument);
+        });
+        if (sourceMeta !== undefined) {
+          metaList = filteredMetaGT(sourceMeta, sweepArgs as SweepArguments);
+        }
+      }
       setFilteredMeta(metaList);
     }
   }, [currentImage, sweepList, sweepArgs, unifiedInversionSolutions]);

diff --git a/src/components/generalTask/InversionSolutionDiagnosticContainer.tsx b/src/components/generalTask/InversionSolutionDiagnosticContainer.tsx
@@ -110,42 +110,81 @@ export const inversionSolutionDiagnosticContainerQuery = graphql`
                 edges {
                   node {
                     file {
-                      #for ScaledInversionSolutions
+                      __typename
                       ... on ScaledInversionSolution {
                         id
                         meta {
                           k
                           v
                         }
-                        source_solution {
-                          id
-                          meta {
-                            k
-                            v
+                        predecessors {
+                          __typename
+                          pre_id: id
+                          relationship
+                          depth
+                          node {
+                            ... on File {
+                              file_meta: meta {
+                                k
+                                v
+                              }
+                            }
+                            ... on InversionSolution {
+                              is_meta: meta {
+                                k
+                                v
+                              }
+                            }
+                            ... on TimeDependentInversionSolution {
+                              td_meta: meta {
+                                k
+                                v
+                              }
+                            }
                           }
                         }
                       }
-
-                      #for TimeDependent InversionSolutions
                       ... on TimeDependentInversionSolution {
                         id
                         meta {
                           k
                           v
                         }
-                        source_solution {
-                          id
-                          meta {
-                            k
-                            v
+                        predecessors {
+                          __typename
+                          pre_id: id
+                          relationship
+                          depth
+                          node {
+                            ... on File {
+                              file_meta: meta {
+                                k
+                                v
+                              }
+                            }
+                            ... on InversionSolution {
+                              is_meta: meta {
+                                k
+                                v
+                              }
+                            }
+                            ... on TimeDependentInversionSolution {
+                              td_meta: meta {
+                                k
+                                v
+                              }
+                            }
                           }
                         }
                       }
+                      ... on Node {
+                        __isNode: __typename
+                        node_id: id
+                      }
                     }
                   }
                 }
               }
-              #for InversionSolutions
               inversion_solution {
                 id
                 file_name
@@ -160,6 +199,10 @@ export const inversionSolutionDiagnosticContainerQuery = graphql`
                 }
               }
             }
+            ... on Node {
+              __isNode: __typename
+              id
+            }
           }
         }
       }