Skip to content

Commit 9b7ba62

Browse files
committed
Fixing the shown errors
1 parent cdc9e7d commit 9b7ba62

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

portal-ui/src/screens/Console/Buckets/BucketDetails/AccessDetailsPanel.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { encodeURLString } from "../../../../common/utils";
3333
import { setErrorSnackMessage, setHelpName } from "../../../../systemSlice";
3434
import { selBucketDetailsLoading } from "./bucketDetailsSlice";
3535
import { useAppDispatch } from "../../../../store";
36-
import { Policy } from "../../../../api/consoleApi";
36+
import { ApiError, Policy } from "../../../../api/consoleApi";
3737

3838
const AccessDetails = () => {
3939
const dispatch = useAppDispatch();
@@ -109,7 +109,8 @@ const AccessDetails = () => {
109109
setBucketUsers(res.data);
110110
setLoadingUsers(false);
111111
})
112-
.catch((err) => {
112+
.catch(async (res) => {
113+
const err = (await res.json()) as ApiError;
113114
dispatch(setErrorSnackMessage(errorToHandler(err)));
114115
setLoadingUsers(false);
115116
});
@@ -133,7 +134,8 @@ const AccessDetails = () => {
133134
setBucketPolicy(res.data.policies);
134135
setLoadingPolicies(false);
135136
})
136-
.catch((err) => {
137+
.catch(async (res) => {
138+
const err = (await res.json()) as ApiError;
137139
dispatch(setErrorSnackMessage(errorToHandler(err)));
138140
setLoadingPolicies(false);
139141
});

portal-ui/src/screens/Console/Buckets/BucketDetails/AccessRulePanel.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { AddIcon, Button, DataTable, SectionTitle } from "mds";
1919
import { useSelector } from "react-redux";
2020
import { useParams } from "react-router-dom";
2121
import { api } from "api";
22-
import { AccessRule as IAccessRule } from "api/consoleApi";
22+
import { AccessRule as IAccessRule, ApiError } from "api/consoleApi";
2323
import { errorToHandler } from "api/errors";
2424
import { IAM_SCOPES } from "../../../../common/SecureComponent/permissions";
2525
import {
@@ -114,7 +114,8 @@ const AccessRule = () => {
114114
setAccessRules(res.data.accessRules);
115115
setLoadingAccessRules(false);
116116
})
117-
.catch((err) => {
117+
.catch(async (res) => {
118+
const err = (await res.json()) as ApiError;
118119
dispatch(setErrorSnackMessage(errorToHandler(err)));
119120
setLoadingAccessRules(false);
120121
});

portal-ui/src/screens/Console/Buckets/BucketDetails/AddAccessRule.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import {
3232
setSnackBarMessage,
3333
} from "../../../../systemSlice";
3434
import { useAppDispatch } from "../../../../store";
35+
import { ApiError } from "../../../../api/consoleApi";
3536

3637
interface IAddAccessRule {
3738
modalOpen: boolean;
@@ -78,8 +79,8 @@ const AddAccessRule = ({
7879
dispatch(setSnackBarMessage("Access Rule added successfully"));
7980
onClose();
8081
})
81-
.catch((err) => {
82-
dispatch(setErrorSnackMessage(errorToHandler(err)));
82+
.catch((res) => {
83+
dispatch(setErrorSnackMessage(errorToHandler(res.error)));
8384
onClose();
8485
});
8586
};

portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/AddBucket.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ import { hasPermission } from "../../../../../common/SecureComponent";
7171
import BucketNamingRules from "./BucketNamingRules";
7272
import PageHeaderWrapper from "../../../Common/PageHeaderWrapper/PageHeaderWrapper";
7373
import { api } from "../../../../../api";
74-
import { ObjectRetentionMode } from "../../../../../api/consoleApi";
74+
import { ApiError, ObjectRetentionMode } from "../../../../../api/consoleApi";
7575
import { errorToHandler } from "../../../../../api/errors";
7676
import HelpMenu from "../../../HelpMenu";
7777
import CSVMultiSelector from "../../../Common/FormComponents/CSVMultiSelector/CSVMultiSelector";
@@ -191,7 +191,8 @@ const AddBucket = () => {
191191
dispatch(setErrorSnackMessage(errorToHandler(res.error)));
192192
}
193193
})
194-
.catch((err) => {
194+
.catch(async (res) => {
195+
const err = (await res.json()) as ApiError;
195196
dispatch(setErrorSnackMessage(errorToHandler(err)));
196197
});
197198
};

portal-ui/src/screens/Console/Configurations/ConfigurationPanels/ConfigurationOptions.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import { useAppDispatch } from "../../../../store";
4646
import { api } from "../../../../api";
4747
import { IElement } from "../types";
4848
import { errorToHandler } from "../../../../api/errors";
49+
import { ApiError } from "../../../../api/consoleApi";
4950

5051
const getRoutePath = (path: string) => {
5152
return `${IAM_PAGES.SETTINGS}/${path}`;
@@ -79,7 +80,8 @@ const ConfigurationOptions = () => {
7980
setConfigSubSysList(confSubSysList);
8081
}
8182
})
82-
.catch((err) => {
83+
.catch(async (res) => {
84+
const err = (await res.json()) as ApiError;
8385
dispatch(setErrorSnackMessage(errorToHandler(err)));
8486
});
8587
}, [dispatch]);

0 commit comments

Comments
 (0)