@protobase/ui 0.22.1 → 0.22.2

package/dist/app/hand-order/hand-order.js

@@ -16,6 +16,6 @@ const listHandOrder = (model, permissions) => model.position?.within === void 0
 * The field a related section sorts its records by hand in: those of one parent, when the section lists every record
 * whose `within` relation points at the page's record, no filter or join resource leaving some out.
 */
-const relatedHandOrder = (item, model, permissions) => model.position?.within !== void 0 && item.field === model.position.within && !item.through && !item.filter ? writablePosition(model, permissions) : void 0;
+const relatedHandOrder = (item, model, permissions) => model.position?.within !== void 0 && item.field === model.position.within && !item.through && !item.from && !item.filter ? writablePosition(model, permissions) : void 0;
 //#endregion
 export { listHandOrder, relatedHandOrder };

package/dist/app/incoming-relations.js

@@ -11,7 +11,7 @@ const where$1 = createWhere();
 */
 const incomingRelations = (model, resources, views, layout, lines) => {
 	if (model.primaryKey.length !== 1) return [];
-	const listed = new Set(layoutItems(layout).flatMap((item) => item.kind === "related" && !item.through ? [`${item.resource}.${item.field}`] : []));
+	const listed = new Set(layoutItems(layout).flatMap((item) => item.kind === "related" && !item.through && !item.from ? [`${item.resource}.${item.field}`] : []));
 	const found = Object.values(resources).flatMap((source) => Object.values(source.fields).filter((field) => field.type === "relation" && field.relation?.resource === model.name && field.relation.columns.length === 1 && field.filterable).filter((field) => field.name !== source.tenant && source.name !== lines?.name && !listed.has(`${source.name}.${field.name}`)).map((field) => ({
 		source,
 		field: field.name

package/dist/app/record-page.js

@@ -59,6 +59,7 @@ import { useRecordEditor } from "./use-record-editor.js";
 import { useRelatedRecords } from "./use-related-records.js";
 import { IncomingCard } from "./incoming-card.js";
 import { RelatedSection } from "./related-section.js";
+import { relatedValue } from "./related-value.js";
 import { Fragment, useMemo } from "react";
 import { Check } from "lucide-react";
 import { isApiError } from "@protobase/client";
@@ -361,11 +362,14 @@ const LoadedRecord = ({ model, recordKey, stored, preview }) => {
 				children
 			}, `group:${item.title}`)];
 		}
-		if (item.kind === "related") return [/* @__PURE__ */ jsx(RelatedSection, {
-			item,
-			recordKey,
-			owner: model.name
-		}, `related:${item.title}`)];
+		if (item.kind === "related") {
+			if (item.from !== void 0 && !known(item.from)) return [];
+			return [/* @__PURE__ */ jsx(RelatedSection, {
+				item,
+				value: relatedValue(item, stored.record, recordKey),
+				owner: model.name
+			}, `related:${item.title}`)];
+		}
 		if (preview && (item.kind === "custom" || item.kind === "map" || item.kind === "gallery")) return [];
 		if (item.kind === "custom") return item.sidebar ? [] : [/* @__PURE__ */ jsx(CustomSection, {
 			item,

package/dist/app/related-section.js

@@ -28,13 +28,13 @@ const and = (...parts) => {
 * all the join records that point at this record hold, read page by page. `null` when no join record does, so nothing
 * can match.
 */
-const useMatch = (item, recordKey) => {
+const useMatch = (item, value) => {
 	const client = useClient();
 	const { resources } = useAdminMeta();
 	const through = item.through;
 	const via = through ? resources[through.resource] : void 0;
 	const key = through?.key ?? via?.primaryKey[0];
-	const viaFilter = through ? and(printFilter(where$1.eq(through.field, recordKey)), through.filter) : "";
+	const viaFilter = through ? and(printFilter(where$1.eq(through.field, value)), through.filter) : "";
 	const collected = useQuery({
 		queryKey: keys.list(via?.name ?? "", viaFilter, "", 0, `related:${key}`),
 		enabled: Boolean(via && key),
@@ -46,8 +46,13 @@ const useMatch = (item, recordKey) => {
 			return [...new Set(joined.items.flatMap((row) => row[key] === null || row[key] === void 0 ? [] : [String(row[key])]))];
 		}
 	});
+	if (value === null) return {
+		filter: null,
+		isPending: false,
+		error: null
+	};
 	if (!through) return {
-		filter: and(printFilter(where$1.eq(item.field, recordKey)), item.filter),
+		filter: and(printFilter(where$1.eq(item.field, value)), item.filter),
 		isPending: false,
 		error: null
 	};
@@ -75,11 +80,11 @@ const Empty = ({ text }) => /* @__PURE__ */ jsx("p", {
 * a join resource, in the list page's table or display, with a link to them all in the list. When they are ordered by
 * hand within this record, **Sort** shows them all in their order, to be moved by their drag handles.
 */
-const RelatedSection = ({ item, recordKey, owner }) => {
+const RelatedSection = ({ item, value, owner }) => {
 	const { resources, views } = useAdminMeta();
 	const model = resources[item.resource];
 	const view = model && views[model.name];
-	const match = useMatch(item, recordKey);
+	const match = useMatch(item, value);
 	const [display, pick] = useEmbeddedDisplay(view, `related:${owner}:${item.title}`, item.display);
 	const permissions = usePermissions(item.resource);
 	const [sorting, setSorting] = useState(false);
@@ -116,7 +121,7 @@ const RelatedSection = ({ item, recordKey, owner }) => {
 			model,
 			view,
 			field: handOrder,
-			filter: printFilter(where$1.eq(item.field, recordKey)),
+			filter: printFilter(where$1.eq(item.field, value)),
 			columns
 		})
 	});

package/dist/app/related-value.js

@@ -0,0 +1,14 @@
+import { relationTarget } from "./related-opens.js";
+//#region src/app/related-value.ts
+/**
+* The value a related section's `field` is matched against: the record's key, or with `from` that field's value as it
+* is (a relation by its key). Null when the record holds none, so the section lists nothing.
+*/
+const relatedValue = (item, record, recordKey) => {
+	if (item.from === void 0) return recordKey;
+	const value = record[item.from];
+	if (typeof value === "boolean") return value;
+	return relationTarget(record, item.from) ?? null;
+};
+//#endregion
+export { relatedValue };

package/dist/package.js

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