From e0c3ed11d1708580f9328b873a1ab2ec06202851 Mon Sep 17 00:00:00 2001 From: Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> Date: Tue, 26 Nov 2024 16:02:49 -0800 Subject: [PATCH 01/12] fix: correct summary rows --- .../lib/excel_import/community_progress_report.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/backend/lib/excel_import/community_progress_report.ts b/app/backend/lib/excel_import/community_progress_report.ts index 6915684e12..dc8c9ab1ca 100644 --- a/app/backend/lib/excel_import/community_progress_report.ts +++ b/app/backend/lib/excel_import/community_progress_report.ts @@ -24,11 +24,11 @@ query getCcbcNumber($_rowId: Int!) { // For the summary table const TOTALS_COLUMN = 'G'; -const COMMUNITIES_IN_PLANNING_ROW = 27; -const COMMUNITIES_IN_CONSTRUCTION_ROW = 28; -const COMMUNITIES_OPERATIONAL_ROW = 29; -const OVERAL_PROJECT_STAGE_ROW = 30; -const TOTAL_NUMBER_OF_COMMUNITIES_ROW = 31; +const COMMUNITIES_IN_PLANNING_ROW = 26; +const COMMUNITIES_IN_CONSTRUCTION_ROW = 27; +const COMMUNITIES_OPERATIONAL_ROW = 28; +const OVERAL_PROJECT_STAGE_ROW = 29; +const TOTAL_NUMBER_OF_COMMUNITIES_ROW = 30; // For the community detail table const COMMUNITY_NAME_COLUMN = 'B'; From 39cde7a39eabce52f8fcaa4340c21f2a8d92c903 Mon Sep 17 00:00:00 2001 From: Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:08:39 -0800 Subject: [PATCH 02/12] fix: community progress report row buffer --- .../excel_import/community_progress_report.ts | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/app/backend/lib/excel_import/community_progress_report.ts b/app/backend/lib/excel_import/community_progress_report.ts index dc8c9ab1ca..896db6c494 100644 --- a/app/backend/lib/excel_import/community_progress_report.ts +++ b/app/backend/lib/excel_import/community_progress_report.ts @@ -24,11 +24,12 @@ query getCcbcNumber($_rowId: Int!) { // For the summary table const TOTALS_COLUMN = 'G'; -const COMMUNITIES_IN_PLANNING_ROW = 26; -const COMMUNITIES_IN_CONSTRUCTION_ROW = 27; -const COMMUNITIES_OPERATIONAL_ROW = 28; -const OVERAL_PROJECT_STAGE_ROW = 29; -const TOTAL_NUMBER_OF_COMMUNITIES_ROW = 30; +let COMMUNITIES_IN_PLANNING_ROW = 25; +let COMMUNITIES_IN_CONSTRUCTION_ROW = 27; +let COMMUNITIES_OPERATIONAL_ROW = 28; +let OVERALL_PROJECT_STAGE_ROW = 29; +let TOTAL_NUMBER_OF_COMMUNITIES_ROW = 30; +const COMMUNITIES_IN_PLANNING_TEXT = 'Number of Communities in Planning'; // For the community detail table const COMMUNITY_NAME_COLUMN = 'B'; @@ -101,6 +102,24 @@ const readSummary = async (wb, sheet_name, applicationId, reportId) => { } } + // find number of communities in planning + for ( + let row = COMMUNITIES_IN_PLANNING_ROW - 5; + row <= COMMUNITIES_IN_PLANNING_ROW + 5; + row++ + ) { + const cellValue = sheet[row]['C']; + console.log('row', row, 'cellValue', cellValue); + if (cellValue === COMMUNITIES_IN_PLANNING_TEXT) { + COMMUNITIES_IN_PLANNING_ROW = row; + COMMUNITIES_IN_CONSTRUCTION_ROW = row + 1; + COMMUNITIES_OPERATIONAL_ROW = row + 2; + OVERALL_PROJECT_STAGE_ROW = row + 3; + TOTAL_NUMBER_OF_COMMUNITIES_ROW = row + 4; + break; + } + } + const jsonData = { numberOfCommunitiesInPlanning: sheet[COMMUNITIES_IN_PLANNING_ROW][TOTALS_COLUMN], @@ -108,7 +127,7 @@ const readSummary = async (wb, sheet_name, applicationId, reportId) => { sheet[COMMUNITIES_IN_CONSTRUCTION_ROW][TOTALS_COLUMN], numberOfCommunitiesOperational: sheet[COMMUNITIES_OPERATIONAL_ROW][TOTALS_COLUMN], - overallProjectStage: sheet[OVERAL_PROJECT_STAGE_ROW][TOTALS_COLUMN], + overallProjectStage: sheet[OVERALL_PROJECT_STAGE_ROW][TOTALS_COLUMN], totalNumberOfCommunities: sheet[TOTAL_NUMBER_OF_COMMUNITIES_ROW][TOTALS_COLUMN], communityData: result, @@ -273,7 +292,7 @@ const LoadCommunityReportData = async (wb, sheet_name, req) => { const validate = req.query?.validate === 'true'; const data = await readSummary(wb, sheet_name, applicationId, reportId); - + console.log('data', data); const errorList = await ValidateData(data._jsonData, applicationId, req); if (errorList.length > 0) { From 748a346f029fee8b9265b2fb4df7ad4858bf51dc Mon Sep 17 00:00:00 2001 From: Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:14:50 -0800 Subject: [PATCH 03/12] chore: cleanup --- app/backend/lib/excel_import/community_progress_report.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/backend/lib/excel_import/community_progress_report.ts b/app/backend/lib/excel_import/community_progress_report.ts index 896db6c494..dc64837051 100644 --- a/app/backend/lib/excel_import/community_progress_report.ts +++ b/app/backend/lib/excel_import/community_progress_report.ts @@ -109,7 +109,6 @@ const readSummary = async (wb, sheet_name, applicationId, reportId) => { row++ ) { const cellValue = sheet[row]['C']; - console.log('row', row, 'cellValue', cellValue); if (cellValue === COMMUNITIES_IN_PLANNING_TEXT) { COMMUNITIES_IN_PLANNING_ROW = row; COMMUNITIES_IN_CONSTRUCTION_ROW = row + 1; @@ -292,7 +291,7 @@ const LoadCommunityReportData = async (wb, sheet_name, req) => { const validate = req.query?.validate === 'true'; const data = await readSummary(wb, sheet_name, applicationId, reportId); - console.log('data', data); + const errorList = await ValidateData(data._jsonData, applicationId, req); if (errorList.length > 0) { From cc8f8a1c9903cd37fe72fd48e13842148de934a8 Mon Sep 17 00:00:00 2001 From: CCBC Service Account <116113628+ccbc-service-account@users.noreply.github.com> Date: Thu, 19 Dec 2024 16:29:05 +0000 Subject: [PATCH 04/12] chore: release v1.218.2 --- CHANGELOG.md | 7 +++++++ db/sqitch.plan | 1 + package.json | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 590fcd929a..faf63564f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.218.2](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.218.1...v1.218.2) (2024-12-19) + +### Bug Fixes + +- community progress report row buffer ([39cde7a](https://github.com/bcgov/CONN-CCBC-portal/commit/39cde7a39eabce52f8fcaa4340c21f2a8d92c903)) +- correct summary rows ([e0c3ed1](https://github.com/bcgov/CONN-CCBC-portal/commit/e0c3ed11d1708580f9328b873a1ab2ec06202851)) + ## [1.218.1](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.218.0...v1.218.1) (2024-12-18) ### Bug Fixes diff --git a/db/sqitch.plan b/db/sqitch.plan index 2bcefb6453..f7576e83d9 100644 --- a/db/sqitch.plan +++ b/db/sqitch.plan @@ -766,3 +766,4 @@ tables/application_dependencies_001_add_applicant_insert 2024-12-09T22:35:13Z Ra @1.218.0 2024-12-10T21:09:25Z CCBC Service Account # release v1.218.0 computed_columns/application_history [computed_columns/application_history@1.213.0] 2024-11-27T23:55:47Z Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> # fix username in announcement history @1.218.1 2024-12-18T17:53:16Z CCBC Service Account # release v1.218.1 +@1.218.2 2024-12-19T16:29:04Z CCBC Service Account # release v1.218.2 diff --git a/package.json b/package.json index 0e0fdb69b7..9e8d01eda1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "CONN-CCBC-portal", - "version": "1.218.1", + "version": "1.218.2", "main": "index.js", "repository": "https://github.com/bcgov/CONN-CCBC-portal.git", "author": "Romer, Meherzad CITZ:EX ", From 1344788765f19924e24a3c7cce7d61b75759bc68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:34:49 +0000 Subject: [PATCH 05/12] chore: bump the minor-and-patch group across 1 directory with 3 updates Bumps the minor-and-patch group with 3 updates in the / directory: [softprops/action-gh-release](https://github.com/softprops/action-gh-release), [actions/upload-artifact](https://github.com/actions/upload-artifact) and [renovatebot/github-action](https://github.com/renovatebot/github-action). Updates `softprops/action-gh-release` from 2.1.0 to 2.2.0 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v2.1.0...v2.2.0) Updates `actions/upload-artifact` from 4.4.3 to 4.5.0 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882...6f51ac03b9356f520e9adb1b1b7802705f340c2b) Updates `renovatebot/github-action` from 41.0.6 to 41.0.7 - [Release notes](https://github.com/renovatebot/github-action/releases) - [Changelog](https://github.com/renovatebot/github-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/renovatebot/github-action/compare/v41.0.6...v41.0.7) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-and-patch - dependency-name: renovatebot/github-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-and-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy.yaml | 2 +- .github/workflows/scorecards.yml | 2 +- .github/workflows/test-containers.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 61ddcd3f8d..90359fd634 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -391,7 +391,7 @@ jobs: id: fetch_tag run: echo "tagVersion=$(git describe --tags $(git rev-list --tags --max-count=1))" >>$GITHUB_OUTPUT - name: Release - uses: softprops/action-gh-release@v2.1.0 + uses: softprops/action-gh-release@v2.2.0 with: generate_release_notes: true tag_name: ${{ steps.fetch_tag.outputs.tagVersion }} diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 8dac7f7909..9a11153ea0 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -49,7 +49,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # tag=v4.4.3 + uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # tag=v4.5.0 with: name: SARIF file path: results.sarif diff --git a/.github/workflows/test-containers.yaml b/.github/workflows/test-containers.yaml index 4ec1ea85ec..53144127c3 100644 --- a/.github/workflows/test-containers.yaml +++ b/.github/workflows/test-containers.yaml @@ -81,7 +81,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Self-hosted Renovate - uses: renovatebot/github-action@v41.0.6 + uses: renovatebot/github-action@v41.0.7 with: configurationFile: ./.github/renovate.json token: ${{ secrets.RENOVATE_GITHUB_TOKEN }} From c9432c9b58a4c0ab9097aecad5fc789ad176e5d8 Mon Sep 17 00:00:00 2001 From: Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> Date: Tue, 24 Dec 2024 11:00:53 -0800 Subject: [PATCH 06/12] chore: updgrade postgres, remove image --- helm/app/values.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/helm/app/values.yaml b/helm/app/values.yaml index e9e88e9858..df2c9f53e2 100644 --- a/helm/app/values.yaml +++ b/helm/app/values.yaml @@ -160,7 +160,7 @@ crunchy-postgres: nameOverride: ccbc fullnameOverride: ccbc # crunchyImage: artifacts.developer.gov.bc.ca/bcgov-docker-local/crunchy-postgres:ubi8-14.7-0 - postgresVersion: 14 + postgresVersion: 15 postGISVersion: 3.3 instances: name: hippo-ha # high availability @@ -231,7 +231,6 @@ crunchy-postgres: max_slot_wal_keep_size: 128MB # default is -1, allowing unlimited wal growth when replicas fall behind proxy: pgBouncer: - image: artifacts.developer.gov.bc.ca/bcgov-docker-local/crunchy-pgbouncer:ubi8-1.18-0 replicas: 2 requests: cpu: 2m @@ -242,7 +241,6 @@ crunchy-postgres: pgmonitor: enabled: true exporter: - image: artifacts.developer.gov.bc.ca/bcgov-docker-local/crunchy-postgres-exporter:ubi8-5.3.1-0 requests: cpu: 1m memory: 64Mi From 7725ec65e91c3c81ab49b96f642f07078777e96f Mon Sep 17 00:00:00 2001 From: Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> Date: Tue, 24 Dec 2024 11:10:40 -0800 Subject: [PATCH 07/12] chore: upgrade postgres on ccbc-db --- db/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/Dockerfile b/db/Dockerfile index 01b32fe800..eee0c6564f 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -1,5 +1,5 @@ # Docker build should be run from parent directory -FROM postgres:14-bookworm +FROM postgres:15-bookworm ENV SUMMARY="DB Schema for bcgov/CONN-CCBC-portal" \ DESCRIPTION="Sqitch migrations for the accompanying app container image" From b7a7162ab3c64c60c07e28947b6726cbffd3c520 Mon Sep 17 00:00:00 2001 From: Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> Date: Tue, 24 Dec 2024 11:27:37 -0800 Subject: [PATCH 08/12] chore: update zap ignore --- .zap/rules.tsv | 1 + 1 file changed, 1 insertion(+) diff --git a/.zap/rules.tsv b/.zap/rules.tsv index 2a53830c01..b7d548f6cb 100644 --- a/.zap/rules.tsv +++ b/.zap/rules.tsv @@ -16,3 +16,4 @@ 90034 IGNORE (Cloud Metadata Potentially Exposed) 40039 IGNORE (Web Cache Deception) 110009 IGNORE (Full Path Disclosure) +90004 IGNORE (Insufficient Site Isolation Against Spectre Vulnerability) From fd14c30470ec0d5f2a6b7a878c5c6378e89a5525 Mon Sep 17 00:00:00 2001 From: Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> Date: Tue, 24 Dec 2024 11:48:53 -0800 Subject: [PATCH 09/12] chore: indent with tabs --- .zap/rules.tsv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zap/rules.tsv b/.zap/rules.tsv index b7d548f6cb..a686c8bb6a 100644 --- a/.zap/rules.tsv +++ b/.zap/rules.tsv @@ -16,4 +16,4 @@ 90034 IGNORE (Cloud Metadata Potentially Exposed) 40039 IGNORE (Web Cache Deception) 110009 IGNORE (Full Path Disclosure) -90004 IGNORE (Insufficient Site Isolation Against Spectre Vulnerability) +90004 IGNORE (Insufficient Site Isolation Against Spectre Vulnerability) From 0233029620f5f9319c042cdf8434215b35524726 Mon Sep 17 00:00:00 2001 From: CCBC Service Account <116113628+ccbc-service-account@users.noreply.github.com> Date: Tue, 24 Dec 2024 20:06:09 +0000 Subject: [PATCH 10/12] chore: release v1.218.3 --- CHANGELOG.md | 2 ++ db/sqitch.plan | 1 + package.json | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index faf63564f0..bab45c15b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [1.218.3](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.218.2...v1.218.3) (2024-12-24) + ## [1.218.2](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.218.1...v1.218.2) (2024-12-19) ### Bug Fixes diff --git a/db/sqitch.plan b/db/sqitch.plan index f7576e83d9..01e711857d 100644 --- a/db/sqitch.plan +++ b/db/sqitch.plan @@ -767,3 +767,4 @@ tables/application_dependencies_001_add_applicant_insert 2024-12-09T22:35:13Z Ra computed_columns/application_history [computed_columns/application_history@1.213.0] 2024-11-27T23:55:47Z Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> # fix username in announcement history @1.218.1 2024-12-18T17:53:16Z CCBC Service Account # release v1.218.1 @1.218.2 2024-12-19T16:29:04Z CCBC Service Account # release v1.218.2 +@1.218.3 2024-12-24T20:06:08Z CCBC Service Account # release v1.218.3 diff --git a/package.json b/package.json index 9e8d01eda1..97a253c732 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "CONN-CCBC-portal", - "version": "1.218.2", + "version": "1.218.3", "main": "index.js", "repository": "https://github.com/bcgov/CONN-CCBC-portal.git", "author": "Romer, Meherzad CITZ:EX ", From d0b43540304a5125490eab7adf39045dffaa877c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Dec 2024 20:30:44 +0000 Subject: [PATCH 11/12] chore: bump @bcgov/bc-sans from 1.0.1 to 2.1.0 in /app Bumps [@bcgov/bc-sans](https://github.com/bcgov/bc-sans) from 1.0.1 to 2.1.0. - [Commits](https://github.com/bcgov/bc-sans/commits) --- updated-dependencies: - dependency-name: "@bcgov/bc-sans" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- app/package.json | 2 +- app/yarn.lock | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 4db106a6af..ca60f295ff 100644 --- a/app/package.json +++ b/app/package.json @@ -34,7 +34,7 @@ "@bcgov-cas/sso-express": "^3.2.0", "@bcgov-cas/sso-react": "^2.0.0", "@bcgov-ccbc/ccbc-node-sp-auth": "^1.0.0", - "@bcgov/bc-sans": "^1.0.1", + "@bcgov/bc-sans": "^2.1.0", "@button-inc/bcgov-theme": "^1.0.1", "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.0", diff --git a/app/yarn.lock b/app/yarn.lock index 93c680cee5..cd74faff30 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1447,6 +1447,11 @@ resolved "https://registry.yarnpkg.com/@bcgov/bc-sans/-/bc-sans-1.0.1.tgz#8b622032465463934319771ea92fa3df74e6c9d3" integrity sha512-4suRUBFeHcuFkwXXJu9pKJNB5Z2G3bpuLEHIq203KVCKC8KrsnqvsyUOf645TypgLwqOTOYCETiXYzfxF4gLAw== +"@bcgov/bc-sans@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@bcgov/bc-sans/-/bc-sans-2.1.0.tgz#881f626901c0bf3324c56563fa0c5045fded420a" + integrity sha512-1MesF4NAVpM5dywoJ68wNcBylHbPqg1dDV/FNuQm0BbspETGlPmfX8LG8rtrCjCAPhWuL2qRT/lBYDUMvFTUnw== + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" From 33623b8235ef9c78ed56d4a3b6bcdbb528e5f1fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Dec 2024 21:21:33 +0000 Subject: [PATCH 12/12] chore: bump @testing-library/react from 14.1.2 to 15.0.7 in /app Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 14.1.2 to 15.0.7. - [Release notes](https://github.com/testing-library/react-testing-library/releases) - [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/react-testing-library/compare/v14.1.2...v15.0.7) --- updated-dependencies: - dependency-name: "@testing-library/react" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- app/package.json | 2 +- app/yarn.lock | 132 +++-------------------------------------------- 2 files changed, 9 insertions(+), 125 deletions(-) diff --git a/app/package.json b/app/package.json index ca60f295ff..da44d8a405 100644 --- a/app/package.json +++ b/app/package.json @@ -120,7 +120,7 @@ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@testing-library/cypress": "^10.0.2", "@testing-library/jest-dom": "^6.6.3", - "@testing-library/react": "^14.1.2", + "@testing-library/react": "^15.0.7", "@testing-library/react-hooks": "^8.0.1", "@testing-library/user-event": "^14.5.2", "@types/archiver": "^6.0.3", diff --git a/app/yarn.lock b/app/yarn.lock index cd74faff30..addb1d638e 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -3656,7 +3656,7 @@ "@babel/runtime" "^7.14.6" "@testing-library/dom" "^10.1.0" -"@testing-library/dom@^10.1.0": +"@testing-library/dom@^10.0.0", "@testing-library/dom@^10.1.0": version "10.4.0" resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.4.0.tgz#82a9d9462f11d240ecadbf406607c6ceeeff43a8" integrity sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ== @@ -3670,20 +3670,6 @@ lz-string "^1.5.0" pretty-format "^27.0.2" -"@testing-library/dom@^9.0.0": - version "9.3.4" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.3.4.tgz#50696ec28376926fec0a1bf87d9dbac5e27f60ce" - integrity sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/runtime" "^7.12.5" - "@types/aria-query" "^5.0.1" - aria-query "5.1.3" - chalk "^4.1.0" - dom-accessibility-api "^0.5.9" - lz-string "^1.5.0" - pretty-format "^27.0.2" - "@testing-library/jest-dom@^6.6.3": version "6.6.3" resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-6.6.3.tgz#26ba906cf928c0f8172e182c6fe214eb4f9f2bd2" @@ -3705,13 +3691,13 @@ "@babel/runtime" "^7.12.5" react-error-boundary "^3.1.0" -"@testing-library/react@^14.1.2": - version "14.1.2" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-14.1.2.tgz#a2b9e9ee87721ec9ed2d7cfc51cc04e474537c32" - integrity sha512-z4p7DVBTPjKM5qDZ0t5ZjzkpSNb+fZy1u6bzO7kk8oeGagpPCAtgh4cx1syrfp7a+QWkM021jGqjJaxJJnXAZg== +"@testing-library/react@^15.0.7": + version "15.0.7" + resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-15.0.7.tgz#ff733ce0893c875cb5a47672e8e772897128f4ae" + integrity sha512-cg0RvEdD1TIhhkm1IeYMQxrzy0MtUNfa3minv4MjbgcYzJAZ7yD0i0lwoPOTPr+INtiXFezt2o8xMSnyHhEn2Q== dependencies: "@babel/runtime" "^7.12.5" - "@testing-library/dom" "^9.0.0" + "@testing-library/dom" "^10.0.0" "@types/react-dom" "^18.0.0" "@testing-library/user-event@^14.5.2": @@ -4744,13 +4730,6 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -aria-query@5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e" - integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ== - dependencies: - deep-equal "^2.0.5" - aria-query@5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e" @@ -6233,30 +6212,6 @@ dedent@^0.7.0: resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= -deep-equal@^2.0.5: - version "2.2.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.1.tgz#c72ab22f3a7d3503a4ca87dde976fe9978816739" - integrity sha512-lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ== - dependencies: - array-buffer-byte-length "^1.0.0" - call-bind "^1.0.2" - es-get-iterator "^1.1.3" - get-intrinsic "^1.2.0" - is-arguments "^1.1.1" - is-array-buffer "^3.0.2" - is-date-object "^1.0.5" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - isarray "^2.0.5" - object-is "^1.1.5" - object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.5.0" - side-channel "^1.0.4" - which-boxed-primitive "^1.0.2" - which-collection "^1.0.1" - which-typed-array "^1.1.9" - deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" @@ -6798,21 +6753,6 @@ es-errors@^1.2.1, es-errors@^1.3.0: resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== -es-get-iterator@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6" - integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.3" - has-symbols "^1.0.3" - is-arguments "^1.1.1" - is-map "^2.0.2" - is-set "^2.0.2" - is-string "^1.0.7" - isarray "^2.0.5" - stop-iteration-iterator "^1.0.0" - es-iterator-helpers@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.0.tgz#2f1a3ab998b30cb2d10b195b587c6d9ebdebf152" @@ -8719,7 +8659,7 @@ internal-slot@^1.0.3: has "^1.0.3" side-channel "^1.0.4" -internal-slot@^1.0.4, internal-slot@^1.0.5: +internal-slot@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== @@ -8762,14 +8702,6 @@ is-alphanumerical@^1.0.0: is-alphabetical "^1.0.0" is-decimal "^1.0.0" -is-arguments@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" @@ -8954,11 +8886,6 @@ is-installed-globally@~0.4.0: global-dirs "^3.0.0" is-path-inside "^3.0.2" -is-map@^2.0.1, is-map@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" - integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== - is-map@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e" @@ -9011,11 +8938,6 @@ is-regex@^1.1.2, is-regex@^1.1.4: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-set@^2.0.1, is-set@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" - integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== - is-set@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d" @@ -9092,11 +9014,6 @@ is-unicode-supported@^0.1.0: resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== -is-weakmap@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" - integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== - is-weakmap@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd" @@ -9109,14 +9026,6 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-weakset@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" - integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - is-weakset@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007" @@ -10731,14 +10640,6 @@ object-inspect@^1.13.1: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff" integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g== -object-is@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -11983,7 +11884,7 @@ regexp.prototype.flags@^1.4.1: define-properties "^1.1.3" functions-have-names "^1.2.2" -regexp.prototype.flags@^1.4.3, regexp.prototype.flags@^1.5.0: +regexp.prototype.flags@^1.4.3: version "1.5.0" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== @@ -12629,13 +12530,6 @@ statuses@2.0.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= -stop-iteration-iterator@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4" - integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ== - dependencies: - internal-slot "^1.0.4" - store2@^2.12.0: version "2.13.2" resolved "https://registry.yarnpkg.com/store2/-/store2-2.13.2.tgz#01ad8802ca5b445b9c316b55e72645c13a3cd7e3" @@ -13860,16 +13754,6 @@ which-builtin-type@^1.1.3: which-collection "^1.0.2" which-typed-array "^1.1.15" -which-collection@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" - integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== - dependencies: - is-map "^2.0.1" - is-set "^2.0.1" - is-weakmap "^2.0.1" - is-weakset "^2.0.1" - which-collection@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"