@firecms/core 3.0.0-beta.2-pre.5 → 3.0.0-beta.3

package/src/form/field_bindings/SwitchFieldBinding.tsx

@@ -1,11 +1,10 @@
 import React from "react";
 
 import { FieldProps } from "../../types";
-import { useClearRestoreValue } from "../../hooks";
 import { getIconForProperty } from "../../util";
-import { FieldHelperText } from "../components/FieldHelperText";
+import { FieldHelperText, LabelWithIcon } from "../components";
 import { BooleanSwitchWithLabel } from "@firecms/ui";
-import { LabelWithIcon } from "../../components";
+import { useClearRestoreValue } from "../useClearRestoreValue";
 
 type SwitchFieldProps = FieldProps<boolean>;
 

package/src/form/field_bindings/TextFieldBinding.tsx

@@ -1,12 +1,11 @@
 import React, { useCallback } from "react";
 
+import { ClearIcon, Collapse, IconButton, TextField } from "@firecms/ui";
 import { FieldProps, PreviewType } from "../../types";
-import { FieldHelperText } from "../components";
-import { useClearRestoreValue } from "../../hooks";
+import { FieldHelperText, LabelWithIcon } from "../components";
 import { getIconForProperty } from "../../util";
-import { ClearIcon, Collapse, IconButton, TextField } from "@firecms/ui";
 import { PropertyPreview } from "../../preview";
