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

Fix SSH key deletion error bug #914

Merged
merged 1 commit into from
Nov 17, 2024
Merged

Fix SSH key deletion error bug #914

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
27 changes: 16 additions & 11 deletions frontend/src/components/accountPage/SSHKeysTable/SSHKeysTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ export interface ISSHKeysTableProps {

const SSHKeysTable: FC<ISSHKeysTableProps> = props => {
const { sshKeys, onDeleteKey } = props;
const [showDeleteModalConfirm, setShowDeleteModalConfirm] = useState(false);
const [recordToDelete, setRecordToDelete] = useState<{
name: string;
key: string;
} | null>(null);
return (
<Table
dataSource={sshKeys}
Expand Down Expand Up @@ -47,7 +50,7 @@ const SSHKeysTable: FC<ISSHKeysTableProps> = props => {
sshKeys?.length && (
<>
<ModalAlert
headTitle={record.name}
headTitle={recordToDelete?.name}
message="Delete ssh key"
description="Do you really want to delete this key?"
type="warning"
Expand All @@ -57,7 +60,7 @@ const SSHKeysTable: FC<ISSHKeysTableProps> = props => {
shape="round"
className="mr-2 w-24"
type="primary"
onClick={() => setShowDeleteModalConfirm(false)}
onClick={() => setRecordToDelete(null)} // Close the modal without deleting
>
Close
</Button>,
Expand All @@ -66,21 +69,23 @@ const SSHKeysTable: FC<ISSHKeysTableProps> = props => {
shape="round"
className="ml-2 w-24"
type="danger"
onClick={() =>
onDeleteKey(record)
.then(() => setShowDeleteModalConfirm(false))
.catch(err => null)
}
onClick={() => {
if (recordToDelete) {
onDeleteKey(recordToDelete) // Safe to call because recordToDelete is not null
.then(() => setRecordToDelete(null)) // Close modal on success
.catch(err => null); // Handle error gracefully
}
}}
>
Delete
</Button>,
]}
show={showDeleteModalConfirm}
setShow={setShowDeleteModalConfirm}
show={!!recordToDelete} // Show the modal only when recordToDelete is not null
setShow={() => setRecordToDelete(null)} // Close the modal on outside click or Close button
/>

<DeleteOutlined
onClick={() => setShowDeleteModalConfirm(true)}
onClick={() => setRecordToDelete(record)}
style={{ color: 'red' }}
/>
</>
Expand Down
Loading