Skip to content

fix(ingestV2): secret deletion always removes last secret instead of … #17237

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
Itsdarkhere wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(ingestV2): secret deletion always removes last secret instead of … #17237

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
52 changes: 25 additions & 27 deletions datahub-web-react/src/app/ingestV2/secret/SecretsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export const SecretsList = ({ showCreateModal: isCreatingSecret, setShowCreateMo
const start = (page - 1) * pageSize;

const [editSecret, setEditSecret] = useState<SecretBuilderState | undefined>(undefined);
const [showConfirmDelete, setShowConfirmDelete] = useState<boolean>(false);
const [deletingSecretUrn, setDeletingSecretUrn] = useState<string | null>(null);

const [deleteSecretMutation] = useDeleteSecretMutation();
const [createSecretMutation] = useCreateSecretMutation();
Expand Down Expand Up @@ -141,7 +141,7 @@ export const SecretsList = ({ showCreateModal: isCreatingSecret, setShowCreateMo
message.error({ content: `Failed to remove secret: \n ${e.message || ''}`, duration: 3 });
}
});
setShowConfirmDelete(false);
setDeletingSecretUrn(null);
refetch();
};

Expand Down Expand Up @@ -233,7 +233,7 @@ export const SecretsList = ({ showCreateModal: isCreatingSecret, setShowCreateMo
};

const handleDeleteClose = () => {
setShowConfirmDelete(false);
setDeletingSecretUrn(null);
};

const onEditSecret = (urnData: any) => {
Expand Down Expand Up @@ -289,30 +289,21 @@ export const SecretsList = ({ showCreateModal: isCreatingSecret, setShowCreateMo
title: '',
key: 'actions',
render: (record: TableDataType) => (
<>
<ButtonsContainer>
<button type="button" onClick={() => onEditSecret(record)} aria-label="Edit secret">
<Icon icon={PencilSimpleLine} />
</button>
<button
type="button"
className="delete-action"
onClick={() => setShowConfirmDelete(true)}
aria-label="Delete secret"
data-test-id="delete-secret-action"
data-icon="delete"
>
<Icon icon={Trash} color="red" />
</button>
</ButtonsContainer>
<ConfirmationModal
isOpen={showConfirmDelete}
modalTitle="Confirm Secret Removal"
modalText="Are you sure you want to remove this secret? Sources that use it may no longer work as expected."
handleConfirm={() => deleteSecret(record.urn)}
handleClose={handleDeleteClose}
/>
</>
<ButtonsContainer>
<button type="button" onClick={() => onEditSecret(record)} aria-label="Edit secret">
<Icon icon={PencilSimpleLine} />
</button>
<button
type="button"
className="delete-action"
onClick={() => setDeletingSecretUrn(record.urn)}
aria-label="Delete secret"
data-test-id="delete-secret-action"
data-icon="delete"
>
<Icon icon={Trash} color="red" />
</button>
</ButtonsContainer>
),
width: '100px',
},
Expand Down Expand Up @@ -371,6 +362,13 @@ export const SecretsList = ({ showCreateModal: isCreatingSecret, setShowCreateMo
onSubmit={onSubmit}
onCancel={onCancel}
/>
<ConfirmationModal
isOpen={deletingSecretUrn !== null}
modalTitle="Confirm Secret Removal"
modalText="Are you sure you want to remove this secret? Sources that use it may no longer work as expected."
handleConfirm={() => deletingSecretUrn && deleteSecret(deletingSecretUrn)}
handleClose={handleDeleteClose}
/>
</>
);
};
Loading