Merge pull request #1649 from SanjalKatiyar/not_found_encryption

Bug 2312118: Fix 'Not Found' error with encryption form
red-hat-storage · Oct 21, 2024 · 637f39f · 637f39f
2 parents c5952c7 + 861fdcf
commit 637f39f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/ocs/storage-class/sc-form.tsx b/packages/ocs/storage-class/sc-form.tsx
@@ -54,7 +54,7 @@ import {
 } from '@odf/shared/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { isOCSStorageSystem, referenceForModel } from '@odf/shared/utils';
-import { getInfrastructurePlatform } from '@odf/shared/utils';
+import { getInfrastructurePlatform, isNotFoundError } from '@odf/shared/utils';
 import {
   ProvisionerProps,
   useK8sWatchResource,
@@ -930,7 +930,7 @@ export const StorageClassEncryptionKMSID: React.FC<ProvisionerProps> = ({
       <StatusBox
         loadError={
           infraLoadError ||
-          csiConfigMapLoadError ||
+          (!isNotFoundError(csiConfigMapLoadError) && csiConfigMapLoadError) ||
           secretsLoadError ||
           odfNsLoadError
         }

diff --git a/packages/shared/src/utils/common.ts b/packages/shared/src/utils/common.ts
@@ -17,6 +17,9 @@ const betaDefaultStorageClassAnnotation =
   'storageclass.beta.kubernetes.io/is-default-class';
 export const LAST_LANGUAGE_LOCAL_STORAGE_KEY = 'bridge/last-language';
 
+export const isNotFoundError = (loadError): boolean =>
+  _.get(loadError, 'response.status') === 404;
+
 export const getAPIVersionForModel: GetAPIVersionForModel = (model) =>
   !model?.apiGroup ? model.apiVersion : `${model.apiGroup}/${model.apiVersion}`;