Skip to content

Commit 8fb4ca3

Browse files
Morililiedison-lhk
authored andcommitted
fix(dashboard): simplify design on choosing columnType in FormattingPopoverContent
1 parent a79f8bf commit 8fb4ca3

1 file changed

Lines changed: 25 additions & 12 deletions

File tree

superset-frontend/src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,17 @@ const renderOperator = ({
164164
showOnlyNone,
165165
columnType,
166166
}: { showOnlyNone?: boolean; columnType?: GenericDataType } = {}) => {
167-
const options =
168-
columnType === GenericDataType.String
169-
? stringOperatorOptions
170-
: columnType === GenericDataType.Boolean
171-
? booleanOperatorOptions
172-
: operatorOptions;
167+
let options;
168+
switch (columnType) {
169+
case GenericDataType.String:
170+
options = stringOperatorOptions;
171+
break;
172+
case GenericDataType.Boolean:
173+
options = booleanOperatorOptions;
174+
break;
175+
default:
176+
options = operatorOptions;
177+
}
173178

174179
return (
175180
<FormItem
@@ -330,12 +335,20 @@ export const FormattingPopoverContent = ({
330335
const handleColumnChange = (value: string) => {
331336
const newColumnType = columns.find(item => item.value === value)?.dataType;
332337
if (newColumnType !== previousColumnType) {
333-
const defaultOperator =
334-
newColumnType === GenericDataType.String
335-
? stringOperatorOptions[0].value
336-
: newColumnType === GenericDataType.Boolean
337-
? booleanOperatorOptions[0].value
338-
: operatorOptions[0].value;
338+
let defaultOperator: Comparator;
339+
340+
switch (newColumnType) {
341+
case GenericDataType.String:
342+
defaultOperator = stringOperatorOptions[0].value;
343+
break;
344+
345+
case GenericDataType.Boolean:
346+
defaultOperator = booleanOperatorOptions[0].value;
347+
break;
348+
349+
default:
350+
defaultOperator = operatorOptions[0].value;
351+
}
339352

340353
form.setFieldsValue({
341354
operator: defaultOperator,

0 commit comments

Comments
 (0)