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

ZKUI-404: improve the error message while deleting an account with buckets #652

Conversation

ChengYanJin
Copy link
Contributor

@ChengYanJin ChengYanJin commented Oct 23, 2023

image image

@bert-e
Copy link
Contributor

bert-e commented Oct 23, 2023

Hello chengyanjin,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Oct 23, 2023

Incorrect fix version

The Fix Version/s in issue ZKUI-404 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 2.1.5

  • 2.2.0

Please check the Fix Version/s of ZKUI-404, or the target
branch of this pull request.

@bert-e
Copy link
Contributor

bert-e commented Oct 23, 2023

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@codecov-commenter
Copy link

codecov-commenter commented Oct 23, 2023

Codecov Report

Merging #652 (fd11797) into development/2.1 (01dc0ae) will increase coverage by 0.04%.
The diff coverage is 66.66%.

@@                 Coverage Diff                 @@
##           development/2.1     #652      +/-   ##
===================================================
+ Coverage            58.18%   58.22%   +0.04%     
===================================================
  Files                  208      208              
  Lines                10157    10162       +5     
  Branches              2942     2944       +2     
===================================================
+ Hits                  5910     5917       +7     
+ Misses                4231     4229       -2     
  Partials                16       16              
Files Coverage Δ
src/react/actions/account.ts 49.45% <66.66%> (+5.26%) ⬆️

... and 3 files with indirect coverage changes

@ChengYanJin ChengYanJin changed the title ZKUI-404: improve the 409 message while deleting an account ZKUI-404: improve the error message while deleting an account with buckets Oct 23, 2023
@ChengYanJin ChengYanJin force-pushed the improvement/ZKUI-404-improve-the-409-message-while-deleting-an-account branch from 3410977 to fd11797 Compare October 24, 2023 09:18
Comment on lines 183 to 187
expect(
screen.getByText(
/Unable to delete the account due to the presence of associated resources./i,
),
).toBeInTheDocument();
Copy link
Contributor

Choose a reason for hiding this comment

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

Shall we ensure the text to be within the modal ?

Suggested change
expect(
screen.getByText(
/Unable to delete the account due to the presence of associated resources./i,
),
).toBeInTheDocument();
expect(
within(screen.getByRole('dialog', { name: /Confirmation/i })).getByText(
/Unable to delete the account due to the presence of associated resources./i,
),
).toBeInTheDocument();

@ChengYanJin ChengYanJin force-pushed the improvement/ZKUI-404-improve-the-409-message-while-deleting-an-account branch 2 times, most recently from 5bcf470 to f494243 Compare October 24, 2023 12:45
@ChengYanJin ChengYanJin force-pushed the improvement/ZKUI-404-improve-the-409-message-while-deleting-an-account branch from f494243 to 0f69c3f Compare October 24, 2023 14:05
Copy link
Contributor

@JBWatenbergScality JBWatenbergScality left a comment

Choose a reason for hiding this comment

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

LGTM

@ChengYanJin
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Oct 24, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 24, 2023

Queue out of order

The changeset has received all authorizations to enter the merge queue,
however the merge queue is currently in an incoherent state. In order
to protect this pull request, I have not added the changeset to the
queue.

Look into https://devdocs.scality.net/support/faq/#bert-e for guidance about
what to do next to unlock the situation, or ask for help on the #ci-support
Slack channel.

The following options are set: approve

@ChengYanJin
Copy link
Contributor Author

/status

@bert-e
Copy link
Contributor

bert-e commented Oct 24, 2023

Status

Status report is not available.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 24, 2023

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.1

  • ✔️ development/2.2

The following branches will NOT be impacted:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 24, 2023

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.1

  • ✔️ development/2.2

The following branches have NOT changed:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0

Please check the status of the associated issue ZKUI-404.

Goodbye chengyanjin.

@bert-e bert-e merged commit 0f69c3f into development/2.1 Oct 24, 2023
22 of 24 checks passed
@bert-e bert-e deleted the improvement/ZKUI-404-improve-the-409-message-while-deleting-an-account branch October 24, 2023 14:50
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.

4 participants