@firecms/core 3.0.0-canary.40 → 3.0.0-canary.42

package/dist/types/navigation.d.ts

@@ -47,7 +47,7 @@ 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: (pathOrAlias: string, entityId?: string, includeUserOverride?: boolean) => EC | undefined;
+    getCollection: (pathOrId: string, entityId?: string, includeUserOverride?: boolean) => EC | undefined;
     /**
      * Get the collection configuration from its parent path segments.
      */

package/dist/util/navigation_utils.d.ts

@@ -8,10 +8,10 @@ export declare function resolveCollectionPathIds(path: string, allCollections: E
 /**
  * Find the corresponding view at any depth for a given path.
  * Note that path or segments of the paths can be collection aliases.
- * @param pathOrAlias
+ * @param pathOrId
  * @param collections
  */
-export declare function getCollectionByPathOrId(pathOrAlias: string, collections: EntityCollection[]): EntityCollection | undefined;
+export declare function getCollectionByPathOrId(pathOrId: string, collections: EntityCollection[]): EntityCollection | undefined;
 /**
  * Get the subcollection combinations from a path:
  * "sites/es/locales" => ["sites/es/locales", "sites"]

package/dist/util/resolutions.d.ts

@@ -2,11 +2,11 @@ import { ArrayProperty, CMSType, EntityCollection, EntityCustomView, EntityValue
 export declare const resolveCollection: <M extends Record<string, any>>({ collection, path, entityId, values, previousValues, userConfigPersistence, fields }: {
     collection: EntityCollection<M> | ResolvedEntityCollection<M>;
     path: string;
-    entityId?: string | undefined;
-    values?: Partial<M> | undefined;
-    previousValues?: Partial<M> | undefined;
-    userConfigPersistence?: UserConfigurationPersistence | undefined;
-    fields?: Record<string, PropertyConfig> | undefined;
+    entityId?: string;
+    values?: Partial<EntityValues<M>>;
+    previousValues?: Partial<EntityValues<M>>;
+    userConfigPersistence?: UserConfigurationPersistence;
+    fields?: Record<string, PropertyConfig>;
 }) => ResolvedEntityCollection<M>;
 /**
  * Resolve property builders, enums and arrays.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-canary.40",
+  "version": "3.0.0-canary.42",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -46,17 +46,20 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@firecms/formex": "^3.0.0-canary.40",
-    "@firecms/ui": "^3.0.0-canary.40",
+    "@firecms/formex": "^3.0.0-canary.42",
+    "@firecms/ui": "^3.0.0-canary.42",
     "@fontsource/jetbrains-mono": "^5.0.19",
-    "@fontsource/roboto": "^5.0.12",
     "@hello-pangea/dnd": "^16.5.0",
+    "@radix-ui/react-portal": "^1.0.4",
+    "clsx": "^2.1.0",
     "date-fns": "^3.6.0",
     "history": "^5.3.0",
     "js-search": "^2.0.1",
     "markdown-it": "^14.1.0",
     "notistack": "^3.0.1",
     "object-hash": "^3.0.0",
+    "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",
@@ -115,7 +118,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "40b01721ac260b6cce7f5d8a3a1d768410e7f20d",
+  "gitHead": "d6a2f28e93d3c532dd6efacfccffb91383d5330e",
   "publishConfig": {
     "access": "public"
   }

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -74,7 +74,6 @@ import { DeleteEntityDialog } from "../DeleteEntityDialog";
 import { useAnalyticsController } from "../../hooks/useAnalyticsController";
 import { useSelectionController } from "./useSelectionController";
 import { EntityCollectionViewStartActions } from "./EntityCollectionViewStartActions";
-import { ClearFilterSortButton } from "../ClearFilterSortButton";
 
 const COLLECTION_GROUP_PARENT_ID = "collectionGroupParent";
 
@@ -82,8 +81,18 @@ const COLLECTION_GROUP_PARENT_ID = "collectionGroupParent";
  * @group Components
  */
 export type EntityCollectionViewProps<M extends Record<string, any>> = {
-    fullPath: string;
+    /**
+     * Complete path where this collection is located.
+     * It defaults to the collection path if not provided.
+     */
+    fullPath?: string;
+    /**
+     * If this is a subcollection, specify the parent collection ids.
+     */
     parentCollectionIds?: string[];
+    /**
+     * Whether this is a subcollection or not.
+     */
     isSubCollection?: boolean;
     className?: string;
 } & EntityCollection<M>;
@@ -114,7 +123,7 @@ export type EntityCollectionViewProps<M extends Record<string, any>> = {
  */
 export const EntityCollectionView = React.memo(
     function EntityCollectionView<M extends Record<string, any>>({
-                                                                     fullPath,
+                                                                     fullPath: fullPathProp,
                                                                      parentCollectionIds,
                                                                      isSubCollection,
                                                                      className,
@@ -122,6 +131,7 @@ export const EntityCollectionView = React.memo(
                                                                  }: EntityCollectionViewProps<M>
     ) {
 
+        const fullPath = fullPathProp ?? collectionProp.path;
         const dataSource = useDataSource(collectionProp);
         const navigation = useNavigationController();
         const sideEntityController = useSideEntityController();
@@ -176,7 +186,6 @@ export const EntityCollectionView = React.memo(
         const usedSelectionController = collection.selectionController ?? selectionController;
         const {
             selectedEntities,
-            toggleEntitySelection,
             isEntitySelected,
             setSelectedEntities
         } = usedSelectionController;

package/src/components/EntityView.tsx

@@ -58,7 +58,7 @@ export function EntityView<M extends Record<string, any>>(
                 </div>
                 {Object.entries(properties)
                     .map(([key, property]) => {
-                        const value = (entity.values)[key];
+                        const value = entity.values?.[key];
                         return (
                             <div
                                 key={`reference_previews_${key}`}

package/src/components/HomePage/DefaultHomePage.tsx

@@ -191,7 +191,7 @@ export function DefaultHomePage({
                                         />
                                     </div>
                                 ))}
-                                {AdditionalCards &&
+                                {group?.toLowerCase() !== "admin" && AdditionalCards &&
                                     AdditionalCards.map((AdditionalCard, i) => (
                                         <div key={`nav_${group}_add_${i}`}>
                                             <AdditionalCard {...actionProps} />

package/src/components/VirtualTable/VirtualTable.tsx

@@ -20,7 +20,7 @@ import { VirtualTableContextProps } from "./types";
 import { VirtualTableHeaderRow } from "./VirtualTableHeaderRow";
 import { VirtualTableRow } from "./VirtualTableRow";
 import { VirtualTableCell } from "./VirtualTableCell";
-import { AssignmentIcon, cn, Markdown, Typography } from "@firecms/ui";
+import { AssignmentIcon, CenteredView, cn, Typography } from "@firecms/ui";
 
 const VirtualListContext = createContext<VirtualTableContextProps<any>>({} as any);
 VirtualListContext.displayName = "VirtualListContext";
@@ -225,24 +225,7 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
             }
 
             if (onFilterUpdate) onFilterUpdate(newFilterValue);
-
-            if (column.key !== sortByProperty) {
-                resetSort();
-            }
-        }, [checkFilterCombination, currentSort, onFilterUpdate, resetSort, sortByProperty]);
-
-        const buildErrorView = useCallback(() => (
-            <div
-                className="h-full flex flex-col items-center justify-center sticky left-0">
-
-                <Typography variant={"h6"}>
-                    {"Error fetching data from the data source"}
-                </Typography>
-
-                {error?.message && <Markdown className={"px-4 break-all"} source={error.message}/>}
-
-            </div>
-        ), [error?.message]);
+        }, [checkFilterCombination, currentSort, onFilterUpdate, sortByProperty]);
 
         const buildEmptyView = useCallback(() => {
             if (loading)
@@ -255,7 +238,18 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
         }, [emptyComponent, loading]);
 
         const empty = !loading && (data?.length ?? 0) === 0;
-        const customView = error ? buildErrorView() : (empty ? buildEmptyView() : undefined);
+        const customView = error
+            ? <CenteredView maxWidth={"2xl"}
+                className="flex flex-col gap-2">
+
+                <Typography variant={"h6"}>
+                    {"Error fetching data from the data source"}
+                </Typography>
+
+                {error?.message && <SafeLinkRenderer text={error.message}/>}
+
+            </CenteredView>
+            : (empty ? buildEmptyView() : undefined);
 
         const virtualListController = {
             data,
@@ -403,3 +397,17 @@ function MemoizedList({
         {Row}
     </List>;
 }
+
+const SafeLinkRenderer: React.FC<{
+    text: string;
+}> = ({ text }) => {
+    const urlRegex = /https?:\/\/[^\s]+/g;
+    const htmlContent = text.replace(urlRegex, (url) => {
+        // For each URL found, replace it with an HTML <a> tag
+        return `<a href="${url}" target="_blank">Link</a><br/>`;
+    });
+
+    return (
+        <div className={"break-all"} dangerouslySetInnerHTML={{ __html: htmlContent }}/>
+    );
+};

package/src/core/FireCMS.tsx

@@ -12,8 +12,7 @@ import { DataSourceContext } from "../contexts/DataSourceContext";
 import { SideEntityControllerContext } from "../contexts/SideEntityControllerContext";
 import { NavigationContext } from "../contexts/NavigationContext";
 import { SideDialogsControllerContext } from "../contexts/SideDialogsControllerContext";
-import { useLocaleConfig } from "../internal/useLocaleConfig";
-import { CenteredView, Typography } from "@firecms/ui";
+import { CenteredView, Typography, useLocaleConfig } from "@firecms/ui";
 import { DialogsProvider } from "../contexts/DialogsProvider";
 import { useBuildDataSource } from "../internal/useBuildDataSource";
 import { useBuildCustomizationController } from "../internal/useBuildCustomizationController";

package/src/hooks/useBuildNavigationController.tsx

@@ -276,9 +276,9 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
     const getCollectionFromPaths = useCallback(<EC extends EntityCollection>(pathSegments: string[]): EC | undefined => {
 
         const collections = collectionsRef.current;
+        if (collections === undefined)
+            throw Error("getCollectionFromPaths: Collections have not been initialised yet");
         let currentCollections: EntityCollection[] | undefined = [...(collections ?? [])];
-        if (!currentCollections)
-            throw Error("Collections have not been initialised yet");
 
         for (let i = 0; i < pathSegments.length; i++) {
             const pathSegment = pathSegments[i];
@@ -297,9 +297,9 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
     const getCollectionFromIds = useCallback(<EC extends EntityCollection>(ids: string[]): EC | undefined => {
 
         const collections = collectionsRef.current;
+        if (collections === undefined)
+            throw Error("getCollectionFromIds: Collections have not been initialised yet");
         let currentCollections: EntityCollection[] | undefined = [...(collections ?? [])];
-        if (!currentCollections)
-            throw Error("Collections have not been initialised yet");
 
         for (let i = 0; i < ids.length; i++) {
             const id = ids[i];
@@ -335,9 +335,7 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
         []);
 
     const resolveAliasesFrom = useCallback((path: string): string => {
-        const collections = collectionsRef.current;
-        if (!collections)
-            throw Error("Collections have not been initialised yet");
+        const collections = collectionsRef.current ?? [];
         return resolveCollectionPathIds(path, collections);
     }, []);
 
@@ -440,7 +438,7 @@ async function resolveCollections(collections: undefined | EntityCollection[] |
                                   collectionPermissions: PermissionsBuilder | undefined,
                                   authController: AuthController,
                                   dataSource: DataSourceDelegate,
-                                  injectCollections?: (collections: EntityCollection[]) => EntityCollection[]) {
+                                  injectCollections?: (collections: EntityCollection[]) => EntityCollection[]): Promise<EntityCollection[]> {
     let resolvedCollections: EntityCollection[] = [];
     if (typeof collections === "function") {
         resolvedCollections = await collections({
@@ -452,14 +450,14 @@ async function resolveCollections(collections: undefined | EntityCollection[] |
         resolvedCollections = collections;
     }
 
-    resolvedCollections = applyPermissionsFunctionIfEmpty(resolvedCollections, collectionPermissions);
-
-    resolvedCollections = filterOutNotAllowedCollections(resolvedCollections, authController);
-
     if (injectCollections) {
         resolvedCollections = injectCollections(resolvedCollections ?? []);
     }
 
+    resolvedCollections = applyPermissionsFunctionIfEmpty(resolvedCollections, collectionPermissions);
+
+    resolvedCollections = filterOutNotAllowedCollections(resolvedCollections, authController);
+
     return resolvedCollections;
 }
 
@@ -489,8 +487,10 @@ function areCollectionListsEqual(a: EntityCollection[], b: EntityCollection[]) {
     if (a.length !== b.length) {
         return false;
     }
-    const aSorted = a.sort((a, b) => a.id.localeCompare(b.id));
-    const bSorted = b.sort((a, b) => a.id.localeCompare(b.id));
+    const aCopy = [...a];
+    const bCopy = [...b];
+    const aSorted = aCopy.sort((x, y) => x.id.localeCompare(y.id));
+    const bSorted = bCopy.sort((x, y) => x.id.localeCompare(y.id));
     return aSorted.every((value, index) => areCollectionsEqual(value, bSorted[index]));
 }
 

package/src/hooks/useProjectLog.tsx

@@ -9,7 +9,7 @@ export type AccessResponse = {
     message?: string;
 }
 
-async function makeRequest(authController: AuthController, pluginKeys: string | undefined) {
+async function makeRequest(authController: AuthController, pluginKeys: string[] | undefined) {
     const firebaseToken = await authController.getAuthToken();
     return fetch(DEFAULT_SERVER + "/access_log",
         {
@@ -30,12 +30,12 @@ export function useProjectLog(authController: AuthController,
                               plugins?: FireCMSPlugin<any, any, any>[]): AccessResponse | null {
     const [accessResponse, setAccessResponse] = useState<AccessResponse | null>(null);
     const accessedUserRef = useRef<string | null>(null);
-    const pluginKeys = plugins?.map(plugin => plugin.key).join(",");
+    const pluginKeys = plugins?.map(plugin => plugin.key);
     useEffect(() => {
         if (authController.user && authController.user.uid !== accessedUserRef.current && !authController.initialLoading) {
             makeRequest(authController, pluginKeys).then(setAccessResponse);
             accessedUserRef.current = authController.user.uid;
         }
-    }, [authController]);
+    }, [authController, pluginKeys]);
     return accessResponse;
 }

package/src/internal/useBuildSideEntityController.tsx

@@ -49,7 +49,7 @@ export const useBuildSideEntityController = (navigation: NavigationController,
                     }, 1);
                 }
             } else {
-                console.warn("Location path is not a collection path");
+                // console.warn("Location path is not a collection path");
             }
             initialised.current = true;
         }

package/src/types/navigation.ts

@@ -56,7 +56,7 @@ 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: (pathOrAlias: string,
+    getCollection: (pathOrId: string,
                     entityId?: string,
                     includeUserOverride?: boolean) => EC | undefined;
     /**

package/src/util/navigation_utils.ts

@@ -60,14 +60,14 @@ export function resolveCollectionPathIds(path: string, allCollections: EntityCol
 /**
  * Find the corresponding view at any depth for a given path.
  * Note that path or segments of the paths can be collection aliases.
- * @param pathOrAlias
+ * @param pathOrId
  * @param collections
  */
-export function getCollectionByPathOrId(pathOrAlias: string, collections: EntityCollection[]): EntityCollection | undefined {
+export function getCollectionByPathOrId(pathOrId: string, collections: EntityCollection[]): EntityCollection | undefined {
 
-    const subpaths = removeInitialAndTrailingSlashes(pathOrAlias).split("/");
+    const subpaths = removeInitialAndTrailingSlashes(pathOrId).split("/");
     if (subpaths.length % 2 === 0) {
-        throw Error(`getCollectionByPathOrAlias: Collection paths must have an odd number of segments: ${pathOrAlias}`);
+        throw Error(`getCollectionByPathOrId: Collection paths must have an odd number of segments: ${pathOrId}`);
     }
 
     const subpathCombinations = getCollectionPathsCombinations(subpaths);
@@ -80,10 +80,10 @@ export function getCollectionByPathOrId(pathOrAlias: string, collections: Entity
 
         if (navigationEntry) {
 
-            if (subpathCombination === pathOrAlias) {
+            if (subpathCombination === pathOrId) {
                 result = navigationEntry;
             } else if (navigationEntry.subcollections) {
-                const newPath = pathOrAlias.replace(subpathCombination, "").split("/").slice(2).join("/");
+                const newPath = pathOrId.replace(subpathCombination, "").split("/").slice(2).join("/");
                 if (newPath.length > 0)
                     result = getCollectionByPathOrId(newPath, navigationEntry.subcollections);
             }

package/dist/internal/useLocaleConfig.d.ts

@@ -1 +0,0 @@
-export declare function useLocaleConfig(locale?: string): void;

package/src/internal/useLocaleConfig.tsx

@@ -1,18 +0,0 @@
-import * as locales from "date-fns/locale";
-// @ts-ignore
-import { registerLocale, setDefaultLocale } from "react-datepicker";
-import { useEffect } from "react";
-
-export function useLocaleConfig(locale?: string) {
-    useEffect(() => {
-        if (!locale) {
-            return;
-        }
-        // @ts-ignore
-        const dateFnsLocale = locales[locale];
-        if (dateFnsLocale) {
-            registerLocale(locale, dateFnsLocale);
-            setDefaultLocale(locale);
-        }
-    }, [locale])
-}