Skip to content

feat(terminal): share connection menu and add node quick connect #13787

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

feat(terminal): share connection menu and add node quick connect #13787

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions frontend/src/api/modules/group.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,13 @@ export const deleteGroup = (id: number) => {
return http.post(`/core/groups/del`, { id: id });
};

export const getAgentGroupList = (type: string) => {
return http.post<Array<Group.GroupInfo>>(`/groups/search`, { type: type });
export const getAgentGroupList = (type: string, nodeName?: string) => {
return http.post<Array<Group.GroupInfo>>(
`/groups/search`,
{ type: type },
undefined,
nodeName ? { CurrentNode: nodeName } : undefined,
);
};
export const createAgentGroup = (params: Group.GroupCreate) => {
return http.post<Group.GroupCreate>(`/groups`, params);
Expand Down
24 changes: 16 additions & 8 deletions frontend/src/api/modules/terminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,24 @@ export const getHostTree = (params: Host.ReqSearch) => {
export const updateLocalConn = (param: { withReset: boolean; defaultConn: string }) => {
return http.post(`/settings/ssh/default`, param);
};
export const addHost = (params: Host.HostOperate) => {
export const addHost = (params: Host.HostOperate, nodeName?: string) => {
let request = deepCopy(params) as Host.HostOperate;
encodeBase64Fields(request, ['password', 'privateKey']);
if (params.isLocal) {
return http.post(`/settings/ssh`, request);
return http.post(`/settings/ssh`, request, undefined, nodeName ? { CurrentNode: nodeName } : undefined);
}
return http.postLocalNode<Host.HostOperate>(`/hosts`, request);
};
export const testByInfo = (params: Host.HostConnTest) => {
export const testByInfo = (params: Host.HostConnTest | Host.HostOperate, nodeName?: string) => {
let request = deepCopy(params) as Host.HostOperate;
encodeBase64Fields(request, ['password', 'privateKey']);
if (params.isLocal) {
return http.post<boolean>(`/settings/ssh/check/info`, request);
return http.post<boolean>(
`/settings/ssh/check/info`,
request,
undefined,
nodeName ? { CurrentNode: nodeName } : undefined,
);
}
return http.postLocalNode<boolean>(`/hosts/test/byinfo`, request);
};
Expand All @@ -47,15 +52,18 @@ export const deleteHost = (params: { ids: number[] }) => {
return http.postLocalNode(`/hosts/del`, params);
};

// agent
export const loadLocalConn = () => {
return http.get<Host.HostConnTest>(`/settings/ssh/conn`);
};
export const testLocalConn = () => {
return http.post<boolean>(`/settings/ssh/check`);
export const testLocalConn = (nodeName?: string) => {
return http.post<boolean>(
`/settings/ssh/check`,
undefined,
undefined,
nodeName ? { CurrentNode: nodeName } : undefined,
);
};

// live web terminal sessions of the caller; ssh ones live on the local node, local shells on the operated node
export const searchTerminalSessions = (localNode: boolean) => {
return localNode
? http.postLocalNode<TerminalSession[]>(`/hosts/terminal/sessions/search`)
Expand Down
Loading
Loading