@firecms/core 3.0.0-canary.1 → 3.0.0-canary.3

package/dist/util/index.d.ts

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-canary.1",
+  "version": "3.0.0-canary.3",
   "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.1",
-    "@firecms/ui": "^3.0.0-canary.1",
+    "@firecms/formex": "^3.0.0-canary.3",
+    "@firecms/ui": "^3.0.0-canary.3",
     "@fontsource/ibm-plex-mono": "^5.0.8",
     "@fontsource/roboto": "^5.0.8",
     "@hello-pangea/dnd": "^16.5.0",
@@ -115,7 +115,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "2e4b4126562ef2d7e099bba8b116f77ba3e1e3cf",
+  "gitHead": "9d587b683991dfcefd28e1c13b693364b5de72b2",
   "publishConfig": {
     "access": "public"
   }

package/src/components/EntityCollectionTable/EntityCollectionRowActions.tsx

@@ -1,5 +1,4 @@
 import React, { MouseEvent, useCallback } from "react";
-import equal from "react-fast-compare"
 
 import { CollectionSize, Entity, EntityAction, EntityCollection, SelectionController } from "../../types";
 import { Checkbox, cn, IconButton, Menu, MenuItem, MoreVertIcon, Skeleton, Tooltip, Typography } from "@firecms/ui";

package/src/hooks/useBuildNavigationController.tsx

@@ -1,5 +1,6 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { useLocation } from "react-router-dom";
+import equal from "react-fast-compare"
 
 import {
     AuthController,
@@ -49,7 +50,7 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
                                                                                                      basePath = DEFAULT_BASE_PATH,
                                                                                                      baseCollectionPath = DEFAULT_COLLECTION_PATH,
                                                                                                      authController,
-                                                                                                     collections: baseCollections,
+                                                                                                     collections: collectionsProp,
                                                                                                      views: baseViews,
                                                                                                      userConfigPersistence,
                                                                                                      dataSourceDelegate,
@@ -58,6 +59,7 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
 
     const location = useLocation();
 
+    const collectionsRef = useRef<EntityCollection[] | null>();
     const [collections, setCollections] = useState<EntityCollection[] | undefined>();
     const [views, setViews] = useState<CMSView[] | undefined>();
     const [initialised, setInitialised] = useState<boolean>(false);
@@ -80,7 +82,6 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
         [baseCollectionPath]);
 
     const computeTopNavigation = useCallback((collections: EntityCollection[], views: CMSView[]): TopNavigationResult => {
-        // return (collection.editable && resolvePermissions(collection, authController, paths).editCollection) ?? DEFAULT_PERMISSIONS.editCollection;
         const navigationEntries: TopNavigationEntry[] = [
             ...(collections ?? []).map(collection => (!collection.hideFromNavigation
                 ? {
@@ -125,14 +126,16 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
 
         try {
             const [resolvedCollections = [], resolvedViews = []] = await Promise.all([
-                    resolveCollections(baseCollections, authController, dataSourceDelegate, injectCollections),
+                    resolveCollections(collectionsProp, authController, dataSourceDelegate, injectCollections),
                     resolveCMSViews(baseViews, authController, dataSourceDelegate)
                 ]
             );
-
-            setCollections(resolvedCollections);
-            setViews(resolvedViews);
-            setTopLevelNavigation(computeTopNavigation(resolvedCollections ?? [], resolvedViews));
+            if (!equal(collectionsRef.current, resolvedCollections) || !equal(views, resolvedViews) || !equal(topLevelNavigation, computeTopNavigation(resolvedCollections, resolvedViews))) {
+                collectionsRef.current = resolvedCollections;
+                setCollections(resolvedCollections);
+                setViews(resolvedViews);
+                setTopLevelNavigation(computeTopNavigation(resolvedCollections ?? [], resolvedViews));
+            }
         } catch (e) {
             console.error(e);
             setNavigationLoadingError(e as any);
@@ -140,7 +143,7 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
 
         setNavigationLoading(false);
         setInitialised(true);
-    }, [baseCollections, authController.user, authController.initialLoading, baseViews, computeTopNavigation, injectCollections]);
+    }, [collectionsProp, authController.user, authController.initialLoading, baseViews, computeTopNavigation, injectCollections]);
 
     useEffect(() => {
         refreshNavigation();
@@ -276,15 +279,7 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
         }
 
         // for each odd path segment, get the collection
-        const parentCollectionIds = result.map(r => getCollectionFromPaths(r)?.id).filter(Boolean) as string[];
-
-        getCollectionFromPaths(oddPathSegments);
-
-        // const allParentCollectionsForPath = getAllParentReferencesForPath(path);
-        // console.log("allParentCollectionsForPath", allParentCollectionsForPath);
-        // const parentCollectionIds = allParentCollectionsForPath.map(r => r.id);
-        console.log("getParentCollectionIds", path, parentCollectionIds);
-        return parentCollectionIds;
+        return result.map(r => getCollectionFromPaths(r)?.id).filter(Boolean) as string[];
     }, [getAllParentReferencesForPath])
 
     const convertIdsToPaths = useCallback((ids: string[]): string[] => {

package/src/util/index.ts

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