Skip to content

Commit

Permalink
Test (#4048)
Browse files Browse the repository at this point in the history
* update docker-compose so primary docker compose refers to mayan.
Fix dockerfiles so that they are compatible with version bumps.
add profiles to services.
update makefiles with above profile changes.

* Remove router filter from map/list view. (#3898)

* Increment DEV version - IS77 5.2

* CI: Bump version to v5.0.2-77.1

* ts version/updates.

* test corrections.

* temporarily disable affected tests. will be re-enabled with vitest.

* CI: Bump version to v5.0.2-77.2

* Tech debt/vite (#3920)

* SPIKE: Vite  (#3760)

* UAT Release - IS75 (#3865)

* Automation refactoring - Change of models and functions to avois warning messages

* Automation refactoring - Change of models and functions to avois warning messages

* Automation fixes related to new modals

* Disposition Files - Offers and Sale Tab

* Disposition Files - Offers and Sale Tab

* Update Nuget packages

* Changes on automation to adapt changes on PIMS IS74

* Fixed property list sort by lot size (#3825)

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

* CI: Bump version to v5.0.1-74.17

* Fixed lease not showing pids on view (#3824)

* CI: Bump version to v5.0.1-74.18

* Bump dev version - IS75 (#3827)

* CI: Bump version to v5.0.1-75.1

* psp-7880 disposition file number export display. (#3819)

* psp-7880 disposition file number export display.

* test correction.

---------

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

* CI: Bump version to v5.0.1-75.2

* fix missed mapping of sale completion date on frontend. (#3828)

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

* CI: Bump version to v5.0.1-75.3

* psp-7925 text correction. (#3830)

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

* CI: Bump version to v5.0.1-75.4

* PSP-7500 - UI/UX cleanup agreements create /edit (#3817)

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

* CI: Bump version to v5.0.1-75.5

* IS-75.00 Database Schema Changes (#3818)

* IS-75.00 Database Schema Changes

PSP_PIMS | Development Sprint: S75.00 | Design Sprint: 74 | Date: 2024-Feb-27
- Altered seed scripts:
  - 135_DML_PIMS_PROP_MGMT_ACTIVITY_TYPE.sql
  - 136_DML_PIMS_PROP_MGMT_ACTIVITY_SUBTYPE.sql
- Requires additional metadata to meet standards

* Changed ZONING_POTENTIAL to 100 Bytes

- PIMS_PROPERTY.ZONING_POTENTIAL
- PIMS_PROPERTY_HIST.ZONING_POTENTIAL

---------

Co-authored-by: Manuel Rodriguez <[email protected]>

* CI: Bump version to v5.0.1-75.6

* Regenerated scaffold (#3832)

* CI: Bump version to v5.0.1-75.7

* PSP-7636 Prometheus/Sysdig alerts (#3831)

* Update sysdig team yaml with rest of devs

* Move sysdig config to monitoring folder

* Add a health check for the PIMS database via the PIMS API and Prometheus.

* Update local prometheus configuration to support alerting when database server goes down

* CI: Bump version to v5.0.1-75.8

* PSP-7849 : Stop user from completing acquisition file if take is in progress takes (#3833)

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

* CI: Bump version to v5.0.1-75.9

* correct cancel modal behaviour. (#3838)

* CI: Bump version to v5.0.1-75.10

* psp-7622 Testing (#3821)

* Added tests for subdivision view

* Lint fixes

* CI: Bump version to v5.0.1-75.11

* psp-7854 property consolidation backend service. (#3834)

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

* CI: Bump version to v5.0.1-75.12

* psp 7616 | Subdivision Consolidation navigation (#3836)

* Added functionality to navigate to subdivision and consolidation

* lint fixes

* more lint fixes

* CI: Bump version to v5.0.1-75.13

* PSP-7681 : FT-REG: Browser alerts should be replaced by established modal dialogs (#3790)

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

* CI: Bump version to v5.0.1-75.14

* Adding initial elements of Subdivision, changes on Acquisition Agreements

* psp-7975 ensure disposition file filter by D- is consistent

* psp-7975 user api corrections.

* min page range.

* CI: Bump version to v5.0.1-75.15

* psp-7896 add acquisition properties request to generate letter logic. (#3837)

* CI: Bump version to v5.0.1-75.16

* PSP-7869 Indicate "retired" on property information details  (#3840)

* CI: Bump version to v5.0.1-75.17

* PSP-7916 : Disposition file GST collected - correct the calculation (#3847)

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

* CI: Bump version to v5.0.1-75.18

* Psp 7984 node 20 update (#3846)

* node 20 update.

* node 20 dependency updates.

* test corrections.

* package json stylih update.

---------

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

* CI: Bump version to v5.0.1-75.19

* CI: Bump version to v5.0.1-75.20

* psp 7385 | Consolidation frontend (#3845)

* Added consolidation front end and cleanup

* Updated property layer types

* Fixed tests

* Updated subdivision to match consolidation ui

* Pr fixes

* upated icon size

* CI: Bump version to v5.0.1-75.21

* Adding or improving list views and pagination

* psp-7993 correct recursive model object. (#3843)

* CI: Bump version to v5.0.1-75.22

* CI: Bump version to v5.0.1-75.23

* PSP-7907 Add representation of RETIRED properties on the map view and advance filter (#3853)

* Add retired map pin image

* Update map legend

* Add retired property toggle to advanced map filters

* Update backend filter queries

* Implement separate service call for retiring properties

* Map state-machine updates and frontend updates

* backend logic fix

* Update map clustering logic to not display retired properties

* Test corrections

* Update snapshots

* Properly exclude mockServiceWorker from any linting rules

* CI: Bump version to v5.0.1-75.24

* PSP-7860, psp-7962, psp-7963, psp-7964 | Added consolidation history view and fixed issues (#3848)

* Added consolidation history view and fixed issues

* CI: Bump version to v5.0.1-75.25

* psp-7658 display is retired in property list view. (#3835)

* psp-7658 display is retired in property list view.

* test updates.

* remove disposition completion date from add form.

* CI: Bump version to v5.0.1-75.26

* Psp-7818 display disposition errors with error modal (#3852)

* increase readability of error when pid not found in pims.

* display disposition errors with error modal

* CI: Bump version to v5.0.1-75.27

* psp-7313 change user override styling. (#3851)

* CI: Bump version to v5.0.1-75.28

* PSP-8002 : FT:UI/UX- Agreements: Agreement #(number) is not aligned accurately above the line (#3855)

* CI: Bump version to v5.0.1-75.29

* PSP-6920 replace toast with warning modal (#3861)

* PSP-6920 replace toast message with popup dialog

* Lint fixes

* CI: Bump version to v5.0.1-75.30

* PSP-8047 : FT-REG: Disposition Files - Net proceeds before & After SPP cost tool tips are not displaying the correct text (#3859)

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

* CI: Bump version to v5.0.1-75.31

* correct issue in gen env script. (#3863)

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

* CI: Bump version to v5.0.1-75.32

* PSP-8046 : FT-REG: Disposition Files - Net proceeds before & After SP… (#3858)


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

* CI: Bump version to v5.0.1-75.33

* Fix PSP-7927 (#3862)

* Updated timeouts to be 30s instead of 3s when retrieving information for adding properties

* Fixed lint

* Added timeout for subdivision

---------

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

* CI: Bump version to v5.0.1-75.34

* Fix "retired" label on property information header (#3864)

* CI: Bump version to v5.0.1-75.35

---------

Co-authored-by: Sue Tairaku <[email protected]>
Co-authored-by: devinleighsmith <[email protected]>
Co-authored-by: Sue Tairaku <[email protected]>
Co-authored-by: Manuel Rodriguez <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Smith <[email protected]>
Co-authored-by: Eduardo <[email protected]>
Co-authored-by: Herrera <[email protected]>
Co-authored-by: Doug Filteau <[email protected]>
Co-authored-by: devinleighsmith <[email protected]>

* PSP-8093 label change/fix (#3883)

* Fix typo

* Fix label text

* Snapshot updates

* CI: Bump version to v5.0.1-76.17

* PSP-7929 : Backend error - For all files do not include a retired property on selection (#3884)

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

* CI: Bump version to v5.0.1-76.18

* PSP-7922 Completing disposition file - selected properties and errors (#3885)

* Refactor logic to validate disposition file upon closing file

* Disposition form styling fixes

* Update snapshots

* Test corrections

* CI: Bump version to v5.0.1-76.19

* PSP-7968, PSP-7967, PSP-8087 (#3886)

* Adding or improving list views and pagination

* Automation - changes based on Build updates

* Deleting unnecessary comments

---------

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

* CI: Bump version to v5.0.1-76.20

* psp-7995 consolidation/subdivision restrictions. (#3877)

* psp-7995 consolidation/subdivision restrictions.

* psp-7993 fix research file save errors.

* PR correction.

* CI: Bump version to v5.0.1-76.21

* psp-7924 property operation sub-table. (#3888)

* psp-7924 property operation sub-table.

* test updates.

* CI: Bump version to v5.0.1-76.22

* PSP-8003 : FT:UI/UX- Agreements: Second word starting letter doesn't start with capital letter In the Agreement Details word (#3890)

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

* CI: Bump version to v5.0.1-76.23

* PSP-6765 empty file upload error (#3889)

* Lint fixes

* Fix NPE when uploading empty file

* Test updates

* PR feedback

* CI: Bump version to v5.0.1-76.24

* PSP-8051 : FT:User is able to add the retired property record to the … (#3893)

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

* CI: Bump version to v5.0.1-76.25

* psp-8125 order of file types. (#3895)

* CI: Bump version to v5.0.1-76.26

* Update image references and fixed tests

* Dev merges

* psp-7962 correct missing no rows message introduced by operation sect… (#3894)

* psp-7962 correct missing no rows message introduced by operation section subtable.

* snapshot update.

* test corrections.

---------

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

* CI: Bump version to v5.0.1-76.27

* fix an error introduced in the isRetired conditional logic when getting properties by pid. (#3899)

* CI: Bump version to v5.0.1-76.28

* psp-8133 do not show retired properties unless isretired specified. (#3897)

* CI: Bump version to v5.0.1-76.29

* psp-8126 | Research files also match retired properties now (#3900)

* Research files also match retired properties now

* Updated tests

* CI: Bump version to v5.0.1-76.30

* Correct typo in file association display. (#3902)

* CI: Bump version to v5.0.1-76.31

* Changes to PIMS_DATA_SOURCE_TYPE (#3901)

Co-authored-by: Manuel Rodriguez <[email protected]>

* CI: Bump version to v5.0.1-76.32

* FT-REG: Consolidations - Incorrect instructions for selecting a child property. (#3903)

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

* CI: Bump version to v5.0.1-76.33

* Fully fix property getByPid, add unit tests. (#3904)

* CI: Bump version to v5.0.1-76.34

* PSP-8144, PSP-8119 Disposition File bug fixes (#3906)

* PSP-8144 Fix file closing logic

* PSP-8119 Fix NPE when adding existing properties to a disposition file

* Fix invalid logic for MatchProperties by PIN

* CI: Bump version to v5.0.1-76.35

* psp-8150 fix consolidation/subdivision issues. (#3905)

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

* CI: Bump version to v5.0.1-76.36

* Increment DEV version - IS77 5.2

* CI: Bump version to v5.0.2-77.1

* ensure that max zoom is used consistently between map and map clusterer. (#3910)

* ensure that max zoom is used consistently between map and map clusterer.

* test corrections.

* re-order properties to ensure consolidation draft order correct. (#3908)

* Fix adding pre-existing properties to disposition file (#3911)

* CI: Bump version to v5.0.2-77.2

* vite build warning corrections.

---------

Co-authored-by: Alejandro Sanchez <[email protected]>
Co-authored-by: Eduardo <[email protected]>
Co-authored-by: Sue Tairaku <[email protected]>
Co-authored-by: Sue Tairaku <[email protected]>
Co-authored-by: Manuel Rodriguez <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Smith <[email protected]>
Co-authored-by: Herrera <[email protected]>
Co-authored-by: Doug Filteau <[email protected]>

* test correction.

* update trufflehog config exemptions.

* trufflehog fix.

* PIMS PROPERTY ETL Merge files commit (#3919)

* CI: Bump version to v5.0.2-77.3

* CI: Bump version to v5.0.2-77.4

* HOTFIX - correct multipolygon spatial correction logic. (#3922)

* HOTFIX - correct multipolygon spatial correction logic.

* correct package name.

* CI: Bump version to v5.0.2-77.5

* IS-78.00 Database Schema (#3924)

PSP_PIMS | Development Sprint: S77.00 | Design Sprint: 76 | Date: 2024-Apr-03
- Altered tables:
  - PIMS_PROPERTY
  - PIMS_PROPERTY_HIST
  - PIMS_TAKE
  - PIMS_TAKE_HIST
- Altered views:
  - PIMS_PROPERTY_BOUNDARY_VW
  - PIMS_PROPERTY_LOCATION_VW
- Altered seed scripts:
  - 007_PSP_PIMS_PROPERTY_HIST_Add.sql
  - 128_DML_PIMS_LAND_ACT_TYPE.sql
- Altered test scripts:
  - 005_DML_LEASE_PROPERTY.sql
- Requires additional metadata to meet standards

* CI: Bump version to v5.0.2-77.6

* Scaffold/s77 (#3925)

* Generated scaffold

* Fixed compilation. Note: The current code will not functionally work. Another PR will fix functionality

* CI: Bump version to v5.0.2-77.7

* PSP-8092 : Prevent completion of acquisition file that has no take (#3912)

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

* CI: Bump version to v5.0.2-77.8

* PSP-7886 : Prevent users from adding new takes, and/or deleting completed takes from a non-active (e.g. draft or active) acquisition file (#3923)


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

* CI: Bump version to v5.0.2-77.9

* correct map not loading properties initially. (#3929)

* CI: Bump version to v5.0.2-77.10

* psp-8116 Update frontend layer configuration. (#3928)

* Update frontend layer configuration.

* formatting.

---------

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

* CI: Bump version to v5.0.2-77.11

* Psp 7581 - PROPOSAL - use bootstrap for 4px spacing. fix link styling and pagination styling. (#3916)

* update link styling, including tab underlines.

* proposal: update bootstrap m- syntax to use multiples of 4px.

* snapshot updates.

* lint fixes.

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

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

* snapshot update.

---------

Signed-off-by: devinleighsmith <[email protected]>
Co-authored-by: Smith <[email protected]>
Co-authored-by: Alejandro Sanchez <[email protected]>

* CI: Bump version to v5.0.2-77.12

* psp-8187, correct enum mapping of pims layer such that area units are processed correctly.
Also ensure that pims area units are converted to M2 in consolidation/subdivision.

* allow properties with null boundaries to be saved.

* fix hotfix/minor release version.

* update handling of undefined enum value.

* modify typing.

* Do not return non-polygon boundaries as the mapping is not idempotent. (#3930)

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

* update version on lock file

* CI: Bump version to v5.2.0-77.13

* PSP-7730 map legend UI UX enhancements (#3934)

* Update info marker assets

* PSP-7730 map legend UI UX enhancements

* Update snapshots

* CI: Bump version to v5.2.0-77.14

* Update to IS-77.00 Database Schema (#3935)

* Update to IS-77.00 Database Schema

* Updated Views

Changes to HAS_ACQUISITION_FILE calculation

* CI: Bump version to v5.2.0-77.15

* allow codecov updates to fail. (#3939)

* CI: Bump version to v5.2.0-77.16

* PSP-8198 tenant json loading bug (#3938)

* CI: Bump version to v5.2.0-77.17

* hide toolbar on associated property operations. (#3918)

* CI: Bump version to v5.2.0-77.18

* ensure that all subdivisions/consolidations only allow for owned source properties. (#3917)

* CI: Bump version to v5.2.0-77.19

* Updated scaffold (#3937)

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

* CI: Bump version to v5.2.0-77.20

* IS-77.00 Updated Alters (#3940)

* Update to IS-77.00 Database Schema

* Updated Views

Changes to HAS_ACQUISITION_FILE calculation

* IS-77 Updated Alters

---------

Co-authored-by: Manuel Rodriguez <[email protected]>

* CI: Bump version to v5.2.0-77.21

* codecov fix (#3942)

* codecov secret naming update.

* restore codecov upload requirement.

---------

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

* CI: Bump version to v5.2.0-77.22

* codecov attempted fix. (#3943)

* update codecov config to match doc.

* workflow dispatch test.

* revert testing changes.

* temporarily remove constraints on codecov action.

---------

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

* CI: Bump version to v5.2.0-77.23

* PSP-7884 add take completion date. (#3927)

* psp-7884 add take completion date.

* add take read-only completion date.

* corrections.

* sort imports.

* make correction.

* code review comments.

* corrections.

* CI: Bump version to v5.2.0-77.24

* PSP-8182: Consolidation and subdivisions test cases (#3936)

* Adding or improving list views and pagination

* Automation - changes based on Build updates

* Deleting unnecessary comments

* Subdivision/ Consolidation - Alternative testing paths

---------

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

* CI: Bump version to v5.2.0-77.25

* Take property update and cleanup (#3933)

* Added logic to support calculating property states from takes

* Updated logic to use tasks

* Fixed tests

* Test merges

* Updated snaps

* CI: Bump version to v5.2.0-77.26

* PSP-8198 Vite fix (#3945)

* PSP-8198: exclude JSON files from vite gzip compression

* Load tenant.json from root URL

* CI: Bump version to v5.2.0-77.27

* CI: Bump version to v5.2.0-77.28

* Bump DEV version - IS78 (#3947)

* CI: Bump version to v5.2.0-78.1

* PSP-8203 FT: map icon that hovers when you try to choose property on the map is not displayed (#3948)

* PSP-8203 Fix loading bug when SVG is loaded as data URL by vite

* update snapshots

* CI: Bump version to v5.2.0-78.2

* Features/psp 7836 filter (#3941)

* Added logic to support calculating property states from takes

* Updated logic to use tasks

* Fixed tests

* Fixed filter and respective tests

* fixed tests

* Added backend view retrieval for property list

* Fixed frontend references to removed fields

* Fixed Tets

* Fixed Tets

* PR fixes

* CI: Bump version to v5.2.0-78.3

* Updated consolidation and subdivisions to only display 3 decimal digits (#3949)

* CI: Bump version to v5.2.0-78.4

* psp-7739 make map layers use same parent sidebar as map advanced filt… (#3944)

* psp-7739 make map layers use same parent sidebar as map advanced filters.

* psp-7739 layer test updates.

* test corrections.

* minor correction.

* CI: Bump version to v5.2.0-78.5

* Psp 8102 - new take types (#3952)

* psp-8102 frontend changes to support new take types

* add support for new take types on backend.

* test correction.

* CI: Bump version to v5.2.0-78.6

* IS-78.00 Database Schema Changes (#3957)

* IS-78.00 Database Schema Changes

PSP_PIMS | Development Sprint: S78.00 | Design Sprint: 77 | Date: 2024-Apr-16
- Altered seed scripts:
  - 020_DML_PIMS_STATIC_VARIABLE.sql
  - 056_DML_PIMS_LEASE_PURPOSE_TYPE.sql
- Requires additional metadata to meet standards

* Corrected static variables

* CI: Bump version to v5.2.0-78.7

* psp-8154 show warning when adding lease take type. (#3959)

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

* CI: Bump version to v5.2.0-78.8

* disposition filter and advance filter not showing properties on first load (#3958)

* CI: Bump version to v5.2.0-78.9

* Add asnotracking, with unrelated bugfix for view documents screen. (#3956)

* CI: Bump version to v5.2.0-78.10

* psp-8025 add warning to disposition file when closing a file not in sold status. (#3960)

* CI: Bump version to v5.2.0-78.11

* psp-8205 hide land act end date for certain types. (#3961)

* CI: Bump version to v5.2.0-78.12

* PSP-8094, PSP-8095: Warn user that property is part of an existing file (#3965)

* CI: Bump version to v5.2.0-78.13

* Updated generation of models to use IsoDatetime alias (#3963)

* CI: Bump version to v5.2.0-78.14

* PSP-8181 : FT-REG: Lease & License - H1005A is not including security deposit amount, properties Legal Description and land area (#3967)

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

* CI: Bump version to v5.2.0-78.15

* PSP-8103 Warn user that property is part of any disposition file (#3968)

* Fix property warning for acquisition files

* PSP-8103 show warning when adding a property included in another file

* Test corrections

* CI: Bump version to v5.2.0-78.16

* Fixed looking for property in the property listview (#3964)

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

* CI: Bump version to v5.2.0-78.17

* Psp 7883 - remove acquisition completion date. (#3962)

* psp-7883 remove acquisition complete date.

* psp-7883 lint correction.

* test fixes.

---------

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

* CI: Bump version to v5.2.0-78.18

* Vitest (#3950)

* vitest - config and packages.

* vitest tests with trivial changes - no review required.

* non-test file changes - do not need review.

* snapshots - do not require review.

* These changes should be reviewed.

* merge corrections.

* test corrections.

* update coverage configuration

* coverage corrections.

* test changes

* re-enable tests.

---------

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

* CI: Bump version to v5.2.0-78.19

* Bump DEV version - IS79 (#3974)

* CI: Bump version to v5.2.0-79.1

* psp-7999 close button styling (#3973)

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

* CI: Bump version to v5.2.0-79.2

* IS-79.00 Database Schema (#3969)

* IS-79.00 Database Schema

PSP_PIMS | Development Sprint: S79.00 | Design Sprint: 78 | Date: 2024-Apr-23
- Altered tables:
  - PIMS_ACQUISITION_FILE
  - PIMS_PROPERTY
- Added seed scripts:
  - 007_PSP_PIMS_ACQUISITION_FILE_HIST_Add.sql
  - 151_DML_PIMS_FILE_NUMBER_TYPE.sql
- Altered seed scripts:
  - 116_DML_PIMS_TAKE_TYPE.sql
- Altered test scripts:
  - 031_PIMS_ACQUISITION_FILE.sql
  - 033_PIMS_PROPERTY_ACQUISITION_FILE.sql
  - 043_PIMS_ACQUISITION_FILE.sql
  - 058_PIMS_TAKE.sql
- Added test scripts:
  - 075_PIMS_FILE_NUMBER.sql
- Requires additional metadata to meet standards

* Updated Lease Purpose Codes

Late addition to the release.

---------

Co-authored-by: Manuel Rodriguez <[email protected]>

* CI: Bump version to v5.2.0-79.3

* Scaffold/s79 (#3975)

* Generated scaffold

* Compilation fixes

* CI: Bump version to v5.2.0-79.4

* PSP-8182: Automation update based on last changes on TST Environment (#3976)

* Adding or improving list views and pagination

* Automation - changes based on Build updates

* Deleting unnecessary comments

* Subdivision/ Consolidation - Alternative testing paths

* Updates based on last deployment to TST environment

---------

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

* CI: Bump version to v5.2.0-79.5

* snapshot updates. (#3977)

* CI: Bump version to v5.2.0-79.6

* vitest corrections (#3978)

* vitest fixes.

* re-install moment-timezone.

* remove only modifier

* snapshot update.

* skip failing test.

* vitest performance and mocking corrections.

* ensure console warnings are treated as failures.

* try skipping troublesome test.

* acquisition file owners.

* CI: Bump version to v5.2.0-79.7

* PSP-8022 : Disposition file states - Hold (#3979)

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

* CI: Bump version to v5.2.0-79.8

* psp-7909 take ui refactor. (#3980)

* psp-7909 take ui refactor.

* psp-8145

* correct invalid type.

* code review corrections.

* merge corrections.

* CI: Bump version to v5.2.0-79.9

* unit test stability corrections (#3982)

* vitest fixes.

* re-install moment-timezone.

* vitest performance and mocking corrections.

* ensure console warnings are treated as failures.

* try skipping troublesome test.

* update msw, make some corrections to aid with test instability.

* increase maxworkers now that test stability increased.

* package updates.

* CI: Bump version to v5.2.0-79.10

* PSP-8324 Update area convertor in Lease and License (#3981)

* Code cleanup

* Show common area component on lease view

* Update property-lease repository to return area unit type-code

* Use common area component to update lease property areas

* Test updates

* Increase spacing as per UI/UX review

* Update snapshots

* CI: Bump version to v5.2.0-79.11

* psp-8252 remove unecessary cast from/to string (#3984)

* CI: Bump version to v5.2.0-79.12

* properly handle null/empty organization (based on error in test). (#3986)

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

* CI: Bump version to v5.2.0-79.13

* PSP-8366 : Enforce character limit on file names in document list (#3991)

* PSP-8366 : Enforce character limit on file names in document list

* - updates

---------

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

* CI: Bump version to v5.2.0-79.14

* PSP-8361: Automation updates based on IS79 build on Test Environment (#3985)

* Adding or improving list views and pagination

* Automation - changes based on Build updates

* Deleting unnecessary comments

* Subdivision/ Consolidation - Alternative testing paths

* Updates based on last deployment to TST environment

* Changes on automation based on IS79 changes

---------

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

* CI: Bump version to v5.2.0-79.15

* IS-79.00 Property View Updates (#3989)

Co-authored-by: Manuel Rodriguez <[email protected]>

* CI: Bump version to v5.2.0-79.16

* PSP-8124 Fix map zoom bug for draft markers (#3993)

* CI: Bump version to v5.2.0-79.17

* psp-7928 make document upload block - to reduce number of failed uploads. (#3988)

* CI: Bump version to v5.2.0-79.18

* psp-8353 add missing disposition message. (#3994)

* CI: Bump version to v5.2.0-79.19

* PSP-8186 : Property File Change Log Update (#3995)

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

* CI: Bump version to v5.2.0-79.20

* IS-79.00 Added PIMS_PROPERTY_VW View (#3997)

* IS-79.00 Property View Updates

* IS-79.00 Added PIMS_PROPERTY_VW View

---------

Co-authored-by: Manuel Rodriguez <[email protected]>

* CI: Bump version to v5.2.0-79.21

* Added new view that does allows for properties without locaiton data (#3998)

* CI: Bump version to v5.2.0-79.22

* directly replace address search bar with selected result. (#3996)

Correctly handle either comma or pipe delimeted pids.
Add error message for multiple pid responses.

* CI: Bump version to v5.2.0-79.23

* PSP - pre-release test feedback. (#4004)

* CI: Bump version to v5.2.0-79.24

* PSP-8241 | Updated take calculation to use incoming take if being updated (#4002)

* Updated take calculation to use incoming take if being updated

* PR fixes

* CI: Bump version to v5.2.0-79.25

* PIMS Property and Address Merge ETL (#4003)

PIMS Property and Address Merge ETL

* CI: Bump version to v5.2.0-79.26

* correct help href not being set during initial help modal open. (#4019)

* Hotfix - ensure that it is possible to display properties with no ownership types. (#4035)

* PSP-8474 | Fixed property updates removing is-owned (#4037)

* Fixed property updates removing is-owned

* Updated version

* hotfix - consolidation/subdivision button display (#4042)

* psp-8441 correct missing subdivision icon.

* bump hotfix version.

* snapshot updates.

---------

Signed-off-by: devinleighsmith <[email protected]>
Co-authored-by: Smith <[email protected]>
Co-authored-by: Alejandro Sanchez <[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: Sue Tairaku <[email protected]>
Co-authored-by: Sue Tairaku <[email protected]>
Co-authored-by: Manuel Rodriguez <[email protected]>
Co-authored-by: Herrera <[email protected]>
Co-authored-by: Doug Filteau <[email protected]>
Co-authored-by: ap-quartech <[email protected]>
Co-authored-by: JamesPayer <[email protected]>
  • Loading branch information
12 people authored May 28, 2024
1 parent ef18e47 commit 120fe48
Show file tree
Hide file tree
Showing 1,723 changed files with 264,175 additions and 35,402 deletions.
1 change: 1 addition & 0 deletions .github/.trufflehog3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ exclude: # exclude matching issues
- "*.ico"
- "*.css"
- "*.scss"
- "*.config.ts"
- message: Ignore integrity hashes on Openshift config files
pattern: sha256:.*
paths:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/api-dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ jobs:
- name: Codecov
uses: codecov/[email protected]
env:
CODECOV_TOKEN: ${{ secrets.CODECOV }}
with:
# User defined upload name. Visible in Codecov UI
name: PIMS
# Repository upload token - get it from codecov.io. Required only for private repositories
token: ${{ secrets.CodeCov }}
# Path to coverage file to upload
file: ${{env.working-directory}}/tests/unit/TestResults/coverage.opencover.xml
# Flag upload to group coverage metrics (e.g. unittests | integration | ui,chrome)
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/app-react.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ jobs:
- run: npm run build --if-present
working-directory: ${{env.working-directory}}

- run: npm run coverage -- --maxWorkers=2
- run: npm run coverage -- --bail 1 --maxWorkers 2 --minWorkers 2
working-directory: ${{env.working-directory}}
env:
REACT_APP_TENANT: MOTI

- name: Codecov
uses: codecov/[email protected]
env:
CODECOV_TOKEN: ${{ secrets.CODECOV }}
with:
# User defined upload name. Visible in Codecov UI
name: PIMS
# Repository upload token - get it from codecov.io. Required only for private repositories
token: ${{ secrets.CodeCov }}
# Path to coverage file to upload
file: ${{env.working-directory}}/coverage/coverage-final.json
# Flag upload to group coverage metrics (e.g. unittests | integration | ui,chrome)
Expand Down
13 changes: 8 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -184,27 +184,27 @@ infra: ## Starts infrastructure containers (e.g. database, geoserver). Useful fo

start: ## Starts the local containers (n=service name)
@echo "$(P) Starting client and server containers..."
@docker-compose start $(n)
@docker-compose --profile all start $(n)

up: ## Runs the local containers (n=service name)
@echo "$(P) Running client and server..."
@docker-compose up -d --no-recreate $(n)
@docker-compose --profile all up -d --no-recreate $(n)

destroy: ## Stops the local containers and removes them (n=service name)
@echo "$(P) Removing docker containers..."
@docker-compose rm -s -f $(n)

down: ## Stops the local containers and removes them
@echo "$(P) Stopping client and server..."
@docker-compose down
@docker-compose --profile all down

stop: ## Stops the local containers (n=service name)
@echo "$(P) Stopping client and server..."
@docker-compose stop $(n)
@docker-compose --profile all stop $(n)

build: ## Builds the local containers (n=service name)
@echo "$(P) Building images..."
@docker-compose build --no-cache $(n)
@docker-compose --profile all build --no-cache $(n)

rebuild: ## Build the local contains (n=service name) and then start them after building
@"$(MAKE)" build n=$(n)
Expand All @@ -216,6 +216,9 @@ clean: ## Removes all local containers, images, volumes, etc
@docker volume rm -f psp-frontend-node-cache
@docker volume rm -f psp-api-db-data

restart-mayan:
@docker-compose --profile mayan up --build -d

logs: ## Shows logs for running containers (n=service name)
@docker-compose logs -f $(n)

Expand Down
25 changes: 24 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
version: "3.5"

include:
- tools/mayan-edms/docker-compose.yml

services:
####################### Database #######################
database:
profiles:
- all
- psp
environment:
- TARGET_SPRINT
- SEED
Expand All @@ -21,6 +27,9 @@ services:

####################### Backend #######################
backend:
profiles:
- all
- psp
restart: on-failure:1
container_name: psp-api
build:
Expand All @@ -39,6 +48,9 @@ services:

####################### Frontend #######################
frontend:
profiles:
- all
- psp
stdin_open: true
tty: true
restart: on-failure:1
Expand All @@ -59,6 +71,9 @@ services:

####################### GeoServer #######################
geoserver:
profiles:
- all
- psp
image: kartoza/geoserver:2.19.2
volumes:
- ./tools/geoserver/geoserver_data:/opt/geoserver/data_dir/workspaces
Expand All @@ -77,6 +92,8 @@ services:
####################### Clam AV #######################
# example av test file here: https://serverfault.com/questions/484082/how-should-i-test-clam-anti-virus
clamav:
profiles:
- all
image: mkodockx/docker-clamav:alpine-idb-amd64
environment:
- CLAMD_CONF_MaxFileSize=500M
Expand All @@ -86,14 +103,17 @@ services:
restart: on-failure
container_name: psp-clamav
healthcheck:
test: ["CMD", "./check.sh"]
test: [ "CMD", "./check.sh" ]
interval: 60s
retries: 3
start_period: 120s
networks:
- psp

prometheus:
profiles:
- all
- monitoring
image: ubuntu/prometheus
container_name: psp-prometheus
ports:
Expand All @@ -108,6 +128,9 @@ services:
- "--web.enable-lifecycle"

grafana:
profiles:
- all
- monitoring
image: grafana/grafana-oss
container_name: psp-grafana
restart: on-failure
Expand Down
Loading

0 comments on commit 120fe48

Please sign in to comment.