Skip to content

Commit cdffdae

Browse files
authored
Fix life cycle rule edit for transition (#3183)
1 parent 27e3b82 commit cdffdae

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

web-app/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ import {
2929
Switch,
3030
} from "mds";
3131
import { api } from "api";
32-
import { Tier } from "api/consoleApi";
32+
import { ApiError, Tier } from "api/consoleApi";
3333
import { modalStyleUtils } from "../../Common/FormComponents/common/styleLibrary";
3434
import { ITiersDropDown, LifeCycleItem } from "../types";
35-
import { ErrorResponseHandler } from "../../../../common/types";
36-
import { setModalErrorSnackMessage } from "../../../../systemSlice";
35+
import { setErrorSnackMessage } from "../../../../systemSlice";
3736
import { useAppDispatch } from "../../../../store";
3837
import ModalWrapper from "../../Common/ModalWrapper/ModalWrapper";
3938
import QueryMultiSelector from "../../Common/FormComponents/QueryMultiSelector/QueryMultiSelector";
39+
import { errorToHandler } from "../../../../api/errors";
4040

4141
interface IAddUserContentProps {
4242
closeModalAndRefresh: (reload: boolean) => void;
@@ -245,15 +245,15 @@ const EditLifecycleConfiguration = ({
245245
let transition: { [key: string]: number | string } = {};
246246

247247
if (
248-
lifecycleRule.expiration?.days &&
249-
lifecycleRule.expiration?.days > 0
248+
lifecycleRule.transition?.days &&
249+
lifecycleRule.transition?.days > 0
250250
) {
251-
transition["transition_days"] = parseInt(expiryDays);
251+
transition["transition_days"] = parseInt(transitionDays);
252252
transition["storage_class"] = storageClass;
253253
}
254-
if (lifecycleRule.expiration?.noncurrent_expiration_days) {
254+
if (lifecycleRule.transition?.noncurrent_transition_days) {
255255
transition["noncurrentversion_transition_days"] =
256-
parseInt(NCExpirationDays);
256+
parseInt(NCTransitionDays);
257257
transition["noncurrentversion_transition_storage_class"] =
258258
NCTransitionSC;
259259
}
@@ -282,9 +282,10 @@ const EditLifecycleConfiguration = ({
282282
setAddLoading(false);
283283
closeModalAndRefresh(true);
284284
})
285-
.catch((err: ErrorResponseHandler) => {
285+
.catch(async (eRes) => {
286286
setAddLoading(false);
287-
dispatch(setModalErrorSnackMessage(err));
287+
const err = (await eRes.json()) as ApiError;
288+
dispatch(setErrorSnackMessage(errorToHandler(err)));
288289
});
289290
}
290291
};

web-app/src/screens/Console/Common/ModalWrapper/ModalWrapper.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,7 @@ const ModalWrapper = ({
7575

7676
if (modalSnackMessage) {
7777
message = modalSnackMessage.detailedErrorMsg;
78-
if (
79-
modalSnackMessage.detailedErrorMsg === "" ||
80-
modalSnackMessage.detailedErrorMsg.length < 5
81-
) {
78+
if (message === "" || (message && message.length < 5)) {
8279
message = modalSnackMessage.message;
8380
}
8481
}

0 commit comments

Comments
 (0)