@firecms/core 3.0.0-canary.118 → 3.0.0-canary.119

package/dist/types/datasource.d.ts

@@ -177,6 +177,10 @@ export interface DataSourceDelegate {
      * If the data source has been initialised
      */
     initialised?: boolean;
+    /**
+     * If the user is authenticated to use the data source
+     */
+    authenticated?: boolean;
     /**
      * Fetch data from a collection
      * @param path

package/dist/types/properties.d.ts

@@ -8,7 +8,7 @@ import { ChipColorKey, ChipColorScheme } from "@firecms/ui";
 /**
  * @group Entity properties
  */
-export type DataType<T extends CMSType = CMSType> = T extends string ? "string" : T extends number ? "number" : T extends boolean ? "boolean" : T extends Date ? "date" : T extends GeoPoint ? "geopoint" : T extends Vector ? "vector" : T extends EntityReference ? "reference" : T extends Array<CMSType> ? "array" : T extends Record<string, any> ? "map" : never;
+export type DataType<T extends CMSType = CMSType> = T extends string ? "string" : T extends number ? "number" : T extends boolean ? "boolean" : T extends Date ? "date" : T extends GeoPoint ? "geopoint" : T extends Vector ? "vector" : T extends EntityReference ? "reference" : T extends Array<CMSType> ? "array" : T extends Record<string, CMSType> ? "map" : never;
 /**
  * @group Entity properties
  */

package/dist/util/resolutions.d.ts

@@ -26,6 +26,19 @@ export declare function resolveProperty<T extends CMSType = CMSType, M extends R
     fields?: Record<string, PropertyConfig<any>>;
     ignoreMissingFields?: boolean;
 }): ResolvedProperty<T> | null;
