Merge branch 'rename-maufacturer-api-functions-#674' into RHF-ZOD-Man…

…ufacturers-#663 * rename-maufacturer-api-functions-#674: (23 commits) Omit overridden types #664 Update httpd:2.4.59-alpine3.20 Docker digest to 71f38b7 Update Node.js to 6ce211b changed disabled rpws text to `text.secondary` #507 Point CI API tests back to develop #661 update breadcrumbs snapshot changed tooltip labels to say `details` #507 removed uneeded aria-label in breadcrumbs #507 refactored external links test #689 removed string used for debugging updated snapshots #507 fixed breadcrumbs fastpass issue #507 changed aria-label in overflow tooltip changed obsolete replacement table unselectable item text colour #507 added label to obsolete reason textfield #507 improved colour contrast in cat cat dialog #507 added aria-label to tooltip #507 point at ral-facilities/inventory-management-system-api#294 for the e2e tests Rename catalogue_item_properites to properties #661 added aria label to tooltip in items dialog ...
ral-facilities · Jun 21, 2024 · a30ae93 · a30ae93
2 parents 027aa4e + 3475297
commit a30ae93
Show file tree

Hide file tree

Showing 32 changed files with 220 additions and 251 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Specify a base image
-FROM node:20.14.0-alpine3.20@sha256:66c7d989b6dabba6b4305b88f40912679aebd9f387a5b16ffa76dfb9ae90b060
+FROM node:20.14.0-alpine3.20@sha256:6ce211be2226e86d61413dc19f11cab7ab96205837811c6356881a4157cea0c5
 
 # Set the working directory
 WORKDIR /inventory-management-system-run

diff --git a/Dockerfile.prod b/Dockerfile.prod
@@ -1,7 +1,7 @@
 # Dockerfile to build and serve inventory management system
 
 # Build stage
-FROM node:20.14.0-alpine3.20@sha256:66c7d989b6dabba6b4305b88f40912679aebd9f387a5b16ffa76dfb9ae90b060 as builder
+FROM node:20.14.0-alpine3.20@sha256:6ce211be2226e86d61413dc19f11cab7ab96205837811c6356881a4157cea0c5 as builder
 
 WORKDIR /inventory-management-system-build
 
@@ -30,7 +30,7 @@ RUN set -eux; \
     yarn build;
 
 # Run stage
-FROM httpd:2.4.59-alpine3.20@sha256:554f25b8496f360a58febaaa5df9effb8e037cc1b70b27d40b7353a85e8edbf0
+FROM httpd:2.4.59-alpine3.20@sha256:71f38b7a2394cccbbcfca9a1d17f3a0a03444e98aac8e4bd1616786c27bf6b64
 
 WORKDIR /usr/local/apache2/htdocs
 

