Skip to content

Commit 2c84a52

Browse files
authored
Use FormLayout from mds (#2788)
1 parent 6020590 commit 2c84a52

File tree

8 files changed

+21
-74
lines changed

8 files changed

+21
-74
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@ import Grid from "@mui/material/Grid";
1919
import { LinearProgress } from "@mui/material";
2020
import { Theme } from "@mui/material/styles";
2121
import { useNavigate } from "react-router-dom";
22-
import { BackLink, BucketsIcon, Button, HelpBox, InfoIcon } from "mds";
22+
import {
23+
BackLink,
24+
BucketsIcon,
25+
Button,
26+
FormLayout,
27+
HelpBox,
28+
InfoIcon,
29+
} from "mds";
2330
import {
2431
containerForHeader,
2532
modalBasic,
@@ -37,7 +44,6 @@ import {
3744
} from "../../../../../systemSlice";
3845
import PageLayout from "../../../Common/Layout/PageLayout";
3946
import InputUnitMenu from "../../../Common/FormComponents/InputUnitMenu/InputUnitMenu";
40-
import FormLayout from "../../../Common/FormLayout";
4147
import TooltipWrapper from "../../../Common/TooltipWrapper/TooltipWrapper";
4248
import SectionTitle from "../../../Common/SectionTitle";
4349
import {
@@ -243,7 +249,7 @@ const AddBucket = () => {
243249
<FormLayout
244250
title={"Create Bucket"}
245251
icon={<BucketsIcon />}
246-
helpbox={
252+
helpBox={
247253
<HelpBox
248254
iconComponent={<BucketsIcon />}
249255
title={"Buckets"}

portal-ui/src/screens/Console/Common/FormLayout.tsx

Lines changed: 0 additions & 53 deletions
This file was deleted.

portal-ui/src/screens/Console/Configurations/TiersConfiguration/TierTypeSelector.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ import { tierTypes } from "./utils";
2121
import { IAM_PAGES } from "../../../../common/SecureComponent/permissions";
2222
import PageLayout from "../../Common/Layout/PageLayout";
2323
import TierTypeCard from "./TierTypeCard";
24-
import { BackLink, HelpBox, TiersIcon } from "mds";
25-
import FormLayout from "../../Common/FormLayout";
24+
import { BackLink, FormLayout, HelpBox, TiersIcon } from "mds";
2625
import PageHeaderWrapper from "../../Common/PageHeaderWrapper/PageHeaderWrapper";
2726

2827
const TierTypeSelector = () => {
@@ -50,7 +49,7 @@ const TierTypeSelector = () => {
5049
<FormLayout
5150
title={"Select Tier Type"}
5251
icon={<TiersIcon />}
53-
helpbox={
52+
helpBox={
5453
<HelpBox
5554
iconComponent={<TiersIcon />}
5655
title={"Tier Types"}

portal-ui/src/screens/Console/Groups/AddGroupScreen.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
} from "../Common/FormComponents/common/styleLibrary";
2626
import Grid from "@mui/material/Grid";
2727
import { LinearProgress } from "@mui/material";
28-
import { BackLink, Button, CreateGroupIcon } from "mds";
28+
import { BackLink, Button, CreateGroupIcon, FormLayout } from "mds";
2929
import PageLayout from "../Common/Layout/PageLayout";
3030
import InputBoxWrapper from "../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
3131
import AddGroupHelpBox from "./AddGroupHelpBox";
@@ -34,7 +34,6 @@ import { IAM_PAGES } from "../../../common/SecureComponent/permissions";
3434
import { ErrorResponseHandler } from "../../../../src/common/types";
3535
import api from "../../../../src/common/api";
3636

37-
import FormLayout from "../Common/FormLayout";
3837
import { setErrorSnackMessage } from "../../../systemSlice";
3938
import { useAppDispatch } from "../../../store";
4039
import PageHeaderWrapper from "../Common/PageHeaderWrapper/PageHeaderWrapper";
@@ -110,7 +109,7 @@ const AddGroupScreen = ({ classes }: IAddGroupProps) => {
110109
<FormLayout
111110
title={"Create Group"}
112111
icon={<CreateGroupIcon />}
113-
helpbox={<AddGroupHelpBox />}
112+
helpBox={<AddGroupHelpBox />}
114113
>
115114
<form noValidate autoComplete="off" onSubmit={setSaving}>
116115
<Grid container>

portal-ui/src/screens/Console/KMS/AddKeyForm.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ import React, { useState } from "react";
1818
import { Box } from "@mui/material";
1919

2020
import Grid from "@mui/material/Grid";
21-
import { AddAccessRuleIcon, Button } from "mds";
21+
import { AddAccessRuleIcon, Button, FormLayout } from "mds";
2222
import PageLayout from "../Common/Layout/PageLayout";
2323
import InputBoxWrapper from "../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
2424
import { ErrorResponseHandler } from "../../../common/types";
25-
import FormLayout from "../Common/FormLayout";
2625
import useApi from "../Common/Hooks/useApi";
2726
import KMSHelpBox from "./KMSHelpbox";
2827

@@ -57,7 +56,7 @@ const AddKeyForm = ({ onSuccess, onError }: IAddKeyFormProps) => {
5756
<FormLayout
5857
title={"Create Key"}
5958
icon={<AddAccessRuleIcon />}
60-
helpbox={
59+
helpBox={
6160
<KMSHelpBox
6261
helpText={"Encryption Key"}
6362
contents={[

portal-ui/src/screens/Console/KMS/ImportKey.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ import React, { Fragment, useState } from "react";
1818
import { Box } from "@mui/material";
1919

2020
import Grid from "@mui/material/Grid";
21-
import { AddAccessRuleIcon, BackLink, Button } from "mds";
21+
import { AddAccessRuleIcon, BackLink, Button, FormLayout } from "mds";
2222
import PageLayout from "../Common/Layout/PageLayout";
2323
import InputBoxWrapper from "../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
2424
import { IAM_PAGES } from "../../../common/SecureComponent/permissions";
2525
import { ErrorResponseHandler } from "../../../common/types";
26-
import FormLayout from "../Common/FormLayout";
2726
import { setErrorSnackMessage } from "../../../systemSlice";
2827
import { useNavigate } from "react-router-dom";
2928
import { useAppDispatch } from "../../../store";
@@ -81,7 +80,7 @@ const ImportKey = () => {
8180
<FormLayout
8281
title={"Import Key"}
8382
icon={<AddAccessRuleIcon />}
84-
helpbox={
83+
helpBox={
8584
<KMSHelpBox
8685
helpText={"Encryption Key"}
8786
contents={[

portal-ui/src/screens/Console/Policies/AddPolicyScreen.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
import React, { Fragment, useState } from "react";
1818
import Grid from "@mui/material/Grid";
1919
import { Box } from "@mui/material";
20-
import { AddAccessRuleIcon, BackLink, Button } from "mds";
20+
import { AddAccessRuleIcon, BackLink, Button, FormLayout } from "mds";
2121
import PageLayout from "../Common/Layout/PageLayout";
2222
import InputBoxWrapper from "../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
2323
import AddPolicyHelpBox from "./AddPolicyHelpBox";
2424
import CodeMirrorWrapper from "../Common/FormComponents/CodeMirrorWrapper/CodeMirrorWrapper";
2525
import { IAM_PAGES } from "../../../common/SecureComponent/permissions";
26-
import FormLayout from "../Common/FormLayout";
2726
import { setErrorSnackMessage } from "../../../systemSlice";
2827
import { useNavigate } from "react-router-dom";
2928
import { useAppDispatch } from "../../../store";
@@ -100,7 +99,7 @@ const AddPolicyScreen = () => {
10099
<FormLayout
101100
title={"Create Policy"}
102101
icon={<AddAccessRuleIcon />}
103-
helpbox={<AddPolicyHelpBox />}
102+
helpBox={<AddPolicyHelpBox />}
104103
>
105104
<form
106105
noValidate

portal-ui/src/screens/Console/Users/AddUserScreen.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import React, { Fragment } from "react";
1818
import { Theme } from "@mui/material/styles";
19-
import { BackLink, Button, CreateUserIcon } from "mds";
19+
import { BackLink, Button, CreateUserIcon, FormLayout } from "mds";
2020
import createStyles from "@mui/styles/createStyles";
2121
import withStyles from "@mui/styles/withStyles";
2222
import UserSelector from "./UserSelector";
@@ -37,7 +37,6 @@ import GroupsSelectors from "./GroupsSelectors";
3737

3838
import { IAM_PAGES } from "../../../common/SecureComponent/permissions";
3939
import { useNavigate } from "react-router-dom";
40-
import FormLayout from "../Common/FormLayout";
4140
import AddUserHelpBox from "./AddUserHelpBox";
4241
import { setErrorSnackMessage } from "../../../systemSlice";
4342
import { AppState, useAppDispatch } from "../../../store";
@@ -115,7 +114,7 @@ const AddUser = ({ classes }: IAddUserProps) => {
115114
<FormLayout
116115
title={"Create User"}
117116
icon={<CreateUserIcon />}
118-
helpbox={<AddUserHelpBox />}
117+
helpBox={<AddUserHelpBox />}
119118
>
120119
<form
121120
noValidate

0 commit comments

Comments
 (0)