Fix Lucene search not working & update tests

- Fix search not working when Lucene search mode selected - Update tests to reflect URL params chhanges
ral-facilities · Aug 31, 2023 · 19743c0 · 19743c0
1 parent dfab365
commit 19743c0
Show file tree

Hide file tree

Showing 35 changed files with 113 additions and 93 deletions.
diff --git a/packages/datagateway-common/src/api/index.test.tsx b/packages/datagateway-common/src/api/index.test.tsx
@@ -395,7 +395,7 @@ describe('generic api functions', () => {
         });
 
         expect(pushSpy).toHaveBeenCalledWith({
-          search: '?semanticSearch=false',
+          search: '?',
         });
       });
     });
@@ -435,7 +435,7 @@ describe('generic api functions', () => {
         });
 
         expect(pushSpy).toHaveBeenCalledWith({
-          search: '?semanticSearch=false',
+          search: '?',
         });
       });
     });
@@ -481,7 +481,7 @@ describe('generic api functions', () => {
         });
 
         expect(pushSpy).toHaveBeenCalledWith({
-          search: '?semanticSearch=false',
+          search: '?',
         });
       });
     });
@@ -643,7 +643,7 @@ describe('generic api functions', () => {
 
         expect(replaceSpy).toHaveBeenCalledWith({
           search:
-            '?semanticSearch=false&filters=%7B%22name%22%3A%7B%22value%22%3A%22test%22%2C%22type%22%3A%22include%22%7D%2C%22title%22%3A%7B%22value%22%3A%22test2%22%2C%22type%22%3A%22include%22%7D%7D',
+            '?filters=%7B%22name%22%3A%7B%22value%22%3A%22test%22%2C%22type%22%3A%22include%22%7D%2C%22title%22%3A%7B%22value%22%3A%22test2%22%2C%22type%22%3A%22include%22%7D%7D',
         });
       });
 
@@ -665,7 +665,7 @@ describe('generic api functions', () => {
         });
 
         expect(replaceSpy).toHaveBeenCalledWith({
-          search: '?semanticSearch=false&sort=%7B%22name%22%3A%22asc%22%7D',
+          search: '?sort=%7B%22name%22%3A%22asc%22%7D',
         });
       });
 
@@ -794,7 +794,7 @@ describe('generic api functions', () => {
           result.current(null);
         });
 
-        expect(pushSpy).toHaveBeenLastCalledWith('?semanticSearch=false');
+        expect(pushSpy).toHaveBeenLastCalledWith('?');
       });
     });
 
@@ -822,7 +822,7 @@ describe('generic api functions', () => {
           result.current(null);
         });
 
-        expect(pushSpy).toHaveBeenLastCalledWith('?semanticSearch=false');
+        expect(pushSpy).toHaveBeenLastCalledWith('?');
       });
     });
   });

diff --git a/packages/datagateway-dataview/cypress/e2e/table/pageContainer.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/pageContainer.cy.ts
@@ -26,7 +26,7 @@ describe('PageContainer Component', () => {
       cy.get('[aria-rowindex="1"] [aria-colindex="4"]').contains('24');
 
       cy.get('[data-testid="clear-filters-button"]').click();
-      cy.url().should('eq', `${url}?semanticSearch=false`);
+      cy.url().should('eq', `${url}?`);
     });
   });
 

