Merge branch 'develop' into systems-tree-test-#1272

Author: joshdimanteto

.github/workflows/ci-build.yml

@@ -121,6 +121,9 @@ jobs:
           --env API__ALLOWED_CORS_HEADERS='["*"]' \
           --env API__ALLOWED_CORS_ORIGINS='["*"]' \
           --env API__ALLOWED_CORS_METHODS='["*"]' \
+          --env OBJECT_STORAGE__ENABLED=false \
+          --env OBJECT_STORAGE__API_REQUEST_TIMEOUT_SECONDS=10 \
+          --env OBJECT_STORAGE__API_URL=http://localhost:8002 \
           harbor.stfc.ac.uk/inventory-management-system/ims-api:develop
 
       - name: Checkout repo

Dockerfile

@@ -1,5 +1,5 @@
 # Specify a base image
-FROM node:22.13.0-alpine3.20@sha256:db8dcb90326a0116375414e9a7c068a6b87a4422b7da37b5c6cd026f7c7835d3
+FROM node:22.14.0-alpine3.20@sha256:9bef0ef1e268f60627da9ba7d7605e8831d5b56ad07487d24d1aa386336d1944
 
 # Set the working directory
 WORKDIR /inventory-management-system-run

Dockerfile.prod

@@ -1,7 +1,7 @@
 # Dockerfile to build and serve inventory management system
 
 # Build stage
-FROM node:22.13.0-alpine3.20@sha256:db8dcb90326a0116375414e9a7c068a6b87a4422b7da37b5c6cd026f7c7835d3 as builder
+FROM node:22.14.0-alpine3.20@sha256:9bef0ef1e268f60627da9ba7d7605e8831d5b56ad07487d24d1aa386336d1944 as builder
 
 WORKDIR /inventory-management-system-build
 
@@ -30,7 +30,7 @@ RUN set -eux; \
     yarn build;
 
 # Run stage
-FROM httpd:2.4.62-alpine3.20@sha256:b64b5734fbc0fbb8fb995d5cc29a2ff2d86ed4c83dfd4f4d82d183f2a66daed4
+FROM httpd:2.4.63-alpine3.21@sha256:4aec2953509e2d3aa5a8d73c580a381be44803fd2481875b15d9ad7d2810d7ca
 
 WORKDIR /usr/local/apache2/htdocs
 

cypress/e2e/with_api/catalogueCategories/functions.ts

