From d9e8f8e69b15642f212aed130112307e9cfdc060 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 30 Nov 2025 10:41:26 +0200 Subject: [PATCH] refactor(options): remove unnecessary ribbon activation option --- apps/client/src/widgets/ribbon/RibbonDefinition.ts | 2 +- apps/server/src/routes/api/options.ts | 1 - apps/server/src/services/options_init.ts | 1 - packages/commons/src/lib/options_interface.ts | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/client/src/widgets/ribbon/RibbonDefinition.ts b/apps/client/src/widgets/ribbon/RibbonDefinition.ts index 9f19707cb..8117c511a 100644 --- a/apps/client/src/widgets/ribbon/RibbonDefinition.ts +++ b/apps/client/src/widgets/ribbon/RibbonDefinition.ts @@ -50,7 +50,7 @@ export const RIBBON_TAB_DEFINITIONS: TabConfiguration[] = [ icon: "bx bx-calendar-edit", content: EditedNotesTab, show: ({ note }) => note?.hasOwnedLabel("dateNote"), - activate: ({ note }) => (note?.getPromotedDefinitionAttributes().length === 0 || !options.is("promotedAttributesOpenInRibbon")) && options.is("editedNotesOpenInRibbon") + activate: () => options.is("editedNotesOpenInRibbon") }, { title: t("book_properties.book_properties"), diff --git a/apps/server/src/routes/api/options.ts b/apps/server/src/routes/api/options.ts index 05f659db8..503447fa1 100644 --- a/apps/server/src/routes/api/options.ts +++ b/apps/server/src/routes/api/options.ts @@ -80,7 +80,6 @@ const ALLOWED_OPTIONS = new Set([ "disableTray", "customSearchEngineName", "customSearchEngineUrl", - "promotedAttributesOpenInRibbon", "editedNotesOpenInRibbon", "locale", "formattingLocale", diff --git a/apps/server/src/services/options_init.ts b/apps/server/src/services/options_init.ts index e170b347c..c93fbd0f0 100644 --- a/apps/server/src/services/options_init.ts +++ b/apps/server/src/services/options_init.ts @@ -129,7 +129,6 @@ const defaultOptions: DefaultOption[] = [ { name: "logRetentionDays", value: "90", isSynced: false }, // default 90 days { name: "customSearchEngineName", value: "DuckDuckGo", isSynced: true }, { name: "customSearchEngineUrl", value: "https://duckduckgo.com/?q={keyword}", isSynced: true }, - { name: "promotedAttributesOpenInRibbon", value: "true", isSynced: true }, { name: "editedNotesOpenInRibbon", value: "true", isSynced: true }, { name: "mfaEnabled", value: "false", isSynced: false }, { name: "mfaMethod", value: "totp", isSynced: false }, diff --git a/packages/commons/src/lib/options_interface.ts b/packages/commons/src/lib/options_interface.ts index 0e044d37c..bdc223c1f 100644 --- a/packages/commons/src/lib/options_interface.ts +++ b/packages/commons/src/lib/options_interface.ts @@ -121,7 +121,6 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions