@firecms/collection_editor 3.0.0-alpha.28 → 3.0.0-alpha.30

package/src/types/collection_editor_controller.tsx

@@ -1,5 +1,6 @@
 import { CollectionEditorPermissionsBuilder } from "./config_permissions";
 import { EntityCollection, Property } from "@firecms/core";
+import { PersistedCollection } from "./persisted_collection";
 
 /**
  * Controller to open the collection editor dialog.
@@ -11,7 +12,7 @@ export interface CollectionEditorController {
         path?: string,
         fullPath?: string,
         parentPathSegments: string[],
-        parentCollection?: EntityCollection<any, any, any>
+        parentCollection?: EntityCollection
     }) => void;
 
     createCollection: (props: {
@@ -21,7 +22,7 @@ export interface CollectionEditorController {
             name?: string
         },
         parentPathSegments: string[],
-        parentCollection?: EntityCollection<any, any, any>,
+        parentCollection?: PersistedCollection,
         redirect: boolean
     }) => void;
 
@@ -31,6 +32,7 @@ export interface CollectionEditorController {
         currentPropertiesOrder?: string[],
         editedCollectionPath: string,
         parentPathSegments: string[],
+        collection: PersistedCollection
     }) => void;
 
     configPermissions: CollectionEditorPermissionsBuilder;

package/src/types/persisted_collection.ts

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

package/src/useCollectionEditorPlugin.tsx

@@ -1,11 +1,5 @@
 import React, { useCallback } from "react";
-import {
-    EntityCollection,
-    FireCMSPlugin,
-    makePropertiesEditable,
-    makePropertiesNonEditable,
-    User
-} from "@firecms/core";
+import { EntityCollection, FireCMSPlugin, makePropertiesEditable, User } from "@firecms/core";
 import { ConfigControllerProvider } from "./ConfigControllerProvider";
 import { CollectionEditorPermissionsBuilder } from "./types/config_permissions";
 import { EditorCollectionAction } from "./components/EditorCollectionAction";
@@ -76,7 +70,7 @@ export function useCollectionEditorPlugin<EC extends PersistedCollection = Persi
      getUser,
      collectionInference,
      getData
- }: CollectionConfigControllerProps<EC, UserType>): FireCMSPlugin {
+ }: CollectionConfigControllerProps<EC, UserType>): FireCMSPlugin<any, any, PersistedCollection> {
 
     const injectCollections = useCallback(
         (collections: EntityCollection[]) => {
@@ -86,6 +80,7 @@ export function useCollectionEditorPlugin<EC extends PersistedCollection = Persi
             };
             const editableCollections = collectionConfigController.collections ?? [];
             editableCollections.forEach(markAsEditable);
+            console.debug("Injecting collections", { editableCollections, collections });
             return joinCollectionLists(editableCollections, collections);
         },
         [collectionConfigController.collections]);