@firecms/collection_editor 3.0.0-3.0.0-beta.4.pre.1.0

package/src/ui/collection_editor/import/clean_import_data.ts

@@ -0,0 +1,53 @@
+import { Properties, slugify } from "@firecms/core";
+import { ImportConfig } from "@firecms/data_import_export";
+
+export function cleanPropertiesFromImport(properties: Properties, parentSlug = ""): {
+    headersMapping: ImportConfig["headersMapping"],
+    properties: Properties,
+    idColumn?: ImportConfig["idColumn"],
+} {
+
+    const result = Object.keys(properties).reduce((acc, key) => {
+        const property = properties[key];
+        const slug = slugify(key);
+        const fullSlug = parentSlug ? `${parentSlug}.${slug}` : slug;
+
+        if (property.dataType === "map" && property.properties) {
+            const slugifiedResult = cleanPropertiesFromImport(property.properties as Properties, fullSlug);
+            return {
+                headersMapping: { ...acc.headersMapping, [key]: fullSlug },
+                properties: {
+                    ...acc.properties,
+                    [slug]: {
+                        ...property,
+                        properties: slugifiedResult.properties,
+                        propertiesOrder: Object.keys(slugifiedResult.properties)
+                    }
+                }
+            }
+        }
+
+        const updatedProperties = {
+            ...acc.properties,
+            [slug]: property
+        } as Properties;
+
+        const headersMapping = { ...acc.headersMapping, [key]: fullSlug } as Record<string, string>;
+
+        return {
+            headersMapping,
+            properties: updatedProperties,
+        }
+    }, { headersMapping: {}, properties: {} });
+
+    const firstKey = Object.keys(result.headersMapping)?.[0];
+    let idColumn: string | undefined;
+    if (firstKey?.includes("id") || firstKey?.includes("key")) {
+        idColumn = firstKey;
+    }
+
+    return {
+        ...result,
+        idColumn
+    };
+}

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

@@ -0,0 +1,138 @@
+import React, { useCallback, useState } from "react";
+import { AddIcon, Button, Paper, Typography } from "@firecms/ui";
+import { getIn, useFormex } from "@firecms/formex";
+import { PropertyFormDialog } from "../PropertyEditView";
+import { getFullId, idToPropertiesPath, namespaceToPropertiesOrderPath } from "../util";
+import { PropertyTree } from "../PropertyTree";
+import { ArrayProperty, Property, PropertyConfig } from "@firecms/core";
+
+export function BlockPropertyField({ disabled, getData, allowDataInference, propertyConfigs, collectionEditable }: {
+    disabled: boolean;
+    getData?: () => Promise<object[]>;
+    allowDataInference: boolean;
+    propertyConfigs: Record<string, PropertyConfig>,
+    collectionEditable: boolean;
+}) {
+
+    const {
+        values,
+        setFieldValue
+    } = useFormex<ArrayProperty>();
+
+    const [propertyDialogOpen, setPropertyDialogOpen] = useState<boolean>(false);
+    const [selectedPropertyKey, setSelectedPropertyKey] = useState<string | undefined>();
+    const [selectedPropertyNamespace, setSelectedPropertyNamespace] = useState<string | undefined>();
+
+    const onPropertyChanged = ({
+                                   id,
+                                   property
+                               }: { id?: string, property: Property }) => {
+        if (!id)
+            throw Error();
+
+        setFieldValue("oneOf.properties", {
+            ...(values.oneOf?.properties ?? {}),
+            [id]: property
+        }, 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);
+    };
+
+    const selectedPropertyFullId = selectedPropertyKey ? getFullId(selectedPropertyKey, selectedPropertyNamespace) : undefined;
+    const selectedProperty = selectedPropertyFullId ? getIn(values.oneOf?.properties, selectedPropertyFullId.replaceAll(".", ".properties.")) : undefined;
+
+    const deleteProperty = useCallback((propertyKey?: string, namespace?: string) => {
+        const fullId = propertyKey ? getFullId(propertyKey, namespace) : undefined;
+        if (!fullId)
+            throw Error("collection editor miss config");
+
+        setFieldValue(`oneOf.${idToPropertiesPath(fullId)}`, undefined, false);
+        const propertiesOrderPath = `oneOf.${namespaceToPropertiesOrderPath(namespace)}`;
+        const currentPropertiesOrder: string[] = getIn(values, propertiesOrderPath);
+        setFieldValue(propertiesOrderPath, currentPropertiesOrder.filter((p) => p !== propertyKey), false);
+
+        setPropertyDialogOpen(false);
+        setSelectedPropertyKey(undefined);
+        setSelectedPropertyNamespace(undefined);
+    }, [setFieldValue, values]);
+
+    const addChildButton = <Button
+        autoFocus
+        color="primary"
+
+        onClick={() => setPropertyDialogOpen(true)}
+        startIcon={<AddIcon/>}
+    >
+        Add property to {values.name ?? "this block"}
+    </Button>;
+
+    const onPropertyMove = useCallback((propertiesOrder: string[], namespace?: string) => {
+        setFieldValue(`oneOf.${namespaceToPropertiesOrderPath(namespace)}`, propertiesOrder, false);
+    }, []);
+
+    return (
+        <>
+            <div className={"col-span-12"}>
+                <div className={"flex justify-between items-end mt-8 mb-4"}>
+                    <Typography variant={"subtitle2"}>Properties in this
+                        block</Typography>
+                    {addChildButton}
+                </div>
+                <Paper className="p-2 pl-8">
+
+                    <PropertyTree
+                        properties={values.oneOf?.properties ?? {}}
+                        propertiesOrder={values.oneOf?.propertiesOrder}
+                        errors={{}}
+                        collectionEditable={collectionEditable}
+                        onPropertyClick={disabled
+                            ? undefined
+                            : (propertyKey, namespace) => {
+                                setSelectedPropertyKey(propertyKey);
+                                setSelectedPropertyNamespace(namespace);
+                                setPropertyDialogOpen(true);
+                            }}
+                        onPropertyMove={disabled
+                            ? undefined
+                            : onPropertyMove}/>
+
+                    {!disabled && !values.oneOf?.propertiesOrder?.length &&
+                        <div className="h-full flex items-center justify-center p-4">
+                            Add the first property to this block
+                        </div>}
+
+                </Paper>
+            </div>
+
+            {!disabled && <PropertyFormDialog
+                inArray={false}
+                forceShowErrors={false}
+                open={propertyDialogOpen}
+                getData={getData}
+                allowDataInference={allowDataInference}
+                onCancel={() => {
+                    setPropertyDialogOpen(false);
+                    setSelectedPropertyKey(undefined);
+                    setSelectedPropertyNamespace(undefined);
+                }}
+                onOkClicked={() => {
+                    setPropertyDialogOpen(false);
+                    setSelectedPropertyKey(undefined);
+                    setSelectedPropertyNamespace(undefined);
+                }}
+                collectionEditable={collectionEditable}
+                onDelete={deleteProperty}
+                propertyKey={selectedPropertyKey}
+                propertyNamespace={selectedPropertyNamespace}
+                property={selectedProperty}
+                existingProperty={Boolean(selectedPropertyKey)}
+                autoUpdateId={!selectedPropertyKey}
+                autoOpenTypeSelect={!selectedPropertyKey}
+                onPropertyChanged={onPropertyChanged}
+                existingPropertyKeys={selectedPropertyKey ? undefined : values.oneOf?.propertiesOrder}
+                propertyConfigs={propertyConfigs}/>}
+
+        </>);
+}

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

@@ -0,0 +1,40 @@
+import React from "react";
+import { Field, FormexFieldProps, getIn, useFormex } from "@firecms/formex";
+
+import { GeneralPropertyValidation } from "./validation/GeneralPropertyValidation";
+import { ValidationPanel } from "./validation/ValidationPanel";
+import { SwitchControl } from "../SwitchControl";
+
+export function BooleanPropertyField({ disabled }: {
+    disabled: boolean;
+}) {
+    const { values } = useFormex();
+    const defaultValue = getIn(values, "defaultValue");
+
+    return (
+        <>
+            <div className={"col-span-12"}>
+
+                <ValidationPanel>
+                    <GeneralPropertyValidation disabled={disabled}/>
+                </ValidationPanel>
+
+            </div>
+
+            <div className={"col-span-12"}>
+
+                <Field
+                    name={"defaultValue"}>
+                    {({ field, form }: FormexFieldProps) => {
+                        return <SwitchControl
+                            label={defaultValue === null || defaultValue === undefined ? "Default value not set" : ("Default value is " + defaultValue.toString())}
+                            disabled={disabled}
+                            allowIndeterminate={true} field={field}
+                            form={form}/>
+                    }}
+                </Field>
+
+            </div>
+        </>
+    );
+}

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

@@ -0,0 +1,110 @@
+import { Field, getIn, useFormex } from "@firecms/formex";
+import { DebouncedTextField } from "@firecms/ui";
+import { PropertyWithId } from "../PropertyEditView";
+import React from "react";
+import { FieldCaption, toSnakeCase, unslugify } from "@firecms/core";
+
+type CommonPropertyFieldsProps = {
+    showErrors: boolean,
+    disabledId: boolean,
+    disabled: boolean;
+    isNewProperty: boolean;
+    autoUpdateId: boolean;
+};
+
+export const CommonPropertyFields = React.forwardRef<HTMLDivElement, CommonPropertyFieldsProps>(
+    function CommonPropertyFields({
+                                      showErrors,
+                                      disabledId,
+                                      disabled,
+                                      autoUpdateId,
+                                      isNewProperty
+                                  }, ref) {
+
+        const {
+            errors,
+            values,
+            setFieldValue,
+            setFieldTouched,
+            touched,
+            validate
+        } = useFormex<PropertyWithId>();
+
+        const name = "name";
+        const nameError = showErrors && getIn(errors, name);
+
+        const id = "id";
+        const idError = showErrors && getIn(errors, id);
+
+        const description = "description";
+        const descriptionError = showErrors && getIn(errors, description);
+
+        return (
+            <div className={"flex flex-col gap-2 col-span-12"}>
+
+                <div>
+                    <Field
+                        name={name}
+                        inputRef={ref}
+                        as={DebouncedTextField}
+                        value={values[name]}
+                        onChange={(e: any) => {
+                            const newNameValue = e.target.value;
+                            const idTouched = getIn(touched, id);
+                            if (!idTouched && autoUpdateId) {
+                                setFieldValue(id, newNameValue ? toSnakeCase(newNameValue) : "", false)
+                            }
+                            setFieldValue(name, newNameValue, true);
+                            setFieldTouched(name, true);
+                        }}
+                        style={{ fontSize: 20 }}
+                        placeholder={"Field name"}
+                        required
+                        disabled={disabled}
+                        error={Boolean(nameError)}/>
+
+                    <FieldCaption error={Boolean(nameError)}>
+                        {nameError}
+                    </FieldCaption>
+                </div>
+
+                <div>
+                    <Field
+                        name={id}
+                        as={DebouncedTextField}
+                        label={"ID"}
+                        value={values[id]}
+                        onChange={(e: any) => {
+                            const newIdValue = e.target.value;
+                            const nameTouched = getIn(touched, name);
+                            if (!nameTouched && autoUpdateId) {
+                                setFieldValue(name, newIdValue ? unslugify(newIdValue) : "")
+                            }
+                            setFieldValue(id, newIdValue, true);
+                            setFieldTouched(id, true);
+                        }}
+                        disabled={disabledId || disabled}
+                        required
+                        size="small"
+                        error={Boolean(idError)}/>
+                    <FieldCaption error={Boolean(idError)}>
+                        {idError}
+                    </FieldCaption>
+                </div>
+
+                <div>
+                    <Field name={description}
+                           as={DebouncedTextField}
+                           label={"Description"}
+                           disabled={disabled}
+                           error={Boolean(descriptionError)}/>
+                    <FieldCaption error={Boolean(descriptionError)}>
+                        {descriptionError}
+                    </FieldCaption>
+                </div>
+
+            </div>
+        );
+
+    }
+);

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

