Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: fix grammar error #19740

Merged
merged 1 commit into from
Apr 20, 2022
Merged

chore: fix grammar error #19740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion superset-frontend/packages/superset-ui-chart-controls/src/operators/flattenOperator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions superset-frontend/packages/superset-ui-chart-controls/src/operators/renameOperator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions superset-frontend/packages/superset-ui-chart-controls/src/operators/rollingWindowOperator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down
4 changes: 2 additions & 2 deletions superset-frontend/packages/superset-ui-chart-controls/src/operators/timeCompareOperator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> =
Expand All @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...et-frontend/packages/superset-ui-chart-controls/src/operators/timeComparePivotOperator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/packages/superset-ui-chart-controls/src/operators/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
2 changes: 1 addition & 1 deletion ...src/operators/utils/isValidTimeCompare.ts → ...s/src/operators/utils/isTimeComparison.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> = (
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bycatch: grammar error.

formData,
queryObject,
) => {
Expand Down
6 changes: 3 additions & 3 deletions superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
import {
rollingWindowOperator,
timeCompareOperator,
isValidTimeCompare,
isTimeComparison,
pivotOperator,
resampleOperator,
renameOperator,
Expand Down Expand Up @@ -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,
)
Expand All @@ -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:
Expand Down