Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 5.4 branch into dev #4087

Merged
merged 9 commits into from
Jun 6, 2024
Merged

Merge 5.4 branch into dev #4087

merged 9 commits into from
Jun 6, 2024

Conversation

asanchezr
Copy link
Collaborator

No description provided.

asanchezr and others added 9 commits May 31, 2024 10:20
Align 5.4 branch with dev changes
* psp-8108 style changes for improvements page. (#4066)

Co-authored-by: Smith <[email protected]>

* CI: Bump version to v5.3.0-81.22

* Code cleanup

* Configure GeoJSON serialization and update nuget package

* Use NTS geojson serialization for property boundaries

* Update tsapi model generation to support NTS geometries

* Update generated api models

* Update geometry mappings to support multipolygons

* Add new method to transform Geometry coordinates in-place

* Send proper geojson geometries back to the server

* Update boundary geometry in property service

* Lint fixes

* Refactor to eliminate code duplication in property location coordinate transformation

* remove obsolete custom geojson serializer

* Code cleanup

* Rename code type file

* Support multipolygons on parcel boundaries in the frontend

* Backend code fixes

* Remove projection logic from GetLeaseById

* Test updates and code fixes

---------

Co-authored-by: devinleighsmith <[email protected]>
Co-authored-by: Smith <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* psp-8108 style changes for improvements page. (#4066)

Co-authored-by: Smith <[email protected]>

* CI: Bump version to v5.3.0-81.22

* make the file pretext on file headers in front of file status bold. (#4067)

Co-authored-by: Smith <[email protected]>

* CI: Bump version to v5.3.0-81.23

* PSP-8552 : FT: Map View- Historical file number search is not working… (#4065)

Co-authored-by: Herrera <[email protected]>

* CI: Bump version to v5.3.0-81.24

* modify tooltip render direction to avoid clipping. (#4069)

* modify tooltip render direction to avoid clipping.

* also correct remarks section.

---------

Co-authored-by: Smith <[email protected]>

* CI: Bump version to v5.3.0-81.25

* psp-8499 | Updated historical number rendering for leases (#4050)

* Updated historical number rendering for leases

* Fixed tests

* Updated placeholder and duplicate logic for Historical File #

* CI: Bump version to v5.3.0-81.26

* Features/psp 7494 (#4068)

* Updated the deposts page

* Fixed stylings for buttons and margin for collapsable section

* updated snaps

* PR comment updates.

---------

Co-authored-by: FuriousLlama <[email protected]>
Co-authored-by: Smith <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.3.0-81.27

* PSP-8315 : Add Lease and License Checklist (#4062)

Co-authored-by: Herrera <[email protected]>

* CI: Bump version to v5.3.0-81.28

* psp-8585 display either retired or disposed status in property header… (#4075)

* psp-8585 display either retired or disposed status in property header if relevant

Signed-off-by: devinleighsmith <[email protected]>

* psp-8585 code review corrections

---------

Signed-off-by: devinleighsmith <[email protected]>

* CI: Bump version to v5.3.0-81.29

* psp-8568 fix database scripts such that the draft disposition status is actually disabled. (#4076)

* CI: Bump version to v5.3.0-81.30

---------

Signed-off-by: devinleighsmith <[email protected]>
Co-authored-by: Smith <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Eduardo <[email protected]>
Co-authored-by: Herrera <[email protected]>
Co-authored-by: Manuel Rodriguez <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>
merge changes from dev into 5.4
Copy link
Contributor

github-actions bot commented Jun 6, 2024

✅ No secrets were detected in the code.

Copy link

codecov bot commented Jun 6, 2024

Codecov Report

Attention: Patch coverage is 37.03704% with 68 lines in your changes missing coverage. Please review.

Project coverage is 85.34%. Comparing base (1c0a4b5) to head (67d5c6b).

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##              dev    #4087      +/-   ##
==========================================
+ Coverage   85.30%   85.34%   +0.03%     
==========================================
  Files        1617     1618       +1     
  Lines      122482   122386      -96     
  Branches     9389     9374      -15     
==========================================
- Hits       104483   104449      -34     
+ Misses      17694    17636      -58     
+ Partials      305      301       -4     
Flag Coverage Δ
unittests 85.34% <37.03%> (+0.03%) ⬆️

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

Files Coverage Δ
...rce/backend/api/Services/DispositionFileService.cs 81.86% <100.00%> (-0.43%) ⬇️
.../apimodels/Models/Concepts/Property/GeometryMap.cs 100.00% <100.00%> (ø)
...rce/backend/dal/Repositories/PropertyRepository.cs 85.34% <100.00%> (ø)
.../frontend/src/features/mapSideBar/shared/models.ts 95.77% <100.00%> (+1.51%) ⬆️
...els/api/generated/ApiGen_CodeTypes_GeoJsonTypes.ts 100.00% <100.00%> (ø)
...rce/backend/api/Services/AcquisitionFileService.cs 74.45% <0.00%> (+1.47%) ⬆️
source/backend/api/Services/ResearchFileService.cs 73.56% <66.66%> (+11.47%) ⬆️
source/frontend/src/utils/mapPropertyUtils.ts 94.62% <90.00%> (-0.29%) ⬇️
source/backend/api/Services/LeaseService.cs 40.12% <33.33%> (+4.55%) ⬆️
.../src/components/common/HeaderField/StatusField.tsx 88.96% <25.00%> (ø)
... and 3 more

@asanchezr asanchezr merged commit e5710ed into dev Jun 6, 2024
9 checks passed
@asanchezr asanchezr deleted the 5.4 branch November 8, 2024 01:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants