@firecms/collection_editor 3.0.0-alpha.5 → 3.0.0-alpha.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firecms/collection_editor",
-  "version": "3.0.0-alpha.5",
+  "version": "3.0.0-alpha.51",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.es.js",
   "types": "dist/index.d.ts",
@@ -8,13 +8,16 @@
   "exports": {
     ".": {
       "import": "./dist/index.es.js",
-      "require": "./dist/index.umd.js"
-    }
+      "require": "./dist/index.umd.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./package.json": "./package.json"
   },
   "dependencies": {
-    "@firecms/data_import": "^3.0.0-alpha.5",
-    "@firecms/schema_inference": "^3.0.0-alpha.5",
-    "flexsearch": "0.7.31"
+    "@firecms/data_import_export": "^3.0.0-alpha.51",
+    "@firecms/schema_inference": "^3.0.0-alpha.51",
+    "json5": "^2.2.3",
+    "prism-react-renderer": "^2.3.0"
   },
   "peerDependencies": {
     "react": "^18.2.0",
@@ -25,7 +28,8 @@
   "scripts": {
     "dev": "vite",
     "test": "jest",
-    "build": "vite build && tsc --emitDeclarationOnly"
+    "build": "vite build && tsc --emitDeclarationOnly -p tsconfig.prod.json",
+    "clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f"
   },
   "eslintConfig": {
     "extends": [
@@ -47,33 +51,32 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@types/react": "^18.2.8",
-    "@types/react-dom": "^18.2.4",
-    "@typescript-eslint/eslint-plugin": "^5.59.9",
-    "@typescript-eslint/parser": "^5.59.9",
-    "@vitejs/plugin-react": "^4.0.0",
-    "eslint": "^8.42.0",
+    "@types/react": "^18.2.45",
+    "@types/react-dom": "^18.2.17",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
+    "@vitejs/plugin-react": "^4.2.1",
+    "eslint": "^8.55.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^29.7.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-router": "^6.12.0",
-    "react-router-dom": "^6.12.0",
+    "react-router": "^6.21.0",
+    "react-router-dom": "^6.21.0",
     "ts-jest": "^29.1.1",
-    "typescript": "^5.2.2",
-    "vite": "^4.3.9",
+    "typescript": "^5.3.3",
+    "vite": "^4.5.1",
     "vite-plugin-fonts": "^0.7.0"
   },
   "files": [
-    "dist"
+    "dist",
+    "src"
   ],
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f73e3367dc97cbea9c98408b3aafaa48454d440b"
+  "gitHead": "d47d8dad9356b48398b65559b7a59926f3d50373"
 }

package/src/ConfigControllerProvider.tsx

@@ -0,0 +1,321 @@
+import React, { PropsWithChildren, useCallback, useEffect } from "react";
+import equal from "react-fast-compare"
+
+import { CollectionsConfigController } from "./types/config_controller";
+import { Property, useFireCMSContext, useNavigationController, User, useSnackbarController } from "@firecms/core";
+import { CollectionEditorDialog } from "./ui/collection_editor/CollectionEditorDialog";
+import { useNavigate } from "react-router";
+import { CollectionEditorController } from "./types/collection_editor_controller";
+import { CollectionEditorPermissionsBuilder } from "./types/config_permissions";
+import { CollectionInference } from "./types/collection_inference";
+import { PropertyFormDialog } from "./ui/collection_editor/PropertyEditView";
+import { PersistedCollection } from "./types/persisted_collection";
+
+export const ConfigControllerContext = React.createContext<CollectionsConfigController>({} as any);
+export const CollectionEditorContext = React.createContext<CollectionEditorController>({} as any);
+
+export interface ConfigControllerProviderProps {
+    /**
+     * Controller for managing the collections' config.
+     */
+    collectionConfigController: CollectionsConfigController;
+
+    /**
+     * Callback used to infer the schema from the data.
+     */
+    collectionInference?: CollectionInference;
+
+    /**
+     * Use this builder to define the permissions for the configuration per user.
+     */
+    configPermissions?: CollectionEditorPermissionsBuilder;
+
+    /**
+     * Groups that cannot be used to create new collections.
+     */
+    reservedGroups?: string[];
+
+    extraView?: {
+        View: React.ComponentType<{
+            path: string
+        }>,
+        icon: React.ReactNode
+    };
+
+    pathSuggestions?: (path?: string) => Promise<string[]>;
+
+    getUser: (uid: string) => User | null
+
+    getData?: (path: string) => Promise<object[]>;
+
+}
+
+export const ConfigControllerProvider = React.memo(
+    function ConfigControllerProvider({
+                                          children,
+                                          collectionConfigController,
+                                          configPermissions,
+                                          reservedGroups,
+                                          collectionInference,
+                                          extraView,
+                                          pathSuggestions,
+                                          getUser,
+                                          getData
+                                      }: PropsWithChildren<ConfigControllerProviderProps>) {
+
+        const navigation = useNavigationController();
+        const navigate = useNavigate();
+        const snackbarController = useSnackbarController();
+        const { propertyConfigs } = useFireCMSContext();
+
+        const {
+            collections
+        } = navigation;
+        const existingPaths = collections.map(col => col.path.trim().toLowerCase());
+
+        const [rootPathSuggestions, setRootPathSuggestions] = React.useState<string[] | undefined>();
+        useEffect(() => {
+            if (pathSuggestions) {
+                pathSuggestions().then((paths) => {
+                    setRootPathSuggestions(paths.filter(p => !existingPaths.includes(p.trim().toLowerCase())));
+                });
+            }
+        }, [pathSuggestions]);
+
+        const [currentDialog, setCurrentDialog] = React.useState<{
+            isNewCollection: boolean,
+            parentCollection?: PersistedCollection,
+            editedCollectionPath?: string,
+            fullPath?: string,
+            parentCollectionIds: string[],
+            initialValues?: {
+                path?: string,
+                group?: string,
+                name?: string
+            },
+            redirect: boolean
+        }>();
+
+        const [currentPropertyDialog, setCurrentPropertyDialog] = React.useState<{
+            propertyKey?: string,
+            property?: Property,
+            namespace?: string,
+            parentCollection?: PersistedCollection,
+            currentPropertiesOrder?: string[],
+            editedCollectionPath: string,
+            fullPath?: string,
+            parentCollectionIds: string[],
+            collectionEditable: boolean;
+        }>();
+
+        const defaultConfigPermissions: CollectionEditorPermissionsBuilder = useCallback(() => ({
+            createCollections: true,
+            editCollections: true,
+            deleteCollections: true
+        }), []);
+
+        const editCollection = useCallback(({
+                                                path,
+                                                fullPath,
+                                                parentCollectionIds,
+                                                parentCollection
+                                            }: {
+            path?: string,
+            fullPath?: string,
+            parentCollectionIds: string[],
+            parentCollection?: PersistedCollection
+        }) => {
+            setCurrentDialog({
+                editedCollectionPath: path,
+                fullPath,
+                parentCollectionIds,
+                isNewCollection: false,
+                parentCollection,
+                redirect: false
+            });
+        }, []);
+
+        const editProperty = useCallback(({
+                                              propertyKey,
+                                              property,
+                                              editedCollectionPath,
+                                              currentPropertiesOrder,
+                                              parentCollectionIds,
+                                              collection
+                                          }: {
+            propertyKey?: string,
+            property?: Property,
+            currentPropertiesOrder?: string[],
+            editedCollectionPath: string,
+            parentCollectionIds: string[],
+            collection: PersistedCollection,
+        }) => {
+            // namespace is all the path until the last dot
+            const namespace = propertyKey && propertyKey.includes(".")
+                ? propertyKey.substring(0, propertyKey.lastIndexOf("."))
+                : undefined;
+            const propertyKeyWithoutNamespace = propertyKey && propertyKey.includes(".")
+                ? propertyKey.substring(propertyKey.lastIndexOf(".") + 1)
+                : propertyKey;
+            console.log("edit property", propertyKeyWithoutNamespace, collection)
+            setCurrentPropertyDialog({
+                propertyKey: propertyKeyWithoutNamespace,
+                property,
+                namespace,
+                currentPropertiesOrder,
+                editedCollectionPath,
+                parentCollectionIds,
+                collectionEditable: collection?.editable ?? false
+            });
+        }, []);
+
+        const createCollection = React.useCallback(({
+                                                        parentCollectionIds,
+                                                        parentCollection,
+                                                        initialValues,
+                                                        redirect
+                                                    }: {
+            parentCollectionIds: string[],
+            parentCollection?: PersistedCollection
+            initialValues?: {
+                group?: string,
+                path?: string,
+                name?: string
+            },
+            redirect: boolean
+        }) => {
+            setCurrentDialog({
+                isNewCollection: true,
+                parentCollectionIds,
+                parentCollection,
+                initialValues,
+                redirect
+            });
+        }, []);
+
+        const getPathSuggestions = !pathSuggestions
+            ? undefined
+            : (path?: string) => {
+                if (!path && rootPathSuggestions)
+                    return Promise.resolve(rootPathSuggestions);
+                else {
+                    return pathSuggestions?.(path);
+                }
+            }
+
+        return (
+            <ConfigControllerContext.Provider value={collectionConfigController}>
+                <CollectionEditorContext.Provider
+                    value={{
+                        editCollection,
+                        createCollection,
+                        editProperty,
+                        configPermissions: configPermissions ?? defaultConfigPermissions,
+                        rootPathSuggestions
+                    }}>
+
+                    {children}
+
+                    <CollectionEditorDialog
+                        open={Boolean(currentDialog)}
+                        configController={collectionConfigController}
+                        isNewCollection={false}
+                        collectionInference={collectionInference}
+                        {...currentDialog}
+                        getData={getData}
+                        reservedGroups={reservedGroups}
+                        extraView={extraView}
+                        pathSuggestions={getPathSuggestions}
+                        getUser={getUser}
+                        handleClose={(collection) => {
+                            if (currentDialog?.redirect) {
+                                if (collection && currentDialog?.isNewCollection && !currentDialog.parentCollectionIds.length) {
+                                    const url = navigation.buildUrlCollectionPath(collection.id ?? collection.path);
+                                    navigate(url);
+                                }
+                            }
+                            setCurrentDialog(undefined);
+                        }}/>
+
+                    {/* Used for editing properties*/}
+                    <PropertyFormDialog
+                        open={Boolean(currentPropertyDialog)}
+                        includeIdAndName={true}
+                        existingProperty={Boolean(currentPropertyDialog?.propertyKey)}
+                        autoUpdateId={!currentPropertyDialog ? false : !currentPropertyDialog?.propertyKey}
+                        autoOpenTypeSelect={!currentPropertyDialog ? false : !currentPropertyDialog?.propertyKey}
+                        inArray={false}
+                        collectionEditable={currentPropertyDialog?.collectionEditable ?? false}
+                        getData={getData && currentPropertyDialog?.editedCollectionPath
+                            ? () => {
+                                const resolvedPath = navigation.resolveAliasesFrom(currentPropertyDialog.editedCollectionPath!)
+                                return getData(resolvedPath);
+                            }
+                            : undefined}
+                        onPropertyChanged={({
+                                                id,
+                                                property
+                                            }) => {
+                            if (!currentPropertyDialog) return;
+                            if (!id) return;
+                            const newProperty = !(currentPropertyDialog.propertyKey);
+                            return collectionConfigController.saveProperty({
+                                path: currentPropertyDialog?.editedCollectionPath,
+                                property,
+                                propertyKey: id,
+                                newPropertiesOrder: newProperty && currentPropertyDialog.currentPropertiesOrder ? [...currentPropertyDialog.currentPropertiesOrder, id] : undefined,
+                                namespace: currentPropertyDialog.namespace,
+                                parentCollectionIds: currentPropertyDialog.parentCollectionIds
+                            })
+                                .catch((e) => {
+                                    console.error(e);
+                                    snackbarController.open({
+                                        type: "error",
+                                        message: "Error persisting property: " + (e.message ?? "Details in the console")
+                                    });
+                                    return false;
+                                });
+                        }}
+                        onPropertyChangedImmediate={false}
+                        onDelete={() => {
+                            if (!currentPropertyDialog?.propertyKey) return;
+                            const newPropertiesOrder = currentPropertyDialog?.currentPropertiesOrder?.filter(p => p !== currentPropertyDialog?.propertyKey);
+                            return collectionConfigController.deleteProperty({
+                                path: currentPropertyDialog?.editedCollectionPath,
+                                propertyKey: currentPropertyDialog?.propertyKey,
+                                namespace: currentPropertyDialog?.namespace,
+                                newPropertiesOrder,
+                                parentCollectionIds: currentPropertyDialog?.parentCollectionIds
+                            })
+                                .then(() => {
+                                    setCurrentPropertyDialog(undefined);
+                                }).catch((e) => {
+                                    console.error(e);
+                                    snackbarController.open({
+                                        type: "error",
+                                        message: "Error deleting property: " + (e.message ?? "Details in the console")
+                                    });
+                                    return false;
+                                });
+                        }}
+                        onError={() => {
+                        }}
+                        onOkClicked={() => {
+                            setCurrentPropertyDialog(undefined);
+                        }}
+                        onCancel={() => {
+                            setCurrentPropertyDialog(undefined);
+                        }}
+                        initialErrors={{}}
+                        forceShowErrors={false}
+                        existingPropertyKeys={[]}
+                        allowDataInference={true}
+                        propertyConfigs={propertyConfigs}
+                        property={currentPropertyDialog?.property}
+                        propertyKey={currentPropertyDialog?.propertyKey}/>
+
+                </CollectionEditorContext.Provider>
+
+            </ConfigControllerContext.Provider>
+        );
+    }, equal);

package/src/index.ts

@@ -0,0 +1,35 @@
+export {
+    useCollectionEditorPlugin
+} from "./useCollectionEditorPlugin";
+
+export {
+    useCollectionEditorController
+} from "./useCollectionEditorController";
+export {
+    useCollectionsConfigController
+} from "./useCollectionsConfigController";
+
+export {
+    editableProperty, removeNonEditableProperties
+} from "./utils/entities";
+
+export type {
+    CollectionsConfigController, DeleteCollectionParams, SaveCollectionParams
+} from "./types/config_controller";
+export type {
+    CollectionEditorController
+} from "./types/collection_editor_controller";
+export type {
+    CollectionEditorPermissions, CollectionEditorPermissionsBuilder
+} from "./types/config_permissions";
+export type {
+    PersistedCollection
+} from "./types/persisted_collection";
+
+export type {
+    CollectionInference
+} from "./types/collection_inference";
+
+export { MissingReferenceWidget } from "./ui/MissingReferenceWidget";
+
+export * from "./ui/collection_editor/util";

package/src/types/collection_editor_controller.tsx

@@ -0,0 +1,42 @@
+import { CollectionEditorPermissionsBuilder } from "./config_permissions";
+import { Property } from "@firecms/core";
+import { PersistedCollection } from "./persisted_collection";
+
+/**
+ * Controller to open the collection editor dialog.
+ * @group Hooks and utilities
+ */
+export interface CollectionEditorController {
+
+    editCollection: (props: {
+        path?: string,
+        fullPath?: string,
+        parentCollectionIds: string[],
+        parentCollection?: PersistedCollection
+    }) => void;
+
+    createCollection: (props: {
+        initialValues?: {
+            group?: string,
+            path?: string,
+            name?: string
+        },
+        parentCollectionIds: string[],
+        parentCollection?: PersistedCollection,
+        redirect: boolean
+    }) => void;
+
+    editProperty: (props: {
+        propertyKey?: string,
+        property?: Property,
+        currentPropertiesOrder?: string[],
+        editedCollectionPath: string,
+        parentCollectionIds: string[],
+        collection: PersistedCollection
+    }) => void;
+
+    configPermissions: CollectionEditorPermissionsBuilder;
+
+    rootPathSuggestions?: string[];
+
+}

package/src/types/collection_inference.ts

@@ -0,0 +1,3 @@
+import { EntityCollection } from "@firecms/core";
+
+export type CollectionInference = (path: string, collectionGroup: boolean, parentCollectionIds: string[]) => Promise<Partial<EntityCollection> | null>;

package/src/types/config_controller.tsx

@@ -0,0 +1,50 @@
+import { CMSType, Property } from "@firecms/core";
+import { PersistedCollection } from "./persisted_collection";
+
+/**
+ * Use this controller to access the configuration that is stored externally,
+ * and not defined in code.
+ */
+export interface CollectionsConfigController {
+
+    loading: boolean;
+
+    collections?: PersistedCollection[];
+
+    saveCollection: <M extends { [Key: string]: CMSType }>(params: SaveCollectionParams<M>) => Promise<void>;
+
+    saveProperty: (params: SavePropertyParams) => Promise<void>;
+    deleteProperty: (params: DeletePropertyParams) => Promise<void>;
+
+    deleteCollection: (props: DeleteCollectionParams) => Promise<void>;
+
+}
+
+export type SaveCollectionParams<M extends Record<string, any>> = {
+    id: string,
+    collectionData: PersistedCollection<M>,
+    previousPath?: string,
+    parentCollectionIds?: string[]
+}
+
+export type SavePropertyParams = {
+    path: string,
+    propertyKey: string,
+    namespace?: string,
+    newPropertiesOrder?: string[],
+    property: Property,
+    parentCollectionIds?: string[]
+}
+
+export type DeletePropertyParams = {
+    path: string,
+    propertyKey: string,
+    namespace?: string,
+    newPropertiesOrder?: string[],
+    parentCollectionIds?: string[]
+}
+
+export type DeleteCollectionParams = {
+    path: string,
+    parentCollectionIds?: string[]
+}

package/src/types/config_permissions.ts

@@ -0,0 +1,20 @@
+import { EntityCollection } from "@firecms/core";
+
+export type CollectionEditorPermissionsBuilder<UserType = any, EC extends EntityCollection = EntityCollection> = (params: { user: UserType | null, collection?: EC }) => CollectionEditorPermissions;
+
+export type CollectionEditorPermissions = {
+    /**
+     * Is the user allowed to create new collections.
+     */
+    createCollections: boolean;
+
+    /**
+     * Is the user allowed to modify this collection
+     */
+    editCollections: boolean;
+
+    /**
+     * Is the user allowed to delete this collection
+     */
+    deleteCollections: boolean;
+}

package/src/types/persisted_collection.ts

@@ -0,0 +1,9 @@
+import { EntityCollection, User } from "@firecms/core";
+
+export type PersistedCollection<M extends Record<string, any> = any, UserType extends User = User>
+    = Omit<EntityCollection<M, UserType>, "subcollections"> & {
+    // properties: Properties<M>;
+    ownerId: string;
+    subcollections?: PersistedCollection<any, any>[];
+    editable?: boolean;
+}

package/src/ui/CollectionViewHeaderAction.tsx

@@ -0,0 +1,42 @@
+import { IconButton, ResolvedProperty, SettingsIcon, Tooltip } from "@firecms/core";
+import React from "react";
+import { useCollectionEditorController } from "../useCollectionEditorController";
+import { PersistedCollection } from "../types/persisted_collection";
+
+export function CollectionViewHeaderAction({
+                                               propertyKey,
+                                               onHover,
+                                               property,
+                                               fullPath,
+                                               parentCollectionIds,
+                                               collection
+                                           }: {
+    property: ResolvedProperty,
+    propertyKey: string,
+    onHover: boolean,
+    fullPath: string,
+    parentCollectionIds: string[],
+    collection: PersistedCollection;
+}) {
+
+    const collectionEditorController = useCollectionEditorController();
+
+    return (
+        <Tooltip title={"Edit"}>
+            <IconButton
+                className={onHover ? "bg-white dark:bg-gray-950" : "hidden"}
+                onClick={() => {
+                    collectionEditorController.editProperty({
+                        propertyKey,
+                        property,
+                        editedCollectionPath: fullPath,
+                        parentCollectionIds,
+                        collection
+                    });
+                }}
+                size={"small"}>
+                <SettingsIcon size={"small"}/>
+            </IconButton>
+        </Tooltip>
+    )
+}