@protobase/ui 0.22.6 → 0.22.7

package/dist/app/charts/chart-groups.js

@@ -49,4 +49,4 @@ const measureText = (value, measure) => {
 	return `${measure.hints?.prefix ?? ""}${text}${measure.hints?.suffix ?? ""}`;
 };
 //#endregion
-export { groupFilter, measureText, periodPoints, valueSlices };
+export { colorOf, groupFilter, labelOf, measureText, periodPoints, valueSlices };

package/dist/app/charts/chart-view.js

@@ -7,6 +7,7 @@ import { periodPoints, valueSlices } from "./chart-groups.js";
 import { GroupBars } from "./group-bars.js";
 import { GroupDonut } from "./group-donut.js";
 import { PeriodChart } from "./period-chart.js";
+import { splitPoints } from "./split-points.js";
 import { jsx } from "react/jsx-runtime";
 //#region src/app/charts/chart-view.tsx
 const measureOf = (model, view, sum, average) => {
@@ -19,20 +20,31 @@ const measureOf = (model, view, sum, average) => {
 		hints: view?.fields[name]
 	};
 };
+const labelOf = (field, resources, views) => {
+	const target = field?.type === "relation" && field.relation ? resources[field.relation.resource] : void 0;
+	return target && target.primaryKey.length === 1 ? labelFieldOf(target, views[target.name]) : void 0;
+};
 /**
 * Loads a chart's groups through `:aggregate` and draws them: a date field's buckets as bars or a line, a field's
 * values as ranked bars or a donut, each value linking to its records. The server checked the chart at startup.
 */
-const ChartView = ({ model, view, groupBy, type = "bar", sum, average, filter = "", granularity = "day", range = "30d", limit = 10, empty = "Nothing to chart yet." }) => {
+const ChartView = ({ model, view, groupBy, splitBy, type = "bar", sum, average, filter = "", granularity = "day", range = "30d", limit = 10, empty = "Nothing to chart yet." }) => {
 	const { resources, views } = useAdminMeta();
 	const field = model.fields[groupBy];
 	const dated = field?.type === "date" || field?.type === "timestamp";
-	const target = field?.type === "relation" && field.relation ? resources[field.relation.resource] : void 0;
-	const label = target && target.primaryKey.length === 1 ? labelFieldOf(target, views[target.name]) : void 0;
+	const label = labelOf(field, resources, views);
+	const splitField = dated && splitBy !== void 0 ? model.fields[splitBy] : void 0;
+	const splitLabel = labelOf(splitField, resources, views);
+	const split = splitField ? {
+		splitBy: splitField.name,
+		splitLimit: 8,
+		...splitLabel && { splitLabel }
+	} : {};
 	const params = dated ? {
 		granularity,
 		range,
-		timeZone: viewerZone()
+		timeZone: viewerZone(),
+		...split
 	} : {
 		limit,
 		...label && { label }
@@ -56,11 +68,24 @@ const ChartView = ({ model, view, groupBy, type = "bar", sum, average, filter =
 		className: "text-muted-foreground",
 		children: empty
 	});
+	const chartType = type === "line" ? "line" : "bar";
+	if (dated && splitField && result.data.splits) {
+		const { series, points } = splitPoints(groups, result.data.splits, splitField, view?.fields[splitField.name], measure, filter);
+		return /* @__PURE__ */ jsx(PeriodChart, {
+			points,
+			measure,
+			bucket: granularity,
+			type: chartType,
+			series,
+			resource: model.name,
+			view
+		});
+	}
 	if (dated) return /* @__PURE__ */ jsx(PeriodChart, {
 		points: periodPoints(groups, measure),
 		measure,
 		bucket: granularity,
-		type: type === "line" ? "line" : "bar"
+		type: chartType
 	});
 	const slices = valueSlices(groups, field, view?.fields[groupBy], measure, filter);
 	return type === "donut" ? /* @__PURE__ */ jsx(GroupDonut, {

package/dist/app/charts/group-donut.js

@@ -1,6 +1,5 @@
-import { AppLink } from "../use-app-address.js";
 import { measureText } from "./chart-groups.js";
-import { filteredListAddress } from "../list-link.js";
+import { LegendItem } from "./legend-item.js";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Cell, Pie, PieChart, ResponsiveContainer, Tooltip } from "recharts";
 //#region src/app/charts/group-donut.tsx
@@ -51,29 +50,20 @@ const GroupDonut = ({ resource, view, slices, measure }) => {
 			})
 		}), /* @__PURE__ */ jsx("ul", {
 			className: "flex w-full min-w-0 flex-col gap-0.5",
-			children: slices.map((slice) => /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsxs(AppLink, {
-				to: filteredListAddress(view, resource, slice.filter),
-				className: "group flex items-center gap-2 rounded-md px-1 py-0.5 hover:bg-muted",
-				children: [
-					/* @__PURE__ */ jsx("span", {
-						className: "size-2.5 shrink-0 rounded-full",
-						style: { background: slice.color },
-						"aria-hidden": true
-					}),
-					/* @__PURE__ */ jsx("span", {
-						className: "min-w-0 flex-1 truncate group-hover:text-primary-text",
-						children: slice.label
-					}),
-					/* @__PURE__ */ jsx("span", {
-						className: "font-medium tabular-nums",
-						children: measureText(slice.value, measure)
-					}),
-					/* @__PURE__ */ jsx("span", {
-						className: "w-9 text-right text-xs text-muted-foreground tabular-nums",
-						children: percent(slice.value ?? 0, whole)
-					})
-				]
-			}) }, slice.key))
+			children: slices.map((slice) => /* @__PURE__ */ jsxs(LegendItem, {
+				resource,
+				view,
+				filter: slice.filter,
+				color: slice.color,
+				label: slice.label,
+				children: [/* @__PURE__ */ jsx("span", {
+					className: "font-medium tabular-nums",
+					children: measureText(slice.value, measure)
+				}), /* @__PURE__ */ jsx("span", {
+					className: "w-9 text-right text-xs text-muted-foreground tabular-nums",
+					children: percent(slice.value ?? 0, whole)
+				})]
+			}, slice.key))
 		})]
 	});
 };

package/dist/app/charts/legend-item.js

@@ -0,0 +1,33 @@
+import { AppLink } from "../use-app-address.js";
+import { filteredListAddress } from "../list-link.js";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+//#region src/app/charts/legend-item.tsx
+const row = "flex items-center gap-2 rounded-md px-1 py-0.5";
+/**
+* One row of a chart legend: a colour dot and the value's name, with `children` after it. With a `filter` the row links to
+* that value's records; without, as for the rest of a split, it is plain text.
+*/
+const LegendItem = ({ resource, view, filter, color, label, children }) => {
+	const content = /* @__PURE__ */ jsxs(Fragment, { children: [
+		/* @__PURE__ */ jsx("span", {
+			className: "size-2.5 shrink-0 rounded-full",
+			style: { background: color },
+			"aria-hidden": true
+		}),
+		/* @__PURE__ */ jsx("span", {
+			className: "min-w-0 flex-1 truncate group-hover:text-primary-text",
+			children: label
+		}),
+		children
+	] });
+	return /* @__PURE__ */ jsx("li", { children: filter === void 0 ? /* @__PURE__ */ jsx("div", {
+		className: row,
+		children: content
+	}) : /* @__PURE__ */ jsx(AppLink, {
+		to: filteredListAddress(view, resource, filter),
+		className: `group ${row} hover:bg-muted`,
+		children: content
+	}) });
+};
+//#endregion
+export { LegendItem };

package/dist/app/charts/period-chart.js

@@ -1,5 +1,6 @@
 import { useMediaQuery } from "../../lib/use-media-query.js";
 import { measureText } from "./chart-groups.js";
+import { LegendItem } from "./legend-item.js";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Bar, BarChart, CartesianGrid, Line, LineChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from "recharts";
 //#region src/app/charts/period-chart.tsx
