Merge branch 'develop' into gfi-1664

ral-facilities · Sep 19, 2024 · 4e34c0c · 4e34c0c
2 parents a424309 + 7ec33f3
commit 4e34c0c
Show file tree

Hide file tree

Showing 27 changed files with 427 additions and 387 deletions.
diff --git a/packages/datagateway-common/package.json b/packages/datagateway-common/package.json
@@ -12,7 +12,7 @@
     "@emotion/styled": "11.11.0",
     "@mui/x-date-pickers": "6.11.2",
     "@types/lodash.debounce": "4.0.6",
-    "axios": "1.6.1",
+    "axios": "1.7.4",
     "connected-react-router": "6.9.1",
     "date-fns": "2.30.0",
     "hex-to-rgba": "2.0.1",

diff --git a/packages/datagateway-common/src/table/columnFilters/textColumnFilter.component.test.tsx b/packages/datagateway-common/src/table/columnFilters/textColumnFilter.component.test.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import TextColumnFilter, {
   usePrincipalExperimenterFilter,
   useTextFilter,
+  DEBOUNCE_DELAY,
 } from './textColumnFilter.component';
 import { act } from 'react-dom/test-utils';
 import { usePushFilter, usePushFilters } from '../../api';
@@ -12,7 +13,6 @@ import userEvent from '@testing-library/user-event';
 
 jest.mock('../../api');
 jest.useFakeTimers('modern');