@@ -0,0 +1,86 @@
+import React from "react";
+import { getIn, useFormex } from "@firecms/formex";
+import { FieldCaption, NumberProperty, StringProperty } from "@firecms/core";
+import { Select, SelectItem } from "@firecms/ui";
+import { GeneralPropertyValidation } from "./validation/GeneralPropertyValidation";
+import { ValidationPanel } from "./validation/ValidationPanel";
+
+export function DateTimePropertyField({ disabled }: {
+    disabled: boolean;
+}) {
+
+    const {
+        values,
+        errors,
+        touched,
+        setFieldValue
+    } = useFormex<StringProperty | NumberProperty>();
+
+    const modePath = "mode";
+    const modeValue: string | undefined = getIn(values, modePath);
+    const modeError: string | undefined = getIn(touched, modePath) && getIn(errors, modePath);
+
+    const autoValuePath = "autoValue";
+    const autoValueValue: string | undefined = getIn(values, autoValuePath);
+    const autoValueError: string | undefined = getIn(touched, autoValuePath) && getIn(errors, autoValuePath);
+
+    return (
+        <>
+            <div className={"flex flex-col col-span-12"}>
+                <Select name={modePath}
+                        value={modeValue ?? "date"}
+                        error={Boolean(modeError)}
+                        onValueChange={(v) => setFieldValue(modePath, v)}
+                        label={"Mode"}
+                        renderValue={(v) => {
+                            switch (v) {
+                                case "date_time":
+                                    return "Date/Time";
+                                case "date":
+                                    return "Date";
+                                default:
+                                    return "";
+                            }
+                        }}
+                        disabled={disabled}>
+                    <SelectItem value={"date_time"}> Date/Time </SelectItem>
+                    <SelectItem value={"date"}> Date </SelectItem>
+                </Select>
+                <FieldCaption error={Boolean(modeError)}>
+                    {modeError}
+                </FieldCaption>
+
+                <Select name={autoValuePath}
+                        disabled={disabled}
+                        value={autoValueValue ?? ""}
+                        onValueChange={(v) => setFieldValue(autoValuePath, v === "none" ? null : v)}
+                        renderValue={(v) => {
+                            switch (v) {
+                                case "on_create":
+                                    return "On create";
+                                case "on_update":
+                                    return "On any update";
+                                default:
+                                    return "None";
+                            }
+                        }}
+                        error={Boolean(autoValueError)}
+                        label={"Automatic value"}>
+                    <SelectItem value={"none"}> None </SelectItem>
+                    <SelectItem value={"on_create"}> On create </SelectItem>
+                    <SelectItem value={"on_update"}> On any update </SelectItem>
+                </Select>
+                <FieldCaption error={Boolean(autoValueError)}>
+                    {autoValueError ?? "Update this field automatically when creating or updating the entity"}
+                </FieldCaption>
+
+            </div>
+
+            <div className={"col-span-12"}>
+                <ValidationPanel>
+                    <GeneralPropertyValidation disabled={disabled}/>
+                </ValidationPanel>
+            </div>
+        </>
+    );
+}

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

