Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
57a1e4a
updated ha id option
npham49 Jun 30, 2025
262a9b0
updating comments and wordings
npham49 Jul 2, 2025
f025fae
Merge pull request #1113 from bcgov/BCMOHAM-26040-ha-id-idp
npham49 Jul 2, 2025
68a7e37
Removed unused scripts and updated cronjob YAML files
chloe-yuu Jul 2, 2025
f0f3ff9
First name and Last name variables are not sent from Keycloak anymore…
MaelCormier-CGI Jul 11, 2025
4646763
Merge pull request #1115 from bcgov/dev-env
MaelCormier-CGI Jul 16, 2025
603f4ca
update the Openshift CLI install method on test&prod deployment workf…
chloe-yuu Jul 16, 2025
df10b90
Test openshift workflow: add comment to trigger cronjob deployment
chloe-yuu Jul 16, 2025
3bf7829
Merge pull request #1118 from bcgov/dev-env
chloe-yuu Jul 16, 2025
6a01be6
Update deployment documentation to reflect infrastructure change auto…
chloe-yuu Jul 23, 2025
b19f475
Complete production deployment documentation based on promote-prod wo…
chloe-yuu Jul 23, 2025
d7848a4
Merge pull request #1119 from bcgov/update-deployment-docs
chloe-yuu Jul 23, 2025
d08ab2d
Merge pull request #1120 from bcgov/dev-env
chloe-yuu Jul 24, 2025
ee80c77
JSU3-global and frontend JS upgrade (#1122)
chloe-yuu Aug 13, 2025
5ebc5d1
update node version on workflow files (#1124)
chloe-yuu Aug 13, 2025
0c0ee30
Dockerfile update to include .npmrc to client container (#1126)
chloe-yuu Aug 14, 2025
4887be3
fixing npm build error on server which triggered by nodejs upgrade (#…
chloe-yuu Aug 14, 2025
46aeea7
fixing server errors (#1128)
chloe-yuu Aug 15, 2025
be149f4
Fix SPA catch-all route for Express 5 / path-to-regexp v6 (#1129)
chloe-yuu Aug 15, 2025
164502c
removing more freshworks.cluib references
npham49 Aug 18, 2025
8424a78
Merge pull request #1130 from bcgov/BCMOHAM-26040-domain-removal
npham49 Aug 18, 2025
87d14a2
updating string replacement for double quotes
npham49 Aug 18, 2025
a912934
Merge pull request #1131 from bcgov/BCMOHAM-26040-domain-removal
npham49 Aug 18, 2025
0fabc58
updating nonce to be inserted by webpack
npham49 Aug 18, 2025
09be79e
Merge pull request #1132 from bcgov/BCMOHAM-26040-domain-removal
npham49 Aug 18, 2025
3f570d6
fixing the CSP violations issue related to nonce (#1133)
chloe-yuu Aug 19, 2025
9599777
adding docs for cert and table fixes
npham49 Aug 19, 2025
8381dd2
Merge pull request #1134 from bcgov/JSU-3-table-pagination
npham49 Aug 21, 2025
7cfc5b3
fixing seeding script not connecting properly
npham49 Sep 18, 2025
96def88
Frontend js upgrade & fix (#1135)
chloe-yuu Sep 18, 2025
02bc7f4
backend library upgrades and mongodb version update (#1137)
chloe-yuu Sep 29, 2025
72535e7
fix the email validation on participant info edit pop-up (#1138)
chloe-yuu Sep 30, 2025
a40731d
fix: resolve 'a few seconds ago' display for participant Last Updated…
chloe-yuu Oct 1, 2025
2741979
JSU-414: hide the 'Edit' button to non_mohadmin accounts
chloe-yuu Oct 1, 2025
bd77594
Merge pull request #1136 from bcgov/JSU-3-seeding-script
npham49 Oct 2, 2025
0cc9dab
Jsu 416 employer site fix (#1140)
chloe-yuu Oct 7, 2025
3bd3832
correct the logic for participants' hire and ROS status.
chloe-yuu Oct 8, 2025
50bd3f8
roll back the change site option after a participant been archived
chloe-yuu Oct 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '24'

- name: Cache node modules
id: cache-npm
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/promote-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ env:
SA_TOKEN: ${{ secrets.SA_TOKEN_CONFIG }}
PROJECT: hcap
HEALTH_CHECK_URL: https://hcap-server-f047a2-dev.apps.silver.devops.gov.bc.ca/api/v1/version
DEV_URL: https://hcapemployers.dev.freshworks.club
DEV_URL: https://dev.hcapemployers.gov.bc.ca

jobs:
audit:
Expand All @@ -55,7 +55,7 @@ jobs:

- uses: actions/setup-node@v2
with:
node-version: '20'
node-version: '24'

- name: NPM Audit
run: |
Expand Down Expand Up @@ -98,6 +98,7 @@ jobs:
oc login --token="$SA_TOKEN" --server="$CLUSTER"
cd "$GITHUB_WORKSPACE"
make server-config-test
make cron-job-test
confirm:
name: Get Confirmation Dev Deployment
runs-on: ubuntu-latest
Expand Down Expand Up @@ -145,6 +146,7 @@ jobs:
oc login --token="$SA_TOKEN" --server="$CLUSTER"
cd "$GITHUB_WORKSPACE"
make server-config
make cron-job
build:
name: OpenShift Build & Deploy
runs-on: ubuntu-latest
Expand Down
22 changes: 5 additions & 17 deletions .github/workflows/promote-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Cache OpenShift CLI
id: cache-oc
uses: actions/cache@v3
with:
path: /usr/local/bin/oc
key: ${{ runner.os }}-oc

- name: Install OpenShift CLI
if: steps.cache-oc.outputs.cache-hit != 'true'
run: |
OC_VERSION=3.11.0
sudo apt-get update
sudo apt-get -y install wget
wget --quiet -O oc.tar.gz "https://github.com/openshift/origin/releases/download/v${OC_VERSION}/openshift-origin-client-tools-v${OC_VERSION}-0cbc58b-linux-64bit.tar.gz"
FILE=$(tar -tf oc.tar.gz | grep '/oc$')
tar -zxf oc.tar.gz "$FILE"
sudo mv "$FILE" /usr/local/bin/oc
rm -rf oc.tar.gz openshift-origin-client-tools-v*
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: latest

- name: Checking Deployment Config changes
uses: dorny/paths-filter@v2
Expand All @@ -65,7 +51,9 @@ jobs:
run: |
cd "$GITHUB_WORKSPACE"
make server-config-test
make cron-job-test
make server-config
make cron-job

- name: Promote
run: |
Expand Down
50 changes: 13 additions & 37 deletions .github/workflows/promote-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,10 @@ jobs:
ref: ${{ github.event.inputs.ref }}
fetch-depth: 0

- name: Cache OpenShift CLI
id: cache-oc
uses: actions/cache@v3
with:
path: /usr/local/bin/oc
key: ${{ runner.os }}-oc

- name: Install OpenShift CLI
if: steps.cache-oc.outputs.cache-hit != 'true'
run: |
OC_VERSION=3.11.0
sudo apt-get update
sudo apt-get -y install wget
wget --quiet -O oc.tar.gz "https://github.com/openshift/origin/releases/download/v${OC_VERSION}/openshift-origin-client-tools-v${OC_VERSION}-0cbc58b-linux-64bit.tar.gz"
FILE=$(tar -tf oc.tar.gz | grep '/oc$')
tar -zxf oc.tar.gz "$FILE"
sudo mv "$FILE" /usr/local/bin/oc
rm -rf oc.tar.gz openshift-origin-client-tools-v*

- name: Verify OpenShift CLI installation
run: oc version
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: latest

- name: Get previous commit
id: get-prev-commit
Expand All @@ -80,6 +63,7 @@ jobs:
oc login --token="$SA_TOKEN" --server="$CLUSTER"
cd "$GITHUB_WORKSPACE"
make server-config-test
make cron-job-test
confirm:
name: Get Confirmation For Test Deployment
runs-on: ubuntu-latest
Expand Down Expand Up @@ -113,6 +97,11 @@ jobs:
- 'openshift/**'
base: ${{ steps.get-prev-commit.outputs.prev_commit }} #The commit right before the current commit

- name: Install OpenShift CLI
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: latest

- name: Apply Changes
env:
OS_NAMESPACE_SUFFIX: test
Expand All @@ -121,6 +110,7 @@ jobs:
oc login --token="$SA_TOKEN" --server="$CLUSTER"
cd "$GITHUB_WORKSPACE"
make server-config
make cron-job
promoteTest:
name: OpenShift Promotion
runs-on: ubuntu-latest
Expand All @@ -135,24 +125,10 @@ jobs:
with:
ref: ${{ github.event.inputs.ref }}

- name: Cache OpenShift CLI
id: cache-oc
uses: actions/cache@v3
with:
path: /usr/local/bin/oc
key: ${{ runner.os }}-oc

- name: Install OpenShift CLI
if: steps.cache-oc.outputs.cache-hit != 'true'
run: |
OC_VERSION=3.11.0
sudo apt-get update
sudo apt-get -y install wget
wget --quiet -O oc.tar.gz "https://github.com/openshift/origin/releases/download/v${OC_VERSION}/openshift-origin-client-tools-v${OC_VERSION}-0cbc58b-linux-64bit.tar.gz"
FILE=$(tar -tf oc.tar.gz | grep '/oc$')
tar -zxf oc.tar.gz "$FILE"
sudo mv "$FILE" /usr/local/bin/oc
rm -rf oc.tar.gz openshift-origin-client-tools-v*
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: latest

- name: Promote
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/service.run.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: '20'
node-version: '24'
- name: Execute Service Pod
env:
OS_NAMESPACE_SUFFIX: dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/service.run.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: '20'
node-version: '24'
- name: Execute Service Pod
env:
OS_NAMESPACE_SUFFIX: prod
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/service.run.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: '20'
node-version: '24'
- name: Execute Service Pod
env:
OS_NAMESPACE_SUFFIX: test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: '20'
node-version: '24'

- name: Cache node modules
id: cache-npm
Expand Down
33 changes: 6 additions & 27 deletions .husky/_/husky.sh
Original file line number Diff line number Diff line change
@@ -1,30 +1,9 @@
#!/bin/sh
if [ -z "$husky_skip_init" ]; then
debug () {
[ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1"
}
echo "husky - DEPRECATED

readonly hook_name="$(basename "$0")"
debug "starting $hook_name..."
Please remove the following two lines from $0:

if [ "$HUSKY" = "0" ]; then
debug "HUSKY env variable is set to 0, skipping hook"
exit 0
fi
#!/usr/bin/env sh
. \"\$(dirname -- \"\$0\")/_/husky.sh\"

if [ -f ~/.huskyrc ]; then
debug "sourcing ~/.huskyrc"
. ~/.huskyrc
fi

export readonly husky_skip_init=1
sh -e "$0" "$@"
exitCode="$?"

if [ $exitCode != 0 ]; then
echo "husky - $hook_name hook exited with code $exitCode (error)"
exit $exitCode
fi

exit 0
fi
They WILL FAIL in v10.0.0
"
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Client
FROM node:20-slim AS client
FROM node:24-slim AS client

# Build client
ENV HOME_CLIENT=/opt/app-root/src/app/client
Expand All @@ -12,7 +12,7 @@ ENV HOME=/tmp
RUN mkdir -p ${HOME_CLIENT}
RUN chown -R 1008111001 ${HOME_CLIENT}
WORKDIR ${HOME_CLIENT}
COPY client/package*.json ./
COPY client/package*.json client/.npmrc ./
RUN chown -R 1008040000 .

USER 1008040000
Expand All @@ -22,7 +22,7 @@ COPY client/. .
RUN INLINE_RUNTIME_CHUNK=false npm run build

# Server build stage
FROM node:20-slim AS server-builder
FROM node:24-slim AS server-builder
ENV HOME_SERVER=/opt/app-root/src/app/server
USER root

Expand All @@ -42,7 +42,7 @@ RUN mkdir -p build/migrations/assets && \
cp -r migrations/assets/* build/migrations/assets/ 2>/dev/null || true

# Server runtime stage
FROM node:20-slim AS server
FROM node:24-slim AS server
# Static env vars
ARG VERSION
ENV VERSION=$VERSION
Expand Down
11 changes: 11 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ archive-withdrawn-participants:
@docker exec $(APP_NAME)-server npm run archive-withdrawn-participants

# Local Development
local-watch-server:
@echo "Running local server in watch mode"
@npm run watch --prefix server

local-watch-client:
@echo "Running local client in watch mode"
@npm run start --prefix client

local-build:
@echo "Building local app image"
Expand Down Expand Up @@ -283,6 +290,10 @@ service-pod:
@node .pipeline/service-config.js | xargs -I{} oc process -f openshift/service.pod.yml -p APP_NAME=$(APP_NAME) -p SERVICE_CONFIG={} -p IMAGE_TAG=$(tag) -p IMAGE_NAMESPACE=$(TOOLS_NAMESPACE) | oc apply -n $(TARGET_NAMESPACE) -f -

# Cron Job
cron-job-test:
@oc -n $(TARGET_NAMESPACE) process -f openshift/in-progres-stale-clean.cronjob.yml -p APP_NAME=$(APP_NAME) -p IMAGE_TAG=$(OS_NAMESPACE_SUFFIX) -p IMAGE_NAMESPACE=$(TOOLS_NAMESPACE) | oc apply -n $(TARGET_NAMESPACE) -f - --dry-run=true
@oc -n $(TARGET_NAMESPACE) process -f openshift/open-expired-clean.cronjob.yml -p APP_NAME=$(APP_NAME) -p IMAGE_TAG=$(OS_NAMESPACE_SUFFIX) -p IMAGE_NAMESPACE=$(TOOLS_NAMESPACE) | oc apply -n $(TARGET_NAMESPACE) -f - --dry-run=true

cron-job:
@oc -n $(TARGET_NAMESPACE) process -f openshift/in-progres-stale-clean.cronjob.yml -p APP_NAME=$(APP_NAME) -p IMAGE_TAG=$(OS_NAMESPACE_SUFFIX) -p IMAGE_NAMESPACE=$(TOOLS_NAMESPACE) | oc apply -n $(TARGET_NAMESPACE) -f -
@oc -n $(TARGET_NAMESPACE) process -f openshift/open-expired-clean.cronjob.yml -p APP_NAME=$(APP_NAME) -p IMAGE_TAG=$(OS_NAMESPACE_SUFFIX) -p IMAGE_NAMESPACE=$(TOOLS_NAMESPACE) | oc apply -n $(TARGET_NAMESPACE) -f -
Expand Down
13 changes: 0 additions & 13 deletions client/.eslintrc

This file was deleted.

1 change: 1 addition & 0 deletions client/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
legacy-peer-deps=true
2 changes: 1 addition & 1 deletion client/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Used for local development
FROM node:20-slim
FROM node:24-slim

# Allow node modules to be called directly
ENV PATH=$PATH:/client/node_modules/.bin
Expand Down
2 changes: 1 addition & 1 deletion client/Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Used for local testing with Keycloak
FROM node:20-slim
FROM node:24-slim

# Allow node modules to be called directly
ENV PATH=$PATH:/client/node_modules/.bin
Expand Down
25 changes: 25 additions & 0 deletions client/craco.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module.exports = {
webpack: {
configure: (webpackConfig) => {
// Ignore source map warnings from node_modules
webpackConfig.ignoreWarnings = [
function ignoreSourcemapsloaderWarnings(warning) {
return (
warning.module &&
warning.module.resource &&
warning.module.resource.includes('node_modules') &&
warning.details &&
warning.details.includes('source-map-loader')
);
},
];
return webpackConfig;
},
},
devServer: {
setupMiddlewares: (middlewares, devServer) => {
// This replaces the deprecated onBeforeSetupMiddleware and onAfterSetupMiddleware
return middlewares;
},
},
};
35 changes: 35 additions & 0 deletions client/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import js from '@eslint/js';
import reactHooks from 'eslint-plugin-react-hooks';
import globals from 'globals';

export default [
{
ignores: ['**/node_modules/**', '**/build/**', '**/dist/**'],
},
js.configs.recommended,
{
files: ['**/*.{js,jsx}'],
plugins: {
'react-hooks': reactHooks,
},
languageOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
globals: {
...globals.browser,
...globals.node,
},
parserOptions: {
ecmaFeatures: {
jsx: true,
},
},
},
rules: {
'no-unused-vars': 'off',
'no-undef': 'error',
'no-case-declarations': 'off',
'no-constant-binary-expression': 'off',
},
},
];
Loading
Loading