Skip to content

refactor: Build new action buttons for cancel confirmation modal [FC-0076] #1732

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

Conversation

ChrisChV
Copy link
Contributor

@ChrisChV ChrisChV commented Mar 12, 2025

Description

  • Build new action buttons for cancel confirmation modal in basic block and advanced block editors.
  • Which edX user roles will this change impact? "Course Author"

Supporting information

Testing instructions

  • Go to the library home of a library
  • Create a new text component.
  • Open the text component editor, make a change, and click cancel. Verify the new Modal.
  • Create a new drag and drop.
  • Open the drag and drop editor, click cancel. Verify the new Modal.

Other information

N/A

@ChrisChV ChrisChV marked this pull request as draft March 12, 2025 18:51
@openedx-webhooks openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label Apr 1, 2025
@openedx-webhooks
Copy link

openedx-webhooks commented Apr 1, 2025

Thanks for the pull request, @ChrisChV!

This repository is currently maintained by @openedx/2u-tnl.

Once you've gone through the following steps feel free to tag them in a comment and let them know that your changes are ready for engineering review.

🔘 Get product approval

If you haven't already, check this list to see if your contribution needs to go through the product review process.

  • If it does, you'll need to submit a product proposal for your contribution, and have it reviewed by the Product Working Group.
    • This process (including the steps you'll need to take) is documented here.
  • If it doesn't, simply proceed with the next step.
🔘 Provide context

To help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:

  • Dependencies

    This PR must be merged before / after / at the same time as ...

  • Blockers

    This PR is waiting for OEP-1234 to be accepted.

  • Timeline information

    This PR must be merged by XX date because ...

  • Partner information

    This is for a course on edx.org.

  • Supporting documentation
  • Relevant Open edX discussion forum threads
🔘 Get a green build

If one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green.


Where can I find more information?

If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources:

When can I expect my changes to be merged?

Our goal is to get community contributions seen and reviewed as efficiently as possible.

However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:

  • The size and impact of the changes that it introduces
  • The need for product review
  • Maintenance status of the parent repository

💡 As a result it may take up to several weeks or months to complete a review and merge your PR.

@github-project-automation github-project-automation bot moved this to Needs Triage in Contributions Apr 1, 2025
@mphilbrick211 mphilbrick211 added the FC Relates to an Axim Funded Contribution project label Apr 1, 2025
@mphilbrick211 mphilbrick211 moved this from Needs Triage to Waiting on Author in Contributions Apr 1, 2025
Copy link

codecov bot commented Apr 1, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.53%. Comparing base (341a03c) to head (3ab35c7).
Report is 1 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1732   +/-   ##
=======================================
  Coverage   93.53%   93.53%           
=======================================
  Files        1132     1132           
  Lines       23043    23047    +4     
  Branches     4864     4867    +3     
=======================================
+ Hits        21553    21557    +4     
  Misses       1422     1422           
  Partials       68       68           

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@ChrisChV ChrisChV marked this pull request as ready for review April 1, 2025 22:26
Copy link
Contributor

@navinkarkera navinkarkera left a comment

Choose a reason for hiding this comment

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

@ChrisChV Looks good. Left some suggestions to simplify css.

  • I tested this: Followed test instructions
  • I read through the code
  • I checked for accessibility issues
  • Includes documentation

Comment on lines 21 to 34
<div className="w-100 d-flex justify-content-between">
<Button
variant="outline-brand"
onClick={() => onCloseEditor?.()}
>
<FormattedMessage {...messages.discardChangesButtonlabel} />
</Button>
<Button
variant="primary"
onClick={closeCancelConfirmModal}
>
<FormattedMessage {...messages.keepEditingButtonLabel} />
</Button>
</div>
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
<div className="w-100 d-flex justify-content-between">
<Button
variant="outline-brand"
onClick={() => onCloseEditor?.()}
>
<FormattedMessage {...messages.discardChangesButtonlabel} />
</Button>
<Button
variant="primary"
onClick={closeCancelConfirmModal}
>
<FormattedMessage {...messages.keepEditingButtonLabel} />
</Button>
</div>
<>
<Button
variant="outline-brand"
onClick={() => onCloseEditor?.()}
>
<FormattedMessage {...messages.discardChangesButtonlabel} />
</Button>
<ActionRow.Spacer />
<Button
variant="primary"
onClick={closeCancelConfirmModal}
>
<FormattedMessage {...messages.keepEditingButtonLabel} />
</Button>
</>

If we apply the previous change, this can be simplified with just a spacer in between.

Make sure to import ActionRow

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks much better 👍

Copy link
Contributor

@bradenmacdonald bradenmacdonald left a comment

Choose a reason for hiding this comment

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

Changes look fine to me. I didn't test it. Can we get the coverage test passing?

@ChrisChV ChrisChV force-pushed the chris/update-cancel-confirmation-button-msg branch from fdb0116 to d8e68cd Compare April 5, 2025 01:45
@ChrisChV ChrisChV force-pushed the chris/update-cancel-confirmation-button-msg branch from d8e68cd to 3ab35c7 Compare April 11, 2025 16:36
@ChrisChV ChrisChV merged commit e00a4c4 into openedx:master Apr 11, 2025
7 checks passed
@github-project-automation github-project-automation bot moved this from Waiting on Author to Done in Contributions Apr 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
FC Relates to an Axim Funded Contribution project open-source-contribution PR author is not from Axim or 2U
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants