GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-07-04 18:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed #8440 - multiple separate "ungrouped" groups

Browse Source
This commit is contained in:
Eugene Pankov 2023-06-04 20:55:44 +02:00
parent 86cff8d98a
commit e813133f12
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tabby-core/src/services/profiles.service.ts
View File

@ -96,6 +96,8 @@ export class ProfilesService {
const freeInputEquivalent = provider?.intoQuickConnectString(fullProfile) ?? undefined const freeInputEquivalent = provider?.intoQuickConnectString(fullProfile) ?? undefined
return { return {
...profile, ...profile,
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
group: profile.group || '',
freeInputEquivalent, freeInputEquivalent,
description: provider?.getDescription(fullProfile), description: provider?.getDescription(fullProfile),
} }

7
tabby-settings/src/components/profilesSettingsTab.component.ts
View File

@ -163,10 +163,13 @@ export class ProfilesSettingsTabComponent extends BaseComponent {
const profileGroupCollapsed = JSON.parse(window.localStorage.profileGroupCollapsed ?? '{}') const profileGroupCollapsed = JSON.parse(window.localStorage.profileGroupCollapsed ?? '{}')
for (const profile of this.profiles) { 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) { if (!group) {
group = { group = {
name: profile.group, // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
name: profile.group || '',
profiles: [], profiles: [],
editable: true, editable: true,
collapsed: profileGroupCollapsed[profile.group ?? ''] ?? false, collapsed: profileGroupCollapsed[profile.group ?? ''] ?? false,