Merge branch 'develop'

redbox-mint · Jun 26, 2023 · d8a6d4f · d8a6d4f
2 parents 605ed24 + fc055e3
commit d8a6d4f
Show file tree

Hide file tree

Showing 466 changed files with 69,957 additions and 31,200 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,21 +1,22 @@
 jobs:
   build:
     docker:
-      - image: 'cimg/node:14.19'
+      - image: 'cimg/node:18.12'
     steps:
       - checkout
       - run: (cd core && npm install && node_modules/.bin/tsc)
       - run: npm install --production
       - run: node_modules/.bin/tsc
-      - run: (cd angular && npm install)
+      - run: curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash
       - run: (chmod +x support/build/compileProductionAngular.sh && support/build/compileProductionAngular.sh)
+      - run: (chmod +x support/build/compileProductionAngularLegacy.sh && support/build/compileProductionAngularLegacy.sh)
       - persist_to_workspace:
           root: .
           paths:
             - .
   build_without_angular:
     docker:
-      - image: 'cimg/node:14.19'
+      - image: 'cimg/node:18.12'
     steps:
       - checkout
       - run: (cd core && npm install && node_modules/.bin/tsc)
@@ -34,10 +35,12 @@ jobs:
       - run: node_modules/.bin/tsc -p tsconfig-codecov.json
       - run: (sudo chmod -R 777 . && cd support/integration-testing && sudo mkdir -p .tmp/attachments/staging && sudo chmod -R 777 . && docker-compose -f docker-compose.newman.yml up --abort-on-container-exit --exit-code-from redboxportal && docker-compose -f docker-compose.mocha.yml up --abort-on-container-exit --exit-code-from redboxportal)
       - run: npm i -g codecov && codecov -t $CODECOV_TOKEN
-      - run: npm i
+      - run: curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash
+      - run: (chmod +x support/unit-testing/angular/testAngular.sh && support/unit-testing/angular/testAngular.sh)
+      - run: sudo chmod -R 777 . && npm i
   deploy:
     docker:
-      - image: 'cimg/node:14.19'
+      - image: 'cimg/node:18.12'
     steps:
       - setup_remote_docker
       - attach_workspace:
@@ -98,15 +101,15 @@ workflows:
               only: 'master'
   build_test_dependabot:
     jobs:
-      - build_without_angular:
+      - build:
           filters:
             branches:
               only: /^dependabot.*/
             tags:
               ignore: /.*/
       - test:
           requires:
-            - build_without_angular
+            - build
       - deploy:
           requires:
             - test

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18.7.0
+18.12.1
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,17 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+      {
+        "localRoot": "${workspaceFolder}",
+        "name": "Debug RedBox Portal",
+        "port": 9876,
+        "remoteRoot": "/opt/redbox-portal",
+        "request": "attach",
+        "skipFiles": [
+          "<node_internals>/**"
+        ],
+        "type": "node"
+      }
+
+    ]
+  }
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ The [Queensland Cyber Infrastructure Foundation](http://www.qcif.edu.au) (QCIF)
 
 Requirements:
 
-- Node 12.x
+- Node 18.x
 - Docker
 - Docker Compose
 

diff --git a/angular/.angular-cli.json → angular-legacy/.angular-cli.json b/angular/.angular-cli.json → angular-legacy/.angular-cli.json
@@ -4,56 +4,6 @@
     "name": "angular"
   },
   "apps": [
-    {
-      "name": "localAuth",
-      "root": "localAuth",
-      "outDir": "../assets/angular/localAuth",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    },
-    {
-      "name": "dashboard",
-      "root": "dashboard",
-      "outDir": "../assets/angular/dashboard",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    },
     {
       "name": "record_search",
       "root": "record_search",
@@ -104,106 +54,6 @@
         "prod": "environments/environment.prod.ts"
       }
     },
-    {
-      "name": "report",
-      "root": "report",
-      "outDir": "../assets/angular/report",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    },
-    {
-      "name": "manageRoles",
-      "root": "manageRoles",
-      "outDir": "../assets/angular/manageRoles",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    },
-    {
-      "name": "manageUsers",
-      "root": "manageUsers",
-      "outDir": "../assets/angular/manageUsers",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    },
-    {
-      "name": "export",
-      "root": "export",
-      "outDir": "../assets/angular/export",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    },
     {
       "name": "userProfile",
       "root": "userProfile",

diff --git a/angular-legacy/.editorconfig b/angular-legacy/.editorconfig
@@ -0,0 +1,13 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
diff --git a/angular-legacy/.gitignore b/angular-legacy/.gitignore
@@ -0,0 +1,43 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+yarn-error.log
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+Thumbs.db
diff --git a/angular-legacy/.nvmrc b/angular-legacy/.nvmrc
@@ -0,0 +1 @@
+14.19.0
diff --git a/angular/Makefile → angular-legacy/Makefile b/angular/Makefile → angular-legacy/Makefile
@@ -3,10 +3,6 @@ help:
 	    @echo "To build all apps run make make build-frontend"
 
 build-frontend:
-			@echo "Building local_auth"
-	        node_modules/.bin/ng build -a=0 --extract-css true
-			@echo "Building dashboard"
-			node_modules/.bin/ng build -a=1 --extract-css true
 			@echo "Building record_search"
 			node_modules/.bin/ng build -a=2 --extract-css true
 			@echo "Building transfer_owner"
@@ -27,10 +23,6 @@ build-frontend:
 			node_modules/.bin/ng build -a=10 --extract-css true
 
 build-frontend-prod:
-			@echo "Building local_auth"
-	    node_modules/.bin/ng build -a=0 --prod --build-optimizer --output-hashing=none --extract-css true
-			@echo "Building dashboard"
-			node_modules/.bin/ng build -a=1 --prod --build-optimizer --output-hashing=none --extract-css true
 			@echo "Building record_search"
 			node_modules/.bin/ng build -a=2 --prod --build-optimizer --output-hashing=none --extract-css true
 			@echo "Building transfer_owner"
@@ -51,10 +43,6 @@ build-frontend-prod:
 			node_modules/.bin/ng build -a=10 --prod --build-optimizer --output-hashing=none --extract-css true
 
 build-frontend-prod-sourcemaps:
-			@echo "Building local_auth"
-	    node_modules/.bin/ng build -a=0 --prod --build-optimizer --output-hashing=none --sourcemaps=true --extract-css true
-			@echo "Building dashboard"
-			node_modules/.bin/ng build -a=1 --prod --build-optimizer --output-hashing=none --sourcemaps=true --extract-css true
 			@echo "Building record_search"
 			node_modules/.bin/ng build -a=2 --prod --build-optimizer --output-hashing=none --sourcemaps=true --extract-css true
 			@echo "Building transfer_owner"

diff --git a/angular-legacy/README.md b/angular-legacy/README.md
@@ -0,0 +1,28 @@
+# Angular 
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.2.7.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+Before running the tests make sure you are serving the app via `ng serve`.
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).