GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-27 14:59:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

sort hosts in the jump hosts list

Browse Source
This commit is contained in:
Eugene Pankov 2022-03-16 10:34:40 +01:00
parent 7e876afb3b
commit 9bc6831f40
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -46,6 +46,7 @@
"graceful-fs": "^4.2.9", "graceful-fs": "^4.2.9",
"html-loader": "3.1.0", "html-loader": "3.1.0",
"json-loader": "^0.5.7", "json-loader": "^0.5.7",
"thenby": "^1.3.4",
"lru-cache": "^6.0.0", "lru-cache": "^6.0.0",
"macos-release": "^3.0.1", "macos-release": "^3.0.1",
"ngx-sortablejs": "^11.1.0", "ngx-sortablejs": "^11.1.0",

1
tabby-core/package.json
View File

@ -27,7 +27,6 @@
"ngx-perfect-scrollbar": "^10.1.0", "ngx-perfect-scrollbar": "^10.1.0",
"ngx-translate-messageformat-compiler": "^4.11.0", "ngx-translate-messageformat-compiler": "^4.11.0",
"readable-stream": "3.6.0", "readable-stream": "3.6.0",
"thenby": "^1.3.4",
"uuid": "^8.0.0" "uuid": "^8.0.0"
}, },
"peerDependencies": { "peerDependencies": {

5
tabby-core/yarn.lock
View File

@ -161,11 +161,6 @@ string_decoder@^1.1.1:
dependencies: dependencies:
safe-buffer "~5.2.0" safe-buffer "~5.2.0"
thenby@^1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/thenby/-/thenby-1.3.4.tgz#81581f6e1bb324c6dedeae9bfc28e59b1a2201cc"
integrity sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==
tslib@^1.10.0: tslib@^1.10.0:
version "1.14.1" version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"

2
tabby-ssh/src/components/sshProfileSettings.component.pug
View File

@ -61,7 +61,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav')
label(translate) Jump host label(translate) Jump host
select.form-control([(ngModel)]='profile.options.jumpHost') select.form-control([(ngModel)]='profile.options.jumpHost')
option([ngValue]='null', translate) Select option([ngValue]='null', translate) Select
option([ngValue]='x.id', *ngFor='let x of jumpHosts') {{x.name}} option([ngValue]='x.id', *ngFor='let x of jumpHosts') {{getJumpHostLabel(x)}}
.d-flex.w-100(*ngIf='connectionMode === "socksProxy"') .d-flex.w-100(*ngIf='connectionMode === "socksProxy"')

7
tabby-ssh/src/components/sshProfileSettings.component.ts
View File

@ -1,6 +1,7 @@
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
import { Component, ViewChild } from '@angular/core' import { Component, ViewChild } from '@angular/core'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { firstBy } from 'thenby'
import { ConfigService, FileProvidersService, Platform, HostAppService, PromptModalComponent, PartialProfile } from 'tabby-core' import { ConfigService, FileProvidersService, Platform, HostAppService, PromptModalComponent, PartialProfile } from 'tabby-core'
import { LoginScriptsSettingsComponent } from 'tabby-terminal' import { LoginScriptsSettingsComponent } from 'tabby-terminal'
@ -34,6 +35,8 @@ export class SSHProfileSettingsComponent {
async ngOnInit () { async ngOnInit () {
this.jumpHosts = this.config.store.profiles.filter(x => x.type === 'ssh' && x !== this.profile) this.jumpHosts = this.config.store.profiles.filter(x => x.type === 'ssh' && x !== this.profile)
this.jumpHosts.sort(firstBy(x => this.getJumpHostLabel(x)))
for (const k of Object.values(SSHAlgorithmType)) { for (const k of Object.values(SSHAlgorithmType)) {
this.algorithms[k] = {} this.algorithms[k] = {}
for (const alg of this.profile.options.algorithms?.[k] ?? []) { for (const alg of this.profile.options.algorithms?.[k] ?? []) {
@ -63,6 +66,10 @@ export class SSHProfileSettingsComponent {
} }
} }
getJumpHostLabel (p: PartialProfile<SSHProfile>) {
return p.group ? `${p.group} / ${p.name}` : p.name
}
async setPassword () { async setPassword () {
const modal = this.ngbModal.open(PromptModalComponent) const modal = this.ngbModal.open(PromptModalComponent)
modal.componentInstance.prompt = `Password for ${this.profile.options.user}@${this.profile.options.host}` modal.componentInstance.prompt = `Password for ${this.profile.options.user}@${this.profile.options.host}`

5
yarn.lock
View File

@ -8143,6 +8143,11 @@ text-table@^0.2.0, text-table@~0.2.0:
resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
thenby@^1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/thenby/-/thenby-1.3.4.tgz#81581f6e1bb324c6dedeae9bfc28e59b1a2201cc"
integrity sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==
throttleit@0.0.2: throttleit@0.0.2:
version "0.0.2" version "0.0.2"
resolved "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz" resolved "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"