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.

Sign up for GitHub

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

Jump to bottom

SIMSBIOHUB-288: Sample Site Dropdowns #1110

Merged
merged 50 commits into from
Oct 11, 2023
Merged

SIMSBIOHUB-288: Sample Site Dropdowns #1110

merged 50 commits into from
Oct 11, 2023

Conversation

al-rosenthal
Copy link
Contributor

Links to Jira Tickets

SIMSBIOHUB-288
SIMSBIOHUB-289
SIMSBIOHUB-290
SIMSBIOHUB-291

Description of Changes

  • Sampling site, method and period dropdowns have been added and wired up
  • Elastic search added to species search column
  • Fixes made to data types for observation date/ time values
  • Data grid values now can be edited

Testing Notes

-Navigate to Manage Observations page

  • Add a new sampling site
  • Reload observation page
  • Add new observations
  • Save changes

KjartanE and others added 30 commits September 27, 2023 12:07
@KjartanE
Initial surveyContext update for sampleSiteLoader
25fc726
@al-rosenthal
added sql and updated stubbed into display for sample sites
51f3e06
@al-rosenthal
updated to to id
af7479b
@al-rosenthal
refactored sql
06dccd5
@al-rosenthal
added order by clause
d19527f
@al-rosenthal
added another comment
71b9713
@KjartanE
block out edit page
01d6839
@al-rosenthal
Merge branch 'dev' into SIMSBIOHUB-220-221
876cde3
@NickPhura
SIMSBIOHUB-288: WIP Autocomplete components
4d4dbb4
@NickPhura
WIP
379ba97
@NickPhura
WIP
fb48bd2
@NickPhura
WIP
351cf38
@al-rosenthal
updated migration
c8b9eba
@al-rosenthal
sample site, method and periods displaying the correct data
7f48877
@al-rosenthal
clean up
31fc0db
@NickPhura
Updates
08752cb
@NickPhura
Merge branch 'SIMSBIOHUB-288' of https://github.com/bcgov/biohubbc in…
27328c2 
…to SIMSBIOHUB-288
@NickPhura
Add experimental Time control to data grid.
ec28fad
@al-rosenthal
fixed issues with missing key
1c1b58c
@al-rosenthal
Merge branch 'SIMSBIOHUB-288' of https://github.com/bcgov/biohubbc in…
2c26076 
…to SIMSBIOHUB-288
@al-rosenthal
updated repo
749a58f
@al-rosenthal
added float parser and fixed observation insert
2404847
@NickPhura
Updates
5d0034e
@al-rosenthal
updated save
731a32a
@NickPhura
Update observation index.ts
2043ea7
@NickPhura
Merge branch 'SIMSBIOHUB-288' of https://github.com/bcgov/biohubbc in…
fd4c441 
…to SIMSBIOHUB-288
@NickPhura
nits
5147213
@al-rosenthal
saving edits on observation records
796ca87
@al-rosenthal
Merge branch 'SIMSBIOHUB-288' of https://github.com/bcgov/biohubbc in…
4c8ae53 
…to SIMSBIOHUB-288
@al-rosenthal
fixed error with deleting all records
f54a958
@codecov
Copy link

codecov bot commented Oct 6, 2023 •
edited
Loading

Codecov Report

Merging #1110 (c9aa28c) into dev (dfd11f5) will decrease coverage by 0.94%.
The diff coverage is 4.07%.

@@            Coverage Diff             @@
##              dev    #1110      +/-   ##
==========================================
- Coverage   63.26%   62.33%   -0.94%     
==========================================
  Files         529      539      +10     
  Lines       15858    16103     +245     
  Branches     2452     2480      +28     
==========================================
+ Hits        10033    10038       +5     
- Misses       5137     5376     +239     
- Partials      688      689       +1
Files Coverage Δ
api/src/paths/project/{projectId}/survey/list.ts 96.66% <100.00%> (ø)
...{projectId}/survey/{surveyId}/observation/index.ts 95.45% <100.00%> (ø)
api/src/repositories/sample-method-repository.ts 100.00% <100.00%> (ø)
app/src/contexts/observationsContext.tsx 0.00% <ø> (ø)
...funding-sources/components/CreateFundingSource.tsx 79.31% <100.00%> (+3.44%) ⬆️
...s/funding-sources/components/EditFundingSource.tsx 75.75% <100.00%> (+3.03%) ⬆️
app/src/features/surveys/SurveyRouter.tsx 0.00% <ø> (ø)
...features/surveys/components/SamplingMethodForm.tsx 0.00% <ø> (ø)
...s/surveys/components/StratumCreateOrEditDialog.tsx 7.14% <ø> (ø)
...s/surveys/observations/SurveyObservationHeader.tsx 0.00% <ø> (ø)
... and 27 more

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

curtisupshall
curtisupshall reviewed Oct 6, 2023
View reviewed changes
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.

Review Part 1/?

api/src/repositories/observation-repository.ts Outdated Show resolved Hide resolved
app/src/components/data-grid/autocomplete/AsyncAutocompleteDataGridEditCell.tsx Outdated Show resolved Hide resolved
app/src/components/data-grid/autocomplete/AsyncAutocompleteDataGridEditCell.tsx Show resolved Hide resolved
app/src/components/data-grid/autocomplete/AsyncAutocompleteDataGridEditCell.tsx Show resolved Hide resolved
curtisupshall
curtisupshall reviewed Oct 10, 2023
View reviewed changes
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.

Couple more review comments

app/src/contexts/observationsContext.tsx Show resolved Hide resolved
app/src/features/surveys/observations/ObservationComponent.tsx Outdated Show resolved Hide resolved
@NickPhura NickPhura requested a review from MacQSL October 10, 2023 19:57
curtisupshall
curtisupshall reviewed Oct 10, 2023
View reviewed changes
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.

Code looks good overall! Had a few minor comments

app/src/components/data-grid/autocomplete/AsyncAutocompleteDataGridEditCell.tsx Show resolved Hide resolved
app/src/features/surveys/observations/ObservationComponent.tsx Show resolved Hide resolved
app/src/features/surveys/observations/ObservationsTable.tsx Outdated Show resolved Hide resolved
app/src/features/surveys/observations/ObservationsTable.tsx Outdated Show resolved Hide resolved
app/src/features/surveys/observations/sampling-sites/SamplingSiteHeader.tsx Outdated Show resolved Hide resolved
app/src/features/surveys/observations/sampling-sites/SamplingSiteList.tsx Outdated Show resolved Hide resolved
app/src/features/surveys/observations/sampling-sites/SamplingSiteList.tsx Outdated Show resolved Hide resolved
app/src/features/surveys/observations/sampling-sites/SamplingSiteList.tsx Outdated Show resolved Hide resolved
app/src/features/surveys/observations/sampling-sites/edit/SamplingSiteEditPage.tsx Show resolved Hide resolved
app/src/features/surveys/observations/sampling-sites/edit/components/SampleSiteEditForm.tsx Outdated Show resolved Hide resolved
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

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

No Coverage information No Coverage information
3.6% 3.6% Duplication

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

curtisupshall
curtisupshall approved these changes Oct 11, 2023
View reviewed changes
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.

Code looks good!

@NickPhura NickPhura changed the title SIMSBIOHUB-288: Sample Site dropdowns SIMSBIOHUB-288: Sample Site Dropdowns Oct 11, 2023
@NickPhura NickPhura merged commit e976b83 into dev Oct 11, 2023
@NickPhura NickPhura deleted the SIMSBIOHUB-288 branch October 11, 2023 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NickPhura NickPhura NickPhura approved these changes

@curtisupshall curtisupshall curtisupshall approved these changes

@KjartanE KjartanE Awaiting requested review from KjartanE

@GrahamS-Quartech GrahamS-Quartech Awaiting requested review from GrahamS-Quartech

@JeremyQuartech JeremyQuartech Awaiting requested review from JeremyQuartech

@MacQSL MacQSL Awaiting requested review from MacQSL

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@al-rosenthal @NickPhura @curtisupshall @KjartanE