@rebasepro/cms 0.21.2-canary.g1ea48be → 0.23.0

package/dist/{CollectionEditorDialog-B1mG1cfx.js → CollectionEditorDialog-DLHCka00.js}

@@ -1,14 +1,14 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
-import { A as getFieldId, At as convertDataToEntity, Ft as ImportSaveInProgress, Gt as SearchIconsView, Kt as FieldCaption, Nt as getInferenceType, Ot as ImportNewPropertyFieldPreview, Pt as useImportConfig, Rt as ImportFileUpload, S as isSchemaChangeCancelled, Sn as useUrlController, Tt as useCollectionEditorController, Wt as PropertyConfigBadge, _ as useCollectionsConfigController, _n as CollectionTableBinding, ct as useSafeSnackbarController, er as useCollectionRegistryController, hn as useSelectionController, i as namespaceToPropertiesOrderPath, k as getFieldConfig, kt as DataNewPropertiesMapping, l as validateCollectionJson, m as toSerializableCollectionConfig, n as getFullIdPath, o as CollectionGenerationApiError, r as idToPropertiesPath, t as getFullId, wn as useNavigationStateController } from "./util-qfCPxJzB.js";
-import { a as updatePropertyFromWidget, c as useAIModifiedPaths, i as supportedFields, n as PropertyForm, o as PropertyTree, r as PropertyFormDialog, s as AIModifiedPathsProvider } from "./PropertyEditView-gKNUHxLY.js";
+import { $t as PropertyConfigBadge, A as getFieldId, At as guessIdColumn, Dn as CollectionTableBinding, Ft as useImportConfig, It as ImportSaveInProgress, Mn as useUrlController, Ot as ImportNewPropertyFieldPreview, Pn as useNavigationStateController, Pt as getInferenceType, S as isSchemaChangeCancelled, Tn as useSelectionController, Tt as useCollectionEditorController, _ as useCollectionsConfigController, ct as useSafeSnackbarController, en as SearchIconsView, i as namespaceToPropertiesOrderPath, jt as convertDataToEntity, k as getFieldConfig, kt as DataNewPropertiesMapping, l as validateCollectionJson, m as toSerializableCollectionConfig, n as getFullIdPath, o as CollectionGenerationApiError, r as idToPropertiesPath, t as getFullId, tn as FieldCaption, ur as useCollectionRegistryController, zt as ImportFileUpload } from "./util-DybQBkug.js";
+import { a as updatePropertyFromWidget, c as useAIModifiedPaths, i as supportedFields, n as PropertyForm, o as PropertyTree, r as PropertyFormDialog, s as AIModifiedPathsProvider } from "./PropertyEditView-_pu5hzZn.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 { buildCollectionFromTableMetadata, getGeneratedPolicyNames, getSubcollections, getTableName, isPropertyBuilder } from "@rebasepro/common";
+import { buildCollectionFromTableMetadata, getGeneratedPolicyNames, getSubcollections, getTableName, isPropertyBuilder, policyToSecurityRule } from "@rebasepro/common";
 import { AIIcon, ConfirmationDialog, ErrorView, IconForView, UnsavedChangesDialog, getIcon, removeInitialAndTrailingSlashes, useAuthController, useCustomizationController, useLargeLayout, useRebaseContext, useTranslation, useUnsavedChangesDialog } from "@rebasepro/app";
 import { Field, Formex, clone, getIn, useCreateFormex, useFormex } from "@rebasepro/forms";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { RLS_ROLES_SQL, RLS_UID_SQL, getDataSourceCapabilities } from "@rebasepro/types";
+import { RLS_ROLES_SQL, RLS_UID_SQL, getDataSourceCapabilities, isPostgresCollectionConfig } from "@rebasepro/types";
 import { camelCase, getPolicyNamesForRule, isEmptyObject, mergeDeep, prettifyIdentifier, randomString, removeUndefined, singular, slugify, toSnakeCase, unslugify } from "@rebasepro/utils";
 import { z } from "zod";
 import { buildEntityPropertiesFromData, buildPropertyFromData } from "@rebasepro/inference";
