QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-06-03 06:39:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: make TS enums strictly PascalCase (#26875)

Browse Source
This commit is contained in:
Ville Brofeldt
2024-01-31 17:40:44 -08:00
committed by GitHub
parent 959a5a5ad6
commit 19f8405bc0
362 changed files with 2002 additions and 2032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.test.tsx
View File

@@ -37,7 +37,7 @@ import {
DndFilterSelectProps,
} from 'src/explore/components/controls/DndColumnSelectControl/DndFilterSelect';
import { PLACEHOLDER_DATASOURCE } from 'src/dashboard/constants';
import { EXPRESSION_TYPES } from '../FilterControl/types';
import { ExpressionTypes } from '../FilterControl/types';
const defaultProps: DndFilterSelectProps = {
type: 'DndFilterSelect',
@@ -91,7 +91,7 @@ test('renders with default props', async () => {
test('renders with value', async () => {
const value = new AdhocFilter({
sqlExpression: 'COUNT(*)',
expressionType: EXPRESSION_TYPES.SQL,
expressionType: ExpressionTypes.Sql,
});
render(setup({ value }), {
useDnd: true,
@@ -124,7 +124,7 @@ test('renders options with column', async () => {
{
id: 1,
type: 'VARCHAR',
type_generic: GenericDataType.STRING,
type_generic: GenericDataType.String,
column_name: 'Column',
},
],

42
superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndFilterSelect.tsx
View File

@@ -50,7 +50,7 @@ import { DndItemType } from 'src/explore/components/DndItemType';
import { ControlComponentProps } from 'src/explore/components/Control';
import DndAdhocFilterOption from './DndAdhocFilterOption';
import { useDefaultTimeFilter } from '../DateFilterControl/utils';
import { CLAUSES, EXPRESSION_TYPES } from '../FilterControl/types';
import { Clauses, ExpressionTypes } from '../FilterControl/types';
const { warning } = Modal;
@@ -246,36 +246,36 @@ const DndFilterSelect = (props: DndFilterSelectProps) => {
// via datasource saved metric
if (filterOptions.saved_metric_name) {
return new AdhocFilter({
expressionType: EXPRESSION_TYPES.SQL,
expressionType: ExpressionTypes.Sql,
subject: getMetricExpression(filterOptions.saved_metric_name),
operator:
OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.GREATER_THAN].operation,
operatorId: Operators.GREATER_THAN,
OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.GreaterThan].operation,
operatorId: Operators.GreaterThan,
comparator: 0,
clause: CLAUSES.HAVING,
clause: Clauses.Having,
});
}
// has a custom label, meaning it's custom column
if (filterOptions.label) {
return new AdhocFilter({
expressionType: EXPRESSION_TYPES.SQL,
expressionType: ExpressionTypes.Sql,
subject: new AdhocMetric(option).translateToSql(),
operator:
OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.GREATER_THAN].operation,
operatorId: Operators.GREATER_THAN,
OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.GreaterThan].operation,
operatorId: Operators.GreaterThan,
comparator: 0,
clause: CLAUSES.HAVING,
clause: Clauses.Having,
});
}
// add a new filter item
if (filterOptions.column_name) {
return new AdhocFilter({
expressionType: EXPRESSION_TYPES.SIMPLE,
expressionType: ExpressionTypes.Simple,
subject: filterOptions.column_name,
operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.EQUALS].operation,
operatorId: Operators.EQUALS,
operator: OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.Equals].operation,
operatorId: Operators.Equals,
comparator: '',
clause: CLAUSES.WHERE,
clause: Clauses.Where,
isNew: true,
});
}
@@ -352,15 +352,15 @@ const DndFilterSelect = (props: DndFilterSelectProps) => {
const adhocFilter = useMemo(() => {
if (isSavedMetric(droppedItem)) {
return new AdhocFilter({
expressionType: EXPRESSION_TYPES.SQL,
clause: CLAUSES.HAVING,
expressionType: ExpressionTypes.Sql,
clause: Clauses.Having,
sqlExpression: droppedItem?.expression,
});
}
if (droppedItem instanceof AdhocMetric) {
return new AdhocFilter({
expressionType: EXPRESSION_TYPES.SQL,
clause: CLAUSES.HAVING,
expressionType: ExpressionTypes.Sql,
clause: Clauses.Having,
sqlExpression: (droppedItem as AdhocMetric)?.translateToSql(),
});
}
@@ -368,15 +368,15 @@ const DndFilterSelect = (props: DndFilterSelectProps) => {
subject: (droppedItem as ColumnMeta)?.column_name,
};
if (config.subject) {
config.operator = OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.IN].operation;
config.operatorId = Operators.IN;
config.operator = OPERATOR_ENUM_TO_OPERATOR_TYPE[Operators.In].operation;
config.operatorId = Operators.In;
}
if (
isColumnMeta(droppedItem) &&
isTemporalColumn(droppedItem?.column_name, props.datasource)
) {
config.operator = Operators.TEMPORAL_RANGE;
config.operatorId = Operators.TEMPORAL_RANGE;
config.operator = Operators.TemporalRange;
config.operatorId = Operators.TemporalRange;
config.comparator = defaultTimeFilter;
}
return new AdhocFilter(config);

8
superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndMetricSelect.tsx
View File

@@ -312,12 +312,12 @@ const DndMetricSelect = (props: any) => {
const config: Partial<AdhocMetric> = {
column: itemValue,
};
if (itemValue.type_generic === GenericDataType.NUMERIC) {
if (itemValue.type_generic === GenericDataType.Numeric) {
config.aggregate = AGGREGATES.SUM;
} else if (
itemValue.type_generic === GenericDataType.STRING ||
itemValue.type_generic === GenericDataType.BOOLEAN ||
itemValue.type_generic === GenericDataType.TEMPORAL
itemValue.type_generic === GenericDataType.String ||
itemValue.type_generic === GenericDataType.Boolean ||
itemValue.type_generic === GenericDataType.Temporal
) {
config.aggregate = AGGREGATES.COUNT_DISTINCT;
}