[CI] Tailor release workflow for 1.9.19 (#2646)

Co-authored-by: Terry Jia <terryjia88@gmail.com>

.github/workflows/eslint.yaml

@@ -6,6 +6,8 @@ on:
       - main
       - master
       - 'dev*'
+      - 'core/*'
+      - 'desktop/*'
 
 jobs:
   eslint:

.github/workflows/format.yaml

@@ -2,7 +2,7 @@ name: Prettier Check
 
 on:
   pull_request:
-    branches: [ main, master, dev* ]
+    branches: [ main, master, dev*, core/*, desktop/* ]
 
 jobs:
   prettier:

.github/workflows/release.yaml

@@ -6,8 +6,7 @@ on:
     branches:
       - main
       - master
-    paths:
-      - "package.json"
+      - 'desktop/*'
 
 jobs:
   draft_release:
@@ -40,9 +39,9 @@ jobs:
           files: |
             dist.zip
           tag_name: v${{ steps.current_version.outputs.version }}
-          draft: false
+          draft: true
           prerelease: false
-          make_latest: "true"
+          make_latest: "false"
           generate_release_notes: true
   publish_types:
     runs-on: ubuntu-latest

.github/workflows/test-ui.yaml

@@ -5,11 +5,15 @@ on:
     branches:
       - main
       - master
+      - 'core/*'
+      - 'desktop/*'
   pull_request:
     branches:
       - main
       - master
       - 'dev*'
+      - 'core/*'
+      - 'desktop/*'
 
 jobs:
   jest-tests:

.github/workflows/vitest.yaml

@@ -6,11 +6,15 @@ on:
       - main
       - master
       - 'dev*'
+      - 'core/*'
+      - 'desktop/*'
   pull_request:
     branches:
       - main
       - master
       - 'dev*'
+      - 'core/*'
+      - 'desktop/*'
 
 jobs:
   test:

package-lock.json

@@ -1,16 +1,16 @@
 {
   "name": "@comfyorg/comfyui-frontend",
-  "version": "1.9.16",
+  "version": "1.9.18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@comfyorg/comfyui-frontend",
-      "version": "1.9.16",
+      "version": "1.9.18",
       "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": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comfyorg/comfyui-frontend",
   "private": true,
-  "version": "1.9.16",
+  "version": "1.9.19",
   "type": "module",
   "repository": "https://github.com/Comfy-Org/ComfyUI_frontend",
   "homepage": "https://comfy.org",
@@ -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",

src/components/load3d/Load3DAnimationControls.vue

@@ -20,7 +20,7 @@
 
     <div
       v-if="animations && animations.length > 0"
-      class="absolute top-0 left-0 w-full flex justify-center pt-2 gap-2 items-center z-10"
+      class="absolute top-0 left-0 w-full flex justify-center pt-2 gap-2 items-center pointer-events-auto z-10"
     >
       <Button class="p-button-rounded p-button-text" @click="togglePlay">
         <i

src/components/load3d/Load3DControls.vue

@@ -1,5 +1,7 @@
 <template>
-  <div class="absolute top-2 left-2 flex flex-col gap-2 z-20">
+  <div
+    class="absolute top-2 left-2 flex flex-col gap-2 pointer-events-auto z-20"
+  >
     <Button class="p-button-rounded p-button-text" @click="toggleCamera">
       <i
         class="pi pi-camera text-white text-lg"

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"
   }
-}
+}

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)
 })
 

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')
 }