Eugeny/tabby
1
1
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2024-11-29 09:18:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9264 from Clem-Fern/fix#9262

Browse Source
This commit is contained in:
Eugene 2023-12-01 14:44:44 +01:00 committed by GitHub
commit 9f6263f3d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ 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 { firstBy } from 'thenby'
import { ConfigService, FileProvidersService, Platform, HostAppService, PromptModalComponent, PartialProfile } from 'tabby-core' import { FileProvidersService, Platform, HostAppService, PromptModalComponent, PartialProfile, ProfilesService } from 'tabby-core'
import { LoginScriptsSettingsComponent } from 'tabby-terminal' import { LoginScriptsSettingsComponent } from 'tabby-terminal'
import { PasswordStorageService } from '../services/passwordStorage.service' import { PasswordStorageService } from '../services/passwordStorage.service'
import { ForwardedPortConfig, SSHAlgorithmType, SSHProfile } from '../api' import { ForwardedPortConfig, SSHAlgorithmType, SSHProfile } from '../api'
@ -27,14 +27,14 @@ export class SSHProfileSettingsComponent {
constructor ( constructor (
public hostApp: HostAppService, public hostApp: HostAppService,
private config: ConfigService, private profilesService: ProfilesService,
private passwordStorage: PasswordStorageService, private passwordStorage: PasswordStorageService,
private ngbModal: NgbModal, private ngbModal: NgbModal,
private fileProviders: FileProvidersService, private fileProviders: FileProvidersService,
) { } ) { }
async ngOnInit () { async ngOnInit () {
this.jumpHosts = this.config.store.profiles.filter(x => x.type === 'ssh' && x !== this.profile) this.jumpHosts = (await this.profilesService.getProfiles({ includeBuiltin: false })).filter(x => x.type === 'ssh' && x !== this.profile)
this.jumpHosts.sort(firstBy(x => this.getJumpHostLabel(x))) this.jumpHosts.sort(firstBy(x => this.getJumpHostLabel(x)))
for (const k of Object.values(SSHAlgorithmType)) { for (const k of Object.values(SSHAlgorithmType)) {
@ -67,7 +67,7 @@ export class SSHProfileSettingsComponent {
} }
getJumpHostLabel (p: PartialProfile<SSHProfile>) { getJumpHostLabel (p: PartialProfile<SSHProfile>) {
return p.group ? `${p.group} / ${p.name}` : p.name return p.group ? `${this.profilesService.resolveProfileGroupName(p.group)} / ${p.name}` : p.name
} }
async setPassword () { async setPassword () {