@firecms/core 3.0.0-canary.50 → 3.0.0-canary.52

package/dist/types/navigation.d.ts

@@ -47,9 +47,9 @@ export type NavigationController<EC extends EntityCollection = EntityCollection<
      * Get the collection configuration for a given path.
      * The collection is resolved from the given path or alias.
      */
-    getCollection: (pathOrId: string, entityId?: string, includeUserOverride?: boolean) => EC | undefined;
+    getCollection: (pathOrId: string, includeUserOverride?: boolean) => EC | undefined;
     /**
-     * Get the collection configuration from its parent path segments.
+     * Get the collection configuration from its parent ids.
      */
     getCollectionFromIds: (ids: string[]) => EC | undefined;
     /**

package/dist/util/icon_synonyms.d.ts

@@ -280,7 +280,6 @@ export declare const iconSynonyms: {
     cast: string;
     cast_connected: string;
     cast_for_education: string;
-    catching_pokemon: string;
     category: string;
     celebration: string;
     cell_tower: string;
@@ -381,10 +380,6 @@ export declare const iconSynonyms: {
     credit_score: string;
     crib: string;
     crop: string;
-    crop_169: string;
-    crop_32: string;
-    crop_54: string;
-    crop_75: string;
     crop_din: string;
     crop_free: string;
     crop_landscape: string;
@@ -419,7 +414,6 @@ export declare const iconSynonyms: {
     delete_forever: string;
     delete_outline: string;
     delete_sweep: string;
-    delivery_dining: string;
     density_large: string;
     density_medium: string;
     density_small: string;
@@ -524,10 +518,6 @@ export declare const iconSynonyms: {
     edit_road: string;
     egg: string;
     egg_alt: string;
-    eighteen_mp: string;
-    eight_k: string;
-    eight_mp: string;
-    eightteen_mp: string;
     eject: string;
     elderly: string;
     elderly_woman: string;
@@ -540,7 +530,6 @@ export declare const iconSynonyms: {
     electric_rickshaw: string;
     electric_scooter: string;
     elevator: string;
-    eleven_mp: string;
     email: string;
     e_mobiledata: string;
     emoji_emotions: string;
@@ -580,7 +569,6 @@ export declare const iconSynonyms: {
     extension: string;
     extension_off: string;
     face: string;
-    facebook: string;
     face_retouching_natural: string;
     face_retouching_off: string;
     fact_check: string;
@@ -604,7 +592,6 @@ export declare const iconSynonyms: {
     fiber_new: string;
     fiber_pin: string;
     fiber_smart_record: string;
-    fifteen_mp: string;
     file_copy: string;
     file_download: string;
     file_download_done: string;
@@ -641,14 +628,8 @@ export declare const iconSynonyms: {
     fire_extinguisher: string;
     fireplace: string;
     first_page: string;
-    fitbit: string;
     fitness_center: string;
     fit_screen: string;
-    five_g: string;
-    five_k: string;
-    five_k_plus: string;
-    five_mp: string;
-    fivteen_mp: string;
     flag: string;
     flag_circle: string;
     flaky: string;
@@ -717,11 +698,6 @@ export declare const iconSynonyms: {
     forward_5: string;
     forward_to_inbox: string;
     foundation: string;
-    four_g_mobiledata: string;
-    four_g_plus_mobiledata: string;
-    four_k: string;
-    four_mp: string;
-    fourteen_mp: string;
     free_breakfast: string;
     fullscreen: string;
     fullscreen_exit: string;
@@ -737,10 +713,8 @@ export declare const iconSynonyms: {
     gif_box: string;
     girl: string;
     gite: string;
-    git_hub: string;
     g_mobiledata: string;
     golf_course: string;
-    google: string;
     gpp_bad: string;
     gpp_good: string;
     gpp_maybe: string;
@@ -753,8 +727,6 @@ export declare const iconSynonyms: {
     grain: string;
     graphic_eq: string;
     grass: string;
-    grid3x3: string;
-    grid4x4: string;
     grid_goldenratio: string;
     grid_off: string;
     grid_on: string;
@@ -799,7 +771,6 @@ export declare const iconSynonyms: {
     hide_image: string;
     hide_source: string;
     highlight: string;
-    highlight_alt: string;
     highlight_off: string;
     high_quality: string;
     hiking: string;
@@ -859,14 +830,12 @@ export declare const iconSynonyms: {
     insert_page_break: string;
     insert_photo: string;
     insights: string;
-    instagram: string;
     install_desktop: string;
     install_mobile: string;
     integration_instructions: string;
     interests: string;
     interpreter_mode: string;
     inventory: string;
-    inventory2: string;
     invert_colors: string;
     invert_colors_off: string;
     ios_share: string;
@@ -936,7 +905,6 @@ export declare const iconSynonyms: {
     line_weight: string;
     link: string;
     linked_camera: string;
-    linked_in: string;
     link_off: string;
     liquor: string;
     list: string;
@@ -1065,7 +1033,6 @@ export declare const iconSynonyms: {
     monochrome_photos: string;
     mood: string;
     mood_bad: string;
-    moped: string;
     more: string;
     more_horiz: string;
     more_time: string;
@@ -1113,13 +1080,8 @@ export declare const iconSynonyms: {
     nightlight_round: string;
     night_shelter: string;
     nights_stay: string;
-    nine_k: string;
-    nine_k_plus: string;
-    nine_mp: string;
-    nineteen_mp: string;
     no_accounts: string;
     no_backpack: string;
-    no_cell: string;
     no_drinks: string;
     no_encryption: string;
     no_encryption_gmailerrorred: string;
@@ -1157,9 +1119,6 @@ export declare const iconSynonyms: {
     oil_barrel: string;
     ondemand_video: string;
     on_device_training: string;
-    one_k: string;
-    one_kk: string;
-    one_k_plus: string;
     online_prediction: string;
     opacity: string;
     open_in_browser: string;
@@ -1181,13 +1140,9 @@ export declare const iconSynonyms: {
     panorama: string;
     panorama_fish_eye: string;
     panorama_horizontal: string;
-    panorama_horizontal_select: string;
     panorama_photosphere: string;
-    panorama_photosphere_select: string;
     panorama_vertical: string;
-    panorama_vertical_select: string;
     panorama_wide_angle: string;
-    panorama_wide_angle_select: string;
     pan_tool: string;
     paragliding: string;
     park: string;
@@ -1271,16 +1226,11 @@ export declare const iconSynonyms: {
     pin: string;
     pinch: string;
     pin_drop: string;
-    pinterest: string;
     pivot_table_chart: string;
-    pix: string;
     place: string;
     plagiarism: string;
     play_arrow: string;
     play_circle: string;
-    play_circle_filled: string;
-    play_circle_filled_white: string;
-    play_circle_outline: string;
     play_disabled: string;
     play_for_work: string;
     play_lesson: string;
@@ -1353,7 +1303,6 @@ export declare const iconSynonyms: {
     recommend: string;
     record_voice_over: string;
     rectangle: string;
-    reddit: string;
     redeem: string;
     redo: string;
     reduce_capacity: string;
@@ -1496,10 +1445,6 @@ export declare const iconSynonyms: {
     settings_suggest: string;
     settings_system_daydream: string;
     settings_voice: string;
-    seven_k: string;
-    seven_k_plus: string;
-    seven_mp: string;
-    seventeen_mp: string;
     share: string;
     share_location: string;
     shield: string;
@@ -1522,19 +1467,13 @@ export declare const iconSynonyms: {
     signal_cellular_4_bar: string;
     signal_cellular_alt: string;
     signal_cellular_connected_no_internet_0_bar: string;
-    signal_cellular_connected_no_internet_1_bar: string;
-    signal_cellular_connected_no_internet_2_bar: string;
-    signal_cellular_connected_no_internet_3_bar: string;
     signal_cellular_connected_no_internet_4_bar: string;
     signal_cellular_nodata: string;
     signal_cellular_no_sim: string;
     signal_cellular_null: string;
     signal_cellular_off: string;
     signal_wifi_bad: string;
-    signal_wifi_connected_no_internet4: string;
     signal_wifi_off: string;
-    signal_wifi_statusbar4_bar: string;
-    signal_wifi_statusbar_connected_no_internet4: string;
     signal_wifi_statusbar_null: string;
     signpost: string;
     sim_card: string;
@@ -1542,12 +1481,6 @@ export declare const iconSynonyms: {
     sim_card_download: string;
     single_bed: string;
     sip: string;
-    six_k: string;
-    six_k_plus: string;
-    six_mp: string;
-    sixteen_mp: string;
-    sixty_fps: string;
-    sixty_fps_select: string;
     skateboarding: string;
     skip_next: string;
     skip_previous: string;
@@ -1618,10 +1551,8 @@ export declare const iconSynonyms: {
     stairs: string;
     star: string;
     star_border: string;
-    star_border_purple_500: string;
     star_half: string;
     star_outline: string;
-    star_purple_500: string;
     star_rate: string;
     stars: string;
     start: string;
@@ -1709,8 +1640,6 @@ export declare const iconSynonyms: {
     task: string;
     task_alt: string;
     taxi_alert: string;
-    telegram: string;
-    ten_mp: string;
     terminal: string;
     terrain: string;
     text_decrease: string;
@@ -1730,16 +1659,6 @@ export declare const iconSynonyms: {
     theaters: string;
     thermostat: string;
     thermostat_auto: string;
-    thirteen_mp: string;
-    thirty_fps: string;
-    thirty_fps_select: string;
-    three_d_rotation: string;
-    three_g_mobiledata: string;
-    three_k: string;
-    three_k_plus: string;
-    three_mp: string;
-    three_p: string;
-    three_sixty: string;
     thumb_down: string;
     thumb_down_alt: string;
     thumb_down_off_alt: string;
@@ -1755,7 +1674,6 @@ export declare const iconSynonyms: {
     timer_3: string;
     timer_3_select: string;
     timer_off: string;
-    times_one_mobiledata: string;
     time_to_leave: string;
     tips_and_updates: string;
     title: string;
@@ -1799,16 +1717,6 @@ export declare const iconSynonyms: {
     turn_slight_right: string;
     tv: string;
     tv_off: string;
-    twelve_mp: string;
-    twenty_four_mp: string;
-    twenty_one_mp: string;
-    twenty_three_mp: string;
-    twenty_two_mp: string;
-    twenty_zero_mp: string;
-    twitter: string;
-    two_k: string;
-    two_k_plus: string;
-    two_mp: string;
     two_wheeler: string;
     umbrella: string;
     unarchive: string;
@@ -1938,7 +1846,6 @@ export declare const iconSynonyms: {
     wrong_location: string;
     wysiwyg: string;
     yard: string;
-    you_tube: string;
     youtube_searched_for: string;
     zoom_in: string;
     zoom_in_map: string;

package/dist/util/resolutions.d.ts

@@ -1,5 +1,5 @@
 import { ArrayProperty, CMSType, EntityCollection, EntityCustomView, EntityValues, EnumValueConfig, EnumValues, NumberProperty, PropertiesOrBuilders, PropertyConfig, PropertyOrBuilder, ResolvedArrayProperty, ResolvedEntityCollection, ResolvedNumberProperty, ResolvedProperties, ResolvedProperty, ResolvedStringProperty, StringProperty, UserConfigurationPersistence } from "../types";
-export declare const resolveCollection: <M extends Record<string, any>>({ collection, path, entityId, values, previousValues, userConfigPersistence, fields }: {
+export declare const resolveCollection: <M extends Record<string, any>>({ collection, path, entityId, values, previousValues, userConfigPersistence, fields, ignoreMissingFields }: {
     collection: EntityCollection<M> | ResolvedEntityCollection<M>;
     path: string;
     entityId?: string;
@@ -7,13 +7,14 @@ export declare const resolveCollection: <M extends Record<string, any>>({ collec
     previousValues?: Partial<EntityValues<M>>;
     userConfigPersistence?: UserConfigurationPersistence;
     fields?: Record<string, PropertyConfig>;
+    ignoreMissingFields?: boolean;
 }) => ResolvedEntityCollection<M>;
 /**
  * Resolve property builders, enums and arrays.
  * @param propertyOrBuilder
  * @param propertyValue
  */
