diff --git a/package-lock.json b/package-lock.json index 9d62b1c369..483368193f 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.87", "@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 d969fc6e00..a7c458dce6 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.87", "@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 b1c1b0f791..2a819e3f5c 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", diff --git a/src/locales/fr/main.json b/src/locales/fr/main.json index b9ef6d206b..f75fabac26 100644 --- a/src/locales/fr/main.json +++ b/src/locales/fr/main.json @@ -654,9 +654,9 @@ "ready": "Finalisation...", "starting-server": "Démarrage du serveur ComfyUI..." }, - "reinstall": "Réinstaller", "reportIssue": "Signaler un problème", - "showTerminal": "Afficher le terminal" + "showTerminal": "Afficher le terminal", + "troubleshoot": "Dépannage" }, "settingsCategories": { "About": "À Propos", diff --git a/src/locales/ja/main.json b/src/locales/ja/main.json index b467ee015d..8b4288e4d9 100644 --- a/src/locales/ja/main.json +++ b/src/locales/ja/main.json @@ -654,9 +654,9 @@ "ready": "完了中...", "starting-server": "ComfyUIサーバーを起動中..." }, - "reinstall": "再インストール", "reportIssue": "問題を報告", - "showTerminal": "ターミナルを表示" + "showTerminal": "ターミナルを表示", + "troubleshoot": "トラブルシューティング" }, "settingsCategories": { "About": "情報", diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json index 1b230e7fd7..d1ff55f02e 100644 --- a/src/locales/ko/main.json +++ b/src/locales/ko/main.json @@ -654,9 +654,9 @@ "ready": "마무리 중...", "starting-server": "ComfyUI 서버 시작 중..." }, - "reinstall": "재설치", "reportIssue": "문제 보고", - "showTerminal": "터미널 보기" + "showTerminal": "터미널 보기", + "troubleshoot": "문제 해결" }, "settingsCategories": { "About": "정보", diff --git a/src/locales/ru/main.json b/src/locales/ru/main.json index 23cae8df09..2362e85eee 100644 --- a/src/locales/ru/main.json +++ b/src/locales/ru/main.json @@ -654,9 +654,9 @@ "ready": "Завершение…", "starting-server": "Запуск сервера ComfyUI…" }, - "reinstall": "Переустановить", "reportIssue": "Сообщить о проблеме", - "showTerminal": "Показать терминал" + "showTerminal": "Показать терминал", + "troubleshoot": "Устранение неполадок" }, "settingsCategories": { "About": "О программе", diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json index 071625da60..3441973530 100644 --- a/src/locales/zh/main.json +++ b/src/locales/zh/main.json @@ -654,9 +654,9 @@ "ready": "完成中...", "starting-server": "正在启动 ComfyUI 服务器..." }, - "reinstall": "重新安装", "reportIssue": "报告问题", - "showTerminal": "显示终端" + "showTerminal": "显示终端", + "troubleshoot": "故障排除" }, "settingsCategories": { "About": "关于", 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(filterOptions.value[1]) +const filter = ref(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" />