Bug 1796664: Add links to Marketplace workflows in OperatorHub #3861

rebeccaalpert · 2020-01-03T17:12:15Z

Read annotations and use action text, remote workflow link, and support link from annotations if present. Default to original values if not found.

The annotations don't seem to be present yet, but I added code to handle them for when they show up.

Fixes https://issues.redhat.com/projects/CONSOLE/issues/CONSOLE-1953.

rebeccaalpert · 2020-01-03T17:14:43Z

/hold

...ackages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-item-details.tsx

spadgett · 2020-01-03T17:50:11Z

cc @robszumski @alimobrem

spadgett · 2020-01-03T19:27:48Z

...ackages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-item-details.tsx

@@ -87,6 +91,12 @@ export const OperatorHubItemDetails: React.SFC<OperatorHubItemDetailsProps> = ({
      item.subscription.metadata.name
    }?showDelete=true`;

+  const createLinkWorkflow =


Instead of having separate createLink and createLinkWorkflow variables, it would be better to have a single createLink variables that's set to the right value.

const createLink = _.get(obj, ['metadata', 'annotations', 'marketplace.openshift.io/remote-workflow']) || `/operatorhub/subscribe?pkg=${ obj.metadata.name }&catalog=${catalogSource}&catalogNamespace=${catalogSourceNamespace}&targetNamespace=${namespace}`;

Updated this.

rebeccaalpert · 2020-01-06T15:16:55Z

/retest

rebeccaalpert · 2020-01-06T15:42:19Z

/retest

spadgett · 2020-01-14T18:01:18Z

...ackages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-item-details.tsx

@@ -39,6 +41,8 @@ export const OperatorHubItemDetails: React.SFC<OperatorHubItemDetailsProps> = ({
    catalogSourceNamespace,
  } = item;
  const notAvailable = <span className="properties-side-panel-pf-property-label">N/A</span>;
+  const actionText =
+    _.get(obj, ['metadata', 'annotations', 'marketplace.openshift.io/action-text']) || 'Install';


I'm guessing these annotations would be on the CSV not the PackageManifest, but we need to check with @alimobrem. If so, this would be

Suggested change

_.get(obj, ['metadata', 'annotations', 'marketplace.openshift.io/action-text']) || 'Install';

_.get(obj, ['status', 'channels', '0', 'currentCSVDesc', 'annotations', 'marketplace.openshift.io/action-text']) || 'Install';

and similar for the annotations below

Yes they are on the CSV.

Thanks

spadgett · 2020-01-24T21:01:52Z

@rebeccaalpert PR needs rebase and there's a pending comment about reading the annotation

rebeccaalpert · 2020-01-24T21:19:51Z

@spadgett This is blocked by modal PR. Will rebase and upload latest once that merges.

spadgett · 2020-01-24T22:54:13Z

@spadgett This is blocked by modal PR. Will rebase and upload latest once that merges.

Understood. If you rebase on your modal commit from the other PR and include it here, we should be able to review and tag.

spadgett · 2020-01-24T23:09:25Z

frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.tsx

+    '0',
+    'currentCSVDesc',
+    'annotations',
+    'marketplace.openshift.io/support-workflow',


@alimobrem @robszumski It looks like there's an existing support annotation. Is there a reason we can't simply use that?

We are using that one, right?

spadgett · 2020-01-24T23:10:58Z

frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.tsx

@@ -619,6 +619,14 @@ export const ClusterServiceVersionDetails: React.SFC<ClusterServiceVersionDetail
  props,
 ) => {
  const { spec, metadata, status } = props.obj;
+  const ibmSupportLink = _.get(props.obj, [


This path is wrong if you have the ClusterServiceVersion resource. This path is for the PackageManfiest.

Here it would just be on metadata.annotations.

spadgett · 2020-01-24T23:12:31Z

frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.tsx

@@ -647,6 +655,10 @@ export const ClusterServiceVersionDetails: React.SFC<ClusterServiceVersionDetail
                <dd>
                  {spec.provider && spec.provider.name ? spec.provider.name : 'Not available'}
                </dd>
+                <dt>Support</dt>
+                <dd>
+                  {ibmSupportLink && <ExternalLink href={ibmSupportLink} text="Get Support" />}


We should fall back to the standard support link here if available. (Although I think the marketplace support link could use the standard annotation.)

spadgett · 2020-01-24T23:13:47Z

...ackages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-item-details.tsx

+    'currentCSVDesc',
+    'annotations',
+    'marketplace.openshift.io/support-workflow',
+  ]);


This should be read where the other CSV annotations are

https://github.com/spadgett/console/blob/bd4bf53545273a950023660b8482fc3ab60a6914/frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-page.tsx#L42-L50

spadgett · 2020-01-24T23:14:29Z

frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx

+        'currentCSVDesc',
+        'annotations',
+        'marketplace.openshift.io/action-text',
+      ])) ||


This should be read with the other annotations

https://github.com/spadgett/console/blob/bd4bf53545273a950023660b8482fc3ab60a6914/frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-page.tsx#L42-L50

openshift-ci-robot · 2020-01-29T16:55:45Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rebeccaalpert, spadgett

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:

~~frontend/OWNERS~~ [spadgett]

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

spadgett · 2020-01-29T16:57:14Z

/hold cancel

This was approved and in the queue Friday, and no other changes have been made. (The commit from Friday rebased cleanly with no changes now that the modal PR merged.)

rebeccaalpert · 2020-01-29T18:47:24Z

/retest

openshift-bot · 2020-01-29T19:06:35Z

/retest

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

openshift-bot · 2020-01-29T20:37:08Z

/retest

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

openshift-bot · 2020-01-29T20:50:23Z

/retest

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

openshift-bot · 2020-01-29T21:16:38Z

/retest

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

openshift-bot · 2020-01-29T23:13:37Z

/retest

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

openshift-bot · 2020-01-29T23:26:21Z

/retest

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

openshift-ci-robot · 2020-01-30T21:37:38Z

@rebeccaalpert: This pull request references Bugzilla bug 1796664, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Bug 1796664: Add links to Marketplace workflows in OperatorHub

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.

openshift-bot · 2020-01-30T22:13:28Z

/retest

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

openshift-bot · 2020-01-31T00:23:13Z

/retest

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

openshift-bot · 2020-01-31T04:04:09Z

/retest

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

openshift-bot · 2020-01-31T04:30:04Z

/retest

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

openshift-bot · 2020-01-31T05:35:07Z

/retest

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

openshift-bot · 2020-01-31T07:19:08Z

/retest

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

openshift-bot · 2020-01-31T07:45:09Z

/retest

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

openshift-bot · 2020-01-31T09:16:10Z

/retest

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

openshift-bot · 2020-01-31T09:30:56Z

/retest

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

openshift-bot · 2020-01-31T11:13:23Z

/retest

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

openshift-bot · 2020-01-31T11:39:18Z

/retest

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

openshift-bot · 2020-01-31T13:09:31Z

/retest

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

openshift-bot · 2020-01-31T13:35:47Z

/retest

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

openshift-bot · 2020-01-31T15:45:52Z

/retest

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

openshift-bot · 2020-01-31T15:58:56Z

/retest

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

openshift-ci-robot · 2020-01-31T18:01:15Z

@rebeccaalpert: All pull requests linked via external trackers have merged. Bugzilla bug 1796664 has been moved to the MODIFIED state.

In response to this:

Bug 1796664: Add links to Marketplace workflows in OperatorHub

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.

openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. component/olm Related to OLM labels Jan 3, 2020

openshift-ci-robot requested review from jeff-phillips-18 and spadgett January 3, 2020 17:13

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 3, 2020

spadgett reviewed Jan 3, 2020

View reviewed changes

...ackages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-item-details.tsx Outdated Show resolved Hide resolved

...ackages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-item-details.tsx Outdated Show resolved Hide resolved

rebeccaalpert force-pushed the ibm-marketplace-annotations branch from f0de823 to dda3a6b Compare January 3, 2020 18:45

openshift-ci-robot added the component/core Related to console core functionality label Jan 3, 2020

spadgett reviewed Jan 3, 2020

View reviewed changes

rebeccaalpert force-pushed the ibm-marketplace-annotations branch from dda3a6b to b71d52b Compare January 3, 2020 20:25

spadgett added this to the v4.4 milestone Jan 3, 2020

spadgett reviewed Jan 14, 2020

View reviewed changes

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 24, 2020

rebeccaalpert force-pushed the ibm-marketplace-annotations branch from b71d52b to 9b771d4 Compare January 24, 2020 22:54

openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 24, 2020

spadgett reviewed Jan 24, 2020

View reviewed changes

rebeccaalpert force-pushed the ibm-marketplace-annotations branch 3 times, most recently from d800ee1 to 08667e5 Compare January 25, 2020 00:45

openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 25, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 29, 2020

spadgett changed the title ~~frontend: Add links to IBM Marketplace workflows in OperatorHub~~ Bug 1796664: Add links to Marketplace workflows in OperatorHub Jan 30, 2020

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jan 30, 2020

openshift-merge-robot merged commit d07c7de into openshift:master Jan 31, 2020

	_.get(obj, ['metadata', 'annotations', 'marketplace.openshift.io/action-text']) \|\| 'Install';
	_.get(obj, ['status', 'channels', '0', 'currentCSVDesc', 'annotations', 'marketplace.openshift.io/action-text']) \|\| 'Install';

Bug 1796664: Add links to Marketplace workflows in OperatorHub #3861

Bug 1796664: Add links to Marketplace workflows in OperatorHub #3861

Conversation

rebeccaalpert commented Jan 3, 2020 • edited

rebeccaalpert commented Jan 3, 2020

spadgett commented Jan 3, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rebeccaalpert commented Jan 6, 2020

rebeccaalpert commented Jan 6, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

spadgett commented Jan 24, 2020

rebeccaalpert commented Jan 24, 2020 • edited

spadgett commented Jan 24, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

openshift-ci-robot commented Jan 29, 2020

spadgett commented Jan 29, 2020

rebeccaalpert commented Jan 29, 2020

openshift-bot commented Jan 29, 2020

openshift-bot commented Jan 29, 2020

openshift-bot commented Jan 29, 2020

openshift-bot commented Jan 29, 2020

openshift-bot commented Jan 29, 2020

openshift-bot commented Jan 29, 2020

openshift-ci-robot commented Jan 30, 2020

openshift-bot commented Jan 30, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-bot commented Jan 31, 2020

openshift-ci-robot commented Jan 31, 2020

rebeccaalpert commented Jan 3, 2020 •

edited

rebeccaalpert commented Jan 24, 2020 •

edited

spadgett commented Jan 24, 2020 •

edited