-const DEBOUNCE_DELAY = 250;
 
 describe('Text filter component', () => {
   let user: UserEvent;

diff --git a/packages/datagateway-common/src/table/columnFilters/textColumnFilter.component.tsx b/packages/datagateway-common/src/table/columnFilters/textColumnFilter.component.tsx
@@ -24,13 +24,12 @@ const TextColumnFilter = (props: {
     propValue ? propValue : ''
   );
   const [type, setType] = React.useState(propType ? propType : 'include');
-
-  // Debounce the updating of the column filter by 250 milliseconds.
+  // Debounce the updating of the column filter by 500 milliseconds.
   const updateValue = React.useMemo(
     () =>
       debounce((value: string) => {
         onChange(value === '' ? null : { value: value, type: type });
-      }, 250),
+      }, DEBOUNCE_DELAY),
     [onChange, type]
   );
 
@@ -129,6 +128,8 @@ const TextColumnFilter = (props: {
   );
 };
 
+export const DEBOUNCE_DELAY = 500;
+
 export default TextColumnFilter;
 
 export const useTextFilter = (

diff --git a/packages/datagateway-dataview/cypress/e2e/card/dls/datasets.cy.ts b/packages/datagateway-dataview/cypress/e2e/card/dls/datasets.cy.ts
@@ -15,18 +15,18 @@ describe('DLS - Datasets Cards', () => {
     cy.get('#datagateway-dataview').should('be.visible');
 
     //Default sort
-    cy.contains('[role="button"]', 'desc').should('exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('be.visible');
+    cy.contains('[role="button"]', 'asc').should('exist');
+    cy.get('.MuiTableSortLabel-iconDirectionAsc').should('be.visible');
   });
 
   it('should be able to click a dataset to see its datafiles', () => {
     cy.get('[data-testid="card"]')
       .first()
-      .contains('DATASET 61')
+      .contains('DATASET 1')
       .click({ force: true });
     cy.location('pathname').should(
       'eq',
-      '/browse/proposal/INVESTIGATION%201/investigation/1/dataset/61/datafile'
+      '/browse/proposal/INVESTIGATION%201/investigation/1/dataset/1/datafile'
     );
   });
 
@@ -38,29 +38,28 @@ describe('DLS - Datasets Cards', () => {
     cy.get('[data-testid="card"]')
       .first()
       .get('[aria-label="card-more-information"]')
-      .contains('DATASET 61');
+      .contains('DATASET 1');
     cy.get('[data-testid="card"]')
       .first()
       .get('[aria-label="card-more-information"]')
-      .contains('1.73 GB', { timeout: 10000 });
+      .contains('1.39 GB', { timeout: 10000 });
 
     cy.get('#dataset-type-tab').click({ force: true });
     cy.get('[data-testid="card"]')
       .first()
       .get('[aria-label="card-more-information"]')
-      .contains('DATASETTYPE 3');
+      .contains('DATASETTYPE 2');
   });
 
   it('should be able to sort by one field or multiple', () => {
-    //Revert the default sort
-    cy.contains('[role="button"]', 'Create Time').as('timeSortButton').click();
+    // Revert the default sort
+    cy.contains('[role="button"]', 'Name').as('nameSortButton').click();
+    cy.get('@nameSortButton').click();
+
     cy.wait('@getDatasetsOrder', { timeout: 10000 });
 
     // ascending
     cy.contains('[role="button"]', 'Name').as('nameSortButton').click();
-    cy.wait('@getDatasetsOrder', {
-      timeout: 10000,
-    });
     cy.contains('[role="button"]', 'asc').should('exist');
     cy.contains('[role="button"]', 'desc').should('not.exist');
     cy.get('[data-testid="card"]').first().contains('DATASET 1');
@@ -81,7 +80,7 @@ describe('DLS - Datasets Cards', () => {
     cy.get('[data-testid="card"]').first().contains('DATASET 1');
 
     // multiple fields (shift click)
-    cy.get('@timeSortButton').click();
+    cy.contains('[role="button"]', 'Create Time').as('timeSortButton').click();
     cy.wait('@getDatasetsOrder', {
       timeout: 10000,
     });

diff --git a/packages/datagateway-dataview/cypress/e2e/card/isis/datasets.cy.ts b/packages/datagateway-dataview/cypress/e2e/card/isis/datasets.cy.ts
@@ -15,26 +15,27 @@ describe('ISIS - Datasets Cards', () => {
     cy.get('#datagateway-dataview').should('be.visible');
 
     //Default sort
-    cy.contains('[role="button"]', 'desc').should('exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('be.visible');
+    cy.contains('[role="button"]', 'asc').should('exist');
+    cy.get('.MuiTableSortLabel-iconDirectionAsc').should('be.visible');
   });
 
   it('should be able to click a dataset to see its datafiles', () => {
     cy.get('[data-testid="card"]')
       .first()
-      .contains('DATASET 79')
+      .contains('DATASET 19')
       .click({ force: true });
     cy.location('pathname').should(
       'eq',
-      '/browse/instrument/1/facilityCycle/19/investigation/19/dataset/79'
+      '/browse/instrument/1/facilityCycle/19/investigation/19/dataset/19'
     );
   });
 
   it('should be able to expand "More Information"', () => {
-    //Revert the default sort
-    cy.contains('[role="button"]', 'Create Time').click();
-    cy.wait('@getDatasetsOrder', { timeout: 10000 });
+    // Revert the default sort
+    cy.contains('[role="button"]', 'Name').as('nameSortButton').click();
+    cy.get('@nameSortButton').click();
 
+    cy.get('[data-testid="card"]').first().contains('DATASET 19');
     cy.get('[data-testid="card"]')
       .first()
       .contains('More Information')
@@ -56,15 +57,14 @@ describe('ISIS - Datasets Cards', () => {
   });
 
   it('should be able to sort by one field or multiple', () => {
-    //Revert the default sort
-    cy.contains('[role="button"]', 'Create Time').as('timeSortButton').click();
+    // Revert the default sort
+    cy.contains('[role="button"]', 'Name').as('nameSortButton').click();
+    cy.get('@nameSortButton').click();
     cy.wait('@getDatasetsOrder', { timeout: 10000 });
 
     // ascending
     cy.contains('[role="button"]', 'Name').as('nameSortButton').click();
-    cy.wait('@getDatasetsOrder', {
-      timeout: 10000,
-    });
+
     cy.contains('[role="button"]', 'asc').should('exist');
     cy.contains('[role="button"]', 'desc').should('not.exist');
     cy.get('[data-testid="card"]').first().contains('DATASET 19');
@@ -85,7 +85,7 @@ describe('ISIS - Datasets Cards', () => {
     cy.get('[data-testid="card"]').first().contains('DATASET 19');
 
     // multiple fields (shift click)
-    cy.get('@timeSortButton').click();
+    cy.contains('[role="button"]', 'Create Time').as('timeSortButton').click();
     cy.wait('@getDatasetsOrder', {
       timeout: 10000,
     });

diff --git a/packages/datagateway-dataview/cypress/e2e/cartSelection.cy.ts b/packages/datagateway-dataview/cypress/e2e/cartSelection.cy.ts
@@ -311,16 +311,16 @@ describe('Add/remove from cart functionality', () => {
           .and('eq', 'true');
 
         cy.get('[aria-label="select row 0"]').should('be.checked');
-        cy.get('[aria-label="select row 1"]').should('not.be.checked');
+        cy.get('[aria-label="select row 2"]').should('not.be.checked');
 
         cy.get('[aria-label="grid"]').scrollTo('bottom', {
           ensureScrollable: false,
         });
         cy.get('[aria-label="grid"]').scrollTo('bottom', {
           ensureScrollable: false,
         });
-        cy.get('[aria-label="select row 13"]').should('not.be.checked');
-        cy.get('[aria-label="select row 14"]').should('be.checked');
+        cy.get('[aria-label="select row 12"]').should('not.be.checked');
+        cy.get('[aria-label="select row 13"]').should('be.checked');
       });
 
       it('by shift clicking', () => {
@@ -467,7 +467,7 @@ describe('Add/remove from cart functionality', () => {
         cy.get('[aria-label="grid"]').scrollTo('bottom', {
           ensureScrollable: false,
         });
-        cy.get('[aria-label="select row 13"]').should('be.checked');
+        cy.get('[aria-label="select row 13"]').should('not.be.checked');
         cy.get('[aria-label="select row 14"]').should('be.checked');
       });
 

diff --git a/packages/datagateway-dataview/cypress/e2e/table/dls/datafiles.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/dls/datafiles.cy.ts
@@ -16,8 +16,8 @@ describe('DLS - Datafiles Table', () => {
     cy.get('#datagateway-dataview').should('be.visible');
 
     //Default sort
-    cy.get('[aria-sort="descending"]').should('exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('be.visible');
+    cy.get('[aria-sort="ascending"]').should('exist');
+    cy.get('.MuiTableSortLabel-iconDirectionAsc').should('be.visible');
   });
 
   it('should not load incorrect URL', () => {
@@ -38,8 +38,9 @@ describe('DLS - Datafiles Table', () => {
   });
 
   it('should be able to sort by all sort directions on single and multiple columns', () => {
-    //Revert the default sort
-    cy.contains('[role="button"]', 'Create Time').as('timeSortButton').click();
+    // Revert the default sort
+    cy.contains('[role="button"]', 'Name').as('nameSortButton').click();
+    cy.get('@nameSortButton').click();
     cy.wait('@datafilesOrder', { timeout: 10000 });
 
     // ascending order
@@ -81,11 +82,9 @@ describe('DLS - Datafiles Table', () => {
     );
 
     // multiple columns (shift click)
-    cy.get('@timeSortButton').click();
+    cy.contains('[role="button"]', 'Create Time').click();
     cy.wait('@datafilesOrder', { timeout: 10000 });
-    cy.contains('[role="button"]', 'Name')
-      .as('nameSortButton')
-      .click({ shiftKey: true });
+    cy.get('@nameSortButton').click({ shiftKey: true });
     cy.wait('@datafilesOrder', { timeout: 10000 });
     cy.get('@nameSortButton').click({ shiftKey: true });
     cy.wait('@datafilesOrder', { timeout: 10000 });
@@ -141,12 +140,12 @@ describe('DLS - Datafiles Table', () => {
 
     cy.get('#details-panel').should('be.visible');
     cy.get('[aria-label="Hide details"]').should('exist');
-    cy.get('#details-panel').contains('Datafile 1607').should('be.visible');
+    cy.get('#details-panel').contains('Datafile 1131').should('be.visible');
 
     cy.get('[aria-label="Show details"]').first().click();
 
-    cy.get('#details-panel').contains('Datafile 1726').should('be.visible');
-    cy.get('#details-panel').contains('Datafile 1607').should('not.exist');
+    cy.get('#details-panel').contains('Datafile 1012').should('be.visible');
+    cy.get('#details-panel').contains('Datafile 1131').should('not.exist');
     cy.get('[aria-label="Hide details"]').should('have.length', 1);
 
     cy.get('[aria-label="Hide details"]').first().click();

diff --git a/packages/datagateway-dataview/cypress/e2e/table/dls/datasets.cy.ts b/packages/datagateway-dataview/cypress/e2e/table/dls/datasets.cy.ts
@@ -21,8 +21,8 @@ describe('DLS - Datasets Table', () => {
     cy.get('#datagateway-dataview').should('be.visible');
 
     //Default sort
-    cy.get('[aria-sort="descending"]').should('exist');
-    cy.get('.MuiTableSortLabel-iconDirectionDesc').should('be.visible');
+    cy.get('[aria-sort="ascending"]').should('exist');
+    cy.get('.MuiTableSortLabel-iconDirectionAsc').should('be.visible');
   });
 
   it('should not load incorrect URL', () => {
@@ -37,7 +37,7 @@ describe('DLS - Datasets Table', () => {
 
     cy.location('pathname').should(
       'eq',
-      '/browse/proposal/INVESTIGATION%201/investigation/1/dataset/61/datafile'
+      '/browse/proposal/INVESTIGATION%201/investigation/1/dataset/1/datafile'
     );
   });
 
@@ -49,11 +49,12 @@ describe('DLS - Datasets Table', () => {
   });
 
   it('should be able to sort by all sort directions on single and multiple columns', () => {
-    //Revert the default sort
-    cy.contains('[role="button"]', 'Create Time').as('timeSortButton').click();
+    // Revert the default sort
+    cy.contains('[role="button"]', 'Name').as('nameSortButton').click();
+    cy.get('@nameSortButton').click();
 
     // ascending order
-    cy.contains('[role="button"]', 'Name').as('nameSortButton').click();
+    cy.get('@nameSortButton').click();
     cy.wait('@datasets', { timeout: 10000 });
 
     cy.get('[aria-sort="ascending"]').should('exist');
@@ -84,7 +85,8 @@ describe('DLS - Datasets Table', () => {
     cy.get('[aria-rowindex="1"] [aria-colindex="3"]').contains('DATASET 1');
 
     // multiple columns (shift click)
-    cy.get('@timeSortButton').click();
+    cy.contains('[role="button"]', 'Create Time').as('timeSortButton').click();
+    // ascending order
     cy.wait('@datasets', { timeout: 10000 });
     cy.get('@nameSortButton').click({ shiftKey: true });
     cy.wait('@datasets', { timeout: 10000 });
@@ -102,8 +104,9 @@ describe('DLS - Datasets Table', () => {
   });
 
   it('should change icons when sorting on a column', () => {
-    // clear the default sort
-    cy.contains('[role="button"]', 'Create Time').click();
+    // clear default sort
+    cy.contains('[role="button"]', 'Name').click();
+    cy.contains('[role="button"]', 'Name').click();
 
     cy.get('[data-testid="SortIcon"]').should('have.length', 5);
 
@@ -145,21 +148,21 @@ describe('DLS - Datasets Table', () => {
 
       cy.get('#details-panel').should('be.visible');
       cy.get('[aria-label="Hide details"]').should('exist');
-      cy.get('#details-panel').contains('DATASET 1').should('be.visible');
+      cy.get('#details-panel').contains('DATASET 61').should('be.visible');
 
       cy.get('[aria-label="Show details"]').first().click();
 
-      cy.get('#details-panel').contains('DATASET 61').should('be.visible');
-      cy.get('#details-panel').contains('DATASET 1').should('not.exist');
+      cy.get('#details-panel').contains('DATASET 1').should('be.visible');
+      cy.get('#details-panel').contains('DATASET 61').should('not.exist');
       cy.get('[aria-label="Hide details"]').should('have.length', 1);
 
       cy.get('#details-panel')
-        .contains('Home down your nice amount successful')
+        .contains('Suggest shake effort many last prepare small')
         .should('be.visible');
 
       cy.get('[aria-controls="dataset-type-panel"]').click();
       cy.get('#dataset-type-panel').should('not.have.attr', 'hidden');
-      cy.get('#details-panel').contains('DATASETTYPE 3');
+      cy.get('#details-panel').contains('DATASETTYPE 2');
 
       cy.get('[aria-label="Hide details"]').first().click();