diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index dc49327ec12bf..a23f318d4a3e7 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -88,6 +88,8 @@ const D3_FORMAT_OPTIONS = [
[',.3f', ',.3f (12345.432 => 12,345.432)'],
['+,', '+, (12345.432 => +12,345.432)'],
['$,.2f', '$,.2f (12345.432 => $12,345.43)'],
+ ['DURATION', 'Duration in ms (66000 => 1m 6s)'],
+ ['DURATION_SUB', 'Duration in ms (100.40008 => 100ms 400µs 80ns)'],
];
const ROW_LIMIT_OPTIONS = [10, 50, 100, 250, 500, 1000, 5000, 10000, 50000];
diff --git a/superset/assets/src/query/Column.ts b/superset/assets/src/query/Column.ts
deleted file mode 100644
index d627e94016524..0000000000000
--- a/superset/assets/src/query/Column.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-export enum ColumnType {
- DOUBLE = 'DOUBLE',
- FLOAT = 'FLOAT',
- INT = 'INT',
- BIGINT = 'BIGINT',
- LONG = 'LONG',
- REAL = 'REAL',
- NUMERIC = 'NUMERIC',
- DECIMAL = 'DECIMAL',
- MONEY = 'MONEY',
- DATE = 'DATE',
- TIME = 'TIME',
- DATETIME = 'DATETIME',
- VARCHAR = 'VARCHAR',
- STRING = 'STRING',
- CHAR = 'CHAR',
-}
-
-// TODO: fill out additional fields of the Column interface
-export default interface Column {
- id: number;
- type: ColumnType;
- columnName: string;
-}
diff --git a/superset/assets/src/query/DatasourceKey.ts b/superset/assets/src/query/DatasourceKey.ts
deleted file mode 100644
index f0251f5b35d9c..0000000000000
--- a/superset/assets/src/query/DatasourceKey.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-enum DatasourceType {
- Table = 'table',
- Druid = 'druid',
-}
-
-export default interface DatasourceKey {
- id: number;
- type: DatasourceType;
-}
-
-// Declaration merging with the interface above. No need to redeclare id and type.
-export default class DatasourceKey {
- constructor(key: string) {
- const [ idStr, typeStr ] = key.split('__');
- this.id = parseInt(idStr, 10);
- this.type = typeStr === 'table' ? DatasourceType.Table : DatasourceType.Druid;
- }
-
- public toString() {
- return `${this.id}__${this.type}`;
- }
-
- public toObject() {
- return {
- id: this.id,
- type: this.type,
- };
- }
-}
diff --git a/superset/assets/src/query/FormData.ts b/superset/assets/src/query/FormData.ts
deleted file mode 100644
index a282c6409b5f7..0000000000000
--- a/superset/assets/src/query/FormData.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { AdhocMetric, MetricKey } from './Metric';
-
-// Type signature and utility functions for formData shared by all viz types
-// It will be gradually filled out as we build out the query object
-
-// Define mapped type separately to work around a limitation of TypeScript
-// https://github.com/Microsoft/TypeScript/issues/13573
-// The Metrics in formData is either a string or a proper metric. It will be
-// unified into a proper Metric type during buildQuery (see `/query/Metrics.ts`).
-type Metrics = Partial
>;
-
-type BaseFormData = {
- datasource: string;
-} & Metrics;
-
-// FormData is either sqla-based or druid-based
-type SqlaFormData = {
- granularity_sqla: string;
-} & BaseFormData;
-
-type DruidFormData = {
- granularity: string;
-} & BaseFormData;
-
-type FormData = SqlaFormData | DruidFormData;
-export default FormData;
-
-export function getGranularity(formData: FormData): string {
- return 'granularity_sqla' in formData ? formData.granularity_sqla : formData.granularity;
-}
diff --git a/superset/assets/src/query/Metric.ts b/superset/assets/src/query/Metric.ts
deleted file mode 100644
index 1ff6bccd8eaf4..0000000000000
--- a/superset/assets/src/query/Metric.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import Column from './Column';
-import FormData from './FormData';
-
-export const LABEL_MAX_LENGTH = 43;
-
-// Note that the values of MetricKeys are lower_snake_case because they're
-// used as keys of form data jsons.
-export enum MetricKey {
- METRIC = 'metric',
- METRICS = 'metrics',
- PERCENT_METRICS = 'percent_metrics',
- RIGHT_AXIS_METRIC = 'metric_2',
- SECONDARY_METRIC = 'secondary_metric',
- X = 'x',
- Y = 'y',
- SIZE = 'size',
-}
-
-export enum Aggregate {
- AVG = 'AVG',
- COUNT = 'COUNT ',
- COUNT_DISTINCT = 'COUNT_DISTINCT',
- MAX = 'MAX',
- MIN = 'MIN',
- SUM = 'SUM',
-}
-
-export enum ExpressionType {
- SIMPLE = 'SIMPLE',
- SQL = 'SQL',
-}
-
-interface AdhocMetricSimple {
- expressionType: ExpressionType.SIMPLE;
- column: Column;
- aggregate: Aggregate;
-}
-
-interface AdhocMetricSQL {
- expressionType: ExpressionType.SQL;
- sqlExpression: string;
-}
-
-export type AdhocMetric = {
- label?: string,
- optionName?: string,
-} & (AdhocMetricSimple | AdhocMetricSQL);
-
-type Metric = {
- label: string;
-} & Partial;
-
-export default Metric;
-
-export class Metrics {
- // Use Array to maintain insertion order for metrics that are order sensitive
- private metrics: Metric[];
-
- constructor(formData: FormData) {
- this.metrics = [];
- for (const key of Object.keys(MetricKey)) {
- const metric = formData[MetricKey[key] as MetricKey];
- if (metric) {
- if (typeof metric === 'string') {
- this.metrics.push({
- label: metric,
- });
- } else {
- // Note we further sanitize the metric label for BigQuery datasources
- // TODO: move this logic to the client once client has more info on the
- // the datasource
- const label = metric.label || this.getDefaultLabel(metric);
- this.metrics.push({
- ...metric,
- label,
- });
- }
- }
- }
- }
-
- public getMetrics() {
- return this.metrics;
- }
-
- public getLabels() {
- return this.metrics.map((m) => m.label);
- }
-
- private getDefaultLabel(metric: AdhocMetric) {
- let label: string;
- if (metric.expressionType === ExpressionType.SIMPLE) {
- label = `${metric.aggregate}(${(metric.column.columnName)})`;
- } else {
- label = metric.sqlExpression;
- }
- return label.length <= LABEL_MAX_LENGTH ? label :
- `${label.substring(0, LABEL_MAX_LENGTH - 3)}...`;
- }
-}
diff --git a/superset/assets/src/query/buildQueryContext.ts b/superset/assets/src/query/buildQueryContext.ts
deleted file mode 100644
index f0f4c4f7c028a..0000000000000
--- a/superset/assets/src/query/buildQueryContext.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import buildQueryObject, { QueryObject } from './buildQueryObject';
-import DatasourceKey from './DatasourceKey';
-import FormData from './FormData';
-
-const WRAP_IN_ARRAY = (baseQueryObject: QueryObject) => [baseQueryObject];
-
-// Note: let TypeScript infer the return type
-export default function buildQueryContext(
- formData: FormData,
- buildQuery: (baseQueryObject: QueryObject) => QueryObject[] = WRAP_IN_ARRAY) {
- return {
- datasource: new DatasourceKey(formData.datasource).toObject(),
- queries: buildQuery(buildQueryObject(formData)),
- };
-}
diff --git a/superset/assets/src/query/buildQueryObject.ts b/superset/assets/src/query/buildQueryObject.ts
deleted file mode 100644
index 8549955def1e1..0000000000000
--- a/superset/assets/src/query/buildQueryObject.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import FormData, { getGranularity } from './FormData';
-import Metric, { Metrics } from './Metric';
-
-// TODO: fill out the rest of the query object
-export interface QueryObject {
- granularity: string;
- groupby?: string[];
- metrics?: Metric[];
-}
-
-// Build the common segments of all query objects (e.g. the granularity field derived from
-// either sql alchemy or druid). The segments specific to each viz type is constructed in the
-// buildQuery method for each viz type (see `wordcloud/buildQuery.ts` for an example).
-// Note the type of the formData argument passed in here is the type of the formData for a
-// specific viz, which is a subtype of the generic formData shared among all viz types.
-export default function buildQueryObject(formData: T): QueryObject {
- return {
- granularity: getGranularity(formData),
- metrics: new Metrics(formData).getMetrics(),
- };
-}
diff --git a/superset/assets/src/query/index.ts b/superset/assets/src/query/index.ts
deleted file mode 100644
index f9b4e1c5f34b5..0000000000000
--- a/superset/assets/src/query/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-// Public API of the query module
-export { default } from './buildQueryContext';
-export { default as FormData } from './FormData';
diff --git a/superset/assets/src/setup/setupFormatters.js b/superset/assets/src/setup/setupFormatters.js
index 7d6bd2c6bfaeb..9972caeb3ed0a 100644
--- a/superset/assets/src/setup/setupFormatters.js
+++ b/superset/assets/src/setup/setupFormatters.js
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { getNumberFormatter, getNumberFormatterRegistry, NumberFormats } from '@superset-ui/number-format';
+import { createDurationFormatter, getNumberFormatter, getNumberFormatterRegistry, NumberFormats } from '@superset-ui/number-format';
import { getTimeFormatterRegistry, smartDateFormatter, smartDateVerboseFormatter } from '@superset-ui/time-format';
export default function setupFormatters() {
@@ -54,7 +54,9 @@ export default function setupFormatters() {
.registerValue('.0%f', getNumberFormatter('.1%'))
.registerValue('$,0', getNumberFormatter('$,.4f'))
.registerValue('$,0f', getNumberFormatter('$,.4f'))
- .registerValue('$,.f', getNumberFormatter('$,.4f'));
+ .registerValue('$,.f', getNumberFormatter('$,.4f'))
+ .registerValue('DURATION', createDurationFormatter())
+ .registerValue('DURATION_SUB', createDurationFormatter({ formatSubMilliseconds: true }));
getTimeFormatterRegistry()
.registerValue('smart_date', smartDateFormatter)
diff --git a/superset/assets/stylesheets/less/index.less b/superset/assets/stylesheets/less/index.less
index 680c134b59915..b1fc604323c0e 100644
--- a/superset/assets/stylesheets/less/index.less
+++ b/superset/assets/stylesheets/less/index.less
@@ -25,7 +25,11 @@
@stroke-primary: @brand-primary;
body {
- min-height: 100vh;
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
display: flex;
flex-direction: column;
}
diff --git a/superset/utils/core.py b/superset/utils/core.py
index c341f0843ea8c..8e704551fad10 100644
--- a/superset/utils/core.py
+++ b/superset/utils/core.py
@@ -30,7 +30,6 @@
import os
import signal
import smtplib
-import sys
from time import struct_time
import traceback
from typing import List, NamedTuple, Optional, Tuple, Union
@@ -68,7 +67,6 @@
logging.getLogger("MARKDOWN").setLevel(logging.INFO)
-PY3K = sys.version_info >= (3, 0)
DTTM_ALIAS = "__timestamp"
ADHOC_METRIC_EXPRESSION_TYPES = {"SIMPLE": "SIMPLE", "SQL": "SQL"}
@@ -796,10 +794,8 @@ def zlib_compress(data):
>>> json_str = '{"test": 1}'
>>> blob = zlib_compress(json_str)
"""
- if PY3K:
- if isinstance(data, str):
- return zlib.compress(bytes(data, "utf-8"))
- return zlib.compress(data)
+ if isinstance(data, str):
+ return zlib.compress(bytes(data, "utf-8"))
return zlib.compress(data)
@@ -812,13 +808,11 @@ def zlib_decompress(blob: bytes, decode: Optional[bool] = True) -> Union[bytes,
>>> got_str == json_str
True
"""
- if PY3K:
- if isinstance(blob, bytes):
- decompressed = zlib.decompress(blob)
- else:
- decompressed = zlib.decompress(bytes(blob, "utf-8"))
- return decompressed.decode("utf-8") if decode else decompressed
- return zlib.decompress(blob)
+ if isinstance(blob, bytes):
+ decompressed = zlib.decompress(blob)
+ else:
+ decompressed = zlib.decompress(bytes(blob, "utf-8"))
+ return decompressed.decode("utf-8") if decode else decompressed
_celery_app = None
diff --git a/superset/viz.py b/superset/viz.py
index 184a379340ada..06ff4261b3a64 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -1477,22 +1477,18 @@ def query_obj(self):
numeric_columns = self.form_data.get("all_columns_x")
if numeric_columns is None:
raise Exception(_("Must have at least one numeric column specified"))
- self.columns = [numeric_columns]
- d["columns"] = [numeric_columns] + self.groupby
+ self.columns = numeric_columns
+ d["columns"] = numeric_columns + self.groupby
# override groupby entry to avoid aggregation
d["groupby"] = []
return d
def labelify(self, keys, column):
- if isinstance(keys, str) or isinstance(keys, int):
+ if isinstance(keys, str):
keys = (keys,)
-
# removing undesirable characters
- labels = [
- re.sub(r"\W+", r"_", k) if isinstance(k, str) else str(k) for k in keys
- ]
-
- if len(self.columns) > 0 or not self.groupby:
+ labels = [re.sub(r"\W+", r"_", k) for k in keys]
+ if len(self.columns) > 1 or not self.groupby:
# Only show numeric column in label if there are many
labels = [column] + labels
return "__".join(labels)