@@ -58,22 +59,47 @@ const axisTick = {
 	fontSize: 11,
 	fill: "var(--muted-foreground)"
 };
-const PointTooltip = ({ active, payload, measure, bucket }) => {
+const PointTooltip = ({ active, payload, measure, bucket, series }) => {
 	const point = payload?.[0]?.payload;
 	if (!active || !point) return null;
 	return /* @__PURE__ */ jsxs("div", {
 		className: "rounded-md border bg-background px-2.5 py-1.5 text-xs shadow-pop",
-		children: [/* @__PURE__ */ jsx("div", {
-			className: "text-muted-foreground",
-			children: (bucket === "week" ? "Week of " : "") + formatterOf(tooltipFormats[bucket])(point.at)
-		}), /* @__PURE__ */ jsx("div", {
-			className: "font-semibold tabular-nums",
-			children: measureText(point.value, measure)
-		})]
+		children: [
+			/* @__PURE__ */ jsx("div", {
+				className: "text-muted-foreground",
+				children: (bucket === "week" ? "Week of " : "") + formatterOf(tooltipFormats[bucket])(point.at)
+			}),
+			series?.map((part) => /* @__PURE__ */ jsxs("div", {
+				className: "flex items-center gap-2",
+				children: [
+					/* @__PURE__ */ jsx("span", {
+						className: "size-2 shrink-0 rounded-full",
+						style: { background: part.color },
+						"aria-hidden": true
+					}),
+					/* @__PURE__ */ jsx("span", {
+						className: "flex-1",
+						children: part.label
+					}),
+					/* @__PURE__ */ jsx("span", {
+						className: "font-semibold tabular-nums",
+						children: measureText(point[part.key] ?? null, measure)
+					})
+				]
+			}, part.key)),
+			series && measure.kind !== "average" && /* @__PURE__ */ jsx("div", {
+				className: "mt-0.5 border-t pt-0.5 font-semibold tabular-nums",
+				children: measureText(point.value, measure)
+			}),
+			!series && /* @__PURE__ */ jsx("div", {
+				className: "font-semibold tabular-nums",
+				children: measureText(point.value, measure)
+			})
+		]
 	});
 };
 /** A date field's buckets over time, as bars or a line; a bucket without a value to add up is a gap. */
-const PeriodChart = ({ points, measure, bucket, type }) => {
+const PeriodChart = ({ points, measure, bucket, type, series, resource, view }) => {
 	const wide = useMediaQuery("(min-width: 640px)");
 	const tick = formatterOf(formats[bucket]);
 	const grid = /* @__PURE__ */ jsx(CartesianGrid, {
@@ -101,11 +127,17 @@ const PeriodChart = ({ points, measure, bucket, type }) => {
 		cursor: type === "bar" ? { fill: "var(--muted)" } : { stroke: "var(--border-strong)" },
 		content: /* @__PURE__ */ jsx(PointTooltip, {
 			measure,
-			bucket
+			bucket,
+			...series && { series }
 		}),
 		isAnimationActive: false
 	});
-	return /* @__PURE__ */ jsx("div", {
+	const parts = series ?? [{
+		key: "value",
+		label: "",
+		color: "var(--chart-1)"
+	}];
+	const chart = /* @__PURE__ */ jsx("div", {
 		className: "h-40",
 		children: /* @__PURE__ */ jsx(ResponsiveContainer, {
 			width: "100%",
@@ -123,13 +155,13 @@ const PeriodChart = ({ points, measure, bucket, type }) => {
 					x,
 					y,
 					tooltip,
-					/* @__PURE__ */ jsx(Line, {
-						dataKey: "value",
-						stroke: "var(--chart-1)",
+					parts.map((part) => /* @__PURE__ */ jsx(Line, {
+						dataKey: part.key,
+						stroke: part.color,
 						strokeWidth: 2,
 						dot: points.length <= 31 ? {
 							r: 3,
-							fill: "var(--chart-1)",
+							fill: part.color,
 							strokeWidth: 0
 						} : false,
 						activeDot: {
@@ -138,7 +170,7 @@ const PeriodChart = ({ points, measure, bucket, type }) => {
 							strokeWidth: 2
 						},
 						isAnimationActive: false
-					})
+					}, part.key))
 				]
 			}) : /* @__PURE__ */ jsxs(BarChart, {
 				data: points,
@@ -154,21 +186,36 @@ const PeriodChart = ({ points, measure, bucket, type }) => {
 					x,
 					y,
 					tooltip,
-					/* @__PURE__ */ jsx(Bar, {
-						dataKey: "value",
-						fill: "var(--chart-1)",
-						radius: [
+					parts.map((part, index) => /* @__PURE__ */ jsx(Bar, {
+						dataKey: part.key,
+						fill: part.color,
+						...series && { stackId: "split" },
+						radius: index === parts.length - 1 ? [
 							4,
 							4,
 							0,
 							0
-						],
+						] : 0,
 						isAnimationActive: false
-					})
+					}, part.key))
 				]
 			})
 		})
 	});
+	if (!series || resource === void 0) return chart;
+	return /* @__PURE__ */ jsxs("div", {
+		className: "flex flex-col gap-2",
+		children: [chart, /* @__PURE__ */ jsx("ul", {
+			className: "flex flex-wrap gap-x-3 gap-y-0.5 text-sm",
+			children: series.map((part) => /* @__PURE__ */ jsx(LegendItem, {
+				resource,
+				view,
+				color: part.color,
+				label: part.label,
+				...part.filter !== void 0 && { filter: part.filter }
+			}, part.key))
+		})]
+	});
 };
 //#endregion
 export { PeriodChart };

package/dist/app/charts/split-points.js

@@ -0,0 +1,52 @@
+import { colorOf, groupFilter, labelOf, periodPoints } from "./chart-groups.js";
+//#region src/app/charts/split-points.ts
+const noise = 1e-6;
+/**
+* A date field's buckets with each split into one part per value of another field, in the order the API ranks them.
+* A bucket where a value has no records holds 0 of a count and no value of a sum or average. For a count or a sum, what
+* the kept values leave of the bucket's total is "Other", a series of its own when some bucket has any; an average
+* has no remainder.
+*/
+const splitPoints = (groups, splits, field, hints, measure, filter = "") => {
+	const series = splits.map((split, index) => ({
+		key: `s${index}`,
+		label: labelOf(field, hints, split),
+		color: colorOf(field, hints, split.value, index),
+		filter: groupFilter(field, split.value, filter)
+	}));
+	const missing = measure.kind === "count" ? 0 : null;
+	const partOf = (group, value) => {
+		const part = group.splits?.find((candidate) => candidate.value === value);
+		if (!part) return missing;
+		return measure.kind === "count" ? part.count : part[measure.kind] ?? null;
+	};
+	const points = periodPoints(groups, measure).map((point, at) => {
+		const group = groups[at];
+		const parts = splits.map((split) => partOf(group, split.value));
+		const entries = Object.fromEntries(parts.map((part, index) => [`s${index}`, part]));
+		if (measure.kind === "average") return {
+			...point,
+			...entries
+		};
+		const rest = point.value === null ? null : point.value - parts.reduce((all, part) => all + (part ?? 0), 0);
+		return {
+			...point,
+			...entries,
+			other: rest === null ? null : rest < noise ? 0 : rest
+		};
+	});
+	if (!(measure.kind !== "average" && points.some((point) => (point.other ?? 0) > 0))) return {
+		series,
+		points: points.map(({ other, ...point }) => point)
+	};
+	return {
+		series: [...series, {
+			key: "other",
+			label: "Other",
+			color: "var(--border-strong)"
+		}],
+		points
+	};
+};
+//#endregion
+export { splitPoints };

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.22.6";
+var version = "0.22.7";
 var protobase = { "pluginApi": 1 };
 //#endregion
 export { protobase, version };