From cdffdae2893209744bb743dc6f52188fc1f28f94 Mon Sep 17 00:00:00 2001
From: Prakash Senthil Vel <23444145+prakashsvmx@users.noreply.github.com>
Date: Mon, 8 Jan 2024 20:13:07 +0530
Subject: [PATCH] Fix life cycle rule edit for  transition (#3183)

---
 .../EditLifecycleConfiguration.tsx            | 21 ++++++++++---------
 .../Common/ModalWrapper/ModalWrapper.tsx      |  5 +----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/web-app/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx b/web-app/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx
index 54ead6bd5..7f39546f8 100644
--- a/web-app/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx
+++ b/web-app/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx
@@ -29,14 +29,14 @@ import {
   Switch,
 } from "mds";
 import { api } from "api";
-import { Tier } from "api/consoleApi";
+import { ApiError, Tier } from "api/consoleApi";
 import { modalStyleUtils } from "../../Common/FormComponents/common/styleLibrary";
 import { ITiersDropDown, LifeCycleItem } from "../types";
-import { ErrorResponseHandler } from "../../../../common/types";
-import { setModalErrorSnackMessage } from "../../../../systemSlice";
+import { setErrorSnackMessage } from "../../../../systemSlice";
 import { useAppDispatch } from "../../../../store";
 import ModalWrapper from "../../Common/ModalWrapper/ModalWrapper";
 import QueryMultiSelector from "../../Common/FormComponents/QueryMultiSelector/QueryMultiSelector";
+import { errorToHandler } from "../../../../api/errors";
 
 interface IAddUserContentProps {
   closeModalAndRefresh: (reload: boolean) => void;
@@ -245,15 +245,15 @@ const EditLifecycleConfiguration = ({
         let transition: { [key: string]: number | string } = {};
 
         if (
-          lifecycleRule.expiration?.days &&
-          lifecycleRule.expiration?.days > 0
+          lifecycleRule.transition?.days &&
+          lifecycleRule.transition?.days > 0
         ) {
-          transition["transition_days"] = parseInt(expiryDays);
+          transition["transition_days"] = parseInt(transitionDays);
           transition["storage_class"] = storageClass;
         }
-        if (lifecycleRule.expiration?.noncurrent_expiration_days) {
+        if (lifecycleRule.transition?.noncurrent_transition_days) {
           transition["noncurrentversion_transition_days"] =
-            parseInt(NCExpirationDays);
+            parseInt(NCTransitionDays);
           transition["noncurrentversion_transition_storage_class"] =
             NCTransitionSC;
         }
@@ -282,9 +282,10 @@ const EditLifecycleConfiguration = ({
           setAddLoading(false);
           closeModalAndRefresh(true);
         })
-        .catch((err: ErrorResponseHandler) => {
+        .catch(async (eRes) => {
           setAddLoading(false);
-          dispatch(setModalErrorSnackMessage(err));
+          const err = (await eRes.json()) as ApiError;
+          dispatch(setErrorSnackMessage(errorToHandler(err)));
         });
     }
   };
diff --git a/web-app/src/screens/Console/Common/ModalWrapper/ModalWrapper.tsx b/web-app/src/screens/Console/Common/ModalWrapper/ModalWrapper.tsx
index 636139955..63c862b51 100644
--- a/web-app/src/screens/Console/Common/ModalWrapper/ModalWrapper.tsx
+++ b/web-app/src/screens/Console/Common/ModalWrapper/ModalWrapper.tsx
@@ -75,10 +75,7 @@ const ModalWrapper = ({
 
   if (modalSnackMessage) {
     message = modalSnackMessage.detailedErrorMsg;
-    if (
-      modalSnackMessage.detailedErrorMsg === "" ||
-      modalSnackMessage.detailedErrorMsg.length < 5
-    ) {
+    if (message === "" || (message && message.length < 5)) {
       message = modalSnackMessage.message;
     }
   }