From 23ebba9e11b5c218dd28f6877eacadcc4371df61 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Nov 2022 00:53:24 +0000 Subject: [PATCH 1/5] CI: Bump version to v3.0.0-40.32 --- source/backend/api/Pims.Api.csproj | 4 ++-- source/frontend/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj index c2acf8439e..1f4f119443 100644 --- a/source/backend/api/Pims.Api.csproj +++ b/source/backend/api/Pims.Api.csproj @@ -2,8 +2,8 @@ 0ef6255f-9ea0-49ec-8c65-c172304b4926 - 3.0.0-40.31 - 3.0.0-40.31 + 3.0.0-40.32 + 3.0.0-40.32 3.0.0.40 true 16BC0468-78F6-4C91-87DA-7403C919E646 diff --git a/source/frontend/package.json b/source/frontend/package.json index 09335d9597..92fa0a63e9 100644 --- a/source/frontend/package.json +++ b/source/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "3.0.0-40.31", + "version": "3.0.0-40.32", "private": true, "dependencies": { "@bcgov/bc-sans": "1.0.1", From e377bcd98ab8ccd357886a1646014c855f634991 Mon Sep 17 00:00:00 2001 From: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com> Date: Wed, 23 Nov 2022 17:15:56 -0800 Subject: [PATCH 2/5] psp-4949 correct display of non-inventory properties. (#2456) * psp-4949 correct display of non-inventory properties. * only throw non-axios errors if throwerror is true. --- .../src/features/mapSideBar/MotiInventoryHeader.tsx | 4 +++- .../src/hooks/pims-api/useApiRequestWrapper.ts | 2 +- source/frontend/src/hooks/useComposedProperties.ts | 13 ++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/source/frontend/src/features/mapSideBar/MotiInventoryHeader.tsx b/source/frontend/src/features/mapSideBar/MotiInventoryHeader.tsx index 8b24699104..3bb3552cea 100644 --- a/source/frontend/src/features/mapSideBar/MotiInventoryHeader.tsx +++ b/source/frontend/src/features/mapSideBar/MotiInventoryHeader.tsx @@ -27,7 +27,9 @@ export const MotiInventoryHeader: React.FunctionComponent diff --git a/source/frontend/src/hooks/pims-api/useApiRequestWrapper.ts b/source/frontend/src/hooks/pims-api/useApiRequestWrapper.ts index 95393c40ee..bc04cc73f3 100644 --- a/source/frontend/src/hooks/pims-api/useApiRequestWrapper.ts +++ b/source/frontend/src/hooks/pims-api/useApiRequestWrapper.ts @@ -80,7 +80,7 @@ export const useApiRequestWrapper = < onSuccess && onSuccess(response); return response; } catch (e) { - if (!axios.isAxiosError(e)) { + if (!axios.isAxiosError(e) && throwError) { throw e; } if (!isMounted()) { diff --git a/source/frontend/src/hooks/useComposedProperties.ts b/source/frontend/src/hooks/useComposedProperties.ts index 8cc91e0b10..2503529e31 100644 --- a/source/frontend/src/hooks/useComposedProperties.ts +++ b/source/frontend/src/hooks/useComposedProperties.ts @@ -41,7 +41,7 @@ export const useComposedProperties = ({ parcelMapFullyAttributed.name, ); const { getSummaryWrapper } = useBcAssessmentLayer(bcAssessment.url, bcAssessment.names); - const retrievedPid = getApiPropertyWrapper?.response?.pid?.toString(); + const retrievedPid = getApiPropertyWrapper?.response?.pid?.toString() ?? pid?.toString(); const retrievedPin = getApiPropertyWrapper?.response?.pin?.toString(); const typeCheckWrapper = useDeepCompareCallback( @@ -74,11 +74,14 @@ export const useComposedProperties = ({ const executeBcAssessmentSummary = getSummaryWrapper.execute; useEffect(() => { - if (!!retrievedPid) { - typeCheckWrapper(() => executeGetLtsa(retrievedPid), PROPERTY_TYPES.LTSA); - typeCheckWrapper(() => findByPid(retrievedPid), PROPERTY_TYPES.PARCEL_MAP); + if (retrievedPid !== undefined) { + typeCheckWrapper(() => executeGetLtsa(retrievedPid ?? ''), PROPERTY_TYPES.LTSA); typeCheckWrapper( - () => executeBcAssessmentSummary(retrievedPid), + () => findByPid((retrievedPid ?? '').padStart(9, '0'), true), + PROPERTY_TYPES.PARCEL_MAP, + ); + typeCheckWrapper( + () => executeBcAssessmentSummary(retrievedPid ?? ''), PROPERTY_TYPES.BC_ASSESSMENT, ); } else if (!!retrievedPin) { From 6a4f69fa24e744f4bc535ecb30f2ca7e739c9520 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Nov 2022 01:16:14 +0000 Subject: [PATCH 3/5] CI: Bump version to v3.0.0-40.33 --- source/backend/api/Pims.Api.csproj | 4 ++-- source/frontend/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj index 1f4f119443..3c0dbefb02 100644 --- a/source/backend/api/Pims.Api.csproj +++ b/source/backend/api/Pims.Api.csproj @@ -2,8 +2,8 @@ 0ef6255f-9ea0-49ec-8c65-c172304b4926 - 3.0.0-40.32 - 3.0.0-40.32 + 3.0.0-40.33 + 3.0.0-40.33 3.0.0.40 true 16BC0468-78F6-4C91-87DA-7403C919E646 diff --git a/source/frontend/package.json b/source/frontend/package.json index 92fa0a63e9..d8aac94c3d 100644 --- a/source/frontend/package.json +++ b/source/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "3.0.0-40.32", + "version": "3.0.0-40.33", "private": true, "dependencies": { "@bcgov/bc-sans": "1.0.1", From e61b3bffd55e43aaa9d2c7ef61ecd04e4dd6b8c4 Mon Sep 17 00:00:00 2001 From: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com> Date: Wed, 23 Nov 2022 17:32:37 -0800 Subject: [PATCH 4/5] prevent formik submit from refreshing the page. (#2455) * prevent formik submit from refreshing the page. * snapshot updates. Co-authored-by: Smith --- .../documents/list/DocumentFilter/DocumentFilterForm.tsx | 6 +++++- .../__snapshots__/DocumentFilterForm.test.tsx.snap | 4 ++-- .../list/__snapshots__/DocumentListView.test.tsx.snap | 4 ++-- .../documents/__snapshots__/DocumentsPage.test.tsx.snap | 2 +- .../detail/__snapshots__/ActivityForm.test.tsx.snap | 2 +- .../detail/__snapshots__/ActivityView.test.tsx.snap | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/source/frontend/src/features/documents/list/DocumentFilter/DocumentFilterForm.tsx b/source/frontend/src/features/documents/list/DocumentFilter/DocumentFilterForm.tsx index b7d8941a62..0a34ea5808 100644 --- a/source/frontend/src/features/documents/list/DocumentFilter/DocumentFilterForm.tsx +++ b/source/frontend/src/features/documents/list/DocumentFilter/DocumentFilterForm.tsx @@ -62,7 +62,11 @@ export const DocumentFilterForm = (props: IDocumentFilterFormProps) => { - + formikProps.handleSubmit()} + type="button" + disabled={formikProps.isSubmitting} + />
Date: Thu, 24 Nov 2022 01:32:54 +0000 Subject: [PATCH 5/5] CI: Bump version to v3.0.0-40.34 --- source/backend/api/Pims.Api.csproj | 4 ++-- source/frontend/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj index 3c0dbefb02..83409711b3 100644 --- a/source/backend/api/Pims.Api.csproj +++ b/source/backend/api/Pims.Api.csproj @@ -2,8 +2,8 @@ 0ef6255f-9ea0-49ec-8c65-c172304b4926 - 3.0.0-40.33 - 3.0.0-40.33 + 3.0.0-40.34 + 3.0.0-40.34 3.0.0.40 true 16BC0468-78F6-4C91-87DA-7403C919E646 diff --git a/source/frontend/package.json b/source/frontend/package.json index d8aac94c3d..1d82396487 100644 --- a/source/frontend/package.json +++ b/source/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "3.0.0-40.33", + "version": "3.0.0-40.34", "private": true, "dependencies": { "@bcgov/bc-sans": "1.0.1",