SIMSBIOHUB 211 - Edit Telemetry Form #1094

GrahamS-Quartech · 2023-09-15T22:34:14Z

Links to Jira Tickets

SIMSBIOHUB-211

Description of Changes

Restructured the deployment form to better handle the case where multiple devices with potentially multiple deployments per device will need to be displayed. Hitting edit deployment on a critter with multiple devices assigned will demonstrate this case. It will only update information that has been modified since opening the form.
Added hooks and routes for upserting collars in BCTW, getting deployments per device id, getting device metadata change history, updating deployment rows for both SIMS and BCTW.

Testing Notes

~~Some functionality may not work 100% correctly until an API patch for BCTW gets merged in. Will update this comment when that happens.~~

…NoSummarySectionData.tsx

…tterbase from within SIMS api

…o critterbase calls, still need to implement automated signup

…pi routes similar to existing SIMS routes

…handling

…out menus in UI

…mponents can now be added to form on button click

… calling cb api through hooks in the frontend. No more extra auth headers, now all done through keycloak JWT.

…rbase. Made a wrapper function for critterbase selects that uses existing Formik components

…der and the docker compose that we don't need anymore

…ge in dev environment

…cidentally while merging

github-actions · 2023-09-15T22:34:27Z

Openshift URLs for the PR Deployment:

codecov · 2023-09-15T22:36:27Z

Codecov Report

Merging #1094 (ae21c2d) into dev (5289900) will increase coverage by 0.27%.
The diff coverage is 66.27%.

@@            Coverage Diff             @@
##              dev    #1094      +/-   ##
==========================================
+ Coverage   64.62%   64.90%   +0.27%     
==========================================
  Files         487      489       +2     
  Lines       14495    14622     +127     
  Branches     2263     2287      +24     
==========================================
+ Hits         9368     9490     +122     
+ Misses       4535     4526       -9     
- Partials      592      606      +14

Files Changed	Coverage Δ
...src/features/surveys/view/survey-animals/animal.ts	`68.26% <ø> (-0.60%)`	⬇️
app/src/utils/Utils.ts	`74.11% <25.00%> (-2.43%)`	⬇️
app/src/features/surveys/view/SurveyAnimals.tsx	`44.94% <37.73%> (+1.19%)`	⬆️
...urveys/view/survey-animals/TelemetryDeviceForm.tsx	`60.60% <50.00%> (+56.43%)`	⬆️
app/src/hooks/telemetry/useDeviceApi.tsx	`60.00% <57.14%> (-0.87%)`	⬇️
api/src/paths/telemetry/device/index.ts	`83.33% <83.33%> (ø)`
app/src/hooks/api/useSurveyApi.ts	`42.85% <85.71%> (+3.29%)`	⬆️
...vey/{surveyId}/critters/{critterId}/deployments.ts	`89.28% <88.88%> (-1.63%)`	⬇️
...ojectId}/survey/{surveyId}/critters/{critterId}.ts	`95.65% <100.00%> (-0.19%)`	⬇️
api/src/repositories/survey-critter-repository.ts	`100.00% <100.00%> (ø)`
... and 5 more

... and 3 files with indirect coverage changes

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

api/src/repositories/survey-critter-repository.ts

api/src/services/bctw-service.ts

api/src/services/survey-critter-service.ts

app/src/features/surveys/view/SurveyAnimals.tsx

app/src/features/surveys/view/survey-animals/SurveyAnimalsTableActions.tsx

app/src/features/surveys/view/survey-animals/TelemetryDeviceForm.tsx

curtisupshall

Had to review this in chunks, sorry about that. Code looks good!

app/src/utils/Utils.ts

…ch blocks, better upsert behavior, etc

JeremyQuartech

Code looks good!

api/src/paths/project/{projectId}/survey/{surveyId}/critters/{critterId}.ts

JeremyQuartech

Looks good to me!

…existing ones

curtisupshall

Looks good - just noticed a couple more things

app/src/features/surveys/view/SurveyAnimals.tsx

app/src/features/surveys/view/survey-animals/TelemetryDeviceForm.tsx

sonarqubecloud · 2023-09-19T16:56:57Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
4 Code Smells

No Coverage information
0.0% Duplication

curtisupshall

Code looks good! 🌎

JeremyQuartech

Good to go 👍

MacQSL and others added 30 commits July 18, 2023 10:27

Created section for individual animals in survey

b5e0bb8

consolidated duplicate components into single component -> now using …

df53224

…NoSummarySectionData.tsx

added SurveyAnimals.tsx to SurveyPage

43315b3

renamed file to NoSurveySectionData

da71902

updated references to use new component name/import

b96aa49

Added new express router and relevant env variables to connect to cri…

8b47054

…tterbase from within SIMS api

Added simple critterbase hook and test page to app

5f498bb

Frontend / API will not pass correct authentication headers through t…

13f4aa2

…o critterbase calls, still need to implement automated signup

adding state for animal section buttons

b96d61d

Implemented critterbase signup and markings endpoint as express-opena…

5352ef8

