Merge branch 'upload-images-#1062' into gallery-view-#1081

.github/workflows/ci-build.yml

@@ -159,7 +159,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repo
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - 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@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Login to Harbor
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0

eslint.config.js

@@ -71,15 +71,9 @@ export default tseslint.config(
       ...jsxA11yPlugin.configs.recommended.rules,
     },
   },
-  // eslint-plugin-testing-library doesn't support flat config properly yet
-  // https://github.com/testing-library/eslint-plugin-testing-library/issues/899
   {
     files: ['**/?*test.{js,ts,jsx,tsx}'],
-    plugins: {
-      'testing-library': fixupPluginRules({
-        rules: reactTestingLibraryPlugin.rules,
-      }),
-    },
-    rules: reactTestingLibraryPlugin.configs.react.rules,
+    plugins: reactTestingLibraryPlugin.configs['flat/react'].plugins,
+    rules: reactTestingLibraryPlugin.configs['flat/react'].rules,
   }
 );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inventory-management-system",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "type": "module",
   "private": true,
   "dependencies": {
@@ -103,7 +103,7 @@
     "eslint-plugin-prettier": "5.2.1",
     "eslint-plugin-react": "7.37.1",
     "eslint-plugin-react-hooks": "5.0.0",
-    "eslint-plugin-testing-library": "6.3.0",
+    "eslint-plugin-testing-library": "6.4.0",
     "express": "4.21.0",
     "globals": "15.11.0",
     "jsdom": "25.0.0",

src/catalogue/items/catalogueItemsTable.component.tsx

@@ -457,10 +457,10 @@ const CatalogueItemsTable = (props: CatalogueItemsTableProps) => {
         filterVariant: 'range',
         Cell: ({ row }) => {
           // Logic to get the range slider to work with null values
-          return row.original.catalogueItem.cost_to_rework_gbp === 0
+          return row.original.catalogueItem.days_to_rework === 0
             ? 0
-            : row.original.catalogueItem.cost_to_rework_gbp !== null
-              ? row.original.catalogueItem.cost_to_rework_gbp
+            : row.original.catalogueItem.days_to_rework !== null
+              ? row.original.catalogueItem.days_to_rework
               : '';
         },
         GroupedCell: TableGroupedCell,

src/common/images/imageGallery.component.test.tsx

@@ -64,6 +64,20 @@ describe('Image Gallery', () => {
     };
     user = userEvent.setup();
     axiosGetSpy = vi.spyOn(storageApi, 'get');
+
+    Object.defineProperty(window, 'matchMedia', {
+      writable: true,
+      value: vi.fn().mockImplementation((query) => ({
+        matches: false,
+        media: query,
+        onchange: null,
+        addListener: vi.fn(),
+        removeListener: vi.fn(),
+        addEventListener: vi.fn(),
+        removeEventListener: vi.fn(),
+        dispatchEvent: vi.fn(),
+      })),
+    });
   });
 
   afterEach(() => {

src/common/tab/__snapshots__/tabView.component.test.tsx.snap

@@ -137,7 +137,7 @@ exports[`TabView Component > renders correctly 1`] = `
         </div>
       </div>
       <div
-        class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 css-1idn90j-MuiGrid-root"
+        class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 css-1ol5ri8-MuiGrid-root"
       >
         <div
           aria-labelledby="tab1-tab"

src/setupTests.ts

@@ -23,17 +23,3 @@ window.ResizeObserver = vi.fn().mockImplementation(() => ({
   observe: vi.fn(),
   unobserve: vi.fn(),
 }));
-
-Object.defineProperty(window, 'matchMedia', {
-  writable: true,
-  value: vi.fn().mockImplementation((query) => ({
-    matches: false,
-    media: query,
-    onchange: null,
-    addListener: vi.fn(),
-    removeListener: vi.fn(),
-    addEventListener: vi.fn(),
-    removeEventListener: vi.fn(),
-    dispatchEvent: vi.fn(),
-  })),
-});

src/systems/systemDetails.component.tsx

@@ -93,7 +93,6 @@ function SystemDetails(props: SystemDetailsProps) {
         </Grid>
         {system !== undefined && <SystemDetailsActionMenu system={system} />}
       </Grid>
-      <Grid></Grid>
       <Divider role="presentation" />
       {system === undefined ? (
         <Box