You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by yo...@apache.org on 2022/04/20 13:02:27 UTC
[superset] branch master updated: chore: fix grammar error (#19740)
This is an automated email from the ASF dual-hosted git repository.
yongjiezhao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 4f997cd9ac chore: fix grammar error (#19740)
4f997cd9ac is described below
commit 4f997cd9ace0c59751bab8e4f910ce693fe3483f
Author: Yongjie Zhao <yo...@gmail.com>
AuthorDate: Wed Apr 20 21:02:14 2022 +0800
chore: fix grammar error (#19740)
---
.../superset-ui-chart-controls/src/operators/flattenOperator.ts | 1 -
.../superset-ui-chart-controls/src/operators/renameOperator.ts | 6 +++---
.../src/operators/rollingWindowOperator.ts | 4 ++--
.../superset-ui-chart-controls/src/operators/timeCompareOperator.ts | 4 ++--
.../src/operators/timeComparePivotOperator.ts | 4 ++--
.../superset-ui-chart-controls/src/operators/utils/index.ts | 2 +-
.../operators/utils/{isValidTimeCompare.ts => isTimeComparison.ts} | 2 +-
.../plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts | 6 +++---
8 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/operators/flattenOperator.ts b/superset-frontend/packages/superset-ui-chart-controls/src/operators/flattenOperator.ts
index 5188b34f2f..2fe732fc83 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/operators/flattenOperator.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/operators/flattenOperator.ts
@@ -1,4 +1,3 @@
-/* eslint-disable camelcase */
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/operators/renameOperator.ts b/superset-frontend/packages/superset-ui-chart-controls/src/operators/renameOperator.ts
index 66909047b8..94dfa70bbc 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/operators/renameOperator.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/operators/renameOperator.ts
@@ -24,7 +24,7 @@ import {
ComparisionType,
} from '@superset-ui/core';
import { PostProcessingFactory } from './types';
-import { getMetricOffsetsMap, isValidTimeCompare } from './utils';
+import { getMetricOffsetsMap, isTimeComparison } from './utils';
export const renameOperator: PostProcessingFactory<PostProcessingRename> = (
formData,
@@ -45,7 +45,7 @@ export const renameOperator: PostProcessingFactory<PostProcessingRename> = (
!(
// todo: we should provide an approach to handle derived metrics
(
- isValidTimeCompare(formData, queryObject) &&
+ isTimeComparison(formData, queryObject) &&
[
ComparisionType.Difference,
ComparisionType.Ratio,
@@ -60,7 +60,7 @@ export const renameOperator: PostProcessingFactory<PostProcessingRename> = (
// "actual values" will add derived metric.
// we will rename the "metric" from the metricWithOffset label
// for example: "count__1 year ago" => "1 year ago"
- isValidTimeCompare(formData, queryObject) &&
+ isTimeComparison(formData, queryObject) &&
formData.comparison_type === ComparisionType.Values
) {
const metricOffsetMap = getMetricOffsetsMap(formData, queryObject);
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/operators/rollingWindowOperator.ts b/superset-frontend/packages/superset-ui-chart-controls/src/operators/rollingWindowOperator.ts
index 563b3e0544..0ab459e5ca 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/operators/rollingWindowOperator.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/operators/rollingWindowOperator.ts
@@ -24,14 +24,14 @@ import {
PostProcessingRolling,
RollingType,
} from '@superset-ui/core';
-import { getMetricOffsetsMap, isValidTimeCompare } from './utils';
+import { getMetricOffsetsMap, isTimeComparison } from './utils';
import { PostProcessingFactory } from './types';
export const rollingWindowOperator: PostProcessingFactory<
PostProcessingRolling | PostProcessingCum
> = (formData, queryObject) => {
let columns: (string | undefined)[];
- if (isValidTimeCompare(formData, queryObject)) {
+ if (isTimeComparison(formData, queryObject)) {
const metricsMap = getMetricOffsetsMap(formData, queryObject);
columns = [
...Array.from(metricsMap.values()),
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/operators/timeCompareOperator.ts b/superset-frontend/packages/superset-ui-chart-controls/src/operators/timeCompareOperator.ts
index ec62384615..3fe253edfd 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/operators/timeCompareOperator.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/operators/timeCompareOperator.ts
@@ -18,7 +18,7 @@
* under the License.
*/
import { ComparisionType, PostProcessingCompare } from '@superset-ui/core';
-import { getMetricOffsetsMap, isValidTimeCompare } from './utils';
+import { getMetricOffsetsMap, isTimeComparison } from './utils';
import { PostProcessingFactory } from './types';
export const timeCompareOperator: PostProcessingFactory<PostProcessingCompare> =
@@ -27,7 +27,7 @@ export const timeCompareOperator: PostProcessingFactory<PostProcessingCompare> =
const metricOffsetMap = getMetricOffsetsMap(formData, queryObject);
if (
- isValidTimeCompare(formData, queryObject) &&
+ isTimeComparison(formData, queryObject) &&
comparisonType !== ComparisionType.Values
) {
return {
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/operators/timeComparePivotOperator.ts b/superset-frontend/packages/superset-ui-chart-controls/src/operators/timeComparePivotOperator.ts
index 44a1825ff8..f7bbd238c6 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/operators/timeComparePivotOperator.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/operators/timeComparePivotOperator.ts
@@ -24,14 +24,14 @@ import {
NumpyFunction,
PostProcessingPivot,
} from '@superset-ui/core';
-import { getMetricOffsetsMap, isValidTimeCompare } from './utils';
+import { getMetricOffsetsMap, isTimeComparison } from './utils';
import { PostProcessingFactory } from './types';
export const timeComparePivotOperator: PostProcessingFactory<PostProcessingPivot> =
(formData, queryObject) => {
const metricOffsetMap = getMetricOffsetsMap(formData, queryObject);
- if (isValidTimeCompare(formData, queryObject)) {
+ if (isTimeComparison(formData, queryObject)) {
const aggregates = Object.fromEntries(
[...metricOffsetMap.values(), ...metricOffsetMap.keys()].map(metric => [
metric,
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/operators/utils/index.ts b/superset-frontend/packages/superset-ui-chart-controls/src/operators/utils/index.ts
index d591dbd23e..e4dfbd7769 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/operators/utils/index.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/operators/utils/index.ts
@@ -18,5 +18,5 @@
* under the License.
*/
export { getMetricOffsetsMap } from './getMetricOffsetsMap';
-export { isValidTimeCompare } from './isValidTimeCompare';
+export { isTimeComparison } from './isTimeComparison';
export { TIME_COMPARISON_SEPARATOR } from './constants';
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/operators/utils/isValidTimeCompare.ts b/superset-frontend/packages/superset-ui-chart-controls/src/operators/utils/isTimeComparison.ts
similarity index 94%
rename from superset-frontend/packages/superset-ui-chart-controls/src/operators/utils/isValidTimeCompare.ts
rename to superset-frontend/packages/superset-ui-chart-controls/src/operators/utils/isTimeComparison.ts
index 793bb39231..4430b9541c 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/operators/utils/isValidTimeCompare.ts
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/operators/utils/isTimeComparison.ts
@@ -21,7 +21,7 @@ import { ComparisionType } from '@superset-ui/core';
import { getMetricOffsetsMap } from './getMetricOffsetsMap';
import { PostProcessingFactory } from '../types';
-export const isValidTimeCompare: PostProcessingFactory<boolean> = (
+export const isTimeComparison: PostProcessingFactory<boolean> = (
formData,
queryObject,
) => {
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
index c2f603bfc4..3478c73470 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
@@ -27,7 +27,7 @@ import {
import {
rollingWindowOperator,
timeCompareOperator,
- isValidTimeCompare,
+ isTimeComparison,
pivotOperator,
resampleOperator,
renameOperator,
@@ -61,7 +61,7 @@ export default function buildQuery(formData: QueryFormData) {
2015-03-01 318.0 0.0
*/
- const pivotOperatorInRuntime: PostProcessingPivot = isValidTimeCompare(
+ const pivotOperatorInRuntime: PostProcessingPivot = isTimeComparison(
formData,
baseQueryObject,
)
@@ -80,7 +80,7 @@ export default function buildQuery(formData: QueryFormData) {
is_timeseries,
// todo: move `normalizeOrderBy to extractQueryFields`
orderby: normalizeOrderBy(baseQueryObject).orderby,
- time_offsets: isValidTimeCompare(formData, baseQueryObject)
+ time_offsets: isTimeComparison(formData, baseQueryObject)
? formData.time_compare
: [],
/* Note that: