From 5b99504f73a3931151e1e7edca8957c53a7d2230 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 7 Dec 2024 23:32:13 +1100
Subject: [PATCH 1/4] Add generic default button for unknown dialogs

---
 .../dialog/content/ConfirmationDialogContent.vue       | 10 +++++++++-
 src/locales/en.json                                    |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/dialog/content/ConfirmationDialogContent.vue b/src/components/dialog/content/ConfirmationDialogContent.vue
index 81feebd9c..f545e6e0b 100644
--- a/src/components/dialog/content/ConfirmationDialogContent.vue
+++ b/src/components/dialog/content/ConfirmationDialogContent.vue
@@ -26,7 +26,7 @@
         @click="onConfirm"
         icon="pi pi-save"
       />
-      <template v-else>
+      <template v-else-if="type === 'dirtyClose'">
         <Button
           :label="$t('no')"
           severity="secondary"
@@ -35,6 +35,14 @@
         />
         <Button :label="$t('save')" @click="onConfirm" icon="pi pi-save" />
       </template>
+      <!-- Invalid - just show a close button. -->
+      <Button
+        v-else
+        :label="$t('close')"
+        severity="primary"
+        @click="onCancel"
+        icon="pi pi-times"
+      />
     </div>
   </section>
 </template>
diff --git a/src/locales/en.json b/src/locales/en.json
index afb48b8b1..f487c9ac5 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -136,6 +136,7 @@
   "save": "Save",
   "no": "No",
   "cancel": "Cancel",
+  "close": "Close",
   "overwrite": "Overwrite",
   "customize": "Customize",
   "experimental": "BETA",

From 6cc86ef20782542d7aefec5e4aabaac35d4ade09 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 7 Dec 2024 23:33:59 +1100
Subject: [PATCH 2/4] Add reinstall confirmation dialog

---
 .../dialog/content/ConfirmationDialogContent.vue  | 10 +++++++++-
 src/extensions/core/electronAdapter.ts            | 15 +++++++++++----
 src/services/dialogService.ts                     |  8 +++++++-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/components/dialog/content/ConfirmationDialogContent.vue b/src/components/dialog/content/ConfirmationDialogContent.vue
index f545e6e0b..a5a07b6ed 100644
--- a/src/components/dialog/content/ConfirmationDialogContent.vue
+++ b/src/components/dialog/content/ConfirmationDialogContent.vue
@@ -35,6 +35,13 @@
         />
         <Button :label="$t('save')" @click="onConfirm" icon="pi pi-save" />
       </template>
+      <Button
+        v-else-if="type === 'reinstall'"
+        :label="$t('desktopMenu.reinstall')"
+        severity="warn"
+        @click="onConfirm"
+        icon="pi pi-eraser"
+      />
       <!-- Invalid - just show a close button. -->
       <Button
         v-else
@@ -50,10 +57,11 @@
 <script setup lang="ts">
 import Button from 'primevue/button'
 import { useDialogStore } from '@/stores/dialogStore'
+import type { ConfirmationDialogType } from '@/services/dialogService'
 
 const props = defineProps<{
   message: string
-  type: 'overwrite' | 'delete' | 'dirtyClose'
+  type: ConfirmationDialogType
   onConfirm: (value?: boolean) => void
   itemList?: string[]
 }>()
diff --git a/src/extensions/core/electronAdapter.ts b/src/extensions/core/electronAdapter.ts
index 6bd6a2ade..3d267a133 100644
--- a/src/extensions/core/electronAdapter.ts
+++ b/src/extensions/core/electronAdapter.ts
@@ -1,4 +1,6 @@
+import { t } from '@/i18n'
 import { app } from '@/scripts/app'
