add min/max to chart link

Per discussion and agreement with the developers of this PR, I added the min/max error bars to the chart link ability.
OpenEnergyDashboard · Aug 4, 2023 · eb1a362 · eb1a362
1 parent 973d236
commit eb1a362
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/src/client/app/actions/graph.ts b/src/client/app/actions/graph.ts
@@ -216,6 +216,7 @@ export interface LinkOptions {
 	sliderRange?: TimeInterval;
 	toggleAreaNormalization?: boolean;
 	areaUnit?: string;
+	toggleMinMax?: boolean;
 	toggleBarStacking?: boolean;
 	comparePeriod?: ComparePeriod;
 	compareSortingOrder?: SortingOrder;
@@ -234,7 +235,7 @@ export function changeOptionsFromLink(options: LinkOptions) {
 	const dispatchSecond: Array<Thunk | t.ChangeChartToRenderAction | t.ChangeBarStackingAction |
 		t.ChangeGraphZoomAction | t.ChangeCompareSortingOrderAction | t.ToggleOptionsVisibility |
 		m.UpdateSelectedMapAction | t.UpdateLineGraphRate | t.ToggleAreaNormalizationAction |
-		t.UpdateSelectedAreaUnitAction> = [];
+		t.UpdateSelectedAreaUnitAction | t.ToggleShowMinMaxAction> = [];
 	/* eslint-enable @typescript-eslint/indent */
 
 	if (options.meterIDs) {
@@ -269,7 +270,9 @@ export function changeOptionsFromLink(options: LinkOptions) {
 	}
 	if (options.areaUnit) {
 		dispatchSecond.push(updateSelectedAreaUnit(options.areaUnit as AreaUnitType));
-
+	}
+	if (options.toggleMinMax) {
+		dispatchSecond.push(toggleShowMinMax());
 	}
 	if (options.toggleBarStacking) {
 		dispatchSecond.push(changeBarStacking());

diff --git a/src/client/app/components/RouteComponent.tsx b/src/client/app/components/RouteComponent.tsx
@@ -42,6 +42,7 @@ interface RouteProps {
 	role: UserRole;
 	renderOnce: boolean;
 	areaNormalization: boolean;
+	minMax: boolean;
 	changeOptionsFromLink(options: LinkOptions): Promise<any[]>;
 	clearCurrentUser(): any;
 	changeRenderOnce(): any;
@@ -214,6 +215,11 @@ export default class RouteComponent extends React.Component<RouteProps> {
 							case 'areaUnit':
 								options.areaUnit = info;
 								break;
+							case 'minMax':
+								if (this.props.minMax.toString() !== info) {
+									options.toggleMinMax = true;
+								}
+								break;
 							case 'comparePeriod':
 								options.comparePeriod = validateComparePeriod(info);
 								break;

diff --git a/src/client/app/containers/ChartLinkContainer.ts b/src/client/app/containers/ChartLinkContainer.ts
@@ -61,6 +61,7 @@ function mapStateToProps(state: State) {
 	linkText += `&unitID=${unitID.toString()}`;
 	linkText += `&rate=${state.graph.lineGraphRate.label.toString()},${state.graph.lineGraphRate.rate.toString()}`;
 	linkText += `&areaUnit=${state.graph.selectedAreaUnit}&areaNormalization=${state.graph.areaNormalization}`;
+	linkText += `&minMax=${state.graph.showMinMax}`;
 	return {
 		linkText,
 		chartType

diff --git a/src/client/app/containers/RouteContainer.ts b/src/client/app/containers/RouteContainer.ts
@@ -27,7 +27,8 @@ function mapStateToProps(state: State) {
 		role,
 		// true if the chartlink rendering has been done.
 		renderOnce: state.graph.renderOnce,
-		areaNormalization: state.graph.areaNormalization
+		areaNormalization: state.graph.areaNormalization,
+		minMax: state.graph.showMinMax
 	};
 }