@firecms/collection_editor 3.0.0-rc.1 → 3.0.0-rc.2

package/dist/types/collection_inference.d.ts

@@ -2,4 +2,4 @@ import { EntityCollection } from "@firecms/core";
 /**
  * This function is used to infer the configuration of a collection given its path.
  */
-export type CollectionInference = (path: string, collectionGroup: boolean, parentCollectionPaths: string[]) => Promise<Partial<EntityCollection> | null>;
+export type CollectionInference = (path: string, collectionGroup: boolean, parentCollectionPaths: string[], databaseId?: string) => Promise<Partial<EntityCollection> | null>;

package/dist/ui/collection_editor/properties/StringPropertyField.d.ts

@@ -1,5 +1,5 @@
 export declare function StringPropertyField({ widgetId, disabled, showErrors }: {
-    widgetId: "text_field" | "multiline" | "email";
+    widgetId: "text_field" | "multiline" | "email" | "user_select";
     disabled: boolean;
     showErrors: boolean;
 }): import("react/jsx-runtime").JSX.Element;

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@firecms/collection_editor",
   "type": "module",
-  "version": "3.0.0-rc.1",
+  "version": "3.0.0-rc.2",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.es.js",
   "types": "./dist/index.d.ts",
   "source": "src/index.ts",
   "dependencies": {
-    "@firecms/data_export": "^3.0.0-rc.1",
-    "@firecms/data_import": "^3.0.0-rc.1",
-    "@firecms/data_import_export": "^3.0.0-rc.1",
-    "@firecms/formex": "^3.0.0-rc.1",
-    "@firecms/schema_inference": "^3.0.0-rc.1",
-    "@firecms/ui": "^3.0.0-rc.1",
+    "@firecms/data_export": "^3.0.0-rc.2",
+    "@firecms/data_import": "^3.0.0-rc.2",
+    "@firecms/data_import_export": "^3.0.0-rc.2",
+    "@firecms/formex": "^3.0.0-rc.2",
+    "@firecms/schema_inference": "^3.0.0-rc.2",
+    "@firecms/ui": "^3.0.0-rc.2",
     "json5": "^2.2.3",
     "prism-react-renderer": "^2.4.1"
   },
@@ -69,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e91ae67d24262a9b944550abaae626f182688aa1"
+  "gitHead": "6295de2d801a3d2cddaa958fd66cb041dd2c240e"
 }

package/src/ConfigControllerProvider.tsx

@@ -49,7 +49,7 @@ export interface ConfigControllerProviderProps {
         icon: React.ReactNode
     };
 
-    getUser?: (uid: string) => User | null
+    getUser?: (uid: string) => User | null;
 
     getData?: (path: string, parentPaths: string[]) => Promise<object[]>;
 

package/src/types/collection_inference.ts

@@ -3,4 +3,4 @@ import { EntityCollection } from "@firecms/core";
 /**
  * This function is used to infer the configuration of a collection given its path.
  */
-export type CollectionInference = (path: string, collectionGroup: boolean, parentCollectionPaths: string[]) => Promise<Partial<EntityCollection> | null>;
+export type CollectionInference = (path: string, collectionGroup: boolean, parentCollectionPaths: string[], databaseId?:string) => Promise<Partial<EntityCollection> | null>;

package/src/ui/collection_editor/CollectionEditorDialog.tsx

