PSP-6286 : Restrict changing final compensation requisition status back to draft #3281

eddherrera · 2023-06-21T21:57:02Z

No description provided.

…ck to draft

github-actions · 2023-06-21T21:59:01Z

✅ No secrets were detected in the code.

github-actions · 2023-06-21T22:04:27Z

✅ No secrets were detected in the code.

codecov · 2023-06-21T22:06:34Z

Codecov Report

Merging #3281 (f840788) into dev (02d2644) will decrease coverage by 2.71%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##              dev    #3281      +/-   ##
==========================================
- Coverage   76.16%   73.46%   -2.71%     
==========================================
  Files         817     1283     +466     
  Lines       16124    29919   +13795     
  Branches     4469     5462     +993     
==========================================
+ Hits        12281    21979    +9698     
- Misses       3843     7699    +3856     
- Partials        0      241     +241

Flag	Coverage Δ
unittests	`73.46% <100.00%> (-2.71%)`	⬇️

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

Impacted Files	Coverage Δ
...s/compensation/CompensationRequisitionTrayView.tsx	`6.45% <ø> (+0.20%)`	⬆️
...rce/backend/api/Services/AcquisitionFileService.cs	`75.74% <100.00%> (ø)`
...end/api/Services/CompensationRequisitionService.cs	`88.60% <100.00%> (ø)`
.../detail/CompensationRequisitionDetailContainer.tsx	`80.00% <100.00%> (-1.25%)`	⬇️
...ation/detail/CompensationRequisitionDetailView.tsx	`81.00% <100.00%> (+28.87%)`	⬆️

... and 467 files with indirect coverage changes

# Conflicts: # source/backend/tests/unit/api/Services/CompensationRequisitionServiceTest.cs

github-actions · 2023-06-23T17:56:22Z

✅ No secrets were detected in the code.

devinleighsmith · 2023-06-26T18:05:11Z

source/backend/api/Services/CompensationRequisitionService.cs

@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
+using DocumentFormat.OpenXml.Office2010.Excel;


this can likely be removed.

devinleighsmith · 2023-06-26T18:08:50Z

...atures/mapSideBar/acquisition/tabs/compensation/detail/CompensationRequisitionDetailView.tsx

- }}
- />
- )}
+ {setEditMode !== undefined &&


could we have this refactored so that there is a single block that conditionally renders the edit button? we should never have a case where multiple edit buttons are returned, so I'd rather the render logic more clearly reflected that.

maybe turn these if statements into named functions or bools, so we can do something like:
if(isDraftAndCanEdit || isNotDraftAndAdmin) or similar

updated to use bool variables.

devinleighsmith · 2023-06-26T18:11:01Z

...atures/mapSideBar/acquisition/tabs/compensation/detail/CompensationRequisitionDetailView.tsx

 {formatMoney(payeeDetails?.totalAmount ?? 0)}
 </HeaderField>
 </Col>
 </StyledRow>
 </Section>

 <Section header="Requisition Details">
- <SectionField label="Status" labelWidth="4">
+ <SectionField label="Status" labelWidth="4" data-testid={'compensation-status'}>


data-testid="compensation_status"

asanchezr · 2023-06-26T18:34:58Z

source/backend/api/Services/CompensationRequisitionService.cs

+ private void CheckDraftStatusUpdateAuthorized((bool? currentStatus, bool? newStatus) statusComparable)
+ {
+ if (statusComparable.currentStatus.HasValue && statusComparable.currentStatus.Value.Equals(false)
+ && ((statusComparable.newStatus.HasValue && statusComparable.newStatus.Value.Equals(true)) || !statusComparable.newStatus.HasValue)
+ && !_user.HasPermission(Permissions.AdminUsers))
+ {
+ throw new NotAuthorizedException();
+ }
+ }


I see here that we are checking for this permission: AdminUsers - which according to the code comments "Can administer user accounts."

This is not the same as an ADMIN user which would have the Permissions.SystemAdmin claim - wouldn't it make sense to use SystemAdmin here instead?

that naming convention for claims is certainly ambiguous. If that's the one needed I'll change it.

Double check with @devinleighsmith but I believe SystemAdmin is the correct one...

- Added test to assert that the Comp req is created with the right minimal values.

github-actions · 2023-06-26T20:04:56Z

✅ No secrets were detected in the code.

github-actions · 2023-06-26T20:18:02Z

✅ No secrets were detected in the code.

github-actions · 2023-06-26T20:31:32Z

✅ 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>

Eduardo Herrera added 3 commits June 21, 2023 12:07

PSP-6286 : Restrict changing final compensation requisition status ba…

7a0cf97

…ck to draft

- fix tests

a25d58b

- linting

dcf0594

eddherrera added the enhancement New feature or request label Jun 21, 2023

eddherrera self-assigned this Jun 21, 2023

eddherrera requested review from devinleighsmith, asanchezr, FuriousLlama, stairaku, PryancaJSharma and buddy326 as code owners June 21, 2023 21:57

Merge branch 'dev' into psp-6286

353ff1b

Merge branch 'dev' into psp-6286

3846899

# Conflicts: # source/backend/tests/unit/api/Services/CompensationRequisitionServiceTest.cs

devinleighsmith reviewed Jun 26, 2023

View reviewed changes

devinleighsmith approved these changes Jun 26, 2023

View reviewed changes

asanchezr reviewed Jun 26, 2023

View reviewed changes

asanchezr approved these changes Jun 26, 2023

View reviewed changes

Eduardo Herrera added 2 commits June 26, 2023 12:13

Merge branch 'dev' into psp-6286

36fd72e

- Update to use the proper permission in the backend.

4fde851

- Added test to assert that the Comp req is created with the right minimal values.

- test fixes

aed04eb

- fix role

f840788

eddherrera merged commit 947ef87 into bcgov:dev Jun 26, 2023
8 of 9 checks passed

eddherrera deleted the psp-6286 branch July 4, 2023 22:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PSP-6286 : Restrict changing final compensation requisition status back to draft #3281

PSP-6286 : Restrict changing final compensation requisition status back to draft #3281

eddherrera commented Jun 21, 2023

github-actions bot commented Jun 21, 2023

github-actions bot commented Jun 21, 2023

codecov bot commented Jun 21, 2023 •

edited

Loading

github-actions bot commented Jun 23, 2023

devinleighsmith Jun 26, 2023

eddherrera Jun 26, 2023

devinleighsmith Jun 26, 2023

devinleighsmith Jun 26, 2023 •

edited

Loading

eddherrera Jun 26, 2023

devinleighsmith Jun 26, 2023

eddherrera Jun 26, 2023

asanchezr Jun 26, 2023

eddherrera Jun 26, 2023

asanchezr Jun 26, 2023

eddherrera Jun 26, 2023

github-actions bot commented Jun 26, 2023

github-actions bot commented Jun 26, 2023

github-actions bot commented Jun 26, 2023

PSP-6286 : Restrict changing final compensation requisition status back to draft #3281

PSP-6286 : Restrict changing final compensation requisition status back to draft #3281

Conversation

eddherrera commented Jun 21, 2023

github-actions bot commented Jun 21, 2023

github-actions bot commented Jun 21, 2023

codecov bot commented Jun 21, 2023 • edited Loading

Codecov Report

github-actions bot commented Jun 23, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

devinleighsmith Jun 26, 2023 • edited Loading

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

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 26, 2023

github-actions bot commented Jun 26, 2023

codecov bot commented Jun 21, 2023 •

edited

Loading

devinleighsmith Jun 26, 2023 •

edited

Loading