From b447aa83453bec71883b4cf06be222e5da70fa7f Mon Sep 17 00:00:00 2001
From: Aswath K <aswath.sana@gmail.com>
Date: Tue, 30 Mar 2021 22:10:23 +0530
Subject: [PATCH 1/2] Allow removing filter on Dropdown Widget

---
 .../designSystems/blueprint/DropdownComponent.tsx    |  3 ++-
 app/client/src/widgets/DropdownWidget.tsx            | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/client/src/components/designSystems/blueprint/DropdownComponent.tsx b/app/client/src/components/designSystems/blueprint/DropdownComponent.tsx
index 5c1b1de9b0..cd4613ab79 100644
--- a/app/client/src/components/designSystems/blueprint/DropdownComponent.tsx
+++ b/app/client/src/components/designSystems/blueprint/DropdownComponent.tsx
@@ -259,7 +259,7 @@ class DropDownComponent extends React.Component<DropDownComponentProps> {
             <StyledSingleDropDown
               className={this.props.isLoading ? Classes.SKELETON : ""}
               items={this.props.options}
-              filterable={true}
+              filterable={this.props.isFilterable}
               itemRenderer={this.renderSingleSelectItem}
               onItemSelect={this.onItemSelect}
               disabled={this.props.disabled}
@@ -414,6 +414,7 @@ export interface DropDownComponentProps extends ComponentProps {
   selectedIndexArr: number[];
   options: DropdownOption[];
   isLoading: boolean;
+  isFilterable: boolean;
   width: number;
   height: number;
 }
diff --git a/app/client/src/widgets/DropdownWidget.tsx b/app/client/src/widgets/DropdownWidget.tsx
index d4adbd943b..ab2fd3abb7 100644
--- a/app/client/src/widgets/DropdownWidget.tsx
+++ b/app/client/src/widgets/DropdownWidget.tsx
@@ -58,6 +58,15 @@ class DropdownWidget extends BaseWidget<DropdownWidgetProps, WidgetState> {
             isBindProperty: true,
             isTriggerProperty: false,
           },
+          {
+            propertyName: "isFilterable",
+            label: "Filterable",
+            helpText: "Makes the dropdown list filterable",
+            controlType: "SWITCH",
+            isJSConvertible: true,
+            isBindProperty: true,
+            isTriggerProperty: false,
+          },
           {
             propertyName: "isRequired",
             label: "Required",
@@ -111,6 +120,7 @@ class DropdownWidget extends BaseWidget<DropdownWidgetProps, WidgetState> {
       options: VALIDATION_TYPES.OPTIONS_DATA,
       selectionType: VALIDATION_TYPES.TEXT,
       isRequired: VALIDATION_TYPES.BOOLEAN,
+      isFilterable: VALIDATION_TYPES.BOOLEAN,
       // onOptionChange: VALIDATION_TYPES.ACTION_SELECTOR,
       selectedOptionValues: VALIDATION_TYPES.ARRAY,
       selectedOptionLabels: VALIDATION_TYPES.ARRAY,
@@ -180,6 +190,7 @@ class DropdownWidget extends BaseWidget<DropdownWidgetProps, WidgetState> {
         selectedIndexArr={computedSelectedIndexArr}
         label={`${this.props.label}`}
         isLoading={this.props.isLoading}
+        isFilterable={this.props.isFilterable}
         disabled={this.props.isDisabled}
       />
     );
@@ -277,6 +288,7 @@ export interface DropdownWidgetProps extends WidgetProps, WithMeta {
   onOptionChange?: string;
   defaultOptionValue?: string | string[];
   isRequired: boolean;
+  isFilterable: boolean;
   selectedOptionValue: string;
   selectedOptionValueArr: string[];
   selectedOptionLabels: string[];

From a6afa8ce4dc728dbf7cd01270b42834a109954a4 Mon Sep 17 00:00:00 2001
From: Aswath K <aswath.sana@gmail.com>
Date: Wed, 31 Mar 2021 08:42:27 +0530
Subject: [PATCH 2/2] Makes isFilterable true by default for DropdownWidget

---
 app/client/src/mockResponses/WidgetConfigResponse.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/client/src/mockResponses/WidgetConfigResponse.tsx b/app/client/src/mockResponses/WidgetConfigResponse.tsx
index c2fb30230a..78fa5c42ab 100644
--- a/app/client/src/mockResponses/WidgetConfigResponse.tsx
+++ b/app/client/src/mockResponses/WidgetConfigResponse.tsx
@@ -173,6 +173,7 @@ const WidgetConfigResponse: WidgetConfigReducerState = {
       ],
       widgetName: "Dropdown",
       defaultOptionValue: "VEG",
+      isFilterable: true,
       version: 1,
     },
     CHECKBOX_WIDGET: {