Merge pull request #713 from bcgov/develop

Deployment PR - 291

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-node@master
         with:
           node-version: ${{ matrix.node }}
-      - run: npm ci --legacy-peer-deps
+      - run: npm ci
       - run: npm run build
       - run: npm run test:ci
   test-portal-frontend:
@@ -29,8 +29,8 @@ jobs:
         working-directory: portal-frontend
     strategy:
       matrix:
-        platform: [ ubuntu-latest ]
-        node: [ "18" ]
+        platform: [ubuntu-latest]
+        node: ["18"]
     name: Portal Frontend Tests - ${{ matrix.node }}/${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
     steps:
@@ -48,7 +48,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        node: ["18"]
+        node: ["20"]
     name: API Tests - ${{ matrix.node }}/${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
     steps:

.github/workflows/coverage.yml

@@ -11,18 +11,18 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        node: ["18"]
+        node: ["20"]
     name: Coverage Report ALCS Frontend - ${{ matrix.node }}/${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
           node-version: ${{ matrix.node }}
-      - run: npm install --legacy-peer-deps
+      - run: npm install
       - run: npm run build
       - run: npm run test:cov
-      - if: matrix.node == '18'
+      - if: matrix.node == '20'
         uses: actions/upload-artifact@v3
         with:
           name: coverage-alcs-frontend
@@ -35,8 +35,8 @@ jobs:
         working-directory: portal-frontend
     strategy:
       matrix:
-        platform: [ ubuntu-latest ]
-        node: [ "18" ]
+        platform: [ubuntu-latest]
+        node: ["20"]
     name: Coverage Report Portal Frontend - ${{ matrix.node }}/${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
     steps:
@@ -47,7 +47,7 @@ jobs:
       - run: npm install
       - run: npm run build
       - run: npm run test:cov
-      - if: matrix.node == '18'
+      - if: matrix.node == '20'
         uses: actions/upload-artifact@v3
         with:
           name: coverage-portal-frontend
@@ -61,7 +61,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        node: ["18"]
+        node: ["20"]
     name: Coverage Report API - ${{ matrix.node }}/${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
     steps:
@@ -72,7 +72,7 @@ jobs:
       - run: npm install
       - run: npm run build
       - run: npm run test:cov
-      - if: matrix.node == '18'
+      - if: matrix.node == '20'
         uses: actions/upload-artifact@v3
         with:
           name: coverage-api

README.md

@@ -10,7 +10,7 @@
 
 This project contains the frontend and backend for the ALCS used for tracking various permits and other ALC related documents
 
-## Getting Help or Reporting an Issue
+## Getting Help or Reporting an Issue 
 
 To report bugs/issues/features requests, please file an [issue](https://github.com/bcgov/alcs/issues).
 
@@ -23,3 +23,11 @@ To report bugs/issues/features requests, please file an [issue](https://github.c
 - [SchemaSpy - ALCS](https://bcgov.github.io/alcs/schemaspy/alcs/index.html)
 - [SchemaSpy - OATS](https://bcgov.github.io/alcs/schemaspy/oats/index.html)
 - [One time Jobs](./docs/jobs.md)
+
+## Run dev setup
+- [Run ALCS Frontend](./alcs-frontend/README.md)
+- [Run Portal Frontend Readme](./portal-frontend/README.md)
+- [Run Services](./services/README.md)
+- [Setup database](./services/README.md)
+- Acquire latest development.json from some developer on the team
+- Run docker - `docker compose up`

alcs-frontend/Dockerfile

@@ -1,5 +1,5 @@
 ###### Install dependencies only when needed ######
-FROM node:18.12-alpine AS build
+FROM node:20-alpine AS build
 
 # Make /app as working directory
 WORKDIR /app

alcs-frontend/README.md

@@ -2,9 +2,10 @@
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.0.5.
 
-## Development server
+## Run alcs
 
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
+Run `npm install --legacy-peer-deps`
+Run `npm run start`
 
 ## Code scaffolding
 

alcs-frontend/angular.json

@@ -23,19 +23,10 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets",
-              "src/maintenance.html"
-            ],
-            "styles": [
-              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
-              "src/styles.scss"
-            ],
+            "assets": ["src/favicon.ico", "src/assets", "src/maintenance.html"],
+            "styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss"],
             "stylePreprocessorOptions": {
-              "includePaths": [
-                "node_modules"
-              ]
+              "includePaths": ["node_modules"]
             },
             "scripts": []
           },
@@ -99,40 +90,27 @@
         "test": {
           "builder": "@angular-builders/jest:run",
           "options": {
-            "polyfills": [
-              "src/polyfills.ts"
-            ],
+            "polyfills": ["src/polyfills.ts"],
             "tsConfig": "tsconfig.spec.json",
-            "inlineStyleLanguage": [
-              "scss"
-            ],
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
-              "src/styles.scss"
-            ],
-            "scripts": []
+            "inlineStyleLanguage": ["scss"],
+            "assets": ["src/favicon.ico", "src/assets"],
+            "styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss"],
+            "scripts": [],
+            "detectOpenHandles": true,
+            "forceExit": true
           }
         },
         "lint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {
-            "lintFilePatterns": [
-              "src/**/*.ts",
-              "src/**/*.html"
-            ]
+            "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
           }
         }
       }
     }
   },
   "cli": {
     "analytics": "d29c8019-b84b-4fdc-9690-1ee8ea441897",
-    "schematicCollections": [
-      "@angular-eslint/schematics"
-    ]
+    "schematicCollections": ["@angular-eslint/schematics"]
   }
 }

alcs-frontend/jest.config.js

@@ -1,7 +1,6 @@
 module.exports = {
   preset: 'jest-preset-angular',
   moduleDirectories: ['node_modules', 'src'],
-  globalSetup: 'jest-preset-angular/global-setup',
   coverageReporters: [
     [
       'lcov',