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

Release dev-staging changes to dev #1131

Merged
merged 36 commits into from
Nov 10, 2023
Merged

Release dev-staging changes to dev #1131

merged 36 commits into from
Nov 10, 2023

Conversation

curtisupshall
Copy link
Contributor

@curtisupshall curtisupshall commented Oct 20, 2023

Changes from dev-staging have already been reviewed.

Links to Jira tickets

@curtisupshall curtisupshall changed the title Release dev staging changes Release dev staging changes (SIMSBIOHUB-226) Oct 20, 2023
@codecov
Copy link

codecov bot commented Oct 20, 2023

Codecov Report

Merging #1131 (cd8e3e0) into dev (0e8754f) will decrease coverage by 2.06%.
The diff coverage is 26.69%.

@@            Coverage Diff             @@
##              dev    #1131      +/-   ##
==========================================
- Coverage   63.16%   61.11%   -2.06%     
==========================================
  Files         536      553      +17     
  Lines       16367    16774     +407     
  Branches     2516     2579      +63     
==========================================
- Hits        10339    10251      -88     
- Misses       5334     5845     +511     
+ Partials      694      678      -16     
Files Coverage Δ
api/src/__mocks__/db.ts 97.14% <100.00%> (+0.26%) ⬆️
api/src/models/project-create.ts 62.85% <ø> (-3.81%) ⬇️
api/src/models/project-update.ts 100.00% <ø> (ø)
api/src/models/project-view.ts 100.00% <ø> (ø)
api/src/openapi/schemas/project.ts 100.00% <ø> (ø)
api/src/paths/codes.ts 100.00% <ø> (ø)
api/src/paths/funding-sources/index.ts 93.75% <100.00%> (-0.13%) ⬇️
...t/{projectId}/attachments/{attachmentId}/delete.ts 96.15% <100.00%> (ø)
api/src/paths/project/{projectId}/survey/create.ts 96.15% <ø> (ø)
...ey/{surveyId}/attachments/{attachmentId}/delete.ts 96.15% <100.00%> (ø)
... and 169 more

... and 16 files with indirect coverage changes

📣 Codecov offers a browser extension for seamless coverage viewing on GitHub. Try it in Chrome or Firefox today!

NickPhura
NickPhura previously approved these changes Oct 20, 2023
NickPhura
NickPhura previously approved these changes Oct 20, 2023
@NickPhura NickPhura self-requested a review October 20, 2023 18:42
@NickPhura NickPhura added the Do Not Merge PR should not be merged label Oct 20, 2023
@NickPhura NickPhura changed the title Release dev staging changes (SIMSBIOHUB-226) SIMSBIOHUB-226: Release dev staging changes Oct 23, 2023
* Minor Fixes / UI Tweaks
* Fix permit component list key
* Rename old sampling method form to sampling strategy

Co-authored-by: Nick Phura <[email protected]>
@mauberti-bc

This comment was marked as outdated.

curtisupshall and others added 4 commits October 24, 2023 16:12
* Add's UIs for uploading CSV files to survey observations
* Adds a new database table to track survey observation CSV submissions, survey_observation_submission
* Alters the survey_observation table to make optional the sampling site, method, and period columns
* Adds service and repo methods for processing observation CSVs
* Survey Study area can now import files with multiple features
* Drawn features can be created and saved to a survey
* New card for displaying and editing map features
* Region selector updated
* Adds Sampling Site record count to title area, Example: Sampling Sites (10)
* Adds Observation record count to title area of observations map component and manage observations page, Example: Observations (10)
* Adds 'supplementaryObservationData' section to get survey observations endpoint. This allows observation record counts to be displayed, even if the get observations response becomes paginated or virtualized at a later date
GrahamS-Quartech and others added 16 commits October 31, 2023 12:11
* Added some additional logic to the API to extract a name and description from the provided shape file when creating sampling sites.
* It will search the keys of the geometry's properties for "name" or "label" and "des" or "desc" or "descr" (exact match), then use the value for the sampling site name and description respectively.
* Added a character limit to the sampling site name field in the edit form.

---------

Co-authored-by: JeremyQuartech <[email protected]>
Map container removed in lieu of using the leaflet component 
Map css moved into single component
Removed project location data  

---------

Co-authored-by: Nick Phura <[email protected]>
Co-authored-by: JeremyQuartech <[email protected]>
Co-authored-by: jeznorth <[email protected]>
Removed field method and site selection strategies are now required on surveys
* Add delete sample site button to menu drop down
* Check for any associated observations to sample site.
* hook up api sample-site delete function.

