diff --git a/tabby-settings/src/components/profilesSettingsTab.component.pug b/tabby-settings/src/components/profilesSettingsTab.component.pug index d883ae49..9c8144a8 100644 --- a/tabby-settings/src/components/profilesSettingsTab.component.pug +++ b/tabby-settings/src/components/profilesSettingsTab.component.pug @@ -12,7 +12,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') [(ngModel)]='config.store.terminal.profile', (ngModelChange)='config.save()', ) - optgroup([label]='"Custom Profiles"|translate', *ngIf='customProfiles?.length > 0') + optgroup([label]='"Custom Profiles"|translate', *ngIf='customProfiles?.length > 0') option( *ngFor='let profile of customProfiles', [ngValue]='profile.id' diff --git a/tabby-settings/src/components/profilesSettingsTab.component.ts b/tabby-settings/src/components/profilesSettingsTab.component.ts index e2c03392..c1f54065 100644 --- a/tabby-settings/src/components/profilesSettingsTab.component.ts +++ b/tabby-settings/src/components/profilesSettingsTab.component.ts @@ -20,6 +20,7 @@ interface CollapsableProfileGroup extends ProfileGroup { }) export class ProfilesSettingsTabComponent extends BaseComponent { builtinProfiles: PartialProfile[] = [] + profiles: PartialProfile[] = [] templateProfiles: PartialProfile[] = [] customProfiles: PartialProfile[] = [] profileGroups: PartialProfileGroup[] @@ -41,13 +42,17 @@ export class ProfilesSettingsTabComponent extends BaseComponent { } async ngOnInit (): Promise { - this.refresh() + await this.refreshProfileGroups() + await this.refreshProfiles() + this.subscribeUntilDestroyed(this.config.changed$, () => this.refreshProfileGroups()) + this.subscribeUntilDestroyed(this.config.changed$, () => this.refreshProfiles()) + } + + async refreshProfiles (): Promise { this.builtinProfiles = (await this.profilesService.getProfiles()).filter(x => x.isBuiltin) this.customProfiles = (await this.profilesService.getProfiles()).filter(x => !x.isBuiltin) this.templateProfiles = this.builtinProfiles.filter(x => x.isTemplate) this.builtinProfiles = this.builtinProfiles.filter(x => !x.isTemplate) - this.refresh() - this.subscribeUntilDestroyed(this.config.changed$, () => this.refresh()) } launchProfile (profile: PartialProfile): void { @@ -242,7 +247,7 @@ export class ProfilesSettingsTabComponent extends BaseComponent { } } - async refresh (): Promise { + async refreshProfileGroups (): Promise { const profileGroupCollapsed = JSON.parse(window.localStorage.profileGroupCollapsed ?? '{}') const groups = await this.profilesService.getProfileGroups({ includeNonUserGroup: true, includeProfiles: true }) groups.sort((a, b) => a.name.localeCompare(b.name))