+export declare function getArrayResolvedProperties<M>({ propertyKey, propertyValue, property, ...props }: {
+    propertyValue: any;
+    propertyKey?: string;
+    property: ArrayProperty<any> | ResolvedArrayProperty<any>;
+    ignoreMissingFields: boolean;
+    values?: Partial<M>;
+    previousValues?: Partial<M>;
+    path?: string;
+    entityId?: string;
+    index?: number;
+    fromBuilder?: boolean;
+    fields?: Record<string, PropertyConfig>;
+}): ResolvedProperty[];
 export declare function resolveArrayProperty<T extends any[], M>({ propertyKey, property, ignoreMissingFields, ...props }: {
     propertyKey?: string;
     property: ArrayProperty<T> | ResolvedArrayProperty<T>;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@firecms/core",
     "type": "module",
-    "version": "3.0.0-canary.118",
+    "version": "3.0.0-canary.119",
     "description": "Awesome Firebase/Firestore-based headless open-source CMS",
     "funding": {
         "url": "https://github.com/sponsors/firecmsco"
@@ -46,9 +46,9 @@
         "./package.json": "./package.json"
     },
     "dependencies": {
-        "@firecms/editor": "^3.0.0-canary.118",
-        "@firecms/formex": "^3.0.0-canary.118",
-        "@firecms/ui": "^3.0.0-canary.118",
+        "@firecms/editor": "^3.0.0-canary.119",
+        "@firecms/formex": "^3.0.0-canary.119",
+        "@firecms/ui": "^3.0.0-canary.119",
         "@hello-pangea/dnd": "^16.6.0",
         "@radix-ui/react-portal": "^1.1.1",
         "clsx": "^2.1.1",
@@ -100,7 +100,7 @@
         "dist",
         "src"
     ],
-    "gitHead": "91168e34bae600c45320b3092a153bc4d60d0018",
+    "gitHead": "22e1ffb78b12816a576df70e3aa7df1ee29e26ad",
     "publishConfig": {
         "access": "public"
     },

package/src/components/VirtualTable/fields/VirtualTableSelect.tsx

@@ -82,8 +82,6 @@ export function VirtualTableSelect(props: {
                 className="w-full h-full p-0 bg-transparent"
                 position={"item-aligned"}
                 disabled={disabled}
-                padding={false}
-                includeFocusOutline={false}
                 value={validValue
                     ? ((internalValue as any[]).map(v => v.toString()))
                     : ([])}

package/src/core/DefaultDrawer.tsx

@@ -30,15 +30,15 @@ export function DefaultDrawer({
         logo
     } = useApp();
 
+    const [adminMenuOpen, setAdminMenuOpen] = React.useState(false);
+
     const analyticsController = useAnalyticsController();
     const navigation = useNavigationController();
 
-    const tooltipsOpen = drawerHovered && !drawerOpen;
+    const tooltipsOpen = drawerHovered && !drawerOpen && !adminMenuOpen;
     const largeLayout = useLargeLayout();
     const navigate = useNavigate();
 
-    const [adminMenuOpen, setAdminMenuOpen] = React.useState(false);
-
     if (!navigation.topLevelNavigation)
         throw Error("Navigation not ready in Drawer");
 
@@ -91,6 +91,7 @@ export function DefaultDrawer({
                                         key={`navigation_${index}`}
                                         icon={<IconForView collectionOrView={view.collection ?? view.view}/>}
                                         tooltipsOpen={tooltipsOpen}
+                                        adminMenuOpen={adminMenuOpen}
                                         drawerOpen={drawerOpen}
                                         onClick={() => onClick(view)}
                                         url={view.url}
@@ -101,6 +102,7 @@ export function DefaultDrawer({
                 </div>
 
                 {adminViews.length > 0 && <Menu
+                    side={"right"}
                     open={adminMenuOpen}
                     onOpenChange={setAdminMenuOpen}
                     trigger={

package/src/core/DrawerNavigationItem.tsx

@@ -7,6 +7,7 @@ export function DrawerNavigationItem({
                                          name,
                                          icon,
                                          drawerOpen,
+                                         adminMenuOpen,
                                          tooltipsOpen,
                                          url,
                                          onClick
@@ -15,6 +16,7 @@ export function DrawerNavigationItem({
     name: string,
     tooltipsOpen: boolean,
     drawerOpen: boolean,
+    adminMenuOpen?: boolean,
     url: string,
     onClick?: () => void,
 }) {
@@ -56,7 +58,7 @@ export function DrawerNavigationItem({
     </div>;
 
     return <Tooltip
-        open={drawerOpen ? false : tooltipsOpen}
+        open={drawerOpen || adminMenuOpen ? false : tooltipsOpen}
         side="right"
         title={name}>
         {listItem}

package/src/form/field_bindings/MapFieldBinding.tsx

@@ -54,7 +54,7 @@ export function MapFieldBinding({
             {Object.entries(mapProperties)
                 .filter(([_, property]) => !isHidden(property))
                 .map(([entryKey, childProperty], index) => {
-                        const fieldProps = {
+                        const fieldBindingProps = {
                             propertyKey: `${propertyKey}.${entryKey}`,
                             disabled,
                             property: childProperty,
@@ -70,7 +70,7 @@ export function MapFieldBinding({
                             <div key={`map-${propertyKey}-${index}`}>
                                 <ErrorBoundary>
                                     <PropertyFieldBinding
-                                        {...fieldProps}/>
+                                        {...fieldBindingProps}/>
                                 </ErrorBoundary>
                             </div>
                         );

package/src/form/field_bindings/RepeatFieldBinding.tsx

@@ -2,7 +2,7 @@ import React, { useState } from "react";
 import { CMSType, FieldProps, ResolvedProperty } from "../../types";
 import { FieldHelperText, FormikArrayContainer, LabelWithIconAndTooltip } from "../components";
 import { ErrorBoundary } from "../../components";
-import { getDefaultValueFor, getIconForProperty } from "../../util";
+import { getArrayResolvedProperties, getDefaultValueFor, getIconForProperty } from "../../util";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
 import { ExpandablePanel, Typography } from "@firecms/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";
@@ -34,8 +34,17 @@ export function RepeatFieldBinding<T extends Array<any>>({
     if (!property.of)
         throw Error("RepeatFieldBinding misconfiguration. Property `of` not set");
 
-    if (!property.resolvedProperties || !Array.isArray(property.resolvedProperties))
-        throw Error("RepeatFieldBinding - Internal error: Expected array in 'property.resolvedProperties'");
+    let resolvedProperties = property.resolvedProperties;
+    if (!resolvedProperties) {
+        resolvedProperties = getArrayResolvedProperties({
+            propertyValue: value,
+            propertyKey,
+            property,
+            ignoreMissingFields: false
+        })
+    }
+    // if (!resolvedProperties || !Array.isArray(resolvedProperties))
+    //     throw Error("RepeatFieldBinding - Internal error: Expected array in 'property.resolvedProperties'");
 
     const expanded = property.expanded === undefined ? true : property.expanded;
     const ofProperty: ResolvedProperty<CMSType[]> = property.of as ResolvedProperty<CMSType[]>;
@@ -49,7 +58,7 @@ export function RepeatFieldBinding<T extends Array<any>>({
     });
 
     const buildEntry = (index: number, internalId: number) => {
-        const childProperty = property.resolvedProperties[index] ?? ofProperty;
+        const childProperty = resolvedProperties[index] ?? ofProperty;
         const fieldProps = {
             propertyKey: `${propertyKey}.${index}`,
             disabled,

package/src/form/field_bindings/SelectFieldBinding.tsx

@@ -49,50 +49,51 @@ export function SelectFieldBinding<T extends EnumType>({
     return (
         <>
 
-            <PropertyIdCopyTooltip propertyKey={propertyKey}>
-                <Select
-                    size={size === "medium" ? "medium" : "small"}
-                    value={value !== undefined && value != null ? value.toString() : ""}
-                    disabled={disabled}
-                    position="item-aligned"
-                    inputClassName={cls("w-full")}
-                    label={<LabelWithIcon
-                        icon={getIconForProperty(property, "small")}
-                        required={property.validation?.required}
-                        title={property.name}
-                        className={"text-text-secondary dark:text-text-secondary-dark ml-3.5"}
-                    />}
-                    endAdornment={
-                        property.clearable && <IconButton
-                            onClick={handleClearClick}>
-                            <ClearIcon/>
-                        </IconButton>
-                    }
-                    onValueChange={(updatedValue: string) => {
-                        const newValue = updatedValue
-                            ? (property.dataType === "number" ? parseFloat(updatedValue) : updatedValue)
-                            : null;
-                        return setValue(newValue as T);
-                    }}
-                    renderValue={(enumKey: any) => {
-                        return <EnumValuesChip
-                            enumKey={enumKey}
+            <Select
+                size={size === "medium" ? "medium" : "small"}
+                value={value !== undefined && value != null ? value.toString() : ""}
+                disabled={disabled}
+                position="item-aligned"
+                inputClassName={cls("w-full")}
+                label={
+                    <PropertyIdCopyTooltip propertyKey={propertyKey}>
+                        <LabelWithIcon
+                            icon={getIconForProperty(property, "small")}
+                            required={property.validation?.required}
+                            title={property.name}
+                            className={"text-text-secondary dark:text-text-secondary-dark ml-3.5"}
+                        />
+                    </PropertyIdCopyTooltip>}
+                endAdornment={
+                    property.clearable && <IconButton
+                        onClick={handleClearClick}>
+                        <ClearIcon/>
+                    </IconButton>
+                }
+                onValueChange={(updatedValue: string) => {
+                    const newValue = updatedValue
+                        ? (property.dataType === "number" ? parseFloat(updatedValue) : updatedValue)
+                        : null;
+                    return setValue(newValue as T);
+                }}
+                renderValue={(enumKey: any) => {
+                    return <EnumValuesChip
+                        enumKey={enumKey}
+                        enumValues={enumValues}
+                        size={size}/>;
+                }}
+            >
+                {enumValues && enumValues.map((option) => {
+                    return <SelectItem
+                        key={option.id}
+                        value={String(option.id)}>
+                        <EnumValuesChip
+                            enumKey={String(option.id)}
                             enumValues={enumValues}
-                            size={size}/>;
-                    }}
-                >
-                    {enumValues && enumValues.map((option) => {
-                        return <SelectItem
-                            key={option.id}
-                            value={String(option.id)}>
-                            <EnumValuesChip
-                                enumKey={String(option.id)}
-                                enumValues={enumValues}
-                                size={size}/>
-                        </SelectItem>
-                    })}
-                </Select>
-            </PropertyIdCopyTooltip>
+                            size={size}/>
+                    </SelectItem>
+                })}
+            </Select>
 
             <FieldHelperText includeDescription={includeDescription}
                              showError={showError}

package/src/form/field_bindings/TextFieldBinding.tsx

@@ -19,7 +19,6 @@ interface TextFieldBindingProps<T extends string | number> extends FieldProps<T>
  * @group Form fields
  */
 export function TextFieldBinding<T extends string | number>({
-                                                                context,
                                                                 propertyKey,
                                                                 value,
                                                                 setValue,

package/src/form/index.tsx

@@ -34,10 +34,5 @@ export {
 
 export * from "./components";
 
-// export type { EntityFormProps } from "./EntityForm";
-// export {
-//     EntityForm
-// } from "./EntityForm";
-
 export { PropertyFieldBinding } from "./PropertyFieldBinding";
 export * from "./useClearRestoreValue";

package/src/types/datasource.ts

@@ -260,6 +260,11 @@ export interface DataSourceDelegate {
      */
     initialised?: boolean;
 
+    /**
+     * If the user is authenticated to use the data source
+     */
+    authenticated?: boolean;
+
     /**
      * Fetch data from a collection
      * @param path

package/src/types/properties.ts

@@ -18,7 +18,7 @@ export type DataType<T extends CMSType = CMSType> =
                         T extends Vector ? "vector" :
                             T extends EntityReference ? "reference" :
                                 T extends Array<CMSType> ? "array" :
-                                    T extends Record<string, any> ? "map" : never;
+                                    T extends Record<string, CMSType> ? "map" : never;
 
 /**
  * @group Entity properties

package/src/util/resolutions.ts

@@ -217,6 +217,38 @@ export function resolveProperty<T extends CMSType = CMSType, M extends Record<st
         : null;
 }
 
+export function getArrayResolvedProperties<M>({
+                                           propertyKey,
+                                           propertyValue,
+                                           property,
+                                           ...props
+                                       }: {
+    propertyValue: any,
+    propertyKey?: string,
+    property: ArrayProperty<any> | ResolvedArrayProperty<any>,
+    ignoreMissingFields: boolean,
+    values?: Partial<M>;
+    previousValues?: Partial<M>;
+    path?: string;
+    entityId?: string;
+    index?: number;
+    fromBuilder?: boolean;
+    fields?: Record<string, PropertyConfig>
+}) {
+
+    const of = property.of;
+    return Array.isArray(propertyValue)
+        ? propertyValue.map((v: any, index: number) => {
+            return resolveProperty({
+                propertyKey: `${propertyKey}.${index}`,
+                propertyOrBuilder: of,
+                ...props,
+                index
+            });
+        }).filter(e => Boolean(e)) as ResolvedProperty[]
+        : [];
+}
+
 export function resolveArrayProperty<T extends any[], M>({
                                                              propertyKey,
                                                              property,
@@ -254,17 +286,13 @@ export function resolveArrayProperty<T extends any[], M>({
             } as ResolvedArrayProperty;
         } else {
             const of = property.of;
-            const resolvedProperties: ResolvedProperty[] = Array.isArray(propertyValue)
-                ? propertyValue.map((v: any, index: number) => {
-                    return resolveProperty({
-                        propertyKey: `${propertyKey}.${index}`,
-                        propertyOrBuilder: of,
-                        ignoreMissingFields,
-                        ...props,
-                        index
-                    });
-                }).filter(e => Boolean(e)) as ResolvedProperty[]
-                : [];
+            const resolvedProperties = getArrayResolvedProperties({
+                propertyValue,
+                propertyKey,
+                property,
+                ignoreMissingFields,
+                ...props
+            });
             const ofProperty = resolveProperty({
                 propertyOrBuilder: of,
                 ignoreMissingFields,