@@ -0,0 +1,114 @@
+import React, { useMemo } from "react";
+import { getIn, useFormex } from "@firecms/formex";
+import { EnumValueConfig, resolveEnumValues, useSnackbarController } from "@firecms/core";
+import { Select, SelectItem } from "@firecms/ui";
+import { EnumForm } from "../EnumForm";
+import { StringPropertyValidation } from "./validation/StringPropertyValidation";
+import { ArrayPropertyValidation } from "./validation/ArrayPropertyValidation";
+import { ValidationPanel } from "./validation/ValidationPanel";
+import { PropertyWithId } from "../PropertyEditView";
+
+export function EnumPropertyField({
+                                      multiselect,
+                                      updateIds,
+                                      disabled,
+                                      showErrors,
+                                      allowDataInference,
+                                      getData
+                                  }: {
+    multiselect: boolean;
+    updateIds: boolean;
+    disabled: boolean;
+    showErrors: boolean;
+    allowDataInference?: boolean;
+    getData?: () => Promise<object[]>;
+}) {
+
+    const {
+        values,
+        setFieldError,
+        setFieldValue
+    } = useFormex<PropertyWithId>();
+
+    const snackbarContext = useSnackbarController();
+
+    const enumValuesPath = multiselect ? "of.enumValues" : "enumValues";
+
+    const defaultValue = getIn(values, "defaultValue");
+
+    const valuesEnumValues = getIn(values, enumValuesPath);
+    const enumValues: EnumValueConfig[] = useMemo(() => {
+        if (!valuesEnumValues || typeof valuesEnumValues === "boolean")
+            return [] as EnumValueConfig[];
+        return resolveEnumValues(valuesEnumValues) ?? [] as EnumValueConfig[];
+    }, [valuesEnumValues]);
+
+    const onValuesChanged = (value: EnumValueConfig[]) => {
+        if (!values)
+            return;
+        setFieldValue(enumValuesPath, value);
+        if (!multiselect) {
+            const enumIds = value.filter(v => Boolean(v?.id)).map((v: any) => v.id);
+            if (defaultValue && !enumIds.includes(defaultValue)) {
+                setFieldValue("defaultValue", undefined);
+                snackbarContext.open({
+                    type: "warning",
+                    message: "Default value was cleared"
+                })
+            }
+        }
+    };
+
+    return (
+        <>
+            <div className={"col-span-12"}>
+                <EnumForm enumValues={enumValues}
+                          updateIds={updateIds}
+                          disabled={disabled}
+                          allowDataInference={allowDataInference}
+                          onError={(hasError) => {
+                              setFieldError(enumValuesPath, hasError ? "This enum property is missing some values" : undefined);
+                          }}
+                          getData={getData
+                              ? () => getData()
+                                  .then(res => res.map(d => values.id && getIn(d, values.id)).filter(Boolean))
+                              : undefined}
+                          onValuesChanged={onValuesChanged}/>
+            </div>
+
+            <div className={"col-span-12"}>
+
+                <ValidationPanel>
+                    {!multiselect &&
+                        <StringPropertyValidation disabled={disabled}
+                                                  showErrors={showErrors}/>}
+                    {multiselect &&
+                        <ArrayPropertyValidation disabled={disabled}/>}
+                </ValidationPanel>
+
+            </div>
+
+            {!multiselect && <div className={"col-span-12"}>
+
+                <Select
+                    disabled={disabled}
+                    position={"item-aligned"}
+                    onValueChange={(value: string) => {
+                        setFieldValue("defaultValue", value);
+                    }}
+                    label={"Default value"}
+                    value={defaultValue ?? ""}>
+                    {enumValues
+                        .filter((enumValue) => Boolean(enumValue?.id))
+                        .map((enumValue) => (
+                            <SelectItem key={enumValue.id}
+                                        value={enumValue.id?.toString()}>
+                                {enumValue.label}
+                            </SelectItem>
+                        ))}
+                </Select>
+
+            </div>}
+        </>
+    );
+}

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

@@ -0,0 +1,20 @@
+import React from "react";
+import { ValidationPanel } from "./validation/ValidationPanel";
+import { GeneralPropertyValidation } from "./validation/GeneralPropertyValidation";
+
+export function KeyValuePropertyField({ disabled }: {
+    disabled: boolean;
+}) {
+
+    return (
+        <>
+            <div className={"col-span-12"}>
+
+                <ValidationPanel>
+                    <GeneralPropertyValidation disabled={disabled}/>
+                </ValidationPanel>
+
+            </div>
+        </>
+    );
+}