Skip to content

Commit

Permalink
✨ ApplicationAssessmentPageHeader refactor to remove useEntityModal (k…
Browse files Browse the repository at this point in the history
…onveyor#1246)

- Replace UseEntityModal with local state "standard" approach we now use
- Remove useEntityModal hook which is not used anymore.

Resolves konveyor#1234
  • Loading branch information
gildub authored and ibolton336 committed Aug 8, 2023
1 parent 5c99245 commit 29c283d
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 150 deletions.
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.

46 changes: 0 additions & 46 deletions client/src/app/shared/hooks/useEntityModal/useEntityModal.test.tsx

This file was deleted.

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

This file was deleted.

0 comments on commit 29c283d

Please sign in to comment.