* SIMSBIOHUB-336/337 (#1142)

* Adds Sampling Site record count to title area, Example: Sampling Sites (10)
* Adds Observation record count to title area of observations map component and manage observations page, Example: Observations (10)
* Adds 'supplementaryObservationData' section to get survey observations endpoint. This allows observation record counts to be displayed, even if the get observations response becomes paginated or virtualized at a later date

* SIMSBIOHUB 343 - Incorrect date overlap error in sampling methods (#1144)

* Fixed an issue where the yup schema used for editing sampling methods used the wrong field for a date overlap check.
* Removed an unintended required().
* Added a refresh call when submitting sampling method changes so they are reflected in the UI. Otherwise you will still see the previous value if you go back to the sampling methods view even though the new value did save to the db.

* SIMSBIOHUB-334/350/352 (#1143)

* Added snackbar popup upon successfully saving observations.
* Removed single-click to edit; Fixed bug that made row go into edit mode when clicking row delete icon.
* Added seconds to the observation time

* Clean up functions and excess data calls

* fix tests

---------

Co-authored-by: JeremyQuartech <[email protected]>
Co-authored-by: GrahamS-Quartech <[email protected]>
Co-authored-by: Curtis Upshall <[email protected]>
…1152)

* Added a migration that removes the intended_outcome_id column from the survey table and shifts the responsibility onto a join table called survey_intended_outcome. This makes it possible to have multiple intended outcomes associated with a single survey.
* Modified the frontend and API to support this change. The dropdown in the add and edit forms for the survey have been replaced with a multiselect. Multiselect will still display the subtext associated with these elements.
* In various cases where a single intended outcome was displayed before, they display as a comma deliminated list instead.
* These items now display with the label of "Ecological Variables" in the frontend survey components.
* Modified each custom renderEditCell component of the ObservationTable to manually set hasFocus. This allows the user to Tab forward to the next cell or Shift+Tab back to the previous.
* Wrapped some of the simpler TextField / DatePicker renders in their own functional components so that the same hasFocus pattern could be used.
…vey fields (#1158)

* Replace existing survey list endpoint with index, which returns a subset of survey fields rather than all fields.
* Swap out old keycloak libraries for newer more up to date libraries.
* Add RouteGuards tests.
* Add git action to clean PR builds for PRs against non-base branches
…#1157)

SIMSBIOHUB-354-355: Added sampling site and study area features to the observation map on the survey details page
---------

Co-authored-by: Nick Phura <[email protected]>
* Added a new ObservationTableContext
* Added an endpont and repository methods to delete one or more observation records
* Added loading button props to the YesNoDialog
* Refactored the observation context to support deleting one or more observation records
#1161)

* Moved the shapefile name and description extraction to UI. Modified the sampling site POST api to accept custom names and desc from UI. Implemented the same ability in study area submission, now both parts of the form can reference the same logic for extracting this info.
* Minor UI polish and updating notification content.
* Removes toLowerCase casting on user_identifier fields from keycloak and stores raw string value in the database regardless of case
* Adds LOWER() sql statements on any relation to user_identifiers and user guids as to make them case-insensitive
Added time to periods in sampling sites

---------

Co-authored-by: Alfred Rosenthal <[email protected]>
…ecords (#1165)

* Seed script will now inject a survey sampling site with a corresponding method, period, and three observations.
* Adds the TaxonomyContext for caching taxonomy names from IDs
* Updates the skeleton loader on the observations table
* Adds backend caching for taxonomy name lookup
* Updates service and repo methods for fetching observations supplementary data
* Fixes a bug with updating the observation count upon deletion
* Fixes a bug where deleted observation records would reappear when going back to the survey page after deletion
* Adds a missing snackbar shown upon deletion
* Adds the count of observtions being deleted in the confirm deletion dialog
@curtisupshall curtisupshall removed the Do Not Merge PR should not be merged label Nov 9, 2023
@curtisupshall curtisupshall marked this pull request as ready for review November 9, 2023 18:43
@curtisupshall curtisupshall added the Early Feedback Welcome PR is not finished, but early review feedback is welcomed label Nov 9, 2023
@curtisupshall curtisupshall changed the title SIMSBIOHUB-226: Release dev staging changes Release dev-staging changes to dev Nov 9, 2023
Added a delete all button to study areas, updated map UI, added layer colors

---------

Co-authored-by: jeznorth <[email protected]>
@curtisupshall curtisupshall added Ready For Review PR is ready for review and removed Early Feedback Welcome PR is not finished, but early review feedback is welcomed labels Nov 9, 2023
Copy link
Contributor

@al-rosenthal al-rosenthal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💣

Copy link

sonarcloud bot commented Nov 9, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 7 Code Smells

No Coverage information No Coverage information
5.6% 5.6% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@curtisupshall curtisupshall merged commit 6bd3050 into dev Nov 10, 2023
17 of 20 checks passed
@NickPhura NickPhura deleted the dev-staging branch December 9, 2023 00:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ready For Review PR is ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants