From 51c1f8859389a54a06a0a08624d78953301ff233 Mon Sep 17 00:00:00 2001 From: Rajat Dabade Date: Fri, 19 Jan 2024 12:05:44 +0530 Subject: [PATCH] Revert "[Feat]: added iscolumn in option rendering" (#4396) --- .../filters/AggregatorFilter/AggregatorFilter.tsx | 1 - .../QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx | 1 - .../filters/QueryBuilderSearch/OptionRenderer.tsx | 6 ------ .../QueryBuilder/filters/QueryBuilderSearch/index.tsx | 1 - frontend/src/container/QueryBuilder/type.ts | 1 - frontend/src/hooks/queryBuilder/useOptions.ts | 1 - 6 files changed, 11 deletions(-) diff --git a/frontend/src/container/QueryBuilder/filters/AggregatorFilter/AggregatorFilter.tsx b/frontend/src/container/QueryBuilder/filters/AggregatorFilter/AggregatorFilter.tsx index b5683f9ced..f27336e96a 100644 --- a/frontend/src/container/QueryBuilder/filters/AggregatorFilter/AggregatorFilter.tsx +++ b/frontend/src/container/QueryBuilder/filters/AggregatorFilter/AggregatorFilter.tsx @@ -81,7 +81,6 @@ export const AggregatorFilter = memo(function AggregatorFilter({ }), )} dataType={item.dataType} - isColumn={item.isColumn} /> ), value: `${item.key}${selectValueDivider}${createIdFromObjectFields( diff --git a/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx b/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx index a3213cb4bc..386786f70c 100644 --- a/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx +++ b/frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx @@ -81,7 +81,6 @@ export const GroupByFilter = memo(function GroupByFilter({ }), )} dataType={item.dataType || ''} - isColumn={item.isColumn} /> ), value: `${transformStringWithPrefix({ diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRenderer.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRenderer.tsx index 94cd2f2b9d..32bf8fbd40 100644 --- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRenderer.tsx +++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRenderer.tsx @@ -10,7 +10,6 @@ function OptionRenderer({ label, value, dataType, - isColumn, }: OptionRendererProps): JSX.Element { const optionType = getOptionType(label); @@ -28,10 +27,6 @@ function OptionRenderer({ Data type: {dataType} - - isColumn: - {isColumn ? 'True' : 'False'} - ) : ( @@ -45,7 +40,6 @@ interface OptionRendererProps { label: string; value: string; dataType: string; - isColumn: boolean; } export default OptionRenderer; diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx index b4af20c58b..975c79a4a8 100644 --- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx +++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx @@ -210,7 +210,6 @@ function QueryBuilderSearch({ label={option.label} value={option.value} dataType={option.dataType || ''} - isColumn={option.isColumn || false} /> {option.selected && } diff --git a/frontend/src/container/QueryBuilder/type.ts b/frontend/src/container/QueryBuilder/type.ts index 69add7d3db..892330ebdd 100644 --- a/frontend/src/container/QueryBuilder/type.ts +++ b/frontend/src/container/QueryBuilder/type.ts @@ -15,5 +15,4 @@ export type Option = { label: string; selected?: boolean; dataType?: string; - isColumn?: boolean; }; diff --git a/frontend/src/hooks/queryBuilder/useOptions.ts b/frontend/src/hooks/queryBuilder/useOptions.ts index bc599b0bcc..322934372c 100644 --- a/frontend/src/hooks/queryBuilder/useOptions.ts +++ b/frontend/src/hooks/queryBuilder/useOptions.ts @@ -44,7 +44,6 @@ export const useOptions = ( label: `${getLabel(item)}`, value: item.key, dataType: item.dataType, - isColumn: item.isColumn, })), [getLabel], );