Merge branch 'RSM-3297-rename-equipment-to-infrastructure' of github.…

…com:UoA-eResearch/hub-stack into dev
UoA-eResearch · Mar 5, 2024 · b456139 · b456139
2 parents 92c8e81 + 33f358d
commit b456139
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/research-hub-web/cypress/integration/equipment.e2e.ts b/research-hub-web/cypress/integration/equipment.e2e.ts
@@ -9,7 +9,7 @@ describe('ResearchHubs Equipment Pages', () => {
             }
         });
 
-        cy.visit('equipment/operetta-high-content-imaging-system');
+        cy.visit('infrastructure/operetta-high-content-imaging-system');
 
         cy.wait('@gqlGetEquipmentBySlug');
     });

diff --git a/research-hub-web/src/app/pipes/content-type-display-name.pipe.spec.ts b/research-hub-web/src/app/pipes/content-type-display-name.pipe.spec.ts
@@ -10,7 +10,7 @@ describe('ContentTypeDisplayNamePipe', () => {
   it('Should return correct content display names', () => {
     expect(pipe.transform('article')).toBe('Article');
     expect(pipe.transform('caseStudy')).toBe('Case Study');
-    expect(pipe.transform('equipment')).toBe('Equipment');
+    expect(pipe.transform('equipment')).toBe('Infrastructure');
     expect(pipe.transform('event')).toBe('Event');
     expect(pipe.transform('funding')).toBe('Funding');
     expect(pipe.transform('service')).toBe('Service');

diff --git a/research-hub-web/src/app/pipes/content-type-display-name.pipe.ts b/research-hub-web/src/app/pipes/content-type-display-name.pipe.ts
@@ -5,7 +5,7 @@ export const ContentTypeDisplayNames = {
   'article': 'Article',
   'capability': 'Capability',
   'casestudy': 'Case Study',
-  'equipment': 'Equipment',
+  'equipment': 'Infrastructure',
   'event': 'Event',
   'funding': 'Funding',
   'service': 'Service',

diff --git a/research-hub-web/src/app/routing/routing.ts b/research-hub-web/src/app/routing/routing.ts
@@ -52,7 +52,7 @@ export const appRoutes: Routes = [
         loadChildren: () => import('@components/activities-page/activities-page.module').then((m) => m.ActivitiesPageModule),
       },
       {
-        path: 'equipment',
+        path: 'infrastructure',
         loadChildren: () => import('@components/equipments/equipments.module').then(m => m.EquipmentsModule)
       },
       {

diff --git a/research-hub-web/src/app/services/search.service.ts b/research-hub-web/src/app/services/search.service.ts
@@ -37,7 +37,8 @@ export class SearchService {
             summary: summary,
             slug: element._source.fields.slug["en-US"],
             ssoProtected: element._source.fields.ssoProtected["en-US"],
-            contentType: element._source.sys.contentType.sys.id,
+            contentType: element._source.sys.contentType.sys.id == 'equipment' ?
+            'infrastructure' : element._source.sys.contentType.sys.id,
             chips: element._source.fields.category?.["en-US"].map(x => {
               return { name: x.name, id: x.sys.id };
             })
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ describe('ResearchHubs Equipment Pages', () => { @@
                 }
             });
-            cy.visit('equipment/operetta-high-content-imaging-system');
+            cy.visit('infrastructure/operetta-high-content-imaging-system');
             cy.wait('@gqlGetEquipmentBySlug');
         });
@@ Expand Down @@