-export declare function resolveProperty<T extends CMSType = CMSType, M extends Record<string, any> = any>({ propertyOrBuilder, fromBuilder, ...props }: {
+export declare function resolveProperty<T extends CMSType = CMSType, M extends Record<string, any> = any>({ propertyOrBuilder, fromBuilder, ignoreMissingFields, ...props }: {
     propertyKey?: string;
     propertyOrBuilder: PropertyOrBuilder<T, M> | ResolvedProperty<T>;
     values?: Partial<M>;
@@ -23,8 +24,9 @@ export declare function resolveProperty<T extends CMSType = CMSType, M extends R
     index?: number;
     fromBuilder?: boolean;
     fields?: Record<string, PropertyConfig<any>>;
+    ignoreMissingFields?: boolean;
 }): ResolvedProperty<T> | null;
-export declare function resolveArrayProperty<T extends any[], M>({ propertyKey, property, ...props }: {
+export declare function resolveArrayProperty<T extends any[], M>({ propertyKey, property, ignoreMissingFields, ...props }: {
     propertyKey?: string;
     property: ArrayProperty<T> | ResolvedArrayProperty<T>;
     values?: Partial<M>;
@@ -34,13 +36,14 @@ export declare function resolveArrayProperty<T extends any[], M>({ propertyKey,
     index?: number;
     fromBuilder?: boolean;
     fields?: Record<string, PropertyConfig>;
+    ignoreMissingFields?: boolean;
 }): ResolvedArrayProperty;
 /**
  * Resolve enums and arrays for properties
  * @param properties
  * @param value
  */
-export declare function resolveProperties<M extends Record<string, any>>({ properties, ...props }: {
+export declare function resolveProperties<M extends Record<string, any>>({ properties, ignoreMissingFields, ...props }: {
     properties: PropertiesOrBuilders<M>;
     values?: Partial<M>;
     previousValues?: Partial<M>;
@@ -49,6 +52,7 @@ export declare function resolveProperties<M extends Record<string, any>>({ prope
     index?: number;
     fromBuilder?: boolean;
     fields?: Record<string, PropertyConfig>;
+    ignoreMissingFields?: boolean;
 }): ResolvedProperties<M>;
 /**
  * Resolve enum aliases for a string or number property

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@firecms/core",
     "type": "module",
-    "version": "3.0.0-canary.50",
+    "version": "3.0.0-canary.52",
     "description": "Awesome Firebase/Firestore-based headless open-source CMS",
     "funding": {
         "url": "https://github.com/sponsors/firecmsco"
@@ -46,8 +46,8 @@
         "./package.json": "./package.json"
     },
     "dependencies": {
-        "@firecms/formex": "^3.0.0-canary.50",
-        "@firecms/ui": "^3.0.0-canary.50",
+        "@firecms/formex": "^3.0.0-canary.52",
+        "@firecms/ui": "^3.0.0-canary.52",
         "@fontsource/jetbrains-mono": "^5.0.20",
         "@hello-pangea/dnd": "^16.6.0",
         "@radix-ui/react-portal": "^1.0.4",
@@ -111,7 +111,7 @@
         "dist",
         "src"
     ],
-    "gitHead": "e5d125d95a0c858bbcc9a57acc1adb3b61c64f23",
+    "gitHead": "f48ab87b5a5ad7f68ee4093aa1d624b0bddd7589",
     "publishConfig": {
         "access": "public"
     },

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -66,11 +66,7 @@ import {
 } from "../common";
 import { PopupFormField } from "../EntityCollectionTable/internal/popup_field/PopupFormField";
 import { GetPropertyForProps } from "../EntityCollectionTable/EntityCollectionTableProps";
-import {
-    copyEntityAction,
-    deleteEntityAction,
-    editEntityAction
-} from "../EntityCollectionTable/internal/default_entity_actions";
+import { copyEntityAction, deleteEntityAction, editEntityAction } from "../common/default_entity_actions";
 import { DeleteEntityDialog } from "../DeleteEntityDialog";
 import { useAnalyticsController } from "../../hooks/useAnalyticsController";
 import { useSelectionController } from "./useSelectionController";
@@ -417,7 +413,7 @@ export const EntityCollectionView = React.memo(
                     Builder: ({ entity }) => {
                         const collectionsWithPath = navigation.getParentReferencesFromPath(entity.path);
                         return (
-                            <>
+                            <div className={"flex flex-col gap-2 w-full"}>
                                 {collectionsWithPath.map((reference) => {
                                     return (
                                         <ReferencePreview
@@ -426,7 +422,7 @@ export const EntityCollectionView = React.memo(
                                             size={"tiny"}/>
                                     );
                                 })}
-                            </>
+                            </div>
                         );
                     }
                 }]

package/src/components/EntityView.tsx

@@ -31,7 +31,7 @@ export function EntityView<M extends Record<string, any>>(
         entityId: entity.id,
         values: entity.values,
         fields: customizationController.propertyConfigs
-    }), [collection, path, entity]);
+    }), [collection, path, entity, customizationController.propertyConfigs]);
 
     const properties: ResolvedProperties = resolvedCollection.properties;
 

package/src/components/PropertyIdCopyTooltipContent.tsx

@@ -1,4 +1,4 @@
-import { ContentPasteIcon, IconButton, Typography } from "@firecms/ui";
+import { ContentCopyIcon, IconButton, Typography } from "@firecms/ui";
 import { useCallback, useState } from "react";
 
 export function PropertyIdCopyTooltipContent({ propertyId }: { propertyId: string }) {
@@ -12,9 +12,8 @@ export function PropertyIdCopyTooltipContent({ propertyId }: { propertyId: strin
                             color={"disabled"}>{copied ? "Copied" : "Property ID"}</Typography>
                 <Typography variant={"caption"} className={"text-white"}><code>{propertyId}</code></Typography>
             </div>
-            {/*    Copy to clipboard button*/}
             <IconButton size={"small"}>
-                <ContentPasteIcon size={"smallest"}
+                <ContentCopyIcon size={"smallest"}
                                   className={"text-white"}
                                   onClick={useCallback(() => {
                                       navigator.clipboard.writeText(propertyId);

package/src/components/ReferenceWidget.tsx

@@ -122,7 +122,7 @@ export function ReferenceWidget<M extends Record<string, any>>({
             size={size}/>
 
     }
-    return <div className={cn("text-sm font-medium text-gray-500",
+    return <div className={cn("text-sm font-medium",
         "min-w-80 flex flex-col gap-4",
         "relative transition-colors duration-200 ease-in rounded font-medium",
         disabled ? "bg-opacity-50" : "hover:bg-opacity-75",

package/src/components/{EntityCollectionTable/internal → common}/default_entity_actions.tsx

@@ -1,6 +1,6 @@
-import { EntityAction } from "../../../types";
 import { ArchiveIcon, DeleteIcon, FileCopyIcon, KeyboardTabIcon, OpenInNewIcon } from "@firecms/ui";
-import { DeleteEntityDialog } from "../../DeleteEntityDialog";
+import { EntityAction } from "../../types";
+import { DeleteEntityDialog } from "../DeleteEntityDialog";
 
 export const editEntityAction: EntityAction = {
     icon: <KeyboardTabIcon/>,

package/src/components/common/index.ts

@@ -3,3 +3,4 @@ export * from "./useDebouncedData";
 export * from "./useColumnsIds";
 export * from "./useDataSourceEntityCollectionTableController";
 export * from "./useTableSearchHelper";
+export * from "./default_entity_actions";

package/src/components/common/types.tsx

@@ -1,4 +1,4 @@
-import { CollectionSize, FireCMSContext, ResolvedProperty, SelectedCellProps } from "../../types";
+import { CollectionSize, ResolvedProperty, SelectedCellProps } from "../../types";
 
 export type EntityCollectionTableController<M extends Record<string, any>> = {
 

package/src/components/common/useColumnsIds.tsx

@@ -7,8 +7,16 @@ const COLLECTION_GROUP_PARENT_ID = "collectionGroupParent";
 
 export function useColumnIds<M extends Record<string, any>>(collection: ResolvedEntityCollection<M>, includeSubcollections: boolean): PropertyColumnConfig[] {
     return useMemo(() => {
-        if (collection.propertiesOrder)
-            return hideAndExpandKeys(collection, collection.propertiesOrder);
+        if (collection.propertiesOrder) {
+            const propertyColumnConfigs = hideAndExpandKeys(collection, collection.propertiesOrder);
+            if (collection.collectionGroup) {
+                propertyColumnConfigs.push({
+                    key: COLLECTION_GROUP_PARENT_ID,
+                    disabled: true
+                });
+            }
+            return propertyColumnConfigs;
+        }
         return getDefaultColumnKeys(collection, includeSubcollections);
     }, [collection, includeSubcollections]);
 }

package/src/core/Drawer.tsx

@@ -2,31 +2,37 @@ import React, { useCallback } from "react";
 
 import { useLargeLayout, useNavigationController } from "../hooks";
 
-import { NavLink, useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { CMSAnalyticsEvent, TopNavigationEntry, TopNavigationResult } from "../types";
 import { IconForView } from "../util";
 import { cn, IconButton, Menu, MenuItem, MoreVertIcon, Tooltip, Typography } from "@firecms/ui";
 import { useAnalyticsController } from "../hooks/useAnalyticsController";
+import { useDrawer } from "./Scaffold";
+import { DrawerNavigationItem } from "./DrawerNavigationItem";
 
 /**
  * Props used in case you need to override the default drawer
  * @group Core
  */
-export type DrawerProps<T = {}> = T & {
+export type DrawerProps = {
     hovered: boolean,
     drawerOpen: boolean,
-    closeDrawer: () => any,
+    openDrawer: () => void,
+    closeDrawer: () => void,
+    autoOpenDrawer?: boolean
 }
 
 /**
  * Default drawer used in the CMS
  * @group Core
  */
-export function Drawer({
-                           hovered,
-                           drawerOpen,
-                           closeDrawer
-                       }: DrawerProps) {
+export function Drawer() {
+
+    const {
+        hovered,
+        drawerOpen,
+        closeDrawer,
+    } = useDrawer();
 
     const analyticsController = useAnalyticsController();
     const navigation = useNavigationController();
@@ -131,61 +137,3 @@ export function Drawer({
         </>
     );
 }
-
-export function DrawerNavigationItem({
-                                         name,
-                                         icon,
-                                         drawerOpen,
-                                         tooltipsOpen,
-                                         url,
-                                         onClick
-                                     }: {
-    icon: React.ReactElement,
-    name: string,
-    tooltipsOpen: boolean,
-    drawerOpen: boolean,
-    url: string,
-    onClick?: () => void,
-}) {
-
-    const iconWrap = <div
-        className={"text-gray-600 dark:text-gray-500"}>
-        {icon}
-    </div>;
-
-    const listItem = <NavLink
-        onClick={onClick}
-        style={{
-            width: !drawerOpen ? "72px" : "280px",
-            transition: drawerOpen ? "width 150ms ease-in" : undefined
-        }}
-        className={({ isActive }: any) => cn("rounded-r-xl truncate",
-            "hover:bg-slate-300 hover:bg-opacity-75 dark:hover:bg-gray-700 dark:hover:bg-opacity-75 text-gray-800 dark:text-gray-200 hover:text-gray-900 hover:dark:text-white",
-            "flex flex-row items-center mr-8",
-            // "transition-all ease-in-out delay-100 duration-300",
-            // drawerOpen ? "w-full" : "w-18",
-            drawerOpen ? "pl-8 h-12" : "pl-6 h-11",
-            "font-medium text-sm",
-            isActive ? "bg-slate-200 bg-opacity-75 dark:bg-gray-800" : ""
-        )}
-        to={url}
-    >
-
-        {iconWrap}
-
-        <div
-            className={cn(
-                drawerOpen ? "opacity-100" : "opacity-0 hidden",
-                "ml-4 font-inherit text-inherit"
-            )}>
-            {name.toUpperCase()}
-        </div>
-    </NavLink>;
-
-    return <Tooltip
-        open={drawerOpen ? false : tooltipsOpen}
-        side="right"
-        title={name}>
-        {listItem}
-    </Tooltip>;
-}