Addressed non-logic feedback

openshift · Jul 2, 2021 · 858d95c · 858d95c
1 parent 1df0a85
commit 858d95c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 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
@@ -105,8 +105,21 @@ const InstallingHintBlock: React.FC<OperatorHubItemDetailsHintBlockProps> = ({
   subscription,
 }) => {
   const { t } = useTranslation();
+  const [installedCSV] = useK8sWatchResource<ClusterServiceVersionKind>(
+    subscription?.status?.installedCSV
+      ? {
+          kind: referenceForModel(ClusterServiceVersionModel),
+          name: subscription?.status?.installedCSV,
+          namespace: subscription?.metadata?.namespace,
+          isList: false,
+          namespaced: true,
+        }
+      : null,
+  );
   const nsPath = `/k8s/${namespace ? `ns/${namespace}` : 'all-namespaces'}`;
-  const to = `${nsPath}/subscriptions/${subscription.metadata.name ?? ''}`;
+  const to = installedCSV
+    ? `${nsPath}/clusterserviceversions/${installedCSV?.metadata?.name}/subscription`
+    : `${nsPath}/subscriptions/${subscription.metadata.name ?? ''}`;
   return (
     <HintBlock className="co-catalog-page__hint" title={t('olm~Installing Operator')}>
       <p>

diff --git a/...end/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-page.tsx b/...end/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-page.tsx
@@ -50,13 +50,10 @@ const ANNOTATIONS_WITH_JSON = [
 ];
 
 const clusterServiceVersionFor = (
-  packageManifest: PackageManifestKind,
   clusterServiceVersions: ClusterServiceVersionKind[],
-  version: string,
+  csvName: string,
 ): ClusterServiceVersionKind => {
-  return clusterServiceVersions?.find(
-    (csv) => csv.metadata.name === `${packageManifest.metadata.name}.${version}`,
-  );
+  return clusterServiceVersions?.find((csv) => csv.metadata.name === csvName);
 };
 
 const installPlanFor = (
@@ -219,9 +216,8 @@ export const OperatorHubList: React.FC<OperatorHubListProps> = ({
           )(namespace);
 
           const clusterServiceVersion = clusterServiceVersionFor(
-            pkg,
             clusterServiceVersions?.data,
-            currentCSVDesc?.version,
+            subscription?.status?.currentCSV,
           );
 
           const installPlan = installPlanFor(subscription, installPlans?.data);

diff --git a/frontend/packages/operator-lifecycle-manager/src/types.ts b/frontend/packages/operator-lifecycle-manager/src/types.ts
@@ -204,6 +204,7 @@ export type SubscriptionKind = {
     installPlanRef?: ObjectReference;
     state?: SubscriptionState;
     lastUpdated?: string;
+    currentCSV?: string;
   };
 } & K8sResourceCommon;