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

Eugeny · Dec 1, 2023 · 9f6263f · 9f6263f
2 parents 38c9714 + f80db81
commit 9f6263f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/tabby-ssh/src/components/sshProfileSettings.component.ts b/tabby-ssh/src/components/sshProfileSettings.component.ts
@@ -3,7 +3,7 @@ import { Component, ViewChild } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 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 { PasswordStorageService } from '../services/passwordStorage.service'
 import { ForwardedPortConfig, SSHAlgorithmType, SSHProfile } from '../api'
@@ -27,14 +27,14 @@ export class SSHProfileSettingsComponent {
 
     constructor (
         public hostApp: HostAppService,
-        private config: ConfigService,
+        private profilesService: ProfilesService,
         private passwordStorage: PasswordStorageService,
         private ngbModal: NgbModal,
         private fileProviders: FileProvidersService,
     ) { }
 
     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)))
 
         for (const k of Object.values(SSHAlgorithmType)) {
@@ -67,7 +67,7 @@ export class SSHProfileSettingsComponent {
     }
 
     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 () {