Merge pull request #427 from bcgov/development

Merge development into master

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
  - master
 
 jobs:
- unit-test:
+ test:
  if: github.actor != 'dependabot[bot]'
  runs-on: ubuntu-latest
  steps:
@@ -16,9 +16,11 @@ jobs:
  with:
  node-version: "16"
  cache: "yarn"
+ - run: |
+ mv sample.env .env
+ - run: docker compose pull test-db
  - run: yarn
- - run: npm run front-end:test
- - run: npm run back-end:test
+ - run: npm t
  yarn-build:
  if: github.actor != 'dependabot[bot]'
  runs-on: ubuntu-latest
@@ -37,6 +39,7 @@ jobs:
  steps:
  - uses: actions/checkout@v2
  - uses: actions/setup-node@v2
+ - run: yarn
  - run: pip install pre-commit
  - run: pre-commit run --all-files -v
  commitlint:

.pre-commit-config.yaml

@@ -8,16 +8,17 @@ repos:
  - id: check-json
  - id: check-vcs-permalinks
  - id: check-yaml
+ exclude: ^helm/templates/
  args: [--allow-multiple-documents]
  - id: end-of-file-fixer
  - id: trailing-whitespace
  - repo: https://github.com/pre-commit/mirrors-eslint
- rev: v8.3.0
+ rev: v8.48.0
  hooks:
  - id: eslint
  additional_dependencies:
  [
- "eslint@8.3.0",
+ "eslint@8.48.0",
  "eslint-plugin-react",
  "@typescript-eslint/eslint-plugin",
  "typescript",

.secrets.baseline

@@ -97,13 +97,6 @@
  "hashed_secret": "2992d572d50232bec5afe6991589d1fba15be002",
  "is_verified": false,
  "line_number": 48
- },
- {
- "type": "Secret Keyword",
- "filename": ".github/workflows/e2e.yml",
- "hashed_secret": "8843d7f92416211de9ebb963ff4ce28125932878",
- "is_verified": false,
- "line_number": 51
  }
  ],
  "README.md": [
@@ -167,40 +160,15 @@
  "line_number": 29
  }
  ],
- "helm/templates/dbSecret.yaml": [
- {
- "type": "Secret Keyword",
- "filename": "helm/templates/dbSecret.yaml",
- "hashed_secret": "35f5ce6b5834fb0ddaaf5ad9ace7da3793982b8b",
- "is_verified": false,
- "line_number": 7
- }
- ],
- "openshift/templates/database/patroni-digmkt-deploy.yaml": [
- {
- "type": "Secret Keyword",
- "filename": "openshift/templates/database/patroni-digmkt-deploy.yaml",
- "hashed_secret": "0303d145888470b11b50aea97264fad24b029fdc",
- "is_verified": false,
- "line_number": 147
- }
- ],
  "sample.env": [
  {
  "type": "Basic Auth Credentials",
  "filename": "sample.env",
  "hashed_secret": "2992d572d50232bec5afe6991589d1fba15be002",
  "is_verified": false,
  "line_number": 4
- },
- {
- "type": "Secret Keyword",
- "filename": "sample.env",
- "hashed_secret": "8843d7f92416211de9ebb963ff4ce28125932878",
- "is_verified": false,
- "line_number": 5
  }
  ]
  },
- "generated_at": "2023-01-29T04:59:44Z"
+ "generated_at": "2023-08-31T18:34:51Z"
 }

babel.config.js

@@ -1,6 +1,7 @@
 module.exports = {
- presets: [
- ['@babel/preset-env', {targets: {node: '10'}}],
- '@babel/preset-typescript','@babel/preset-react'
- ],
- };
+ presets: [
+ ["@babel/preset-env", { targets: { node: "10" } }],
+ "@babel/preset-typescript",
+ "@babel/preset-react"
+ ]
+};

commitlint.config.js

@@ -1 +1 @@
-module.exports = {extends: ['@commitlint/config-conventional']}
+module.exports = { extends: ["@commitlint/config-conventional"] };