Backmerge test to dev #3347
Merged
Backmerge test to dev #3347
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…map without requiring manual refresh. (bcgov#3296)
…bcgov#3297) * separate unmounted vs error behaviour on usemapsearch. * test corrections. * correct try/catch location.
* Automation test - Stabilization of some automated features (bcgov#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 (bcgov#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 (bcgov#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 (bcgov#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 (bcgov#3291) * CI: Bump version to v3.2.0-56.23 * Bump DEV version - IS57 (bcgov#3295) * CI: Bump version to v3.2.0-57.1 * PSP-5951 refactor left hand file navigation - Acquisition ONLY (bcgov#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 (bcgov#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. (bcgov#3294) * CI: Bump version to v3.2.0-57.4 * PSP-5716, PSP-5717, PSP-5719: Expropriation forms 1, 5 and 9 (bcgov#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. (bcgov#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 (bcgov#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>
Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com>
bcgov#3323) Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com>
* correct credentials scan failure. * force dependency versions. --------- Co-authored-by: Smith <Devin.Smith@quartech.com>
…cgov#3332) * Fix for takes not showing properly on the update screen * Removed debugger code
Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com>
Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com>
* psp-6566 * correct order of operations for 0 pad.
… financial codes. (bcgov#3340)
Co-authored-by: Smith <Devin.Smith@quartech.com>
…he Created By and Last updated By dates are not displayed and the user is always USER (bcgov#3336) Co-authored-by: Eduardo Herrera <Eduardo.Herrera@quartech.com>
…to_test # Conflicts: # etl/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES.dtproj # etl/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES/PAIMS_PIMS_CODES.dtsx # source/backend/api/Pims.Api.csproj # source/frontend/package-lock.json # source/frontend/package.json # source/frontend/src/components/maps/hooks/useActiveFeatureLayer.test.tsx # source/frontend/src/components/maps/hooks/useMapSearch.tsx # source/frontend/src/components/maps/leaflet/Layers/util.tsx # source/frontend/src/features/leases/detail/LeasePages/details/UpdateLeaseContainer.tsx # source/frontend/src/features/leases/detail/LeasePages/payment/table/terms/TermsForm.tsx # source/frontend/src/features/mapSideBar/acquisition/tabs/compensation/detail/__snapshots__/CompensationRequisitionDetailView.test.tsx.snap # source/frontend/src/features/mapSideBar/acquisition/tabs/compensation/update/UpdateCompensationRequisitionContainer.tsx # source/frontend/src/features/mapSideBar/property/tabs/takes/update/TakesUpdateContainer.tsx # source/frontend/src/features/properties/map/compensation/update/UpdateCompensationRequisitionContainer.test.tsx # source/frontend/src/hooks/layer-api/useLayerQuery.tsx # source/frontend/src/hooks/pims-api/useFullyAttributedParcelMapLayer.ts # source/frontend/src/models/generate/acquisition/GenerateCompensation.test.ts # source/frontend/src/models/generate/acquisition/GenerateCompensationPayee.ts # source/frontend/src/models/generate/compensation/GenerateCompensation.test.ts
…o_test Backmerge master to test
asanchezr
requested review from
devinleighsmith,
FuriousLlama,
stairaku,
PryancaJSharma,
eddherrera and
buddy326
as code owners
|
✅ No secrets were detected in the code. |
Codecov Report
@@ Coverage Diff @@
## dev #3347 +/- ##
==========================================
- Coverage 72.85% 72.83% -0.02%
==========================================
Files 1302 1302
Lines 30188 30208 +20
Branches 5561 5568 +7
==========================================
+ Hits 21994 22003 +9
- Misses 7956 7967 +11
Partials 238 238
Flags with carried forward coverage won't be shown. Click here to find out more.
|
devinleighsmith
approved these changes
Jul 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.