Merge pull request red-hat-storage#1404 from bipuladh/fix-client-fall…

…back Remove storage class prefix for client deployments
TimothyAsirJeyasing · May 23, 2024 · 241c066 · 241c066
2 parents d59156f + 8253676
commit 241c066
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 41 deletions.
diff --git a/packages/ocs/dashboards/persistent-external/breakdown-card.tsx b/packages/ocs/dashboards/persistent-external/breakdown-card.tsx
@@ -31,7 +31,7 @@ import {
   TitleWithHelp,
 } from '../persistent-internal/capacity-breakdown-card/capacity-breakdown-card';
 import '../persistent-internal/capacity-breakdown-card/capacity-breakdown-card.scss';
-import useClientFallback from './fallback-hook';
+import getClientFallback from './client-fallback';
 
 export const BreakdownCard: React.FC = () => {
   const { t } = useCustomTranslation();
@@ -47,7 +47,7 @@ export const BreakdownCard: React.FC = () => {
 
   // name of created StorageClasses are prefix by StorageCluster name
   const storageClassName = systemFlags?.[clusterNs]?.ocsClusterName;
-  const storageClassNamePrefix = useClientFallback(storageClassName);
+  const storageClassNamePrefix = getClientFallback(storageClassName);
 
   const { queries, model, metric } = getBreakdownMetricsQuery(
     metricType,

diff --git a/packages/ocs/dashboards/persistent-external/client-fallback.ts b/packages/ocs/dashboards/persistent-external/client-fallback.ts
@@ -0,0 +1,13 @@
+/**
+ * This hooks is for ODF Client Mode use case only.
+ * ODF client mode doesn't deploy ODF StorageCluster hence we will use no storage class prefix. We will rely on provisioners
+ *
+ */
+const getClientFallback = (storageClusterName: string) => {
+  if (storageClusterName) {
+    return storageClusterName;
+  }
+  return '';
+};
+
+export default getClientFallback;
diff --git a/packages/ocs/dashboards/persistent-external/fallback-hook.ts b/packages/ocs/dashboards/persistent-external/fallback-hook.ts
diff --git a/packages/ocs/dashboards/persistent-external/utilization-card.tsx b/packages/ocs/dashboards/persistent-external/utilization-card.tsx
@@ -15,7 +15,7 @@ import {
   INDEPENDENT_UTILIZATION_QUERIES,
 } from '../../queries';
 import { ODFSystemParams } from '../../types';
-import useClientFallback from './fallback-hook';
+import getClientFallback from './client-fallback';
 
 export const UtilizationContent: React.FC = () => {
   const { t } = useCustomTranslation();
@@ -25,7 +25,7 @@ export const UtilizationContent: React.FC = () => {
 
   // name of created StorageClasses are prefix by StorageCluster name
   const storageClassName = systemFlags?.[clusterNs]?.ocsClusterName;
-  const storageClassNamePrefix = useClientFallback(storageClassName);
+  const storageClassNamePrefix = getClientFallback(storageClassName);
 
   return (
     <UtilizationBody>