diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index b9e6cdf16..e41d1f296 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4 - name: Setup Node.js uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4 @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4 - name: Setup Node.js uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4 @@ -63,7 +63,7 @@ jobs: - name: Upload Cypress screenshots if: failure() - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4 with: name: Inventory management system Screenshots path: cypress/screenshots @@ -74,7 +74,7 @@ jobs: steps: - name: Clone api repo - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 with: repository: ral-facilities/inventory-management-system-api ref: develop @@ -120,7 +120,7 @@ jobs: harbor.stfc.ac.uk/inventory-management-system/ims-api:develop - name: Checkout repo - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4 - name: Setup Node.js uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4 @@ -146,7 +146,7 @@ jobs: - name: Upload Cypress screenshots if: failure() - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4 with: name: Inventory management system (with api) Screenshots path: cypress/screenshots diff --git a/package.json b/package.json index 4e4653821..fede1fd45 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "axios": "^1.7.2", "browserslist": "^4.23.0", "browserslist-to-esbuild": "^2.1.1", - "date-fns": "3.6.0", + "date-fns": "4.1.0", "history": "^5.3.0", "loglevel": "^1.9.1", "lz-string": "^1.5.0", @@ -67,10 +67,10 @@ ], "packageManager": "yarn@4.5.0", "devDependencies": { - "@babel/eslint-parser": "7.25.1", + "@babel/eslint-parser": "7.25.8", "@eslint/compat": "1.1.1", - "@eslint/js": "9.10.0", - "@tanstack/eslint-plugin-query": "5.53.0", + "@eslint/js": "9.12.0", + "@tanstack/eslint-plugin-query": "5.59.7", "@testing-library/cypress": "10.0.2", "@testing-library/dom": "10.4.0", "@testing-library/jest-dom": "6.5.0", @@ -81,15 +81,15 @@ "@types/react-router-dom": "5.3.3", "@vitest/coverage-v8": "2.1.1", "cross-env": "7.0.3", - "cypress": "13.14.2", - "eslint": "9.10.0", + "cypress": "13.15.0", + "eslint": "9.12.0", "eslint-config-prettier": "9.1.0", - "eslint-plugin-cypress": "3.5.0", + "eslint-plugin-cypress": "4.0.0", "eslint-plugin-jsx-a11y": "6.10.0", "eslint-plugin-no-only-tests": "3.3.0", "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-react": "7.36.1", - "eslint-plugin-react-hooks": "4.6.2", + "eslint-plugin-react": "7.37.1", + "eslint-plugin-react-hooks": "5.0.0", "eslint-plugin-testing-library": "6.3.0", "express": "4.21.0", "globals": "15.9.0", @@ -98,7 +98,7 @@ "serve": "14.2.3", "serve-static": "1.16.2", "start-server-and-test": "2.0.8", - "typescript-eslint": "8.5.0", + "typescript-eslint": "8.8.1", "vitest": "2.1.1" }, "msw": { diff --git a/src/admin/units/units.component.tsx b/src/admin/units/units.component.tsx index 74d8621eb..e85ee325f 100644 --- a/src/admin/units/units.component.tsx +++ b/src/admin/units/units.component.tsx @@ -55,6 +55,7 @@ function Units() { accessorFn: (row) => new Date(row.modified_time), id: 'modified_time', filterVariant: 'datetime-range', + filterFn: 'betweenInclusive', size: 350, enableGrouping: false, Cell: ({ row }) => @@ -66,6 +67,7 @@ function Units() { accessorFn: (row) => new Date(row.created_time), id: 'created_time', filterVariant: 'datetime-range', + filterFn: 'betweenInclusive', size: 350, enableGrouping: false, enableHiding: true, diff --git a/src/admin/usageStatuses/__snapshots__/usageStatuses.component.test.tsx.snap b/src/admin/usageStatuses/__snapshots__/usageStatuses.component.test.tsx.snap index b3c9d9fa2..f53ccd264 100644 --- a/src/admin/usageStatuses/__snapshots__/usageStatuses.component.test.tsx.snap +++ b/src/admin/usageStatuses/__snapshots__/usageStatuses.component.test.tsx.snap @@ -364,13 +364,50 @@ exports[`Usage statuses > renders table correctly 1`] = ` class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-jk1t0h-MuiFormControl-root-MuiTextField-root" >
+
+ + ​ + + + + +
renders table correctly 1`] = `
+

+ +

@@ -527,14 +572,51 @@ exports[`Usage statuses > renders table correctly 1`] = ` class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-1blq8rz-MuiFormControl-root-MuiTextField-root" >
+
+ + ​ + + + + +
renders table correctly 1`] = `
+

+ +

renders table correctly 1`] = ` aria-label="Max" autocomplete="new-password" class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedEnd css-929hxt-MuiInputBase-input-MuiInput-input" - id=":re:" + id=":rg:" inputmode="text" placeholder="Max" title="Max" @@ -733,14 +823,51 @@ exports[`Usage statuses > renders table correctly 1`] = ` class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-1blq8rz-MuiFormControl-root-MuiTextField-root" >
+
+ + ​ + + + + +
renders table correctly 1`] = `
+

+ +

renders table correctly 1`] = ` aria-label="Max" autocomplete="new-password" class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedEnd css-929hxt-MuiInputBase-input-MuiInput-input" - id=":rl:" + id=":ro:" inputmode="text" placeholder="Max" title="Max" @@ -1180,7 +1315,7 @@ exports[`Usage statuses > renders table correctly 1`] = ` class="MuiInputBase-root MuiInput-root MuiInputBase-colorPrimary css-1mmm5cp-MuiInputBase-root-MuiInput-root-MuiSelect-root" >