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

style(app): app_fixed_spacing_for_calibration_modals #10766

Merged
merged 3 commits into from
Jun 15, 2022

Conversation

aptrons22
Copy link
Contributor

@aptrons22 aptrons22 commented Jun 15, 2022

Overview

Corrected branch issue, removed code from DirectionControl.tsx and refactored the spacing calibration modals code to reside in the JogControls component instead.

#10677

Changelog

Refactored the following files to include marginBottom spacing set to marginBottom={SPACING.spacing5}

  • MeasureNozzle.tsx
  • MeasureTip.tsx
  • SaveXYPoint.tsx
  • SaveZPoint.tsx
  • TipPickUp.tsx

Review requests

Low

Risk assessment

Low

…tion modals

corrected branch issue and refactored the spacing calibration modals

#10677
@aptrons22 aptrons22 self-assigned this Jun 15, 2022
@codecov
Copy link

codecov bot commented Jun 15, 2022

Codecov Report

Merging #10766 (f8a4a05) into release_6.0.0 (f88a416) will decrease coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@                Coverage Diff                @@
##           release_6.0.0   #10766      +/-   ##
=================================================
- Coverage          73.84%   73.83%   -0.01%     
=================================================
  Files               2158     2158              
  Lines              58341    58340       -1     
  Branches            5960     5959       -1     
=================================================
- Hits               43079    43078       -1     
  Misses             13989    13989              
  Partials            1273     1273              
Flag Coverage Δ
app 71.59% <ø> (-0.01%) ⬇️

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

Impacted Files Coverage Δ
app/src/molecules/JogControls/DirectionControl.tsx 85.71% <ø> (ø)
app/src/molecules/JogControls/index.tsx 100.00% <ø> (ø)
.../src/organisms/CalibrationPanels/MeasureNozzle.tsx 70.96% <ø> (ø)
app/src/organisms/CalibrationPanels/MeasureTip.tsx 66.66% <ø> (ø)
...pp/src/organisms/CalibrationPanels/SaveXYPoint.tsx 79.59% <ø> (ø)
app/src/organisms/CalibrationPanels/SaveZPoint.tsx 97.36% <ø> (ø)
app/src/organisms/CalibrationPanels/TipPickUp.tsx 87.50% <ø> (ø)
...isms/Devices/ModuleCard/MagneticModuleSlideout.tsx 90.00% <0.00%> (-0.25%) ⬇️

@aptrons22 aptrons22 marked this pull request as ready for review June 15, 2022 02:58
@aptrons22 aptrons22 requested a review from a team as a code owner June 15, 2022 02:58
@aptrons22 aptrons22 requested review from smb2268, b-cooper, sfoster1, jerader and vabruzzo and removed request for a team and smb2268 June 15, 2022 02:58
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.

The changes look good, the only thing is now that you are merging into release_6.0.0, you should see the marginBottom={SPACING.spacing5} reflected in JogControls. After you remove that, this PR should be good to go 🚀

@jerader jerader requested review from koji and removed request for sfoster1 June 15, 2022 12:32
removed unwanted code from JogControls > index.tsx file

#10677
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.

This looks good to me! 🚀 We may want design approval from Mel when she gets back next week before merging though.

Copy link
Contributor

@vabruzzo vabruzzo 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 👍

Copy link
Contributor

@b-cooper b-cooper left a comment

Choose a reason for hiding this comment

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

This fix looks good. When Mel is back in town, we'll also want to get her approval on the visuals.

Copy link
Contributor

@koji koji left a comment

Choose a reason for hiding this comment

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

The changes look good to me.
You are not replacing any old SPACING_s. Is there any specific reason?

@aptrons22 aptrons22 merged commit f113ae4 into release_6.0.0 Jun 15, 2022
b-cooper pushed a commit that referenced this pull request Jun 21, 2022
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.

None yet

5 participants