@@ -103,6 +103,7 @@ function GeneralSettingsForm({ isNewCollection, existingPaths, existingIds, pare
 									as: DebouncedTextField,
 									label: "Table name",
 									required: true,
+									disabled: !isNewCollection,
 									error: showErrors && Boolean(errors.table)
 								}), /* @__PURE__ */ jsx(FieldCaption, {
 									error: touched.table && Boolean(errors.table),
@@ -962,6 +963,8 @@ function CollectionPropertiesEditorForm({ showErrors, isNewCollection, propertyE
 	const initialErrors = selectedPropertyKey && propertyErrorsRef?.current?.properties ? propertyErrorsRef.current.properties[selectedPropertyKey] : void 0;
 	const emptyCollection = (values?.propertiesOrder === void 0 || values.propertiesOrder.length === 0) && (!values?.properties || Object.keys(values.properties).length === 0);
 	const usedPropertiesOrder = values.propertiesOrder ? values.propertiesOrder : Object.keys(values.properties);
+	const selectedNamespaceOrder = getCurrentPropertiesOrder(selectedPropertyNamespace);
+	const otherPropertyKeys = useMemo(() => (selectedNamespaceOrder ?? []).filter((key) => key !== selectedPropertyKey), [selectedNamespaceOrder, selectedPropertyKey]);
 	const owner = useMemo(() => values.ownerId && getUser ? getUser(values.ownerId) : null, [getUser, values.ownerId]);
 	const generationCounter = useAIModifiedPaths()?.generationCounter ?? 0;
 	const onPropertyClick = (propertyKey, namespace) => {
@@ -1071,6 +1074,7 @@ function CollectionPropertiesEditorForm({ showErrors, isNewCollection, propertyE
 								propertyKey: selectedPropertyKey,
 								propertyNamespace: selectedPropertyNamespace,
 								property: selectedProperty,
+								existingPropertyKeys: otherPropertyKeys,
 								onPropertyChanged,
 								onDelete: deleteProperty,
 								onError: onPropertyErrorInternal,
@@ -2328,12 +2332,9 @@ function cleanPropertiesFromImport(properties, parentSlug = "") {
 		headersMapping: {},
 		properties: {}
 	});
-	const firstKey = Object.keys(result.headersMapping)?.[0];
-	let idColumn;
-	if (firstKey?.includes("id") || firstKey?.includes("key")) idColumn = firstKey;
 	return {
 		...result,
-		idColumn
+		idColumn: guessIdColumn(Object.keys(result.headersMapping), result.headersMapping, result.properties)
 	};
 }
 //#endregion
@@ -2371,48 +2372,88 @@ function toSecurityMode(permissive) {
 	return permissive === "RESTRICTIVE" ? "restrictive" : "permissive";
 }
 /**
-* Build a {@link SecurityRule} from a `pg_policies` row.
+* Build a rule from what the inline editor saved. Its `roles` are application
+* roles; a live policy's are its `TO` list, which `policyToSecurityRule` reads.
 *
-* `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.
+* The WITH CHECK is kept whether or not there is a USING: every INSERT-only
+* policy has only a check, and a roles-only rule with no roles compiles to
+* `WITH CHECK (false)`, which stops every insert.
 */
 function toSecurityRule(policy) {
-	const base = {
+	return {
 		name: policy.policyname ?? "",
 		operation: toSecurityOperation(policy.cmd),
 		mode: toSecurityMode(policy.permissive),
-		roles: policy.roles ? [...policy.roles] : void 0
+		roles: policy.roles ? [...policy.roles] : void 0,
+		...policy.qual ? { using: policy.qual } : {},
+		...policy.with_check ? { withCheck: policy.with_check } : {}
 	};
-	if (policy.qual) return {
-		...base,
-		using: policy.qual,
-		withCheck: policy.with_check || void 0
-	};
-	return base;
+}
+/**
+* The rule with what the editor changed, and nothing else.
+*
+* The editor shows a rule as a policy — name, command, mode, application roles
+* and raw USING / WITH CHECK — and has no field for `ownerField`, `access`, a
+* structured `condition`, `operations` (it shows them as ALL) or `pgRoles`.
+* The rule used to be rebuilt from the form, which dropped all of them:
+* renaming an owner rule saved a roles-only rule with no roles, which compiles
+* to `USING (false)`. So a field is only written when it differs from what the
+* editor was opened with. A condition typed in replaces the rule's condition
+* whole — the forms are exclusive.
+*
+* Studio's RLS editor does the same in `policyRules.ts`; there the editor's
+* roles are the policy's `TO` list, `pgRoles`, and here they are `roles`.
+*/
+function editedRule(rule, original, edited) {
+	const next = toSecurityRule(edited);
+	const result = { ...rule };
+	if ((edited.policyname ?? "") !== original.policyname) if (next.name) result.name = next.name;
+	else delete result.name;
+	if (edited.cmd !== original.cmd) {
+		delete result.operations;
+		result.operation = next.operation;
+	}
+	if (edited.permissive !== original.permissive) result.mode = next.mode;
+	if (!sameRoles(edited.roles, original.roles)) if (next.roles && next.roles.length > 0) result.roles = next.roles;
+	else delete result.roles;
+	if ((edited.qual || null) !== (original.qual || null) || (edited.with_check || null) !== (original.with_check || null)) {
+		delete result.ownerField;
+		delete result.access;
+		delete result.condition;
+		delete result.check;
+		delete result.using;
+		delete result.withCheck;
+		if (next.using) result.using = next.using;
+		if (next.withCheck) result.withCheck = next.withCheck;
+	}
+	return result;
+}
+function sameRoles(a, b) {
+	const left = [...a ?? []].sort();
+	const right = [...b ?? []].sort();
+	return left.length === right.length && left.every((role, i) => role === right[i]);
 }
 function CollectionRLSTab() {
 	const { values, setFieldValue } = useFormex();
-	const [editingPolicy, setEditingPolicy] = useState(null);
+	const [editing, setEditing] = useState(null);
 	const { readOnly, readOnlyReason } = useCollectionsConfigController();
 	const readOnlyTitle = readOnlyReason || "This backend does not accept collection edits.";
 	const rules = values.securityRules || [];
 	const { databaseAdmin } = useRebaseContext();
 	const [dbPolicies, setDbPolicies] = useState([]);
 	const [isLoadingDb, setIsLoadingDb] = useState(false);
+	const tableName = getTableName(values);
+	const schemaName = isPostgresCollectionConfig(values) && values.schema ? values.schema : "public";
 	useEffect(() => {
 		const fetchLivePolicies = async () => {
-			const tableName = values.id || values.table || values.alias;
 			if (!tableName || !databaseAdmin?.executeSql) return;
 			setIsLoadingDb(true);
 			try {
+				const rawTableName = sanitizeSqlIdentifier(tableName).slice(1, -1);
 				const sql = `
                     SELECT policyname, permissive, roles, cmd, qual, with_check
                     FROM pg_policies
-                    WHERE tablename = '${sanitizeSqlIdentifier(tableName).slice(1, -1)}' AND schemaname NOT IN ('information_schema', 'pg_catalog');
+                    WHERE schemaname = '${sanitizeSqlIdentifier(schemaName).slice(1, -1)}' AND tablename = '${rawTableName}';
                 `;
 				const result = await databaseAdmin.executeSql(sql);
 				const extractRows = (res) => {
@@ -2445,9 +2486,8 @@ function CollectionRLSTab() {
 		fetchLivePolicies();
 	}, [
 		databaseAdmin,
-		values.id,
-		values.table,
-		values.alias
+		tableName,
+		schemaName
 	]);
 	/**
 	* Application roles available to `SecurityRule.roles`.
@@ -2481,19 +2521,16 @@ function CollectionRLSTab() {
 			mounted = false;
 		};
 	}, [databaseAdmin]);
-	const tableName = values.id || values.table || values.alias;
 	const generatedPolicyNames = useMemo(() => {
 		if (!tableName) return /* @__PURE__ */ new Set();
 		return getGeneratedPolicyNames(values);
 	}, [tableName, values]);
 	const unmappedPolicies = dbPolicies.filter((dp) => !generatedPolicyNames.has(dp.policyname));
-	const handleSave = async (newPolicy) => {
-		const rule = toSecurityRule(newPolicy);
-		let newRules;
-		if (editingPolicy === "new") newRules = [...rules, rule];
-		else newRules = rules.map((r) => r.name === editingPolicy.policyname ? rule : r);
+	const handleSave = (newPolicy) => {
+		if (!editing) return;
+		const newRules = editing === "new" ? [...rules, toSecurityRule(newPolicy)] : rules.map((r, i) => i === editing.index ? editedRule(r, editing.policy, newPolicy) : r);
 		setFieldValue("securityRules", newRules);
-		setEditingPolicy(null);
+		setEditing(null);
 	};
 	return /* @__PURE__ */ jsx("div", {
 		className: "overflow-auto my-auto",
@@ -2514,7 +2551,7 @@ function CollectionRLSTab() {
 								variant: "filled",
 								color: "neutral",
 								disabled: readOnly,
-								onClick: () => setEditingPolicy("new"),
+								onClick: () => setEditing("new"),
 								children: "CREATE POLICY"
 							}) })
 						})]
@@ -2527,7 +2564,7 @@ function CollectionRLSTab() {
 						})
 					}) : /* @__PURE__ */ jsx("div", {
 						className: "flex flex-col gap-3",
-						children: rules.map((rule) => /* @__PURE__ */ jsxs(Paper, {
+						children: rules.map((rule, index) => /* @__PURE__ */ jsxs(Paper, {
 							className: "p-4 border border-transparent hover:border-surface-200 dark:hover:border-surface-700 rounded-lg flex flex-col sm:flex-row sm:items-center justify-between gap-4 transition-colors bg-surface-card shadow-sm",
 							children: [/* @__PURE__ */ jsxs("div", {
 								className: "flex flex-col gap-1.5 min-w-0",
@@ -2559,21 +2596,24 @@ function CollectionRLSTab() {
 									size: "small",
 									variant: "text",
 									disabled: readOnly,
-									onClick: () => setEditingPolicy({
-										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 ?? []],
-										qual: rule.using || null,
-										with_check: rule.withCheck || null
+									onClick: () => setEditing({
+										index,
+										policy: {
+											policyname: rule.name ?? "",
+											tablename: tableName || "your_table",
+											permissive: (rule.mode || "permissive").toUpperCase(),
+											cmd: (rule.operation || "ALL").toUpperCase(),
+											roles: [...rule.roles ?? []],
+											qual: rule.using || null,
+											with_check: rule.withCheck || null
+										}
 									}),
 									children: "EDIT"
 								}), /* @__PURE__ */ jsx(IconButton, {
 									size: "small",
 									disabled: readOnly,
 									onClick: () => {
-										setFieldValue("securityRules", rules.filter((r) => r.name !== rule.name));
+										setFieldValue("securityRules", rules.filter((_r, i) => i !== index));
 									},
 									children: /* @__PURE__ */ jsx(Trash2Icon, {
 										size: iconSize.smallest,
@@ -2581,7 +2621,7 @@ function CollectionRLSTab() {
 									})
 								})]
 							})]
-						}, rule.name))
+						}, `${index}:${rule.name ?? ""}`))
 					}),
 					isLoadingDb && unmappedPolicies.length === 0 && /* @__PURE__ */ jsx("div", {
 						className: "flex justify-center mt-8",
@@ -2648,7 +2688,7 @@ function CollectionRLSTab() {
 												color: "primary",
 												disabled: readOnly,
 												onClick: () => {
-													const rule = toSecurityRule(dp);
+													const rule = policyToSecurityRule(dp);
 													setFieldValue("securityRules", [...rules, rule]);
 												},
 												children: "Import to codebase"
@@ -2661,16 +2701,17 @@ function CollectionRLSTab() {
 					})
 				]
 			}), /* @__PURE__ */ jsx(Dialog, {
-				open: !!editingPolicy,
-				onOpenChange: (open) => !open && setEditingPolicy(null),
+				open: !!editing,
+				onOpenChange: (open) => !open && setEditing(null),
 				maxWidth: "4xl",
-				children: editingPolicy && /* @__PURE__ */ jsx(InlinePolicyEditor, {
-					policy: editingPolicy === "new" ? void 0 : editingPolicy,
-					table: values.id || values.table || values.alias || "your_table",
+				children: editing && /* @__PURE__ */ jsx(InlinePolicyEditor, {
+					policy: editing === "new" ? void 0 : editing.policy,
+					table: tableName || "your_table",
+					schema: schemaName,
 					availableRoles,
 					rolesUnavailable,
 					onSave: handleSave,
-					onCancel: () => setEditingPolicy(null)
+					onCancel: () => setEditing(null)
 				})
 			})]
 		})
@@ -2683,7 +2724,7 @@ var COMMAND_OPTIONS = [
 	"UPDATE",
 	"DELETE"
 ];
-function InlinePolicyEditor({ policy, table, availableRoles, rolesUnavailable, onSave, onCancel }) {
+function InlinePolicyEditor({ policy, table, schema, availableRoles, rolesUnavailable, onSave, onCancel }) {
 	const { t } = useTranslation();
 	const [name, setName] = useState(policy?.policyname || "");
 	const [behavior, setBehavior] = useState(policy?.permissive || "PERMISSIVE");
@@ -2716,7 +2757,11 @@ function InlinePolicyEditor({ policy, table, availableRoles, rolesUnavailable, o
 				className: "text-sm font-normal text-text-secondary dark:text-text-secondary-dark tracking-wide mt-1",
 				children: ["Define RLS rules for ", /* @__PURE__ */ jsxs("span", {
 					className: "font-mono text-primary bg-primary-bg px-1 py-0.5 rounded",
-					children: ["public.", table]
+					children: [
+						schema,
+						".",
+						table
+					]
 				})]
 			})]
 		}),
@@ -3582,4 +3627,4 @@ var validateId = (value, isNewCollection, existingPaths, existingIds) => {
 //#endregion
 export { CollectionEditorDialog as n, CollectionEditorDialog_exports as r, CollectionEditor as t };
 
-//# sourceMappingURL=CollectionEditorDialog-B1mG1cfx.js.map
+//# sourceMappingURL=CollectionEditorDialog-DLHCka00.js.map