@@ -1,6 +1,7 @@
 const modifyCatalogueCategory = (
   values: {
     editCatalogueCategoryName?: string;
+    actionsIndex?: number;
     name: string;
     newFormFields?: {
       name: string;
@@ -13,10 +14,15 @@ const modifyCatalogueCategory = (
   },
   ignoreChecks?: boolean
 ) => {
-  if (values.editCatalogueCategoryName) {
-    cy.findByRole('button', {
-      name: `actions ${values.editCatalogueCategoryName} catalogue category button`,
-    }).click();
+  if (
+    values.editCatalogueCategoryName &&
+    typeof values.actionsIndex === 'number'
+  ) {
+    cy.findAllByRole('button', {
+      name: 'Card Actions',
+    })
+      .eq(values.actionsIndex)
+      .click();
 
     cy.findByRole('menuitem', {
       name: `edit ${values.editCatalogueCategoryName} catalogue category button`,
@@ -92,7 +98,10 @@ const modifyCatalogueCategory = (
   }
 
   cy.findByRole('button', { name: 'Save' }).click();
-  if (values.editCatalogueCategoryName)
+  if (
+    values.editCatalogueCategoryName &&
+    typeof values.actionsIndex === 'number'
+  )
     cy.findByRole('button', { name: 'Close' }).click();
   if (!ignoreChecks) {
     cy.findByText(values.name).should('exist');
@@ -116,10 +125,12 @@ const modifyCatalogueCategory = (
   }
 };
 
-const deleteCatalogueCategory = (name: string) => {
-  cy.findByRole('button', {
-    name: `actions ${name} catalogue category button`,
-  }).click();
+const deleteCatalogueCategory = (name: string, actionsIndex: number) => {
+  cy.findAllByRole('button', {
+    name: 'Card Actions',
+  })
+    .eq(actionsIndex)
+    .click();
 
   cy.findByRole('menuitem', {
     name: `delete ${name} catalogue category button`,
@@ -128,10 +139,15 @@ const deleteCatalogueCategory = (name: string) => {
   cy.findByRole('button', { name: 'Continue' }).click();
 };
 
-export const duplicateCatalogueCategory = (name: string) => {
-  cy.findByRole('button', {
-    name: `actions ${name} catalogue category button`,
-  }).click();
+export const duplicateCatalogueCategory = (
+  name: string,
+  actionsIndex: number
+) => {
+  cy.findAllByRole('button', {
+    name: 'Card Actions',
+  })
+    .eq(actionsIndex)
+    .click();
 
   cy.findByRole('menuitem', {
     name: `duplicate ${name} catalogue category button`,
@@ -141,9 +157,11 @@ export const duplicateCatalogueCategory = (name: string) => {
   cy.findByText(`${name}_copy_1`).should('exist');
 };
 
-const copyToCatalogueCategory = (values: { checkedCategories: string[] }) => {
+const copyToCatalogueCategory = (values: {
+  checkedCategories: { name: string; index: number }[];
+}) => {
   for (let i = 0; i < values.checkedCategories.length; i++) {
-    cy.findByLabelText(`${values.checkedCategories[i]} checkbox`).click();
+    cy.findAllByRole('checkbox', { name: 'Toggle select card' }).eq(i).click();
   }
   cy.findByRole('button', { name: 'Copy to' }).click();
   cy.findByRole('button', { name: 'navigate to catalogue home' }).click();
@@ -153,14 +171,17 @@ const copyToCatalogueCategory = (values: { checkedCategories: string[] }) => {
   cy.findByRole('button', { name: 'navigate to catalogue home' }).click();
 
   for (let i = 0; i < values.checkedCategories.length; i++) {
-    cy.findByText(`${values.checkedCategories[i]}`).should('exist');
-    deleteCatalogueCategory(`${values.checkedCategories[i]}`);
+    cy.findByText(`${values.checkedCategories[i].name}`).should('exist');
+    deleteCatalogueCategory(
+      `${values.checkedCategories[i].name}`,
+      values.checkedCategories[i].index
+    );
   }
 };
 
 const moveToCatalogueCategory = (values: { checkedCategories: string[] }) => {
   for (let i = 0; i < values.checkedCategories.length; i++) {
-    cy.findByLabelText(`${values.checkedCategories[i]} checkbox`).click();
+    cy.findAllByRole('checkbox', { name: 'Toggle select card' }).eq(i).click();
   }
   cy.findByRole('button', { name: 'Move to' }).click();
   cy.findByRole('button', { name: 'navigate to catalogue home' }).click();
@@ -224,27 +245,32 @@ export const editCatalogueCategories = () => {
   cy.findByRole('button', { name: 'navigate to catalogue home' }).click();
   modifyCatalogueCategory({
     editCatalogueCategoryName: 'Lenses',
+    actionsIndex: 0,
     name: 'Lenses 2',
   });
 
   cy.findByText('Lenses 2').click();
 
   modifyCatalogueCategory({
     editCatalogueCategoryName: 'Spherical Lenses',
+    actionsIndex: 0,
     name: 'Spherical Lenses 2',
   });
 };
 
 export const duplicateCatalogueCategories = () => {
   cy.findByRole('button', { name: 'navigate to catalogue home' }).click();
-  duplicateCatalogueCategory('Lenses 2');
+  duplicateCatalogueCategory('Lenses 2', 0);
   cy.findByText('Lenses 2').click();
-  duplicateCatalogueCategory('Spherical Lenses 2');
+  duplicateCatalogueCategory('Spherical Lenses 2', 0);
 };
 
 export const copyToCatalogueCategories = () => {
   copyToCatalogueCategory({
-    checkedCategories: ['Spherical Lenses 2', 'Spherical Lenses 2_copy_1'],
+    checkedCategories: [
+      { name: 'Spherical Lenses 2', index: 2 },
+      { name: 'Spherical Lenses 2_copy_1', index: 2 },
+    ],
   });
 };
 
@@ -258,8 +284,8 @@ export const moveToCatalogueCategories = () => {
 
 export const deleteCatalogueCategories = () => {
   cy.findByRole('button', { name: 'navigate to catalogue home' }).click();
-  deleteCatalogueCategory('Spherical Lenses 2');
-  deleteCatalogueCategory('Spherical Lenses 2_copy_1');
-  deleteCatalogueCategory('Lenses 2');
-  deleteCatalogueCategory('Lenses 2_copy_1');
+  deleteCatalogueCategory('Lenses 2', 0);
+  deleteCatalogueCategory('Spherical Lenses 2', 0);
+  deleteCatalogueCategory('Lenses 2_copy_1', 0);
+  deleteCatalogueCategory('Spherical Lenses 2_copy_1', 0);
 };

cypress/e2e/with_api/catalogueItems/catalogueItems.cy.ts

@@ -7,10 +7,10 @@ import { addUnits } from '../units/functions';
 import {
   addCatalogueItem,
   copyToCatalogueItems,
+  duplicateCatalogueItem,
   editCatalogueItem,
   moveToCatalogueItems,
   obsoleteCatalogueItem,
-  duplicateCatalogueItem,
 } from './functions';
 
 describe('catalogue items', () => {
@@ -28,7 +28,7 @@ describe('catalogue items', () => {
     addUnits(['mm', 'nm'], true);
     cy.visit('/catalogue');
     addCatalogueCategories(true);
-    duplicateCatalogueCategory('Spherical Lenses');
+    duplicateCatalogueCategory('Spherical Lenses', 0);
   });
   afterEach(() => {
     cy.clearMocks();

cypress/e2e/with_api/items/functions.ts

@@ -128,7 +128,7 @@ export const editProperty = () => {
   cy.findByRole('button', { name: 'navigate to catalogue home' }).click();
   cy.findByText('Lenses').click();
   cy.findByRole('button', {
-    name: `actions Spherical Lenses catalogue category button`,
+    name: `Card Actions`,
   }).click();
 
   cy.findByRole('menuitem', {
@@ -176,7 +176,7 @@ export const addProperty = () => {
   cy.findByRole('button', { name: 'navigate to catalogue home' }).click();
   cy.findByText('Lenses').click();
   cy.findByRole('button', {
-    name: `actions Spherical Lenses catalogue category button`,
+    name: `Card Actions`,
   }).click();
 
   cy.findByRole('menuitem', {