Skip to content

fix life cycle rule edit for transition #3183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 8, 2024
Merged

fix life cycle rule edit for transition #3183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9f7ea9
fix lifecycle edit for transition rule
prakashsvmx Jan 8, 2024
c3ff4d7
fix lifecycle edit for transition rule
prakashsvmx Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions web-app/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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)));
});
}
};
Expand Down
5 changes: 1 addition & 4 deletions web-app/src/screens/Console/Common/ModalWrapper/ModalWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down