Merge pull request #1642 from bipuladh/release-4.16-compatibility

[release-4.16-compatibility] DFBUGS-713: Block creation of external mode when Provider mode is already present
red-hat-storage · Dec 19, 2024 · 7334d4b · 7334d4b
2 parents cf46e70 + 750120f
commit 7334d4b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/...-storage-system/create-storage-system-steps/backing-storage-step/backing-storage-step.tsx b/...-storage-system/create-storage-system-steps/backing-storage-step/backing-storage-step.tsx
@@ -3,6 +3,7 @@ import {
   STORAGE_CLUSTER_SYSTEM_KIND,
   NO_PROVISIONER,
 } from '@odf/core/constants';
+import { PROVIDER_MODE } from '@odf/core/features';
 import { useSafeK8sGet } from '@odf/core/hooks';
 import { useODFNamespaceSelector } from '@odf/core/redux';
 import { scResource } from '@odf/core/resources';
@@ -25,6 +26,7 @@ import {
 } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { isDefaultClass, getODFCsv, getGVKLabel } from '@odf/shared/utils';
+import { useFlag } from '@openshift-console/dynamic-plugin-sdk';
 import * as _ from 'lodash-es';
 import {
   Form,
@@ -213,6 +215,7 @@ export const BackingStorage: React.FC<BackingStorageProps> = ({
 
   const isFullDeployment = deployment === DeploymentType.FULL;
   const isProviderMode = deployment === DeploymentType.PROVIDER_MODE;
+  const isProviderModePresent = useFlag(PROVIDER_MODE) && hasInternal;
   const isNonRHCSExternalType =
     type === BackingStorageType.EXTERNAL &&
     externalStorage !== OCSStorageClusterModel.kind;
@@ -269,7 +272,7 @@ export const BackingStorage: React.FC<BackingStorageProps> = ({
      * Allow pre selecting the "external connection" option instead of the "existing" option
      * if an OCS Storage System is already created.
      */
-    if (hasOCS && allowedExternalStorage.length) {
+    if (hasOCS && allowedExternalStorage.length && !isProviderModePresent) {
       dispatch({
         type: 'backingStorage/setType',
         payload: BackingStorageType.EXTERNAL,
@@ -282,7 +285,7 @@ export const BackingStorage: React.FC<BackingStorageProps> = ({
         },
       });
     }
-  }, [dispatch, allowedExternalStorage.length, hasOCS]);
+  }, [dispatch, allowedExternalStorage.length, hasOCS, isProviderModePresent]);
 
   React.useEffect(() => {
     /*
@@ -384,7 +387,11 @@ export const BackingStorage: React.FC<BackingStorageProps> = ({
             value={BackingStorageType.EXTERNAL}
             isChecked={type === BackingStorageType.EXTERNAL}
             onChange={(event, _unused) => onRadioSelect(_unused, event)}
-            isDisabled={allowedExternalStorage.length === 0 || isProviderMode}
+            isDisabled={
+              allowedExternalStorage.length === 0 ||
+              isProviderMode ||
+              isProviderModePresent
+            }
             body={
               showExternalStorageSelection && (
                 <ExternalSystemSelection

diff --git a/...ate-storage-system/create-storage-system-steps/backing-storage-step/select-deployment.tsx b/...ate-storage-system/create-storage-system-steps/backing-storage-step/select-deployment.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { FDF_FLAG } from '@odf/core/redux';
-import { DeploymentType } from '@odf/core/types';
+import { BackingStorageType, DeploymentType } from '@odf/core/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { useFlag } from '@openshift-console/dynamic-plugin-sdk';
 import {
@@ -49,6 +49,12 @@ export const SelectDeployment: React.FC<SelectDeploymentProps> = ({
       // 'value' on SelectProps['onSelect'] is string hence does not match with payload of type "DeploymentType"
       payload: value as DeploymentType,
     });
+    if (value === DeploymentType.PROVIDER_MODE) {
+      dispatch({
+        type: 'backingStorage/setType',
+        payload: BackingStorageType.EXISTING,
+      });
+    }
     setIsSelectOpen(false);
   };