@rebasepro/cms 0.21.2-canary.g1ea48be → 0.23.0

package/dist/{PropertyEditView-gKNUHxLY.js → PropertyEditView-_pu5hzZn.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
-import { A as getFieldId, E as DEFAULT_FIELD_CONFIGS, Kt as FieldCaption, Ut as ArrayContainer, Wt as PropertyConfigBadge, a as namespaceToPropertiesPath, ct as useSafeSnackbarController, er as useCollectionRegistryController, g as toSerializableProperty, i as namespaceToPropertiesOrderPath, k as getFieldConfig, m as toSerializableCollectionConfig, n as getFullIdPath, r as idToPropertiesPath, t as getFullId } from "./util-qfCPxJzB.js";
+import { $t as PropertyConfigBadge, A as getFieldId, E as DEFAULT_FIELD_CONFIGS, Qt as ArrayContainer, a as namespaceToPropertiesPath, ct as useSafeSnackbarController, g as toSerializableProperty, i as namespaceToPropertiesOrderPath, k as getFieldConfig, m as toSerializableCollectionConfig, n as getFullIdPath, r as idToPropertiesPath, t as getFullId, tn as FieldCaption, ur as useCollectionRegistryController } from "./util-DybQBkug.js";
 import React, { createContext, useCallback, useContext, useDeferredValue, useEffect, useMemo, useRef, useState } from "react";
 import { deepEqual } from "fast-equals";
 import { AlertTriangleIcon, ArrowDownToLineIcon, ArrowUpToLineIcon, Badge, BooleanSwitchWithLabel, Button, Card, CheckSquareIcon, CircularProgress, DebouncedTextField, Dialog, DialogActions, DialogContent, DialogTitle, ErrorBoundary, ExpandablePanel, FileSearchIcon, FunctionSquareIcon, IconButton, InfoLabel, ListIcon, Menu, MenuItem, MinusCircleIcon, MoreVerticalIcon, MultiSelect, MultiSelectItem, Paper, PlusIcon, RefreshCcwIcon, Select, SelectItem, SettingsIcon, TextField, Tooltip, Trash2Icon, Typography, UploadCloudIcon, cls, defaultBorderMixin, iconSize } from "@rebasepro/ui";
@@ -1448,7 +1448,7 @@ var CommonPropertyFields = React.forwardRef(function CommonPropertyFields({ show
 	const name = "name";
 	const nameError = showErrors && getIn(errors, name);
 	const id = "id";
-	const idError = showErrors && getIn(errors, id);
+	const idError = (showErrors || Boolean(getIn(touched, id))) && getIn(errors, id);
 	const description = "description";
 	const descriptionError = showErrors && getIn(errors, description);
 	return /* @__PURE__ */ jsxs("div", {
@@ -2542,6 +2542,35 @@ var kindUsesLocalKey = (kind) => kind === "belongsTo";
 var kindUsesForeignKeyOnTarget = (kind) => kind === "hasOne" || kind === "hasMany";
 var kindUsesThrough = (kind) => kind === "manyToMany";
 var kindUsesJoinPath = (kind) => kind === "via";
+/**
+* The link fields each kind owns — the only ones a relation of that kind may
+* carry. The same table the boot validator checks a relation against.
+*/
+var LINK_FIELDS_BY_KIND = {
+	belongsTo: ["localKey"],
+	hasOne: ["foreignKeyOnTarget", "sourceKey"],
+	hasMany: ["foreignKeyOnTarget", "sourceKey"],
+	manyToMany: ["through"],
+	via: ["joinPath", "cardinality"]
+};
+var LINK_FIELDS = new Set(Object.values(LINK_FIELDS_BY_KIND).flat());
+/**
+* `relation` switched to `kind`, without the link fields its old kind owned.
+*
+* Switching kind in the property form used to set `kind` and nothing else, so
+* a junction table filled in before switching to "Belongs to" stayed on the
+* relation — `through` on a `belongsTo` — and a `localKey` rode along into a
+* `hasMany`. The boot validator refuses both, and every collection in the
+* directory stops loading. The name, the target and the referential actions
+* belong to every kind and are kept.
+*/
+function relationWithKind(relation, kind) {
+	const owned = LINK_FIELDS_BY_KIND[kind];
+	return {
+		...Object.fromEntries(Object.entries(relation).filter(([key]) => !LINK_FIELDS.has(key) || owned.includes(key))),
+		kind
+	};
+}
 //#endregion
 //#region src/collection_editor/ui/collection_editor/properties/RelationPropertyField.tsx
 var ON_ACTION_OPTIONS = [
@@ -2588,17 +2617,17 @@ function RelationPropertyField({ disabled, showErrors }) {
 	const showLocalKey = kindUsesLocalKey(kind);
 	const showForeignKey = kindUsesForeignKeyOnTarget(kind);
 	const showJoinPath = kindUsesJoinPath(kind);
+	const setLinkField = useCallback((field, value) => setFieldValue(`relation.${field}`, value === "" ? void 0 : value), [setFieldValue]);
 	const updateThrough = useCallback((patch) => {
-		const currentThrough = link.through ?? {
-			table: "",
-			sourceColumn: "",
-			targetColumn: ""
-		};
-		setFieldValue("relation.through", {
-			...currentThrough,
+		const next = Object.fromEntries(Object.entries({
+			...link.through ?? {},
 			...patch
-		});
+		}).filter(([, value]) => value !== "" && value !== void 0));
+		setFieldValue("relation.through", Object.keys(next).length > 0 ? next : void 0);
 	}, [link.through, setFieldValue]);
+	useEffect(() => {
+		if (!values.relation?.kind) setFieldValue("relation.kind", "belongsTo");
+	}, [values.relation?.kind, setFieldValue]);
 	useEffect(() => {
 		if (targetSlug && !relationName) setFieldValue("relation.relationName", targetSlug);
 	}, [
@@ -2641,7 +2670,7 @@ function RelationPropertyField({ disabled, showErrors }) {
 			className: "col-span-12",
 			children: [/* @__PURE__ */ jsx(Select, {
 				value: kind,
-				onValueChange: (v) => setFieldValue("relation.kind", v),
+				onValueChange: (v) => setFieldValue("relation", relationWithKind(link, v)),
 				label: "Kind",
 				disabled,
 				fullWidth: true,
@@ -2663,7 +2692,7 @@ function RelationPropertyField({ disabled, showErrors }) {
 			className: "col-span-12",
 			children: [/* @__PURE__ */ jsx(TextField, {
 				value: localKey,
-				onChange: (e) => setFieldValue("relation.localKey", e.target.value),
+				onChange: (e) => setLinkField("localKey", e.target.value),
 				label: "Local key (foreign key column on this table)",
 				disabled,
 				placeholder: "e.g. author_id"
@@ -2674,7 +2703,7 @@ function RelationPropertyField({ disabled, showErrors }) {
 			children: [
 				/* @__PURE__ */ jsx(TextField, {
 					value: foreignKeyOnTarget,
-					onChange: (e) => setFieldValue("relation.foreignKeyOnTarget", e.target.value),
+					onChange: (e) => setLinkField("foreignKeyOnTarget", e.target.value),
 					label: "Foreign key on target table",
 					disabled,
 					placeholder: "e.g. post_id"
@@ -2683,7 +2712,7 @@ function RelationPropertyField({ disabled, showErrors }) {
 				/* @__PURE__ */ jsx(TextField, {
 					className: "mt-4",
 					value: sourceKey,
-					onChange: (e) => setFieldValue("relation.sourceKey", e.target.value),
+					onChange: (e) => setLinkField("sourceKey", e.target.value),
 					label: "Source key (optional)",
 					disabled,
 					placeholder: "defaults to this table's primary key"
@@ -2948,12 +2977,14 @@ function updatePropertyFromWidget(propertyData, selectedWidgetId, propertyConfig
 		propertyConfig: "date_time",
 		mode: "date_time"
 	});
-	else if (selectedWidgetId === "relation") updatedProperty = mergeDeep(propertyData, {
-		type: "relation",
-		propertyConfig: "relation",
-		relationName: propertyData.relationName ?? ""
-	});
-	else if (selectedWidgetId === "repeat") updatedProperty = mergeDeep(propertyData, {
+	else if (selectedWidgetId === "relation") {
+		const { relationName: _misplaced, ...rest } = propertyData ?? {};
+		updatedProperty = mergeDeep(rest, {
+			type: "relation",
+			propertyConfig: "relation",
+			relation: { kind: propertyData?.relation?.kind ?? "belongsTo" }
+		});
+	} else if (selectedWidgetId === "repeat") updatedProperty = mergeDeep(propertyData, {
 		type: "array",
 		propertyConfig: "repeat"
 	});
@@ -3211,6 +3242,7 @@ var PropertyForm = React.memo(function PropertyForm(props) {
 		property
 	} : void 0);
 	const doOnPropertyChanged = ({ id, property }) => {
+		if (includeIdAndName && id !== lastSubmittedProperty.current?.id && validateId(id, existingPropertyKeys)) return;
 		const params = {
 			id,
 			previousId: lastSubmittedProperty.current?.id,
@@ -3802,4 +3834,4 @@ function WidgetSelectViewItem({ onClick, initialProperty, propertyConfig, existi
 //#endregion
 export { updatePropertyFromWidget as a, useAIModifiedPaths as c, supportedFields as i, PropertyForm as n, PropertyTree as o, PropertyFormDialog as r, AIModifiedPathsProvider as s, PropertyEditView_exports as t };
 
-//# sourceMappingURL=PropertyEditView-gKNUHxLY.js.map
+//# sourceMappingURL=PropertyEditView-_pu5hzZn.js.map