Merge pull request #6363 from gebhardtr/rhm-utm

Bug 1874901: add utm_source parameter to Red Hat Marketplace URLs for attribution
openshift · Sep 18, 2020 · 910f7ce · 910f7ce
2 parents f6957c3 + ad57af4
commit 910f7ce
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 8 deletions.
diff --git a/frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.tsx b/frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.tsx
@@ -851,6 +851,18 @@ export const ClusterServiceVersionDetails: React.SFC<ClusterServiceVersionDetail
     }
   }
 
+  let supportWorkflowUrl;
+  if (marketplaceSupportWorkflow) {
+    try {
+      const url = new URL(marketplaceSupportWorkflow);
+      url.searchParams.set('utm_source', 'openshift_console');
+      supportWorkflowUrl = url.toString();
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(error.message);
+    }
+  }
+
   return (
     <>
       <ScrollToTopOnMount />
@@ -884,11 +896,11 @@ export const ClusterServiceVersionDetails: React.SFC<ClusterServiceVersionDetail
                 <dd>
                   {spec.provider && spec.provider.name ? spec.provider.name : 'Not available'}
                 </dd>
-                {marketplaceSupportWorkflow && (
+                {supportWorkflowUrl && (
                   <>
                     <dt>Support</dt>
                     <dd>
-                      <ExternalLink href={marketplaceSupportWorkflow} text="Get support" />
+                      <ExternalLink href={supportWorkflowUrl} text="Get support" />
                     </dd>
                   </>
                 )}

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
@@ -168,6 +168,17 @@ export const OperatorHubItemDetails: React.FC<OperatorHubItemDetailsProps> = ({
   const mappedInfraFeatures = mappedData(infraFeatures);
   const mappedValidSubscription = mappedData(validSubscription);
 
+  let supportWorkflowUrl;
+  if (marketplaceSupportWorkflow)
+    try {
+      const url = new URL(marketplaceSupportWorkflow);
+      url.searchParams.set('utm_source', 'openshift_console');
+      supportWorkflowUrl = url.toString();
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(error.message);
+    }
+
   return (
     <div className="modal-body modal-body-border">
       <div className="modal-body-content">
@@ -199,8 +210,8 @@ export const OperatorHubItemDetails: React.FC<OperatorHubItemDetailsProps> = ({
               <PropertyItem
                 label="Support"
                 value={
-                  marketplaceSupportWorkflow ? (
-                    <ExternalLink href={marketplaceSupportWorkflow} text="Get support" />
+                  supportWorkflowUrl ? (
+                    <ExternalLink href={supportWorkflowUrl} text="Get support" />
                   ) : (
                     support || notAvailable
                   )

diff --git a/...nd/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx b/...nd/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx
@@ -421,6 +421,18 @@ export const OperatorHubTileView: React.FC<OperatorHubTileViewProps> = (props) =
     detailsItem &&
     `/k8s/ns/${detailsItem.subscription.metadata.namespace}/${SubscriptionModel.plural}/${detailsItem.subscription.metadata.name}?showDelete=true`;
 
+  let remoteWorkflowUrl = detailsItem?.marketplaceRemoteWorkflow;
+  if (remoteWorkflowUrl) {
+    try {
+      const url = new URL(remoteWorkflowUrl);
+      url.searchParams.set('utm_source', 'openshift_console');
+      remoteWorkflowUrl = url.toString();
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(error.message);
+    }
+  }
+
   if (_.isEmpty(filteredItems)) {
     return (
       <>
@@ -468,10 +480,10 @@ export const OperatorHubTileView: React.FC<OperatorHubTileViewProps> = (props) =
                 id="catalog-item-header"
               />
               <div className="co-catalog-page__overlay-actions">
-                {detailsItem.marketplaceRemoteWorkflow && (
+                {remoteWorkflowUrl && (
                   <ExternalLink
                     additionalClassName="pf-c-button pf-m-primary co-catalog-page__overlay-action"
-                    href={detailsItem.marketplaceRemoteWorkflow}
+                    href={remoteWorkflowUrl}
                     text={
                       <>
                         <div className="co-catalog-page__overlay-action-label">
@@ -486,8 +498,8 @@ export const OperatorHubTileView: React.FC<OperatorHubTileViewProps> = (props) =
                   <Link
                     className={classNames(
                       'pf-c-button',
-                      { 'pf-m-secondary': detailsItem.marketplaceRemoteWorkflow },
-                      { 'pf-m-primary': !detailsItem.marketplaceRemoteWorkflow },
+                      { 'pf-m-secondary': remoteWorkflowUrl },
+                      { 'pf-m-primary': !remoteWorkflowUrl },
                       'co-catalog-page__overlay-action',
                     )}
                     data-test-id="operator-install-btn"