Skip to content

Commit 0c480dd

Browse files
authored
Handle errors for Set Policy for Access keys (#3005)
Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
1 parent c07b8dc commit 0c480dd

File tree

3 files changed

+33
-28
lines changed

3 files changed

+33
-28
lines changed

portal-ui/src/screens/Console/Account/Account.tsx

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,31 +34,32 @@ import { actionsTray } from "../Common/FormComponents/common/styleLibrary";
3434
import ChangePasswordModal from "./ChangePasswordModal";
3535
import SearchBox from "../Common/SearchBox";
3636
import withSuspense from "../Common/Components/withSuspense";
37-
import {
38-
CONSOLE_UI_RESOURCE,
39-
IAM_PAGES,
40-
IAM_SCOPES,
41-
} from "../../../common/SecureComponent/permissions";
42-
import { SecureComponent } from "../../../common/SecureComponent";
4337

4438
import { selectSAs } from "../Configurations/utils";
4539
import DeleteMultipleServiceAccounts from "../Users/DeleteMultipleServiceAccounts";
4640
import ServiceAccountPolicy from "./ServiceAccountPolicy";
47-
import {
48-
setErrorSnackMessage,
49-
setHelpName,
50-
setSnackBarMessage,
51-
} from "../../../systemSlice";
41+
5242
import { selFeatures } from "../consoleSlice";
53-
import { useAppDispatch } from "../../../store";
5443
import TooltipWrapper from "../Common/TooltipWrapper/TooltipWrapper";
5544
import PageHeaderWrapper from "../Common/PageHeaderWrapper/PageHeaderWrapper";
5645
import { api } from "api";
5746
import { errorToHandler } from "api/errors";
5847
import HelpMenu from "../HelpMenu";
59-
import { ServiceAccounts } from "../../../api/consoleApi";
60-
import { usersSort } from "../../../utils/sortFunctions";
6148
import { ACCOUNT_TABLE_COLUMNS } from "./AccountUtils";
49+
import { useAppDispatch } from "store";
50+
import { ApiError, ServiceAccounts } from "api/consoleApi";
51+
import {
52+
setErrorSnackMessage,
53+
setHelpName,
54+
setSnackBarMessage,
55+
} from "systemSlice";
56+
import { usersSort } from "utils/sortFunctions";
57+
import { SecureComponent } from "common/SecureComponent";
58+
import {
59+
CONSOLE_UI_RESOURCE,
60+
IAM_PAGES,
61+
IAM_SCOPES,
62+
} from "common/SecureComponent/permissions";
6263

6364
const DeleteServiceAccount = withSuspense(
6465
React.lazy(() => import("./DeleteServiceAccount")),
@@ -103,8 +104,9 @@ const Account = () => {
103104
const sortedRows = res.data.sort(usersSort);
104105
setRecords(sortedRows);
105106
})
106-
.catch((err) => {
107-
dispatch(setErrorSnackMessage(errorToHandler(err.error)));
107+
.catch(async (res) => {
108+
const err = (await res.json()) as ApiError;
109+
dispatch(setErrorSnackMessage(errorToHandler(err)));
108110
setLoading(false);
109111
});
110112
}

portal-ui/src/screens/Console/Account/AddServiceAccountScreen.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ import { modalStyleUtils } from "../Common/FormComponents/common/styleLibrary";
3333
import { NewServiceAccount } from "../Common/CredentialsPrompt/types";
3434
import { IAM_PAGES } from "../../../common/SecureComponent/permissions";
3535
import { setErrorSnackMessage, setHelpName } from "../../../systemSlice";
36-
import { useAppDispatch } from "../../../store";
37-
import { getRandomString } from "../../../common/utils";
3836
import { api } from "api";
3937
import { errorToHandler } from "api/errors";
40-
import { ContentType } from "api/consoleApi";
38+
import { ApiError, ContentType } from "api/consoleApi";
4139
import CodeMirrorWrapper from "../Common/FormComponents/CodeMirrorWrapper/CodeMirrorWrapper";
4240
import AddServiceAccountHelpBox from "./AddServiceAccountHelpBox";
4341
import CredentialsPrompt from "../Common/CredentialsPrompt/CredentialsPrompt";
4442
import PanelTitle from "../Common/PanelTitle/PanelTitle";
4543
import PageHeaderWrapper from "../Common/PageHeaderWrapper/PageHeaderWrapper";
4644
import HelpMenu from "../HelpMenu";
45+
import { useAppDispatch } from "store";
46+
import { getRandomString } from "common/utils";
4747

4848
const AddServiceAccount = () => {
4949
const dispatch = useAppDispatch();
@@ -83,9 +83,10 @@ const AddServiceAccount = () => {
8383
});
8484
})
8585

86-
.catch((err) => {
86+
.catch(async (res) => {
8787
setAddSending(false);
88-
dispatch(setErrorSnackMessage(errorToHandler(err.error)));
88+
const err = (await res.json()) as ApiError;
89+
dispatch(setErrorSnackMessage(errorToHandler(err)));
8990
});
9091
}
9192
}, [addSending, setAddSending, dispatch, policyJSON, accessKey, secretKey]);

portal-ui/src/screens/Console/Account/ServiceAccountPolicy.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616

1717
import React, { useEffect, useState } from "react";
1818
import { Button, ChangeAccessPolicyIcon, Grid } from "mds";
19-
import { modalStyleUtils } from "../Common/FormComponents/common/styleLibrary";
20-
import { encodeURLString } from "../../../common/utils";
21-
import { setModalErrorSnackMessage } from "../../../systemSlice";
22-
import { useAppDispatch } from "../../../store";
2319
import { api } from "api";
2420
import { errorToHandler } from "api/errors";
25-
import ModalWrapper from "../Common/ModalWrapper/ModalWrapper";
2621
import CodeMirrorWrapper from "../Common/FormComponents/CodeMirrorWrapper/CodeMirrorWrapper";
22+
import { ApiError } from "api/consoleApi";
23+
import { useAppDispatch } from "store";
24+
import { encodeURLString } from "common/utils";
25+
import { setErrorSnackMessage, setModalErrorSnackMessage } from "systemSlice";
26+
import ModalWrapper from "../Common/ModalWrapper/ModalWrapper";
27+
import { modalStyleUtils } from "../Common/FormComponents/common/styleLibrary";
2728

2829
interface IServiceAccountPolicyProps {
2930
open: boolean;
@@ -66,8 +67,9 @@ const ServiceAccountPolicy = ({
6667
.then(() => {
6768
closeModalAndRefresh();
6869
})
69-
.catch((err) => {
70-
dispatch(setModalErrorSnackMessage(errorToHandler(err)));
70+
.catch(async (res) => {
71+
const err = (await res.json()) as ApiError;
72+
dispatch(setErrorSnackMessage(errorToHandler(err)));
7173
});
7274
};
7375

0 commit comments

Comments
 (0)