Merge branch 'develop' into enhance-usage-statuses-filtering-#887

.github/workflows/ci-build.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: 20
           cache: 'yarn'
@@ -35,7 +35,7 @@ jobs:
 
       - name: Upload coverage reports to Codecov
         if: success()
-        uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4
+        uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -48,7 +48,7 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: 20
           cache: 'yarn'
@@ -74,7 +74,7 @@ jobs:
 
     steps:
       - name: Clone api repo
-        uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
         with:
           repository: ral-facilities/inventory-management-system-api
           ref: develop
@@ -123,7 +123,7 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: 20
           cache: 'yarn'
@@ -138,7 +138,7 @@ jobs:
 
       - name: Output docker logs (mongodb)
         if: failure()
-        run: docker logs mongodb_container
+        run: docker logs ims_api_mongodb_container
 
       - name: Output docker logs (api)
         if: failure()
@@ -159,7 +159,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Login to Harbor
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0

.github/workflows/release-build.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Login to Harbor
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0

.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.4.1.cjs
+yarnPath: .yarn/releases/yarn-4.5.0.cjs

cypress/support/commands.ts

@@ -117,7 +117,7 @@ Cypress.Commands.add('findBrowserMockedRequests', ({ method, url }) => {
 declare global {
   interface Window {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    msw: { http: any; worker: any; matchRequestUrl: any };
+    msw: { worker: any; http: any; matchRequestUrl: any };
   }
 }
 

eslint.config.js

@@ -1,7 +1,10 @@
 import { fixupPluginRules } from '@eslint/compat';
 import eslint from '@eslint/js';
+import queryPlugin from '@tanstack/eslint-plugin-query';
 import prettierPlugin from 'eslint-config-prettier';
 import cypressPlugin from 'eslint-plugin-cypress/flat';
+import jsxA11yPlugin from 'eslint-plugin-jsx-a11y';
+import noOnlyTestsPlugin from 'eslint-plugin-no-only-tests';
 import reactPlugin from 'eslint-plugin-react';
 import reactHooksPlugin from 'eslint-plugin-react-hooks';
 import reactTestingLibraryPlugin from 'eslint-plugin-testing-library';
@@ -33,6 +36,9 @@ export default tseslint.config(
       // eslint-plugin-react-hooks doesn't support flat config properly yet
       // https://github.com/facebook/react/issues/28313
       'react-hooks': fixupPluginRules(reactHooksPlugin),
+      '@tanstack/query': queryPlugin,
+      'no-only-tests': noOnlyTestsPlugin,
+      'jsx-a11y': jsxA11yPlugin,
     },
     extends: [
       eslint.configs.recommended,
@@ -60,6 +66,9 @@ export default tseslint.config(
       'react/react-in-jsx-scope': 'off',
       'react/prop-types': 'off',
       ...reactHooksPlugin.configs.recommended.rules,
+      ...queryPlugin.configs.recommended.rules,
+      'no-only-tests/no-only-tests': 'error',
+      ...jsxA11yPlugin.configs.recommended.rules,
     },
   },
   // eslint-plugin-testing-library doesn't support flat config properly yet

package.json

@@ -27,7 +27,7 @@
     "loglevel": "^1.9.1",
     "lz-string": "^1.5.0",
     "material-react-table": "^2.13.0",
-    "msw": "2.4.5",
+    "msw": "2.4.9",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-hook-form": "^7.52.0",
@@ -65,24 +65,28 @@
     "not dead",
     "not op_mini all"
   ],
-  "packageManager": "yarn@4.4.1",
+  "packageManager": "yarn@4.5.0",
   "devDependencies": {
     "@babel/eslint-parser": "7.25.1",
     "@eslint/compat": "1.1.1",
     "@eslint/js": "9.10.0",
+    "@tanstack/eslint-plugin-query": "5.53.0",
     "@testing-library/cypress": "10.0.2",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.5.0",
     "@testing-library/react": "16.0.1",
     "@testing-library/user-event": "14.5.2",
+    "@types/eslint-plugin-jsx-a11y": "6.9.0",
     "@types/eslint__js": "8.42.3",
     "@types/react-router-dom": "5.3.3",
-    "@vitest/coverage-v8": "2.1.0",
+    "@vitest/coverage-v8": "2.1.1",
     "cross-env": "7.0.3",
     "cypress": "13.14.2",
     "eslint": "9.10.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-cypress": "3.5.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",
@@ -93,9 +97,9 @@
     "prettier": "3.3.3",
     "serve": "14.2.3",
     "serve-static": "1.16.2",
-    "start-server-and-test": "2.0.7",
+    "start-server-and-test": "2.0.8",
     "typescript-eslint": "8.5.0",
-    "vitest": "2.1.0"
+    "vitest": "2.1.1"
   },
   "msw": {
     "workerDirectory": "public"

public/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "short_name": "IMS",
+  "name": "Inventory Management System",
   "icons": [
     {
       "src": "favicon.ico",

public/mockServiceWorker.js

@@ -8,7 +8,7 @@
  * - Please do NOT serve this file on production.
  */
 
-const PACKAGE_VERSION = '2.4.5'
+const PACKAGE_VERSION = '2.4.9'
 const INTEGRITY_CHECKSUM = '26357c79639bfa20d64c0efca2a87423'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()

src/mocks/browser.ts

@@ -3,8 +3,8 @@ import { setupWorker } from 'msw/browser';
 import { handlers } from './handlers';
 
 // This configures a Service Worker with the given request handlers.
-
 export const worker = setupWorker(...handlers);
+
 // Make the `worker` and `http` references available globally,
 // so they can be accessed in both runtime and test suites.
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment