From 278d30a25f971baafb10916ae07b4af6d00e7f46 Mon Sep 17 00:00:00 2001 From: Dylan Barkowsky <37922247+dbarkowsky@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:44:37 -0800 Subject: [PATCH 1/4] PIMS-2250 API Dependency Updates (#2878) --- express-api/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/express-api/package.json b/express-api/package.json index b730bb1f54..28a1b421cc 100644 --- a/express-api/package.json +++ b/express-api/package.json @@ -41,7 +41,7 @@ "typeorm-naming-strategies": "4.1.0", "winston": "3.17.0", "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz", - "zod": "3.23.3" + "zod": "3.24.0" }, "devDependencies": { "@eslint/js": "9.16.0", @@ -69,6 +69,6 @@ "ts-jest": "29.2.0", "tsc-alias": "1.8.8", "typescript": "5.7.2", - "typescript-eslint": "8.17.0" + "typescript-eslint": "8.18.0" } } From 64dfdc4e5d29b010a296e1d5f8d3dfe31f4b4ea9 Mon Sep 17 00:00:00 2001 From: Dylan Barkowsky <37922247+dbarkowsky@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:03:40 -0800 Subject: [PATCH 2/4] PIMS-2251 Frontend Dependency Updates (#2879) --- react-app/package.json | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/react-app/package.json b/react-app/package.json index 6a5199df14..fa6b0b7c6c 100644 --- a/react-app/package.json +++ b/react-app/package.json @@ -16,8 +16,8 @@ "dependencies": { "@bcgov/bc-sans": "2.1.0", "@bcgov/citz-imb-sso-react": "1.0.0-alpha7", - "@emotion/react": "11.13.0", - "@emotion/styled": "11.13.0", + "@emotion/react": "11.14.0", + "@emotion/styled": "11.14.0", "@mdi/js": "7.4.47", "@mdi/react": "1.6.1", "@mui/icons-material": "6.1.0", @@ -25,12 +25,13 @@ "@mui/material": "6.1.2", "@mui/x-data-grid": "7.23.0", "@mui/x-date-pickers": "7.23.0", + "@react-leaflet/core": "2.1.0", "@turf/turf": "7.1.0", "dayjs": "1.11.10", "react": "18.3.1", "react-dom": "18.3.1", "react-error-boundary": "4.1.2", - "react-hook-form": "7.53.0", + "react-hook-form": "7.54.0", "react-leaflet": "4.2.1", "react-leaflet-draw": "0.20.4", "react-plugin": "3.0.0-alpha.4", @@ -38,13 +39,13 @@ "supercluster": "8.0.1", "use-supercluster": "1.2.0", "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz", - "zod": "3.23.8" + "zod": "3.24.0" }, "devDependencies": { "@babel/preset-env": "7.26.0", - "@babel/preset-react": "7.25.9", + "@babel/preset-react": "7.26.3", "@testing-library/jest-dom": "6.6.3", - "@testing-library/react": "16.0.0", + "@testing-library/react": "16.1.0", "@types/geojson": "7946.0.14", "@types/jest": "29.5.11", "@types/leaflet": "1.9.9", @@ -62,8 +63,13 @@ "ts-jest": "29.2.0", "ts-node": "10.9.2", "typescript": "5.7.2", - "typescript-eslint": "8.17.0", - "vite": "5.4.6", + "typescript-eslint": "8.18.0", + "vite": "6.0.3", "vite-tsconfig-paths": "5.1.2" + }, + "overrides": { + "@vitejs/plugin-react": { + "vite": "6.0.3" + } } } From 1932f6e269b05f8aac69b5e7551379aeeb187656 Mon Sep 17 00:00:00 2001 From: Dylan Barkowsky <37922247+dbarkowsky@users.noreply.github.com> Date: Tue, 17 Dec 2024 14:44:30 -0800 Subject: [PATCH 3/4] PIMS-2252 Notification Script (#2880) Co-authored-by: Sharala-Perumal <80914899+Sharala-Perumal@users.noreply.github.com> --- tools/bulkEmailResend/resendEmails.ts | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 tools/bulkEmailResend/resendEmails.ts diff --git a/tools/bulkEmailResend/resendEmails.ts b/tools/bulkEmailResend/resendEmails.ts new file mode 100644 index 0000000000..5bcb9d7a48 --- /dev/null +++ b/tools/bulkEmailResend/resendEmails.ts @@ -0,0 +1,31 @@ +/** + * This script takes from a JSON list of notifications and resends those notifications. + * The only necessary property of the notification is the "id". + * Get the token from your browser session. You must be an admin for this to work. + * Drop the JSON file in this same folder and adjust the file name to use. + * I ran this using Deno. Adjustments may be needed with other runtimes. + */ + +import notifsToResend from './notif_ids_to_resend.json' with { type: "json" }; + +const token = ""; + +const targetUrl = "https://pims.gov.bc.ca/api/v2/notifications/queue" + +notifsToResend.forEach(notif => { + fetch(`${targetUrl}/${notif.id}`, { + method: 'PUT', + headers: { + Authorization: `Bearer ${token}`, + 'Content-Type': 'application/json', + }, + }).then(async (value: Response) => { + if (value.status == 200){ + console.log(notif.id, "Success") + } else { + console.log(notif.id, value.status, await value.text()) + } + }).catch((reason: any) => { + console.log(notif.id, reason) + }) +}) From 881ab5fdf82f9b7940db1ce1d1d4078ba2dc3ec4 Mon Sep 17 00:00:00 2001 From: Manish Sihag Date: Wed, 18 Dec 2024 11:41:19 -0800 Subject: [PATCH 4/4] remove oc login dependency from GH actions (#2885) --- .github/workflows/DEV-Api-V2-image-build.yml | 8 -------- .github/workflows/DEV-App-V2-image-build.yml | 9 +-------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/DEV-Api-V2-image-build.yml b/.github/workflows/DEV-Api-V2-image-build.yml index dc411bf568..b0e496195d 100644 --- a/.github/workflows/DEV-Api-V2-image-build.yml +++ b/.github/workflows/DEV-Api-V2-image-build.yml @@ -19,14 +19,6 @@ jobs: with: fetch-depth: 0 - # login to the Openshift Cluster - - name: Login to Openshift - uses: redhat-actions/oc-login@v1 - with: - openshift_server_url: ${{ secrets.OPENSHIFT_SERVER_URL }} - openshift_token: ${{ secrets.OPENSHIFT_SA_TOOLS_TOKEN }} - namespace: ${{ secrets.OPENSHIFT_TOOLS_NAMESPACE }} - # Login to BC Gov Docker Image Repository - name: Login to Openshift Docker run: | diff --git a/.github/workflows/DEV-App-V2-image-build.yml b/.github/workflows/DEV-App-V2-image-build.yml index dac861d300..edec644619 100644 --- a/.github/workflows/DEV-App-V2-image-build.yml +++ b/.github/workflows/DEV-App-V2-image-build.yml @@ -19,14 +19,7 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - # Login to the Openshift Cluster - - name: Login to Openshift - uses: redhat-actions/oc-login@v1 - with: - openshift_server_url: ${{ secrets.OPENSHIFT_SERVER_URL }} - openshift_token: ${{ secrets.OPENSHIFT_SA_TOOLS_TOKEN }} - namespace: ${{ secrets.OPENSHIFT_TOOLS_NAMESPACE }} + # Login to BC Gov Docker Image Repository - name: Login to Openshift Docker