@@ -329,7 +329,7 @@ function CollectionEditorInternal<M extends Record<string, any>>({
 
     const doCollectionInference = collectionInference ? (collection: PersistedCollection<any>) => {
         if (!collectionInference) return undefined;
-        return collectionInference?.(collection.path, collection.collectionGroup ?? false, parentPaths ?? []);
+        return collectionInference?.(collection.path, collection.collectionGroup ?? false, parentPaths ?? [], collection.databaseId);
     } : undefined;
 
     const inferCollectionFromData = async (newCollection: PersistedCollection<M>) => {

package/src/ui/collection_editor/PropertyEditView.tsx

@@ -150,7 +150,6 @@ export const PropertyForm = React.memo(
             validateOnChange: true,
             validateOnInitialRender: true,
             onSubmit: (newPropertyWithId, controller) => {
-                console.debug("onSubmit", newPropertyWithId);
                 const {
                     id,
                     ...property
@@ -401,6 +400,7 @@ function PropertyEditFormFields({
     let childComponent;
     if (selectedFieldConfigId === "text_field" ||
         selectedFieldConfigId === "multiline" ||
+        selectedFieldConfigId === "user_select" ||
         selectedFieldConfigId === "email") {
         childComponent =
             <StringPropertyField widgetId={selectedFieldConfigId}
@@ -605,6 +605,7 @@ const WIDGET_TYPE_MAP: Record<PropertyConfigId, string> = {
     url: "Text",
     email: "Text",
     switch: "Boolean",
+    user_select: "Users",
     select: "Select",
     multi_select: "Select",
     number_input: "Number",
@@ -786,6 +787,7 @@ export function WidgetSelectViewItem({
                         <WarningIcon size="smallest" className={"w-4"}/>
                     </Tooltip>}
                     <Typography
+                        variant={"label"}
                         color={shouldWarnChangingDataType ? "secondary" : undefined}>{propertyConfig.name}</Typography>
                 </div>
 

package/src/ui/collection_editor/PropertyFieldPreview.tsx

@@ -69,7 +69,7 @@ export function PropertyFieldPreview({
 
                     {includeName &&
                         <ErrorBoundary>
-                            <Typography variant="body1"
+                            <Typography variant="label"
                                         component="span"
                                         className="flex-grow pr-2">
                                 {property.name
@@ -131,8 +131,8 @@ export function NonEditablePropertyPreview({
             <div className={"relative m-4"}>
                 {propertyConfig && <PropertyConfigBadge propertyConfig={propertyConfig}/>}
                 {!propertyConfig && <div
-                    className={"h-8 w-8 p-1 rounded-full shadow text-white bg-surface-500"}>
-                    <FunctionsIcon color={"inherit"} size={"medium"}/>
+                    className={"h-8 w-8 flex items-center justify-center rounded-full shadow text-white bg-surface-500"}>
+                    <FunctionsIcon color={"inherit"} size={"small"}/>
                 </div>}
                 <DoNotDisturbOnIcon color={"disabled"} size={"small"} className={"absolute -right-2 -top-2"}/>
             </div>

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

@@ -4,6 +4,7 @@ import {
     EntityCollectionTable,
     Properties,
     useAuthController,
+    useNavigationController,
     useSelectionController
 } from "@firecms/core";
 import { useEffect, useState } from "react";
@@ -20,11 +21,18 @@ export function CollectionEditorImportDataPreview({
 }) {
 
     const authController = useAuthController();
+    const navigation = useNavigationController();
     const [loading, setLoading] = useState<boolean>(false);
 
     async function loadEntities() {
-        // const propertiesMapping = getPropertiesMapping(importConfig.originProperties, properties, importConfig.headersMapping);
-        const mappedData = importConfig.importData.map(d => convertDataToEntity(authController, d, importConfig.idColumn, importConfig.headersMapping, properties, "TEMP_PATH", importConfig.defaultValues));
+        const mappedData = importConfig.importData.map(d => convertDataToEntity(authController,
+            navigation,
+            d,
+            importConfig.idColumn,
+            importConfig.headersMapping,
+            properties,
+            "TEMP_PATH",
+            importConfig.defaultValues));
         importConfig.setEntities(mappedData);
     }
 

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

@@ -10,7 +10,7 @@ export function StringPropertyField({
                                         disabled,
                                         showErrors
                                     }: {
-    widgetId: "text_field" | "multiline" | "email";
+    widgetId: "text_field" | "multiline" | "email" | "user_select";
     disabled: boolean;
     showErrors: boolean;
 }) {
@@ -33,6 +33,10 @@ export function StringPropertyField({
                                                   trim={true}
                                                   uppercase={true}
                                                   showErrors={showErrors}/>}
+                    {widgetId === "user_select" &&
+                        <StringPropertyValidation disabled={disabled}
+                                                  showErrors={showErrors}/>}
+
                     {widgetId === "multiline" &&
                         <StringPropertyValidation disabled={disabled}
                                                   length={true}

package/src/ui/collection_editor/utils/supported_fields.tsx

@@ -6,6 +6,7 @@ export const supportedFieldsIds: PropertyConfigId[] = [
     "markdown",
     "url",
     "email",
+    "user_select",
     "select",
     "multi_select",
     "number_input",

package/src/ui/collection_editor/utils/update_property_for_widget.ts

@@ -27,7 +27,24 @@ export function updatePropertyFromWidget(propertyData: any,
                 markdown: undefined,
                 email: undefined,
                 url: undefined,
-                enumValues: undefined
+                enumValues: undefined,
+                userSelect: undefined
+            } satisfies StringProperty
+        );
+    } else if (selectedWidgetId === "user_select") {
+        updatedProperty = mergeDeep(
+            propertyData,
+            {
+                dataType: "string",
+                propertyConfig: "user_select",
+                editable: propertyData.editable !== undefined ? propertyData.editable : true,
+                storage: undefined,
+                multiline: undefined,
+                markdown: undefined,
+                email: undefined,
+                url: undefined,
+                enumValues: undefined,
+                userSelect: true
             } satisfies StringProperty
         );
     } else if (selectedWidgetId === "multiline") {
@@ -42,7 +59,8 @@ export function updatePropertyFromWidget(propertyData: any,
                 markdown: undefined,
                 email: undefined,
                 url: undefined,
-                enumValues: undefined
+                enumValues: undefined,
+                userSelect: undefined
             } satisfies StringProperty
         );
     } else if (selectedWidgetId === "markdown") {
@@ -56,7 +74,8 @@ export function updatePropertyFromWidget(propertyData: any,
                 multiline: undefined,
                 markdown: true,
                 email: undefined,
-                url: undefined
+                url: undefined,
+                userSelect: undefined
             } satisfies StringProperty
         );
     } else if (selectedWidgetId === "url") {
@@ -71,7 +90,8 @@ export function updatePropertyFromWidget(propertyData: any,
                 markdown: undefined,
                 email: undefined,
                 url: true,
-                enumValues: undefined
+                enumValues: undefined,
+                userSelect: undefined
             } satisfies StringProperty
         );
     } else if (selectedWidgetId === "email") {
@@ -86,7 +106,8 @@ export function updatePropertyFromWidget(propertyData: any,
                 markdown: undefined,
                 email: true,
                 url: undefined,
-                enumValues: undefined
+                enumValues: undefined,
+                userSelect: undefined
             } satisfies StringProperty
         );
     } else if (selectedWidgetId === "select") {
@@ -101,7 +122,8 @@ export function updatePropertyFromWidget(propertyData: any,
                 markdown: undefined,
                 email: undefined,
                 url: undefined,
-                enumValues: propertyData.enumValues ?? []
+                enumValues: propertyData.enumValues ?? [],
+                userSelect: undefined
             } satisfies StringProperty
         );
     } else if (selectedWidgetId === "multi_select") {