PSP-5951 refactor left hand file navigation - Acquisition ONLY #3288

asanchezr · 2023-06-23T22:55:38Z

Left hand sidebar navigation refactored to use routing instead of internal state. Only applies to acquisition file forms (for now)

File routing

File Property routing

github-actions · 2023-06-23T22:57:45Z

✅ No secrets were detected in the code.

codecov · 2023-06-23T23:08:48Z

Codecov Report

Merging #3288 (ea9ec62) into dev (2d80131) will increase coverage by 3.60%.
The diff coverage is 51.70%.

❗ Current head ea9ec62 differs from pull request most recent head 9582015. Consider uploading reports for the commit 9582015 to get more accurate results

@@            Coverage Diff             @@
##              dev    #3288      +/-   ##
==========================================
+ Coverage   72.59%   76.19%   +3.60%     
==========================================
  Files        1291      818     -473     
  Lines       29944    16161   -13783     
  Branches     5527     4469    -1058     
==========================================
- Hits        21737    12314    -9423     
+ Misses       7968     3847    -4121     
+ Partials      239        0     -239

Flag	Coverage Δ
unittests	`76.19% <51.70%> (+3.60%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
...src/features/mapSideBar/property/InventoryTabs.tsx	`42.85% <0.00%> (-7.15%)`	⬇️
...apSideBar/router/CompensationRequisitionRouter.tsx	`71.42% <0.00%> (ø)`
...ures/mapSideBar/acquisition/FilePropertyRouter.tsx	`8.33% <8.33%> (ø)`
...eatures/mapSideBar/acquisition/AcquisitionView.tsx	`42.85% <34.88%> (+6.74%)`	⬆️
...tures/mapSideBar/acquisition/AcquisitionRouter.tsx	`54.54% <54.54%> (ø)`
...apSideBar/acquisition/tabs/AcquisitionFileTabs.tsx	`76.31% <58.33%> (-0.61%)`	⬇️
...mapSideBar/shared/detail/PropertyFileContainer.tsx	`80.00% <63.63%> (-8.00%)`	⬇️
...es/mapSideBar/acquisition/AcquisitionContainer.tsx	`91.48% <88.00%> (-1.94%)`	⬇️
.../mapSideBar/acquisition/common/AcquisitionMenu.tsx	`96.15% <90.90%> (-3.85%)`	⬇️
source/frontend/src/features/account/Login.tsx	`93.10% <100.00%> (+0.24%)`	⬆️
... and 3 more

... and 562 files with indirect coverage changes

github-actions · 2023-06-26T18:15:52Z

✅ No secrets were detected in the code.

github-actions · 2023-06-26T18:50:39Z

✅ No secrets were detected in the code.

devinleighsmith · 2023-06-26T19:39:19Z

source/frontend/src/features/mapSideBar/acquisition/FilePropertyRouter.tsx

+ const properties = acquisitionFile?.fileProperties || [];
+ const selectedPropertyIndex = selectedMenuIndex - 1;
+ const acquisitionFileProperty = properties[selectedPropertyIndex];
+ if (!!acquisitionFileProperty.file) {


received a dereference error from this when accessing a non-existing property index.
This is actually a realistic test case in the case where a user tries to access an old link to a property previously associated to an acquisition file that has since been removed. (Which could also occur in the case of simultaneous editing of the property). Would be nice to handle this case more gracefully with a more readable error message.

I see. Didn't consider that edge case. Will update the error message.

Fixed. We show a toast now and also redirect to File Details screen when accessing a non-existing property index.

devinleighsmith · 2023-06-26T19:42:00Z

our default handling of when a file fails to load is not very good. Predates this change so I'll log tech debt separately.

devinleighsmith · 2023-06-26T19:46:32Z

source/frontend/src/features/mapSideBar/acquisition/AcquisitionRouter.tsx

+ }
+
+ // render edit forms
+ if (props.isEditing) {


what should we do if we are editing and our path doesn't match one of these? currently we display an empty edit screen.

The old code in ViewSelector throws an error - throw Error('Active edit form not defined');
I can create a default route that does the same

Fixed. We redirect to the default File tab (file details)

devinleighsmith · 2023-06-26T19:47:48Z

source/frontend/src/features/mapSideBar/acquisition/FilePropertyRouter.tsx

+ const fileProperty = getAcquisitionFileProperty(props.acquisitionFile, props.selectedMenuIndex);
+
+ // render edit forms
+ if (props.isEditing) {


same question here.

I can throw an error like the old code used to do or redirect to file/property details if route doesn't match. Not sure what's better

Fixed. We redirect to the default property tab (property details)

github-actions · 2023-06-26T21:09:18Z

✅ No secrets were detected in the code.

github-actions · 2023-06-27T00:22:31Z

✅ No secrets were detected in the code.

…ting

github-actions · 2023-06-27T16:48:26Z

✅ No secrets were detected in the code.

…ting

github-actions · 2023-06-27T22:57:01Z

✅ No secrets were detected in the code.

* Automation test - Stabilization of some automated features (#3285) * Automation Projects * Automation - Projects and Products automation * Leases refactoring * Leases refactoring * Acquisition Files refactoring * Automation fixes * Automation - stabilization of some automation features --------- Co-authored-by: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com> * PSP-5111 * CI: Bump version to v3.2.0-56.18 * CI: Bump version to v3.2.0-56.19 * PSP-6286 : Restrict changing final compensation requisition status back to draft (#3281) --------- Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com> * CI: Bump version to v3.2.0-56.20 * PSP-5715 : Sec3/Sec6 add forms to acquisition file (#3292) Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com> * CI: Bump version to v3.2.0-56.21 * Psp 6322 - lease and license refactor (#3253) * psp-6322 lease refactor. * merge corrections. * lint corrections. * code review updates. * merge corrections. * test corrections. * CI: Bump version to v3.2.0-56.22 * psp-5361: fix link name for financial codes in admin tools (#3291) * CI: Bump version to v3.2.0-56.23 * Bump DEV version - IS57 (#3295) * CI: Bump version to v3.2.0-57.1 * PSP-5951 refactor left hand file navigation - Acquisition ONLY (#3288) * Update useQuery global hook * Update shared tabbed forms * Refactor property tabs to work with state OR routing * Refactor acquisition left hand navigation to use routing * Remove setContainerState callback from acquisition forms * Test corrections * Improve tab names for properties * Set header title based on current tab route * Fix routing issue with requisition compensations * Update snapshots * Fix failing tests * Fix bug when removing property from File * Add tests for routing in Acquisition View * Redirect to default tabs when editing and path doesn't match * Test corrections * Fix dereference error when accessing non-existing property index * Remove unused code * Move router components to router folder * Test corrections * CI: Bump version to v3.2.0-57.2 * psp-5791: add assignee to tenant types (#3290) * CI: Bump version to v3.2.0-57.3 * psp-6246 increase keycloak sync resiliancy via polly, also update deprecated calls from keycloak api. (#3294) * CI: Bump version to v3.2.0-57.4 * PSP-5716, PSP-5717, PSP-5719: Expropriation forms 1, 5 and 9 (#3303) * WIP * Code refactor to accommodate expropriation forms * Fix styling for ContactPicker * WIP - Expr Form1 * ContactInputView fixes * Refactor interest holder property table into generic file property table * Expropriation Form1 - WIP * Create generic wrapper around form items to provide validation error feedback * Add impacted properties table to Expropriation Form 1 * Update snapshots * Add remaining expropriation forms * Make forms more testable * Unit tests * CI: Bump version to v3.2.0-57.5 * psp-5860 limit lease and license access by region. (#3298) * psp-5860 limit lease and license access by region. * PR updates. * lint fixes. * fix null vs undefined on project display. * correct null vs undefined at model level. * removed dead code. * CI: Bump version to v3.2.0-57.6 * psp-6428 fix layers colors (#3304) Co-authored-by: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com> Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com> * CI: Bump version to v3.2.0-57.7 * Merge fixes * CI: Bump version to v4.0.0-57.8 --------- Co-authored-by: Sue Tairaku <42981334+stairaku@users.noreply.github.com> Co-authored-by: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com> Co-authored-by: PryancaJSharma <99448336+PryancaJSharma@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Eduardo <eddherrera@users.noreply.github.com> Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com> Co-authored-by: Aman Monga <53246811+buddy326@users.noreply.github.com>

* psp-6425 ensure that a new property added to a lease shows up on the map without requiring manual refresh. (#3296) * psp-6442 filter expired codes, correct code value displays. (#3300) * HOTFIX: Psp 6408 - separate unmounted vs. error map search behaviour. (#3297) * separate unmounted vs error behaviour on usemapsearch. * test corrections. * correct try/catch location. * psp-6499 ensure access request region is being populated when accepting an AR. (#3301) * financial activity code instead of id, concurrency control and update corrections. (#3305) * bump version number for 4.0 (#3306) * Fix issue where bad tenant data can cause an NPE. (#3309) * TEST Release - IS57 (#3312) * Automation test - Stabilization of some automated features (#3285) * Automation Projects * Automation - Projects and Products automation * Leases refactoring * Leases refactoring * Acquisition Files refactoring * Automation fixes * Automation - stabilization of some automation features --------- Co-authored-by: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com> * PSP-5111 * CI: Bump version to v3.2.0-56.18 * CI: Bump version to v3.2.0-56.19 * PSP-6286 : Restrict changing final compensation requisition status back to draft (#3281) --------- Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com> * CI: Bump version to v3.2.0-56.20 * PSP-5715 : Sec3/Sec6 add forms to acquisition file (#3292) Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com> * CI: Bump version to v3.2.0-56.21 * Psp 6322 - lease and license refactor (#3253) * psp-6322 lease refactor. * merge corrections. * lint corrections. * code review updates. * merge corrections. * test corrections. * CI: Bump version to v3.2.0-56.22 * psp-5361: fix link name for financial codes in admin tools (#3291) * CI: Bump version to v3.2.0-56.23 * Bump DEV version - IS57 (#3295) * CI: Bump version to v3.2.0-57.1 * PSP-5951 refactor left hand file navigation - Acquisition ONLY (#3288) * Update useQuery global hook * Update shared tabbed forms * Refactor property tabs to work with state OR routing * Refactor acquisition left hand navigation to use routing * Remove setContainerState callback from acquisition forms * Test corrections * Improve tab names for properties * Set header title based on current tab route * Fix routing issue with requisition compensations * Update snapshots * Fix failing tests * Fix bug when removing property from File * Add tests for routing in Acquisition View * Redirect to default tabs when editing and path doesn't match * Test corrections * Fix dereference error when accessing non-existing property index * Remove unused code * Move router components to router folder * Test corrections * CI: Bump version to v3.2.0-57.2 * psp-5791: add assignee to tenant types (#3290) * CI: Bump version to v3.2.0-57.3 * psp-6246 increase keycloak sync resiliancy via polly, also update deprecated calls from keycloak api. (#3294) * CI: Bump version to v3.2.0-57.4 * PSP-5716, PSP-5717, PSP-5719: Expropriation forms 1, 5 and 9 (#3303) * WIP * Code refactor to accommodate expropriation forms * Fix styling for ContactPicker * WIP - Expr Form1 * ContactInputView fixes * Refactor interest holder property table into generic file property table * Expropriation Form1 - WIP * Create generic wrapper around form items to provide validation error feedback * Add impacted properties table to Expropriation Form 1 * Update snapshots * Add remaining expropriation forms * Make forms more testable * Unit tests * CI: Bump version to v3.2.0-57.5 * psp-5860 limit lease and license access by region. (#3298) * psp-5860 limit lease and license access by region. * PR updates. * lint fixes. * fix null vs undefined on project display. * correct null vs undefined at model level. * removed dead code. * CI: Bump version to v3.2.0-57.6 * psp-6428 fix layers colors (#3304) Co-authored-by: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com> Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com> * CI: Bump version to v3.2.0-57.7 * Merge fixes * CI: Bump version to v4.0.0-57.8 --------- Co-authored-by: Sue Tairaku <42981334+stairaku@users.noreply.github.com> Co-authored-by: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com> Co-authored-by: PryancaJSharma <99448336+PryancaJSharma@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Eduardo <eddherrera@users.noreply.github.com> Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com> Co-authored-by: Aman Monga <53246811+buddy326@users.noreply.github.com> * CI: Bump version to v4.0.0-57.9 * psp-6495 Correct issue with object matching not working as expected. (#3310) * HOTFIX: h0074 standardize agreement owner string other name. (#3315) * h0074 standardize agreement owner string other name. * unit test corrections. * use financial code instead of id in generated h120. (#3316) Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com> * Increment hotfix version in UAT (#3321) * PSP-6522 : Display user friendly error when compensation req does not… (#3323) Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com> * CI: Bump version to v4.0.0-57.10 * fix trufflehog install from failing (#3333) (#3335) * correct credentials scan failure. * force dependency versions. --------- Co-authored-by: Smith <Devin.Smith@quartech.com> * Fix for takes not showing properly on the update screen | psp-6572 (#3332) * Fix for takes not showing properly on the update screen * Removed debugger code * PSP-6563 : HOTFIX: in trust is missing on H120 (#3325) Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com> * PSP-6557 : HOTFIX - Missing values on Template H120 (#3326) Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com> * Fixed business function not being displayed (#3330) * Psp 6566 map search corrections (#3338) * psp-6566 * correct order of operations for 0 pad. * psp-6585 updates to allow etl to overwrite null expiry date on yearly financial codes. (#3340) * bump release hotfix version. (#3341) Co-authored-by: Smith <Devin.Smith@quartech.com> * PSP-6527 : FT-REG: Lease & License - When a new license is created, the Created By and Last updated By dates are not displayed and the user is always USER (#3336) Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com> * CI: Bump version to v4.0.0-57.11 * CI: Bump version to v4.0.3-57.51 * Update snapshots --------- Co-authored-by: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com> Co-authored-by: Sue Tairaku <42981334+stairaku@users.noreply.github.com> Co-authored-by: PryancaJSharma <99448336+PryancaJSharma@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Eduardo <eddherrera@users.noreply.github.com> Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com> Co-authored-by: Aman Monga <53246811+buddy326@users.noreply.github.com> Co-authored-by: Smith <Devin.Smith@quartech.com> Co-authored-by: Manuel Rodriguez <marobej@gmail.com> Co-authored-by: devinleighsmith <devinleighsmith@gmail.com>

asanchezr added 11 commits June 23, 2023 15:11

Update useQuery global hook

310cedc

Update shared tabbed forms

08469d3

Refactor property tabs to work with state OR routing

2cd481c

Refactor acquisition left hand navigation to use routing

dd8892a

Remove setContainerState callback from acquisition forms

2d4ecb4

Test corrections

aeabddd

Improve tab names for properties

7884923

Set header title based on current tab route

004d3ff

Fix routing issue with requisition compensations

f1d152e

Update snapshots

399e362

Fix failing tests

6bcd184

asanchezr requested review from devinleighsmith, FuriousLlama, stairaku, PryancaJSharma, eddherrera and buddy326 as code owners June 23, 2023 22:55

Merge branch 'dev' into psp-5951-sidebar-routing

2eeb023

Merge branch 'dev' into psp-5951-sidebar-routing

ea9ec62

devinleighsmith reviewed Jun 26, 2023

View reviewed changes

devinleighsmith approved these changes Jun 26, 2023

View reviewed changes

Merge branch 'dev' into psp-5951-sidebar-routing

6b37f94

asanchezr added 3 commits June 26, 2023 16:10

Fix bug when removing property from File

7d1d4bf

Add tests for routing in Acquisition View

c1e5b91

Redirect to default tabs when editing and path doesn't match

812b0a6

Merge remote-tracking branch 'upstream/dev' into psp-5951-sidebar-rou…

dde59f2

…ting

asanchezr added 6 commits June 27, 2023 14:15

Test corrections

72e9b67

Fix dereference error when accessing non-existing property index

a91a303

Remove unused code

0c4329b

Move router components to router folder

6379a18

Test corrections

0b215ec

Merge remote-tracking branch 'upstream/dev' into psp-5951-sidebar-rou…

9582015

…ting

asanchezr merged commit 161ec7b into bcgov:dev Jun 27, 2023
7 checks passed

asanchezr deleted the psp-5951-sidebar-routing branch June 27, 2023 23:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PSP-5951 refactor left hand file navigation - Acquisition ONLY #3288

PSP-5951 refactor left hand file navigation - Acquisition ONLY #3288

asanchezr commented Jun 23, 2023

github-actions bot commented Jun 23, 2023

codecov bot commented Jun 23, 2023 •

edited

Loading

github-actions bot commented Jun 26, 2023

github-actions bot commented Jun 26, 2023

devinleighsmith Jun 26, 2023

asanchezr Jun 26, 2023

asanchezr Jun 27, 2023

devinleighsmith commented Jun 26, 2023

devinleighsmith Jun 26, 2023

asanchezr Jun 26, 2023

asanchezr Jun 27, 2023

devinleighsmith Jun 26, 2023

asanchezr Jun 26, 2023

asanchezr Jun 27, 2023

github-actions bot commented Jun 26, 2023

github-actions bot commented Jun 27, 2023

github-actions bot commented Jun 27, 2023

github-actions bot commented Jun 27, 2023

PSP-5951 refactor left hand file navigation - Acquisition ONLY #3288

PSP-5951 refactor left hand file navigation - Acquisition ONLY #3288

Conversation

asanchezr commented Jun 23, 2023

File routing

File Property routing

github-actions bot commented Jun 23, 2023

codecov bot commented Jun 23, 2023 • edited Loading

Codecov Report

github-actions bot commented Jun 26, 2023

github-actions bot commented Jun 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

devinleighsmith commented Jun 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jun 26, 2023

github-actions bot commented Jun 27, 2023

github-actions bot commented Jun 27, 2023

github-actions bot commented Jun 27, 2023

codecov bot commented Jun 23, 2023 •

edited

Loading