Skip to content

Commit c4d5cb9

Browse files
cakr322cakr322
authored
Merge pull request #397 from UoA-eResearch/rc2.8.2
Rc2.8.2
2 parents c76b017 + ad82a98 commit c4d5cb9

File tree

11 files changed

+87
-12
lines changed

11 files changed

+87
-12
lines changed

‎cer-graphql/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cer-graphql",
3-
"version": "2.8.1",
3+
"version": "2.8.2",
44
"description": "A GraphQL server used to proxy and authorise requests to external data sources.",
55
"main": "build/index.js",
66
"scripts": {

‎hub-search-proxy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hub-search-proxy",
3-
"version": "2.8.1",
3+
"version": "2.8.2",
44
"description": "Serverless Framework Lambda functions to interact with AWS ElasticSearch Service.",
55
"main": "handler.js",
66
"scripts": {

‎research-hub-web/angular.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,18 @@
113113
"extractLicenses": true,
114114
"vendorChunk": false,
115115
"buildOptimizer": true,
116+
"index": {
117+
"input": "src/index.test.html",
118+
"output": "index.html"
119+
},
116120
"fileReplacements": [
117121
{
118122
"replace": "src/environments/environment.ts",
119123
"with": "src/environments/environment.test.ts"
120124
}
125+
],
126+
"scripts": [
127+
"src/tagManager.test.js"
121128
]
122129
},
123130
"dev": {
@@ -253,11 +260,18 @@
253260
"extractLicenses": true,
254261
"vendorChunk": false,
255262
"buildOptimizer": true,
263+
"index": {
264+
"input": "src/index.test.html",
265+
"output": "index.html"
266+
},
256267
"fileReplacements": [
257268
{
258269
"replace": "src/environments/environment.ts",
259270
"with": "src/environments/environment.test-preview.ts"
260271
}
272+
],
273+
"scripts": [
274+
"src/tagManager.test.js"
261275
]
262276
},
263277
"prod-preview": {

‎research-hub-web/cypress/integration/activities.e2e.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
describe('ResearchHubs Activities Page', () => {
22

33
beforeEach(() => {
4-
cy.visit('/activities');
4+
cy.visit('/stage');
55
});
66

77
it('displays the title', () => {
@@ -22,4 +22,4 @@ describe('ResearchHubs Activities Page', () => {
2222

2323
cy.location('pathname').should('include', 'search');
2424
})
25-
});
25+
});

‎research-hub-web/cypress/integration/navbar.e2e.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ describe('ResearchHubs NavBar', () => {
4747
});
4848

4949
it('can click Activities in navbar and navigate to Activities page', () => {
50-
cy.get('.main-navbar-row a').contains('Activities').click();
50+
cy.get('.main-navbar-row a').contains('Research stage').click();
5151

52-
cy.location('pathname').should('include', 'activities');
52+
cy.location('pathname').should('include', 'stage');
5353
});
5454

5555
it('can click Sign In in navbar and are taken to SSO login page', () => {

‎research-hub-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "research-hub-web",
3-
"version": "2.8.1",
3+
"version": "2.8.2",
44
"license": "MIT",
55
"scripts": {
66
"ng": "ng",

‎research-hub-web/src/app/components/activities-page/activities-page.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { Router } from '@angular/router';
1818
styleUrls: ['./activities-page.component.scss']
1919
})
2020
export class ActivitiesPageComponent implements OnInit, OnDestroy {
21-
public title: string = 'Research Activities';
21+
public title: string = 'Research stage';
2222
public description: Maybe<string> | undefined;
2323
public allStages$: Observable<Stage[]>;
2424
private subscriptions: Subscription = new Subscription();

‎research-hub-web/src/app/components/layout/navbar/navbar.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@
3434
<a mat-button class="hide-small" [routerLink]="'/categories'">
3535
Categories
3636
</a>
37-
<a mat-button class="hide-small" [routerLink]="'/activities'">
38-
Activities
37+
<a mat-button class="hide-small" [routerLink]="'/stage'">
38+
Research stage
3939
</a>
4040
<ng-container
4141
*ngIf="loggedIn$ | async; then isSignedIn; else signIn"
4242
></ng-container>
4343
</mat-toolbar-row>
4444
<mat-toolbar-row class="navbar-row-show-small">
4545
<a mat-button [routerLink]="'/categories'">Categories</a>
46-
<a mat-button [routerLink]="'/activities'">Activities</a>
46+
<a mat-button [routerLink]="'/stage'">Research stage</a>
4747
</mat-toolbar-row>
4848
</mat-toolbar>
4949

‎research-hub-web/src/app/routing/routing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export const appRoutes: Routes = [
4848
loadChildren: () => import('@components/categories-page/categories-page.module').then((m) => m.CategoriesPageModule),
4949
},
5050
{
51-
path: 'activities',
51+
path: 'stage',
5252
loadChildren: () => import('@components/activities-page/activities-page.module').then((m) => m.ActivitiesPageModule),
5353
},
5454
{

‎research-hub-web/src/index.test.html

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>ResearchHub</title>
6+
<meta name="description" content="The ResearchHub connects you with people, resources, and services from across the University to enhance and accelerate your research."/>
7+
<base href="/">
8+
9+
<meta name="viewport" content="width=device-width, initial-scale=1">
10+
<link rel="icon" href="./assets/imgs/favicon.png?v=2">
11+
<link rel="apple-touch-icon" href="./assets/icons/icon-192x192_apple.png">
12+
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans" rel="stylesheet">
13+
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
14+
15+
<!-- Twitter Card -->
16+
<meta name="twitter:card" content="summary"/>
17+
<meta name="twitter:title" content="ResearchHub"/>
18+
<meta name="twitter:description" content="The ResearchHub connects you with people, resources, and services from across the University to enhance and accelerate your research."/>
19+
<meta name="twitter:image" content="https://images.ctfassets.net/vbuxn5csp0ik/5IfxoF4WQ4Ks71q2HeLbgC/d0c3bb826ceebd31be789a73edac48fe/UoA_Details_230-min.jpeg?w=120&amp;h=120&amp;fm=png&amp;fit=thumb&amp;f=face"/>
20+
21+
<!-- Open Graph -->
22+
<meta property="og:site_name" content="ResearchHub"/>
23+
<meta property="og:title" content="ResearchHub"/>
24+
<meta property="og:url" content="https://research-hub.auckland.ac.nz/"/>
25+
<meta property="og:type" content="website"/>
26+
<meta property="og:description" content="The ResearchHub connects you with people, resources, and services from across the University to enhance and accelerate your research."/>
27+
<meta property="og:locale" content="en_US"/>
28+
<meta property="og:image" content="https://images.ctfassets.net/vbuxn5csp0ik/5IfxoF4WQ4Ks71q2HeLbgC/d0c3bb826ceebd31be789a73edac48fe/UoA_Details_230-min.jpeg?w=1200&amp;h=630&amp;q=90"/>
29+
<meta property="og:image:alt" content="The University of Auckland"/>
30+
<meta property="og:image:type" content="image/jpeg"/>
31+
32+
<!-- Service Worker -->
33+
<link rel="manifest" href="manifest.webmanifest">
34+
<meta name="theme-color" content="#00467f">
35+
</head>
36+
37+
<body>
38+
39+
<!-- This is replaced with Tag Manager prod workspace for production build - see index.prod.html -->
40+
<!-- Google Tag Manager (noscript) -->
41+
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-MQL92QB"
42+
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
43+
<!-- End Google Tag Manager (noscript) -->
44+
45+
<app-root></app-root>
46+
</body>
47+
</html>

0 commit comments

Comments
 (0)