chore: fix grammar error (apache#19740)

ValtechMobility · Jun 9, 2022 · ff4b7a6 · ff4b7a6
1 parent d1ddc32
commit ff4b7a6
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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/...et-frontend/packages/superset-ui-chart-controls/src/operators/timeComparePivotOperator.ts b/...et-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
@@ -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/...src/operators/utils/isValidTimeCompare.ts → ...s/src/operators/utils/isTimeComparison.ts b/...src/operators/utils/isValidTimeCompare.ts → ...s/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
@@ -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: