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

Migrated OpenID module components to mds #2925

Merged
merged 1 commit into from
Jul 6, 2023
Merged

Migrated OpenID module components to mds #2925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
134 changes: 47 additions & 87 deletions portal-ui/src/screens/Console/IDP/AddIDPConfiguration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,26 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.

import React, { useEffect, useState } from "react";

import { Theme } from "@mui/material/styles";
import createStyles from "@mui/styles/createStyles";
import withStyles from "@mui/styles/withStyles";
import { Box, Grid } from "@mui/material";
import {
formFieldStyles,
modalBasic,
} from "../Common/FormComponents/common/styleLibrary";
import InputBoxWrapper from "../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
import { BackLink, Button, PageLayout } from "mds";
BackLink,
Button,
FormLayout,
Grid,
InputBox,
PageLayout,
SectionTitle,
Switch,
} from "mds";
import { useNavigate } from "react-router-dom";
import { ErrorResponseHandler } from "../../../common/types";
import { useAppDispatch } from "../../../store";
import { modalStyleUtils } from "../Common/FormComponents/common/styleLibrary";
import {
setErrorSnackMessage,
setHelpName,
setServerNeedsRestart,
} from "../../../systemSlice";
import useApi from "../Common/Hooks/useApi";
import SectionTitle from "../Common/SectionTitle";
import FormSwitchWrapper from "../Common/FormComponents/FormSwitchWrapper/FormSwitchWrapper";
import PageHeaderWrapper from "../Common/PageHeaderWrapper/PageHeaderWrapper";
import HelpMenu from "../HelpMenu";

Expand All @@ -51,14 +49,7 @@ type AddIDPConfigurationProps = {
endpoint: string;
};

const styles = (theme: Theme) =>
createStyles({
...formFieldStyles,
...modalBasic,
});

const AddIDPConfiguration = ({
classes,
icon,
helpBox,
header,
Expand Down Expand Up @@ -132,7 +123,7 @@ const AddIDPConfiguration = ({
switch (value.type) {
case "toggle":
return (
<FormSwitchWrapper
<Switch
indicatorLabels={["Enabled", "Disabled"]}
checked={fields[key] === "on" ? true : false}
value={"is-field-enabled"}
Expand All @@ -148,7 +139,7 @@ const AddIDPConfiguration = ({
);
default:
return (
<InputBoxWrapper
<InputBox
id={key}
required={value.required}
name={key}
Expand Down Expand Up @@ -178,76 +169,45 @@ const AddIDPConfiguration = ({
actions={<HelpMenu />}
/>
<PageLayout>
<Box
sx={{
display: "grid",
padding: "25px",
gap: "25px",
gridTemplateColumns: {
md: "2fr 1.2fr",
xs: "1fr",
},
border: "1px solid #eaeaea",
}}
>
<Box>
<SectionTitle icon={icon}>{title}</SectionTitle>
<form
noValidate
autoComplete="off"
onSubmit={(e: React.FormEvent<HTMLFormElement>) => {
addRecord(e);
}}
>
<Grid container item spacing="20" sx={{ marginTop: 1 }}>
<Grid xs={12} item>
{Object.entries(extraFormFields).map(([key, value]) => (
<Grid
item
xs={12}
className={classes.formFieldRow}
key={key}
>
{renderFormField(key, value)}
</Grid>
))}
<Grid item xs={12} textAlign={"right"}>
<Box
sx={{
display: "flex",
alignItems: "center",
justifyContent: "flex-end",
marginTop: "20px",
gap: "15px",
}}
>
<Button
id={"clear"}
type="button"
variant="regular"
onClick={resetForm}
label={"Clear"}
/>

<Button
id={"save-key"}
type="submit"
variant="callAction"
color="primary"
disabled={loading || !validSave()}
label={"Save"}
/>
</Box>
</Grid>
<FormLayout helpBox={helpBox}>
<SectionTitle icon={icon}>{title}</SectionTitle>
<form
noValidate
autoComplete="off"
onSubmit={(e: React.FormEvent<HTMLFormElement>) => {
addRecord(e);
}}
>
<Grid container>
<Grid xs={12} item>
{Object.entries(extraFormFields).map(([key, value]) =>
renderFormField(key, value)
)}
<Grid item xs={12} sx={modalStyleUtils.modalButtonBar}>
<Button
id={"clear"}
type="button"
variant="regular"
onClick={resetForm}
label={"Clear"}
/>

<Button
id={"save-key"}
type="submit"
variant="callAction"
color="primary"
disabled={loading || !validSave()}
label={"Save"}
/>
</Grid>
</Grid>
</form>
</Box>
{helpBox}
</Box>
</Grid>
</form>
</FormLayout>
</PageLayout>
</Grid>
);
};

export default withStyles(styles)(AddIDPConfiguration);
export default AddIDPConfiguration;
20 changes: 17 additions & 3 deletions portal-ui/src/screens/Console/IDP/AddIDPConfigurationHelpbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
import React, { Fragment } from "react";
// This file is part of MinIO Console Server
// Copyright (c) 2023 MinIO, Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

import { Box } from "@mui/material";
import { HelpIconFilled } from "mds";
import React, { Fragment } from "react";
import { HelpIconFilled, Box } from "mds";

interface IContent {
icon: React.ReactNode;
Expand Down
14 changes: 6 additions & 8 deletions portal-ui/src/screens/Console/IDP/DeleteIDPConfigurationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,16 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

import React from "react";

import { DialogContentText } from "@mui/material";
import { ErrorResponseHandler } from "../../../common/types";
import useApi from "../Common/Hooks/useApi";
import ConfirmDialog from "../Common/ModalWrapper/ConfirmDialog";
import React, { Fragment } from "react";
import { ConfirmDeleteIcon } from "mds";
import {
setErrorSnackMessage,
setServerNeedsRestart,
} from "../../../systemSlice";
import { useAppDispatch } from "../../../store";
import { ErrorResponseHandler } from "../../../common/types";
import useApi from "../Common/Hooks/useApi";
import ConfirmDialog from "../Common/ModalWrapper/ConfirmDialog";

interface IDeleteIDPConfigurationModalProps {
closeDeleteModalAndRefresh: (refresh: boolean) => void;
Expand Down Expand Up @@ -74,10 +72,10 @@ const DeleteIDPConfigurationModal = ({
disabled: deleteLoading,
}}
confirmationContent={
<DialogContentText>
<Fragment>
Are you sure you want to delete IDP <b>{displayName}</b>{" "}
configuration? <br />
</DialogContentText>
</Fragment>
}
/>
);
Expand Down
Loading