From 62f44ebed373ea4a118deba874388577e2209865 Mon Sep 17 00:00:00 2001
From: Rahul Barwal <rahul.barwal@appsmith.com>
Date: Thu, 19 Dec 2024 12:58:19 +0530
Subject: [PATCH] Revert "fix: Correct Select Widget Mapping for Dynamic Label
 and Value Keys (#35862)"

This reverts commit 9f387d5763b98b6e0b1fcbd053b9f945ec0942a9.
---
 .../ClientSide/Widgets/Select/Select2_Spec.ts | 51 -------------------
 .../widgets/SelectWidget/widget/derived.js    |  4 +-
 2 files changed, 2 insertions(+), 53 deletions(-)

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts
index 4f91c5c0c9f1..fd2d5f5c4475 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts
@@ -7,7 +7,6 @@ import {
   locators,
   propPane,
   widgetLocators,
-  jsEditor,
 } from "../../../../../support/Objects/ObjectsCore";
 import EditorNavigation, {
   EntityType,
@@ -21,24 +20,6 @@ describe(
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.SELECT);
     });
 
-    const validateLabelAndValueKey = (labelKey: string, valueKey: string) => {
-      // Validate Label key
-      propPane.ToggleJSMode("Label key", true);
-      propPane.UpdatePropertyFieldValue("Label key", labelKey);
-      agHelper.SelectDropDown("Blue");
-      agHelper.ReadSelectedDropDownValue().then(($selectedValue) => {
-        expect($selectedValue).to.eq("Blue");
-      });
-
-      // Validate Value key
-      propPane.ToggleJSMode("Value key", true);
-      propPane.UpdatePropertyFieldValue("Value key", valueKey);
-      agHelper.SelectDropDown("Blue");
-      agHelper.ReadSelectedDropDownValue().then(($selectedValue) => {
-        expect($selectedValue).to.eq("Blue");
-      });
-    };
-
     it("1. Validate Label properties - Text , Position , Alignment , Width(in columns)", function () {
       //Text
       propPane.TypeTextIntoField("Text", "Select Value");
@@ -318,37 +299,5 @@ describe(
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.FORM));
       cy.get(locators._selectClearButton_testId).should("not.exist");
     });
-
-    it("10.Validate using function inside label key and value key returns correct label options", () => {
-      // Navigate back to the editor
-      deployMode.NavigateBacktoEditor();
-
-      // Select the widget
-      EditorNavigation.SelectEntityByName("Select1", EntityType.Widget);
-
-      // Validate keys
-      validateLabelAndValueKey("{{(() => 'name')()}}", "{{(() => 'code')()}}");
-
-      // Create JS Object with array data
-      jsEditor.CreateJSObject(
-        `export default {
-            array: [1, 2, 3]
-          }`,
-        {
-          completeReplace: true,
-          toRun: false,
-          prettify: true,
-        },
-      );
-
-      // Select the widget
-      EditorNavigation.SelectEntityByName("Select1", EntityType.Widget);
-
-      // Validate keys
-      validateLabelAndValueKey(
-        "{{JSObject1.array.length > 0 ? 'name' : ''}}",
-        "{{JSObject1.array.length > 0 ? 'code' : ''}}",
-      );
-    });
   },
 );
diff --git a/app/client/src/widgets/SelectWidget/widget/derived.js b/app/client/src/widgets/SelectWidget/widget/derived.js
index 30612ed00db4..fd76ef07b22f 100644
--- a/app/client/src/widgets/SelectWidget/widget/derived.js
+++ b/app/client/src/widgets/SelectWidget/widget/derived.js
@@ -8,13 +8,13 @@ export default {
     if (typeof props.optionLabel === "string") {
       labels = sourceData.map((d) => d[props.optionLabel]);
     } else if (_.isArray(props.optionLabel)) {
-      labels = sourceData.map((d, i) => d[props.optionLabel[i]]);
+      labels = props.optionLabel;
     }
 
     if (typeof props.optionValue === "string") {
       values = sourceData.map((d) => d[props.optionValue]);
     } else if (_.isArray(props.optionValue)) {
-      values = sourceData.map((d, i) => d[props.optionValue[i]]);
+      values = props.optionValue;
     }
 
     return sourceData.map((d, i) => ({