@rebasepro/admin 0.11.1-canary.gfd39654 → 0.12.1-canary.gdfba2a1

package/README.md

@@ -71,7 +71,7 @@ pnpm add @rebasepro/admin
 | `useSelectionController` | Row selection state for tables |
 | `useHistory` | Snapshot change history and version revert |
 | `useBreadcrumbsController` | Breadcrumb navigation state |
-| `useCMSContext` | Access the CMS-level context |
+| `useAdminContext` | Access the admin-level context |
 | `useResolvedNavigationFrom` | Resolve navigation tree from collection configs |
 
 ### Data Import/Export

package/dist/{CollectionEditorDialog-o7F_zbGY.js → CollectionEditorDialog-B8j6HArJ.js}

@@ -1,10 +1,10 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
-import { $t as CollectionTableBinding, A as getFieldId, Ct as convertDataToEntity, Dt as useImportConfig, Et as getInferenceType, Ft as FieldCaption, In as useCollectionRegistryController, Nt as PropertyConfigBadge, Ot as ImportSaveInProgress, Pt as SearchIconsView, St as DataNewPropertiesMapping, Zt as useSelectionController, _ as useCollectionsConfigController, i as namespaceToPropertiesOrderPath, in as useUrlController, k as getFieldConfig, kt as ImportFileUpload, l as validateCollectionJson, m as toSerializableCollectionConfig, n as getFullIdPath, o as CollectionGenerationApiError, on as useNavigationStateController, r as idToPropertiesPath, t as getFullId, vt as useCollectionEditorController, xt as ImportNewPropertyFieldPreview } from "./util-BhhfHY1M.js";
-import { a as updatePropertyFromWidget, c as useAIModifiedPaths, i as supportedFields, l as useSafeSnackbarController, n as PropertyForm, o as PropertyTree, r as PropertyFormDialog, s as AIModifiedPathsProvider } from "./PropertyEditView-DgB2b22q.js";
+import { $t as CollectionTableBinding, A as getFieldId, Ct as convertDataToEntity, Dt as useImportConfig, Et as getInferenceType, Ft as FieldCaption, In as useCollectionRegistryController, Nt as PropertyConfigBadge, Ot as ImportSaveInProgress, Pt as SearchIconsView, St as DataNewPropertiesMapping, Zt as useSelectionController, _ as useCollectionsConfigController, i as namespaceToPropertiesOrderPath, in as useUrlController, k as getFieldConfig, kt as ImportFileUpload, l as validateCollectionJson, m as toSerializableCollectionConfig, n as getFullIdPath, o as CollectionGenerationApiError, on as useNavigationStateController, r as idToPropertiesPath, t as getFullId, vt as useCollectionEditorController, xt as ImportNewPropertyFieldPreview } from "./util-BwZuV81o.js";
+import { a as updatePropertyFromWidget, c as useAIModifiedPaths, i as supportedFields, l as useSafeSnackbarController, n as PropertyForm, o as PropertyTree, r as PropertyFormDialog, s as AIModifiedPathsProvider } from "./PropertyEditView-D2b9_nbC.js";
 import * as React$1 from "react";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Alert, AppWindow, ArrowLeftIcon, BooleanSwitchWithLabel, Button, Card, CheckIcon, Chip, CircularProgress, CircularProgressCenter, CodeIcon, ColumnsIcon, Container, CopyIcon, DebouncedTextField, Dialog, DialogActions, DialogContent, DialogTitle, ErrorBoundary, FileIcon, FileSearchIcon, FileTextIcon, IconButton, KanbanIcon, KeyIcon, LayoutGridIcon, ListIcon, LoadingButton, Menu, MultiSelect, MultiSelectItem, PanelLeftIcon, Paper, PlusIcon, Select, SelectItem, ShoppingCartIcon, SquareIcon, Tab, TableIcon, Tabs, TextField, ToggleButtonGroup, Tooltip, Trash2Icon, Typography, UserIcon, XIcon, cls, coolIconKeys, defaultBorderMixin, iconSize } from "@rebasepro/ui";
-import { getEffectiveSecurityRules, getSubcollections, getTableName, isPropertyBuilder } from "@rebasepro/common";
+import { buildCollectionFromTableMetadata, getEffectiveSecurityRules, getSubcollections, getTableName, isPropertyBuilder } from "@rebasepro/common";
 import { AIIcon, ConfirmationDialog, ErrorView, IconForView, UnsavedChangesDialog, removeInitialAndTrailingSlashes, useAuthController, useCustomizationController, useLargeLayout, useRebaseContext, useUnsavedChangesDialog } from "@rebasepro/app";
 import { Field, Formex, clone, getIn, useCreateFormex, useFormex } from "@rebasepro/forms";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -696,7 +696,7 @@ function GetCodeDialog({ collection, onOpenChange, open }) {
 				variant: "body2",
 				className: "my-4 mb-8",
 				children: [
-					"If you want to customise the collection in code, you can add this collection code to your CMS app configuration. More info in the ",
+					"If you want to customise the collection in code, you can add this collection code to your admin app configuration. More info in the ",
 					/* @__PURE__ */ jsx("a", {
 						rel: "noopener noreferrer",
 						href: "https://rebase.pro/docs/cloud/quickstart",
@@ -875,7 +875,8 @@ function CollectionPropertiesEditorForm({ showErrors, isNewCollection, propertyE
 		return currentPropertiesOrderRef.current[namespace] ?? getIn(values, namespaceToPropertiesOrderPath(namespace));
 	};
 	const updatePropertiesOrder = (newPropertiesOrder, namespace) => {
-		setFieldValue(namespaceToPropertiesOrderPath(namespace), newPropertiesOrder, false);
+		const propertiesOrderPath = namespaceToPropertiesOrderPath(namespace);
+		setFieldValue(propertiesOrderPath, newPropertiesOrder, false);
 		currentPropertiesOrderRef.current[namespace ?? ""] = newPropertiesOrder;
 	};
 	const deleteProperty = (propertyKey, namespace) => {
@@ -884,7 +885,10 @@ function CollectionPropertiesEditorForm({ showErrors, isNewCollection, propertyE
 		if (!fullId) throw Error("collection editor miss config");
 		setFieldValue(idToPropertiesPath(fullId), void 0, false);
 		const currentPropertiesOrder = getCurrentPropertiesOrder(namespace);
-		if (currentPropertiesOrder) updatePropertiesOrder(currentPropertiesOrder.filter((p) => p !== propertyKey), namespace);
+		if (currentPropertiesOrder) {
+			const newPropertiesOrder = currentPropertiesOrder.filter((p) => p !== propertyKey);
+			updatePropertiesOrder(newPropertiesOrder, namespace);
+		}
 		setNewPropertyDialogOpen(false);
 		setSelectedPropertyIndex(void 0);
 		setSelectedPropertyKey(void 0);
@@ -1177,7 +1181,8 @@ function CollectionJsonImportDialog({ open, onClose, onImport }) {
 			setErrors([]);
 			return;
 		}
-		setErrors(validateCollectionJson(value).errors);
+		const result = validateCollectionJson(value);
+		setErrors(result.errors);
 	}, []);
 	const handleImport = useCallback(() => {
 		const result = validateCollectionJson(jsonValue);
@@ -2077,7 +2082,8 @@ function CollectionEditorImportMapping({ importConfig, propertyConfigs }) {
 			return currentPropertiesOrderRef.current[namespace] ?? getIn(values, namespaceToPropertiesOrderPath(namespace));
 		};
 		const updatePropertiesOrder = (newPropertiesOrder, namespace) => {
-			setFieldValue(namespaceToPropertiesOrderPath(namespace), newPropertiesOrder, false);
+			const propertiesOrderPath = namespaceToPropertiesOrderPath(namespace);
+			setFieldValue(propertiesOrderPath, newPropertiesOrder, false);
 			currentPropertiesOrderRef.current[namespace ?? ""] = newPropertiesOrder;
 		};
 		if (previousId && previousId !== id) {
@@ -2329,6 +2335,53 @@ function sanitizeSqlIdentifier(name) {
 	if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name)) throw new Error(`Invalid SQL identifier: "${name}". Only letters, digits, and underscores are allowed.`);
 	return `"${name}"`;
 }
+/**
+* `pg_policies` reports the operation and the permissive flag in upper case;
+* `SecurityRule` names them in lower case. These two used to be `.toLowerCase()`
+* assigned straight into a `SecurityRule`, which typechecks only against a
+* `string` field — and this file declared its own local `SecurityRule` with
+* `operation?: string`, so it did. Against the real type it does not: an
+* unrecognised `cmd` would have been written into the collection as a policy
+* operation that compiles to nothing.
+*/
+function toSecurityOperation(cmd) {
+	switch (cmd) {
+		case "SELECT": return "select";
+		case "INSERT": return "insert";
+		case "UPDATE": return "update";
+		case "DELETE": return "delete";
+		case "ALL": return "all";
+		default: return;
+	}
+}
+function toSecurityMode(permissive) {
+	if (!permissive) return void 0;
+	return permissive === "RESTRICTIVE" ? "restrictive" : "permissive";
+}
+/**
+* Build a {@link SecurityRule} from a `pg_policies` row.
+*
+* `SecurityRule` is a discriminated union and this is the part the local shadow
+* type flattened away: a raw-SQL rule *requires* `using`, so a policy with only
+* a `WITH CHECK` clause — every INSERT-only policy — is not one. It is a
+* roles-only rule carrying the check. Assembling the object field-by-field
+* against `operation?: string` accepted all of these and told the compiler
+* nothing.
+*/
+function toSecurityRule(policy) {
+	const base = {
+		name: policy.policyname ?? "",
+		operation: toSecurityOperation(policy.cmd),
+		mode: toSecurityMode(policy.permissive),
+		roles: policy.roles ? [...policy.roles] : void 0
+	};
+	if (policy.qual) return {
+		...base,
+		using: policy.qual,
+		withCheck: policy.with_check || void 0
+	};
+	return base;
+}
 function CollectionRLSTab() {
 	const { values, setFieldValue } = useFormex();
 	const [editingPolicy, setEditingPolicy] = useState(null);
@@ -2353,7 +2406,7 @@ function CollectionRLSTab() {
 					if (Array.isArray(res)) return res;
 					return [];
 				};
-				setDbPolicies(extractRows(result).map((p) => {
+				const policies = extractRows(result).map((p) => {
 					let parsedRoles = [];
 					const r = p.roles || p.ROLES;
 					if (Array.isArray(r)) parsedRoles = r;
@@ -2367,7 +2420,8 @@ function CollectionRLSTab() {
 						qual: p.qual || p.QUAL || null,
 						with_check: p.with_check || p.WITH_CHECK || null
 					};
-				}));
+				});
+				setDbPolicies(policies);
 			} catch (e) {
 				console.error("Failed to fetch DB policies", e);
 			} finally {
@@ -2437,14 +2491,7 @@ function CollectionRLSTab() {
 	]);
 	const unmappedPolicies = dbPolicies.filter((dp) => !generatedPolicyNames.has(dp.policyname));
 	const handleSave = async (newPolicy) => {
-		const rule = {
-			name: newPolicy.policyname ?? "",
-			operation: newPolicy.cmd?.toLowerCase(),
-			mode: newPolicy.permissive?.toLowerCase(),
-			using: newPolicy.qual || void 0,
-			withCheck: newPolicy.with_check || void 0,
-			roles: newPolicy.roles
-		};
+		const rule = toSecurityRule(newPolicy);
 		let newRules;
 		if (editingPolicy === "new") newRules = [...rules, rule];
 		else newRules = rules.map((r) => r.name === editingPolicy.policyname ? rule : r);
@@ -2511,11 +2558,11 @@ function CollectionRLSTab() {
 									size: "small",
 									variant: "text",
 									onClick: () => setEditingPolicy({
-										policyname: rule.name,
+										policyname: rule.name ?? "",
 										tablename: values.id || values.table || values.alias || "your_table",
 										permissive: (rule.mode || "permissive").toUpperCase(),
 										cmd: (rule.operation || "ALL").toUpperCase(),
-										roles: rule.roles || [],
+										roles: [...rule.roles ?? []],
 										qual: rule.using || null,
 										with_check: rule.withCheck || null
 									}),
@@ -2595,14 +2642,7 @@ function CollectionRLSTab() {
 											variant: "outlined",
 											color: "primary",
 											onClick: () => {
-												const rule = {
-													name: dp.policyname,
-													operation: dp.cmd?.toLowerCase(),
-													mode: dp.permissive?.toLowerCase(),
-													using: dp.qual || void 0,
-													withCheck: dp.with_check || void 0,
-													roles: dp.roles
-												};
+												const rule = toSecurityRule(dp);
 												setFieldValue("securityRules", [...rules, rule]);
 											},
 											children: "Import to codebase"
@@ -2651,7 +2691,7 @@ function InlinePolicyEditor({ policy, table, availableRoles, rolesUnavailable, o
 	* from what users hold, so a role that is referenced here but assigned to
 	* nobody would otherwise vanish from its own policy on the next save.
 	*/
-	const roleOptions = useMemo(() => Array.from(new Set([...availableRoles, ...roles])).sort(), [availableRoles, roles]);
+	const roleOptions = useMemo(() => Array.from(/* @__PURE__ */ new Set([...availableRoles, ...roles])).sort(), [availableRoles, roles]);
 	const addCustomRole = () => {
 		const trimmed = customRole.trim();
 		if (!trimmed || roles.includes(trimmed)) {
@@ -2843,243 +2883,6 @@ function InlinePolicyEditor({ policy, table, availableRoles, rolesUnavailable, o
 	] });
 }
 //#endregion
-//#region src/collection_editor/pgColumnToProperty.ts
-/**
-* Maps a PostgreSQL column data type to a Rebase property type.
-*/
-function pgTypeToRebaseProperty(column) {
-	const { column_name, data_type, udt_name, is_nullable, column_default, enum_values } = column;
-	const required = is_nullable === "NO";
-	const prettifiedName = prettifyIdentifier(column_name);
-	const isAutoId = column_default != null && (column_default.includes("nextval") || column_default.includes("gen_random_uuid") || column_default.includes("uuid_generate") || column_default.includes("identity"));
-	if (data_type === "USER-DEFINED" && enum_values && enum_values.length > 0) return {
-		type: "string",
-		name: prettifiedName,
-		enum: enum_values.map((v) => ({
-			id: v,
-			label: prettifyIdentifier(v)
-		})),
-		validation: required ? { required: true } : void 0
-	};
-	const dt = data_type.toLowerCase();
-	switch (dt) {
-		case "character varying":
-		case "varchar":
-		case "text":
-		case "char":
-		case "character":
-		case "citext": {
-			let colType = "varchar";
-			if (dt === "text" || dt === "citext") colType = "text";
-			if (dt === "char" || dt === "character") colType = "char";
-			const prop = {
-				type: "string",
-				name: prettifiedName,
-				columnType: colType,
-				validation: required ? { required: true } : void 0
-			};
-			if (isAutoId) prop.isId = "manual";
-			return prop;
-		}
-		case "uuid": {
-			const prop = {
-				type: "string",
-				name: prettifiedName,
-				validation: required ? { required: true } : void 0
-			};
-			if (isAutoId) prop.isId = "uuid";
-			return prop;
-		}
-		case "integer":
-		case "bigint":
-		case "smallint": {
-			const prop = {
-				type: "number",
-				name: prettifiedName,
-				columnType: dt === "bigint" ? "bigint" : "integer",
-				validation: {
-					...required ? { required: true } : {},
-					integer: true
-				}
-			};
-			if (isAutoId) prop.isId = "increment";
-			return prop;
-		}
-		case "serial":
-		case "bigserial":
-		case "smallserial": return {
-			type: "number",
-			name: prettifiedName,
-			columnType: dt === "bigserial" ? "bigserial" : "serial",
-			isId: "increment",
-			validation: {
-				...required ? { required: true } : {},
-				integer: true
-			}
-		};
-		case "numeric":
-		case "decimal":
-		case "real":
-		case "double precision": {
-			let colType = "numeric";
-			if (dt === "real") colType = "real";
-			if (dt === "double precision") colType = "double precision";
-			return {
-				type: "number",
-				name: prettifiedName,
-				columnType: colType,
-				validation: required ? { required: true } : void 0
-			};
-		}
-		case "boolean": return {
-			type: "boolean",
-			name: prettifiedName,
-			validation: required ? { required: true } : void 0
-		};
-		case "timestamp with time zone":
-		case "timestamp without time zone":
-		case "timestamp":
-		case "timestamptz":
-		case "date":
-		case "time with time zone":
-		case "time without time zone":
-		case "time": {
-			let colType = "timestamp";
-			if (dt.startsWith("date")) colType = "date";
-			if (dt.startsWith("time ") || dt === "time") colType = "time";
-			return {
-				type: "date",
-				name: prettifiedName,
-				columnType: colType,
-				validation: required ? { required: true } : void 0
-			};
-		}
-		case "jsonb":
-		case "json": return {
-			type: "map",
-			name: prettifiedName,
-			columnType: dt === "jsonb" ? "jsonb" : "json",
-			keyValue: true,
-			properties: {}
-		};
-		case "array":
-		case "ARRAY": {
-			let innerType = "string";
-			let colType = void 0;
-			if (udt_name === "_text" || udt_name === "_varchar") {
-				innerType = "string";
-				colType = "text[]";
-			} else if (udt_name === "_int4" || udt_name === "_int2" || udt_name === "_int8") {
-				innerType = "number";
-				colType = "integer[]";
-			} else if (udt_name === "_bool") {
-				innerType = "boolean";
-				colType = "boolean[]";
-			} else if (udt_name === "_numeric") {
-				innerType = "number";
-				colType = "numeric[]";
-			}
-			return {
-				type: "array",
-				name: prettifiedName,
-				columnType: colType,
-				of: { type: innerType }
-			};
-		}
-		default: return {
-			type: "string",
-			name: prettifiedName,
-			validation: required ? { required: true } : void 0
-		};
-	}
-}
-/**
-* Builds a partial AdminCollection from PostgreSQL table metadata.
-* This is used when creating a new collection from an existing database table.
-*/
-function buildCollectionFromTableMetadata(tableName, metadata) {
-	const properties = {};
-	const propertiesOrder = [];
-	const relations = [];
-	const securityRules = [];
-	for (const column of metadata.columns) {
-		const property = pgTypeToRebaseProperty(column);
-		if (property) {
-			const propRecord = property;
-			Object.keys(propRecord).forEach((key) => propRecord[key] === void 0 && delete propRecord[key]);
-			properties[column.column_name] = property;
-			propertiesOrder.push(column.column_name);
-		}
-	}
-	if (metadata.foreignKeys) for (const fk of metadata.foreignKeys) {
-		const relName = fk.column_name.endsWith("_id") ? fk.column_name.substring(0, fk.column_name.length - 3) : fk.column_name;
-		relations.push({
-			id: fk.column_name,
-			relationName: relName,
-			target: fk.foreign_table_name,
-			cardinality: "one",
-			direction: "owning",
-			localKey: fk.column_name
-		});
-	}
-	if (metadata.junctions) for (const junction of metadata.junctions) {
-		const relName = junction.target_table_name;
-		relations.push({
-			id: junction.target_table_name + "_relation",
-			relationName: relName,
-			target: junction.target_table_name,
-			cardinality: "many",
-			direction: "owning",
-			through: {
-				table: junction.junction_table_name,
-				sourceColumn: junction.source_column_name,
-				targetColumn: junction.target_column_name
-			}
-		});
-	}
-	if (metadata.policies) for (const policy of metadata.policies) {
-		let operations = [];
-		switch (policy.cmd) {
-			case "ALL":
-				operations = [
-					"read",
-					"create",
-					"update",
-					"delete"
-				];
-				break;
-			case "SELECT":
-				operations = ["read"];
-				break;
-			case "INSERT":
-				operations = ["create"];
-				break;
-			case "UPDATE":
-				operations = ["update"];
-				break;
-			case "DELETE":
-				operations = ["delete"];
-				break;
-		}
-		securityRules.push({
-			name: policy.policy_name,
-			operations,
-			roles: policy.roles ?? [],
-			qual: policy.qual,
-			with_check: policy.with_check
-		});
-	}
-	return {
-		name: prettifyIdentifier(tableName),
-		slug: tableName,
-		table: tableName,
-		properties,
-		propertiesOrder,
-		...relations.length > 0 ? { relations } : {},
-		...securityRules.length > 0 ? { securityRules } : {}
-	};
-}
-//#endregion
 //#region src/collection_editor/ui/collection_editor/CollectionEditorDialog.tsx
 var CollectionEditorDialog_exports = /* @__PURE__ */ __exportAll({
 	CollectionEditor: () => CollectionEditor,
@@ -3575,10 +3378,11 @@ function CollectionEditorInternal({ isNewCollection, configController, editedCol
 							showErrors: submitCount > 0,
 							isNewCollection,
 							onPropertyError: (propertyKey, namespace, error) => {
-								propertyErrorsRef.current = removeUndefined({
+								const current = removeUndefined({
 									...propertyErrorsRef.current,
 									[getFullIdPath(propertyKey, namespace)]: removeUndefined(error, true)
 								}, true);
+								propertyErrorsRef.current = current;
 								formController.validate();
 							},
 							getUser,
@@ -3741,4 +3545,4 @@ var validateId = (value, isNewCollection, existingPaths, existingIds) => {
 //#endregion
 export { CollectionEditorDialog as n, CollectionEditorDialog_exports as r, CollectionEditor as t };
 
-//# sourceMappingURL=CollectionEditorDialog-o7F_zbGY.js.map
+//# sourceMappingURL=CollectionEditorDialog-B8j6HArJ.js.map