Skip to content

Conversation

@JeremyQuartech
Copy link
Contributor

Description of Changes

  • Updated styling of Add telemetry device dialog
  • Changed edit telemetry details to render each device as a card
  • Minor changes to Individual animals nomenclature
  • Styling improvements on individual animals table
  • Styling improvements on general animal form
  • Minor bug fix in /deployments api

@JeremyQuartech JeremyQuartech added the Early Feedback Welcome PR is not finished, but early review feedback is welcomed label Oct 3, 2023
@github-actions
Copy link

github-actions bot commented Oct 3, 2023

@codecov
Copy link

codecov bot commented Oct 3, 2023

Codecov Report

Merging #1105 (9c0effd) into dev (df69dcb) will increase coverage by 0.00%.
The diff coverage is 59.09%.

@@           Coverage Diff           @@
##              dev    #1105   +/-   ##
=======================================
  Coverage   63.50%   63.50%           
=======================================
  Files         533      533           
  Lines       15817    15818    +1     
  Branches     2472     2472           
=======================================
+ Hits        10044    10046    +2     
+ Misses       5087     5086    -1     
  Partials      686      686           
Files Coverage Δ
...vey/{surveyId}/critters/{critterId}/deployments.ts 89.09% <100.00%> (ø)
app/src/components/buttons/HelpButtonTooltip.tsx 50.00% <ø> (ø)
app/src/components/fields/CbSelectFieldWrapper.tsx 57.14% <ø> (ø)
app/src/components/fields/TelemetrySelectField.tsx 77.77% <ø> (ø)
...rveys/view/survey-animals/IndividualAnimalForm.tsx 20.00% <ø> (+5.71%) ⬆️
.../view/survey-animals/SurveyAnimalsTableActions.tsx 100.00% <ø> (ø)
...urveys/view/survey-animals/TelemetryFileUpload.tsx 50.00% <ø> (ø)
...src/features/surveys/view/survey-animals/device.ts 100.00% <100.00%> (ø)
...survey-animals/form-sections/GeneralAnimalForm.tsx 16.66% <ø> (ø)
app/src/features/surveys/view/SurveyAnimals.tsx 35.25% <0.00%> (-0.23%) ⬇️
... and 3 more

... and 2 files with indirect coverage changes

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

@NickPhura
Copy link
Contributor

NickPhura commented Oct 3, 2023

I add a single animal to a survey.

When the survey page loads (just loading the survey page, not clicking anything) I'm getting the following console error:

