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

fix: Fixed spacing in alert modal #22066

Merged
merged 11 commits into from
Dec 20, 2022

Conversation

lyndsiWilliams
Copy link
Member

SUMMARY

This PR fixes the spacing under the "Message content" section of the alert modal.

Note: When I adjusted the spacing I noticed a few spots in the component that needed translating/cleanup so I added that to this PR as well.

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

BEFORE:

alertReportBefore

AFTER:

alertReportAfter

AFTER (extended)

alertReportAfterExtendedEdition

TESTING INSTRUCTIONS

  • Go to the Alerts & reports page and click the "+ ALERT" button
  • Observe the spacing between elements

ADDITIONAL INFORMATION

  • Has associated issue:
  • Required feature flags:
  • Changes UI
  • Includes DB Migration (follow approval process in SIP-59)
    • Migration is atomic, supports rollback & is backwards-compatible
    • Confirm DB migration upgrade and downgrade tested
    • Runtime estimates and downtime expectations provided
  • Introduces new feature or API
  • Removes existing feature or API

@codecov
Copy link

codecov bot commented Nov 8, 2022

Codecov Report

Merging #22066 (5001014) into master (49f1cfc) will increase coverage by 0.01%.
The diff coverage is 76.49%.

❗ Current head 5001014 differs from pull request most recent head f7f6303. Consider uploading reports for the commit f7f6303 to get more accurate results

@@            Coverage Diff             @@
##           master   #22066      +/-   ##
==========================================
+ Coverage   66.87%   66.89%   +0.01%     
==========================================
  Files        1847     1850       +3     
  Lines       70558    70703     +145     
  Branches     7735     7750      +15     
==========================================
+ Hits        47183    47294     +111     
- Misses      21374    21393      +19     
- Partials     2001     2016      +15     
Flag Coverage Δ
javascript 53.86% <59.75%> (+0.02%) ⬆️
mysql ?

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

Impacted Files Coverage Δ
...ugins/legacy-plugin-chart-pivot-table/src/index.js 66.66% <ø> (ø)
...d/plugins/legacy-plugin-chart-treemap/src/index.js 66.66% <ø> (ø)
...plugins/legacy-preset-chart-nvd3/src/Area/index.js 66.66% <ø> (ø)
.../plugins/legacy-preset-chart-nvd3/src/Bar/index.js 66.66% <ø> (ø)
...plugins/legacy-preset-chart-nvd3/src/Line/index.js 66.66% <ø> (ø)
.../plugin-chart-echarts/src/Timeseries/Area/index.ts 33.33% <ø> (ø)
...-chart-echarts/src/Timeseries/Regular/Bar/index.ts 33.33% <0.00%> (ø)
...chart-echarts/src/Timeseries/Regular/Line/index.ts 33.33% <ø> (ø)
.../plugins/plugin-chart-echarts/src/Treemap/index.ts 50.00% <ø> (ø)
...ars/src/components/ControlHeader/controlHeader.tsx 50.00% <ø> (ø)
... and 57 more

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

@lyndsiWilliams
Copy link
Member Author

/testenv up

@github-actions
Copy link
Contributor

github-actions bot commented Nov 8, 2022

@lyndsiWilliams Ephemeral environment spinning up at http://34.216.6.154:8080. Credentials are admin/admin. Please allow several minutes for bootstrapping and startup.

@eschutho
Copy link
Member

eschutho commented Nov 8, 2022

@lyndsiWilliams This looks great!! Can we also left align it to either match up with the dashboard/chart select box or the email select box? Maybe @yousoph or a designer my have more opinions there.

@rusackas
Copy link
Member

rusackas commented Dec 5, 2022

@lyndsiWilliams @yousoph will there be any more actions happening on this PR, or should we merge it as-is?

@pull-request-size pull-request-size bot added size/S and removed size/M labels Dec 6, 2022
@lyndsiWilliams
Copy link
Member Author

lyndsiWilliams commented Dec 6, 2022

@lyndsiWilliams @yousoph will there be any more actions happening on this PR, or should we merge it as-is?

More actions for sure! @yousoph , @eschutho , Karan, and I all got together on zoom to check this out together and discuss the styling. We decided to, for now, just get everything aligned with the 16px border to clean it up a little more. I just pushed up the changes in this commit.

It now looks like this:
alertModalPolish

@lyndsiWilliams
Copy link
Member Author

/testenv up

@github-actions
Copy link
Contributor

github-actions bot commented Dec 6, 2022

