feat(ui): allow importing external workflows and copying flow nodes in next generation `New Workflow` #3368

g1eny0ung · 2022-06-15T09:21:14Z

What problem does this PR solve?

Close #3364.
Close #3365.

What's changed and how it works?

This PR modifies the way nodes are connected in the flowchart. Since Workflow is "flexible" (for example, if there are currently two parallel nodes, one with 3 children and the other with 4, they cannot be connected one-to-one), I created separate Serial and Parallel nodes to contain the children. Then I finished this PR based on that.

Demos

a-serial-node.mp4

import-a-external-workflow.mp4

copy-a-node.mp4

Related changes

Need to update chaos-mesh/website
Need to update Dashboard UI
Need to cheery-pick to release branches
- release-2.2
- release-2.1

Checklist

CHANGELOG

I have updated the CHANGELOG.md
I have labeled this PR with "no-need-update-changelog"

Tests

Unit test
E2E test
No code
Manual test (add steps below)

Side effects

Breaking backward compatibility

DCO

If you find the DCO check fails, please run commands like below (Depends on the actual situations. For example, if the failed commit isn't the most recent) to fix it:

git commit --amend --signoff
git push --force

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

ti-chi-bot · 2022-06-15T09:21:16Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

STRRL
cwen0

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

https://lodash.com/docs/4.17.15#merge Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

codecov · 2022-06-20T07:01:36Z

Codecov Report

Merging #3368 (6802ad8) into master (9522623) will increase coverage by 0.22%.
The diff coverage is n/a.

❗ Current head 6802ad8 differs from pull request most recent head 48654cd. Consider uploading reports for the commit 48654cd to get more accurate results

@@            Coverage Diff             @@
##           master    #3368      +/-   ##
==========================================
+ Coverage   40.90%   41.13%   +0.22%     
==========================================
  Files         166      165       -1     
  Lines       13985    13853     -132     
==========================================
- Hits         5721     5698      -23     
+ Misses       7835     7723     -112     
- Partials      429      432       +3

Impacted Files	Coverage Δ
.../workflow/controllers/workflow_entry_reconciler.go	`47.02% <0.00%> (-9.19%)`	⬇️
pkg/finalizer/utils.go	`94.44% <0.00%> (-5.56%)`	⬇️
controllers/statuscheck/controller.go	`79.26% <0.00%> (-4.88%)`	⬇️
api/v1alpha1/workflow_webhook.go	`42.34% <0.00%> (-1.82%)`	⬇️
...md/chaos-controller-manager/provider/controller.go	`39.31% <0.00%> (-1.40%)`	⬇️
pkg/bpm/build_linux.go	`32.65% <0.00%> (ø)`
pkg/webhook/validate_auth.go	`0.00% <0.00%> (ø)`
api/v1alpha1/blockchaos_types.go	`0.00% <0.00%> (ø)`
controllers/utils/controller/key.go	`0.00% <0.00%> (ø)`
pkg/chaosdaemon/stress_server_linux.go	`0.00% <0.00%> (ø)`
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a625391...48654cd. Read the comment docs.

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

g1eny0ung · 2022-07-04T06:18:51Z

In fe24730, I added an arrow at the end of the edge to identify the next node, and the workflow flow is now a bit clearer.

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

STRRL

I failed to build the frontend project:

I think we should remove this line:

chaos-mesh/ui/app/src/components/AutoForm/index.tsx

Line 279 in fe24730

podsPreviewDesc={<T id="newE.target.network.target.podsPreviewHelper" />}

STRRL · 2022-07-05T06:25:02Z

rest LGTM!

Awesome!

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

g1eny0ung · 2022-07-05T07:26:15Z

I failed to build the frontend project:

I think we should remove this line:

chaos-mesh/ui/app/src/components/AutoForm/index.tsx

Line 279 in fe24730

podsPreviewDesc={<T id="newE.target.network.target.podsPreviewHelper" />}

Thanks! I forgot to remove this line. Now it's fixed.

cwen0 · 2022-07-05T10:57:06Z

I can't delete this parallel node.

cwen0 · 2022-07-05T11:07:40Z

In parallel node, I created three experiments and specified the sequential relationship, but the YAML file still has three parallel tasks. If we don't support such an operation, we should disable the addition of sequential relationships.

cwen0 · 2022-07-05T11:08:41Z

g1eny0ung · 2022-07-06T03:41:33Z

I can't delete this parallel node.

😵 I forgot to add the operations menu to Serial and Parallel nodes. I will fix them soon.

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

STRRL

LGTM!

I have tried to use it on my own machine with the example workflow yaml files.

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

…ttps://github.com/g1eny0ung/chaos-mesh into feat/import-workflow

g1eny0ung · 2022-07-11T07:33:43Z

In parallel node, I created three experiments and specified the sequential relationship, but the YAML file still has three parallel tasks. If we don't support such an operation, we should disable the addition of sequential relationships.

This place needs to be improved. Currently, I haven't limited users to connect nodes when they aren't permitted to connect. I will open an issue to track it later.

g1eny0ung · 2022-07-11T07:36:10Z

Fixed in bdc8b8d.

cwen0

LGTM

g1eny0ung · 2022-07-11T07:40:48Z

/merge

ti-chi-bot · 2022-07-11T07:40:50Z

This pull request has been accepted and is ready to merge.

Commit hash: 48654cd

…n next generation `New Workflow` (chaos-mesh#3368) * feat(ui): import external workflows Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> * refactor: rewrite flowToWorkflow Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> * fix: isolate flow nodes and real templates Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> * feat: allow copying flow nodes Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> * chore: update CHANGELOG Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> * fix: mutate state https://lodash.com/docs/4.17.15#merge Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> * chore: add marker-end arrow Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> * chore: remove network.target.podsPreviewHelper Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> * fix: build Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> * fix: support copy/delete group nodes Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> * fix: replace default entry when entry exists Signed-off-by: Yue Yang <g1enyy0ung@gmail.com> Signed-off-by: STRRL <im@strrl.dev>

g1eny0ung added 4 commits June 10, 2022 16:09

feat(ui): import external workflows

bf432ef

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

refactor: rewrite flowToWorkflow

32c40b7

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

fix: isolate flow nodes and real templates

0a0216b

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

feat: allow copying flow nodes

884f7ef

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

g1eny0ung added component/ui component/workflow feature/new labels Jun 15, 2022

ti-chi-bot requested review from STRRL and WangXiangUSTC June 15, 2022 09:21

ti-chi-bot added the size/XXL label Jun 15, 2022

g1eny0ung added 3 commits June 15, 2022 17:24

chore: update CHANGELOG

c3dffd3

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

Merge branch 'master' into feat/import-workflow

efd26cf

fix: mutate state

fd5c5c8

https://lodash.com/docs/4.17.15#merge Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

g1eny0ung requested review from cwen0 and a team June 16, 2022 06:28

g1eny0ung force-pushed the feat/import-workflow branch from 6802ad8 to fd5c5c8 Compare June 20, 2022 06:49

Hexilee mentioned this pull request Jun 23, 2022

Tracking Issue: prepare for release 2.3.0, feature status #3361

Closed

16 tasks

ti-chi-bot added the needs-rebase label Jun 30, 2022

Merge branch 'master' into feat/import-workflow

28b044c

ti-chi-bot removed the needs-rebase label Jul 1, 2022

chore: add marker-end arrow

fe24730

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

chore: remove network.target.podsPreviewHelper

97bc7fb

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

STRRL reviewed Jul 5, 2022

View reviewed changes

fix: build

687fbf0

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

g1eny0ung requested a review from STRRL July 5, 2022 07:26

fix: support copy/delete group nodes

4c369c4

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

STRRL approved these changes Jul 7, 2022

View reviewed changes

ti-chi-bot added status/LGT1 needs-rebase labels Jul 7, 2022

Merge branch 'master' into feat/import-workflow

ebe3bd0

ti-chi-bot removed the needs-rebase label Jul 11, 2022

g1eny0ung added 2 commits July 11, 2022 15:30

fix: replace default entry when entry exists

bdc8b8d

Signed-off-by: Yue Yang <g1enyy0ung@gmail.com>

Merge branches 'feat/import-workflow' and 'feat/import-workflow' of h…

48654cd

…ttps://github.com/g1eny0ung/chaos-mesh into feat/import-workflow

cwen0 approved these changes Jul 11, 2022

View reviewed changes

ti-chi-bot added status/LGT2 and removed status/LGT1 labels Jul 11, 2022

ti-chi-bot added the status/can-merge label Jul 11, 2022

g1eny0ung merged commit e0e0d54 into chaos-mesh:master Jul 11, 2022

g1eny0ung deleted the feat/import-workflow branch July 11, 2022 11:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(ui): allow importing external workflows and copying flow nodes in next generation `New Workflow` #3368

feat(ui): allow importing external workflows and copying flow nodes in next generation `New Workflow` #3368

g1eny0ung commented Jun 15, 2022 •

edited

Loading

ti-chi-bot commented Jun 15, 2022 •

edited

Loading

codecov bot commented Jun 20, 2022 •

edited

Loading

g1eny0ung commented Jul 4, 2022

STRRL left a comment

STRRL commented Jul 5, 2022

g1eny0ung commented Jul 5, 2022

cwen0 commented Jul 5, 2022

cwen0 commented Jul 5, 2022

cwen0 commented Jul 5, 2022

g1eny0ung commented Jul 6, 2022

STRRL left a comment

g1eny0ung commented Jul 11, 2022

g1eny0ung commented Jul 11, 2022

cwen0 left a comment

g1eny0ung commented Jul 11, 2022

ti-chi-bot commented Jul 11, 2022

feat(ui): allow importing external workflows and copying flow nodes in next generation New Workflow #3368

feat(ui): allow importing external workflows and copying flow nodes in next generation New Workflow #3368

Conversation

g1eny0ung commented Jun 15, 2022 • edited Loading

What problem does this PR solve?

What's changed and how it works?

Demos

Related changes

Checklist

DCO

ti-chi-bot commented Jun 15, 2022 • edited Loading

codecov bot commented Jun 20, 2022 • edited Loading

Codecov Report

g1eny0ung commented Jul 4, 2022

STRRL left a comment

Choose a reason for hiding this comment

STRRL commented Jul 5, 2022

g1eny0ung commented Jul 5, 2022

cwen0 commented Jul 5, 2022

cwen0 commented Jul 5, 2022

cwen0 commented Jul 5, 2022

g1eny0ung commented Jul 6, 2022

STRRL left a comment

Choose a reason for hiding this comment

g1eny0ung commented Jul 11, 2022

g1eny0ung commented Jul 11, 2022

cwen0 left a comment

Choose a reason for hiding this comment

g1eny0ung commented Jul 11, 2022

ti-chi-bot commented Jul 11, 2022

feat(ui): allow importing external workflows and copying flow nodes in next generation `New Workflow` #3368

feat(ui): allow importing external workflows and copying flow nodes in next generation `New Workflow` #3368

g1eny0ung commented Jun 15, 2022 •

edited

Loading

ti-chi-bot commented Jun 15, 2022 •

edited

Loading

codecov bot commented Jun 20, 2022 •

edited

Loading