Skip to content

Commit

Permalink
Default operator only if UX_BETA enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
kgabryje committed Jul 26, 2021
1 parent 2510b1c commit 07994b6
Showing 1 changed file with 16 additions and 6 deletions.
Expand Up @@ -17,12 +17,19 @@
* under the License.
*/
import React, { useEffect, useMemo, useState } from 'react';
import { logging, SupersetClient, t, Metric } from '@superset-ui/core';
import {
FeatureFlag,
isFeatureEnabled,
logging,
Metric,
SupersetClient,
t,
} from '@superset-ui/core';
import { ColumnMeta } from '@superset-ui/chart-controls';
import { Tooltip } from 'src/components/Tooltip';
import {
Operators,
OPERATOR_ENUM_TO_OPERATOR_TYPE,
Operators,
} from 'src/explore/constants';
import { OptionSortType } from 'src/explore/types';
import {
Expand Down Expand Up @@ -304,11 +311,14 @@ export const DndFilterSelect = (props: DndFilterSelectProps) => {
sqlExpression: (droppedItem as AdhocMetric)?.translateToSql(),
});
}
return new AdhocFilter({
const config: Partial<AdhocFilter> = {
subject: (droppedItem as ColumnMeta)?.column_name,
operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.IN].operation,
operatorId: Operators.IN,
});
};
if (isFeatureEnabled(FeatureFlag.UX_BETA)) {
config.operator = OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.IN].operation;
config.operatorId = Operators.IN;
}
return new AdhocFilter(config);
}, [droppedItem]);

return (
Expand Down

0 comments on commit 07994b6

Please sign in to comment.