@lyndsiWilliams Ephemeral environment spinning up at http://34.212.220.189:8080. Credentials are admin/admin. Please allow several minutes for bootstrapping and startup.

@@ -1300,7 +1309,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
placeholder={t('Time in seconds')}
onChange={onTimeoutVerifyChange}
/>
<span className="input-label">seconds</span>
<span className="input-label">{t('seconds')}</span>

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

You got it! Done in this commit. (I think I got them all!)

@pull-request-size pull-request-size bot added size/L and removed size/S labels Dec 7, 2022
@lyndsiWilliams
Copy link
Member Author

/testenv up ALERT_REPORTS=true

@github-actions
Copy link
Contributor

github-actions bot commented Dec 7, 2022

@lyndsiWilliams Ephemeral environment spinning up at http://35.88.163.217:8080. Credentials are admin/admin. Please allow several minutes for bootstrapping and startup.

@lyndsiWilliams
Copy link
Member Author

/testenv up FEATURE_ALERT_REPORTS=true

@github-actions
Copy link
Contributor

github-actions bot commented Dec 7, 2022

@lyndsiWilliams Ephemeral environment spinning up at http://18.237.171.173:8080. Credentials are admin/admin. Please allow several minutes for bootstrapping and startup.

@lyndsiWilliams
Copy link
Member Author

Closing and reopening to reset the ephemeral environment, things aren't showing up properly 🤔

@github-actions
Copy link
Contributor

github-actions bot commented Dec 7, 2022

Ephemeral environment shutdown and build artifacts deleted.

@lyndsiWilliams lyndsiWilliams reopened this Dec 7, 2022
@lyndsiWilliams
Copy link
Member Author

/testenv up FEATURE_ALERT_REPORTS=true

@github-actions
Copy link
Contributor

github-actions bot commented Dec 7, 2022

@lyndsiWilliams Ephemeral environment spinning up at http://34.221.178.82:8080. Credentials are admin/admin. Please allow several minutes for bootstrapping and startup.

@lyndsiWilliams
Copy link
Member Author

lyndsiWilliams commented Dec 7, 2022

The ephemeral environment doesn't seem to be working correctly for this PR, so if anyone wants to do visual testing it will have to be done locally. This is how it should look:
alertModalPolish

@rusackas
Copy link
Member

rusackas commented Dec 7, 2022

Ephemeral environment seems to be running OK, but I spotted a couple of styling issues there. I can't seem to upload an image here for some reason at the moment, so I'll Slack ya.

@lyndsiWilliams
Copy link
Member Author

/testenv up FEATURE_ALERT_REPORTS=true

@github-actions
Copy link
Contributor

github-actions bot commented Dec 8, 2022

@lyndsiWilliams Ephemeral environment spinning up at http://54.244.206.8:8080. Credentials are admin/admin. Please allow several minutes for bootstrapping and startup.

@lyndsiWilliams lyndsiWilliams force-pushed the lyndsi/fix-spacing-in-alert-modal branch from 1c4743d to 74e5fb5 Compare December 8, 2022 00:45
@rusackas
Copy link
Member

Do we still have build/ephemeral concerns here, or is this ready for the final once-over?

Copy link
Member

@AAfghahi AAfghahi 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!

@lyndsiWilliams
Copy link
Member Author

Do we still have build/ephemeral concerns here, or is this ready for the final once-over?

I'm not sure what's going on with the ephemeral, I'd be happy to zoom and show this locally if that would increase confidence in this. I feel (and hope) that this is just a case of the ephemeral not working correctly.

@@ -1044,14 +1051,50 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
setIsHidden(false);
}

const SAVE_TEXT = t('Save');
Copy link
Member

Choose a reason for hiding this comment

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

@lyndsiWilliams are we going to move these into a TRANSLATIONS object?

Copy link
Member Author

Choose a reason for hiding this comment

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

Definitely! Done in this commit.

Copy link
Member

@eschutho eschutho 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!

@lyndsiWilliams lyndsiWilliams merged commit 1bab5b9 into master Dec 20, 2022
@lyndsiWilliams lyndsiWilliams deleted the lyndsi/fix-spacing-in-alert-modal branch December 20, 2022 17:28
@github-actions
Copy link
Contributor

Ephemeral environment shutdown and build artifacts deleted.

@mistercrunch mistercrunch added 🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels 🚢 2.1.0 and removed 🚢 2.1.3 labels Mar 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels size/L 🚢 2.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants