Merge branch 'main' into feat/tooltip-plugin

frontend/src/lib/uPlotV2/config/UPlotSeriesBuilder.ts

@@ -5,8 +5,8 @@ import uPlot, { Series } from 'uplot';
 import {
 	ConfigBuilder,
 	DrawStyle,
-	FillStyle,
 	LineInterpolation,
+	LineStyle,
 	SeriesProps,
 	VisibilityMode,
 } from './types';
@@ -16,23 +16,29 @@ import {
  * Handles creation of series settings
  */
 export class UPlotSeriesBuilder extends ConfigBuilder<SeriesProps, Series> {
-	private buildLineConfig(
+	private buildLineConfig({
-		lineColor: string,
+		lineColor,
-		lineWidth?: number,
+		lineWidth,
-		lineStyle?: { fill?: FillStyle; dash?: number[] },
+		lineStyle,
-	): Partial<Series> {
+		lineCap,
+	}: {
+		lineColor: string;
+		lineWidth?: number;
+		lineStyle?: LineStyle;
+		lineCap?: Series.Cap;
+	}): Partial<Series> {
 		const lineConfig: Partial<Series> = {
 			stroke: lineColor,
 			width: lineWidth ?? 2,
 		};
 
-		if (lineStyle && lineStyle.fill !== FillStyle.Solid) {
+		if (lineStyle === LineStyle.Dashed) {
-			if (lineStyle.fill === FillStyle.Dot) {
+			lineConfig.dash = [10, 10];
-				lineConfig.cap = 'round';
-			}
-			lineConfig.dash = lineStyle.dash ?? [10, 10];
 		}
 
+		if (lineCap) {
+			lineConfig.cap = lineCap;
+		}
 		return lineConfig;
 	}
 
@@ -138,6 +144,7 @@ export class UPlotSeriesBuilder extends ConfigBuilder<SeriesProps, Series> {
 			lineInterpolation,
 			lineWidth,
 			lineStyle,
+			lineCap,
 			showPoints,
 			pointSize,
 			scaleKey,
@@ -148,7 +155,12 @@ export class UPlotSeriesBuilder extends ConfigBuilder<SeriesProps, Series> {
 
 		const lineColor = this.getLineColor();
 
-		const lineConfig = this.buildLineConfig(lineColor, lineWidth, lineStyle);
+		const lineConfig = this.buildLineConfig({
+			lineColor,
+			lineWidth,
+			lineStyle,
+			lineCap,
+		});
 		const pathConfig = this.buildPathConfig({
 			pathBuilder,
 			drawStyle,

frontend/src/lib/uPlotV2/config/types.ts

@@ -92,16 +92,9 @@ export interface ScaleProps {
  * Props for configuring a series
  */
 
-export enum FillStyle {
+export enum LineStyle {
 	Solid = 'solid',
-	Dash = 'dash',
+	Dashed = 'dashed',
-	Dot = 'dot',
-	Square = 'square',
-}
-
-export interface LineStyle {
-	dash?: Array<number>;
-	fill?: FillStyle;
 }
 
 export enum DrawStyle {
@@ -141,6 +134,7 @@ export interface SeriesProps {
 	lineInterpolation?: LineInterpolation;
 	lineStyle?: LineStyle;
 	lineWidth?: number;
+	lineCap?: Series.Cap;
 
 	// Points config
 	pointColor?: string;