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

Feature/zk UI 415 move overlay out of redux #688

Merged
merged 27 commits into from
Dec 6, 2023

Conversation

JBWatenbergScality
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Nov 24, 2023

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
Copy link
Contributor

bert-e commented Nov 24, 2023

Incorrect fix version

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

  • None

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

  • 2.2.0

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

@codecov-commenter
Copy link

codecov-commenter commented Nov 24, 2023

Codecov Report

Attention: 106 lines in your changes are missing coverage. Please review.

Comparison is base (231477c) 59.30% compared to head (61e0004) 59.37%.
Report is 12 commits behind head on development/2.2.

Files Patch % Lines
src/react/locations/LocationEditor.tsx 52.17% 31 Missing and 2 partials ⚠️
src/react/locations/LocationsList.tsx 0.00% 22 Missing ⚠️
src/react/endpoint/EndpointCreate.tsx 58.33% 15 Missing ⚠️
src/react/endpoint/DeleteEndpoint.tsx 53.57% 13 Missing ⚠️
...c/react/account/details/properties/AccountInfo.tsx 86.11% 5 Missing ⚠️
src/react/databrowser/buckets/details/Overview.tsx 89.79% 5 Missing ⚠️
src/js/mutations.ts 90.69% 4 Missing ⚠️
src/react/account/AccountCreate.tsx 78.94% 4 Missing ⚠️
src/react/actions/auth.ts 0.00% 1 Missing ⚠️
src/react/endpoint/EndpointList.tsx 80.00% 1 Missing ⚠️
... and 3 more
Additional details and impacted files
@@                 Coverage Diff                 @@
##           development/2.2     #688      +/-   ##
===================================================
+ Coverage            59.30%   59.37%   +0.06%     
===================================================
  Files                  216      215       -1     
  Lines                10403    10461      +58     
  Branches              2997     3055      +58     
===================================================
+ Hits                  6170     6211      +41     
- Misses                4216     4231      +15     
- Partials                17       19       +2     

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

@JBWatenbergScality JBWatenbergScality marked this pull request as ready for review November 29, 2023 14:53
@bert-e
Copy link
Contributor

bert-e commented Dec 1, 2023

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:

@bert-e
Copy link
Contributor

bert-e commented Dec 1, 2023

Conflict

There is a conflict between your branch feature/ZKUI-415-move-overlay-out-of-redux and the
destination branch development/2.2.

Please resolve the conflict on the feature branch (feature/ZKUI-415-move-overlay-out-of-redux).

git fetch && \
git checkout origin/feature/ZKUI-415-move-overlay-out-of-redux && \
git merge origin/development/2.2

Resolve merge conflicts and commit

git push origin HEAD:feature/ZKUI-415-move-overlay-out-of-redux

@ChengYanJin ChengYanJin force-pushed the feature/ZKUI-415-move-overlay-out-of-redux branch from 6f39205 to 973a29f Compare December 1, 2023 14:12
@bert-e
Copy link
Contributor

bert-e commented Dec 4, 2023

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:

Copy link
Contributor

@ChengYanJin ChengYanJin left a comment

Choose a reason for hiding this comment

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

LGTM !!!!

@bert-e
Copy link
Contributor

bert-e commented Dec 6, 2023

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:

@JBWatenbergScality
Copy link
Contributor Author

/approve

merry-christmas-happy-holidays-gif

@JBWatenbergScality
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 6, 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.2

The following branches will NOT be impacted:

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

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 Dec 6, 2023

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

  • ✔️ development/2.2

The following branches have NOT changed:

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

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

Goodbye jbwatenbergscality.

@bert-e bert-e merged commit b28f83c into development/2.2 Dec 6, 2023
9 checks passed
@bert-e bert-e deleted the feature/ZKUI-415-move-overlay-out-of-redux branch December 6, 2023 16:03
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