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.

Sign up for GitHub

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

Jump to bottom

Bug 1909790: fix pipeline yaml edit flow #7618

Merged
merged 1 commit into from Jan 12, 2021
Merged

Bug 1909790: fix pipeline yaml edit flow #7618

merged 1 commit into from Jan 12, 2021

Conversation

debsmita1
Copy link
Contributor

@debsmita1 debsmita1 commented Dec 21, 2020 •
edited

Fixes:
https://issues.redhat.com/browse/ODC-5270

Analysis / Root cause:
The new pipeline obj has no resourceVersion property

Solution Description:
Merged the new pipeline and existing pipeline objects

GIF:
pipeline-yaml-edit

Unit test coverage report:

Browser conformance:

  • Chrome
  • Firefox
  • Safari
  • Edge

@debsmita1
Copy link
Contributor Author

/kind bug

@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Dec 21, 2020
@debsmita1 debsmita1 changed the title fix pipeline yaml edit flow Bug 1909790: fix pipeline yaml edit flow Dec 21, 2020
@openshift-ci-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Dec 21, 2020
@openshift-ci-robot
Copy link
Contributor

@debsmita1: This pull request references Bugzilla bug 1909790, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1909790: fix pipeline yaml edit flow

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@debsmita1
Copy link
Contributor Author

/cc @rottencandy @karthikjeeyar

rottencandy
rottencandy reviewed Dec 22, 2020
View reviewed changes
.../packages/pipelines-plugin/src/components/pipelines/pipeline-builder/PipelineBuilderPage.tsx Outdated
Comment on lines 52 to 53
if (!pipeline.metadata?.namespace) {
pipeline.metadata.namespace = ns;
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should keep the namespace check, or it would cause ODC-5251 to appear again.

@rottencandy
Copy link
Contributor

Not able to delete an individual task or a param from the pipeline:
tmp_pl

rottencandy
rottencandy approved these changes Dec 22, 2020
View reviewed changes
Copy link
Contributor

@rottencandy rottencandy left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 22, 2020
@openshift-ci-robot
Copy link
Contributor

@debsmita1: This pull request references Bugzilla bug 1909790, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1909790: fix pipeline yaml edit flow

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

1 similar comment
@openshift-ci-robot
Copy link
Contributor

@debsmita1: This pull request references Bugzilla bug 1909790, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1909790: fix pipeline yaml edit flow

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@debsmita1
Copy link
Contributor Author

/assign @andrewballantyne

@rohitkrai03
Copy link
Contributor

/assign

rohitkrai03
rohitkrai03 suggested changes Jan 12, 2021
View reviewed changes
.../packages/pipelines-plugin/src/components/pipelines/pipeline-builder/PipelineBuilderPage.tsx Outdated
@@ -49,6 +50,13 @@ const PipelineBuilderPage: React.FC<PipelineBuilderPageProps> = (props) => {
if (values.editorType === EditorType.YAML) {
try {
pipeline = safeLoad(values.yamlData);
pipeline =
Copy link
Contributor

Choose a reason for hiding this comment

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

Just curious, why can't we do something similar to how edit-yaml component handles updates?

@karthikjeeyar
Copy link
Contributor

karthikjeeyar commented Jan 12, 2021 •
edited

@debsmita1
While editing the pipeline in the yaml view extra properties like resourceVersion, managedFields etc are not shown in the pipeline yaml view. IMO we should show all the fields in the yaml view without hiding any fields.

The problem here is in PipelineBuilderForm.tsx, sanitizeToYaml function converts the form to yaml using convertBuilderFormToPipeline (missing the third argument existingPipeline). This should fix the issue and also show all the missing fields in the yaml editor. Please revert the current fix and add the third argument to make it work.

@karthikjeeyar
Copy link
Contributor

/lgtm cancel

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 12, 2021
@karthikjeeyar
Copy link
Contributor

Thanks @debsmita1
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 12, 2021
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andrewballantyne, debsmita1, karthikjeeyar, rottencandy

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 12, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 12, 2021

@debsmita1: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-gcp-console e4ea066 link /test e2e-gcp-console

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 0022090 into openshift:master Jan 12, 2021
@openshift-ci-robot
Copy link
Contributor

@debsmita1: All pull requests linked via external trackers have merged:

Bugzilla bug 1909790 has been moved to the MODIFIED state.

In response to this:

Bug 1909790: fix pipeline yaml edit flow

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@spadgett spadgett added this to the v4.7 milestone Jan 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rohitkrai03 rohitkrai03 rohitkrai03 requested changes

@andrewballantyne andrewballantyne andrewballantyne approved these changes

@rottencandy rottencandy rottencandy approved these changes

@abhinandan13jan abhinandan13jan Awaiting requested review from abhinandan13jan

@divyanshiGupta divyanshiGupta Awaiting requested review from divyanshiGupta

@karthikjeeyar karthikjeeyar Awaiting requested review from karthikjeeyar

Assignees

@rohitkrai03 rohitkrai03

@andrewballantyne andrewballantyne

@karthikjeeyar karthikjeeyar

@rottencandy rottencandy

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
v4.7
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@debsmita1 @openshift-ci-robot @rottencandy @rohitkrai03 @karthikjeeyar @openshift-bot @andrewballantyne @spadgett @openshift-merge-robot