Skip to content

Backmerge test into dev#4551

Merged
asanchezr merged 8 commits intobcgov:devfrom
asanchezr:backmerge_test_into_dev
Dec 24, 2024
Merged

Backmerge test into dev#4551
asanchezr merged 8 commits intobcgov:devfrom
asanchezr:backmerge_test_into_dev

Conversation

@asanchezr
Copy link
Collaborator

No description provided.

asanchezr and others added 8 commits December 4, 2024 16:19
* PSP-9565: Changes on automation test set to accomodate GHA (bcgov#4516)

* data changes

* Testing browsers

* changing .net 6.0 to .net 8.0

* Deleting EdgeDriver nuget package

* Changes on webdriver config

* Update integration-test.yml

* Changes on automation test set - IS94

* Changes to adapt GHA

* Changing checklist button to explicit path

* Correcting a research file element

* CI: Bump version to v5.7.0-94.21

* psp-9500 Scheduler microservice (bcgov#4483)

* split off geoserver functionality into a microservice - update docker and ci/cd to support.

* psp-9500 scheduler microservice.

* change service scope

* Readme updates.

* github action corrections.

---------

Co-authored-by: Smith <devin.smith@quartech.com>

* CI: Bump version to v5.7.0-94.22

* Bump version to IS95 (bcgov#4518)

* CI: Bump version to v5.7.0-95.1

* PSP-9569 : H 120 document- Generated document shows full names, inste… (bcgov#4519)

Co-authored-by: Herrera <eduardo.herrera@quartech.com>

* CI: Bump version to v5.7.0-95.2

* Github action fixes (bcgov#4520)

* CI: Bump version to v5.7.0-95.3

* Lease Historical file alignment fix (bcgov#4521)

Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com>

* CI: Bump version to v5.7.0-95.4

* PSP-9517 Remove "cannot determine" region dropdown from User Management screen under Admin Tools (bcgov#4522)

* Remove "Cannot determine" region from user management page

* Test updates

* CI: Bump version to v5.7.0-95.5

* Adding requested tooltip on View and Update forms (bcgov#4523)

* CI: Bump version to v5.7.0-95.6

* IS-95.00 Database Schema (bcgov#4511)

* IS-95.00 Database Schema

PSP_PIMS | Development Sprint: S95.00 | Design Sprint: 94 | Date: 2024-Dec-03
- Altered tables:
  - PIMS_ACQUISITION_FILE
  - PIMS_ACQUISITION_FILE_HIST
  - PIMS_COMPENSATION_REQUISITION
  - PIMS_COMPENSATION_REQUISITION_HIST
  - PIMS_EXPROPRIATION_PAYMENT
  - PIMS_EXPROPRIATION_PAYMENT_HIST
- Added build script:
  - 007_PSP_PIMS_COMPENSATION_REQUISITION_HIST_Add.sql
- Altered build script:
  - 007_PSP_PIMS_ACQUISITION_FILE_HIST_Add.sql
- Altered test script:
  - 043_PIMS_ACQUISITION_FILE.sql
- Requires additional metadata to meet standards

* Fixed alter down

* Aligning to LATEST

---------

Co-authored-by: Manuel Rodriguez <marobej@gmail.com>
Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com>

* CI: Bump version to v5.7.0-95.7

* IS 95 scaffold (bcgov#4525)

* Generated scaffold

* Fixed backend compilation and removed todos.

* CI: Bump version to v5.7.0-95.8

* PSP-9283 : UI UX Clean Up - Acquisition - Stakeholders - edit button (bcgov#4524)

Co-authored-by: Herrera <eduardo.herrera@quartech.com>

* CI: Bump version to v5.7.0-95.9

* PSP-8923: UI UX Clean Up - Left Side Menu - Clicked icon stage (bcgov#4526)

* Adding new yellow tone color

* Adding highlighted color to selected path on the side Menu

* Color format change

* update snapshots

---------

Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com>

* CI: Bump version to v5.7.0-95.10

* Remove unecessary SetOriginalConcurrencyControlNumber method. (bcgov#4527)

* CI: Bump version to v5.7.0-95.11

* PSP-9279 UI UX - Acquisition - Agreements & Expropriation - UI Button update for consistency  (bcgov#4528)

* PSP-9279 UI UX cleanup - make generate buttons consistent

* Update snapshots

* Test updates

* CI: Bump version to v5.7.0-95.12

* psp-9632 limit the default bounds when resetting. (bcgov#4533)

Co-authored-by: Smith <devin.smith@quartech.com>
Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com>

* CI: Bump version to v5.7.0-95.13

* psp-9715 fix issues adding properties with no locations, and also override research file property updates. (bcgov#4530)

Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com>

* CI: Bump version to v5.7.0-95.14

* [CI] Fix build failures after ubuntu-latest upgrade to 24.04 (bcgov#4537)

* CI: Bump version to v5.7.0-95.15

* psp-9457 prevent disposed properties from being added to leases. (bcgov#4532)

* CI: Bump version to v5.7.0-95.16

* disposition override corrections - ensure save redirect functions. (bcgov#4536)

Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com>

* CI: Bump version to v5.7.0-95.17

* psp-9530 allow research files to add retired properties. (bcgov#4534)

* psp-9530 allow research files to add retired properties.

* fix test compilation error.

---------

Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com>

* CI: Bump version to v5.7.0-95.18

* PSP-8573 | Updated list headers (bcgov#4531)

* Updated list headers

* Added icons

* Fixed Typos

* lint fixes

---------

Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com>

* CI: Bump version to v5.7.0-95.19

* PSP-9655 : FT-REG: When creating a new file approximately after 4pm P… (bcgov#4540)

* PSP-9655 : FT-REG: When creating a new file approximately after 4pm PST timezone, PIMS timestamps the file with the next day's date

* - test updates

* - test updates

---------

Co-authored-by: Herrera <eduardo.herrera@quartech.com>
Co-authored-by: Alejandro Sanchez <emailforasr@gmail.com>

* CI: Bump version to v5.7.0-95.20

---------

Co-authored-by: Sue Tairaku <42981334+stairaku@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com>
Co-authored-by: Smith <devin.smith@quartech.com>
Co-authored-by: Eduardo <eddherrera@users.noreply.github.com>
Co-authored-by: Herrera <eduardo.herrera@quartech.com>
Co-authored-by: Doug Filteau <dfilteau@users.noreply.github.com>
Co-authored-by: Manuel Rodriguez <marobej@gmail.com>
Correction for git history on test branch
…gov#4548)

* PSP-9740: Fix faulty logic for Acquisition assigned date value

* Lint fixes

* Test updates

* Increment hotfix version

* Test updates
@asanchezr asanchezr self-assigned this Dec 24, 2024
@github-actions
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4551

1 similar comment
@github-actions
Copy link
Contributor

See CodeCov Report Here: https://app.codecov.io/github/bcgov/psp/pull/4551

@asanchezr asanchezr merged commit 6304a58 into bcgov:dev Dec 24, 2024
@asanchezr asanchezr deleted the backmerge_test_into_dev branch December 24, 2024 04:22
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