Skip to content

fix(ui): update delete API key confirmation modal #1106

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

Open
rachittaneja56-max wants to merge 1 commit into
base: stage
Choose a base branch
from
Open

fix(ui): update delete API key confirmation modal #1106

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
8 changes: 8 additions & 0 deletions packages/ui/__tests__/components/ConfirmationModal.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ const defaultProps = {
};

describe("ConfirmationModal Component", () => {
it("renders the API-key layout only when the API-key variant is selected", () => {
render(<ConfirmationModal {...defaultProps} variant="api-key" />);

expect(
screen.getByTestId("api-key-confirmation-layout")
).toBeInTheDocument();
});

it("renders heading, description and buttons", () => {
render(<ConfirmationModal {...defaultProps} />);

Expand Down
93 changes: 71 additions & 22 deletions packages/ui/src/components/confirm/ConfirmationModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import Button from "../common/button/Button.jsx";
import styles from "./ConfirmationModal.module.css";
import PropTypes from "prop-types";
import { CONFIRMATION_MODAL } from "../../utils/Constants.js";
import { AlertTriangle } from "lucide-react";

function ConfirmationModal({
isOpen,
Expand All @@ -15,36 +16,83 @@ function ConfirmationModal({
customHeading,
customDescription,
customWidth,
variant = "default",
}) {
const handleSubmit = (e) => {
e.preventDefault();
onConfirm();
};

const isApiKeyVariant = variant === "api-key";

return (
<Modal onClose={onClose} isOpen={isOpen} customWidth={customWidth}>
<form onSubmit={handleSubmit}>
<h2 className={styles["confirm-modal-heading"]}>
{customHeading || CONFIRMATION_MODAL.heading}
</h2>
<div className={styles["confirm-modal-description"]}>
{customDescription || CONFIRMATION_MODAL.description}
</div>
{children}
<div className={styles["confirm-modal-button-wrapper"]}>
<Button type="button" variant="secondary" onClick={onClose}>
{CONFIRMATION_MODAL.secondaryButtonText}
</Button>
<Button
variant="danger"
type="submit"
disabled={isConfirmDisabled}
isLoading={isConfirmLoading}
>
{confirmButtonContent || CONFIRMATION_MODAL.primaryButtonText}
</Button>
<Modal
onClose={onClose}
isOpen={isOpen}
customWidth={customWidth}
customClass={isApiKeyVariant ? styles["confirm-modal"] : undefined}
>
{isApiKeyVariant ? (
<div
className={styles["confirm-wrapper"]}
data-testid="api-key-confirmation-layout"
>
<div className={styles.sidebar}>
<div className={styles["sidebar-content"]}>
<AlertTriangle
className={styles["sidebar-icon"]}
aria-hidden="true"
/>
<h2 className={styles["confirm-modal-heading"]}>
{customHeading || CONFIRMATION_MODAL.heading}
</h2>
</div>
</div>

<form onSubmit={handleSubmit} className={styles["form-section"]}>
<div className={styles["confirm-modal-description"]}>
{customDescription || CONFIRMATION_MODAL.description}
</div>
{children}
<div className={styles["confirm-modal-button-wrapper"]}>
<Button type="button" variant="secondary" onClick={onClose}>
{CONFIRMATION_MODAL.secondaryButtonText}
</Button>
<Button
variant="danger"
type="submit"
disabled={isConfirmDisabled}
isLoading={isConfirmLoading}
>
{confirmButtonContent || CONFIRMATION_MODAL.primaryButtonText}
</Button>
</div>
</form>
</div>
</form>
) : (
<form onSubmit={handleSubmit}>
<h2 className={styles["confirm-modal-heading"]}>
{customHeading || CONFIRMATION_MODAL.heading}
</h2>
<div className={styles["confirm-modal-description"]}>
{customDescription || CONFIRMATION_MODAL.description}
</div>
{children}
<div className={styles["confirm-modal-button-wrapper"]}>
<Button type="button" variant="secondary" onClick={onClose}>
{CONFIRMATION_MODAL.secondaryButtonText}
</Button>
<Button
variant="danger"
type="submit"
disabled={isConfirmDisabled}
isLoading={isConfirmLoading}
>
{confirmButtonContent || CONFIRMATION_MODAL.primaryButtonText}
</Button>
</div>
</form>
)}
</Modal>
);
}
Expand All @@ -60,6 +108,7 @@ ConfirmationModal.propTypes = {
customHeading: PropTypes.node,
customDescription: PropTypes.node,
customWidth: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
variant: PropTypes.oneOf(["default", "api-key"]),
};

export default ConfirmationModal;
94 changes: 94 additions & 0 deletions packages/ui/src/components/confirm/ConfirmationModal.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,97 @@
gap: 0.75rem;
margin-top: 1rem;
}

/* API-key delete layout */
.confirm-modal {
width: 660px;
max-width: 95vw;
padding: 0;
overflow-y: auto;
}

.confirm-wrapper {
display: flex;
min-height: 350px;
}

.sidebar {
flex: 0 0 40%;
padding: 2rem 1.5rem;
display: flex;
flex-direction: column;
justify-content: center;
border-right: 1px solid var(--border-color);
border-radius: 12px 0 0 12px;
background-color: var(--white);
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='40' height='40'%3E%3Cpath d='M0 0h40v40H0z' fill='none'/%3E%3Cpath d='M40 0v40M0 0h40' stroke='%23cbd5e1' stroke-width='1'/%3E%3C/svg%3E");
background-size: 40px 40px;
}

[data-theme="dark"] .sidebar {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='40' height='40'%3E%3Cpath d='M0 0h40v40H0z' fill='none'/%3E%3Cpath d='M40 0v40M0 0h40' stroke='%232d3748' stroke-width='0.5'/%3E%3C/svg%3E");
}

.sidebar-content {
display: flex;
flex-direction: column;
align-items: center;
gap: 0.75rem;
}

.sidebar-icon {
color: var(--primary);
width: 36px;
height: 36px;
}

.sidebar .confirm-modal-heading {
font-size: 1.75rem;
font-weight: 700;
margin: 0;
}

.form-section {
flex: 1;
padding: 2rem;
display: flex;
flex-direction: column;
justify-content: center;
gap: 0.25rem;
}

.form-section .confirm-modal-button-wrapper {
gap: 1rem;
margin-top: 1.5rem;
}

.form-section .confirm-modal-button-wrapper button {
flex: 1;
}

@media (max-width: 600px) {
.confirm-modal {
width: 95vw;
}

.confirm-wrapper {
flex-direction: column;
min-height: auto;
}

.sidebar {
flex: none;
border-right: none;
border-bottom: 1px solid var(--border-color);
border-radius: 12px 12px 0 0;
padding: 1.5rem;
}

.confirm-modal .confirm-modal-heading {
font-size: 1.35rem;
}

.form-section {
padding: 1.5rem 1.5rem 2rem 1.5rem;
}
}
1 change: 1 addition & 0 deletions packages/ui/src/page/dashboard/Dashboard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ function Dashboard() {
isOpen={showModal}
onClose={handleModalClose}
onConfirm={handleDeleteKey}
variant="api-key"
isConfirmDisabled={confirmKeyName !== selectedKey?.key_description}
isConfirmLoading={isDeleting}
confirmButtonContent={BUTTON_TEXT.delete}
Expand Down
Loading