diff --git a/cypress/e2e/with_mock_data/catalogueCategories.cy.ts b/cypress/e2e/with_mock_data/catalogueCategories.cy.ts
@@ -292,7 +292,7 @@ describe('Catalogue Category', () => {
         JSON.stringify({
           name: 'test',
           is_leaf: true,
-          catalogue_item_properties: [
+          properties: [
             { name: 'Updated Field 1', type: 'boolean', mandatory: false },
             {
               name: 'Updated Field 2',
@@ -350,7 +350,7 @@ describe('Catalogue Category', () => {
         JSON.stringify({
           name: 'test',
           is_leaf: true,
-          catalogue_item_properties: [
+          properties: [
             { name: 'Updated Field 1', type: 'boolean', mandatory: false },
             {
               name: 'Updated Field 2',
@@ -692,7 +692,7 @@ describe('Catalogue Category', () => {
           parent_id: null,
           code: 'cameras',
           is_leaf: true,
-          catalogue_item_properties: [
+          properties: [
             {
               name: 'Resolution',
               type: 'number',
@@ -806,7 +806,7 @@ describe('Catalogue Category', () => {
           parent_id: '2',
           code: 'cameras',
           is_leaf: true,
-          catalogue_item_properties: [
+          properties: [
             {
               name: 'Resolution',
               type: 'number',

diff --git a/cypress/e2e/with_mock_data/homePage.cy.ts b/cypress/e2e/with_mock_data/homePage.cy.ts
@@ -16,16 +16,12 @@ describe('IMS HomePage', () => {
     cy.url().should('include', '/manufacturers');
     cy.go('back');
 
-    cy.origin('https://www.clf.stfc.ac.uk/Pages/EPAC-Applications.aspx', () => {
-      cy.on('uncaught:exception', () => {
-        return false;
-      });
-    });
-    cy.get('[data-testid="facility-button"]').click();
-    cy.url().should(
-      'equal',
-      'https://www.clf.stfc.ac.uk/Pages/EPAC-Applications.aspx'
-    );
-    cy.go('back');
+    cy.findAllByTestId('facility-button')
+      .first()
+      .should('have.attr', 'href')
+      .should(
+        'include',
+        'https://www.clf.stfc.ac.uk/Pages/EPAC-Applications.aspx'
+      );
   });
 });
diff --git a/src/api/api.types.tsx b/src/api/api.types.tsx
@@ -7,7 +7,7 @@ export interface APIError {
   detail: string;
 }
 
-// Manufacturers
+// ------------------------------------ MANUFACTURERS ------------------------------------
 
 interface Address {
   address_line: string;
@@ -37,7 +37,9 @@ export interface ManufacturerPatch
   id: string;
 }
 
-export interface Manufacturer extends ManufacturerPost, CreatedModifiedMixin {
+export interface Manufacturer
+  extends Omit<ManufacturerPost, 'telephone' | 'url' | 'address'>,
+    CreatedModifiedMixin {
   id: string;
   code: string;
   address: Address;

diff --git a/src/api/catalogueCategories.test.tsx b/src/api/catalogueCategories.test.tsx
@@ -80,7 +80,7 @@ describe('catalogue categories api functions', () => {
         expect(result.current.isSuccess).toBeTruthy();
       });
       expect(result.current.data).toEqual({
-        catalogue_item_properties: [
+        properties: [
           {
             id: '1',
             allowed_values: null,
@@ -253,7 +253,7 @@ describe('catalogue categories api functions', () => {
         parent_id: '1',
         code: 'wavefront-sensors',
         is_leaf: true,
-        catalogue_item_properties: [
+        properties: [
           {
             id: '1',
             name: 'Wavefront Measurement Range',
@@ -277,7 +277,7 @@ describe('catalogue categories api functions', () => {
         parent_id: '1',
         code: 'energy-meters',
         is_leaf: true,
-        catalogue_item_properties: [
+        properties: [
           {
             id: '3',
             name: 'Measurement Range',
@@ -418,7 +418,7 @@ describe('catalogue categories api functions', () => {
         parent_id: '1',
         code: 'wavefront-sensors',
         is_leaf: true,
-        catalogue_item_properties: [
+        properties: [
           {
             id: '1',
             name: 'Wavefront Measurement Range',
@@ -442,7 +442,7 @@ describe('catalogue categories api functions', () => {
         parent_id: '1',
         code: 'energy-meters',
         is_leaf: true,
-        catalogue_item_properties: [
+        properties: [
           {
             id: '3',
             name: 'Measurement Range',

diff --git a/src/api/catalogueItems.test.tsx b/src/api/catalogueItems.test.tsx
@@ -313,7 +313,7 @@ describe('catalogue items api functions', () => {
           name: 'RF Lenses',
           is_leaf: true,
           parent_id: '655ca56c1c251a2a828ca906',
-          catalogue_item_properties: [
+          properties: [
             {
               id: '91',
               name: 'center wavelength',
@@ -446,7 +446,7 @@ describe('catalogue items api functions', () => {
           name: 'RF Lenses',
           is_leaf: true,
           parent_id: '655ca56c1c251a2a828ca906',
-          catalogue_item_properties: [
+          properties: [
             {
               id: '90',
               name: 'center wavelength',

diff --git a/src/api/catalogueItems.tsx b/src/api/catalogueItems.tsx
@@ -255,8 +255,7 @@ export const useCopyToCatalogueItem = (): UseMutationResult<
           // in tests
 
           const targetProperties =
-            copyToCatalogueItem.targetCatalogueCategory
-              ?.catalogue_item_properties;
+            copyToCatalogueItem.targetCatalogueCategory?.properties;
 
           const properties = catalogueItem.properties.map((property) => {
             const targetPropertyId = targetProperties?.find(

diff --git a/src/app.types.tsx b/src/app.types.tsx
@@ -14,12 +14,12 @@ export interface AddCatalogueCategory {
   name: string;
   parent_id?: string | null;
   is_leaf: boolean;
-  catalogue_item_properties?: AddCatalogueCategoryProperty[];
+  properties?: AddCatalogueCategoryProperty[];
 }
 
 export interface AddCatalogueCategoryWithPlacementIds
   extends AddCatalogueCategory {
-  catalogue_item_properties?: AddCatalogueCategoryPropertyWithPlacementIds[];
+  properties?: AddCatalogueCategoryPropertyWithPlacementIds[];
 }
 
 export interface EditCatalogueCategory {
@@ -49,7 +49,7 @@ export interface CatalogueCategory {
   parent_id: string | null;
   code: string;
   is_leaf: boolean;
-  catalogue_item_properties?: CatalogueCategoryProperty[];
+  properties?: CatalogueCategoryProperty[];
   created_time: string;
   modified_time: string;
 }

diff --git a/src/catalogue/category/catalogueCategoryDialog.component.test.tsx b/src/catalogue/category/catalogueCategoryDialog.component.test.tsx
@@ -337,7 +337,7 @@ describe('Catalogue Category Dialog', () => {
       await waitFor(() => user.click(saveButton));
 
       expect(axiosPostSpy).toHaveBeenCalledWith('/v1/catalogue-categories', {
-        catalogue_item_properties: [
+        properties: [
           {
             mandatory: true,
             name: 'radius',
@@ -375,7 +375,7 @@ describe('Catalogue Category Dialog', () => {
       await waitFor(() => user.click(saveButton));
 
       expect(axiosPostSpy).toHaveBeenCalledWith('/v1/catalogue-categories', {
-        catalogue_item_properties: [
+        properties: [
           {
             allowed_values: { type: 'list', values: [1, 2, 8] },
             mandatory: true,
@@ -414,7 +414,7 @@ describe('Catalogue Category Dialog', () => {
       await waitFor(() => user.click(saveButton));
 
       expect(axiosPostSpy).toHaveBeenCalledWith('/v1/catalogue-categories', {
-        catalogue_item_properties: [
+        properties: [
           {
             allowed_values: { type: 'list', values: ['1', '2', '8'] },
             mandatory: true,
@@ -839,7 +839,7 @@ describe('Catalogue Category Dialog', () => {
         parent_id: '1',
         code: 'voltage-meters',
         is_leaf: true,
-        catalogue_item_properties: [
+        properties: [
           {
             id: '1',
             name: 'Measurement Range',
@@ -897,7 +897,7 @@ describe('Catalogue Category Dialog', () => {
 
       expect(axiosPatchSpy).toHaveBeenCalledWith('/v1/catalogue-categories/4', {
         name: 'test2',
-        catalogue_item_properties: undefined,
+        properties: undefined,
       });
 
       expect(onClose).toHaveBeenCalled();
@@ -972,7 +972,7 @@ describe('Catalogue Category Dialog', () => {
       props.selectedCatalogueCategory = {
         ...mockData,
         is_leaf: true,
-        catalogue_item_properties: [
+        properties: [
           {
             id: '1',
             name: 'Field 1',
@@ -1002,7 +1002,7 @@ describe('Catalogue Category Dialog', () => {
       expect(axiosPostSpy).toHaveBeenCalledWith('/v1/catalogue-categories', {
         ...values,
         is_leaf: true,
-        catalogue_item_properties: [
+        properties: [
           {
             name: 'Field 1',
             type: 'text',