…pi routes similar to existing SIMS routes

fixed merge conflict, and updated styling to use MUI5 standards

ba3e335

Added state for handling the form sections

772d73a

created form context + custom hook for handling form section data

23fc5c1

Added first form section (General)

9aff645

updated default export to be the wrapped instance of the AnimalForm

4b6fc18

placeholder content created for General section

e1a1021

updated useAnimalFormData.tsx to implement useReducer for form state …

2451c14

…handling

created helpButton tooltip component, styled simlarily to current pop…

fbb6b67

…out menus in UI

modified the way the state is being handled inside the AnimalForm, co…

2a529a7

…mponents can now be added to form on button click

added temp delete button for each generated form section

ab98f4e

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.

Forgot to start tracking files for critterbase frontend hooks.

6c558b3

renamed GeneralAnimalForm and refactored

20ded28

refactored CaptureAnimalForm

8d0c847

created form section wrapper to reduce syling duplication

2988018

refactored IndividualAnimalForm to use formik FieldArray

94b5959

updated animal form related types

ceef6e2

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

Removed some extra critterbase-sims api fusion stuff from the api fol…

8015531

…der and the docker compose that we don't need anymore

Adds conditonal render to AppRouter to only display dev Playground pa…

16df8c5

…ge in dev environment

Removed some unwanted buttons in the action menu that I added back ac…

1fc3f8c

…cidentally while merging

GrahamS-Quartech requested review from JeremyQuartech and curtisupshall September 15, 2023 22:34

GrahamS-Quartech changed the title ~~SIMSBIOHUB 211~~ SIMSBIOHUB 211 - Edit Telemetry Form Sep 18, 2023

GrahamS-Quartech added 3 commits September 18, 2023 10:37

adds additional testing for new services and endpoints

6008ae9

Adds additional missing test, fixes lint error

cd6b08a

Forgot a test file

96e6845

curtisupshall reviewed Sep 18, 2023

View reviewed changes

Fixed some borked Survey UI tests

bb82bcd

curtisupshall reviewed Sep 18, 2023

View reviewed changes

app/src/utils/Utils.ts Show resolved Hide resolved

GrahamS-Quartech added 2 commits September 18, 2023 14:19

SurveyAnimals test will now press buttons

5a1e18c

Adresses PR comments, adds enums, return types, adds specific try cat…

5a562f9

…ch blocks, better upsert behavior, etc

JeremyQuartech reviewed Sep 18, 2023

View reviewed changes

api/src/paths/project/{projectId}/survey/{surveyId}/critters/{critterId}.ts Show resolved Hide resolved

JeremyQuartech previously approved these changes Sep 18, 2023

View reviewed changes

Catches some bugs surrounding submitting new deployments and editing …

eafcbc1

…existing ones

GrahamS-Quartech dismissed JeremyQuartech’s stale review via eafcbc1 September 18, 2023 23:37

curtisupshall reviewed Sep 18, 2023

View reviewed changes

GrahamS-Quartech added 5 commits September 18, 2023 17:06

Adds some more test and addresses PR comments

90bacec

Adds more tests

e06bcca

lint fix

a196f9e

Removing the code smell surrounding array indexes as react keys

cbad57a

added more survey tests to make review pass

ae21c2d

curtisupshall approved these changes Sep 19, 2023

View reviewed changes

JeremyQuartech approved these changes Sep 19, 2023

View reviewed changes

GrahamS-Quartech merged commit 429212f into dev Sep 19, 2023

NickPhura deleted the SIMSBIOHUB-211 branch October 13, 2023 18:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SIMSBIOHUB 211 - Edit Telemetry Form #1094

SIMSBIOHUB 211 - Edit Telemetry Form #1094

GrahamS-Quartech commented Sep 15, 2023 •

edited

Loading

github-actions bot commented Sep 15, 2023

codecov bot commented Sep 15, 2023 •

edited

Loading

curtisupshall left a comment

JeremyQuartech left a comment

JeremyQuartech left a comment

curtisupshall left a comment

sonarqubecloud bot commented Sep 19, 2023

curtisupshall left a comment

JeremyQuartech left a comment

SIMSBIOHUB 211 - Edit Telemetry Form #1094

SIMSBIOHUB 211 - Edit Telemetry Form #1094

Conversation

GrahamS-Quartech commented Sep 15, 2023 • edited Loading

Links to Jira Tickets

Description of Changes

Testing Notes

github-actions bot commented Sep 15, 2023

codecov bot commented Sep 15, 2023 • edited Loading

Codecov Report

curtisupshall left a comment

Choose a reason for hiding this comment

JeremyQuartech left a comment

Choose a reason for hiding this comment

JeremyQuartech left a comment

Choose a reason for hiding this comment

curtisupshall left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Sep 19, 2023

curtisupshall left a comment

Choose a reason for hiding this comment

JeremyQuartech left a comment

Choose a reason for hiding this comment

GrahamS-Quartech commented Sep 15, 2023 •

edited

Loading

codecov bot commented Sep 15, 2023 •

edited

Loading