diff --git a/packages/datagateway-dataview/src/page/pageContainer.component.test.tsx b/packages/datagateway-dataview/src/page/pageContainer.component.test.tsx
@@ -244,7 +244,7 @@ describe('PageContainer - Tests', () => {
     expect(
       await screen.findByRole('button', { name: 'app.clear_filters' })
     ).toBeDisabled();
-    expect(history.location.search).toEqual('?semanticSearch=false');
+    expect(history.location.search).toEqual('?');
   });
 
   it('display clear filters button and clear for filters onClick (/my-data/DLS)', async () => {

diff --git a/packages/datagateway-dataview/src/views/card/datasetCardView.component.test.tsx b/packages/datagateway-dataview/src/views/card/datasetCardView.component.test.tsx
@@ -198,7 +198,7 @@ describe('Dataset - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('updates filter query params on date filter', async () => {
@@ -223,7 +223,7 @@ describe('Dataset - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });

diff --git a/packages/datagateway-dataview/src/views/card/dls/dlsDatasetsCardView.component.test.tsx b/packages/datagateway-dataview/src/views/card/dls/dlsDatasetsCardView.component.test.tsx
@@ -111,7 +111,7 @@ describe('DLS Datasets - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('updates filter query params on date filter', async () => {
@@ -136,7 +136,7 @@ describe('DLS Datasets - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });

diff --git a/packages/datagateway-dataview/src/views/card/dls/dlsProposalsCardView.component.test.tsx b/packages/datagateway-dataview/src/views/card/dls/dlsProposalsCardView.component.test.tsx
@@ -100,21 +100,21 @@ describe('DLS Proposals - Card View', () => {
     await user.type(filter, 'test');
 
     expect(history.location.search).toBe(
-      `?semanticSearch=false&filters=${encodeURIComponent(
+      `?filters=${encodeURIComponent(
         '{"title":{"value":"test","type":"include"}}'
       )}`
     );
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('uses default sort', () => {
     renderComponent();
     expect(history.length).toBe(1);
     expect(history.location.search).toBe(
-      `?semanticSearch=false&sort=${encodeURIComponent('{"title":"asc"}')}`
+      `?sort=${encodeURIComponent('{"title":"asc"}')}`
     );
   });
 

diff --git a/packages/datagateway-dataview/src/views/card/dls/dlsVisitsCardView.component.test.tsx b/packages/datagateway-dataview/src/views/card/dls/dlsVisitsCardView.component.test.tsx
@@ -114,7 +114,7 @@ describe('DLS Visits - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('updates filter query params on date filter', async () => {
@@ -139,7 +139,7 @@ describe('DLS Visits - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });

diff --git a/packages/datagateway-dataview/src/views/card/investigationCardView.component.test.tsx b/packages/datagateway-dataview/src/views/card/investigationCardView.component.test.tsx
@@ -244,7 +244,7 @@ describe('Investigation - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('updates filter query params on date filter', async () => {
@@ -268,7 +268,7 @@ describe('Investigation - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });

diff --git a/.../datagateway-dataview/src/views/card/isis/isisDataPublicationsCardView.component.test.tsx b/.../datagateway-dataview/src/views/card/isis/isisDataPublicationsCardView.component.test.tsx
@@ -154,14 +154,14 @@ describe('ISIS Data Publication - Card View', () => {
     await user.type(filter, 'Test');
 
     expect(history.location.search).toBe(
-      `?semanticSearch=false&filters=${encodeURIComponent(
+      `?filters=${encodeURIComponent(
         '{"title":{"value":"Test","type":"include"}}'
       )}`
     );
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     jest.useRealTimers();
   });
@@ -183,13 +183,13 @@ describe('ISIS Data Publication - Card View', () => {
 
     await user.type(filterInput, '2019-08-06');
     expect(history.location.search).toBe(
-      `?semanticSearch=false&filters=${encodeURIComponent(
+      `?filters=${encodeURIComponent(
         '{"publicationDate":{"endDate":"2019-08-06"}}'
       )}`
     );
 
     await user.clear(filterInput);
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });
@@ -206,7 +206,7 @@ describe('ISIS Data Publication - Card View', () => {
     );
 
     expect(history.location.search).toBe(
-      `?semanticSearch=false&sort=${encodeURIComponent('{"title":"asc"}')}`
+      `?sort=${encodeURIComponent('{"title":"asc"}')}`
     );
   });
 });
diff --git a/packages/datagateway-dataview/src/views/card/isis/isisDatasetsCardView.component.test.tsx b/packages/datagateway-dataview/src/views/card/isis/isisDatasetsCardView.component.test.tsx
@@ -146,7 +146,7 @@ describe('ISIS Datasets - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('updates filter query params on date filter', async () => {
@@ -171,7 +171,7 @@ describe('ISIS Datasets - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });

diff --git a/...es/datagateway-dataview/src/views/card/isis/isisFacilityCyclesCardView.component.test.tsx b/...es/datagateway-dataview/src/views/card/isis/isisFacilityCyclesCardView.component.test.tsx
@@ -111,7 +111,7 @@ describe('ISIS Facility Cycles - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('updates filter query params on date filter', async () => {
@@ -136,7 +136,7 @@ describe('ISIS Facility Cycles - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });

diff --git a/packages/datagateway-dataview/src/views/card/isis/isisInstrumentsCardView.component.test.tsx b/packages/datagateway-dataview/src/views/card/isis/isisInstrumentsCardView.component.test.tsx
@@ -129,7 +129,7 @@ describe('ISIS Instruments - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('uses default sort', () => {

diff --git a/...es/datagateway-dataview/src/views/card/isis/isisInvestigationsCardView.component.test.tsx b/...es/datagateway-dataview/src/views/card/isis/isisInvestigationsCardView.component.test.tsx
@@ -263,7 +263,7 @@ describe('ISIS Investigations - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('updates filter query params on date filter', async () => {
@@ -288,7 +288,7 @@ describe('ISIS Investigations - Card View', () => {
 
     await user.clear(filter);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });

diff --git a/packages/datagateway-dataview/src/views/table/datafileTable.component.test.tsx b/packages/datagateway-dataview/src/views/table/datafileTable.component.test.tsx
@@ -227,7 +227,7 @@ describe('Datafile table component', () => {
     await user.clear(filterInput);
 
     expect(history.length).toBe(6);
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
   it('updates filter query params on date filter', async () => {
     applyDatePickerWorkaround();
@@ -248,7 +248,7 @@ describe('Datafile table component', () => {
     await user.clear(filterInput);
 
     expect(history.length).toBe(3);
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });

diff --git a/packages/datagateway-dataview/src/views/table/datasetTable.component.test.tsx b/packages/datagateway-dataview/src/views/table/datasetTable.component.test.tsx
@@ -235,7 +235,7 @@ describe('Dataset table component', () => {
     await user.clear(filterInput);
 
     expect(history.length).toBe(6);
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('updates filter query params on date filter', async () => {
@@ -257,7 +257,7 @@ describe('Dataset table component', () => {
     await user.clear(filterInput);
 
     expect(history.length).toBe(3);
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });

diff --git a/packages/datagateway-dataview/src/views/table/dls/dlsDatafilesTable.component.test.tsx b/packages/datagateway-dataview/src/views/table/dls/dlsDatafilesTable.component.test.tsx
@@ -193,7 +193,7 @@ describe('DLS datafiles table component', () => {
     await user.clear(filterInput);
 
     expect(history.length).toBe(6);
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('updates filter query params on date filter', async () => {
@@ -217,7 +217,7 @@ describe('DLS datafiles table component', () => {
     await user.clear(filterInput);
 
     expect(history.length).toBe(3);
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });
@@ -239,7 +239,7 @@ describe('DLS datafiles table component', () => {
 
     expect(history.length).toBe(2);
     expect(history.location.search).toBe(
-      `?semanticSearch=false&sort=${encodeURIComponent('{"name":"asc"}')}`
+      `?sort=${encodeURIComponent('{"name":"asc"}')}`
     );
   });
 

diff --git a/packages/datagateway-dataview/src/views/table/dls/dlsDatasetsTable.component.test.tsx b/packages/datagateway-dataview/src/views/table/dls/dlsDatasetsTable.component.test.tsx
@@ -198,7 +198,7 @@ describe('DLS Dataset table component', () => {
     await user.clear(filterInput);
 
     expect(history.length).toBe(6);
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('updates filter query params on date filter', async () => {
@@ -220,7 +220,7 @@ describe('DLS Dataset table component', () => {
     await user.clear(filterInput);
 
     expect(history.length).toBe(3);
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });

diff --git a/packages/datagateway-dataview/src/views/table/dls/dlsMyDataTable.component.test.tsx b/packages/datagateway-dataview/src/views/table/dls/dlsMyDataTable.component.test.tsx
@@ -226,7 +226,7 @@ describe('DLS MyData table component', () => {
 
     await user.clear(filterInput);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('updates filter query params on date filter', async () => {
@@ -246,7 +246,7 @@ describe('DLS MyData table component', () => {
 
     await user.clear(filterInput);
 
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
 
     cleanupDatePickerWorkaround();
   });

diff --git a/packages/datagateway-dataview/src/views/table/dls/dlsProposalsTable.component.test.tsx b/packages/datagateway-dataview/src/views/table/dls/dlsProposalsTable.component.test.tsx
@@ -163,7 +163,7 @@ describe('DLS Proposals table component', () => {
     await user.clear(filterInput);
 
     expect(history.length).toBe(6);
-    expect(history.location.search).toBe('?semanticSearch=false');
+    expect(history.location.search).toBe('?');
   });
 
   it('uses default sort', () => {