Warning: Encountered two children with the same key, `taxon`. Keys should be unique so that components maintain their identity across updates. Non-unique keys may cause children to be duplicated and/or omitted — the behavior is unsupported and could change in a future version.
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
GridColumnHeadersInner@http://localhost:7107/static/js/bundle.js:128052:9
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
GridColumnHeaders@http://localhost:7107/static/js/bundle.js:127158:9
GridColumnsHeaders@http://localhost:7107/static/js/bundle.js:123752:9
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
./node_modules/@mui/x-data-grid/components/containers/GridMainContainer.js/GridMainContainer<@http://localhost:7107/static/js/bundle.js:128715:100
GridBody@http://localhost:7107/static/js/bundle.js:124781:7
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
GridRoot@http://localhost:7107/static/js/bundle.js:128866:100
GridContextProvider@http://localhost:7107/static/js/bundle.js:133348:29
DataGrid@http://localhost:7107/static/js/bundle.js:121736:84
CustomDataGrid@http://localhost:7107/static/js/bundle.js:17329:19
SurveyAnimalsTable@http://localhost:7107/static/js/bundle.js:49264:28
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Box@http://localhost:7107/static/js/bundle.js:118389:72
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Box@http://localhost:7107/static/js/bundle.js:118389:72
SurveyAnimals@http://localhost:7107/static/js/bundle.js:44226:81
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Paper@http://localhost:7107/static/js/bundle.js:103888:83
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Box@http://localhost:7107/static/js/bundle.js:118389:72
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Grid@http://localhost:7107/static/js/bundle.js:97032:87
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Grid@http://localhost:7107/static/js/bundle.js:97032:87
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Box@http://localhost:7107/static/js/bundle.js:118389:72
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Container@http://localhost:7107/static/js/bundle.js:117455:32
SurveyPage@http://localhost:7107/static/js/bundle.js:46042:73
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Box@http://localhost:7107/static/js/bundle.js:118389:72
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Box@http://localhost:7107/static/js/bundle.js:118389:72
ProjectsLayout@http://localhost:7107/static/js/bundle.js:60594:19
Route@http://localhost:7107/static/js/bundle.js:274891:29
RouteWithTitle@http://localhost:7107/static/js/bundle.js:63199:7
Switch@http://localhost:7107/static/js/bundle.js:275060:29
SurveyRouter
ObservationsContextProvider@http://localhost:7107/static/js/bundle.js:19543:93
SurveyContextProvider@http://localhost:7107/static/js/bundle.js:20004:85
Route@http://localhost:7107/static/js/bundle.js:274891:29
CheckIfUserHasProjectRole@http://localhost:7107/static/js/bundle.js:16904:7
WaitForProjectParticipantInfo@http://localhost:7107/static/js/bundle.js:16749:84
ProjectRoleRouteGuard@http://localhost:7107/static/js/bundle.js:16579:7
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Box@http://localhost:7107/static/js/bundle.js:118389:72
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Box@http://localhost:7107/static/js/bundle.js:118389:72
ProjectsLayout@http://localhost:7107/static/js/bundle.js:60594:19
Route@http://localhost:7107/static/js/bundle.js:274891:29
RouteWithTitle@http://localhost:7107/static/js/bundle.js:63199:7
ProjectContextProvider@http://localhost:7107/static/js/bundle.js:19881:85
ProjectAuthStateContextProvider@http://localhost:7107/static/js/bundle.js:19729:85
Route@http://localhost:7107/static/js/bundle.js:274891:29
RouteWithTitle@http://localhost:7107/static/js/bundle.js:63199:7
Switch@http://localhost:7107/static/js/bundle.js:275060:29
ProjectsRouter
CodesContextProvider@http://localhost:7107/static/js/bundle.js:19055:85
Route@http://localhost:7107/static/js/bundle.js:274891:29
CheckIfAuthenticatedUser@http://localhost:7107/static/js/bundle.js:16779:56
WaitForKeycloakToLoadUserInfo@http://localhost:7107/static/js/bundle.js:16715:39
CheckForKeycloakAuthenticated@http://localhost:7107/static/js/bundle.js:16686:56
AuthenticatedRouteGuard@http://localhost:7107/static/js/bundle.js:16616:7
main
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Box@http://localhost:7107/static/js/bundle.js:118389:72
DialogContextProvider@http://localhost:7107/static/js/bundle.js:19367:98
div
./node_modules/@emotion/react/dist/emotion-element-c39617d8.browser.esm.js/withEmotionCache/<@http://localhost:7107/static/js/bundle.js:65443:66
Box@http://localhost:7107/static/js/bundle.js:118389:72
BaseLayout@http://localhost:7107/static/js/bundle.js:60464:19
Route@http://localhost:7107/static/js/bundle.js:274891:29
RouteWithTitle@http://localhost:7107/static/js/bundle.js:63199:7
Switch@http://localhost:7107/static/js/bundle.js:275060:29
AppRouter@http://localhost:7107/static/js/bundle.js:213:82
Router@http://localhost:7107/static/js/bundle.js:274563:30
BrowserRouter@http://localhost:7107/static/js/bundle.js:274078:35
AuthStateContextProvider@http://localhost:7107/static/js/bundle.js:18966:95
KeycloakProvider@http://localhost:7107/static/js/bundle.js:161152:47
ConfigContextProvider@http://localhost:7107/static/js/bundle.js:19216:78
ThemeProvider@http://localhost:7107/static/js/bundle.js:115989:7
ThemeProvider@http://localhost:7107/static/js/bundle.js:117623:7
ThemeProvider@http://localhost:7107/static/js/bundle.js:114273:9
App

(tested on my local)

@NickPhura
Copy link
Contributor

NickPhura commented Oct 3, 2023

Also, I'm getting a 503 error from the http://localhost:6107/api/project/1/survey/1/deployments endpoint when the survey page loads.

(tested on my local)

al-rosenthal
al-rosenthal previously approved these changes Oct 3, 2023
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.

I'm seeing a 500 on the deployments api call when a survey loads. Am I missing some sort of setup for testing this?

@al-rosenthal al-rosenthal dismissed their stale review October 3, 2023 23:01

hit the wrong button

@sonarqubecloud
Copy link

sonarqubecloud bot commented Oct 3, 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 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@JeremyQuartech JeremyQuartech merged commit ab2019d into dev Oct 3, 2023
@NickPhura NickPhura deleted the telemetry-ui-updates branch October 3, 2023 23:51
KjartanE pushed a commit that referenced this pull request Oct 5, 2023
* Updated HelpButtonTooltip styling
* Cleaned up CbSelectField and TelemetrySelectField components
* Updated SurveyAnimalsI18N messages
* Updated mui components and helper messages in SurveyAnimals component
* Cleaned up dead code in IndividualAnimalForm
* Improved formatting in SurveyAnimalsTable
* Several changes to TelemetryDeviceForm including mui components, overall layout, conditional formatting
* Several changes to FormSectionWrapper including overall layout, styling, and mui components
* Improved styling in GeneralAnimalForm

---------

Co-authored-by: jeznorth <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Early Feedback Welcome PR is not finished, but early review feedback is welcomed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants