Skip to content

feat: use ConfirmDialog for ResetPasswordDialog #2035

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

Merged
merged 5 commits into from
Jun 3, 2022
Merged

feat: use ConfirmDialog for ResetPasswordDialog #2035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
abe3081
feat: use ConfirmDialog for ResetPasswordDialog
AbhineetJain Jun 3, 2022
3a72835
fix lint
AbhineetJain Jun 3, 2022
82d03e8
make description typography a div
AbhineetJain Jun 3, 2022
e3bfaa7
use paragraph for string description, div otherwise
AbhineetJain Jun 3, 2022
20902fd
fix lint
AbhineetJain Jun 3, 2022
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
6 changes: 5 additions & 1 deletion site/src/components/ConfirmDialog/ConfirmDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ export const ConfirmDialog: React.FC<ConfirmDialogProps> = ({
</Typography>

{description && (
<Typography className={styles.description} variant="body2">
<Typography
component={typeof description === "string" ? "p" : "div"}
className={styles.description}
variant="body2"
>
{description}
</Typography>
)}
Expand Down
49 changes: 25 additions & 24 deletions site/src/components/ResetPasswordDialog/ResetPasswordDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import DialogActions from "@material-ui/core/DialogActions"
import DialogContent from "@material-ui/core/DialogContent"
import DialogContentText from "@material-ui/core/DialogContentText"
import { makeStyles } from "@material-ui/core/styles"
import { FC } from "react"
import * as TypesGen from "../../api/typesGenerated"
import { CodeBlock } from "../CodeBlock/CodeBlock"
import { Dialog, DialogActionButtons, DialogTitle } from "../Dialog/Dialog"
import { CodeExample } from "../CodeExample/CodeExample"
import { ConfirmDialog } from "../ConfirmDialog/ConfirmDialog"

export interface ResetPasswordDialogProps {
open: boolean
Expand Down Expand Up @@ -36,32 +34,35 @@ export const ResetPasswordDialog: FC<ResetPasswordDialogProps> = ({
}) => {
const styles = useStyles()

return (
<Dialog open={open} onClose={onClose}>
<DialogTitle title={Language.title} />

<DialogContent>
<DialogContentText variant="subtitle2">{Language.message(user?.username)}</DialogContentText>

<DialogContentText component="div">
<CodeBlock lines={[newPassword ?? ""]} className={styles.codeBlock} />
</DialogContentText>
</DialogContent>
const description = (
<>
<DialogContentText variant="subtitle2">{Language.message(user?.username)}</DialogContentText>
<DialogContentText component="div" className={styles.codeBlock}>
<CodeExample code={newPassword ?? ""} className={styles.codeExample} />
</DialogContentText>
</>
)

<DialogActions>
<DialogActionButtons
onCancel={onClose}
confirmText={Language.confirmText}
onConfirm={onConfirm}
confirmLoading={loading}
/>
</DialogActions>
</Dialog>
return (
<ConfirmDialog
type="info"
hideCancel={false}
open={open}
onConfirm={onConfirm}
onClose={onClose}
title={Language.title}
confirmLoading={loading}
confirmText={Language.confirmText}
description={description}
/>
)
}

const useStyles = makeStyles(() => ({
codeBlock: {
marginBottom: 0,
},
codeExample: {
minHeight: "auto",
userSelect: "all",
width: "100%",
Expand Down