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.

Sign up for GitHub

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

Jump to bottom

UI – Componentize "Discard data" option and add it to Edit Query page #14343

Merged
merged 9 commits into from
Oct 9, 2023
Merged

UI – Componentize "Discard data" option and add it to Edit Query page #14343

merged 9 commits into from
Oct 9, 2023

Conversation

jacobshandling
Copy link
Contributor

@jacobshandling jacobshandling commented Oct 5, 2023 •
edited
Loading

Addresses #13470

  • Save query
    • Add checkbox
      • default unchecked
      • If global setting is disabled (that is, "Disable query reports" is enabled)
        • this box is disabled
        • copy below is changed
        • If enabled locally but globally disabled, box is checked and disabled
        • If user clicks "Edit anyway", the normal checkbox state is restored, allowing them to edit it anyway., e.g. to prepare for enabling globally before doing so
      • banner under certain conditions
    • 2 x update help text
  • Edit query
    • checkbox
    • back button
    • 2 x help text updates
    • save changes modals when conditions are met:
      • changed SQL
      • other
  • Mange queries - update tooltip
  • Significant cleanup and improvement of styles and structure around the Edit Queries page
Screenshot 2023-10-05 at 3 44 05 PM Screenshot 2023-10-05 at 3 44 15 PM Screenshot 2023-10-05 at 3 45 09 PM Screenshot 2023-10-05 at 3 45 29 PM Screenshot 2023-10-05 at 3 46 58 PM Screenshot 2023-10-05 at 3 47 10 PM Screenshot 2023-10-05 at 3 47 24 PM

Checklist for submitter

  • Added/updated tests
  • Manual QA for all new/changed functionality

Jacob Shandling added 7 commits October 4, 2023 16:43
'QueryForm' –> 'EditQueryForm'
7e568d0
Make file and style structure more modular
37cb9a5 
- Move EditQueryPage and associated files up one level, since that matches the actual rendering.
    EditQueryPage renders both EditQueryForm and SaveQueryModal
- Move some styles that apply to both EditQueryFOrm and SaveQueryForm up a level to reuse single style definitions
Componentize dicard option
314046a
Add DiscardDataOption to EditQueryForm
6cf6cc1
Further modularize & simplify edit query / save query styles
a3e9a51
Update empty frequency tooltip
1058858
Wire up conditional warning modal when saving query
a2a7416
@jacobshandling jacobshandling requested a review from a team as a code owner October 5, 2023 22:50
@jacobshandling jacobshandling temporarily deployed to Docker Hub October 5, 2023 22:50 — with GitHub Actions Inactive
@jacobshandling jacobshandling changed the title UI – Add discard option to Edit Query page UI – Componentize "Discard data" option and add it to Edit Query page Oct 5, 2023
@codecov
Copy link

codecov bot commented Oct 5, 2023 •
edited
Loading

Codecov Report

All modified lines are covered by tests ✅

❗ No coverage uploaded for pull request base (7766-frontend@11fc7ed). Click here to learn what that means.

Additional details and impacted files 
@@               Coverage Diff                @@
##             7766-frontend   #14343   +/-   ##
================================================
  Coverage                 ?   58.79%           
================================================
  Files                    ?      909           
  Lines                    ?    74568           
  Branches                 ?     2142           
================================================
  Hits                     ?    43840           
  Misses                   ?    27230           
  Partials                 ?     3498
Flag Coverage Δ
frontend 53.12% <0.00%> (?)

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

ghernandez345
ghernandez345 previously requested changes Oct 6, 2023
View reviewed changes
frontend/pages/queries/edit/_styles.scss Outdated Show resolved Hide resolved
frontend/pages/queries/edit/components/ConfirmSaveChangesModal/ConfirmSaveChangesModal.tsx Outdated Show resolved Hide resolved
frontend/pages/queries/edit/components/DiscardDataOption/DiscardDataOption.tests.tsx Outdated Show resolved Hide resolved
frontend/pages/queries/edit/components/DiscardDataOption/DiscardDataOption.tsx Outdated Show resolved Hide resolved
frontend/pages/queries/edit/components/DiscardDataOption/DiscardDataOption.tsx Outdated Show resolved Hide resolved
frontend/pages/queries/edit/components/DiscardDataOption/DiscardDataOption.tsx Show resolved Hide resolved
frontend/pages/queries/edit/components/DiscardDataOption/DiscardDataOption.tsx Show resolved Hide resolved
frontend/pages/queries/edit/components/DiscardDataOption/DiscardDataOption.tsx Outdated Show resolved Hide resolved
@jacobshandling jacobshandling temporarily deployed to Docker Hub October 6, 2023 18:26 — with GitHub Actions Inactive
@jacobshandling jacobshandling temporarily deployed to Docker Hub October 6, 2023 18:30 — with GitHub Actions Inactive
@jacobshandling jacobshandling temporarily deployed to Docker Hub October 6, 2023 18:30 — with GitHub Actions Inactive
@jacobshandling jacobshandling temporarily deployed to Docker Hub October 6, 2023 20:57 — with GitHub Actions Inactive
@jacobshandling jacobshandling temporarily deployed to Docker Hub October 6, 2023 20:57 — with GitHub Actions Inactive
RachelElysia
RachelElysia approved these changes Oct 9, 2023
View reviewed changes
Copy link
Member

@RachelElysia RachelElysia left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for all the code and file renaming

@jacobshandling jacobshandling dismissed ghernandez345’s stale review October 9, 2023 18:31

dismiss okayed by Gabe

@jacobshandling jacobshandling merged commit 2adf3ce into 7766-frontend Oct 9, 2023
@jacobshandling jacobshandling deleted the 13470-pt2-edit-query branch October 9, 2023 18:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RachelElysia RachelElysia RachelElysia approved these changes

@ghernandez345 ghernandez345 Awaiting requested review from ghernandez345

@gillespi314 gillespi314 Awaiting requested review from gillespi314

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jacobshandling @ghernandez345 @RachelElysia @gillespi314