+import { showConfirmationDialog } from '@/services/dialogService'
 import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
 ;(async () => {
   if (!isElectron()) return
@@ -101,11 +103,16 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil'
       },
       {
         id: 'Comfy-Desktop.Reinstall',
-        label: 'Reinstall',
+        label: t('desktopMenu.reinstall'),
         icon: 'pi pi-refresh',
-        function() {
-          // TODO(huchenlei): Add a confirmation dialog.
-          electronAPI.reinstall()
+        async function() {
+          const proceed = await showConfirmationDialog({
+            message: t('desktopMenu.confirmReinstall'),
+            title: t('desktopMenu.reinstall'),
+            type: 'reinstall'
+          })
+
+          if (proceed) electronAPI.reinstall()
         }
       },
       {
diff --git a/src/services/dialogService.ts b/src/services/dialogService.ts
index 205e9818b..72ff29079 100644
--- a/src/services/dialogService.ts
+++ b/src/services/dialogService.ts
@@ -97,6 +97,12 @@ export async function showPromptDialog({
   })
 }
 
+export type ConfirmationDialogType =
+  | 'overwrite'
+  | 'delete'
+  | 'dirtyClose'
+  | 'reinstall'
+
 /**
  *
  * @returns `true` if the user confirms the dialog,
@@ -112,7 +118,7 @@ export async function showConfirmationDialog({
   /** Dialog heading */
   title: string
   /** Pre-configured dialog type */
-  type: 'overwrite' | 'delete' | 'dirtyClose'
+  type: ConfirmationDialogType
   /** The main message body */
   message: string
   /** Displayed as an unorderd list immediately below the message body */

From 938522883ffead66509a6a8287b3989879985925 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Sat, 7 Dec 2024 23:45:43 +1100
Subject: [PATCH 3/4] Prevent removal of newlines in i18n dialogs

---
 src/components/dialog/content/ConfirmationDialogContent.vue | 6 ++++++
 src/locales/en.json                                         | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/dialog/content/ConfirmationDialogContent.vue b/src/components/dialog/content/ConfirmationDialogContent.vue
index a5a07b6ed..b1108288f 100644
--- a/src/components/dialog/content/ConfirmationDialogContent.vue
+++ b/src/components/dialog/content/ConfirmationDialogContent.vue
@@ -78,3 +78,9 @@ const onConfirm = () => {
   useDialogStore().closeDialog()
 }
 </script>
+
+<style lang="css" scoped>
+.prompt-dialog-content {
+  white-space: pre-wrap;
+}
+</style>
diff --git a/src/locales/en.json b/src/locales/en.json
index f487c9ac5..e691ad2d3 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -599,7 +599,7 @@
   },
   "desktopMenu": {
     "reinstall": "Reinstall",
-    "confirmReinstall": "This will clear your extra_models_config.yaml file, and begin installation again.  Are you sure?"
+    "confirmReinstall": "This will clear your extra_models_config.yaml file,\nand begin installation again.\n\nAre you sure?"
   },
   "settingsCategories": {
     "Comfy-Desktop": "Comfy-Desktop",

From aea3b9f6f4f7e539f916401780315e8e45246cd5 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Sat, 7 Dec 2024 12:53:54 +0000
Subject: [PATCH 4/4] Update locales [skip ci]

---
 src/locales/ja.json | 1 +
 src/locales/ru.json | 1 +
 src/locales/zh.json | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/locales/ja.json b/src/locales/ja.json
index 35570ef58..74509754e 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -5,6 +5,7 @@
   "box": "ボックス",
   "briefcase": "ブリーフケース",
   "cancel": "キャンセル",
+  "close": "閉じる",
   "color": "色",
   "comingSoon": "近日公開",
   "confirm": "確認",
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 2c863c8ee..f43543373 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -5,6 +5,7 @@
   "box": "Ящик",
   "briefcase": "Чемодан",
   "cancel": "Отмена",
+  "close": "Закрыть",
   "color": "Цвет",
   "comingSoon": "Скоро",
   "confirm": "Подтвердить",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 42552a6f5..7290d12a1 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -5,6 +5,7 @@
   "box": "盒子",
   "briefcase": "公文包",
   "cancel": "取消",
+  "close": "关闭",
   "color": "颜色",
   "comingSoon": "敬请期待",
   "confirm": "确认",