Skip to content

Commit 4b6c800

Browse files
authored
Merge pull request #156 from UoA-eResearch/rc2.3.0
Rc2.3.0
2 parents 469ec29 + f85337e commit 4b6c800

File tree

193 files changed

+50033
-26047
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+50033
-26047
lines changed

.github/dependabot.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: 'npm'
4+
directory: '/research-hub-web'
5+
schedule:
6+
interval: 'weekly'
7+
open-pull-requests-limit: 1
8+
reviewers:
9+
- rosemcc
10+
- Trombach
11+
allow:
12+
- dependency-type: 'direct'
13+
- package-ecosystem: 'npm'
14+
directory: '/cer-graphql'
15+
schedule:
16+
interval: 'weekly'
17+
open-pull-requests-limit: 1
18+
reviewers:
19+
- uoa-noel
20+
allow:
21+
- dependency-type: 'direct'
22+
- package-ecosystem: 'npm'
23+
directory: '/hub-search-proxy'
24+
schedule:
25+
interval: 'weekly'
26+
open-pull-requests-limit: 1
27+
reviewers:
28+
- rosemcc
29+
allow:
30+
- dependency-type: 'direct'
31+

.github/workflows/sentry.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Sentry Release
2+
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
- test
8+
- prod
9+
paths:
10+
- 'research-hub-web/**'
11+
12+
jobs:
13+
sentry-release:
14+
name: Create Sentry Release
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Check out Git repository
19+
uses: actions/checkout@v2
20+
- name: Get Branch
21+
id: var
22+
run: echo ::set-output name=branch::${GITHUB_REF#refs/*/}
23+
- name: Output Branch
24+
run: echo ${{ steps.var.outputs.branch }}
25+
- name: Notify Sentry
26+
# https://github.com/getsentry/action-release
27+
uses: getsentry/action-release@v1.1.6
28+
env:
29+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
30+
SENTRY_ORG: university-of-auckland-7o
31+
SENTRY_PROJECT: research-hub
32+
with:
33+
environment: ${{ steps.var.outputs.branch }}

.vscode/launch.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,19 @@
1919
"url": "http://localhost:4200/",
2020
"webRoot": "${workspaceFolder}/research-hub-web/",
2121
"preLaunchTask": "research-hub-web - start"
22+
},
23+
{
24+
"type": "pwa-chrome",
25+
"request": "attach",
26+
"name": "Attach to Karma",
27+
"address": "localhost",
28+
"port": 9222,
29+
"timeout": 600000,
30+
"sourceMaps": true,
31+
"webRoot": "${workspaceFolder}/research-hub-web/",
32+
"pathMapping": {
33+
"/_karma_webpack_": "${workspaceFolder}/research-hub-web/"
34+
}
2235
}
2336
]
2437
}

Architecture.drawio.svg

Lines changed: 0 additions & 1557 deletions
This file was deleted.

Dev_Journey_V3.drawio.svg

Lines changed: 4 additions & 0 deletions
Loading

Development-Journey.png

-407 KB
Binary file not shown.

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ However, test and prod deploys will ONLY be triggered by a push to the test or p
2626
NOTE: The sandbox account is only for temporary usage. All resources created in sandbox should be destroyed when no longer needed.
2727

2828
## Architecture Overview
29-
![Architecture Overview](Architecture.drawio.svg)
29+
![Architecture Overview](ResearchHubArchitecture.png)
3030

31-
## Development Journey
32-
![Development Journey](Development-Journey.png)
31+
## Development and Release Process
32+
![Development and Release](Dev_Journey_V3.drawio.svg)
33+
34+
## UoA Wiki
35+
[ResearchHub Wiki Page](https://wiki.auckland.ac.nz/pages/viewpage.action?spaceKey=APPLCTN&title=ResearchHub)

ResearchHubArchitecture.png

150 KB
Loading

cer-graphql/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ If you wish to use a different AWS profile, use the following command and pass i
3939
![Architecture Overview](./documentation/cer-graphql-startup.png)
4040

4141
## Authentication Process
42-
![Architecture Overview](./documentation/cer-graphql-auth-process.png)
42+
![Architecture Overview](./documentation/cer-graphql-auth-process.png)
43+

cer-graphql/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)