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-207/216: Survey Animals Table and Telemetry Device Deployment #1087

Merged
merged 227 commits into from
Sep 13, 2023
Merged

SIMSBIOHUB-207/216: Survey Animals Table and Telemetry Device Deployment #1087

merged 227 commits into from
Sep 13, 2023

Conversation

JeremyQuartech
Copy link
Contributor

Links to Jira Tickets

SIMSBIOHUB-207
SIMSBIOHUB-216

Description of Changes

  • Adds new 'Survey Animals Table' to the individual animals section of surveys.
  • Action Ellipses in Animals Table supports 'Add Telemetry Device' to deploy devices.
  • Adds new 'Add Telemetry Device' form.
  • New API survey endpoints and hooks to support the above UI additions.
  • Minor changes to BctwService and CritterbaseService.

Testing Notes

  • Minor changes to the BCTW and Critterbase API's were required. These changes have not been rolled out yet, so only local testing is possible at this time.

MacQSL and others added 30 commits July 18, 2023 10:27
@MacQSL
Created section for individual animals in survey
b5e0bb8
@MacQSL
consolidated duplicate components into single component -> now using …
df53224 
…NoSummarySectionData.tsx
@MacQSL
added SurveyAnimals.tsx to SurveyPage
43315b3
@MacQSL
renamed file to NoSurveySectionData
da71902
@MacQSL
updated references to use new component name/import
b96aa49
@GrahamS-Quartech
Added new express router and relevant env variables to connect to cri…
8b47054 
…tterbase from within SIMS api
@GrahamS-Quartech
Added simple critterbase hook and test page to app
5f498bb
@GrahamS-Quartech
Frontend / API will not pass correct authentication headers through t…
13f4aa2 
…o critterbase calls, still need to implement automated signup
@MacQSL
adding state for animal section buttons
b96d61d
@GrahamS-Quartech
Implemented critterbase signup and markings endpoint as express-opena…
5352ef8 
…pi routes similar to existing SIMS routes
@MacQSL
fixed merge conflict, and updated styling to use MUI5 standards
ba3e335
@MacQSL
Added state for handling the form sections
772d73a
@MacQSL
created form context + custom hook for handling form section data
23fc5c1
@MacQSL
Added first form section (General)
9aff645
@MacQSL
updated default export to be the wrapped instance of the AnimalForm
4b6fc18
@MacQSL
placeholder content created for General section
e1a1021
@MacQSL
updated useAnimalFormData.tsx to implement useReducer for form state …
2451c14 
…handling
@MacQSL
created helpButton tooltip component, styled simlarily to current pop…
fbb6b67 
…out menus in UI
@MacQSL
modified the way the state is being handled inside the AnimalForm, co…
2a529a7 
…mponents can now be added to form on button click
@MacQSL
added temp delete button for each generated form section
ab98f4e
@GrahamS-Quartech
Removes express-openapi style critterbase routes in favor of directly…
b799aaf 
… calling cb api through hooks in the frontend. No more extra auth headers, now all done through keycloak JWT.
@GrahamS-Quartech
Forgot to start tracking files for critterbase frontend hooks.
6c558b3
@MacQSL
renamed GeneralAnimalForm and refactored
20ded28
@MacQSL
refactored CaptureAnimalForm
8d0c847
@MacQSL
created form section wrapper to reduce syling duplication
2988018
@MacQSL
refactored IndividualAnimalForm to use formik FieldArray
94b5959
@MacQSL
updated animal form related types
ceef6e2
@GrahamS-Quartech
Made another hook for getting the lookup tables and enums from critte…
cf0799a 
…rbase. Made a wrapper function for critterbase selects that uses existing Formik components
@GrahamS-Quartech
Removed some extra critterbase-sims api fusion stuff from the api fol…
8015531 
…der and the docker compose that we don't need anymore
@GrahamS-Quartech
Adds conditonal render to AppRouter to only display dev Playground pa…
16df8c5 
…ge in dev environment
@JeremyQuartech JeremyQuartech marked this pull request as ready for review September 11, 2023 19:02
@JeremyQuartech JeremyQuartech removed the Early Feedback Welcome PR is not finished, but early review feedback is welcomed label Sep 11, 2023
@github-actions
Copy link

Openshift URLs for the PR Deployment:

al-rosenthal
al-rosenthal previously approved these changes Sep 12, 2023
View reviewed changes
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! 😎

curtisupshall
curtisupshall reviewed Sep 12, 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! +1 for new CustomDataGrid 🙏 Most of my comments are about code style/formatting

api/src/paths/critter-data/critters/filter.ts Show resolved Hide resolved
api/src/paths/project/{projectId}/survey/{surveyId}/critters/index.ts Outdated Show resolved Hide resolved
api/src/paths/project/{projectId}/survey/{surveyId}/critters/index.ts Outdated Show resolved Hide resolved
api/src/paths/project/{projectId}/survey/{surveyId}/critters/{critterId}/deployments.ts Outdated Show resolved Hide resolved
api/src/paths/project/{projectId}/survey/{surveyId}/deployments.ts Outdated Show resolved Hide resolved
app/src/features/surveys/view/survey-animals/TelemetryDeviceForm.tsx Show resolved Hide resolved
app/src/features/surveys/view/survey-animals/TelemetryDeviceForm.tsx Outdated Show resolved Hide resolved
app/src/features/surveys/view/survey-animals/TelemetryDeviceForm.tsx Outdated Show resolved Hide resolved
app/src/hooks/api/useSurveyApi.ts Show resolved Hide resolved
app/src/hooks/telemetry/useDeviceApi.tsx Show resolved Hide resolved
@sonarcloud
Copy link

sonarcloud bot commented Sep 13, 2023

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 2 Code Smells

No Coverage information No Coverage information
1.6% 1.6% Duplication

curtisupshall
curtisupshall approved these changes Sep 13, 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.

Looks great! 🙌

al-rosenthal
al-rosenthal approved these changes Sep 13, 2023
View reviewed changes
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.

👯

@JeremyQuartech JeremyQuartech merged commit 1fa6146 into dev Sep 13, 2023
20 checks passed
@NickPhura NickPhura deleted the SIMSBIOHUB-216 branch October 13, 2023 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GrahamS-Quartech GrahamS-Quartech GrahamS-Quartech left review comments

@curtisupshall curtisupshall curtisupshall approved these changes

@al-rosenthal al-rosenthal al-rosenthal approved these changes

@AlfredRosenthal AlfredRosenthal Awaiting requested review from AlfredRosenthal

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

Successfully merging this pull request may close these issues.
5 participants
@JeremyQuartech @al-rosenthal @curtisupshall @GrahamS-Quartech @MacQSL