From e813133f127497c659a80808e50d7cbc780ddf52 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Sun, 4 Jun 2023 20:55:44 +0200 Subject: [PATCH] fixed #8440 - multiple separate "ungrouped" groups --- tabby-core/src/services/profiles.service.ts | 2 ++ .../src/components/profilesSettingsTab.component.ts | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tabby-core/src/services/profiles.service.ts b/tabby-core/src/services/profiles.service.ts index ef26e6835f..25655d22e9 100644 --- a/tabby-core/src/services/profiles.service.ts +++ b/tabby-core/src/services/profiles.service.ts @@ -96,6 +96,8 @@ export class ProfilesService { const freeInputEquivalent = provider?.intoQuickConnectString(fullProfile) ?? undefined return { ...profile, + // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing + group: profile.group || '', freeInputEquivalent, description: provider?.getDescription(fullProfile), } diff --git a/tabby-settings/src/components/profilesSettingsTab.component.ts b/tabby-settings/src/components/profilesSettingsTab.component.ts index 06dee54f7e..4c1c0434ec 100644 --- a/tabby-settings/src/components/profilesSettingsTab.component.ts +++ b/tabby-settings/src/components/profilesSettingsTab.component.ts @@ -163,10 +163,13 @@ export class ProfilesSettingsTabComponent extends BaseComponent { const profileGroupCollapsed = JSON.parse(window.localStorage.profileGroupCollapsed ?? '{}') for (const profile of this.profiles) { - let group = this.profileGroups.find(x => x.name === profile.group) + // Group null, undefined and empty together + // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing + let group = this.profileGroups.find(x => x.name === (profile.group || '')) if (!group) { group = { - name: profile.group, + // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing + name: profile.group || '', profiles: [], editable: true, collapsed: profileGroupCollapsed[profile.group ?? ''] ?? false,