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-219: Add new sampling site #1100

Merged
merged 142 commits into from
Sep 27, 2023
Merged

SIMSBIOHUB-219: Add new sampling site #1100

merged 142 commits into from
Sep 27, 2023

Conversation

al-rosenthal
Copy link
Contributor

Links to Jira Tickets

SIMSBIOHUB-219

Description of Changes

  • Added migration for tracking survey samples, methods and time periods
  • Added API function for creating a new sample site with accompanying methods and periods
  • Added new UI for importing shape files
  • Added new UI for adding methods/ time periods

Testing Notes

  • To test you will need to navigate to the proper page. Starting on the project page -> go to any survey -> click 'Manage Observations' button -> click '+ Add' button in the sampling site section
  • The data will be visualized in SIMSBIOHUB-220 so in order to see any results you will need to open the database and inspect the following tables: survey_sample_site, survey_sample_method, survey_sample_period
  • Sample Sites that are added are based on the number of features found in the shape file uploaded. For example, if a shape file uploaded contains 5 features, it will create 5 distinct sample sites, each with a copy of any methods/ periods on the form at submission time

jeznorth and others added 30 commits September 14, 2023 13:50
@jeznorth @KjartanE
Initial Prototype Development
b949992
@jeznorth @KjartanE
UI Prototype Development - Adding Sampling Sites
bb3bf38
@jeznorth @KjartanE
WIP
08e5b5e
@jeznorth @KjartanE
WIP
ca302f6
@KjartanE
split up prototype to new components
d852629
@al-rosenthal
added button to get to observations
1ef11dd
@al-rosenthal
added controls and new page for sampling site
f8b63f3
@KjartanE
initial sample tables added
2f0ebbd
@al-rosenthal
added basic map boundary to page, stubbed out formik
da323f1
@al-rosenthal
added method ui, started wiring up UI actions
56b8e99
@KjartanE
db migration, initial repo files
88558b6
@al-rosenthal
moved files around
7e0cdfe
@al-rosenthal
basic modal wired up for adding sample method
a7a2de6
@al-rosenthal
got method dialog setup
7f8f401
@al-rosenthal
shifting components around
1e1ac11
@al-rosenthal
setting up data for form submission
abccb2f
@al-rosenthal
Merge branch 'SIMSBIOHUB-219' into SpatialFiles
f8c7492
@al-rosenthal
moved header into it's own component
d2b9e35
@al-rosenthal
adding proper interfaces and wiring up add method functions
01d15c0
@al-rosenthal
stubbed sample methods into codes API
8bf39b7
@al-rosenthal
added method displays
8501e0b
@al-rosenthal
shifted displays
de07a7a
@NickPhura
Add react-app-rewired to resolve issue with shpjs requiring Buffer.
f60ef26 
Update shapefile parsing functions to work asynchronously, add new functions that are not tied to formik.
@al-rosenthal
added edit functionality to sampling methods
76ebdce
@KjartanE
update repo and service files
18f488c
@al-rosenthal
added placeholder
0820ede
@al-rosenthal
Merge branch 'SIMSBIOHUB-219' into SpatialFiles
f80a2c7
@al-rosenthal
map boundary setup and taking files
1696158
@al-rosenthal
stubbed out API
2fa924b
@KjartanE
update service, location endpoints
35c3cba
curtisupshall
curtisupshall reviewed Sep 26, 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 2

...roject/{projectId}/survey/{surveyId}/sample-site/{surveySampleSiteId}/sample-method/index.ts Outdated Show resolved Hide resolved
...ey/{surveyId}/sample-site/{surveySampleSiteId}/sample-method/{surveySampleMethodId}/index.ts Outdated Show resolved Hide resolved
...ey/{surveyId}/sample-site/{surveySampleSiteId}/sample-method/{surveySampleMethodId}/index.ts Outdated Show resolved Hide resolved
...sample-site/{surveySampleSiteId}/sample-method/{surveySampleMethodId}/sample-period/index.ts Outdated Show resolved Hide resolved
...eySampleSiteId}/sample-method/{surveySampleMethodId}/sample-period/{surveySamplePeriodId}.ts Outdated Show resolved Hide resolved
...eySampleSiteId}/sample-method/{surveySampleMethodId}/sample-period/{surveySamplePeriodId}.ts Outdated Show resolved Hide resolved
api/src/repositories/sample-location-repository.ts Outdated Show resolved Hide resolved
api/src/repositories/sample-period-repository.ts Outdated Show resolved Hide resolved
curtisupshall
curtisupshall reviewed Sep 26, 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 3/3

api/src/services/sample-location-service.ts Show resolved Hide resolved
api/src/services/sample-location-service.ts Show resolved Hide resolved
api/src/services/sample-method-service.ts Show resolved Hide resolved
app/src/components/fields/HorizontalSplitFormComponent.tsx Show resolved Hide resolved
app/src/components/file-upload/DropZone.test.tsx Show resolved Hide resolved
app/src/features/surveys/observations/SurveyObservationPage.tsx Show resolved Hide resolved
...ures/surveys/observations/sampling-sites/components/SampleSiteFileUploadItemActionButton.tsx Outdated Show resolved Hide resolved
app/src/features/surveys/view/SurveyHeader.tsx Outdated Show resolved Hide resolved
app/src/hooks/api/useSamplingSiteApi.ts Outdated Show resolved Hide resolved
database/src/migrations/20230915000000_create_survey_observation_tables.ts Outdated Show resolved Hide resolved
NickPhura
NickPhura previously approved these changes Sep 27, 2023
View reviewed changes
@sonarcloud
Copy link

sonarcloud bot commented Sep 27, 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 0 Code Smells

No Coverage information No Coverage information
24.5% 24.5% Duplication

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

KjartanE
KjartanE approved these changes Sep 27, 2023
View reviewed changes
Copy link
Contributor

@KjartanE KjartanE left a comment

Choose a reason for hiding this comment

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

🐈 Ran locally running properly

@KjartanE KjartanE self-assigned this Sep 27, 2023
@al-rosenthal al-rosenthal merged commit 6d00b84 into dev Sep 27, 2023
17 of 20 checks passed
@al-rosenthal al-rosenthal deleted the SIMSBIOHUB-219 branch September 27, 2023 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KjartanE KjartanE KjartanE approved these changes

@NickPhura NickPhura NickPhura approved these changes

@jeznorth jeznorth Awaiting requested review from jeznorth

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

@JeremyQuartech JeremyQuartech Awaiting requested review from JeremyQuartech

@curtisupshall curtisupshall Awaiting requested review from curtisupshall

Assignees

@KjartanE KjartanE

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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