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.

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

Ability to delete integrations #5143

Merged
merged 7 commits into from
Aug 13, 2024
Merged

Ability to delete integrations #5143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc1c6fc
start delete button
Kelsey-Ethyca Jul 19, 2024
3fa70dc
Merge branch 'main' of https://github.com/ethyca/fides into PROD-2373…
Kelsey-Ethyca Jul 22, 2024
22da695
Merge branch 'main' of https://github.com/ethyca/fides into PROD-2373…
Kelsey-Ethyca Jul 29, 2024
641960d
use connection manager delete integration modal
Kelsey-Ethyca Jul 31, 2024
98ae290
lint and format
Kelsey-Ethyca Jul 31, 2024
c579766
Merge branch 'main' into PROD-2373-ability-to-delete-integrations
Kelsey-Ethyca Jul 31, 2024
882d550
remove console log
Kelsey-Ethyca Jul 31, 2024
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
2 changes: 1 addition & 1 deletion clients/admin-ui/src/features/datastore-connections/ConnectionMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const ConnectionMenu = ({
name={name}
isSwitch={false}
/>
<DeleteConnectionModal connection_key={connection_key} />
<DeleteConnectionModal showMenu connection_key={connection_key} />
</MenuList>
</Portal>
</Menu>
Expand Down
35 changes: 25 additions & 10 deletions clients/admin-ui/src/features/datastore-connections/DeleteConnectionModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,33 @@ import {
Text,
useDisclosure,
} from "fidesui";
import { useRouter } from "next/router";
import React from "react";

import { INTEGRATION_MANAGEMENT_ROUTE } from "~/features/common/nav/v2/routes";

import { useDeleteDatastoreConnectionMutation } from "./datastore-connection.slice";

type DataConnectionProps = {
connection_key: string;
showMenu: boolean;
};

const DeleteConnectionModal = ({ connection_key }: DataConnectionProps) => {
const DeleteConnectionModal = ({
connection_key,
showMenu,
}: DataConnectionProps) => {
const { isOpen, onOpen, onClose } = useDisclosure();
const [deleteConnection, deleteConnectionResult] =
useDeleteDatastoreConnectionMutation();
const router = useRouter();

const handleDeleteConnection = () => {
if (connection_key) {
deleteConnection(connection_key);
if (!showMenu) {
router.push(INTEGRATION_MANAGEMENT_ROUTE);
}
}
};

Expand All @@ -39,16 +50,20 @@ const DeleteConnectionModal = ({ connection_key }: DataConnectionProps) => {

return (
<>
<MenuItem
_focus={{ color: "complimentary.500", bg: "gray.100" }}
onClick={onOpen}
>
<Text fontSize="sm">Delete</Text>
</MenuItem>
{showMenu && (
<MenuItem
_focus={{ color: "complimentary.500", bg: "gray.100" }}
onClick={onOpen}
>
<Text fontSize="sm">Delete</Text>
</MenuItem>
)}
{!showMenu && <Button onClick={onOpen}>Delete integration</Button>}

<Modal isCentered isOpen={isOpen} onClose={closeIfComplete}>
<ModalOverlay />
<ModalContent>
<ModalHeader>Delete Connection</ModalHeader>
<ModalHeader>Delete integration</ModalHeader>
<ModalCloseButton />
<ModalBody pb={6}>
<Stack direction="column" spacing="15px">
Expand All @@ -58,7 +73,7 @@ const DeleteConnectionModal = ({ connection_key }: DataConnectionProps) => {
fontWeight="sm"
lineHeight="20px"
>
Deleting a connection may impact any privacy request that is
Deleting an integration may impact any privacy request that is
currently in progress. Do you wish to proceed?
</Text>
</Stack>
Expand Down Expand Up @@ -93,7 +108,7 @@ const DeleteConnectionModal = ({ connection_key }: DataConnectionProps) => {
color: "gray.600",
}}
>
Delete connection
Delete integration
</Button>
</ModalFooter>
</ModalContent>
Expand Down
9 changes: 9 additions & 0 deletions clients/admin-ui/src/features/integrations/IntegrationBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { ReactNode } from "react";

import Tag from "~/features/common/Tag";
import ConnectionTypeLogo from "~/features/datastore-connections/ConnectionTypeLogo";
import DeleteConnectionModal from "~/features/datastore-connections/DeleteConnectionModal";
import useTestConnection from "~/features/datastore-connections/useTestConnection";
import getIntegrationTypeInfo from "~/features/integrations/add-integration/allIntegrationTypes";
import ConnectionStatusNotice from "~/features/integrations/ConnectionStatusNotice";
Expand All @@ -12,12 +13,14 @@ const IntegrationBox = ({
integration,
showTestNotice,
otherButtons,
showDeleteButton,
configureButtonLabel = "Configure",
onConfigureClick,
}: {
integration?: ConnectionConfigurationResponse;
showTestNotice?: boolean;
otherButtons?: ReactNode;
showDeleteButton?: boolean;
configureButtonLabel?: string;
onConfigureClick?: () => void;
}) => {
Expand Down Expand Up @@ -53,6 +56,12 @@ const IntegrationBox = ({
)}
</Flex>
<ButtonGroup size="sm" variant="outline">
{showDeleteButton && integration && (
<DeleteConnectionModal
showMenu={false}
connection_key={integration.key}
/>
)}
{showTestNotice && (
<Button
onClick={testConnection}
Expand Down
2 changes: 1 addition & 1 deletion clients/admin-ui/src/pages/integrations/[id].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const IntegrationDetailView: NextPage = () => {
},
]}
>
<IntegrationBox integration={connection} />
<IntegrationBox integration={connection} showDeleteButton />
{integrationIsLoading ? (
<Spinner />
) : (
Expand Down
Loading