Merge pull request #450 from UoA-eResearch/rc2.8.7

Rc2.8.7

cer-graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cer-graphql",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "description": "A GraphQL server used to proxy and authorise requests to external data sources.",
   "main": "build/index.js",
   "scripts": {

hub-search-proxy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hub-search-proxy",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "description": "Serverless Framework Lambda functions to interact with AWS ElasticSearch Service.",
   "main": "handler.js",
   "scripts": {

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');
     });

research-hub-web/cypress/integration/routing.e2e.ts

@@ -57,7 +57,7 @@ describe("ResearchHubs legacy routing", () => {
 describe("ResearchHubs SSO protected content", () => {
 
   it('visiting an SSO protected item redirects to SSO login page', () => {
-    cy.visit('/subhub/internal-funding');
+    cy.visit('/article/contracts-and-clauses');
     cy.location('pathname').should('include', '/profile/SAML2/Redirect/SSO');
   });
 });

research-hub-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "research-hub-web",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "license": "MIT",
   "scripts": {
     "ng": "ng",

research-hub-web/src/app/components/articles/article/article.component.html

@@ -173,7 +173,7 @@ <h3 *ngIf="relatedOrgs.length > 0">
         fxFlexOrder="3"
       >
         <h3>
-          Explore Related
+          Explore related
           <hr />
         </h3>
         <div

research-hub-web/src/app/components/capabilitys/capability/capability.component.html

@@ -175,7 +175,7 @@ <h3 *ngIf="relatedOrgs.length > 0">
         fxFlexOrder="3"
       >
         <h3>
-          Explore Related
+          Explore related
           <hr />
         </h3>
         <div

research-hub-web/src/app/components/cards/standard-card/standard-card.component.html

@@ -1,5 +1,5 @@
 <mat-card
-  [routerLink]="['/', contentItem.__typename!.toLowerCase(), contentItem.slug]"
+  [routerLink]="['/', (contentItem.__typename!.toLowerCase() === 'equipment' ? 'infrastructure' : contentItem.__typename!.toLowerCase()) , contentItem.slug]"
   [ngClass]="{ 'subhub-child-card': isSubhubChild }"
 >
   <picture mat-card-image>
@@ -17,7 +17,7 @@
       tabindex="-1"
       [routerLink]="[
         '/',
-        contentItem.__typename!.toLowerCase(),
+        (contentItem.__typename!.toLowerCase() === 'equipment' ? 'infrastructure' : contentItem.__typename!.toLowerCase()),
         contentItem.slug
       ]"
     >

research-hub-web/src/app/components/casestudys/case-study/case-study.component.html

@@ -162,7 +162,7 @@ <h3 *ngIf="relatedOrgs.length > 0">
         fxFlexOrder="3"
       >
         <h3>
-          Explore Related
+          Explore related
           <hr />
         </h3>
         <div

research-hub-web/src/app/components/content-graph/node-details/node-details.component.html

@@ -14,7 +14,7 @@ <h2>Selected Entry</h2>
       <a
         mat-icon-button
         color="primary"
-        [routerLink]="['/', node.type.toLowerCase(), node.slug]"
+        [routerLink]="['/', (node.type.toLowerCase() === 'equipment' ? 'infrastructure' : node.type.toLowerCase()), node.slug]"
         matTooltip="Visit page in ResearchHub"
       >
         <mat-icon>article</mat-icon>
@@ -56,7 +56,7 @@ <h2>Selected Entry</h2>
           <a
             mat-icon-button
             color="primary"
-            [routerLink]="['/', neighbour.type.toLowerCase(), neighbour.slug]"
+            [routerLink]="['/', (neighbour.type.toLowerCase() === 'equipment' ? 'infrastructure' : neighbour.type.toLowerCase()), neighbour.slug]"
             matTooltip="Visit page in ResearchHub"
           >
             <mat-icon>article</mat-icon>
@@ -98,7 +98,7 @@ <h2>Selected Entry</h2>
           <a
             mat-icon-button
             color="primary"
-            [routerLink]="['/', neighbour.type.toLowerCase(), neighbour.slug]"
+            [routerLink]="['/', (neighbour.type.toLowerCase() === 'equipment' ? 'infrastructure' : neighbour.type.toLowerCase()), neighbour.slug]"
             matTooltip="Visit page in ResearchHub"
           >
             <mat-icon>article</mat-icon>

research-hub-web/src/app/components/equipments/equipment-list/equipment-list.component.ts

@@ -11,7 +11,7 @@ import { map } from 'rxjs/operators';
 })
 export class EquipmentListComponent implements OnInit, OnDestroy {
   public equipment: EquipmentCollection;
-  public title: string = 'Equipment Collection';
+  public title: string = 'Infrastructure Collection';
 
   private subscription = new Subscription();
 

research-hub-web/src/app/components/equipments/equipment/equipment.component.html

@@ -98,7 +98,7 @@
       fxLayout="column"
     >
       <h3 *ngIf="relatedItems.length > 0">
-        Explore Related
+        Explore related
         <hr />
       </h3>
       <div

research-hub-web/src/app/components/error-routing/error-routing.module.ts

@@ -31,10 +31,21 @@ export class ErrorRoutingModule extends UoaErrorsConfig {
 
         this.ErrorPageContent['ErrorCode403'] = {
             title: 'Access Restricted',
-            content: `<p>Sorry, You do not have permission to view this page. Please ensure that you are logged in and try again.</p>
+            content: `<p>This page is restricted.</p>
             <p>
-              If you still do not have access and believe you are seeing this page in error, please contact
-              <a href=mailto:${this.contactEmail} target="_blank">${this.contactEmail}</a>.
+                We apologize, but you currently lack the necessary permissions to view this page.  
+                To gain access to this content, kindly retry and ensure that you are logged in 
+                using your University email address (or UPI) along with the corresponding password.
+            </p>
+            <p>
+                Please be aware that content secured behind Single Sign-On (SSO) is exclusively 
+                available to University of Auckland staff and PhD students. Masters students, 
+                under-graduates, collaborating District Health Boards (DHBs), 
+                and the public are not able to access content protected by SSO.
+            </p>
+            <p>
+                <a href="/article/get-access-to-researchhub">
+                Learn more about SSO and accessing ResearchHub content via the ‘Get access to ResearchHub’ page</a>
             </p>`
         };
 

research-hub-web/src/app/components/events/event/event.component.html

@@ -60,7 +60,7 @@
     <!-- Related -->
     <div class="event-owners section" fxLayout="column">
       <h3 *ngIf="relatedItems.length > 0">
-        Explore Related
+        Explore related
         <hr />
       </h3>
       <div

research-hub-web/src/app/components/fundings/funding/funding.component.html

@@ -133,7 +133,7 @@ <h3>
     <!-- Related -->
     <div class="funding-owners section" fxLayout="column">
       <h3 *ngIf="relatedItems.length > 0">
-        Explore Related
+        Explore related
         <hr />
       </h3>
       <div fxLayout="row wrap" fxLayout.xs="column" fxLayoutGap="25px">

research-hub-web/src/app/components/layout/search-filters/search-filters.component.html

@@ -91,8 +91,8 @@
       >
         {{
           activeFilters.stage.length === 1
-            ? activeFilters.stage.length + " activity"
-            : activeFilters.stage.length + " activities"
+            ? activeFilters.stage.length + " stage"
+            : activeFilters.stage.length + " stages"
         }}
         <mat-icon matChipRemove>cancel</mat-icon>
       </mat-chip>

research-hub-web/src/app/components/search-page/search-filter-bar/search-filter-bar.component.html

@@ -36,7 +36,7 @@
 
         <ng-container *ngIf="activeFilters.stage.length > 0">
           <b>{{ activeFilters.stage.length }}</b>
-          {{ activeFilters.stage.length === 1 ? "activity" : "activities" }}
+          {{ activeFilters.stage.length === 1 ? "stage" : "stages" }}
         </ng-container>
 
         <ng-container *ngIf="activeFilters.relatedOrgs.length > 0">

research-hub-web/src/app/components/search-page/search-results-list/search-results-list.component.html

@@ -7,7 +7,7 @@
     role="listitem"
     (keydown.enter)="navigate(result.contentType, result.slug)"
   >
-    <a class="search-link" [routerLink]="['/', result.contentType.toLowerCase(), result.slug]"></a>
+    <a class="search-link" [routerLink]="['/', (result.contentType.toLowerCase() === 'equipment' ? 'infrastructure' : result.contentType.toLowerCase()), result.slug]"></a>
 
     <span class="card-label">{{
       result.contentType | contentTypeDisplayName

research-hub-web/src/app/components/services/service/service.component.html

@@ -69,7 +69,7 @@
       fxLayout="column"
     >
       <h3 *ngIf="relatedItems.length > 0">
-        Explore Related
+        Explore related
         <hr />
       </h3>
       <div

research-hub-web/src/app/components/shared/body-media/blocks-embedded-entry/blocks-embedded-entry.component.html

@@ -171,7 +171,7 @@ <h3>{{ contentItem.name }}</h3>
       <a
         [routerLink]="
           '/' +
-          contentItem['__typename'].toLowerCase() +
+          (contentItem['__typename'].toLowerCase() === 'equipment' ? 'infrastructure' : contentItem['__typename'].toLowerCase()) +
           '/' +
           contentItem['slug']
         "

research-hub-web/src/app/components/shared/body-media/blocks-embedded-entry/blocks-embedded-entry.component.ts

@@ -15,6 +15,7 @@ export class BlocksEmbeddedEntryComponent extends NodeRenderer implements OnInit
   ngOnInit(): void {
     try {
       this.contentItem = this.bodyMediaService.getContentItem(this.node);
+      console.log(this.contentItem['__typename'].toLowerCase() === 'equipment' ? 'infrastructure' : this.contentItem['__typename'].toLowerCase())
     } catch(e) {
       console.error(e);
     }

research-hub-web/src/app/components/shared/body-media/inlines-embedded-entry/inlines-embedded-entry.component.html

@@ -1,7 +1,7 @@
 <!-- Entry Inline -->
 <span *ngIf="contentItem">
     <span>
-        <a class="embedded-entry-inline" [routerLink]="'/' + contentItem['__typename'].toLowerCase() + '/' + contentItem['slug']">
+        <a class="embedded-entry-inline" [routerLink]="'/' + (contentItem['__typename'].toLowerCase() === 'equipment' ? 'infrastructure' : contentItem['__typename'].toLowerCase()) + '/' + contentItem['slug']">
             {{ contentItem.title }}
         </a>
     </span>

research-hub-web/src/app/components/shared/body-media/inlines-entry-hyperlink/inlines-entry-hyperlink.component.html

@@ -2,7 +2,7 @@
 <span *ngIf="contentItem">
   <span>
     <a
-      [routerLink]="['/', contentItem.__typename.toLowerCase(), contentItem.slug]"
+      [routerLink]="['/', (contentItem.__typename.toLowerCase() === 'equipment' ? 'infrastructure' : contentItem.__typename.toLowerCase()), contentItem.slug]"
     >
       <b>{{ data.content[0].value }}</b>
     </a>

research-hub-web/src/app/components/shared/collection-list/collection-list.component.html

@@ -5,21 +5,21 @@
   <ng-container *ngIf="collection">
     <!-- Content Collection -->
     <h1 id="title">
-      {{ collection.__typename | humanCase }}
+      {{ (collection.__typename === 'EquipmentCollection' ? 'InfrastructureCollection' : collection.__typename) | humanCase }}
     </h1>
     Found
     <span class="search-results-text">
       {{ collection.items.length }} </span
     >results in
     <span class="search-results-text">
-      {{ collection.__typename | humanCase }}
+      {{ (collection.__typename === 'EquipmentCollection' ? 'InfrastructureCollection' : collection.__typename) | humanCase }}
     </span>
 
     <!-- Content Collection -->
     <mat-nav-list>
       <mat-card *ngFor="let content of collection.items">
         <a
-          [routerLink]="['/' + content.__typename.toLowerCase(), content.slug]"
+          [routerLink]="['/' + (content.__typename.toLowerCase() === 'equipment' ? 'infrastructure' : content.__typename.toLowerCase()), content.slug]"
           class="result-item"
           [ngClass]="{ ssoProtected: content.ssoProtected }"
         >

research-hub-web/src/app/components/shared/collection-list/collection-list.component.ts

@@ -13,7 +13,7 @@ export class CollectionListComponent implements OnChanges {
   constructor() { }
 
   ngOnChanges(changes: SimpleChanges) {
-    try { this.collection = changes['collection'].currentValue; this.loading = false } catch { }
+    try { this.collection = changes['collection'].currentValue; this.loading = false; console.log(this.collection.__typename) } catch { }
   }
 
   // Scrolling to top of page on page change

research-hub-web/src/app/components/softwares/software/software.component.html

@@ -76,7 +76,7 @@
       fxLayout="column"
     >
       <h3 *ngIf="relatedItems.length > 0">
-        Explore Related
+        Explore related
         <hr />
       </h3>
       <div

research-hub-web/src/app/components/subhubs/subhub/subhub.component.html

@@ -97,7 +97,7 @@
       fxLayout="column"
     >
       <h3 *ngIf="relatedItems.length > 0">
-        Explore Related
+        Explore related
         <hr />
       </h3>
       <div

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');

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',

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)
       },
       {

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 };
             })