@rebasepro/cms 0.23.0 → 0.24.0

package/dist/{CollectionEditorDialog-DLHCka00.js → CollectionEditorDialog-p5-I-Apu.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.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 { A as getFieldId, At as ImportNewPropertyFieldPreview, Bn as useUrlController, Dt as useCollectionEditorController, Ft as convertImportData, Hn as useNavigationStateController, Ht as getInferenceType, Mn as useSelectionController, Mt as guessIdColumn, Nt as ImportConversionProblems, Pn as CollectionTableBinding, S as isSchemaChangeCancelled, Ut as useImportConfig, Wt as ImportSaveInProgress, _ as useCollectionsConfigController, cn as SearchIconsView, ct as useSafeSnackbarController, i as namespaceToPropertiesOrderPath, jt as DataNewPropertiesMapping, k as getFieldConfig, l as validateCollectionJson, ln as FieldCaption, m as toSerializableCollectionConfig, n as getFullIdPath, o as CollectionGenerationApiError, qt as ImportFileUpload, r as idToPropertiesPath, sn as PropertyConfigBadge, t as getFullId, yr as useCollectionRegistryController } from "./util-BRvKFMLa.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-DDB_X-00.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";
@@ -24,6 +24,7 @@ var CollectionEditorSchema = z.object({
 //#region src/collection_editor/ui/collection_editor/GeneralSettingsForm.tsx
 function GeneralSettingsForm({ isNewCollection, existingPaths, existingIds, parentCollection, renderExtraCollectionFields, standalone }) {
 	const { values, setFieldValue, handleChange, touched, errors, setFieldTouched, submitCount } = useFormex();
+	const { t } = useTranslation();
 	const [iconDialogOpen, setIconDialogOpen] = useState(false);
 	const configControllerFromContext = useCollectionsConfigController();
 	const configController = standalone ? { readOnly: false } : configControllerFromContext;
@@ -59,9 +60,10 @@ function GeneralSettingsForm({ isNewCollection, existingPaths, existingIds, pare
 							onDatabaseIdUpdate: updateDatabaseId
 						}),
 						/* @__PURE__ */ jsx(Tooltip, {
-							title: "Change icon",
+							title: t("change_icon"),
 							asChild: true,
 							children: /* @__PURE__ */ jsx(IconButton, {
+								"aria-label": t("change_icon"),
 								shape: "square",
 								disabled: configController?.readOnly,
 								onClick: () => setIconDialogOpen(true),
@@ -788,6 +790,7 @@ function collectionToCode(collection) {
 function CollectionPropertiesEditorForm({ showErrors, isNewCollection, propertyErrorsRef, onPropertyError, setDirty, extraIcon, getUser, getData, doCollectionInference, propertyConfigs, propertyTypePresets, hiddenPropertyTypes, renderExtraPropertyFields, standalone }) {
 	const { values, setFieldValue, setFieldError, setFieldTouched, errors, dirty } = useFormex();
 	const snackbarController = useSafeSnackbarController();
+	const { t } = useTranslation();
 	const configControllerFromContext = useCollectionsConfigController();
 	const configController = standalone ? { readOnly: false } : configControllerFromContext;
 	const largeLayout = useLargeLayout();
@@ -1009,15 +1012,17 @@ function CollectionPropertiesEditorForm({ showErrors, isNewCollection, propertyE
 									title: "Add new properties based on data",
 									asChild: true,
 									children: /* @__PURE__ */ jsx(IconButton, {
+										"aria-label": "Add new properties based on data",
 										size: "small",
 										disabled: inferringProperties,
 										onClick: inferPropertiesFromData,
 										children: inferringProperties ? /* @__PURE__ */ jsx(CircularProgress, { size: "smallest" }) : /* @__PURE__ */ jsx(FileSearchIcon, { size: iconSize.smallest })
 									})
 								}), /* @__PURE__ */ jsx(Tooltip, {
-									title: "Add new property",
+									title: t("studio_property_add_column"),
 									asChild: true,
 									children: /* @__PURE__ */ jsx(IconButton, {
+										"aria-label": t("studio_property_add_column"),
 										size: "small",
 										disabled: configController?.readOnly,
 										onClick: () => setNewPropertyDialogOpen(true),
@@ -2258,54 +2263,72 @@ function CollectionEditorImportDataPreview({ importConfig, properties, propertie
 	const authController = useAuthController();
 	const registry = useCollectionRegistryController();
 	const [loading, setLoading] = useState(false);
+	const [problems, setProblems] = useState([]);
 	async function loadEntities() {
-		const mappedData = importConfig.importData.map((d) => convertDataToEntity(authController, registry, d, importConfig.idColumn, importConfig.headersMapping, properties, "TEMP_PATH", importConfig.defaultValues));
-		importConfig.setEntities(mappedData);
+		const converted = convertImportData(authController, registry, importConfig.importData, importConfig.idColumn, importConfig.headersMapping, properties, "TEMP_PATH", importConfig.defaultValues);
+		importConfig.setEntities(converted.entities);
+		setProblems(converted.problems);
 	}
 	useEffect(() => {
 		loadEntities().finally(() => setLoading(false));
 	}, []);
 	const selectionController = useSelectionController();
 	if (loading) return /* @__PURE__ */ jsx(CircularProgressCenter, {});
-	return /* @__PURE__ */ jsx(CollectionTableBinding, {
-		title: /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx(Typography, {
-			variant: "subtitle2",
-			children: "Imported data preview"
-		}), /* @__PURE__ */ jsx(Typography, {
-			variant: "caption",
-			children: "Entities with the same id will be overwritten"
-		})] }),
-		tableController: {
-			data: importConfig.entities,
-			dataLoading: false,
-			noMoreToLoad: false
-		},
-		endAdornment: /* @__PURE__ */ jsx("div", { className: "h-12" }),
-		filterable: false,
-		sortable: false,
-		selectionController,
-		displayedColumnIds: propertiesOrder.map((p) => ({
-			key: p,
-			disabled: false
-		})),
-		openEntityMode: "side_panel",
-		properties,
-		enablePopupIcon: false
+	return /* @__PURE__ */ jsxs("div", {
+		className: "flex flex-col h-full w-full",
+		children: [/* @__PURE__ */ jsx(ImportConversionProblems, { problems }), /* @__PURE__ */ jsx("div", {
+			className: "flex-1 min-h-0",
+			children: /* @__PURE__ */ jsx(CollectionTableBinding, {
+				title: /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx(Typography, {
+					variant: "subtitle2",
+					children: "Imported data preview"
+				}), /* @__PURE__ */ jsx(Typography, {
+					variant: "caption",
+					children: "Entities with the same id will be overwritten"
+				})] }),
+				tableController: {
+					data: importConfig.entities,
+					dataLoading: false,
+					noMoreToLoad: false
+				},
+				endAdornment: /* @__PURE__ */ jsx("div", { className: "h-12" }),
+				filterable: false,
+				sortable: false,
+				selectionController,
+				displayedColumnIds: propertiesOrder.map((p) => ({
+					key: p,
+					disabled: false
+				})),
+				openEntityMode: "side_panel",
+				properties,
+				enablePopupIcon: false
+			})
+		})]
 	});
 }
 //#endregion
 //#region src/collection_editor/ui/collection_editor/import/clean_import_data.ts
 function cleanPropertiesFromImport(properties, parentSlug = "") {
-	const result = Object.keys(properties).reduce((acc, key) => {
+	const taken = /* @__PURE__ */ new Set();
+	const uniqueSlug = (key, index) => {
+		const base = slugify(key) || `column_${index + 1}`;
+		let slug = base;
+		for (let n = 2; taken.has(slug); n++) slug = `${base}_${n}`;
+		taken.add(slug);
+		return slug;
+	};
+	const result = Object.keys(properties).reduce((acc, key, index) => {
 		const property = properties[key];
-		const slug = slugify(key);
+		const slug = uniqueSlug(key, index);
 		const fullSlug = parentSlug ? `${parentSlug}.${slug}` : slug;
 		if (property.type === "map" && property.properties) {
 			const slugifiedResult = cleanPropertiesFromImport(property.properties, fullSlug);
+			const childMapping = Object.fromEntries(Object.entries(slugifiedResult.headersMapping).map(([childKey, childSlug]) => [`${key}.${childKey}`, childSlug]));
 			return {
 				headersMapping: {
 					...acc.headersMapping,
-					[key]: fullSlug
+					[key]: fullSlug,
+					...childMapping
 				},
 				properties: {
 					...acc.properties,
@@ -3097,11 +3120,17 @@ function CollectionEditorInternal({ isNewCollection, configController, editedCol
 		if (visibleTabs && !visibleTabs.includes(currentView)) setCurrentView(visibleTabs[0] || "general");
 	}, [visibleTabs, currentView]);
 	const [error, setError] = React$1.useState();
-	const saveCollection = (updatedCollection) => {
+	/**
+	* `baseline` is what the form was loaded with: the controller saves the
+	* difference between it and `updatedCollection`, so only what the person
+	* changed is written. Never for a new collection, which is saved whole.
+	*/
+	const saveCollection = (updatedCollection, baseline) => {
 		const id = updatedCollection.slug;
 		return configController.saveCollection({
 			id,
 			collectionData: updatedCollection,
+			baseline: isNewCollection ? void 0 : baseline,
 			previousId: editedCollectionId,
 			parentCollectionSlugs
 		}).then(() => {
@@ -3175,7 +3204,7 @@ function CollectionEditorInternal({ isNewCollection, configController, editedCol
 		console.debug("Submitting collection", newCollectionState);
 		try {
 			if (!isNewCollection) {
-				if (await saveCollection(newCollectionState)) {
+				if (await saveCollection(newCollectionState, formexController.initialValues)) {
 					aiModifiedPaths?.clearAllPaths();
 					formexController.resetForm({ values: newCollectionState });
 					handleClose(newCollectionState);
@@ -3304,6 +3333,14 @@ function CollectionEditorInternal({ isNewCollection, configController, editedCol
 				message: "Collection deleted",
 				type: "success"
 			});
+		}, (e) => {
+			setDeleteRequested(false);
+			if (isSchemaChangeCancelled(e)) return;
+			console.error(e);
+			snackbarController.open({
+				type: "error",
+				message: "Error deleting collection: " + (e instanceof Error ? e.message : String(e))
+			});
 		});
 	};
 	const onWelcomeScreenContinue = (importData, propertiesOrder) => {
@@ -3431,7 +3468,7 @@ function CollectionEditorInternal({ isNewCollection, configController, editedCol
 									type: "info",
 									message: "Data imported successfully"
 								});
-								await saveCollection(values);
+								await saveCollection(values, formController.initialValues);
 								handleClose(importedCollection);
 							}
 						}),
@@ -3467,7 +3504,6 @@ function CollectionEditorInternal({ isNewCollection, configController, editedCol
 							hiddenPropertyTypes,
 							renderExtraPropertyFields,
 							extraIcon: extraView?.icon && /* @__PURE__ */ jsx(IconButton, {
-								color: "primary",
 								onClick: () => setCurrentView("extra_view"),
 								children: extraView.icon
 							}),
@@ -3567,11 +3603,14 @@ function CollectionEditorInternal({ isNewCollection, configController, editedCol
 			open: deleteRequested,
 			onAccept: deleteCollection,
 			onCancel: () => setDeleteRequested(false),
-			title: /* @__PURE__ */ jsx(Fragment, { children: "Delete the stored config?" }),
+			title: /* @__PURE__ */ jsx(Fragment, { children: "Delete this collection?" }),
 			body: /* @__PURE__ */ jsxs(Fragment, { children: [
-				" This will ",
-				/* @__PURE__ */ jsx("b", { children: "not delete any data" }),
-				", only the stored config, and reset to the code state."
+				"Deletes ",
+				/* @__PURE__ */ jsxs("code", { children: [collection?.slug, ".ts"] }),
+				" from your collections and its entry in",
+				" ",
+				/* @__PURE__ */ jsx("code", { children: "index.ts" }),
+				", and commits that. The table and its rows stay in the database. Refused while another collection links to this one."
 			] })
 		})]
 	});
@@ -3627,4 +3666,4 @@ var validateId = (value, isNewCollection, existingPaths, existingIds) => {
 //#endregion
 export { CollectionEditorDialog as n, CollectionEditorDialog_exports as r, CollectionEditor as t };
 
-//# sourceMappingURL=CollectionEditorDialog-DLHCka00.js.map
+//# sourceMappingURL=CollectionEditorDialog-p5-I-Apu.js.map