@firecms/collection_editor 3.0.0-beta.2-pre.4 → 3.0.0-beta.2

package/dist/ui/RootCollectionSuggestions.d.ts

@@ -1 +1,3 @@
-export declare function RootCollectionSuggestions(): import("react/jsx-runtime").JSX.Element;
+export declare function RootCollectionSuggestions({ introMode }: {
+    introMode?: "new_project" | "existing_project";
+}): import("react/jsx-runtime").JSX.Element;

package/dist/useCollectionEditorPlugin.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { EntityCollection, FireCMSPlugin, ModifyCollectionProps, User } from "@firecms/core";
+import { FireCMSPlugin, User } from "@firecms/core";
 import { CollectionEditorPermissionsBuilder } from "./types/config_permissions";
 import { PersistedCollection } from "./types/persisted_collection";
 import { CollectionInference } from "./types/collection_inference";
@@ -9,7 +9,6 @@ export interface CollectionConfigControllerProps<EC extends PersistedCollection
      * Firebase app where the configuration is saved.
      */
     collectionConfigController: CollectionsConfigController;
-    modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void;
     /**
      * Define what actions can be performed on the configuration.
      */
@@ -31,6 +30,7 @@ export interface CollectionConfigControllerProps<EC extends PersistedCollection
     getData?: (path: string, parentPaths: string[]) => Promise<object[]>;
     getUser: (uid: string) => UserType | null;
     onAnalyticsEvent?: (event: string, params?: object) => void;
+    introMode?: "new_project" | "existing_project";
 }
 /**
  * Use this hook to initialise the Collection Editor plugin.
@@ -43,4 +43,7 @@ export interface CollectionConfigControllerProps<EC extends PersistedCollection
  * @param getUser
  * @param collectionInference
  */
-export declare function useCollectionEditorPlugin<EC extends PersistedCollection = PersistedCollection, UserType extends User = User>({ collectionConfigController, modifyCollection, configPermissions, reservedGroups, extraView, pathSuggestions, getUser, collectionInference, getData, onAnalyticsEvent }: CollectionConfigControllerProps<EC, UserType>): FireCMSPlugin<any, any, PersistedCollection>;
+export declare function useCollectionEditorPlugin<EC extends PersistedCollection = PersistedCollection, UserType extends User = User>({ collectionConfigController, introMode, configPermissions, reservedGroups, extraView, pathSuggestions, getUser, collectionInference, getData, onAnalyticsEvent }: CollectionConfigControllerProps<EC, UserType>): FireCMSPlugin<any, any, PersistedCollection>;
+export declare function IntroWidget({ introMode }: {
+    introMode?: "new_project" | "existing_project";
+}): import("react/jsx-runtime").JSX.Element;

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@firecms/collection_editor",
   "type": "module",
-  "version": "3.0.0-beta.2-pre.4",
+  "version": "3.0.0-beta.2",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.es.js",
   "types": "dist/index.d.ts",
   "source": "src/index.ts",
   "dependencies": {
-    "@firecms/data_import_export": "^3.0.0-beta.2-pre.4",
-    "@firecms/formex": "^3.0.0-beta.2-pre.4",
-    "@firecms/schema_inference": "^3.0.0-beta.2-pre.4",
-    "@firecms/ui": "^3.0.0-beta.2-pre.4",
+    "@firecms/data_import_export": "^3.0.0-beta.2",
+    "@firecms/formex": "^3.0.0-beta.2",
+    "@firecms/schema_inference": "^3.0.0-beta.2",
+    "@firecms/ui": "^3.0.0-beta.2",
     "json5": "^2.2.3",
     "prism-react-renderer": "^2.3.1"
   },
@@ -63,7 +63,7 @@
     "react-router-dom": "^6.22.0",
     "ts-jest": "^29.1.2",
     "typescript": "^5.3.3",
