Fix datafileSearch investigationfacilitycycle and new facet requests #…

…1152
ral-facilities · Sep 28, 2023 · 0193e68 · 0193e68
1 parent 1547842
commit 0193e68
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 6 deletions.
diff --git a/packages/datagateway-search/src/card/datasetSearchCardView.component.tsx b/packages/datagateway-search/src/card/datasetSearchCardView.component.tsx
@@ -89,7 +89,17 @@ const DatasetCardView = (props: DatasetCardViewProps): React.ReactElement => {
         minCount: minNumResults,
         maxCount: maxNumResults,
         restrict,
-        facets: [{ target: 'Dataset' }],
+        facets: [
+          { target: 'Dataset' },
+          {
+            target: 'DatasetParameter',
+            dimensions: [{ dimension: 'type.name' }],
+          },
+          {
+            target: 'InvestigationInstrument',
+            dimensions: [{ dimension: 'instrument.name' }],
+          },
+        ],
       },
       filters
     );

diff --git a/packages/datagateway-search/src/card/investigationSearchCardView.component.tsx b/packages/datagateway-search/src/card/investigationSearchCardView.component.tsx
@@ -112,7 +112,11 @@ const InvestigationCardView = (
           },
           {
             target: 'Sample',
-            dimensions: [{ dimension: 'type.name' }],
+            dimensions: [{ dimension: 'sample.type.name' }],
+          },
+          {
+            target: 'InvestigationInstrument',
+            dimensions: [{ dimension: 'instrument.name' }],
           },
         ],
       },

diff --git a/packages/datagateway-search/src/table/datafileSearchTable.component.tsx b/packages/datagateway-search/src/table/datafileSearchTable.component.tsx
@@ -80,6 +80,10 @@ const DatafileSearchTable = (
             target: 'DatafileParameter',
             dimensions: [{ dimension: 'type.name' }],
           },
+          {
+            target: 'InvestigationInstrument',
+            dimensions: [{ dimension: 'instrument.name' }],
+          },
         ],
       },
       filters,
@@ -190,7 +194,7 @@ const DatafileSearchTable = (
                 instrumentId:
                   datafileData.investigationinstrument?.[0]?.['instrument.id'],
                 facilityCycleId:
-                  datafileData.investigationfacilitycycle?.[0][
+                  datafileData.investigationfacilitycycle?.[0]?.[
                     'facilityCycle.id'
                   ],
               },
@@ -239,7 +243,7 @@ const DatafileSearchTable = (
               instrumentId:
                 datafileData.investigationinstrument?.[0]?.['instrument.id'],
               facilityCycleId:
-                datafileData.investigationfacilitycycle?.[0][
+                datafileData.investigationfacilitycycle?.[0]?.[
                   'facilityCycle.id'
                 ],
             },

diff --git a/packages/datagateway-search/src/table/datasetSearchTable.component.tsx b/packages/datagateway-search/src/table/datasetSearchTable.component.tsx
@@ -75,7 +75,17 @@ const DatasetSearchTable = ({
         minCount: minNumResults,
         maxCount: maxNumResults,
         restrict,
-        facets: [{ target: 'Dataset' }],
+        facets: [
+          { target: 'Dataset' },
+          {
+            target: 'DatasetParameter',
+            dimensions: [{ dimension: 'type.name' }],
+          },
+          {
+            target: 'InvestigationInstrument',
+            dimensions: [{ dimension: 'instrument.name' }],
+          },
+        ],
       },
       filters,
       { enabled: dataset }

diff --git a/packages/datagateway-search/src/table/investigationSearchTable.component.tsx b/packages/datagateway-search/src/table/investigationSearchTable.component.tsx
@@ -88,7 +88,11 @@ const InvestigationSearchTable = (
           },
           {
             target: 'Sample',
-            dimensions: [{ dimension: 'type.name' }],
+            dimensions: [{ dimension: 'sample.type.name' }],
+          },
+          {
+            target: 'InvestigationInstrument',
+            dimensions: [{ dimension: 'instrument.name' }],
           },
         ],
       },