@protobase/ui 0.22.3 → 0.22.4

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

@@ -65,10 +65,12 @@ const ChartView = ({ model, view, groupBy, type = "bar", sum, average, filter =
 	const slices = valueSlices(groups, field, view?.fields[groupBy], measure, filter);
 	return type === "donut" ? /* @__PURE__ */ jsx(GroupDonut, {
 		resource: model.name,
+		view,
 		slices,
 		measure
 	}) : /* @__PURE__ */ jsx(GroupBars, {
 		resource: model.name,
+		view,
 		slices,
 		measure
 	});

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

@@ -1,23 +1,20 @@
 import { AppLink } from "../use-app-address.js";
 import { measureText } from "./chart-groups.js";
+import { filteredListAddress } from "../list-link.js";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region src/app/charts/group-bars.tsx
 /**
 * A ranked list of a field's values, each a bar as long as its number and a link to its records. Bars in rows read on
 * a phone as well as on a desk, and carry their label and value as text, so no colour has to say what a bar is.
 */
-const GroupBars = ({ resource, slices, measure }) => {
+const GroupBars = ({ resource, view, slices, measure }) => {
 	const largest = Math.max(0, ...slices.map((slice) => slice.value ?? 0));
 	return /* @__PURE__ */ jsx("ul", {
 		className: "flex flex-col gap-1",
 		children: slices.map((slice) => {
 			const share = largest > 0 && slice.value !== null ? Math.max(0, slice.value) / largest : 0;
 			return /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsxs(AppLink, {
-				to: {
-					kind: "list",
-					resource,
-					filter: slice.filter
-				},
+				to: filteredListAddress(view, resource, slice.filter),
 				className: "group grid grid-cols-[minmax(6rem,35%)_1fr_auto] items-center gap-3 rounded-md px-1 py-1 hover:bg-muted",
 				title: measure.kind === "count" ? void 0 : `${measureText(slice.count, { kind: "count" })} records`,
 				children: [

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

@@ -1,5 +1,6 @@
 import { AppLink } from "../use-app-address.js";
 import { measureText } from "./chart-groups.js";
+import { filteredListAddress } from "../list-link.js";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Cell, Pie, PieChart, ResponsiveContainer, Tooltip } from "recharts";
 //#region src/app/charts/group-donut.tsx
@@ -22,7 +23,7 @@ const SliceTooltip = ({ active, payload, measure }) => {
 * A donut of how a total shares out over a field's values, with a legend that names each, gives its number and share,
 * and links to its records: the legend, not the colour, says which slice is which.
 */
-const GroupDonut = ({ resource, slices, measure }) => {
+const GroupDonut = ({ resource, view, slices, measure }) => {
 	const drawn = slices.filter((slice) => slice.value !== null && slice.value > 0);
 	const whole = drawn.reduce((sum, slice) => sum + slice.value, 0);
 	return /* @__PURE__ */ jsxs("div", {
@@ -51,11 +52,7 @@ const GroupDonut = ({ resource, 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: {
-					kind: "list",
-					resource,
-					filter: slice.filter
-				},
+				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", {

package/dist/app/current-address.js

@@ -24,7 +24,8 @@ const listedResource = (resources, views, resource) => {
 const listDefaults = (model, view, xs = false) => ({
 	display: model ? listDefaultDisplay(model, view, xs) : defaultDisplay(view, xs),
 	orderBy: model ? defaultOrderBy(model, view) : "",
-	filterLayout: "bar"
+	filterLayout: "bar",
+	filter: view?.list?.filter ?? ""
 });
 /** The address as read from the location, with a list's defaults filled in and a record's key as text. */
 const currentAddress = (read, defaults) => {
@@ -38,11 +39,10 @@ const currentAddress = (read, defaults) => {
 	if (read?.kind !== "list") return read;
 	return {
 		...defaults(read.resource),
-		filter: "",
 		...read
 	};
 };
-/** The list address after `change`, leaving out every value that is empty or its default, so `/<resource>` stays clean. */
+/** The list address after `change`, leaving out every value that is empty or its default (a cleared filter is written as an empty `filter=` when the default is not empty), so `/<resource>` stays clean. */
 const changedList = (read, change, defaults) => {
 	const next = {
 		...read,
@@ -52,7 +52,7 @@ const changedList = (read, change, defaults) => {
 	return {
 		kind: "list",
 		resource: read.resource,
-		...next.filter && { filter: next.filter },
+		...differs("filter") && { filter: next.filter },
 		...differs("display") && { display: next.display },
 		...differs("orderBy") && { orderBy: next.orderBy },
 		...differs("filterLayout") && { filterLayout: next.filterLayout },

package/dist/app/displays/board-allowed.js

@@ -0,0 +1,26 @@
+import { parseFilter } from "@protobase/schema";
+//#region src/app/displays/board-allowed.ts
+const flatten = (expr) => expr.kind === "and" ? expr.args.flatMap(flatten) : [expr];
+const text = (value) => value.kind === "string" ? String(value.value) : void 0;
+const allowedBy = (clause, by) => {
+	if (clause.kind === "compare" && clause.op === "=" && clause.field.path.join(".") === by) {
+		const value = text(clause.value);
+		return value === void 0 ? void 0 : [value];
+	}
+	if (clause.kind === "in" && clause.field.path.join(".") === by) {
+		const values = clause.values.map(text);
+		return values.every((value) => value !== void 0) ? values : void 0;
+	}
+};
+/**
+* The columns of a board `filter` does not rule out: those its top-level `by = "v"` and `in(by, ...)` clauses allow. Any
+* other clause leaves every column, so a column is left out only when no record in it can match.
+*/
+const columnsAllowed = (filter, by, columns) => {
+	const parsed = parseFilter(filter);
+	if (!parsed.ok || !parsed.ast) return columns;
+	const clauses = flatten(parsed.ast).map((clause) => allowedBy(clause, by)).filter((values) => values !== void 0);
+	return columns.filter((column) => clauses.every((values) => column.value !== null && values.includes(column.value)));
+};
+//#endregion
+export { columnsAllowed };

package/dist/app/displays/board-display.js

@@ -4,6 +4,7 @@ import { can } from "../permissions.js";
 import { RecordCard } from "./record-card.js";
 import { collision, columnCoordinates, columnId } from "./board-dnd.js";
 import { BoardColumnView } from "./board-column.js";
+import { columnsAllowed } from "./board-allowed.js";
 import { useBoardMove } from "./use-board-move.js";
 import { useRef, useState } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
@@ -14,7 +15,7 @@ import { DndContext, DragOverlay, KeyboardSensor, MouseSensor, TouchSensor, useS
 * a card dragged, or moved with the keyboard, to another column saves the record with that column's value.
 */
 const BoardDisplay = ({ model, view, display, fields, filter, orderBy, limit }) => {
-	const columns = boardColumns(model, view, display);
+	const columns = columnsAllowed(filter, display.by, boardColumns(model, view, display));
 	const card = boardCard(model, view, display);
 	const permissions = usePermissions(model.name);
 	const movable = can(permissions, "update") && !model.fields[display.by]?.readOnly;

package/dist/app/list-link.js

@@ -0,0 +1,23 @@
+//#region src/app/list-link.ts
+/**
+* The list of `resource` opened on exactly the records `filter` counted or showed: with no filter, an empty one when
+* the view's list opens on a default filter, so the link does not narrow what it counted; otherwise a clean path.
+*/
+const filteredListAddress = (view, resource, filter) => {
+	if (filter) return {
+		kind: "list",
+		resource,
+		filter
+	};
+	if (view?.list?.filter) return {
+		kind: "list",
+		resource,
+		filter: ""
+	};
+	return {
+		kind: "list",
+		resource
+	};
+};
+//#endregion
+export { filteredListAddress };

package/dist/app/pages/blocks/stat.js

@@ -5,12 +5,14 @@ import { useLayoutRecord } from "../record-scope.js";
 import { useCount } from "../use-layout-data.js";
 import { propsOf } from "./block-props.js";
 import { CardFrame } from "./card-frame.js";
+import { filteredListAddress } from "../../list-link.js";
 import { FieldValue } from "../field-value.js";
 import { usePathValue } from "../use-path-value.js";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region src/app/pages/blocks/stat.tsx
 const big = "text-2xl font-semibold tracking-tight tabular-nums";
 const Count = ({ model, filter }) => {
+	const { views } = useAdminMeta();
 	const count = useCount(model, filter);
 	if (count.isPending) return /* @__PURE__ */ jsx(Skeleton, { className: "h-8 w-16" });
 	if (count.error) return /* @__PURE__ */ jsx("span", {
@@ -18,11 +20,7 @@ const Count = ({ model, filter }) => {
 		children: "Could not count"
 	});
 	return /* @__PURE__ */ jsx(AppLink, {
-		to: {
-			kind: "list",
-			resource: model.name,
-			filter
-		},
+		to: filteredListAddress(views[model.name], model.name, filter),
 		className: `${big} hover:text-primary-text after:absolute after:inset-0 after:content-['']`,
 		children: count.data.toLocaleString("en-IE")
 	});

package/dist/package.js

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