fix: removed duplicate controls from node toolbar (#7274)

* Removed duplicate elements from node toolbar

* Fixed freeze tests

* Replaced advanced button modal with edit button modal in all tests

* Fixed freeze test

* Fixed tests

* Readded freeze when there is tool mode

---------

Co-authored-by: Carlos Coelho <80289056+carlosrcoelho@users.noreply.github.com>

src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx

@@ -578,34 +578,6 @@ const NodeToolbarComponent = memo(
               <SelectContentWithoutPortal
                 className={"relative top-1 w-56 bg-background"}
               >
-                {hasCode && (
-                  <SelectItem value={"code"}>
-                    <ToolbarSelectItem
-                      shortcut={
-                        shortcuts.find((obj) => obj.name === "Code")?.shortcut!
-                      }
-                      value={"Code"}
-                      icon={"Code"}
-                      dataTestId="code-button-modal"
-                    />
-                  </SelectItem>
-                )}
-                {nodeLength > 0 && (
-                  <SelectItem
-                    value={nodeLength === 0 ? "disabled" : "advanced"}
-                  >
-                    <ToolbarSelectItem
-                      shortcut={
-                        shortcuts.find(
-                          (obj) => obj.name === "Advanced Settings",
-                        )?.shortcut!
-                      }
-                      value={"Controls"}
-                      icon={"SlidersHorizontal"}
-                      dataTestId="advanced-button-modal"
-                    />
-                  </SelectItem>
-                )}
                 <SelectItem value={"save"}>
                   <ToolbarSelectItem
                     shortcut={
@@ -708,17 +680,20 @@ const NodeToolbarComponent = memo(
                     />
                   </SelectItem>
                 )}
-                <SelectItem value="freezeAll">
+                {hasToolMode && (
-                  <ToolbarSelectItem
+                  <SelectItem value="freezeAll">
-                    shortcut={
+                    <ToolbarSelectItem
-                      shortcuts.find((obj) => obj.name === "Freeze")?.shortcut!
+                      shortcut={
-                    }
+                        shortcuts.find((obj) => obj.name === "Freeze")
-                    value={"Freeze"}
+                          ?.shortcut!
-                    icon={"FreezeAll"}
+                      }
-                    dataTestId="freeze-path-button"
+                      value={"Freeze"}
-                    style={`${frozen ? " text-ice" : ""} transition-all`}
+                      icon={"FreezeAll"}
-                  />
+                      dataTestId="freeze-path-button"
-                </SelectItem>
+                      style={`${frozen ? " text-ice" : ""} transition-all`}
+                    />
+                  </SelectItem>
+                )}
                 <SelectItem value="Download">
                   <ToolbarSelectItem
                     shortcut={

src/frontend/tests/core/features/chatInputOutputUser-shard-0.spec.ts

@@ -31,8 +31,7 @@ test(
     await page.waitForSelector("text=Chat Input", { timeout: 30000 });
 
     await page.getByText("Chat Input", { exact: true }).click();
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
     await page.getByText("Close").last().click();
 
     await page.getByText("Playground", { exact: true }).last().click();

src/frontend/tests/core/features/freeze-path.spec.ts

@@ -98,13 +98,7 @@ test(
       timeout: 3000,
     });
 
-    await page.getByTestId("more-options-modal").click();
+    await page.getByText("Freeze").first().click();
-
-    await page.waitForSelector('[data-testid="freeze-path-button"]', {
-      timeout: 3000,
-    });
-
-    await page.getByTestId("freeze-path-button").click();
 
     await page.waitForTimeout(2000);
 

src/frontend/tests/core/features/freeze.spec.ts

@@ -262,17 +262,7 @@ test(
 
     await page.getByText("Split Text", { exact: true }).click();
 
-    await page.waitForSelector('[data-testid="more-options-modal"]', {
+    await page.getByText("Freeze").first().click();
-      timeout: 1000,
-    });
-
-    await page.getByTestId("more-options-modal").click();
-
-    await page.waitForSelector('[data-testid="icon-Snowflake"]', {
-      timeout: 1000,
-    });
-
-    await page.getByText("Freeze", { exact: true }).first().click();
 
     await page.waitForTimeout(3000);
 

src/frontend/tests/core/unit/dropdownComponent.spec.ts

@@ -56,8 +56,7 @@ test(
       timeout: 3000,
     });
 
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
 
     await page.waitForTimeout(1000);
 

src/frontend/tests/core/unit/floatComponent.spec.ts

@@ -60,8 +60,7 @@ test(
 
     expect(value).toBe("-3");
 
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
 
     await page.getByText("Close").last().click();
 
@@ -70,8 +69,7 @@ test(
     if (elementCount === 0) {
       expect(true).toBeTruthy();
 
-      await page.getByTestId("more-options-modal").click();
+      await page.getByTestId("edit-button-modal").last().click();
-      await page.getByTestId("advanced-button-modal").click();
 
       await page.getByText("Close").last().click();
       await page.locator('//*[@id="int_int_seed"]').click();

src/frontend/tests/core/unit/inputComponent.spec.ts

@@ -40,8 +40,7 @@ test(
 
     await page.getByTestId("div-generic-node").click();
 
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
 
     await page
       .locator('//*[@id="showchroma_server_cors_allow_origins"]')
@@ -126,8 +125,7 @@ test(
 
       await page.getByTestId("div-generic-node").click();
 
-      await page.getByTestId("more-options-modal").click();
+      await page.getByTestId("edit-button-modal").last().click();
-      await page.getByTestId("advanced-button-modal").click();
 
       await page.getByText("Close").last().click();
 

src/frontend/tests/core/unit/inputListComponent.spec.ts

@@ -38,8 +38,7 @@ test(
       .fill("test2 test2 test2 test2");
 
     await page.getByTestId("div-generic-node").click();
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
 
     const value0 = await page.getByTestId("inputlist_str_urls_0").inputValue();
     const value1 = await page.getByTestId("inputlist_str_urls_1").inputValue();

src/frontend/tests/core/unit/intComponent.spec.ts

@@ -26,8 +26,7 @@ test("IntComponent", { tag: ["@release", "@workspace"] }, async ({ page }) => {
 
   await page.getByTestId("div-generic-node").click();
 
-  await page.getByTestId("more-options-modal").click();
+  await page.getByTestId("edit-button-modal").last().click();
-  await page.getByTestId("advanced-button-modal").click();
   await page.getByTestId("showmax_tokens").click();
 
   await page.getByText("Close").last().click();
@@ -60,8 +59,7 @@ test("IntComponent", { tag: ["@release", "@workspace"] }, async ({ page }) => {
   await page.getByTestId("zoom_out").click();
   await page.getByTestId("zoom_out").click();
 
-  await page.getByTestId("more-options-modal").click();
+  await page.getByTestId("edit-button-modal").last().click();
-  await page.getByTestId("advanced-button-modal").click();
 
   value = await page.getByTestId("int_int_edit_max_tokens").inputValue();
 
@@ -139,8 +137,7 @@ test("IntComponent", { tag: ["@release", "@workspace"] }, async ({ page }) => {
   if (elementCount === 0) {
     expect(true).toBeTruthy();
 
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
 
     const valueEditNode = await page
       .getByTestId("int_int_max_tokens")

src/frontend/tests/core/unit/keyPairListComponent.spec.ts

@@ -27,8 +27,7 @@ test(
 
     await page.getByTestId("div-generic-node").click();
 
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
 
     await page.getByTestId("showmodel_kwargs").click();
     expect(await page.getByTestId("showmodel_kwargs").isChecked()).toBeTruthy();
@@ -70,8 +69,7 @@ test(
       expect(false).toBeTruthy();
     }
 
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
 
     await page.getByText("Close").last().click();
 
@@ -81,8 +79,7 @@ test(
       expect(true).toBeTruthy();
       await page.getByTestId("div-generic-node").click();
 
-      await page.getByTestId("more-options-modal").click();
+      await page.getByTestId("edit-button-modal").last().click();
-      await page.getByTestId("advanced-button-modal").click();
 
       await page.locator('//*[@id="editNodekeypair0"]').click();
       await page

src/frontend/tests/core/unit/nestedComponent.spec.ts

@@ -60,8 +60,7 @@ test(
 
     await page.getByTestId("div-generic-node").click();
 
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
 
     await page.getByTestId("edit_dict_nesteddict_edit_metadata").last().click();
     await page.getByTitle("Switch to tree mode (current mode: text)").click();

src/frontend/tests/core/unit/promptModalComponent.spec.ts

@@ -82,8 +82,7 @@ test(
       expect(false).toBeTruthy();
     }
 
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
 
     value =
       (await page
@@ -188,8 +187,7 @@ test(
     await page.getByText("Close").last().click();
 
     await zoomOut(page, 2);
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
 
     await page.locator('//*[@id="showprompt1"]').click();
     expect(

src/frontend/tests/core/unit/toggleComponent.spec.ts

@@ -29,8 +29,7 @@ test(
 
     await page.getByTestId("div-generic-node").click();
 
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
 
     await page.locator('//*[@id="showload_hidden"]').click();
     expect(
@@ -74,8 +73,7 @@ test(
 
     await adjustScreenView(page);
 
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
 
     expect(
       await page.getByTestId("toggle_bool_load_hidden").isChecked(),
@@ -141,8 +139,7 @@ test(
 
       await page.getByTestId("div-generic-node").click();
 
-      await page.getByTestId("more-options-modal").click();
+      await page.getByTestId("edit-button-modal").last().click();
-      await page.getByTestId("advanced-button-modal").click();
 
       await page.locator('//*[@id="showload_hidden"]').click();
       expect(

src/frontend/tests/extended/features/limit-file-size-upload.spec.ts

@@ -41,8 +41,7 @@ test(
     await page.waitForSelector("text=Chat Input", { timeout: 30000 });
 
     await page.getByText("Chat Input", { exact: true }).click();
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
     await page.getByText("Close").last().click();
 
     await page.getByText("Playground", { exact: true }).last().click();

src/frontend/tests/extended/regression/general-bugs-shard-3836.spec.ts

@@ -27,8 +27,7 @@ test(
     await page.waitForSelector("text=Chat Input", { timeout: 30000 });
 
     await page.getByText("Chat Input", { exact: true }).click();
-    await page.getByTestId("more-options-modal").click();
+    await page.getByTestId("edit-button-modal").last().click();
-    await page.getByTestId("advanced-button-modal").click();
     await page.getByTestId("showfiles").click();
     await page.getByText("Close").last().click();
 

src/frontend/tests/extended/regression/generalBugs-shard-10.spec.ts

@@ -66,6 +66,9 @@ test(
 
     await page.getByText("Prompt", { exact: true }).last().click();
 
+    await page.waitForSelector('[data-testid="more-options-modal"]', {
+      timeout: 1000,
+    });
     await page.getByTestId("more-options-modal").click();
 
     await page.getByText("Freeze", { exact: true }).first().click();