Skip to content

Commit

Permalink
Merge branch 'main' into PIMS-2258
Browse files Browse the repository at this point in the history
  • Loading branch information
dbarkowsky authored Dec 19, 2024
2 parents 59f4a0a + 881ab5f commit 9039bc8
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 26 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/DEV-Api-V2-image-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/DEV-App-V2-image-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions express-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
}
22 changes: 14 additions & 8 deletions react-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,36 @@
"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",
"@mui/lab": "5.0.0-alpha.170",
"@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",
"react-router-dom": "6.28.0",
"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",
Expand All @@ -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"
}
}
}
31 changes: 31 additions & 0 deletions tools/bulkEmailResend/resendEmails.ts
Original file line number Diff line number Diff line change
@@ -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)
})
})

0 comments on commit 9039bc8

Please sign in to comment.