From 5e39d3f1e2ad07218bd9c6fe78714c1368b32bba Mon Sep 17 00:00:00 2001 From: Lucas Oliveira <62335616+lucaseduoli@users.noreply.github.com> Date: Sat, 29 Mar 2025 21:54:20 -0300 Subject: [PATCH] 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> --- .../components/nodeToolbarComponent/index.tsx | 53 +++++-------------- .../chatInputOutputUser-shard-0.spec.ts | 3 +- .../tests/core/features/freeze-path.spec.ts | 8 +-- .../tests/core/features/freeze.spec.ts | 12 +---- .../tests/core/unit/dropdownComponent.spec.ts | 3 +- .../tests/core/unit/floatComponent.spec.ts | 6 +-- .../tests/core/unit/inputComponent.spec.ts | 6 +-- .../core/unit/inputListComponent.spec.ts | 3 +- .../tests/core/unit/intComponent.spec.ts | 9 ++-- .../core/unit/keyPairListComponent.spec.ts | 9 ++-- .../tests/core/unit/nestedComponent.spec.ts | 3 +- .../core/unit/promptModalComponent.spec.ts | 6 +-- .../tests/core/unit/toggleComponent.spec.ts | 9 ++-- .../features/limit-file-size-upload.spec.ts | 3 +- .../general-bugs-shard-3836.spec.ts | 3 +- .../regression/generalBugs-shard-10.spec.ts | 3 ++ 16 files changed, 40 insertions(+), 99 deletions(-) diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx index 047ff5777..803bab329 100644 --- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx @@ -578,34 +578,6 @@ const NodeToolbarComponent = memo( - {hasCode && ( - - obj.name === "Code")?.shortcut! - } - value={"Code"} - icon={"Code"} - dataTestId="code-button-modal" - /> - - )} - {nodeLength > 0 && ( - - obj.name === "Advanced Settings", - )?.shortcut! - } - value={"Controls"} - icon={"SlidersHorizontal"} - dataTestId="advanced-button-modal" - /> - - )} )} - - obj.name === "Freeze")?.shortcut! - } - value={"Freeze"} - icon={"FreezeAll"} - dataTestId="freeze-path-button" - style={`${frozen ? " text-ice" : ""} transition-all`} - /> - + {hasToolMode && ( + + obj.name === "Freeze") + ?.shortcut! + } + value={"Freeze"} + icon={"FreezeAll"} + dataTestId="freeze-path-button" + style={`${frozen ? " text-ice" : ""} transition-all`} + /> + + )} { await page.getByTestId("div-generic-node").click(); - await page.getByTestId("more-options-modal").click(); - await page.getByTestId("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().click(); const valueEditNode = await page .getByTestId("int_int_max_tokens") diff --git a/src/frontend/tests/core/unit/keyPairListComponent.spec.ts b/src/frontend/tests/core/unit/keyPairListComponent.spec.ts index 96383f0f4..9e858a7f1 100644 --- a/src/frontend/tests/core/unit/keyPairListComponent.spec.ts +++ b/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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().click(); await page.locator('//*[@id="editNodekeypair0"]').click(); await page diff --git a/src/frontend/tests/core/unit/nestedComponent.spec.ts b/src/frontend/tests/core/unit/nestedComponent.spec.ts index c2181d730..5511fc285 100644 --- a/src/frontend/tests/core/unit/nestedComponent.spec.ts +++ b/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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().click(); await page.getByTestId("edit_dict_nesteddict_edit_metadata").last().click(); await page.getByTitle("Switch to tree mode (current mode: text)").click(); diff --git a/src/frontend/tests/core/unit/promptModalComponent.spec.ts b/src/frontend/tests/core/unit/promptModalComponent.spec.ts index 19b5c1299..b0d99ae66 100644 --- a/src/frontend/tests/core/unit/promptModalComponent.spec.ts +++ b/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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().click(); await page.locator('//*[@id="showprompt1"]').click(); expect( diff --git a/src/frontend/tests/core/unit/toggleComponent.spec.ts b/src/frontend/tests/core/unit/toggleComponent.spec.ts index 20bea4ca4..c532e8da6 100644 --- a/src/frontend/tests/core/unit/toggleComponent.spec.ts +++ b/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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().click(); await page.locator('//*[@id="showload_hidden"]').click(); expect( diff --git a/src/frontend/tests/extended/features/limit-file-size-upload.spec.ts b/src/frontend/tests/extended/features/limit-file-size-upload.spec.ts index 70428cb11..4774b4a4d 100644 --- a/src/frontend/tests/extended/features/limit-file-size-upload.spec.ts +++ b/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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().click(); await page.getByText("Close").last().click(); await page.getByText("Playground", { exact: true }).last().click(); diff --git a/src/frontend/tests/extended/regression/general-bugs-shard-3836.spec.ts b/src/frontend/tests/extended/regression/general-bugs-shard-3836.spec.ts index f71655413..aa84dfd3b 100644 --- a/src/frontend/tests/extended/regression/general-bugs-shard-3836.spec.ts +++ b/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("advanced-button-modal").click(); + await page.getByTestId("edit-button-modal").last().click(); await page.getByTestId("showfiles").click(); await page.getByText("Close").last().click(); diff --git a/src/frontend/tests/extended/regression/generalBugs-shard-10.spec.ts b/src/frontend/tests/extended/regression/generalBugs-shard-10.spec.ts index 5718086bc..32edee36c 100644 --- a/src/frontend/tests/extended/regression/generalBugs-shard-10.spec.ts +++ b/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();