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.

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

feat(app): add e-stop modals for odd #13093

Merged
merged 13 commits into from
Jul 18, 2023
Merged

Conversation

koji
Copy link
Contributor

@koji koji commented Jul 12, 2023

Overview

Add two modals for e-stop. One is EstopPressedModal and the other is EstopMissingModal.
Combine DesktopEstopPressedModal and EstopPressedModal into one component as well as DesktopMissingModal.
Also add error type to Chip component.
The function will be added by following PRs.

design
https://www.figma.com/file/t4GKKfUA3RRfgHFxPbVVjV/Release%3A-Touchscreen-August-update?type=design&node-id=629-52540&mode=design&t=ucnIizoesp9Fg9hI-0

Test Plan

  1. run storybook
    check EstopPressedModal and EstopMissingModal under Desktop and ODD

Changelog

  • add EstopPressedModal and tests
  • add EstopMissingModal and tests
  • add error type to Chip component and test

Review requests

Risk assessment

low

add two modals for e-stop. One is EstoPressedModal and the other is EstopMissingModal.
@codecov
Copy link

codecov bot commented Jul 12, 2023

Codecov Report

Merging #13093 (95099f9) into edge (4186bb2) will decrease coverage by 0.64%.
The diff coverage is 93.33%.

Impacted file tree graph

@@            Coverage Diff             @@
##             edge   #13093      +/-   ##
==========================================
- Coverage   73.14%   72.51%   -0.64%     
==========================================
  Files        2337     2390      +53     
  Lines       64487    65916    +1429     
  Branches     7111     7318     +207     
==========================================
+ Hits        47172    47797     +625     
- Misses      15590    16373     +783     
- Partials     1725     1746      +21     
Flag Coverage Δ
app 71.23% <93.33%> (-2.66%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
app/src/atoms/Chip/index.tsx 100.00% <ø> (ø)
app/src/organisms/EstopModal/EstopPressedModal.tsx 89.47% <89.47%> (ø)
app/src/organisms/EstopModal/EstopMissingModal.tsx 100.00% <100.00%> (ø)

... and 55 files with indirect coverage changes

@koji koji requested review from shlokamin and a team July 12, 2023 22:12
@koji koji marked this pull request as ready for review July 12, 2023 22:12
@koji koji requested a review from a team as a code owner July 12, 2023 22:12
@koji koji removed the request for review from a team July 12, 2023 22:12
@koji koji marked this pull request as draft July 13, 2023 17:12
@koji
Copy link
Contributor Author

koji commented Jul 13, 2023

  • combine DesktopEstopPressedModal + EstopPressedModal (ODD) -> EstopPressedModal
  • combine DesktopEstopMissingModal + EstopMissingModal (ODD) -> EstopMissingModal
  • update test

@koji koji marked this pull request as ready for review July 13, 2023 18:55
@koji koji requested a review from jerader July 13, 2023 18:55
Copy link
Collaborator

@jerader jerader left a comment

Choose a reason for hiding this comment

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

just left some tiny cleanup comments but this lgtm!

app/src/atoms/Chip/__tests__/Chip.test.tsx Outdated Show resolved Hide resolved
app/src/atoms/Chip/__tests__/Chip.test.tsx Outdated Show resolved Hide resolved
})

it('should render text and button - inactive run', () => {
props.isActiveRun = false
Copy link
Collaborator

Choose a reason for hiding this comment

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

wow, i didn't realize you can reinitialize props this way, that's cool!

koji added 3 commits July 17, 2023 18:04
no stroke for e-stop modals
for e-stop missing modal of the touchscreen app, the size was changed into medium from large
@koji koji requested a review from shlokamin July 17, 2023 22:18
@koji koji merged commit 623561c into edge Jul 18, 2023
@koji koji deleted the feat_add-estop-modals-for-touchscreen branch April 17, 2024 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants