@firecms/core 3.0.0-beta.1 → 3.0.0-beta.10

package/src/form/components/CustomIdField.tsx

@@ -1,15 +1,25 @@
 import React, { useMemo } from "react";
 
-import { ErrorMessage } from "formik";
-
+// import { ErrorMessage } from "@firecms/formex";
 import { Entity, EntityStatus, EnumValueConfig, EnumValues } from "../../types";
 
 import { useClipboard, useSnackbarController } from "../../hooks";
 import { enumToObjectEntries } from "../../util";
-import { ContentCopyIcon, IconButton, OpenInNewIcon, Select, SelectItem, TextField, Tooltip } from "@firecms/ui";
+import {
+    CircularProgress,
+    ContentCopyIcon,
+    IconButton,
+    OpenInNewIcon,
+    Select,
+    SelectItem,
+    TextField,
+    Tooltip,
+    Typography
+} from "@firecms/ui";
 import { EnumValuesChip } from "../../preview";
 import { useCustomizationController } from "../../hooks/useCustomizationController";
 import { CustomizationController } from "../../types/customization_controller";
+import { useFormex } from "@firecms/formex";
 
 export function CustomIdField<M extends Record<string, any>>({
                                                                  customId,
@@ -17,16 +27,19 @@ export function CustomIdField<M extends Record<string, any>>({
                                                                  status,
                                                                  onChange,
                                                                  error,
-                                                                 entity
+                                                                 entity,
+                                                                 loading
                                                              }: {
     customId?: boolean | EnumValues | "optional"
     entityId?: string
     status: EntityStatus,
     onChange: (id?: string) => void,
     error: boolean,
-    entity: Entity<M> | undefined
+    entity: Entity<M> | undefined,
+    loading: boolean
 }) {
 
+    const { errors } = useFormex();
     const disabled = status === "existing" || !customId;
     const idSetAutomatically = status !== "existing" && !customId;
 
@@ -48,36 +61,38 @@ export function CustomIdField<M extends Record<string, any>>({
 
     const fieldProps = {
         label: idSetAutomatically ? "ID is set automatically" : "ID",
-        disabled,
+        disabled: disabled || loading,
         name: "id",
         value: (entity && status === "existing" ? entity.id : entityId) ?? "",
-        endAdornment: entity
-            ? (
-                <>
-
-                    <Tooltip title={"Copy"}>
-                        <IconButton onClick={(e) => copy(entity.id)}
-                                    aria-label="copy-id">
-                            <ContentCopyIcon size={"small"}/>
-                        </IconButton>
-                    </Tooltip>
-
-                    {customizationController?.entityLinkBuilder &&
-                        <Tooltip title={"Open in the console"}>
-                            <IconButton component={"a"}
-                                        href={customizationController.entityLinkBuilder({ entity })}
-                                        rel="noopener noreferrer"
-                                        target="_blank"
-                                        onClick={(e) => e.stopPropagation()}
-                                        aria-label="go-to-datasource">
-                                <OpenInNewIcon size={"small"}/>
+        endAdornment: loading ? <CircularProgress size={"small"}/> : (entity
+                ? (
+                    <>
+
+                        <Tooltip title={"Copy"}
+                                 asChild={true}>
+                            <IconButton onClick={(e) => copy(entity.id)}
+                                        aria-label="copy-id">
+                                <ContentCopyIcon size={"small"}/>
                             </IconButton>
-                        </Tooltip>}
-
-                </>
-            )
-            : undefined
-
+                        </Tooltip>
+
+                        {customizationController?.entityLinkBuilder &&
+                            <Tooltip title={"Open in the console"}
+                                     asChild={true}>
+                                <IconButton component={"a"}
+                                            href={customizationController.entityLinkBuilder({ entity })}
+                                            rel="noopener noreferrer"
+                                            target="_blank"
+                                            onClick={(e) => e.stopPropagation()}
+                                            aria-label="go-to-datasource">
+                                    <OpenInNewIcon size={"small"}/>
+                                </IconButton>
+                            </Tooltip>}
+
+                    </>
+                )
+                : undefined
+        )
     };
 
     return (
@@ -116,10 +131,10 @@ export function CustomIdField<M extends Record<string, any>>({
                                return onChange(value.length ? value : undefined);
                            }}/>}
 
-            <ErrorMessage name={"id"}
-                          component="div">
-                {(_) => "You need to specify an ID"}
-            </ErrorMessage>
+            {errors.id && <Typography variant={"caption"}
+                                      className={"ml-3.5 text-red-500 dark:text-red-500"}>
+                {errors.id}
+            </Typography>}
 
         </>
     );

package/src/form/components/ErrorFocus.tsx

@@ -1,11 +1,11 @@
 import React, { useEffect } from "react";
-import { useFormikContext } from "formik";
+import { useFormex } from "@firecms/formex";
 
 export const ErrorFocus = ({ containerRef }:
                                {
                                    containerRef?: React.RefObject<HTMLDivElement>
                                }) => {
-    const { isSubmitting, isValidating, errors } = useFormikContext();
+    const { isSubmitting, isValidating, errors } = useFormex();
 
     useEffect(() => {
         const keys = Object.keys(errors);
@@ -21,7 +21,7 @@ export const ErrorFocus = ({ containerRef }:
                 if (scrollableParent) {
                     const top = errorElement.getBoundingClientRect().top;
                     scrollableParent.scrollTo({
-                        top: scrollableParent.scrollTop + top - 64,
+                        top: scrollableParent.scrollTop + top - 196,
                         behavior: "smooth"
                     });
                 }

package/src/form/components/FieldHelperText.tsx

@@ -1,4 +1,4 @@
-import { ResolvedProperty } from "../../types";
+import { Property, ResolvedProperty } from "../../types";
 import { IconButton, InfoIcon, Tooltip, Typography } from "@firecms/ui";
 
 /**
@@ -13,8 +13,8 @@ export function FieldHelperText({
                                     disabled
                                 }: {
                                     error?: string,
-                                    showError: boolean,
-                                    property: ResolvedProperty,
+                                    showError?: boolean,
+                                    property: ResolvedProperty | Property,
                                     includeDescription?: boolean,
                                     disabled?: boolean,
                                 }
@@ -44,7 +44,7 @@ export function FieldHelperText({
         {property.longDescription &&
             <Tooltip title={property.longDescription}
                      side="bottom"
-            >
+                     asChild={true}>
                 <IconButton
                     size={"small"}
                     className="self-start">

package/src/form/components/FormikArrayContainer.tsx

@@ -12,6 +12,7 @@ interface ArrayContainerProps<T> {
     includeAddButton?: boolean;
     newDefaultEntry?: T | null;
     setFieldValue: (field: string, value: any, shouldValidate?: boolean | undefined) => void;
+    className?: string;
 }
 
 /**
@@ -27,7 +28,8 @@ export function FormikArrayContainer<T>({
                                             onInternalIdAdded,
                                             includeAddButton,
                                             newDefaultEntry = null,
-                                            setFieldValue
+                                            setFieldValue,
+                                            className
                                         }: ArrayContainerProps<T>) {
 
     return <ArrayContainer droppableId={name}
@@ -39,6 +41,7 @@ export function FormikArrayContainer<T>({
                            onInternalIdAdded={onInternalIdAdded}
                            includeAddButton={includeAddButton}
                            newDefaultEntry={newDefaultEntry}
+                           className={className}
                            onValueChange={(value) => setFieldValue(name, value)}
     />;
 }

package/src/form/components/LabelWithIcon.tsx

@@ -0,0 +1,41 @@
+import React, { forwardRef } from "react";
+
+interface LabelWithIconProps {
+    icon: React.ReactNode;
+    title?: string;
+    small?: boolean;
+    className?: string;
+    required?: boolean;
+}
+
+/**
+ * Render the label of with an icon and the title of a property
+ * @group Form custom fields
+ */
+export const LabelWithIcon = forwardRef<HTMLDivElement, LabelWithIconProps>(
+    ({
+         icon,
+         title,
+         small,
+         className,
+         required
+     }, ref) => {
+        return (
+            <div
+                ref={ref}
+                className={`inline-flex items-center my-0.5 ${small ? "gap-1" : "gap-2"} ${className ?? ""}`}
+            >
+        {icon}
+                <span
+                    className={`text-start font-medium text-${small ? "base" : "sm"} origin-top-left transform ${
+                        small ? "translate-x-2 scale-75" : ""
+                    }`}
+                >
+          {(title ?? "") + (required ? " *" : "")}
+        </span>
+      </div>
+        );
+    }
+);
+
+LabelWithIcon.displayName = "LabelWithIcon";

package/src/form/components/LabelWithIconAndTooltip.tsx

@@ -0,0 +1,28 @@
+import React from "react";
+import { LabelWithIcon } from "./LabelWithIcon";
+import { PropertyIdCopyTooltip } from "../../components/PropertyIdCopyTooltip";
+
+interface LabelWithIconAndTooltip {
+    icon: React.ReactNode;
+    title?: string;
+    small?: boolean;
+    className?: string;
+    required?: boolean;
+    propertyKey: string
+}
+
+/**
+ * Render the label of with an icon and the title of a property
+ * @group Form custom fields
+ */
+export function LabelWithIconAndTooltip({
+                                            propertyKey,
+                                            className,
+                                            ...props
+                                        }: LabelWithIconAndTooltip) {
+    return (
+        <PropertyIdCopyTooltip propertyKey={propertyKey} className={className}>
+            <LabelWithIcon {...props}/>
+        </PropertyIdCopyTooltip>
+    );
+}

package/src/form/components/StorageItemPreview.tsx

@@ -1,41 +1,45 @@
 import React from "react";
 
-import { Entity, ResolvedStringProperty } from "../../types";
+import { ResolvedStringProperty } from "../../types";
 import { PreviewSize, PropertyPreview } from "../../preview";
 
-import { cn, IconButton, paperMixin, RemoveIcon, Tooltip } from "@firecms/ui";
+import { cls, DescriptionIcon, IconButton, paperMixin, RemoveIcon, Tooltip } from "@firecms/ui";
 import { ErrorBoundary } from "../../components";
 
 interface StorageItemPreviewProps {
     name: string;
     property: ResolvedStringProperty;
     value: string,
-    entity: Entity<any>,
     onRemove: (value: string) => void;
     size: PreviewSize;
     disabled: boolean;
+    placeholder?: boolean;
+    className?: string;
 }
 
 export function StorageItemPreview({
                                        name,
                                        property,
                                        value,
-                                       entity,
                                        onRemove,
                                        disabled,
-                                       size
+                                       size,
+                                       placeholder,
+                                       className
                                    }: StorageItemPreviewProps) {
 
     return (
-        <div className={cn(paperMixin,
+        <div className={cls(paperMixin,
             "relative m-4 border-box flex items-center justify-center",
-            size === "medium" ? "min-w-[220px] min-h-[220px] max-w-[220px]" : "min-w-[118px] min-h-[118px] max-w-[118px]")}>
+            size === "medium" ? "min-w-[220px] min-h-[220px] max-w-[220px]" : "min-w-[118px] min-h-[118px] max-w-[118px]",
+            className)}>
 
-            {!disabled &&
+            {!placeholder && !disabled &&
                 <div
                     className="absolute rounded-full -top-2 -right-2 z-10 bg-white dark:bg-gray-900">
 
                     <Tooltip
+                        asChild={true}
                         title="Remove">
                         <IconButton
                             size={"small"}
@@ -49,16 +53,24 @@ export function StorageItemPreview({
                 </div>
             }
 
-            {value &&
+            {!placeholder && value &&
                 <ErrorBoundary>
                     <PropertyPreview propertyKey={name}
                                      value={value}
                                      property={property}
-                                     // entity={entity}
+                                     interactive={false}
                                      size={size}/>
                 </ErrorBoundary>
             }
 
+            {placeholder &&
+                <div
+                    onClick={(e) => e.stopPropagation()}
+                    className="flex flex-col items-center justify-center w-full h-full">
+                    <DescriptionIcon className="text-gray-700 dark:text-gray-300"/>
+                </div>
+            }
+
 
         </div>
     );

package/src/form/components/StorageUploadProgress.tsx

@@ -3,7 +3,7 @@ import React, { useCallback } from "react";
 import { useSnackbarController, useStorageSource } from "../../hooks";
 import { StorageFieldItem } from "../../util/useStorageUploadController";
 import { ErrorView } from "../../components";
-import { cn, paperMixin, Skeleton } from "@firecms/ui";
+import { cls, paperMixin, Skeleton } from "@firecms/ui";
 
 export interface StorageUploadItemProps {
     storagePath: string;
@@ -22,10 +22,10 @@ export function StorageUploadProgress({
                                           metadata,
                                           onFileUploadComplete,
                                           imageSize,
-                                          simple
+                                          simple,
                                       }: StorageUploadItemProps) {
 
-    const storage = useStorageSource();
+    const storageSource = useStorageSource();
 
     const snackbarController = useSnackbarController();
 
@@ -41,14 +41,14 @@ export function StorageUploadProgress({
         setError(undefined);
         setLoading(true);
 
-        storage.uploadFile({
+        storageSource.uploadFile({
             file,
             fileName,
             path: storagePath,
             metadata
         })
             .then(async ({ path }) => {
-                console.debug("Upload successful");
+                console.debug("Upload successful", path);
                 await onFileUploadComplete(path, entry, metadata);
                 if (mounted.current)
                     setLoading(false);
@@ -67,7 +67,7 @@ export function StorageUploadProgress({
             .finally(() => {
                 uploading.current = false;
             });
-    }, [entry, metadata, onFileUploadComplete, storage, storagePath]);
+    }, [entry, metadata, onFileUploadComplete, storageSource, storagePath]);
 
     React.useEffect(() => {
         mounted.current = true;
@@ -87,9 +87,9 @@ export function StorageUploadProgress({
     }
     return (
 
-        <div className={cn(paperMixin,
+        <div className={cls(paperMixin,
             "relative m-4 border-box flex items-center justify-center",
-             `min-w-[${imageSize}px] min-h-[${imageSize}px]`)}>
+            `min-w-[${imageSize}px] min-h-[${imageSize}px]`)}>
 
             {loading &&
                 <Skeleton className="w-full h-full"/>}

package/src/form/components/index.tsx

@@ -1,3 +1,4 @@
 export * from "./FormikArrayContainer";
-export * from "./SwitchControl";
 export * from "./FieldHelperText";
+export * from "./LabelWithIcon";
+export * from "./LabelWithIconAndTooltip";

package/src/form/field_bindings/ArrayCustomShapedFieldBinding.tsx

@@ -1,11 +1,10 @@
 import React from "react";
 import { FieldProps } from "../../types";
-import { FieldHelperText } from "../components";
+import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
-import { useClearRestoreValue } from "../../hooks";
-import { ExpandablePanel } from "@firecms/ui";
-import { getIconForProperty } from "../../util";
-import { LabelWithIcon } from "../../components";
+import { ExpandablePanel, Typography } from "@firecms/ui";
+import { getArrayResolvedProperties, getIconForProperty } from "../../util";
+import { useClearRestoreValue } from "../useClearRestoreValue";
 
 /**
  * Array field used for custom
@@ -21,7 +20,7 @@ export function ArrayCustomShapedFieldBinding<T extends Array<any>>({
                                                                         showError,
                                                                         isSubmitting,
                                                                         setValue,
-                                                                        tableMode,
+                                                                        minimalistView,
                                                                         property,
                                                                         includeDescription,
                                                                         underlyingValueHasChanged,
@@ -29,8 +28,15 @@ export function ArrayCustomShapedFieldBinding<T extends Array<any>>({
                                                                         disabled
                                                                     }: FieldProps<T, any, any>) {
 
-    if (!Array.isArray(property.resolvedProperties))
-        throw Error("ArrayCustomShapedFieldBinding misconfiguration. Property `of` not set");
+    let resolvedProperties = "resolvedProperties" in property ? property.resolvedProperties : undefined;
+    if (!resolvedProperties) {
+        resolvedProperties = getArrayResolvedProperties({
+            propertyValue: value,
+            propertyKey,
+            property,
+            ignoreMissingFields: false
+        })
+    }
 
     const expanded = property.expanded === undefined ? true : property.expanded;
 
@@ -40,12 +46,17 @@ export function ArrayCustomShapedFieldBinding<T extends Array<any>>({
         setValue
     });
 
-    const title = <LabelWithIcon icon={getIconForProperty(property, "small")}
-                                 required={property.validation?.required}
-                                 className={"text-text-secondary dark:text-text-secondary-dark"}
-                                 title={property.name}/>;
+    const title = (<>
+        <LabelWithIconAndTooltip
+            propertyKey={propertyKey}
+            icon={getIconForProperty(property, "small")}
+            required={property.validation?.required}
+            title={property.name}
+            className={"flex-grow text-text-secondary dark:text-text-secondary-dark"}/>
+        {Array.isArray(value) && <Typography variant={"caption"} className={"px-4"}>({value.length})</Typography>}
+    </>);
 
-    const body = property.resolvedProperties.map((childProperty, index) => {
+    const body = resolvedProperties.map((childProperty, index) => {
         const fieldProps = {
             propertyKey: `${propertyKey}[${index}]`,
             disabled,
@@ -53,9 +64,8 @@ export function ArrayCustomShapedFieldBinding<T extends Array<any>>({
             includeDescription,
             underlyingValueHasChanged,
             context,
-            tableMode: false,
             partOfArray: true,
-            partOfBlock: false,
+            minimalistView: false,
             autoFocus: false
         };
         return <div key={`custom_shaped_array_${index}`} className="pb-4">
@@ -67,14 +77,14 @@ export function ArrayCustomShapedFieldBinding<T extends Array<any>>({
 
         <>
 
-            {!tableMode &&
+            {!minimalistView &&
                 <ExpandablePanel initiallyExpanded={expanded}
                                  title={title}
-                                 className={"px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2"}>
+                                 innerClassName={"px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2"}>
                     {body}
                 </ExpandablePanel>}
 
-            {tableMode && body}
+            {minimalistView && body}
 
             <FieldHelperText includeDescription={includeDescription}
                              showError={showError}