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

Fix multiple charting bugs #306

Merged
merged 1 commit into from
Nov 9, 2020
Merged

Fix multiple charting bugs #306

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
2 changes: 1 addition & 1 deletion datahub/config/datadoc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ cell_types:
visual:
legend_position: ''
legend_display: true

connect_missing: false
values:
display: 0
position: 'center'
Expand Down
21 changes: 14 additions & 7 deletions datahub/webapp/components/DataDocChartCell/DataDocChartComposer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,13 +501,8 @@ const DataDocChartComposerComponent: React.FunctionComponent<
}))}
/>
</FormField>
{['area', 'bar', 'histogram'].includes(values.chartType) ? (
<SimpleField
type="checkbox"
label="Stack Chart"
name="stack"
disabled={values.chartType === 'area'}
/>
{['bar', 'histogram'].includes(values.chartType) ? (
<SimpleField type="checkbox" label="Stack Chart" name="stack" />
) : null}
</>
);
Expand Down Expand Up @@ -817,6 +812,16 @@ const DataDocChartComposerComponent: React.FunctionComponent<
{seriesColorDOM}
</>
)}
{['line', 'area'].includes(values.chartType) ? (
<>
<FormSectionHeader>Line Formatting</FormSectionHeader>
<SimpleField
label="Connect missing data"
name="connectMissing"
type="checkbox"
/>
</>
) : null}
</>
);

Expand Down Expand Up @@ -1050,6 +1055,8 @@ function formValsToMeta(vals: IChartFormValues, meta: IDataChartCellMeta) {
draft.title = vals.title;
draft.visual.legend_position = vals.legendPosition;
draft.visual.legend_display = vals.legendDisplay;
draft.visual.connect_missing = vals.connectMissing;

draft.visual.values = {
display: vals.valueDisplay ?? chartValueDisplayType.FALSE,
position: vals.valuePosition,
Expand Down
2 changes: 2 additions & 0 deletions datahub/webapp/const/dataDocChart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ export enum chartValueDisplayType {
export interface IChartVisualMeta {
legend_position?: ChartLegendPositionType;
legend_display?: boolean;
connect_missing?: boolean;

values: {
display: chartValueDisplayType;
Expand Down Expand Up @@ -230,6 +231,7 @@ export interface IChartFormValues {
title: string;
legendPosition: 'top' | 'bottom' | 'right' | 'left';
legendDisplay: boolean;
connectMissing: boolean;

valueDisplay: chartValueDisplayType;
valuePosition: 'center' | 'start' | 'end';
Expand Down
10 changes: 9 additions & 1 deletion datahub/webapp/lib/chart/chart-data-processing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,19 @@ import { ChartScaleType } from 'const/dataDocChart';
import { colorPalette, colorPaletteFill, fillColor } from 'const/chartColors';

function processDataPoint(val: any, scale: ChartScaleType) {
// val type validation
if (val == null) {
return null;
}

// Convert data by Axis type
if (scale === 'category') {
return val;
} else if (scale === 'time' && isNaN(val)) {
return Number(new Date(val));
return new Date(val);
}

// by default, a point is a number
return Number(val);
}

Expand Down
14 changes: 10 additions & 4 deletions datahub/webapp/lib/chart/chart-meta-processing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ export function mapMetaToFormVals(
title: meta.title || '',
legendPosition: meta.visual.legend_position ?? 'top',
legendDisplay: meta.visual.legend_display ?? true,
connectMissing: meta.visual.connect_missing ?? false,

valueDisplay:
meta.visual.values?.display ?? chartValueDisplayType.FALSE,
valuePosition: meta.visual.values?.position,
Expand Down Expand Up @@ -181,6 +183,10 @@ export function mapMetaToChartOptions(
},
};

if (meta.visual.connect_missing != null) {
optionsObj.spanGaps = meta.visual.connect_missing;
}

optionsObj['plugins'] = {
datalabels: {
display:
Expand Down Expand Up @@ -209,7 +215,7 @@ export function mapMetaToChartOptions(
)} (${percentage}%)`;
},
title: (tooltipItem, chartData) => {
return chartData.labels[tooltipItem[0].index];
return String(chartData.labels[tooltipItem[0].index]);
},
};
} else {
Expand All @@ -220,14 +226,14 @@ export function mapMetaToChartOptions(
const value = tooltipItem.value;
return ` ${label}: ${formatNumber(value)}`;
},
title: (tooltipItem, chartData) => {
title: (tooltipItem, chartData): string => {
if (meta.chart.y_axis.stack) {
let totalValue = 0;
for (const value of tooltipItem) {
totalValue += Number(value.yLabel);
}
if (isNaN(totalValue)) {
return chartData.labels[tooltipItem[0].index];
return String(chartData.labels[tooltipItem[0].index]);
} else {
return (
chartData.labels[tooltipItem[0].index] +
Expand All @@ -236,7 +242,7 @@ export function mapMetaToChartOptions(
);
}
} else {
return chartData.labels[tooltipItem[0].index];
return String(chartData.labels[tooltipItem[0].index]);
}
},
};
Expand Down