Merge pull request #10050 from bipuladh/fix-bz-popover

[release-4.9] Bug 2002696: Fix links and texts for Storage link provided in Overview page.
openshift · Oct 14, 2021 · 17af94e · 17af94e
2 parents 0ab7825 + e2ce208
commit 17af94e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/frontend/packages/ceph-storage-plugin/locales/en/ceph-storage-plugin.json b/frontend/packages/ceph-storage-plugin/locales/en/ceph-storage-plugin.json
@@ -661,9 +661,9 @@
   "Last updated": "Last updated",
   "Storage Systems": "Storage Systems",
   "Used capacity": "Used capacity",
-  "Storage status represents the health status of Openshift Data Foundation's StorageCluster.": "Storage status represents the health status of Openshift Data Foundation's StorageCluster.",
+  "Storage status represents the health status of OpenShift Data Foundation's StorageCluster.": "Storage status represents the health status of OpenShift Data Foundation's StorageCluster.",
+  "Storage status represents the health status of OpenShift Container Storage's StorageCluster.": "Storage status represents the health status of OpenShift Container Storage's StorageCluster.",
   "Health": "Health",
-  "Openshift Data Foundation": "Openshift Data Foundation",
   "Standard": "Standard",
   "Data will be consumed by a Multi-cloud object gateway, deduped, compressed, and encrypted. The encrypted chunks would be saved on the selected BackingStores. Best used when the applications would always use the OpenShift Data Foundation endpoints to access the data.": "Data will be consumed by a Multi-cloud object gateway, deduped, compressed, and encrypted. The encrypted chunks would be saved on the selected BackingStores. Best used when the applications would always use the OpenShift Data Foundation endpoints to access the data.",
   "Data is stored on the NamespaceStores without performing de-duplication, compression, or encryption. BucketClasses of namespace type allow connecting to existing data and serving from them. These are best used for existing data or when other applications (and cloud-native services) need to access the data from outside OpenShift Container Storage.": "Data is stored on the NamespaceStores without performing de-duplication, compression, or encryption. BucketClasses of namespace type allow connecting to existing data and serving from them. These are best used for existing data or when other applications (and cloud-native services) need to access the data from outside OpenShift Container Storage.",

diff --git a/frontend/packages/ceph-storage-plugin/src/components/storage-popover.tsx b/frontend/packages/ceph-storage-plugin/src/components/storage-popover.tsx
@@ -10,11 +10,14 @@ import {
 import Status, {
   StatusPopupSection,
 } from '@console/shared/src/components/dashboard/status-card/StatusPopup';
+import { useFlag } from '@console/shared';
 import { getCephHealthState } from './dashboards/persistent-internal/status-card/utils';
 import { WatchCephResource } from '../types';
+import { ODF_MODEL_FLAG } from '../constants';
 
 export const StoragePopover: React.FC<StoragePopoverProps> = ({ ceph }) => {
   const { t } = useTranslation();
+  const isODF = useFlag(ODF_MODEL_FLAG);
 
   const health = getCephHealthState({ ceph }, t);
   const icon =
@@ -27,15 +30,23 @@ export const StoragePopover: React.FC<StoragePopoverProps> = ({ ceph }) => {
 
   return (
     <>
-      {t(
-        "ceph-storage-plugin~Storage status represents the health status of Openshift Data Foundation's StorageCluster.",
-      )}
+      {isODF
+        ? t(
+            "ceph-storage-plugin~Storage status represents the health status of OpenShift Data Foundation's StorageCluster.",
+          )
+        : t(
+            "ceph-storage-plugin~Storage status represents the health status of OpenShift Container Storage's StorageCluster.",
+          )}
       <StatusPopupSection
         firstColumn={t('ceph-storage-plugin~Provider')}
         secondColumn={t('ceph-storage-plugin~Health')}
       >
         <Status key="ocs" value={value} icon={icon}>
-          <Link to="/ocs-dashboards">{t('ceph-storage-plugin~Openshift Data Foundation')}</Link>
+          <Link to={isODF ? '/odf' : '/ocs-dashboards'}>
+            {isODF
+              ? t('ceph-storage-plugin~OpenShift Data Foundation')
+              : t('ceph-storage-plugin~OpenShift Container Storage')}
+          </Link>
         </Status>
       </StatusPopupSection>
     </>