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

fix: big number with trendline can't calculate cumsum #19542

Merged
merged 1 commit into from
Apr 6, 2022
Merged

fix: big number with trendline can't calculate cumsum #19542

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
56 changes: 13 additions & 43 deletions ...-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/buildQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,63 +18,33 @@
*/
import {
buildQueryContext,
PostProcessingResample,
DTTM_ALIAS,
QueryFormData,
} from '@superset-ui/core';
import {
flattenOperator,
pivotOperator,
resampleOperator,
rollingWindowOperator,
sortOperator,
} from '@superset-ui/chart-controls';

const TIME_GRAIN_MAP: Record<string, string> = {
PT1S: 'S',
PT1M: 'min',
PT5M: '5min',
PT10M: '10min',
PT15M: '15min',
PT30M: '30min',
PT1H: 'H',
P1D: 'D',
P1M: 'MS',
P3M: 'QS',
P1Y: 'AS',
// TODO: these need to be mapped carefully, as the first day of week
// can vary from engine to engine
// P1W: 'W',
// '1969-12-28T00:00:00Z/P1W': 'W',
// '1969-12-29T00:00:00Z/P1W': 'W',
// 'P1W/1970-01-03T00:00:00Z': 'W',
// 'P1W/1970-01-04T00:00:00Z': 'W',
};

Comment on lines -30 to -50
Copy link
Member Author

Choose a reason for hiding this comment

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

Use explicit the Resample control to select.

export default function buildQuery(formData: QueryFormData) {
return buildQueryContext(formData, baseQueryObject => {
// todo: move into full advanced analysis section here
const rollingProc = rollingWindowOperator(formData, baseQueryObject);
const { time_grain_sqla } = formData;
let resampleProc: PostProcessingResample;
if (rollingProc && time_grain_sqla) {
const rule = TIME_GRAIN_MAP[time_grain_sqla];
if (rule) {
resampleProc = {
operation: 'resample',
options: {
method: 'asfreq',
rule,
fill_value: null,
},
};
}
}
const { x_axis } = formData;
const is_timeseries = x_axis === DTTM_ALIAS || !x_axis;

return [
{
...baseQueryObject,
is_timeseries: true,
post_processing: [
sortOperator(formData, baseQueryObject),
resampleProc,
rollingProc,
pivotOperator(formData, {
...baseQueryObject,
index: x_axis,
is_timeseries,
}),
rollingWindowOperator(formData, baseQueryObject),
resampleOperator(formData, baseQueryObject),
flattenOperator(formData, baseQueryObject),
],
},
Expand Down
46 changes: 46 additions & 0 deletions ...ontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/controlPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,52 @@ const config: ControlPanelConfig = {
},
},
],
// eslint-disable-next-line react/jsx-key
[<h1 className="section-header">{t('Resample')}</h1>],
[
{
name: 'resample_rule',
config: {
type: 'SelectControl',
freeForm: true,
label: t('Rule'),
default: null,
choices: [
['1T', '1 minutely frequency'],
['1H', '1 hourly frequency'],
['1D', '1 calendar day frequency'],
['7D', '7 calendar day frequency'],
['1MS', '1 month start frequency'],
['1M', '1 month end frequency'],
['1AS', '1 year start frequency'],
['1A', '1 year end frequency'],
],
description: t('Pandas resample rule'),
},
},
],
[
{
name: 'resample_method',
config: {
type: 'SelectControl',
freeForm: true,
label: t('Fill method'),
default: null,
choices: [
['asfreq', 'Null imputation'],
['zerofill', 'Zero imputation'],
['linear', 'Linear interpolation'],
['ffill', 'Forward values'],
['bfill', 'Backward values'],
['median', 'Median values'],
['mean', 'Mean values'],
['sum', 'Sum values'],
],
description: t('Pandas resample method'),
},
},
],
],
},
],
Expand Down