From 73c9c05c32b6b8ed6ec077cb56ebeb07bbd0622c Mon Sep 17 00:00:00 2001 From: Ivan Kalashnikov Date: Sun, 18 Jan 2026 21:53:16 +0700 Subject: [PATCH] refactor: rename task settings field --- packages/shared-schema/src/migrations/index.ts | 4 ++-- src/app/features/config/default-global-config.const.ts | 4 ++-- .../features/config/form-cfgs/tasks-settings-form.const.ts | 4 ++-- src/app/features/config/global-config.model.ts | 4 ++-- .../task-context-menu-inner.component.ts | 6 +++--- src/app/features/tasks/task/task.component.ts | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/shared-schema/src/migrations/index.ts b/packages/shared-schema/src/migrations/index.ts index cee4a7796..81824acfd 100644 --- a/packages/shared-schema/src/migrations/index.ts +++ b/packages/shared-schema/src/migrations/index.ts @@ -41,10 +41,10 @@ export const MIGRATIONS: SchemaMigration[] = [ const migratedTasksConfig = { ...state.tasks, - isConfirmBeforeTaskDelete: state.misc.isConfirmBeforeTaskDelete ?? false, + isConfirmBeforeDelete: state.misc.isConfirmBeforeTaskDelete ?? false, isAutoAddWorkedOnToToday: state.misc.isAutoAddWorkedOnToToday ?? false, isAutoMarkParentAsDone: state.misc.isAutMarkParentAsDone ?? false, - isTrayShowCurrentTask: state.misc.isTrayShowCurrentTask ?? false, + isTrayShowCurrent: state.misc.isTrayShowCurrentTask ?? false, isMarkdownFormattingInNotesEnabled: !(state.misc.isTurnOffMarkdown ?? false), defaultProjectId: state.misc.defaultProjectId ?? null, notesTemplate: state.misc.taskNotesTpl ?? '', diff --git a/src/app/features/config/default-global-config.const.ts b/src/app/features/config/default-global-config.const.ts index f7aefa837..b776120c1 100644 --- a/src/app/features/config/default-global-config.const.ts +++ b/src/app/features/config/default-global-config.const.ts @@ -35,10 +35,10 @@ export const DEFAULT_GLOBAL_CONFIG: GlobalConfigState = { firstDayOfWeek: undefined, }, tasks: { - isConfirmBeforeTaskDelete: true, + isConfirmBeforeDelete: true, isAutoAddWorkedOnToToday: true, isAutoMarkParentAsDone: false, - isTrayShowCurrentTask: true, + isTrayShowCurrent: true, defaultProjectId: null, isMarkdownFormattingInNotesEnabled: true, notesTemplate: defaultTaskNoteTemplate, diff --git a/src/app/features/config/form-cfgs/tasks-settings-form.const.ts b/src/app/features/config/form-cfgs/tasks-settings-form.const.ts index d50c01913..57351a9de 100644 --- a/src/app/features/config/form-cfgs/tasks-settings-form.const.ts +++ b/src/app/features/config/form-cfgs/tasks-settings-form.const.ts @@ -6,7 +6,7 @@ export const TASKS_SETTINGS_FORM_CFG: ConfigFormSection = { key: 'tasks', items: [ { - key: 'isConfirmBeforeTaskDelete', + key: 'isConfirmBeforeDelete', type: 'checkbox', templateOptions: { label: T.GCF.TASKS.IS_CONFIRM_BEFORE_TASK_DELETE, @@ -27,7 +27,7 @@ export const TASKS_SETTINGS_FORM_CFG: ConfigFormSection = { }, }, { - key: 'isTrayShowCurrentTask', + key: 'isTrayShowCurrent', type: 'checkbox', templateOptions: { label: T.GCF.TASKS.IS_TRAY_SHOW_CURRENT_TASK, diff --git a/src/app/features/config/global-config.model.ts b/src/app/features/config/global-config.model.ts index e4c65c23c..985313eb8 100644 --- a/src/app/features/config/global-config.model.ts +++ b/src/app/features/config/global-config.model.ts @@ -49,8 +49,8 @@ export type MiscConfig = Readonly<{ export type TasksConfig = Readonly<{ isAutoMarkParentAsDone: boolean; isAutoAddWorkedOnToToday: boolean; - isConfirmBeforeTaskDelete?: boolean; - isTrayShowCurrentTask: boolean; + isConfirmBeforeDelete?: boolean; + isTrayShowCurrent: boolean; isMarkdownFormattingInNotesEnabled: boolean; defaultProjectId?: string | null | false; // allow 'false' because of #569 notesTemplate: string; diff --git a/src/app/features/tasks/task-context-menu/task-context-menu-inner/task-context-menu-inner.component.ts b/src/app/features/tasks/task-context-menu/task-context-menu-inner/task-context-menu-inner.component.ts index 989d0c3c3..eb94a121c 100644 --- a/src/app/features/tasks/task-context-menu/task-context-menu-inner/task-context-menu-inner.component.ts +++ b/src/app/features/tasks/task-context-menu/task-context-menu-inner/task-context-menu-inner.component.ts @@ -289,10 +289,10 @@ export class TaskContextMenuInnerComponent implements AfterViewInit { return; } - const isConfirmBeforeTaskDelete = - this._globalConfigService.cfg()?.tasks?.isConfirmBeforeTaskDelete ?? true; + const isConfirmBeforeDelete = + this._globalConfigService.cfg()?.tasks?.isConfirmBeforeDelete ?? true; - if (isConfirmBeforeTaskDelete) { + if (isConfirmBeforeDelete) { this._matDialog .open(DialogConfirmComponent, { data: { diff --git a/src/app/features/tasks/task/task.component.ts b/src/app/features/tasks/task/task.component.ts index 431c48b4b..ab2d82ffd 100644 --- a/src/app/features/tasks/task/task.component.ts +++ b/src/app/features/tasks/task/task.component.ts @@ -371,7 +371,7 @@ export class TaskComponent implements OnDestroy, AfterViewInit { } const isConfirmBeforeTaskDelete = - this._configService.cfg()?.tasks?.isConfirmBeforeTaskDelete ?? true; + this._configService.cfg()?.tasks?.isConfirmBeforeDelete ?? true; if (isConfirmBeforeTaskDelete) { this._matDialog