Skip to content
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

error handling in bucket creation ui #3455

Merged
merged 3 commits into from
Oct 28, 2024
Merged

error handling in bucket creation ui #3455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8741e78
error handling in bucket creation ui
prakashsvmx Oct 22, 2024
ac068a7
narrow type
prakashsvmx Oct 23, 2024
f5231fb
Merge branch 'master' into console-ui-error
bexsoft Oct 28, 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
7 changes: 7 additions & 0 deletions web-app/src/screens/Console/Buckets/ListBuckets/AddBucket/AddBucket.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ const AddBucket = () => {
(state: AppState) => state.addBucket.retentionValidity,
);
const addLoading = useSelector((state: AppState) => state.addBucket.loading);
const addError = useSelector((state: AppState) => state.addBucket.error);
const invalidFields = useSelector(
(state: AppState) => state.addBucket.invalidFields,
);
Expand Down Expand Up @@ -155,6 +156,12 @@ const AddBucket = () => {
IAM_SCOPES.S3_PUT_ACTIONS,
]);

useEffect(() => {
if (addError) {
dispatch(setErrorSnackMessage(errorToHandler(addError)));
}
}, [addError, dispatch]);

useEffect(() => {
const bucketNameErrors = [
!(isDirty && (bucketName.length < 3 || bucketName.length > 63)),
Expand Down
7 changes: 5 additions & 2 deletions web-app/src/screens/Console/Buckets/ListBuckets/AddBucket/addBucketThunks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ export const addBucketAsync = createAsyncThunk(
};
}
}

return api.buckets.makeBucket(request);
try {
return await api.buckets.makeBucket(request);
} catch (err: any) {
return rejectWithValue(err.error);
}
},
);
17 changes: 12 additions & 5 deletions web-app/src/screens/Console/Buckets/ListBuckets/AddBucket/addBucketsSlice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import { createSlice, PayloadAction } from "@reduxjs/toolkit";
import { addBucketAsync } from "./addBucketThunks";
import { ObjectRetentionMode } from "api/consoleApi";
import { ApiError, ObjectRetentionMode } from "api/consoleApi";

interface AddBucketState {
loading: boolean;
Expand All @@ -36,6 +36,7 @@ interface AddBucketState {
navigateTo: string;
excludeFolders: boolean;
excludedPrefixes: string;
error: ApiError | null;
}

const initialState: AddBucketState = {
Expand All @@ -56,6 +57,7 @@ const initialState: AddBucketState = {
navigateTo: "",
excludeFolders: false,
excludedPrefixes: "",
error: null,
};

const addBucketsSlice = createSlice({
Expand Down Expand Up @@ -180,15 +182,20 @@ const addBucketsSlice = createSlice({
builder
.addCase(addBucketAsync.pending, (state) => {
state.loading = true;
state.error = null;
})
.addCase(addBucketAsync.rejected, (state) => {
.addCase(addBucketAsync.rejected, (state, action) => {
state.loading = false;
state.error = action.payload as ApiError;
})
.addCase(addBucketAsync.fulfilled, (state, action) => {
state.loading = false;
state.navigateTo = action.payload.data.bucketName
? "/buckets"
: `/buckets/${action.payload.data.bucketName}/admin`;
state.error = null;
if (action.payload) {
state.navigateTo = action.payload.data.bucketName
? "/buckets"
: `/buckets/${action.payload.data.bucketName}/admin`;
}
});
},
});
Expand Down
Loading