-import { LabelWithIcon } from "../../components";
+import { useClearRestoreValue } from "../useClearRestoreValue";
 
 interface TextFieldProps<T extends string | number> extends FieldProps<T> {
     allowInfinity?: boolean

package/src/form/index.tsx

@@ -40,3 +40,4 @@ export {
 } from "./EntityForm";
 
 export { PropertyFieldBinding } from "./PropertyFieldBinding";
+export * from "./useClearRestoreValue";

package/src/hooks/index.tsx

@@ -4,7 +4,6 @@ export * from "./data/useEntityFetch";
 export * from "./data/save";
 export * from "./data/delete";
 
-export * from "../form/useClearRestoreValue";
 export * from "./useNavigationController";
 
 export * from "./useResolvedNavigationFrom";
@@ -23,3 +22,6 @@ export * from "./useReferenceDialog";
 export * from "./useBrowserTitleAndIcon";
 export * from "./useCustomizationController";
 export * from "./useBuildNavigationController";
+
+export * from "./useBuildLocalConfigurationPersistence";
+export * from "./useBuildModeController";

package/src/{core → hooks}/useBuildModeController.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from "react";
 
-import { ModeController } from "../hooks";
+import { ModeController } from "./index";
 
 /**
  * Use this hook to build a color mode controller that determines

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();
@@ -256,7 +259,7 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
      */
     const baseLocation = state && state.base_location ? state.base_location : location;
 
-    const getAllParentCollectionsForPath = useCallback((path: string): EntityReference[] => {
+    const getAllParentReferencesForPath = useCallback((path: string): EntityReference[] => {
         return getParentReferencesFromPath({
             path,
             collections
@@ -264,8 +267,20 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
     }, [collections]);
 
     const getParentCollectionIds = useCallback((path: string): string[] => {
-        return getAllParentCollectionsForPath(path).map(r => r.id);
-    }, [getAllParentCollectionsForPath])
+
+        const strings = path.split("/");
+        const oddPathSegments = strings.filter((_, i) => i % 2 === 0);
+        oddPathSegments.pop();
+
+        const result: string[][] = [];
+
+        for (let i = 1; i <= oddPathSegments.length; i++) {
+            result.push(oddPathSegments.slice(0, i));
+        }
+
+        // for each odd path segment, get the collection
+        return result.map(r => getCollectionFromPaths(r)?.id).filter(Boolean) as string[];
+    }, [getAllParentReferencesForPath])
 
     const convertIdsToPaths = useCallback((ids: string[]): string[] => {
             let currentCollections = collections;
@@ -282,7 +297,7 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
         }
         , [getCollectionFromIds]);
 
-    return useMemo(() => ({
+    return {
         collections,
         views,
         loading: !initialised || navigationLoading,
@@ -303,10 +318,10 @@ export function useBuildNavigationController<EC extends EntityCollection, UserTy
         topLevelNavigation,
         baseLocation,
         refreshNavigation,
-        getParentReferencesFromPath: getAllParentCollectionsForPath,
+        getParentReferencesFromPath: getAllParentReferencesForPath,
         getParentCollectionIds,
         convertIdsToPaths
-    }), [baseCollectionPath, baseLocation, basePath, buildCMSUrlPath, buildUrlCollectionPath, buildUrlEditCollectionPath, collections, getAllParentCollectionsForPath, getCollection, getCollectionFromPaths, homeUrl, initialised, isUrlCollectionPath, navigationLoading, navigationLoadingError, refreshNavigation, resolveAliasesFrom, topLevelNavigation, urlPathToDataPath, views]);
+    };
 }
 
 export function getSidePanelKey(path: string, entityId?: string) {

package/src/hooks/useProjectLog.tsx

@@ -0,0 +1,31 @@
+import { useEffect, useRef } from "react";
+import { AuthController } from "../types";
+
+export const DEFAULT_SERVER_DEV = "https://api-kdoe6pj3qq-ey.a.run.app";
+export const DEFAULT_SERVER = "https://api-drplyi3b6q-ey.a.run.app";
+
+async function makeRequest(authController: AuthController) {
+    const firebaseToken = await authController.getAuthToken();
+    return fetch(DEFAULT_SERVER + "/access_log",
+        {
+            // mode: "no-cors",
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                Authorization: `Basic ${firebaseToken}`,
+            },
+            body: JSON.stringify({})
+        })
+        .then(async (res) => {
+        });
+}
+
+export function useProjectLog(authController: AuthController) {
+    const accessedUserRef = useRef<string | null>(null);
+    useEffect(() => {
+        if (authController.user && authController.user.uid !== accessedUserRef.current && !authController.initialLoading) {
+            makeRequest(authController);
+            accessedUserRef.current = authController.user.uid;
+        }
+    }, [authController]);
+}

package/src/internal/useBuildDataSource.ts

@@ -330,6 +330,10 @@ export function useBuildDataSource({
  * bindings.
  * Also, Firestore references are replaced with {@link EntityReference}
  * @param data
+ * @param buildReference
+ * @param buildGeoPoint
+ * @param buildDate
+ * @param buildDelete
  * @group Firestore
  */
 export function cmsToDelegateModel(data: any,
@@ -340,9 +344,11 @@ export function cmsToDelegateModel(data: any,
 ): any {
     if (data === undefined) {
         return buildDelete();
+    } else if (data === null) {
+        return null;
     } else if (Array.isArray(data)) {
         return data.map(v => cmsToDelegateModel(v, buildReference, buildGeoPoint, buildDate, buildDelete));
-    } else if (data instanceof EntityReference) {
+    } else if (data.isEntityReference && data.isEntityReference()) {
         return buildReference(data);
     } else if (data instanceof GeoPoint) {
         return buildGeoPoint(data);
@@ -355,4 +361,3 @@ export function cmsToDelegateModel(data: any,
     }
     return data;
 }
-

package/src/preview/PropertyPreview.tsx

@@ -178,7 +178,7 @@ export const PropertyPreview = React.memo(function PropertyPreview<T extends CMS
         }
     } else if (property.dataType === "reference") {
         if (typeof property.path === "string") {
-            if (value instanceof EntityReference) {
+            if (typeof value === "object" && "isEntityReference" in value && value.isEntityReference()) {
                 content = <ReferencePreview
                     disabled={!property.path}
                     previewProperties={property.previewProperties}

package/src/preview/components/ReferencePreview.tsx

@@ -32,7 +32,7 @@ export type ReferencePreviewProps = {
  */
 export const ReferencePreview = React.memo<ReferencePreviewProps>(function ReferencePreview(props: ReferencePreviewProps) {
     const reference = props.reference;
-    if (!((reference as unknown) instanceof EntityReference)) {
+    if (!(typeof reference === "object" && "isEntityReference" in reference && reference.isEntityReference())) {
         console.warn("Reference preview received value of type", typeof reference);
         return <ReferencePreviewContainer
             onClick={props.onClick}

package/src/types/entities.ts

@@ -56,6 +56,10 @@ export class EntityReference<M extends Record<string, any> = any> {
     get pathWithId() {
         return `${this.path}/${this.id}`;
     }
+
+    isEntityReference() {
+        return true;
+    }
 }
 
 export class GeoPoint {

package/src/util/index.ts

@@ -7,7 +7,7 @@ export * from "./objects";
 export * from "./paths";
 export * from "./regexp";
 export * from "./navigation_utils";
-export * from "./useDebounce";
+export * from "./useDebouncedCallback";
 export * from "./property_utils";
 export * from "./resolutions";
 export * from "./permissions";
@@ -20,3 +20,4 @@ export * from "./flatten_object";
 export * from "./make_properties_editable";
 export * from "./join_collections";
 export * from "./builders";
+export * from "./useTraceUpdate";

package/src/util/{useDebounce.ts → useDebouncedCallback.ts}

@@ -1,6 +1,6 @@
 import React from "react";
 
-export function useDebounce<T>(value: T, callback: () => void, immediate: boolean, timeoutMs = 300) {
+export function useDebouncedCallback<T>(value: T, callback: () => void, immediate: boolean, timeoutMs = 300) {
 
     const pendingUpdate = React.useRef(false);
     const performUpdate = () => {

package/dist/util/useDebounce.d.ts

@@ -1 +0,0 @@
-export declare function useDebounce<T>(value: T, callback: () => void, immediate: boolean, timeoutMs?: number): void;

package/src/hooks/useVerifyLicense.tsx

@@ -1 +0,0 @@
-// export