frontend: Add links to IBM Marketplace workflows in OperatorHub

Read annotations and use action text, remote workflow link, and support link from annotations if present. Default to original values if not found. Fixes https://issues.redhat.com/projects/CONSOLE/issues/CONSOLE-1953
openshift · Jan 3, 2020 · dda3a6b · dda3a6b
1 parent 6860f48
commit dda3a6b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/...ages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-item-details.tsx b/...ages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-item-details.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import * as _ from 'lodash';
 import { Modal } from 'patternfly-react';
 import { Button } from '@patternfly/react-core';
 import {
@@ -28,6 +29,7 @@ export const OperatorHubItemDetails: React.SFC<OperatorHubItemDetailsProps> = ({
     imgUrl,
     provider,
     providerType,
+    obj,
     longDescription,
     description,
     version,
@@ -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';
 
   const getHintBlock = () => {
     if (installed) {
@@ -87,6 +91,12 @@ export const OperatorHubItemDetails: React.SFC<OperatorHubItemDetailsProps> = ({
       item.subscription.metadata.name
     }?showDelete=true`;
 
+  const createLinkWorkflow =
+    _.get(obj, ['metadata', 'annotations', 'marketplace.openshift.io/remote-workflow']) ||
+    createLink;
+  const supportWorkflow =
+    _.get(obj, ['metadata', 'annotations', 'marketplace.openshift.io/support-workflow']) || support;
+
   return (
     <>
       <Modal.Header>
@@ -106,9 +116,9 @@ export const OperatorHubItemDetails: React.SFC<OperatorHubItemDetailsProps> = ({
                 {!installed ? (
                   <Link
                     className="pf-c-button pf-m-primary co-catalog-page__overlay-create"
-                    to={createLink}
+                    to={createLinkWorkflow}
                   >
-                    Install
+                    {actionText}
                   </Link>
                 ) : (
                   <Button
@@ -126,7 +136,7 @@ export const OperatorHubItemDetails: React.SFC<OperatorHubItemDetailsProps> = ({
                 <PropertyItem label="Repository" value={repository || notAvailable} />
                 <PropertyItem label="Container Image" value={containerImage || notAvailable} />
                 <PropertyItem label="Created At" value={createdAt || notAvailable} />
-                <PropertyItem label="Support" value={support || notAvailable} />
+                <PropertyItem label="Support" value={supportWorkflow || notAvailable} />
               </PropertiesSidePanel>
               <div className="co-catalog-page__overlay-description">
                 {getHintBlock()}

diff --git a/frontend/public/components/utils/webhooks.tsx b/frontend/public/components/utils/webhooks.tsx
@@ -90,7 +90,7 @@ export const WebhookTriggers: React.FC<WebhookTriggersProps> = (props) => {
       setWebhookSecrets(_.compact(secrets));
       setLoaded(true);
     });
-  }, [isLoaded, canGetSecret]);
+  }, [isLoaded, canGetSecret, secretNames, namespace]);
 
   if (_.isEmpty(webhooks)) {
     return null;