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-392: implement veeam table with useChainedMutations #685

Conversation

ChengYanJin
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Nov 21, 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 Nov 21, 2023

Incorrect fix version

The Fix Version/s in issue ZKUI-392 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-392, or the target
branch of this pull request.

@ChengYanJin ChengYanJin changed the title ZKUI-392: implement veeam configuration UI with real api call ZKUI-392: implement veeam table with **useChainedMutations** Nov 22, 2023
@ChengYanJin ChengYanJin changed the title ZKUI-392: implement veeam table with **useChainedMutations** ZKUI-392: implement veeam table with useChainedMutations Nov 22, 2023
@ChengYanJin ChengYanJin force-pushed the feature/ZKUI-392-implement-veeam-configuration-UI-with-real-api-call branch 2 times, most recently from db86f58 to 0d7ec92 Compare November 28, 2023 12:42
@bert-e
Copy link
Contributor

bert-e commented Nov 28, 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 Nov 29, 2023

Conflict

There is a conflict between your branch feature/ZKUI-392-implement-veeam-configuration-UI-with-real-api-call and the
destination branch development/2.2.

Please resolve the conflict on the feature branch (feature/ZKUI-392-implement-veeam-configuration-UI-with-real-api-call).

git fetch && \
git checkout origin/feature/ZKUI-392-implement-veeam-configuration-UI-with-real-api-call && \
git merge origin/development/2.2

Resolve merge conflicts and commit

git push origin HEAD:feature/ZKUI-392-implement-veeam-configuration-UI-with-real-api-call

@ChengYanJin ChengYanJin force-pushed the feature/ZKUI-392-implement-veeam-configuration-UI-with-real-api-call branch 2 times, most recently from aab882b to b438708 Compare November 29, 2023 17:16
@bert-e
Copy link
Contributor

bert-e commented Nov 29, 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:

@ChengYanJin ChengYanJin force-pushed the feature/ZKUI-392-implement-veeam-configuration-UI-with-real-api-call branch from b438708 to 39d0b80 Compare November 30, 2023 10:06
@bert-e
Copy link
Contributor

bert-e commented Nov 30, 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:

@ChengYanJin ChengYanJin marked this pull request as ready for review November 30, 2023 10:09
@ChengYanJin ChengYanJin force-pushed the feature/ZKUI-392-implement-veeam-configuration-UI-with-real-api-call branch 5 times, most recently from abb514b to 7bbb2c4 Compare November 30, 2023 11:43
@codecov-commenter
Copy link

codecov-commenter commented Nov 30, 2023

Codecov Report

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

Comparison is base (19fb7f6) 59.19% compared to head (ffe1a90) 59.81%.

Files Patch % Lines
src/react/DataServiceRoleProvider.tsx 28.57% 10 Missing ⚠️
src/react/ui-elements/Veeam/VeeamTable.tsx 80.00% 2 Missing ⚠️
src/react/utils/testUtil.tsx 80.00% 2 Missing ⚠️
src/react/ui-elements/Veeam/VeeamConfiguration.tsx 85.71% 0 Missing and 1 partial ⚠️
src/react/ui-elements/Veeam/VeeamSummary.tsx 0.00% 1 Missing ⚠️
Additional details and impacted files
@@                 Coverage Diff                 @@
##           development/2.2     #685      +/-   ##
===================================================
+ Coverage            59.19%   59.81%   +0.62%     
===================================================
  Files                  218      219       +1     
  Lines                10459    10542      +83     
  Branches              3010     3027      +17     
===================================================
+ Hits                  6191     6306     +115     
+ Misses                4251     4219      -32     
  Partials                17       17              

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

@ChengYanJin ChengYanJin force-pushed the feature/ZKUI-392-implement-veeam-configuration-UI-with-real-api-call branch 2 times, most recently from f741621 to b923da2 Compare November 30, 2023 17:16
@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:

@ChengYanJin ChengYanJin force-pushed the feature/ZKUI-392-implement-veeam-configuration-UI-with-real-api-call branch from b923da2 to ffe1a90 Compare December 1, 2023 09:52
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 Dec 1, 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 1, 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-392.

Goodbye chengyanjin.

@bert-e bert-e merged commit 28b4069 into development/2.2 Dec 1, 2023
15 checks passed
@bert-e bert-e deleted the feature/ZKUI-392-implement-veeam-configuration-UI-with-real-api-call branch December 1, 2023 13:19
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