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

Disconnect Connection Button #1858

Merged
merged 1 commit into from
Jan 28, 2025
Merged
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
27 changes: 27 additions & 0 deletions frontend/app/modals/conntypeahead.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,31 @@ function getS3Suggestions(
return s3Suggestions;
}

function getDisconnectItem(
connection: string,
connStatusMap: Map<string, ConnStatus>
): SuggestionConnectionItem | null {
if (!connection) {
return null;
}
const connStatus = connStatusMap.get(connection);
if (!connStatus || connStatus.status != "connected") {
return null;
}
const disconnectSuggestionItem: SuggestionConnectionItem = {
status: "connected",
icon: "xmark",
iconColor: "var(--grey-text-color)",
label: `Disconnect ${connStatus.connection}`,
value: "",
onSelect: async (_: string) => {
const prtn = RpcApi.ConnDisconnectCommand(TabRpcClient, connection, { timeout: 60000 });
prtn.catch((e) => console.log("error disconnecting", connStatus.connection, e));
},
};
return disconnectSuggestionItem;
}

function getConnectionsEditItem(
changeConnModalAtom: jotai.PrimitiveAtom<boolean>,
connSelected: string
Expand Down Expand Up @@ -420,6 +445,7 @@ const ChangeConnectionBlockModal = React.memo(
filterOutNowsh
);
const connectionsEditItem = getConnectionsEditItem(changeConnModalAtom, connSelected);
const disconnectItem = getDisconnectItem(connection, connStatusMap);
const newConnectionSuggestionItem = getNewConnectionSuggestionItem(
connSelected,
localName,
Expand All @@ -435,6 +461,7 @@ const ChangeConnectionBlockModal = React.memo(
...(localSuggestions ? [localSuggestions] : []),
...(remoteSuggestions ? [remoteSuggestions] : []),
...(s3Suggestions ? [s3Suggestions] : []),
...(disconnectItem ? [disconnectItem] : []),
...(connectionsEditItem ? [connectionsEditItem] : []),
...(newConnectionSuggestionItem ? [newConnectionSuggestionItem] : []),
];
Expand Down
Loading