-    "vite": "^4.5.2",
+    "vite": "^5.1.1",
     "vite-plugin-fonts": "^0.7.0"
   },
   "files": [
@@ -73,5 +73,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a947c08aada0e374aec7dff2b0dc9e540e170834"
+  "gitHead": "9c3561bc09311f2339bb6fa224c88a62d3b19617"
 }

package/src/ui/RootCollectionSuggestions.tsx

@@ -1,9 +1,9 @@
 import { unslugify, useAuthController, useNavigationController } from "@firecms/core";
-import { AddIcon, Chip, Collapse, Typography, } from "@firecms/ui";
+import { AddIcon, Chip, CircularProgress, Collapse, Typography, } from "@firecms/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 import React from "react";
 
-export function RootCollectionSuggestions() {
+export function RootCollectionSuggestions({ introMode }: { introMode?: "new_project" | "existing_project" }) {
 
     const authController = useAuthController();
     const navigationController = useNavigationController();
@@ -15,22 +15,27 @@ export function RootCollectionSuggestions() {
         }).createCollections
         : true;
 
-    const rootPathSuggestions = collectionEditorController.rootPathSuggestions ?? [];
+    const rootPathSuggestions = collectionEditorController.rootPathSuggestions;
 
-    const showSuggestions = rootPathSuggestions.length > 3 || ((navigationController.collections ?? []).length === 0 && rootPathSuggestions.length > 0);
+    const showSuggestions = (rootPathSuggestions ?? []).length > 3 || ((navigationController.collections ?? []).length === 0 && (rootPathSuggestions ?? []).length > 0);
+    const forceShowSuggestions = introMode === "existing_project";
     return <Collapse
-        in={showSuggestions}>
+        in={forceShowSuggestions || showSuggestions}>
 
         <div
             className={"flex flex-col gap-1 p-2 my-4"}>
 
-            <Typography variant={"body2"} color={"secondary"}>
-                Create a collection from your data:
-            </Typography>
+            {!introMode && <Typography variant={"body2"} color={"secondary"}>
+                Create a collection <b>automatically</b> from your data:
+            </Typography>}
+
+            {introMode === "existing_project" && <Typography>
+                You will see your <b>database collections</b> here, a few seconds after project creation
+            </Typography>}
 
             <div
                 className={"flex flex-row gap-1 overflow-scroll no-scrollbar "}>
-                {rootPathSuggestions.map((path) => {
+                {(rootPathSuggestions ?? []).map((path) => {
                     return (
                         <div key={path}>
                             <Chip
@@ -50,6 +55,8 @@ export function RootCollectionSuggestions() {
                         </div>
                     );
                 })}
+                {rootPathSuggestions === undefined && <CircularProgress size={"small"}/>}
+                {rootPathSuggestions?.length === 0 && <Typography variant={"caption"}>No suggestions</Typography>}
             </div>
         </div>
     </Collapse>

package/src/ui/collection_editor/CollectionDetailsForm.tsx

@@ -21,7 +21,7 @@ import {
 } from "@firecms/ui";
 
 import { FieldHelperView } from "./properties/FieldHelperView";
-import { useFormex, Field, getIn } from "@firecms/formex";
+import { Field, getIn, useFormex } from "@firecms/formex";
 
 export function CollectionDetailsForm({
                                           isNewCollection,
@@ -70,7 +70,7 @@ export function CollectionDetailsForm({
 
         const singularNameTouched = getIn(touched, "singularName");
         if (!singularNameTouched && isNewCollection && name) {
-            setFieldValue("singularName", singular(name))
+            setFieldValue("singularName", singular(name));
         }
 
     };
@@ -96,17 +96,17 @@ export function CollectionDetailsForm({
     const isSubcollection = !!parentCollection;
 
     let customIdValue: "true" | "false" | "optional" | "code_defined" | undefined;
-    if (customIdValue) {
-        if (typeof values.customId === "object") {
-            customIdValue = "code_defined";
-        } else if (values.customId === true) {
-            customIdValue = "true";
-        } else if (values.customId === false) {
-            customIdValue = "false";
-        } else if (values.customId === "optional") {
-            customIdValue = "optional";
-        }
+    if (typeof values.customId === "object") {
+        customIdValue = "code_defined";
+    } else if (values.customId === true) {
+        customIdValue = "true";
+    } else if (values.customId === false) {
+        customIdValue = "false";
+    } else if (values.customId === "optional") {
+        customIdValue = "optional";
     }
+
+    const showErrors = submitCount > 0;
     return (
         <div className={"overflow-auto my-auto"}>
             <Container maxWidth={"4xl"} className={"flex flex-col gap-4 p-8 m-auto"}>
@@ -141,7 +141,7 @@ export function CollectionDetailsForm({
                             onChange={(e: any) => updateName(e.target.value)}
                             label={"Name"}
                             required
-                            error={touched.name && Boolean(errors.name)}/>
+                            error={showErrors && Boolean(errors.name)}/>
                         <FieldHelperView error={touched.name && Boolean(errors.name)}>
                             {touched.name && Boolean(errors.name) ? errors.name : "Name of in this collection, usually a plural name (e.g. Products)"}
                         </FieldHelperView>
@@ -153,7 +153,7 @@ export function CollectionDetailsForm({
                                label={"Path"}
                                disabled={!isNewCollection}
                                required
-                               error={touched.path && Boolean(errors.path)}/>
+                               error={showErrors && Boolean(errors.path)}/>
 
                         <FieldHelperView error={touched.path && Boolean(errors.path)}>
                             {touched.path && Boolean(errors.path)
@@ -165,7 +165,7 @@ export function CollectionDetailsForm({
 
                     {!isSubcollection && <div className={"col-span-12 sm:col-span-4 relative"}>
 
-                        <TextField error={touched.group && Boolean(errors.group)}
+                        <TextField error={showErrors && Boolean(errors.group)}
                                    disabled={isSubmitting}
                                    value={values.group ?? ""}
                                    autoComplete="off"
@@ -191,7 +191,7 @@ export function CollectionDetailsForm({
                             })}
                         </Autocomplete>
                         <FieldHelperView>
-                            {touched.group && Boolean(errors.group) ? errors.group : "Group of the collection"}
+                            {showErrors && Boolean(errors.group) ? errors.group : "Group of the collection"}
                         </FieldHelperView>
                     </div>}
 
@@ -215,7 +215,7 @@ export function CollectionDetailsForm({
                                            as={DebouncedTextField}
                                            disabled={!isNewCollection}
                                            label={"Collection id"}
-                                           error={touched.id && Boolean(errors.id)}/>
+                                           error={showErrors && Boolean(errors.id)}/>
                                     <FieldHelperView error={touched.id && Boolean(errors.id)}>
                                         {touched.id && Boolean(errors.id) ? errors.id : "This id identifies this collection"}
                                     </FieldHelperView>
@@ -223,8 +223,8 @@ export function CollectionDetailsForm({
 
                                 <div className={"col-span-12"}>
                                     <TextField
-                                        error={touched.singularName && Boolean(errors.singularName)}
-                                        id={"singularName"}
+                                        error={showErrors && Boolean(errors.singularName)}
+                                        name={"singularName"}
                                         aria-describedby={"singularName-helper"}
                                         onChange={(e) => {
                                             setFieldTouched("singularName", true);
@@ -232,14 +232,14 @@ export function CollectionDetailsForm({
                                         }}
                                         value={values.singularName ?? ""}
                                         label={"Singular name"}/>
-                                    <FieldHelperView error={touched.singularName && Boolean(errors.singularName)}>
-                                        {touched.singularName && Boolean(errors.singularName) ? errors.singularName : "Optionally define a singular name for your entities"}
+                                    <FieldHelperView error={showErrors && Boolean(errors.singularName)}>
+                                        {showErrors && Boolean(errors.singularName) ? errors.singularName : "Optionally define a singular name for your entities"}
                                     </FieldHelperView>
                                 </div>
                                 <div className={"col-span-12"}>
                                     <TextField
-                                        error={touched.description && Boolean(errors.description)}
-                                        id="description"
+                                        error={showErrors && Boolean(errors.description)}
+                                        name="description"
                                         value={values.description ?? ""}
                                         onChange={handleChange}
                                         multiline
@@ -247,8 +247,8 @@ export function CollectionDetailsForm({
                                         aria-describedby="description-helper-text"
                                         label="Description"
                                     />
-                                    <FieldHelperView error={touched.description && Boolean(errors.description)}>
-                                        {touched.description && Boolean(errors.description) ? errors.description : "Description of the collection, you can use markdown"}
+                                    <FieldHelperView error={showErrors && Boolean(errors.description)}>
+                                        {showErrors && Boolean(errors.description) ? errors.description : "Description of the collection, you can use markdown"}
                                     </FieldHelperView>
                                 </div>
 

package/src/ui/collection_editor/CollectionEditorDialog.tsx

@@ -374,7 +374,6 @@ function CollectionEditorInternal<M extends Record<string, any>>({
             if (!isNewCollection) {
                 saveCollection(newCollectionState).then(() => {
                     formexController.resetForm({ values: initialValues });
-                    // setNextMode();
                     handleClose(newCollectionState);
                 });
                 return;
@@ -482,7 +481,6 @@ function CollectionEditorInternal<M extends Record<string, any>>({
     const resolvedPath = !pathError ? navigation.resolveAliasesFrom(updatedFullPath) : undefined;
     const getDataWithPath = resolvedPath && getData ? () => getData(resolvedPath, parentPaths ?? []) : undefined;
 
-    // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
         setFormDirty(dirty);
     }, [dirty]);
@@ -552,9 +550,9 @@ function CollectionEditorInternal<M extends Record<string, any>>({
                     {currentView === "welcome" &&
                         <CollectionEditorWelcomeView
                             path={path}
-                            onContinue={(data) => {
-                                if (data) {
-                                    onImportDataSet(data);
+                            onContinue={(importData) => {
+                                if (importData) {
+                                    onImportDataSet(importData);
                                     setCurrentView("import_data_mapping");
                                 } else {
                                     setCurrentView("details");
@@ -577,12 +575,13 @@ function CollectionEditorInternal<M extends Record<string, any>>({
                     {currentView === "import_data_saving" && importConfig &&
                         <ImportSaveInProgress importConfig={importConfig}
                                               collection={values}
-                                              onImportSuccess={(importedCollection) => {
-                                                  handleClose(importedCollection);
+                                              onImportSuccess={async (importedCollection) => {
                                                   snackbarController.open({
                                                       type: "info",
                                                       message: "Data imported successfully"
                                                   });
+                                                  await saveCollection(values);
+                                                  handleClose(importedCollection);
                                               }}
                         />}
 
@@ -649,7 +648,6 @@ function CollectionEditorInternal<M extends Record<string, any>>({
                             <Button variant={"text"}
                                     type="button"
                                     onClick={() => {
-                                        saveCollection(values);
                                         setCurrentView("import_data_mapping");
                                     }}>
                                 <ArrowBackIcon/>
@@ -718,7 +716,6 @@ function CollectionEditorInternal<M extends Record<string, any>>({
                             color="primary"
                             type="submit"
                             loading={isSubmitting}
-                            // disabled={isSubmitting || !dirty}
                         >
                             Update collection
                         </LoadingButton>}

package/src/ui/collection_editor/GetCodeDialog.tsx

@@ -99,7 +99,7 @@ function collectionToCode(collection: EntityCollection): object {
         customId: collection.customId,
         initialFilter: collection.initialFilter,
         initialSort: collection.initialSort,
-        properties: Object.entries(collection.properties)
+        properties: Object.entries(collection.properties ?? {})
             .map(([key, value]) => ({
                 [key]: propertyCleanup(value)
             }))

package/src/ui/collection_editor/SubcollectionsEditTab.tsx

@@ -53,7 +53,7 @@ export function SubcollectionsEditTab({
 
     const [currentDialog, setCurrentDialog] = React.useState<{
         isNewCollection: boolean,
-        editedCollectionPath?: string,
+        editedCollectionId?: string,
     }>();
 
     const {
@@ -78,52 +78,53 @@ export function SubcollectionsEditTab({
                             Subcollections of {values.name}
                         </Typography>
 
-                        {subcollections && subcollections.length > 0 &&
-                            <Paper className={"flex flex-col gap-4 p-2 w-full"}>
-                                <Table>
-                                    <TableBody>
-                                        {subcollections.map((subcollection) => (
-                                            <TableRow key={subcollection.path}
-                                                      onClick={() => setCurrentDialog({
-                                                          isNewCollection: false,
-                                                          editedCollectionPath: subcollection.path,
-                                                      })}>
-                                                <TableCell
-                                                    align="left">
-                                                    <Typography variant={"subtitle2"} className={"flex-grow"}>
-                                                        {subcollection.name}
-                                                    </Typography>
-                                                </TableCell>
-                                                <TableCell
-                                                    align="right">
-                                                    <Tooltip title={"Remove"}>
-                                                        <IconButton size="small"
-                                                                    onClick={(e) => {
-                                                                        e.preventDefault();
-                                                                        e.stopPropagation();
-                                                                        setSubcollectionToDelete(subcollection.id);
-                                                                    }}
-                                                                    color="inherit">
-                                                            <DeleteIcon size={"small"}/>
-                                                        </IconButton>
-                                                    </Tooltip>
-                                                </TableCell>
-                                            </TableRow>
-                                        ))}
-                                    </TableBody>
-                                </Table>
-                            </Paper>}
+                        <Paper className={"flex flex-col gap-4 p-2 w-full"}>
+                            {subcollections && subcollections.length > 0 && <Table>
+                                <TableBody>
+                                    {subcollections.map((subcollection) => (
+                                        <TableRow key={subcollection.path}
+                                                  onClick={() => setCurrentDialog({
+                                                      isNewCollection: false,
+                                                      editedCollectionId: subcollection.id
+                                                  })}>
+                                            <TableCell
+                                                align="left">
+                                                <Typography variant={"subtitle2"} className={"flex-grow"}>
+                                                    {subcollection.name}
+                                                </Typography>
+                                            </TableCell>
+                                            <TableCell
+                                                align="right">
+                                                <Tooltip title={"Remove"}>
+                                                    <IconButton size="small"
+                                                                onClick={(e) => {
+                                                                    e.preventDefault();
+                                                                    e.stopPropagation();
+                                                                    setSubcollectionToDelete(subcollection.id);
+                                                                }}
+                                                                color="inherit">
+                                                        <DeleteIcon size={"small"}/>
+                                                    </IconButton>
+                                                </Tooltip>
+                                            </TableCell>
+                                        </TableRow>
+                                    ))}
+                                </TableBody>
+                            </Table>}
+
+                            <Button
+                                onClick={() => {
+                                    setCurrentDialog({
+                                        isNewCollection: true
+                                    });
+                                }}
+                                variant={"text"}
+                                startIcon={<AddIcon/>}>
+                                Add subcollection
+                            </Button>
+
+                        </Paper>
 
-                        <Button
-                            onClick={() => {
-                                setCurrentDialog({
-                                    isNewCollection: true
-                                });
-                            }}
-                            variant={"outlined"}
-                            startIcon={<AddIcon/>}>
-                            Add subcollection
-                        </Button>
                     </div>
 
                     <div className={"flex-grow  flex flex-col gap-4 items-start"}>
@@ -131,7 +132,19 @@ export function SubcollectionsEditTab({
                             Custom views
                         </Typography>
 
-                        {totalEntityViews > 0 && <>
+
+                        {totalEntityViews === 0 &&
+                            <Alert action={<Button variant="text"
+                                                   size={"small"}
+                                                   href={"https://firecms.co/docs/customization_quickstart"}
+                                                   component={"a"}
+                                                   rel="noopener noreferrer"
+                                                   target="_blank">More info</Button>}>
+                                Define your own custom views by uploading it with the CLI.
+                            </Alert>
+                        }
+
+                        {<>
                             <Paper className={"flex flex-col gap-4 p-2 w-full"}>
                                 <Table>
                                     <TableBody>
@@ -175,29 +188,19 @@ export function SubcollectionsEditTab({
                                         ))}
                                     </TableBody>
                                 </Table>
+
+                                <Button
+                                    onClick={() => {
+                                        setAddEntityViewDialogOpen(true);
+                                    }}
+                                    variant={"text"}
+                                    startIcon={<AddIcon/>}>
+                                    Add custom entity view
+                                </Button>
                             </Paper>
 
                         </>}
 
-                        {totalEntityViews === 0 &&
-                            <Alert action={<Button variant="text"
-                                                   size={"small"}
-                                                   href={"https://firecms.co/docs/customization_quickstart"}
-                                                   component={"a"}
-                                                   rel="noopener noreferrer"
-                                                   target="_blank">More info</Button>}>
-                                Define your own custom views by uploading it with the CLI.
-                            </Alert>
-                        }
-
-                        <Button
-                            onClick={() => {
-                                setAddEntityViewDialogOpen(true);
-                            }}
-                            variant={"outlined"}
-                            startIcon={<AddIcon/>}>
-                            Add custom entity view
-                        </Button>
 
                     </div>
 

package/src/ui/collection_editor/import/CollectionEditorImportMapping.tsx

@@ -140,7 +140,7 @@ export function CollectionEditorImportMapping({
 
     return (
 
-        <div className={"overflow-auto my-auto bg-gray-50 dark:bg-gray-900"}>
+        <div className={"overflow-auto my-auto"}>
             <Container maxWidth={"6xl"} className={"flex flex-col gap-4 p-8 m-auto"}>
 
                 <Typography variant="h6" className={"mt-4"}>Data property mapping</Typography>

package/src/ui/collection_editor/properties/BlockPropertyField.tsx

@@ -23,19 +23,22 @@ export function BlockPropertyField({ disabled, getData, allowDataInference, prop
     const [selectedPropertyKey, setSelectedPropertyKey] = useState<string | undefined>();
     const [selectedPropertyNamespace, setSelectedPropertyNamespace] = useState<string | undefined>();
 
-    const onPropertyCreated = useCallback(({
-                                               id,
-                                               property
-                                           }: { id?: string, property: Property }) => {
+    const onPropertyChanged = ({
+                                   id,
+                                   property
+                               }: { id?: string, property: Property }) => {
         if (!id)
             throw Error();
+
         setFieldValue("oneOf.properties", {
             ...(values.oneOf?.properties ?? {}),
             [id]: property
         }, false);
-        setFieldValue("oneOf.propertiesOrder", [...(values.oneOf?.propertiesOrder ?? Object.keys(values.oneOf?.properties ?? {})), id], false);
+        const currentPropertiesOrder = values.oneOf?.propertiesOrder ?? Object.keys(values.oneOf?.properties ?? {});
+        const newPropertiesOrder = currentPropertiesOrder.includes(id) ? currentPropertiesOrder : [...currentPropertiesOrder, id];
+        setFieldValue("oneOf.propertiesOrder", newPropertiesOrder, false);
         setPropertyDialogOpen(false);
-    }, [values.oneOf?.properties, values.oneOf?.propertiesOrder]);
+    };
 
     const selectedPropertyFullId = selectedPropertyKey ? getFullId(selectedPropertyKey, selectedPropertyNamespace) : undefined;
     const selectedProperty = selectedPropertyFullId ? getIn(values.oneOf?.properties, selectedPropertyFullId.replaceAll(".", ".properties.")) : undefined;
@@ -127,7 +130,7 @@ export function BlockPropertyField({ disabled, getData, allowDataInference, prop
                 existingProperty={Boolean(selectedPropertyKey)}
                 autoUpdateId={!selectedPropertyKey}
                 autoOpenTypeSelect={!selectedPropertyKey}
-                onPropertyChanged={onPropertyCreated}
+                onPropertyChanged={onPropertyChanged}
                 existingPropertyKeys={selectedPropertyKey ? undefined : values.oneOf?.propertiesOrder}
                 propertyConfigs={propertyConfigs}/>}
 

package/src/ui/collection_editor/properties/MapPropertyField.tsx

@@ -25,19 +25,23 @@ export function MapPropertyField({ disabled, getData, allowDataInference, proper
     const [selectedPropertyNamespace, setSelectedPropertyNamespace] = useState<string | undefined>();
 
     const propertiesOrder = values.propertiesOrder ?? Object.keys(values.properties ?? {});
-    const onPropertyCreated = useCallback(({
-                                               id,
-                                               property
-                                           }: { id?: string, property: Property }) => {
+    const onPropertyCreated = ({
+                                   id,
+                                   property
+                               }: { id?: string, property: Property }) => {
         if (!id)
             throw Error();
         setFieldValue("properties", {
             ...(values.properties ?? {}),
             [id]: property
         }, false);
-        setFieldValue("propertiesOrder", [...propertiesOrder, id], false);
+
+        const currentPropertiesOrder = values.propertiesOrder ?? Object.keys(values.properties ?? {});
+        const newPropertiesOrder = currentPropertiesOrder.includes(id) ? currentPropertiesOrder : [...currentPropertiesOrder, id];
+        setFieldValue("propertiesOrder", newPropertiesOrder, false);
+
         setPropertyDialogOpen(false);
-    }, [values.properties, propertiesOrder]);
+    };
 
     const deleteProperty = useCallback((propertyKey?: string, namespace?: string) => {
         const fullId = propertyKey ? getFullId(propertyKey, namespace) : undefined;
@@ -60,15 +64,6 @@ export function MapPropertyField({ disabled, getData, allowDataInference, proper
     const selectedPropertyFullId = selectedPropertyKey ? getFullId(selectedPropertyKey, selectedPropertyNamespace) : undefined;
     const selectedProperty = selectedPropertyFullId ? getIn(values.properties, selectedPropertyFullId.replaceAll(".", ".properties.")) : undefined;
 
-    const addChildButton = <Button
-        color="primary"
-        variant={"outlined"}
-        onClick={() => setPropertyDialogOpen(true)}
-        startIcon={<AddIcon/>}
-    >
-        Add property to {values.name ?? "this group"}
-    </Button>;
-
     const empty = !propertiesOrder || propertiesOrder.length < 1;
 
     const onPropertyMove = useCallback((propertiesOrder: string[], namespace?: string) => {
@@ -80,7 +75,14 @@ export function MapPropertyField({ disabled, getData, allowDataInference, proper
             <div className={"col-span-12"}>
                 <div className="flex justify-between items-end my-4">
                     <Typography variant={"subtitle2"}>Properties in this group</Typography>
-                    {addChildButton}
+                    <Button
+                        color="primary"
+                        variant={"outlined"}
+                        onClick={() => setPropertyDialogOpen(true)}
+                        startIcon={<AddIcon/>}
+                    >
+                        Add property to {values.name ?? "this group"}
+                    </Button>
                 </div>
                 <Paper className="p-2 pl-8">
                     <PropertyTree

package/src/ui/collection_editor/properties/RepeatPropertyField.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from "react";
+import React, { useState } from "react";
 import { ArrayProperty, getFieldConfig, Property, PropertyConfig } from "@firecms/core";
 import { Button, Paper, Typography } from "@firecms/ui";
 import { Field, getIn, useFormex } from "@firecms/formex";