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.

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

✨ Questionnaire delete confirmation #1303

Merged
merged 6 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion client/public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@
"refreshPage": "Try to refresh your page or contact your admin.",
"maxfileSize": "Max file size of 1MB exceeded. Upload a smaller file.",
"dragAndDropFile": "Drag and drop your file here or upload one.",
"uploadYamlFile": "Upload your YAML file"
"uploadYamlFile": "Upload your YAML file",
"deleteQuestionnaire": "Deleting a questionnaire will cascade into the deletion of all answered questionnaires associated to applications and/or archetypes.",
"confirmDeletion": "Confirm deletion by typing <1>{{nameToDelete}}</1> below:"
},
"title": {
"applicationAnalysis": "Application analysis",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.confirm-deletion {
margin-top: var(--pf-v5-global--spacer--xl);
}

.confirm-deletion-input {
margin-top: var(--pf-v5-global--spacer--sm);
margin-bottom: var(--pf-v5-global--spacer--sm);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
import React, { FC, useState } from "react";
import { useTranslation, Trans } from "react-i18next";
import {
ModalProps,
Button,
ButtonVariant,
Modal,
ModalVariant,
Text,
TextInput,
} from "@patternfly/react-core";

import "./ConfirmDeleteCatalog.css";

type ConfirmDeleteDialogProps = {
cancelBtnLabel?: string;
deleteBtnLabel?: string;
deleteObjectMessage: string;
isOpen: boolean;
nameToDelete?: string;
onClose: () => void;
onConfirmDelete: () => void;
titleWhat: string;
titleIconVariant?: ModalProps["titleIconVariant"];
};

const ConfirmDeleteDialog: FC<ConfirmDeleteDialogProps> = ({
cancelBtnLabel,
deleteBtnLabel,
deleteObjectMessage,
isOpen,
nameToDelete,
onClose,
onConfirmDelete,
titleWhat,
titleIconVariant = "warning",
}) => {
const { t } = useTranslation();

const [nameToDeleteInput, setNameToDeleteInput] = useState<string>("");

const isDisabled = nameToDeleteInput !== nameToDelete;

const handleClose = () => {
setNameToDeleteInput("");
onClose();
};

const confirmBtn = (
<Button
id="confirm-delete-dialog-button"
key="confirm"
aria-label="confirm"
variant={ButtonVariant.danger}
isDisabled={isDisabled}
onClick={isDisabled ? undefined : onConfirmDelete}
>
{deleteBtnLabel ?? t("actions.delete")}
</Button>
);

const cancelBtn = (
<Button
key="cancel"
id="cancel-delete-button"
aria-label="cancel"
variant={ButtonVariant.link}
onClick={handleClose}
>
{cancelBtnLabel ?? t("actions.cancel")}
</Button>
);
return (
<Modal
id="confirm-delete-dialog"
variant={ModalVariant.small}
titleIconVariant={titleIconVariant}
isOpen={isOpen}
onClose={handleClose}
aria-label="Confirm delete dialog"
actions={[confirmBtn, cancelBtn]}
title={t("dialog.title.delete", {
what: titleWhat,
})}
>
<Text component="p">{deleteObjectMessage}</Text>
<Text component="p">{t("dialog.message.delete")}</Text>
<Text component="p" className="confirm-deletion">
<Trans i18nKey="dialog.message.confirmDeletion">
Confirm deletion by typing <strong>{{ nameToDelete }}</strong> below:
</Trans>
</Text>
<TextInput
className="confirm-deletion-input"
value={nameToDeleteInput}
onChange={(_, value) => setNameToDeleteInput(value)}
/>
</Modal>
);
};

export default ConfirmDeleteDialog;
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ import {
TableRowContentWithControls,
} from "@app/components/TableControls";
import { ConditionalTooltip } from "@app/components/ConditionalTooltip";
import { ConfirmDialog } from "@app/components/ConfirmDialog";
import { useLocalTableControls } from "@app/hooks/table-controls";
import { NotificationsContext } from "@app/components/NotificationsContext";
import { getAxiosErrorMessage } from "@app/utils/utils";
import { Questionnaire } from "@app/api/models";
import { useHistory } from "react-router-dom";
import { Paths } from "@app/Paths";
import { ImportQuestionnaireForm } from "@app/pages/assessment/import-questionnaire-form/import-questionnaire-form";
import ConfirmDeleteDialog from "@app/components/ConfirmDeleteCatalog/ConfirmDeleteCatalog";

const AssessmentSettings: React.FC = () => {
const { t } = useTranslation();
Expand Down Expand Up @@ -98,7 +98,7 @@ const AssessmentSettings: React.FC = () => {
number | null
>(null);
const [questionnaireToDelete, setQuestionnaireToDelete] =
React.useState<Questionnaire | null>();
React.useState<Questionnaire>();

const tableControls = useLocalTableControls({
idProperty: "id",
Expand Down Expand Up @@ -417,24 +417,17 @@ const AssessmentSettings: React.FC = () => {
>
<Text>TODO Download YAML Template component</Text>
</Modal>
<ConfirmDialog
title={t("dialog.title.delete", {
what: t("terms.questionnaire").toLowerCase(),
})}
<ConfirmDeleteDialog
deleteObjectMessage={t("dialog.message.deleteQuestionnaire")}
isOpen={!!questionnaireToDelete}
titleIconVariant={"warning"}
message={t("dialog.message.delete")}
confirmBtnVariant={ButtonVariant.danger}
confirmBtnLabel={t("actions.delete")}
cancelBtnLabel={t("actions.cancel")}
onCancel={() => setQuestionnaireToDelete(null)}
onClose={() => setQuestionnaireToDelete(null)}
onConfirm={() => {
if (questionnaireToDelete) {
nameToDelete={questionnaireToDelete?.name}
onClose={() => setQuestionnaireToDelete(undefined)}
onConfirmDelete={() => {
questionnaireToDelete &&
deleteQuestionnaire({ questionnaire: questionnaireToDelete });
setQuestionnaireToDelete(null);
}
setQuestionnaireToDelete(undefined);
}}
titleWhat={t("terms.questionnaire").toLowerCase()}
/>
</>
);
Expand Down