From 9e3e688ad67b28c7c6552b1e968f6ca80673f9a0 Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Thu, 20 Feb 2025 13:22:27 +1100
Subject: [PATCH] 1.9.19 (#2640)

---
 package-lock.json             |  8 ++++----
 package.json                  |  2 +-
 src/locales/en/main.json      |  4 ++--
 src/views/MaintenanceView.vue | 17 ++++++-----------
 src/views/ServerStartView.vue |  8 ++++----
 5 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bda64cbed4..0585ada806 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "GPL-3.0-only",
       "dependencies": {
         "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
-        "@comfyorg/comfyui-electron-types": "^0.4.16",
+        "@comfyorg/comfyui-electron-types": "^0.4.20",
         "@comfyorg/litegraph": "^0.8.78",
         "@primevue/forms": "^4.2.5",
         "@primevue/themes": "^4.2.5",
@@ -1938,9 +1938,9 @@
       "dev": true
     },
     "node_modules/@comfyorg/comfyui-electron-types": {
-      "version": "0.4.16",
-      "resolved": "https://registry.npmjs.org/@comfyorg/comfyui-electron-types/-/comfyui-electron-types-0.4.16.tgz",
-      "integrity": "sha512-AKy4WLVAuDka/Xjv8zrKwfU/wfRSQpFVE5DgxoLfvroCI0sw+rV1JqdL6xFVrYIoeprzbfKhQiyqlAWU+QgHyg==",
+      "version": "0.4.20",
+      "resolved": "https://registry.npmjs.org/@comfyorg/comfyui-electron-types/-/comfyui-electron-types-0.4.20.tgz",
+      "integrity": "sha512-JFKGk9wSx7CcYh9MRNo7bqTLJwQzVc+1Xg8V2Ghn9BS3RzpmkfktaWHi+waU7/CRQMzvjF+mnDPP58xk1xbVhA==",
       "license": "GPL-3.0-only"
     },
     "node_modules/@comfyorg/litegraph": {
diff --git a/package.json b/package.json
index 25e21947d4..8927403856 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
   },
   "dependencies": {
     "@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
-    "@comfyorg/comfyui-electron-types": "^0.4.16",
+    "@comfyorg/comfyui-electron-types": "^0.4.20",
     "@comfyorg/litegraph": "^0.8.78",
     "@primevue/forms": "^4.2.5",
     "@primevue/themes": "^4.2.5",
diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index 44cb61652c..4e4ac8d776 100644
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -264,7 +264,7 @@
     "updateConsent": "You previously opted in to reporting crashes. We are now tracking event-based metrics to help identify bugs and improve the app. No personal identifiable information is collected."
   },
   "serverStart": {
-    "reinstall": "Reinstall",
+    "troubleshoot": "Troubleshoot",
     "reportIssue": "Report Issue",
     "openLogs": "Open Logs",
     "showTerminal": "Show Terminal",
@@ -779,4 +779,4 @@
     "fov": "FOV",
     "previewOutput": "Preview Output"
   }
-}
\ No newline at end of file
+}
diff --git a/src/views/MaintenanceView.vue b/src/views/MaintenanceView.vue
index 12ae93140f..6e53d0bc43 100644
--- a/src/views/MaintenanceView.vue
+++ b/src/views/MaintenanceView.vue
@@ -135,12 +135,12 @@ const filterOptions = ref([
 ])
 
 /** Filter binding; can be set to show all tasks, or only errors. */
-const filter = ref<MaintenanceFilter>(filterOptions.value[1])
+const filter = ref<MaintenanceFilter>(filterOptions.value[0])
 
 /** If valid, leave the validation window. */
-const completeValidation = async (alertOnFail = true) => {
+const completeValidation = async () => {
   const isValid = await electron.Validation.complete()
-  if (alertOnFail && !isValid) {
+  if (!isValid) {
     toast.add({
       severity: 'error',
       summary: t('g.error'),
@@ -162,18 +162,13 @@ watch(
   }
 )
 
-// If we're running a fix that may resolve all issues, auto-recheck and continue if everything is OK
-watch(
-  () => taskStore.isRunningInstallationFix,
-  (value, oldValue) => {
-    if (!value && oldValue) completeValidation(false)
-  }
-)
-
 onMounted(async () => {
   electron.Validation.onUpdate(processUpdate)
 
   const update = await electron.Validation.getStatus()
+  if (Object.values(update).some((x) => x === 'error')) {
+    filter.value = filterOptions.value[1]
+  }
   processUpdate(update)
 })
 
diff --git a/src/views/ServerStartView.vue b/src/views/ServerStartView.vue
index e04b7c6919..bca253a819 100644
--- a/src/views/ServerStartView.vue
+++ b/src/views/ServerStartView.vue
@@ -25,9 +25,9 @@
             @click="openLogs"
           />
           <Button
-            icon="pi pi-refresh"
-            :label="t('serverStart.reinstall')"
-            @click="reinstall"
+            icon="pi pi-wrench"
+            :label="t('serverStart.troubleshoot')"
+            @click="troubleshoot"
           />
         </div>
         <Button
@@ -88,7 +88,7 @@ const terminalCreated = (
   terminal.options.cursorInactiveStyle = 'block'
 }
 
-const reinstall = () => electron.reinstall()
+const troubleshoot = () => electron.startTroubleshooting()
 const reportIssue = () => {
   window.open('https://forum.comfy.org/c/v1-feedback/', '_blank')
 }