Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions apps/desktop/src/lib/trpc/routers/settings/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,28 +52,33 @@ function initializeDefaultPresets() {
const row = getSettings();
if (row.terminalPresetsInitialized) return row.terminalPresets ?? [];

const presets: TerminalPreset[] = DEFAULT_PRESETS.map((p) => ({
id: crypto.randomUUID(),
...p,
}));
const existingPresets: TerminalPreset[] = row.terminalPresets ?? [];

const mergedPresets =
existingPresets.length > 0
? existingPresets
: DEFAULT_PRESETS.map((p) => ({
id: crypto.randomUUID(),
...p,
}));

localDb
.insert(settings)
.values({
id: 1,
terminalPresets: presets,
terminalPresets: mergedPresets,
terminalPresetsInitialized: true,
})
.onConflictDoUpdate({
target: settings.id,
set: {
terminalPresets: presets,
terminalPresets: mergedPresets,
terminalPresetsInitialized: true,
},
})
.run();

return presets;
return mergedPresets;
}

/** Get presets tagged with a given auto-apply field, falling back to the isDefault preset */
Expand Down
Loading