From a93e9710050643603c6e857dbd69c3117b100400 Mon Sep 17 00:00:00 2001
From: cristhianzl <cristhian.lousa@gmail.com>
Date: Fri, 29 Mar 2024 22:11:53 -0300
Subject: [PATCH] merge fix

---
 .../src/components/dropdownComponent/index.tsx      | 13 ++++++++-----
 .../components/ParentDisclosureComponent/index.tsx  |  6 +++++-
 .../components/extraSidebarComponent/index.tsx      |  1 +
 src/frontend/src/types/components/index.ts          |  1 +
 .../tests/end-to-end/codeAreaModalComponent.spec.ts |  4 +++-
 .../tests/end-to-end/dropdownComponent.spec.ts      |  3 ++-
 src/frontend/tests/end-to-end/filterEdge.spec.ts    |  3 ++-
 .../tests/end-to-end/floatComponent.spec.ts         |  2 +-
 src/frontend/tests/end-to-end/flowPage.spec.ts      |  2 +-
 .../tests/end-to-end/inputComponent.spec.ts         |  2 +-
 .../tests/end-to-end/inputListComponent.spec.ts     |  2 +-
 src/frontend/tests/end-to-end/intComponent.spec.ts  |  2 +-
 .../tests/end-to-end/keyPairListComponent.spec.ts   |  2 +-
 .../tests/end-to-end/langflowShortcuts.spec.ts      |  2 +-
 .../tests/end-to-end/nestedComponent.spec.ts        |  2 +-
 .../tests/end-to-end/promptModalComponent.spec.ts   |  2 +-
 .../tests/end-to-end/saveComponents.spec.ts         |  2 +-
 .../tests/end-to-end/textAreaModalComponent.spec.ts |  2 +-
 .../tests/end-to-end/toggleComponent.spec.ts        |  2 +-
 19 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/frontend/src/components/dropdownComponent/index.tsx b/src/frontend/src/components/dropdownComponent/index.tsx
index fd4d096de..67b9c5d82 100644
--- a/src/frontend/src/components/dropdownComponent/index.tsx
+++ b/src/frontend/src/components/dropdownComponent/index.tsx
@@ -52,11 +52,14 @@ export default function Dropdown({
                   editNode ? "input-edit-node" : "py-2"
                 )}
               >
-                {value &&
-                value !== "" &&
-                options.find((option) => option === value)
-                  ? options.find((option) => option === value)
-                  : "Choose an option..."}
+                <span data-testid={`value-dropdown-` + id}>
+                  {value &&
+                  value !== "" &&
+                  options.find((option) => option === value)
+                    ? options.find((option) => option === value)
+                    : "Choose an option..."}
+                </span>
+
                 <ForwardedIconComponent
                   name="ChevronsUpDown"
                   className="ml-2 h-4 w-4 shrink-0 opacity-50"
