#1152 - fix handling of string ID from lucene

this fixes the ability to select/deselect items
ral-facilities · Oct 3, 2023 · c0298fd · c0298fd
1 parent 0193e68
commit c0298fd
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 10 deletions.
diff --git a/packages/datagateway-common/src/api/lucene.tsx b/packages/datagateway-common/src/api/lucene.tsx
@@ -74,7 +74,7 @@ interface RangeRequest {
 export interface SearchResult {
   id: number;
   score: number;
-  source: SearchResultSource;
+  source: Omit<SearchResultSource, 'id'> & { id: string }; // TODO: if patrick fixes the string issue, revert this
 }
 
 interface RangeFacetResponse {

diff --git a/packages/datagateway-common/src/app.types.tsx b/packages/datagateway-common/src/app.types.tsx
@@ -304,7 +304,7 @@ export interface SearchFacilityCycleSource {
 }
 
 export interface SearchResultSource {
-  id: number;
+  id: number; // TODO: if patrick doesn't fix the string issue, set this to string and fix the typing issues
   name: string;
   title?: string;
   visitId?: string;

diff --git a/packages/datagateway-search/src/card/datasetSearchCardView.component.tsx b/packages/datagateway-search/src/card/datasetSearchCardView.component.tsx
@@ -120,7 +120,12 @@ const DatasetCardView = (props: DatasetCardViewProps): React.ReactElement => {
   });
 
   function mapSource(response: SearchResponse): SearchResultSource[] {
-    return response.results?.map((result) => result.source) ?? [];
+    return (
+      response.results?.map((result) => ({
+        ...result.source,
+        id: result.id,
+      })) ?? []
+    );
   }
 
   function mapIds(response: SearchResponse): number[] {

diff --git a/packages/datagateway-search/src/card/investigationSearchCardView.component.tsx b/packages/datagateway-search/src/card/investigationSearchCardView.component.tsx
@@ -124,7 +124,12 @@ const InvestigationCardView = (
     );
 
   function mapSource(response: SearchResponse): SearchResultSource[] {
-    return response.results?.map((result) => result.source) ?? [];
+    return (
+      response.results?.map((result) => ({
+        ...result.source,
+        id: result.id,
+      })) ?? []
+    );
   }
 
   function mapIds(response: SearchResponse): number[] {

diff --git a/packages/datagateway-search/src/table/datafileSearchTable.component.tsx b/packages/datagateway-search/src/table/datafileSearchTable.component.tsx
@@ -105,7 +105,12 @@ const DatafileSearchTable = (
   });
 
   function mapSource(response: SearchResponse): SearchResultSource[] {
-    return response.results?.map((result) => result.source) ?? [];
+    return (
+      response.results?.map((result) => ({
+        ...result.source,
+        id: result.id,
+      })) ?? []
+    );
   }
 
   function mapIds(response: SearchResponse): number[] {

diff --git a/packages/datagateway-search/src/table/datasetSearchTable.component.tsx b/packages/datagateway-search/src/table/datasetSearchTable.component.tsx
@@ -115,7 +115,12 @@ const DatasetSearchTable = ({
   });
 
   function mapSource(response: SearchResponse): SearchResultSource[] {
-    return response.results?.map((result) => result.source) ?? [];
+    return (
+      response.results?.map((result) => ({
+        ...result.source,
+        id: result.id,
+      })) ?? []
+    );
   }
 
   function mapIds(response: SearchResponse): number[] {

diff --git a/packages/datagateway-search/src/table/investigationSearchTable.component.tsx b/packages/datagateway-search/src/table/investigationSearchTable.component.tsx
@@ -121,7 +121,12 @@ const InvestigationSearchTable = (
   });
 
   function mapSource(response: SearchResponse): SearchResultSource[] {
-    return response.results?.map((result) => result.source) ?? [];
+    return (
+      response.results?.map((result) => ({
+        ...result.source,
+        id: result.id,
+      })) ?? []
+    );
   }
 
   function mapIds(response: SearchResponse): number[] {

diff --git a/packages/datagateway-search/src/testData.ts b/packages/datagateway-search/src/testData.ts
@@ -24,7 +24,7 @@ const mockSearchResponses: SearchResponse[] = [
         score: 1,
         id: 1,
         source: {
-          id: 1,
+          id: '1',
           name: 'Datafile test name',
           location: '/datafiletest',
           fileSize: 1,
@@ -47,7 +47,7 @@ const mockSearchResponses: SearchResponse[] = [
         id: 596,
         score: 269,
         source: {
-          id: 749,
+          id: '749',
           name: 'source 1',
         },
       },
@@ -59,7 +59,7 @@ const mockSearchResponses: SearchResponse[] = [
         id: 916,
         score: 160,
         source: {
-          id: 143,
+          id: '143',
           name: 'source 3',
         },
       },