From bfec9b692b9fd7a254a0c30fa9d31667594dd62d Mon Sep 17 00:00:00 2001
From: bymyself <abolkonsky.rem@gmail.com>
Date: Wed, 12 Feb 2025 08:02:27 -0700
Subject: [PATCH] Add keybind hint to confirm close dialog (#2529)

Co-authored-by: github-actions <github-actions@github.com>
---
 .../dialog/content/ConfirmationDialogContent.vue      | 11 +++++++++++
 src/components/topbar/WorkflowTab.vue                 |  6 +++++-
 src/locales/en/main.json                              |  1 +
 src/locales/fr/main.json                              |  1 +
 src/locales/ja/main.json                              |  1 +
 src/locales/ko/main.json                              |  1 +
 src/locales/ru/main.json                              |  1 +
 src/locales/zh/main.json                              |  1 +
 src/services/dialogService.ts                         |  9 ++++++---
 src/services/workflowService.ts                       |  7 +++++--
 10 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/components/dialog/content/ConfirmationDialogContent.vue b/src/components/dialog/content/ConfirmationDialogContent.vue
index ecde16c98..9fe3b94b6 100644
--- a/src/components/dialog/content/ConfirmationDialogContent.vue
+++ b/src/components/dialog/content/ConfirmationDialogContent.vue
@@ -4,6 +4,15 @@
     <ul v-if="itemList?.length" class="pl-4 m-0 flex flex-col gap-2">
       <li v-for="item of itemList" :key="item">{{ item }}</li>
     </ul>
+    <Message
+      v-if="hint"
+      icon="pi pi-info-circle"
+      severity="secondary"
+      size="small"
+      variant="simple"
+    >
+      {{ hint }}
+    </Message>
     <div class="flex gap-4 justify-end">
       <Button
         :label="$t('g.cancel')"
@@ -63,6 +72,7 @@
 
 <script setup lang="ts">
 import Button from 'primevue/button'
+import Message from 'primevue/message'
 
 import type { ConfirmationDialogType } from '@/services/dialogService'
 import { useDialogStore } from '@/stores/dialogStore'
@@ -72,6 +82,7 @@ const props = defineProps<{
   type: ConfirmationDialogType
   onConfirm: (value?: boolean) => void
   itemList?: string[]
+  hint?: string
 }>()
 
 const onCancel = () => useDialogStore().closeDialog()
diff --git a/src/components/topbar/WorkflowTab.vue b/src/components/topbar/WorkflowTab.vue
index 1740cb6fa..e996be69b 100644
--- a/src/components/topbar/WorkflowTab.vue
+++ b/src/components/topbar/WorkflowTab.vue
@@ -31,6 +31,7 @@
 <script setup lang="ts">
 import Button from 'primevue/button'
 import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
 
 import {
   usePragmaticDraggable,
@@ -51,6 +52,8 @@ const props = defineProps<{
   workflowOption: WorkflowOption
 }>()
 
+const { t } = useI18n()
+
 const workspaceStore = useWorkspaceStore()
 const workflowStore = useWorkflowStore()
 const workflowTabRef = ref<HTMLElement | null>(null)
@@ -59,7 +62,8 @@ const closeWorkflows = async (options: WorkflowOption[]) => {
   for (const opt of options) {
     if (
       !(await useWorkflowService().closeWorkflow(opt.workflow, {
-        warnIfUnsaved: !workspaceStore.shiftDown
+        warnIfUnsaved: !workspaceStore.shiftDown,
+        hint: t('sideToolbar.workflowTab.dirtyCloseHint')
       }))
     ) {
       // User clicked cancel
diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index 93f6a3c66..44cb61652 100644
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -315,6 +315,7 @@
       "deleteFailed": "Attempt to delete the workflow failed.",
       "dirtyCloseTitle": "Save Changes?",
       "dirtyClose": "The files below have been changed.  Would you like to save them before closing?",
+      "dirtyCloseHint": "Hold Shift to close without prompt",
       "confirmOverwriteTitle": "Overwrite existing file?",
       "confirmOverwrite": "The file below already exists. Would you like to overwrite it?",
       "workflowTreeType": {
diff --git a/src/locales/fr/main.json b/src/locales/fr/main.json
index 52c48978f..8dd161590 100644
--- a/src/locales/fr/main.json
+++ b/src/locales/fr/main.json
@@ -735,6 +735,7 @@
       "deleteFailedTitle": "Échec de la suppression",
       "deleted": "Flux de travail supprimé",
       "dirtyClose": "Les fichiers ci-dessous ont été modifiés. Souhaitez-vous les enregistrer avant de fermer ?",
+      "dirtyCloseHint": "Maintenez Shift pour fermer sans invite",
       "dirtyCloseTitle": "Enregistrer les modifications ?",
       "workflowTreeType": {
         "bookmarks": "Favoris",
diff --git a/src/locales/ja/main.json b/src/locales/ja/main.json
index a14fcc97b..a89ba7686 100644
--- a/src/locales/ja/main.json
+++ b/src/locales/ja/main.json
@@ -735,6 +735,7 @@
       "deleteFailedTitle": "削除に失敗しました",
       "deleted": "ワークフローが削除されました",
       "dirtyClose": "以下のファイルが変更されました。閉じる前に保存しますか？",
+      "dirtyCloseHint": "Shiftキーを押しながら閉じると、プロンプトなしで閉じます",
       "dirtyCloseTitle": "変更を保存しますか？",
       "workflowTreeType": {
         "bookmarks": "ブックマーク",
diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json
index e25233a20..73588ffdf 100644
--- a/src/locales/ko/main.json
+++ b/src/locales/ko/main.json
@@ -735,6 +735,7 @@
       "deleteFailedTitle": "삭제 실패",
       "deleted": "워크플로가 삭제되었습니다.",
       "dirtyClose": "아래 파일들이 변경되었습니다. 닫기 전에 저장하시겠습니까?",
+      "dirtyCloseHint": "프롬프트 없이 닫으려면 Shift를 누르세요",
       "dirtyCloseTitle": "변경 사항 저장",
       "workflowTreeType": {
         "bookmarks": "북마크",
diff --git a/src/locales/ru/main.json b/src/locales/ru/main.json
index f2648a044..52d52e884 100644
--- a/src/locales/ru/main.json
+++ b/src/locales/ru/main.json
@@ -735,6 +735,7 @@
       "deleteFailedTitle": "Не удалось удалить",
       "deleted": "Рабочий процесс удалён",
       "dirtyClose": "Файлы ниже были изменены. Вы хотите сохранить их перед закрытием?",
+      "dirtyCloseHint": "Удерживайте Shift, чтобы закрыть без подсказки",
       "dirtyCloseTitle": "Сохранить изменения?",
       "workflowTreeType": {
         "bookmarks": "Закладки",
diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json
index 9c2a5f93c..50ac8f9a9 100644
--- a/src/locales/zh/main.json
+++ b/src/locales/zh/main.json
@@ -735,6 +735,7 @@
       "deleteFailedTitle": "删除失败",
       "deleted": "工作流已删除",
       "dirtyClose": "以下文件已被更改。您想在关闭之前保存它们吗？",
+      "dirtyCloseHint": "按住 Shift 关闭而不提示",
       "dirtyCloseTitle": "保存更改？",
       "workflowTreeType": {
         "bookmarks": "书签",
diff --git a/src/services/dialogService.ts b/src/services/dialogService.ts
index fefdc1165..b99501533 100644
--- a/src/services/dialogService.ts
+++ b/src/services/dialogService.ts
@@ -133,7 +133,8 @@ export const useDialogService = () => {
     title,
     message,
     type = 'default',
-    itemList = []
+    itemList = [],
+    hint
   }: {
     /** Dialog heading */
     title: string
@@ -141,8 +142,9 @@ export const useDialogService = () => {
     message: string
     /** Pre-configured dialog type */
     type?: ConfirmationDialogType
-    /** Displayed as an unorderd list immediately below the message body */
+    /** Displayed as an unordered list immediately below the message body */
     itemList?: string[]
+    hint?: string
   }): Promise<boolean | null> {
     return new Promise((resolve) => {
       const options: ShowDialogOptions = {
@@ -153,7 +155,8 @@ export const useDialogService = () => {
           message,
           type,
           itemList,
-          onConfirm: resolve
+          onConfirm: resolve,
+          hint
         },
         dialogComponentProps: {
           onClose: () => resolve(null)
diff --git a/src/services/workflowService.ts b/src/services/workflowService.ts
index 12eea62df..057b05ee0 100644
--- a/src/services/workflowService.ts
+++ b/src/services/workflowService.ts
@@ -188,14 +188,17 @@ export const useWorkflowService = () => {
    */
   const closeWorkflow = async (
     workflow: ComfyWorkflow,
-    options: { warnIfUnsaved: boolean } = { warnIfUnsaved: true }
+    options: { warnIfUnsaved: boolean; hint?: string } = {
+      warnIfUnsaved: true
+    }
   ): Promise<boolean> => {
     if (workflow.isModified && options.warnIfUnsaved) {
       const confirmed = await dialogService.confirm({
         title: t('sideToolbar.workflowTab.dirtyCloseTitle'),
         type: 'dirtyClose',
         message: t('sideToolbar.workflowTab.dirtyClose'),
-        itemList: [workflow.path]
+        itemList: [workflow.path],
+        hint: options.hint
       })
       // Cancel
       if (confirmed === null) return false