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

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

Merged
merged 4 commits into from
Oct 26, 2023

Conversation

GrahamS-Quartech
Copy link
Contributor

Links to Jira Tickets

Description of Changes

  • 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.

…e overlap check. Also removed an unintended required. Also added a refresh call when submitting sampling method changes so they are reflected in the UI.
@GrahamS-Quartech GrahamS-Quartech changed the base branch from dev to dev-staging October 26, 2023 18:47
@GrahamS-Quartech GrahamS-Quartech added the Staging Will merge into staging branch label Oct 26, 2023
@codecov
Copy link

codecov bot commented Oct 26, 2023

Codecov Report

Merging #1144 (b04d6a2) into dev-staging (3b1400a) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

@@               Coverage Diff               @@
##           dev-staging    #1144      +/-   ##
===============================================
- Coverage        62.13%   62.13%   -0.01%     
===============================================
  Files              554      554              
  Lines            16914    16915       +1     
  Branches          2598     2598              
===============================================
  Hits             10510    10510              
- Misses            5697     5698       +1     
  Partials           707      707              
Files Coverage Δ
...features/surveys/components/EditSamplingMethod.tsx 0.00% <ø> (ø)
...tions/sampling-sites/edit/SamplingSiteEditPage.tsx 0.00% <0.00%> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@JeremyQuartech
Copy link
Contributor

How can I test these changes? Should this be branched from dev, or dev-staging?

@curtisupshall curtisupshall self-assigned this Oct 26, 2023
@curtisupshall
Copy link
Contributor

How can I test these changes? Should this be branched from dev, or dev-staging?

PR needs to rebuild since the base branch changed from dev to dev-staging. Otherwise, it should be testable in Openshift

@curtisupshall curtisupshall reopened this Oct 26, 2023
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

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

No Coverage information No Coverage information
0.0% 0.0% Duplication

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.

looks good

Copy link
Contributor

@curtisupshall curtisupshall left a comment

Choose a reason for hiding this comment

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

Manually tested. Appears to be working as intended 👍

@curtisupshall curtisupshall merged commit 6b965b9 into dev-staging Oct 26, 2023
18 of 20 checks passed
@curtisupshall curtisupshall deleted the SIMSBIOHUB-343 branch October 26, 2023 23:21
KjartanE pushed a commit that referenced this pull request Oct 27, 2023
)

* 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.
KjartanE added a commit that referenced this pull request Oct 31, 2023
* 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]>
KjartanE added a commit that referenced this pull request Nov 6, 2023
* 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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Staging Will merge into staging branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants