From 0eb03160822f502eca6edbcf58db268c0e9f2be9 Mon Sep 17 00:00:00 2001 From: Manuel Rodriguez Date: Wed, 13 Mar 2024 17:37:26 -0700 Subject: [PATCH] Fix PSP-7927 (#3862) * Updated timeouts to be 30s instead of 3s when retrieving information for adding properties * Fixed lint * Added timeout for subdivision --------- Co-authored-by: Alejandro Sanchez --- .../propertyPicker/LeasePropertySelector.tsx | 2 +- .../add/AcquisitionPropertiesSubForm.tsx | 2 +- .../consolidation/AddConsolidationContainer.tsx | 2 +- .../form/DispositionPropertiesSubForm.tsx | 2 +- .../research/add/ResearchProperties.tsx | 2 +- .../shared/update/properties/UpdateProperties.tsx | 5 ++++- .../subdivision/AddSubdivisionContainer.tsx | 2 +- source/frontend/src/mocks/msw/handlers.ts | 15 ++++++++------- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/source/frontend/src/features/leases/shared/propertyPicker/LeasePropertySelector.tsx b/source/frontend/src/features/leases/shared/propertyPicker/LeasePropertySelector.tsx index 748299c7e6..b1b680b26d 100644 --- a/source/frontend/src/features/leases/shared/propertyPicker/LeasePropertySelector.tsx +++ b/source/frontend/src/features/leases/shared/propertyPicker/LeasePropertySelector.tsx @@ -109,7 +109,7 @@ export const LeasePropertySelector: React.FunctionComponent { const formProperty = PropertyForm.fromMapProperty(property); if (property.pid) { - const bcaSummary = await getPrimaryAddressByPid(property.pid, 3000); + const bcaSummary = await getPrimaryAddressByPid(property.pid, 30000); formProperty.address = bcaSummary?.address ? AddressForm.fromBcaAddress(bcaSummary?.address) : undefined; diff --git a/source/frontend/src/features/mapSideBar/consolidation/AddConsolidationContainer.tsx b/source/frontend/src/features/mapSideBar/consolidation/AddConsolidationContainer.tsx index 00f55cfc5b..b838a64fc3 100644 --- a/source/frontend/src/features/mapSideBar/consolidation/AddConsolidationContainer.tsx +++ b/source/frontend/src/features/mapSideBar/consolidation/AddConsolidationContainer.tsx @@ -61,7 +61,7 @@ const AddConsolidationContainer: React.FC = ({ const getAddress = useCallback( async (pid: string): Promise => { - const bcaSummary = await getPrimaryAddressByPid(pid, 3000); + const bcaSummary = await getPrimaryAddressByPid(pid, 30000); return bcaSummary?.address ? AddressForm.fromBcaAddress(bcaSummary?.address) : undefined; }, [getPrimaryAddressByPid], diff --git a/source/frontend/src/features/mapSideBar/disposition/form/DispositionPropertiesSubForm.tsx b/source/frontend/src/features/mapSideBar/disposition/form/DispositionPropertiesSubForm.tsx index 96148f8c38..a169b3c84c 100644 --- a/source/frontend/src/features/mapSideBar/disposition/form/DispositionPropertiesSubForm.tsx +++ b/source/frontend/src/features/mapSideBar/disposition/form/DispositionPropertiesSubForm.tsx @@ -41,7 +41,7 @@ const DispositionPropertiesSubForm: React.FunctionComponent< return promise.then(async () => { const formProperty = PropertyForm.fromMapProperty(property); if (property.pid) { - const bcaSummary = await getPrimaryAddressByPid(property.pid, 3000); + const bcaSummary = await getPrimaryAddressByPid(property.pid, 30000); formProperty.address = bcaSummary?.address ? AddressForm.fromBcaAddress(bcaSummary?.address) : undefined; diff --git a/source/frontend/src/features/mapSideBar/research/add/ResearchProperties.tsx b/source/frontend/src/features/mapSideBar/research/add/ResearchProperties.tsx index 9b9113b26a..7f68a8cc9c 100644 --- a/source/frontend/src/features/mapSideBar/research/add/ResearchProperties.tsx +++ b/source/frontend/src/features/mapSideBar/research/add/ResearchProperties.tsx @@ -35,7 +35,7 @@ const ResearchProperties: React.FunctionComponent { const formProperty = PropertyForm.fromMapProperty(property); if (property.pid) { - const bcaSummary = await getPrimaryAddressByPid(property.pid, 3000); + const bcaSummary = await getPrimaryAddressByPid(property.pid, 30000); formProperty.address = bcaSummary?.address ? AddressForm.fromBcaAddress(bcaSummary?.address) : undefined; diff --git a/source/frontend/src/features/mapSideBar/shared/update/properties/UpdateProperties.tsx b/source/frontend/src/features/mapSideBar/shared/update/properties/UpdateProperties.tsx index ff2a8a2564..5d52817f58 100644 --- a/source/frontend/src/features/mapSideBar/shared/update/properties/UpdateProperties.tsx +++ b/source/frontend/src/features/mapSideBar/shared/update/properties/UpdateProperties.tsx @@ -155,7 +155,10 @@ export const UpdateProperties: React.FunctionComponent< return promise.then(async () => { const formProperty = PropertyForm.fromMapProperty(property); if (property.pid) { - const bcaSummary = await getPrimaryAddressByPid(property.pid, 3000); + const bcaSummary = await getPrimaryAddressByPid( + property.pid, + 30000, + ); formProperty.address = bcaSummary?.address ? AddressForm.fromBcaAddress(bcaSummary?.address) : undefined; diff --git a/source/frontend/src/features/mapSideBar/subdivision/AddSubdivisionContainer.tsx b/source/frontend/src/features/mapSideBar/subdivision/AddSubdivisionContainer.tsx index 5d276bd2bd..532174a050 100644 --- a/source/frontend/src/features/mapSideBar/subdivision/AddSubdivisionContainer.tsx +++ b/source/frontend/src/features/mapSideBar/subdivision/AddSubdivisionContainer.tsx @@ -56,7 +56,7 @@ const AddSubdivisionContainer: React.FC = ({ onCl const getAddress = useCallback( async (pid: string): Promise => { - const bcaSummary = await getPrimaryAddressByPid(pid, 3000); + const bcaSummary = await getPrimaryAddressByPid(pid, 30000); return bcaSummary?.address ? AddressForm.fromBcaAddress(bcaSummary?.address) : undefined; }, [getPrimaryAddressByPid], diff --git a/source/frontend/src/mocks/msw/handlers.ts b/source/frontend/src/mocks/msw/handlers.ts index f6445170ca..d2c8ddec97 100644 --- a/source/frontend/src/mocks/msw/handlers.ts +++ b/source/frontend/src/mocks/msw/handlers.ts @@ -11,17 +11,18 @@ import { export const handlers = [ rest.get('https://delivery.apps.gov.bc.ca/ext/sgw/geo.bca', (req, res, ctx) => { - if (req.url.search.includes('BCA_FOLIO_ADDRESSES_SV')) { + const search = req.url.search; + if (search.includes('BCA_FOLIO_ADDRESSES_SV')) { return res(ctx.delay(500), ctx.status(200), ctx.json(getMockAddresses())); - } else if (req.url.search.includes('BCA_FOLIO_LEGAL_DESCRIPTS_SV')) { - return res(ctx.delay(500), ctx.status(200), ctx.json(getMockLegalDescriptions())); - } else if (req.url.search.includes('BCA_FOLIO_GNRL_PROP_VALUES_SV')) { + } else if (search.includes('BCA_FOLIO_LEGAL_DESCRIPTS_SV')) { + return res(ctx.delay(5000), ctx.status(200), ctx.json(getMockLegalDescriptions())); + } else if (search.includes('BCA_FOLIO_GNRL_PROP_VALUES_SV')) { return res(ctx.delay(500), ctx.status(200), ctx.json(getMockValues())); - } else if (req.url.search.includes('BCA_FOLIO_SALES_SV')) { + } else if (search.includes('BCA_FOLIO_SALES_SV')) { return res(ctx.delay(500), ctx.status(200), ctx.json(getMockSales())); - } else if (req.url.search.includes('BCA_FOLIO_DESCRIPTIONS_SV')) { + } else if (search.includes('BCA_FOLIO_DESCRIPTIONS_SV')) { return res(ctx.delay(500), ctx.status(200), ctx.json(getMockDescription())); - } else if (req.url.search.includes('BCA_FOLIO_LAND_CHARS_SV')) { + } else if (search.includes('BCA_FOLIO_LAND_CHARS_SV')) { return res(ctx.delay(500), ctx.status(200), ctx.json(getMockLandChars())); } }),