@firecms/core 3.0.0-canary.102 → 3.0.0-canary.103

package/dist/types/collections.d.ts

@@ -44,6 +44,11 @@ export interface EntityCollection<M extends Record<string, any> = any, UserType
      * This path also determines the URL in FireCMS, unless an alias is specified
      */
     path: string;
+    /**
+     * Optional database id of this collection. If not specified, the default
+     * database id will be used.
+     */
+    databaseId?: string;
     /**
      * If this collection is a top level navigation entry, you can set this
      * property to `true` to indicate that this collection is a collection group.

package/dist/types/datasource.d.ts

@@ -14,6 +14,7 @@ export interface FetchEntityProps<M extends Record<string, any> = any> {
  * @group Datasource
  */
 export type ListenEntityProps<M extends Record<string, any> = any> = FetchEntityProps<M> & {
+    databaseId?: string;
     onUpdate: (entity: Entity<M>) => void;
     onError?: (error: Error) => void;
 };
@@ -131,7 +132,7 @@ export interface DataSource {
      * @param entityId
      * @return `true` if there are no other fields besides the given entity
      */
-    checkUniqueField(path: string, name: string, value: any, entityId?: string): Promise<boolean>;
+    checkUniqueField(path: string, name: string, value: any, entityId?: string, databaseId?: string): Promise<boolean>;
     /**
      * Generate an id for a new entity
      */
@@ -163,13 +164,9 @@ export type FilterCombinationValidProps = {
     filterValues: FilterValues<any>;
     sortBy?: [string, "asc" | "desc"];
 };
-export type SaveEntityDelegateProps<M extends Record<string, any> = any> = Omit<SaveEntityProps<M>, "collection">;
-export type FetchCollectionDelegateProps<M extends Record<string, any> = any> = Omit<FetchCollectionProps<M>, "collection"> & {
-    isCollectionGroup?: boolean;
-};
-export type ListenCollectionDelegateProps<M extends Record<string, any> = any> = ListenCollectionProps<M> & {
-    isCollectionGroup?: boolean;
-};
+export type SaveEntityDelegateProps<M extends Record<string, any> = any> = SaveEntityProps<M>;
+export type FetchCollectionDelegateProps<M extends Record<string, any> = any> = FetchCollectionProps<M>;
+export type ListenCollectionDelegateProps<M extends Record<string, any> = any> = ListenCollectionProps<M>;
 export interface DataSourceDelegate {
     /**
      * Key that identifies this data source delegate
@@ -213,7 +210,7 @@ export interface DataSourceDelegate {
      * @param path
      * @param entityId
      */
-    fetchEntity<M extends Record<string, any> = any>({ path, entityId, }: Omit<FetchEntityProps<M>, "collection">): Promise<Entity<M> | undefined>;
+    fetchEntity<M extends Record<string, any> = any>({ path, entityId, }: FetchEntityProps<M>): Promise<Entity<M> | undefined>;
     /**
      * Get realtime updates on one entity.
      * @param path
@@ -223,7 +220,7 @@ export interface DataSourceDelegate {
      * @param onError
      * @return Function to cancel subscription
      */
-    listenEntity?<M extends Record<string, any> = any>({ path, entityId, onUpdate, onError }: Omit<ListenEntityProps<M>, "collection">): () => void;
+    listenEntity?<M extends Record<string, any> = any>({ path, entityId, onUpdate, onError }: ListenEntityProps<M>): () => void;
     /**
      * Save entity to the specified path
      * @param path
@@ -246,7 +243,7 @@ export interface DataSourceDelegate {
      * @param entityId
      * @return `true` if there are no other fields besides the given entity
      */
-    checkUniqueField(path: string, name: string, value: any, entityId?: string): Promise<boolean>;
+    checkUniqueField(path: string, name: string, value: any, entityId?: string, databaseId?: string): Promise<boolean>;
     /**
      * Generate an id for a new entity
      */
@@ -259,7 +256,9 @@ export interface DataSourceDelegate {
      * Check if the given filter combination is valid
      * @param props
      */
-    isFilterCombinationValid?(props: Omit<FilterCombinationValidProps, "collection">): boolean;
+    isFilterCombinationValid?(props: Omit<FilterCombinationValidProps, "collection"> & {
+        databaseId?: string;
+    }): boolean;
     /**
      * Get the object to generate the current time in the datasource
      */
@@ -270,6 +269,7 @@ export interface DataSourceDelegate {
     initTextSearch?: (props: {
         context: FireCMSContext;
         path: string;
+        databaseId?: string;
         collection: EntityCollection;
         parentCollectionIds?: string[];
     }) => Promise<boolean>;

package/dist/types/entities.d.ts

@@ -21,6 +21,7 @@ export interface Entity<M extends object> {
      * Current values
      */
     values: EntityValues<M>;
+    databaseId?: string;
 }
 /**
  * This type represents a record of key value pairs as described in an

package/dist/types/fields.d.ts

@@ -67,13 +67,9 @@ export interface FieldProps<T extends CMSType = any, CustomProps = any, M extend
      */
     partOfArray?: boolean;
     /**
-     * Is this field part of a block (oneOf array)
-     */
-    partOfBlock?: boolean;
-    /**
-     * Is this field being rendered in the entity table popup
+     * Should this field render with the minimal amount of UI elements
      */
-    tableMode?: boolean;
+    minimalistView?: boolean;
     /**
      * Should this field autofocus on mount
      */
@@ -81,7 +77,7 @@ export interface FieldProps<T extends CMSType = any, CustomProps = any, M extend
     /**
      * Additional properties set by the developer
      */
-    customProps?: CustomProps;
+    customProps: CustomProps;
     /**
      * Additional values related to the state of the form or the entity
      */
@@ -118,7 +114,7 @@ export interface FormContext<M extends Record<string, any> = any> {
     /**
      * Entity id, it can be null if it's a new entity
      */
-    entityId?: string;
+    entityId: string;
     /**
      * Path this entity is located at
      */
@@ -157,10 +153,6 @@ export interface PropertyFieldBindingProps<T extends CMSType, M extends Record<s
      * field is being edited
      */
     underlyingValueHasChanged?: boolean;
-    /**
-     * Is this field being rendered in a table
-     */
-    tableMode?: boolean;
     /**
      * Is this field part of an array
      */
@@ -168,7 +160,7 @@ export interface PropertyFieldBindingProps<T extends CMSType, M extends Record<s
     /**
      * Is this field part of a block (oneOf array)
      */
-    partOfBlock?: boolean;
+    minimalistView?: boolean;
     /**
      * Should the field take focus when rendered. When opening the popup view
      * in table mode, it makes sense to put the focus on the only field rendered.

package/dist/util/index.d.ts

@@ -21,3 +21,4 @@ export * from "./make_properties_editable";
 export * from "./join_collections";
 export * from "./builders";
 export * from "./useTraceUpdate";
+export * from "./storage";

package/dist/util/storage.d.ts

@@ -9,7 +9,7 @@ interface ResolveFilenameStringParams<M extends object> {
     file: File;
     propertyKey: string;
 }
-export declare function resolveFilenameString<M extends object>({ input, storage, values, entityId, path, property, file, propertyKey }: ResolveFilenameStringParams<M>): Promise<string>;
+export declare function resolveStorageFilenameString<M extends object>({ input, storage, values, entityId, path, property, file, propertyKey }: ResolveFilenameStringParams<M>): Promise<string>;
 interface ResolveStoragePathStringParams<M extends object> {
     input: string | ((context: UploadedFileContext) => string);
     storage: StorageConfig;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@firecms/core",
     "type": "module",
-    "version": "3.0.0-canary.102",
+    "version": "3.0.0-canary.103",
     "description": "Awesome Firebase/Firestore-based headless open-source CMS",
     "funding": {
         "url": "https://github.com/sponsors/firecmsco"
@@ -46,8 +46,9 @@
         "./package.json": "./package.json"
     },
     "dependencies": {
-        "@firecms/formex": "^3.0.0-canary.102",
-        "@firecms/ui": "^3.0.0-canary.102",
+        "@firecms/editor": "^3.0.0-canary.103",
+        "@firecms/formex": "^3.0.0-canary.103",
+        "@firecms/ui": "^3.0.0-canary.103",
         "@hello-pangea/dnd": "^16.6.0",
         "@radix-ui/react-portal": "^1.1.1",
         "clsx": "^2.1.1",
@@ -60,7 +61,6 @@
         "react-dropzone": "^14.2.3",
         "react-fast-compare": "^3.2.2",
         "react-image-file-resizer": "^0.4.8",
-        "react-markdown-editor-lite": "^1.3.4",
         "react-transition-group": "^4.4.5",
         "react-use-measure": "^2.1.1",
         "react-window": "^1.8.10",
@@ -100,7 +100,7 @@
         "dist",
         "src"
     ],
-    "gitHead": "db22751d03517d639f4b23a26aa1fff81b11ee8d",
+    "gitHead": "c33fe736fee99aaf30789aed66e4385563011783",
     "publishConfig": {
         "access": "public"
     },

package/src/components/EntityCollectionTable/PropertyTableCell.tsx

@@ -49,6 +49,8 @@ export interface PropertyTableCellProps<T extends CMSType> {
 }
 
 function isStorageProperty(property: ResolvedProperty) {
+    if (property.dataType === "string" && property.markdown)
+        return false;
     if (property.dataType === "string" && (property as ResolvedStringProperty).storage)
         return true;
     if (property.dataType === "array") {
@@ -147,7 +149,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any>>(
                                 onValueUpdated,
                                 data: entity,
                             });
-                        } catch (e:any) {
+                        } catch (e: any) {
                             console.error("onValueChange error", e);
                             setError(e);
                         }
@@ -306,7 +308,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any>>(
                                                          updateValue={updateValue}
                     />;
                     fullHeight = true;
-                } else if (!stringProperty.storage) {
+                } else if (stringProperty.markdown || !stringProperty.storage) {
                     const multiline = Boolean(stringProperty.multiline) || Boolean(stringProperty.markdown);
                     innerComponent = <VirtualTableInput error={validationError ?? error}
                                                         disabled={disabled}

package/src/components/EntityCollectionTable/internal/popup_field/PopupFormField.tsx

@@ -27,7 +27,7 @@ import { useCustomizationController, useFireCMSContext } from "../../../../hooks
 import { OnCellValueChangeParams } from "../../../common";
 
 interface PopupFormFieldProps<M extends Record<string, any>> {
-    entity?: Entity<M>;
+    entity: Entity<M>;
     customFieldValidator?: CustomFieldValidator;
     path: string;
     tableKey: string;
@@ -74,7 +74,7 @@ export function PopupFormFieldInternal<M extends Record<string, any>>({
         y: number
     }>();
 
-    const entityId = entityProp?.id;
+    const entityId = entityProp.id;
     const [entity, setEntity] = useState<Entity<M> | undefined>(entityProp);
     // useEffect(() => {
     //     if (entityId && inputCollection) {
@@ -217,7 +217,6 @@ export function PopupFormFieldInternal<M extends Record<string, any>>({
     if (!entity)
         return <></>;
 
-    // enableReinitialize={true}
     // eslint-disable-next-line react-hooks/rules-of-hooks
     const formex = useCreateFormex<M>({
         initialValues: (entity?.values ?? {}) as EntityValues<M>,
@@ -277,9 +276,8 @@ export function PopupFormFieldInternal<M extends Record<string, any>>({
             includeDescription: false,
             underlyingValueHasChanged: false,
             context: formContext,
-            tableMode: true,
             partOfArray: false,
-            partOfBlock: false,
+            minimalistView: false,
             autoFocus: open
         }
         : undefined;

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -306,7 +306,7 @@ export const EntityCollectionView = React.memo(
                  value,
                  property,
                  entityId
-             }) => dataSource.checkUniqueField(fullPath, name, value, entityId),
+             }) => dataSource.checkUniqueField(fullPath, name, value, entityId, collection.databaseId),
             [fullPath]);
 
         const onValueChange: OnCellValueChange<any, any> = ({
@@ -661,19 +661,19 @@ export const EntityCollectionView = React.memo(
                         collection={collection}/>}
                 />
 
-                <PopupFormField
+                {popupCell && <PopupFormField
                     key={`popup_form_${popupCell?.propertyKey}_${popupCell?.entity?.id}`}
                     open={Boolean(popupCell)}
                     onClose={onPopupClose}
                     cellRect={popupCell?.cellRect}
                     propertyKey={popupCell?.propertyKey}
                     collection={collection}
-                    entity={popupCell?.entity}
+                    entity={popupCell.entity}
                     tableKey={tableKey.current}
                     customFieldValidator={uniqueFieldValidator}
                     path={resolvedFullPath}
                     onCellValueChange={onValueChange}
-                    container={containerRef.current}/>
+                    container={containerRef.current}/>}
 
                 {deleteEntityClicked &&
                     <DeleteEntityDialog

package/src/components/common/useTableSearchHelper.ts

@@ -28,6 +28,7 @@ export function useTableSearchHelper<M extends Record<string, any>>({
     const props = {
         context,
         path: fullPath,
+        databaseId: collection.databaseId,
         collection,
         parentCollectionIds
     };

package/src/core/DefaultDrawer.tsx

@@ -78,7 +78,7 @@ export function DefaultDrawer({
 
                 <DrawerLogo logo={logo}/>
 
-                <div className={"overflow-scroll no-scrollbar"}>
+                <div className={"flex-grow overflow-scroll no-scrollbar"}>
 
                     {groupsWithoutAdmin.map((group) => (
                         <React.Fragment

package/src/core/EntityEditView.tsx

@@ -482,7 +482,7 @@ export function EntityEditViewInner<M extends Record<string, any>>({
         setFieldValue: useCallback(formex.setFieldValue, []),
         values: formex.values,
         collection: resolvedCollection,
-        entityId,
+        entityId: entityId as string,
         path,
         save,
         formex
@@ -677,7 +677,7 @@ export function EntityEditViewInner<M extends Record<string, any>>({
                                                                         name,
                                                                         value,
                                                                         property
-                                                                    }) => dataSource.checkUniqueField(path, name, value, entityId),
+                                                                    }) => dataSource.checkUniqueField(path, name, value, entityId, collection.databaseId),
         [dataSource, path, entityId]);
 
     const validationSchema = useMemo(() => entityId
@@ -755,9 +755,8 @@ export function EntityEditViewInner<M extends Record<string, any>>({
                             includeDescription: property.description || property.longDescription,
                             underlyingValueHasChanged: underlyingValueHasChanged && !autoSave,
                             context: formContext,
-                            tableMode: false,
                             partOfArray: false,
-                            partOfBlock: false,
+                            minimalistView: false,
                             autoFocus: false
                         };
 

package/src/core/field_configs.tsx

@@ -8,7 +8,7 @@ import {
     DateTimeFieldBinding,
     KeyValueFieldBinding,
     MapFieldBinding,
-    MarkdownFieldBinding,
+    MarkdownEditorFieldBinding,
     MultiSelectBinding,
     ReferenceFieldBinding,
     RepeatFieldBinding,
@@ -77,7 +77,7 @@ export const DEFAULT_FIELD_CONFIGS: Record<string, PropertyConfig<any>> = {
         property: {
             dataType: "string",
             markdown: true,
-            Field: MarkdownFieldBinding
+            Field: MarkdownEditorFieldBinding
         }
     },
     url: {

package/src/form/PropertyFieldBinding.tsx

@@ -78,9 +78,8 @@ function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Rec
      includeDescription,
      underlyingValueHasChanged,
      disabled,
-     tableMode,
      partOfArray,
-     partOfBlock,
+     minimalistView,
      autoFocus,
      index,
  }: PropertyFieldBindingProps<T, M>): ReactElement<PropertyFieldBindingProps<T, M>> {
@@ -150,9 +149,8 @@ function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Rec
                     underlyingValueHasChanged,
                     context,
                     disabled,
-                    tableMode,
                     partOfArray,
-                    partOfBlock,
+                    minimalistView,
                     autoFocus
                 };
 
@@ -180,9 +178,8 @@ function FieldInternal<T extends CMSType, CustomProps, M extends Record<string,
          property,
          includeDescription,
          underlyingValueHasChanged,
-         tableMode,
          partOfArray,
-         partOfBlock,
+         minimalistView,
          autoFocus,
          context,
          disabled
@@ -243,9 +240,8 @@ function FieldInternal<T extends CMSType, CustomProps, M extends Record<string,
         property: property as ResolvedProperty<T>,
         disabled: disabled ?? false,
         underlyingValueHasChanged: underlyingValueHasChanged ?? false,
-        tableMode: tableMode ?? false,
         partOfArray: partOfArray ?? false,
-        partOfBlock: partOfBlock ?? false,
+        minimalistView: minimalistView ?? false,
         autoFocus: autoFocus ?? false,
         customProps: customFieldProps,
         context

package/src/form/field_bindings/ArrayCustomShapedFieldBinding.tsx

@@ -20,7 +20,7 @@ export function ArrayCustomShapedFieldBinding<T extends Array<any>>({
                                                                         showError,
                                                                         isSubmitting,
                                                                         setValue,
-                                                                        tableMode,
+                                                                        minimalistView,
                                                                         property,
                                                                         includeDescription,
                                                                         underlyingValueHasChanged,
@@ -55,9 +55,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">
@@ -69,14 +68,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"}>
                     {body}
                 </ExpandablePanel>}
 
-            {tableMode && body}
+            {minimalistView && body}
 
             <FieldHelperText includeDescription={includeDescription}
                              showError={showError}

package/src/form/field_bindings/ArrayOfReferencesFieldBinding.tsx

@@ -25,7 +25,7 @@ export function ArrayOfReferencesFieldBinding({
                                                   showError,
                                                   disabled,
                                                   isSubmitting,
-                                                  tableMode,
+                                                  minimalistView,
                                                   property,
                                                   includeDescription,
                                                   setValue,
@@ -130,7 +130,7 @@ export function ArrayOfReferencesFieldBinding({
     return (
         <>
 
-            {!tableMode &&
+            {!minimalistView &&
                 <ExpandablePanel
                     titleClassName={fieldBackgroundMixin}
                     className={cls("px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2", fieldBackgroundMixin)}
@@ -139,7 +139,7 @@ export function ArrayOfReferencesFieldBinding({
                     {body}
                 </ExpandablePanel>}
 
-            {tableMode && body}
+            {minimalistView && body}
 
             <FieldHelperText includeDescription={includeDescription}
                              showError={showError}

package/src/form/field_bindings/BlockFieldBinding.tsx

@@ -27,7 +27,7 @@ export function BlockFieldBinding<T extends Array<any>>({
                                                             isSubmitting,
                                                             setValue,
                                                             setFieldValue,
-                                                            tableMode,
+                                                            minimalistView,
                                                             property,
                                                             includeDescription,
                                                             underlyingValueHasChanged,
@@ -84,7 +84,7 @@ export function BlockFieldBinding<T extends Array<any>>({
 
         <>
 
-            {!tableMode &&
+            {!minimalistView &&
                 <ExpandablePanel
                     className={"px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2"}
                     initiallyExpanded={expanded}
@@ -92,7 +92,7 @@ export function BlockFieldBinding<T extends Array<any>>({
                     {body}
                 </ExpandablePanel>}
 
-            {tableMode && body}
+            {minimalistView && body}
 
             <FieldHelperText includeDescription={includeDescription}
                              showError={showError}
@@ -179,8 +179,7 @@ function BlockEntry({
             context,
             autoFocus,
             partOfArray: false,
-            partOfBlock: true,
-            tableMode: false
+            minimalistView: true
         }
         : undefined;
 
@@ -193,7 +192,7 @@ function BlockEntry({
     };
 
     return (
-        <div className={cls(paperMixin, "bg-transparent p-4 my-4 py-8")}>
+        <div className={cls(paperMixin, "bg-transparent p-2 mb-4")}>
 
             <Field
                 name={typeFieldName}

package/src/form/field_bindings/KeyValueFieldBinding.tsx

@@ -41,7 +41,7 @@ export function KeyValueFieldBinding({
                                          disabled,
                                          property,
                                          setValue,
-                                         tableMode,
+                                         minimalistView,
                                          includeDescription,
                                          underlyingValueHasChanged,
                                          autoFocus,
@@ -71,11 +71,11 @@ export function KeyValueFieldBinding({
     return (
         <>
 
-            {!tableMode && <ExpandablePanel initiallyExpanded={expanded}
-                                            title={title}
-                                            className={"px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2"}>{mapFormView}</ExpandablePanel>}
+            {!minimalistView && <ExpandablePanel initiallyExpanded={expanded}
+                                                 title={title}
+                                                 className={"px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2"}>{mapFormView}</ExpandablePanel>}
 
-            {tableMode && mapFormView}
+            {minimalistView && mapFormView}
 
             <FieldHelperText includeDescription={includeDescription}
                              showError={showError}

package/src/form/field_bindings/MapFieldBinding.tsx

@@ -29,8 +29,7 @@ export function MapFieldBinding({
                                     error,
                                     disabled,
                                     property,
-                                    partOfBlock,
-                                    tableMode,
+                                    minimalistView,
                                     includeDescription,
                                     underlyingValueHasChanged,
                                     autoFocus,
@@ -70,9 +69,8 @@ export function MapFieldBinding({
                             includeDescription,
                             underlyingValueHasChanged,
                             context,
-                            tableMode: false,
                             partOfArray: false,
-                            partOfBlock: false,
+                            minimalistView: false,
                             autoFocus: autoFocus && index === 0
                         };
 
@@ -102,11 +100,11 @@ export function MapFieldBinding({
     return (
         <ErrorBoundary>
 
-            {!tableMode && !partOfBlock && <ExpandablePanel initiallyExpanded={expanded}
-                                                            className={"px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2 bg-slate-50 bg-opacity-50 dark:bg-gray-900"}
-                                                            title={title}>{mapFormView}</ExpandablePanel>}
+            {!minimalistView && !minimalistView && <ExpandablePanel initiallyExpanded={expanded}
+                                                                 className={"px-2 md:px-4 pb-2 md:pb-4 pt-1 md:pt-2 bg-slate-50 bg-opacity-50 dark:bg-gray-900"}
+                                                                 title={title}>{mapFormView}</ExpandablePanel>}
 
-            {(tableMode || partOfBlock) && mapFormView}
+            {(minimalistView || minimalistView) && mapFormView}
 
             <FieldHelperText includeDescription={includeDescription}
                              showError={showError ?? false}