diff --git a/src/frontend/src/pages/FlowPage/components/ParentDisclosureComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/ParentDisclosureComponent/index.tsx
index 4de84a439..c5ff8d767 100644
--- a/src/frontend/src/pages/FlowPage/components/ParentDisclosureComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/ParentDisclosureComponent/index.tsx
@@ -6,13 +6,17 @@ export default function ParentDisclosureComponent({
   button: { title, Icon, buttons = [] },
   children,
   openDisc,
+  testId,
 }: DisclosureComponentType): JSX.Element {
   return (
     <Disclosure as="div" defaultOpen={openDisc} key={title}>
       {({ open }) => (
         <>
           <div>
-            <Disclosure.Button className="parent-disclosure-arrangement">
+            <Disclosure.Button
+              className="parent-disclosure-arrangement"
+              data-testid={testId}
+            >
               <div className="flex gap-4">
                 <span className="parent-disclosure-title">{title}</span>
               </div>
diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
index 7643e66c9..c6ff8386f 100644
--- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
@@ -352,6 +352,7 @@ export default function ExtraSidebar(): JSX.Element {
             title: "Extended",
             Icon: nodeIconsLucide.unknown,
           }}
+          testId="extended-disclosure"
         >
           {Object.keys(dataFilter)
             .sort(sortKeys)
diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts
index 926120886..8ae482716 100644
--- a/src/frontend/src/types/components/index.ts
+++ b/src/frontend/src/types/components/index.ts
@@ -159,6 +159,7 @@ export type DisclosureComponentType = {
       onClick: (event?: React.MouseEvent) => void;
     }[];
   };
+  testId?: string;
 };
 
 export type RangeSpecType = {
diff --git a/src/frontend/tests/end-to-end/codeAreaModalComponent.spec.ts b/src/frontend/tests/end-to-end/codeAreaModalComponent.spec.ts
index 08f46e11c..299b94d95 100644
--- a/src/frontend/tests/end-to-end/codeAreaModalComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/codeAreaModalComponent.spec.ts
@@ -9,12 +9,14 @@ test("CodeAreaModalComponent", async ({ page }) => {
 
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
-
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("pythonfunctiontool");
 
   await page.waitForTimeout(1000);
 
+  await page.getByTestId("extended-disclosure").click();
+
   await page
     .getByTestId("toolsPythonFunctionTool")
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
diff --git a/src/frontend/tests/end-to-end/dropdownComponent.spec.ts b/src/frontend/tests/end-to-end/dropdownComponent.spec.ts
index e009a5179..8eab5882a 100644
--- a/src/frontend/tests/end-to-end/dropdownComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/dropdownComponent.spec.ts
@@ -10,6 +10,7 @@ test("dropDownComponent", async ({ page }) => {
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
 
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("amazon");
 
@@ -39,7 +40,7 @@ test("dropDownComponent", async ({ page }) => {
   await page.getByTestId("ai21.j2-mid-v1-10-option").click();
 
   let value = await page
-    .getByTestId("value-dropdown-model_id")
+    .getByTestId("value-dropdown-dropdown-model_id")
     .first()
     .innerText();
   if (value !== "ai21.j2-mid-v1") {
diff --git a/src/frontend/tests/end-to-end/filterEdge.spec.ts b/src/frontend/tests/end-to-end/filterEdge.spec.ts
index bcd3df2df..f75305629 100644
--- a/src/frontend/tests/end-to-end/filterEdge.spec.ts
+++ b/src/frontend/tests/end-to-end/filterEdge.spec.ts
@@ -10,6 +10,7 @@ test("LLMChain - Tooltip", async ({ page }) => {
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
 
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("llmchain");
 
@@ -104,7 +105,7 @@ test("LLMChain - Filter", async ({ page }) => {
 
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
-
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("llmchain");
 
diff --git a/src/frontend/tests/end-to-end/floatComponent.spec.ts b/src/frontend/tests/end-to-end/floatComponent.spec.ts
index d754e0576..587f0e7ef 100644
--- a/src/frontend/tests/end-to-end/floatComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/floatComponent.spec.ts
@@ -9,7 +9,7 @@ test("FloatComponent", async ({ page }) => {
 
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
-
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("ollama");
 
diff --git a/src/frontend/tests/end-to-end/flowPage.spec.ts b/src/frontend/tests/end-to-end/flowPage.spec.ts
index 6718ecc9a..f9511d37a 100644
--- a/src/frontend/tests/end-to-end/flowPage.spec.ts
+++ b/src/frontend/tests/end-to-end/flowPage.spec.ts
@@ -15,7 +15,7 @@ test.describe("Flow Page tests", () => {
 
     await page.getByTestId("blank-flow").click();
     await page.waitForTimeout(1000);
-
+    await page.getByTestId("extended-disclosure").click();
     await page.getByPlaceholder("Search").click();
     await page.getByPlaceholder("Search").fill("custom");
 
diff --git a/src/frontend/tests/end-to-end/inputComponent.spec.ts b/src/frontend/tests/end-to-end/inputComponent.spec.ts
index 3efecc7d4..8a1b4b46c 100644
--- a/src/frontend/tests/end-to-end/inputComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/inputComponent.spec.ts
@@ -9,7 +9,7 @@ test("InputComponent", async ({ page }) => {
 
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
-
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("Chroma");
 
diff --git a/src/frontend/tests/end-to-end/inputListComponent.spec.ts b/src/frontend/tests/end-to-end/inputListComponent.spec.ts
index 954478b8b..d23b071e5 100644
--- a/src/frontend/tests/end-to-end/inputListComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/inputListComponent.spec.ts
@@ -9,7 +9,7 @@ test("InputListComponent", async ({ page }) => {
 
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
-
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("astradb search");
 
diff --git a/src/frontend/tests/end-to-end/intComponent.spec.ts b/src/frontend/tests/end-to-end/intComponent.spec.ts
index 4bbb0b873..f146be0d6 100644
--- a/src/frontend/tests/end-to-end/intComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/intComponent.spec.ts
@@ -9,7 +9,7 @@ test("IntComponent", async ({ page }) => {
 
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
-
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("openai");
 
diff --git a/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts b/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts
index 457983d51..5b27103cc 100644
--- a/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts
@@ -9,7 +9,7 @@ test("KeypairListComponent", async ({ page }) => {
 
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
-
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("csv");
 
diff --git a/src/frontend/tests/end-to-end/langflowShortcuts.spec.ts b/src/frontend/tests/end-to-end/langflowShortcuts.spec.ts
index a6dc6180b..3fde97938 100644
--- a/src/frontend/tests/end-to-end/langflowShortcuts.spec.ts
+++ b/src/frontend/tests/end-to-end/langflowShortcuts.spec.ts
@@ -18,7 +18,7 @@ test("LangflowShortcuts", async ({ page }) => {
 
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
-
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("ollama");
 
diff --git a/src/frontend/tests/end-to-end/nestedComponent.spec.ts b/src/frontend/tests/end-to-end/nestedComponent.spec.ts
index 994395ad6..042c683bf 100644
--- a/src/frontend/tests/end-to-end/nestedComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/nestedComponent.spec.ts
@@ -9,7 +9,7 @@ test("NestedComponent", async ({ page }) => {
 
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
-
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("pinecone");
 
diff --git a/src/frontend/tests/end-to-end/promptModalComponent.spec.ts b/src/frontend/tests/end-to-end/promptModalComponent.spec.ts
index 82a8ad465..e725322e0 100644
--- a/src/frontend/tests/end-to-end/promptModalComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/promptModalComponent.spec.ts
@@ -9,7 +9,7 @@ test("PromptTemplateComponent", async ({ page }) => {
 
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
-
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("prompt");
 
diff --git a/src/frontend/tests/end-to-end/saveComponents.spec.ts b/src/frontend/tests/end-to-end/saveComponents.spec.ts
index aabba97f8..3860bb431 100644
--- a/src/frontend/tests/end-to-end/saveComponents.spec.ts
+++ b/src/frontend/tests/end-to-end/saveComponents.spec.ts
@@ -87,7 +87,7 @@ test.describe("save component tests", () => {
     if (replaceButton) {
       await page.getByTestId("replace-button").click();
     }
-
+    await page.getByTestId("extended-disclosure").click();
     await page.getByPlaceholder("Search").click();
     await page.getByPlaceholder("Search").fill("group");
     await page.waitForTimeout(1000);
diff --git a/src/frontend/tests/end-to-end/textAreaModalComponent.spec.ts b/src/frontend/tests/end-to-end/textAreaModalComponent.spec.ts
index d0e2f633e..b8ca1088e 100644
--- a/src/frontend/tests/end-to-end/textAreaModalComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/textAreaModalComponent.spec.ts
@@ -9,7 +9,7 @@ test("TextAreaModalComponent", async ({ page }) => {
 
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
-
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("prompt");
 
diff --git a/src/frontend/tests/end-to-end/toggleComponent.spec.ts b/src/frontend/tests/end-to-end/toggleComponent.spec.ts
index 041392d8d..1eabfa6a7 100644
--- a/src/frontend/tests/end-to-end/toggleComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/toggleComponent.spec.ts
@@ -9,7 +9,7 @@ test("ToggleComponent", async ({ page }) => {
 
   await page.getByTestId("blank-flow").click();
   await page.waitForTimeout(1000);
-
+  await page.getByTestId("extended-disclosure").click();
   await page.getByPlaceholder("Search").click();
   await page.getByPlaceholder("Search").fill("directoryLoader");