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

✨ ApplicationAssessmentPageHeader refactor to remove useEntityModal #1246

Merged
merged 4 commits into from
Aug 8, 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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { useTranslation } from "react-i18next";
import { Button, ButtonVariant, Modal, Text } from "@patternfly/react-core";

import { ConfirmDialog, PageHeader } from "@app/shared/components";
import { useEntityModal } from "@app/shared/hooks";
import { ApplicationDependenciesFormContainer } from "@app/shared/containers";
import { Paths } from "@app/Paths";
import { Application, Assessment } from "@app/api/models";
Expand Down Expand Up @@ -33,13 +32,8 @@ export const ApplicationAssessmentPageHeader: React.FC<
}
}, [assessment]);

// Dependencies modal
const {
isOpen: isDependenciesModalOpen,
data: applicationToManageDependencies,
update: openDependenciesModal,
close: closeDependenciesModal,
} = useEntityModal<Application>();
const [applicationDependenciesToManage, setApplicationDependenciesToManage] =
React.useState<Application | null>(null);

return (
<>
Expand All @@ -61,7 +55,9 @@ export const ApplicationAssessmentPageHeader: React.FC<
btnActions={
<>
{application && (
<Button onClick={() => openDependenciesModal(application)}>
<Button
onClick={() => setApplicationDependenciesToManage(application)}
>
{t("actions.manageDependencies")}
</Button>
)}
Expand All @@ -71,17 +67,17 @@ export const ApplicationAssessmentPageHeader: React.FC<
/>

<Modal
isOpen={isDependenciesModalOpen}
isOpen={applicationDependenciesToManage !== null}
variant="medium"
title={t("composed.manageDependenciesFor", {
what: applicationToManageDependencies?.name,
what: applicationDependenciesToManage?.name,
})}
onClose={closeDependenciesModal}
onClose={() => setApplicationDependenciesToManage(null)}
>
{applicationToManageDependencies && (
{applicationDependenciesToManage && (
<ApplicationDependenciesFormContainer
application={applicationToManageDependencies}
onCancel={closeDependenciesModal}
application={applicationDependenciesToManage}
onCancel={() => setApplicationDependenciesToManage(null)}
/>
)}
</Modal>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
} from "@patternfly/react-table";
import TagIcon from "@patternfly/react-icons/dist/esm/icons/tag-icon";
import PencilAltIcon from "@patternfly/react-icons/dist/esm/icons/pencil-alt-icon";

import keycloak from "@app/keycloak";
import {
AppPlaceholder,
Expand Down
1 change: 0 additions & 1 deletion client/src/app/shared/hooks/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export { useEntityModal } from "./useEntityModal";
export { useAssessApplication } from "./useAssessApplication";
1 change: 0 additions & 1 deletion client/src/app/shared/hooks/useEntityModal/index.ts

This file was deleted.

This file was deleted.

86 changes: 0 additions & 86 deletions client/src/app/shared/hooks/useEntityModal/useEntityModal.ts

This file was deleted.