Fix several issues for Non Storage Manager Users, allow sorting Data Used Columns, fix cold storage and object restoration issues #611

JBWatenbergScality · 2023-06-15T13:05:20Z

No description provided.

…ger users

bert-e · 2023-06-15T13:05:23Z

Hello jbwatenbergscality,

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 · 2023-06-15T13:05:28Z

Incorrect fix version

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

None

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

1.6.16
2.0.11
2.1.0

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

JBWatenbergScality · 2023-06-15T13:05:31Z

/create_pull_requests

bert-e · 2023-06-15T13:05:37Z

Incorrect fix version

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

None

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

1.6.16
2.0.11
2.1.0

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

The following options are set: create_pull_requests

JBWatenbergScality · 2023-06-15T13:06:47Z

/create_pull_requests

bert-e · 2023-06-15T13:07:00Z

Integration data created

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

this pull request will merge bugfix/ZKUI-368 into
development/1.6
w/2.0/bugfix/ZKUI-368 will be merged into development/2.0 (pull request INTEGRATION [PR#611 > development/2.0] Hide root access keys and account removal button for non storage manager users #612)
w/2.1/bugfix/ZKUI-368 will be merged into development/2.1 (pull request INTEGRATION [PR#611 > development/2.1] Hide root access keys and account removal button for non storage manager users #613)

The following branches will NOT be impacted:

development/1.4
development/1.5

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests

bert-e · 2023-06-15T13:07:02Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: create_pull_requests

bert-e · 2023-06-19T13:18:57Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: create_pull_requests

… of object location

bert-e · 2023-06-20T14:08:32Z

Conflict

A conflict has been raised during the update of
integration branch w/2.0/bugfix/ZKUI-368 with contents from bugfix/ZKUI-368
and development/2.0.

Please resolve the conflict on the integration branch (w/2.0/bugfix/ZKUI-368).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/2.0/bugfix/ZKUI-368
 $ git pull  # or "git reset --hard origin/w/2.0/bugfix/ZKUI-368"
 $ git merge origin/development/2.0
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/bugfix/ZKUI-368
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.0/bugfix/ZKUI-368

The following options are set: create_pull_requests

bert-e · 2023-06-21T12:37:15Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: create_pull_requests

bert-e · 2023-06-21T15:59:04Z

History mismatch

Merge commit #512c02d4a5c3b779b7497746bc95e295e110d148 on the integration branch
w/2.1/bugfix/ZKUI-368 is merging a branch which is neither the current
branch bugfix/ZKUI-368 nor the development branch
development/2.1.

It is likely due to a rebase of the branch bugfix/ZKUI-368 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_pull_requests

bert-e · 2023-06-21T16:01:12Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: create_pull_requests

…erties.test.tsx

codecov-commenter · 2023-06-22T15:27:39Z

Codecov Report

Merging #611 (a221dba) into development/1.6 (10185ec) will decrease coverage by 0.27%.
The diff coverage is 56.00%.

@@                 Coverage Diff                 @@
##           development/1.6     #611      +/-   ##
===================================================
- Coverage            53.66%   53.40%   -0.27%     
===================================================
  Files                  217      218       +1     
  Lines                10379    10440      +61     
  Branches              2892     2922      +30     
===================================================
+ Hits                  5570     5575       +5     
- Misses                4790     4845      +55     
- Partials                19       20       +1

Impacted Files	Coverage Δ
src/react/account/AccountLocations.tsx	`0.00% <0.00%> (ø)`
src/react/databrowser/buckets/BucketList.tsx	`2.08% <0.00%> (+0.08%)`	⬆️
...t/locations/LocationDetails/LocationDetailsAws.tsx	`100.00% <ø> (ø)`
...tions/LocationDetails/LocationDetailsAwsCustom.tsx	`76.92% <ø> (ø)`
src/react/locations/LocationsList.tsx	`1.23% <0.00%> (-0.02%)`	⬇️
...ct/next-architecture/ui/metrics/DataUsedColumn.tsx	`23.52% <23.52%> (ø)`
...react/next-architecture/domain/business/buckets.ts	`57.50% <50.00%> (-4.44%)`	⬇️
...c/react/databrowser/objects/details/Properties.tsx	`70.21% <66.66%> (-17.79%)`	⬇️
src/react/databrowser/objects/ObjectListTable.tsx	`81.13% <77.77%> (-0.51%)`	⬇️
src/react/account/AccountDetails.tsx	`100.00% <100.00%> (ø)`
... and 8 more

... and 4 files with indirect coverage changes

bert-e · 2023-06-22T16:10:23Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: create_pull_requests

ChengYanJin

LGTM!

JBWatenbergScality · 2023-06-22T16:47:46Z

/approve

bert-e · 2023-06-22T16:53:40Z

Build failed

The build for commit did not succeed in branch bugfix/ZKUI-368.

The following options are set: approve, create_pull_requests

bert-e · 2023-06-26T07:53:57Z

Build failed

The build for commit did not succeed in branch bugfix/ZKUI-368.

The following options are set: create_pull_requests, approve

bert-e · 2023-06-27T08:38:19Z

Build failed

The build for commit did not succeed in branch bugfix/ZKUI-368.

The following options are set: create_pull_requests, approve

bert-e · 2023-06-27T12:05:35Z

Build failed

The build for commit did not succeed in branch w/2.0/bugfix/ZKUI-368.

The following options are set: create_pull_requests, approve

bert-e · 2023-06-27T12:29:11Z

Build failed

The build for commit did not succeed in branch w/2.1/bugfix/ZKUI-368.

The following options are set: create_pull_requests, approve

bert-e · 2023-06-27T12:48:20Z

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/1.6
✔️ development/2.0
✔️ development/2.1

The following branches will NOT be impacted:

development/1.4
development/1.5

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: create_pull_requests, approve

bert-e · 2023-06-27T13:13:19Z

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

✔️ development/1.6
✔️ development/2.0
✔️ development/2.1

The following branches have NOT changed:

development/1.4
development/1.5

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

Goodbye jbwatenbergscality.

Hide root access keys and account removal button for non storage mana…

0c652b4

…ger users

This was referenced Jun 15, 2023

INTEGRATION [PR#611 > development/2.0] Hide root access keys and account removal button for non storage manager users #612

Merged

INTEGRATION [PR#611 > development/2.1] Hide root access keys and account removal button for non storage manager users #613

Merged

Fix Account info import

eded8a7

JBWatenbergScality marked this pull request as ready for review June 15, 2023 13:15

JBWatenbergScality added 2 commits June 16, 2023 18:11

Fix data used sort issue

24ec3df

Add helper text for target bucket name on S3 locations

972002c

JBWatenbergScality added 3 commits June 19, 2023 16:23

Bump coreui to fix % issue

ecf6518

Fix sapce issue for restoration in progress

4db9fbb

Source Object lock downloadable flag from head object restore instead…

d034cb9

… of object location

Working on tests

512c02d

JBWatenbergScality added 5 commits June 22, 2023 13:48

Fix test

6835bcd

tests

3d89dc3

Fix last test ga src/react/databrowser/objects/details/__tests__/Prop…

bbde232

…erties.test.tsx

Increase timeout

36a3f08

try to fix flacky test

a221dba

Add missing redux provider for bucket hooks tests

3628dd0

Reuse global wrapper for AccountDetails

c98e82e

JBWatenbergScality changed the title ~~Hide root access keys and account removal button for non storage manager users~~ Fix several issues for Non Storage Manager Users, allow sorting Data Used Columns, fix cold storage and object restoration issues Jun 22, 2023

JBWatenbergScality added 2 commits June 22, 2023 18:30

Remove only

8bb3a93

considers no data as being the smallest data

b9a7e12

ChengYanJin approved these changes Jun 22, 2023

View reviewed changes

Fix flakyness

96f8427

Attempt to fix flakiness

2514e35

bert-e merged commit 4d15af0 into development/1.6 Jun 27, 2023

bert-e deleted the bugfix/ZKUI-368 branch June 27, 2023 13:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix several issues for Non Storage Manager Users, allow sorting Data Used Columns, fix cold storage and object restoration issues #611

Fix several issues for Non Storage Manager Users, allow sorting Data Used Columns, fix cold storage and object restoration issues #611

JBWatenbergScality commented Jun 15, 2023

bert-e commented Jun 15, 2023

bert-e commented Jun 15, 2023

JBWatenbergScality commented Jun 15, 2023

bert-e commented Jun 15, 2023

JBWatenbergScality commented Jun 15, 2023

bert-e commented Jun 15, 2023

bert-e commented Jun 15, 2023

bert-e commented Jun 19, 2023

bert-e commented Jun 20, 2023

bert-e commented Jun 21, 2023

bert-e commented Jun 21, 2023

bert-e commented Jun 21, 2023

codecov-commenter commented Jun 22, 2023

bert-e commented Jun 22, 2023

ChengYanJin left a comment

JBWatenbergScality commented Jun 22, 2023

bert-e commented Jun 22, 2023

bert-e commented Jun 26, 2023

bert-e commented Jun 27, 2023

bert-e commented Jun 27, 2023

bert-e commented Jun 27, 2023

bert-e commented Jun 27, 2023

bert-e commented Jun 27, 2023

Fix several issues for Non Storage Manager Users, allow sorting Data Used Columns, fix cold storage and object restoration issues #611

Fix several issues for Non Storage Manager Users, allow sorting Data Used Columns, fix cold storage and object restoration issues #611

Conversation

JBWatenbergScality commented Jun 15, 2023

bert-e commented Jun 15, 2023

Hello jbwatenbergscality,

bert-e commented Jun 15, 2023

Incorrect fix version

JBWatenbergScality commented Jun 15, 2023

bert-e commented Jun 15, 2023

Incorrect fix version

JBWatenbergScality commented Jun 15, 2023

bert-e commented Jun 15, 2023

Integration data created

bert-e commented Jun 15, 2023

Waiting for approval

bert-e commented Jun 19, 2023

Waiting for approval

bert-e commented Jun 20, 2023

Conflict

bert-e commented Jun 21, 2023

Waiting for approval

bert-e commented Jun 21, 2023

History mismatch

bert-e commented Jun 21, 2023

Waiting for approval

codecov-commenter commented Jun 22, 2023

Codecov Report

bert-e commented Jun 22, 2023

Waiting for approval

ChengYanJin left a comment

Choose a reason for hiding this comment

JBWatenbergScality commented Jun 22, 2023

bert-e commented Jun 22, 2023

Build failed

bert-e commented Jun 26, 2023

Build failed

bert-e commented Jun 27, 2023

Build failed

bert-e commented Jun 27, 2023

Build failed

bert-e commented Jun 27, 2023

Build failed

bert-e commented Jun 27, 2023

In the queue

bert-e commented Jun 27, 2023