From 0ce66e9e97bab3cb2af20a49afbbcf9fca816b2b Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Thu, 19 Dec 2024 04:03:09 +1100
Subject: [PATCH] Fix cannot open groupNodes menu from canvas (#1980)

* Fix cannot open groupNode menu from canvas

* Fix cannot open groupNode menu from canvas

Fixes root cause of issue

* Update release.yaml with core/1.5 branch
---
 .github/workflows/release.yaml         | 1 +
 src/extensions/core/groupNode.ts       | 2 +-
 src/extensions/core/groupNodeManage.ts | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 5c093d9f1..3b1f67f12 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -6,6 +6,7 @@ on:
     branches:
       - main
       - master
+      - core/1.5
     paths:
       - "package.json"
 
diff --git a/src/extensions/core/groupNode.ts b/src/extensions/core/groupNode.ts
index e6c739519..b47130e8b 100644
--- a/src/extensions/core/groupNode.ts
+++ b/src/extensions/core/groupNode.ts
@@ -1425,7 +1425,7 @@ function addConvertToGroupOptions() {
     options.splice(index + 1, null, {
       content: `Manage Group Nodes`,
       disabled,
-      callback: manageGroupNodes
+      callback: () => manageGroupNodes()
     })
   }
 
diff --git a/src/extensions/core/groupNodeManage.ts b/src/extensions/core/groupNodeManage.ts
index d845bd4e4..00abd14bb 100644
--- a/src/extensions/core/groupNodeManage.ts
+++ b/src/extensions/core/groupNodeManage.ts
@@ -373,7 +373,7 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
           groupNodes.map((g) =>
             $el('option', {
               textContent: g,
-              selected: `${PREFIX}${SEPARATOR}` + g === type,
+              selected: `${PREFIX}${SEPARATOR}${g}` === type,
               value: g
             })
           )
@@ -512,7 +512,8 @@ export class ManageGroupDialog extends ComfyDialog<HTMLDialogElement> {
     this.element.replaceChildren(outer)
     this.changeGroup(
       type
-        ? groupNodes.find((g) => `${PREFIX}${SEPARATOR}` + g === type)
+        ? groupNodes.find((g) => `${PREFIX}${SEPARATOR}${g}` === type) ??
+            groupNodes[0]
         : groupNodes[0]
     )
     this.element.showModal()