@rebasepro/admin 0.0.1-canary.eae7889 → 0.0.1-canary.eb08332

package/src/collection_editor/types/config_controller.tsx

@@ -1,4 +1,4 @@
-import { EntityCollection, NavigationGroupMapping, Property } from "@rebasepro/types";
+import { CollectionConfig, NavigationGroupMapping, Property } from "@rebasepro/types";
 
 export interface CollectionsSetupInfo {
     status: "ongoing" | "complete" | "error";
@@ -13,7 +13,7 @@ export interface CollectionsConfigController {
 
     loading: boolean;
 
-    collections?: EntityCollection[];
+    collections?: CollectionConfig[];
 
     /**
      * If true, the configuration cannot be modified.
@@ -32,7 +32,7 @@ export interface CollectionsConfigController {
      */
     collectionsSetup?: CollectionsSetupInfo;
 
-    getCollection: (id: string) => EntityCollection;
+    getCollection: (id: string) => CollectionConfig;
 
     saveCollection: <M extends { [Key: string]: any }>(params: SaveCollectionParams<M>) => Promise<void>;
     updateCollection: <M extends { [Key: string]: any }>(params: UpdateCollectionParams<M>) => Promise<void>;
@@ -59,16 +59,16 @@ export interface CollectionsConfigController {
 
 export type UpdateCollectionParams<M extends Record<string, unknown> = Record<string, unknown>> = {
     id: string,
-    collectionData: Partial<EntityCollection<M>>,
+    collectionData: Partial<CollectionConfig<M>>,
     previousId?: string,
-    parentCollectionIds?: string[]
+    parentCollectionSlugs?: string[], parentEntityIds?: string[]
 }
 
 export type SaveCollectionParams<M extends Record<string, unknown> = Record<string, unknown>> = {
     id: string,
-    collectionData: EntityCollection<M>,
+    collectionData: CollectionConfig<M>,
     previousId?: string,
-    parentCollectionIds?: string[]
+    parentCollectionSlugs?: string[], parentEntityIds?: string[]
 }
 
 export type SavePropertyParams = {
@@ -77,7 +77,7 @@ export type SavePropertyParams = {
     namespace?: string,
     newPropertiesOrder?: string[],
     property: Property,
-    parentCollectionIds?: string[]
+    parentCollectionSlugs?: string[], parentEntityIds?: string[]
 }
 
 export type DeletePropertyParams = {
@@ -85,25 +85,25 @@ export type DeletePropertyParams = {
     propertyKey: string,
     namespace?: string,
     newPropertiesOrder?: string[],
-    parentCollectionIds?: string[]
+    parentCollectionSlugs?: string[], parentEntityIds?: string[]
 }
 
 export type DeleteCollectionParams = {
     id: string,
-    parentCollectionIds?: string[]
+    parentCollectionSlugs?: string[], parentEntityIds?: string[]
 }
 
 export type UpdatePropertiesOrderParams = {
     fullPath: string;
-    parentCollectionIds: string[];
-    collection: EntityCollection;
+    parentCollectionSlugs: string[], parentEntityIds: string[];
+    collection: CollectionConfig;
     newPropertiesOrder: string[];
 }
 
 export type UpdateKanbanColumnsOrderParams = {
     fullPath: string;
-    parentCollectionIds: string[];
-    collection: EntityCollection;
+    parentCollectionSlugs: string[], parentEntityIds: string[];
+    collection: CollectionConfig;
     kanbanColumnProperty: string;
     newColumnsOrder: string[];
 }

package/src/collection_editor/ui/AddKanbanColumnAction.tsx

@@ -4,12 +4,23 @@ import {
     useAuthController,
     useCustomizationController,
     useTranslation
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { getPropertyInPath } from "../_cms_internals";
-import { EntityCollection, EnumValueConfig, StringProperty } from "@rebasepro/types";
+import { CollectionConfig, EnumValueConfig, StringProperty } from "@rebasepro/types";
 import { resolveEnumValues } from "@rebasepro/common";
-import { Button, cls, defaultBorderMixin, Dialog, DialogActions, DialogContent, IconButton, TextField, Typography } from "@rebasepro/ui";
-import { PlusIcon } from "lucide-react";
+import {
+    Button,
+    cls,
+    defaultBorderMixin,
+    Dialog,
+    DialogActions,
+    DialogContent,
+    DialogTitle,
+    IconButton,
+    PlusIcon,
+    TextField,
+    Typography
+} from "@rebasepro/ui";
 import { useCollectionsConfigController } from "../useCollectionsConfigController";
 import { toSnakeCase } from "@rebasepro/utils";
 
@@ -20,12 +31,12 @@ import { toSnakeCase } from "@rebasepro/utils";
 export function AddKanbanColumnAction({
     collection,
     fullPath,
-    parentCollectionIds,
+    parentCollectionSlugs, parentEntityIds,
     columnProperty
 }: {
-    collection: EntityCollection;
+    collection: CollectionConfig;
     fullPath: string;
-    parentCollectionIds: string[];
+    parentCollectionSlugs: string[], parentEntityIds: string[];
     columnProperty: string;
 }) {
     const [dialogOpen, setDialogOpen] = useState(false);
@@ -111,7 +122,7 @@ export function AddKanbanColumnAction({
                 path: fullPath,
                 propertyKey: columnProperty,
                 property: updatedProperty as StringProperty,
-                parentCollectionIds
+                parentCollectionSlugs
             });
 
             setNewValueLabel("");
@@ -121,7 +132,7 @@ export function AddKanbanColumnAction({
         } finally {
             setSaving(false);
         }
-    }, [newValueLabel, configController, collection, columnProperty, fullPath, parentCollectionIds]);
+    }, [newValueLabel, configController, collection, columnProperty, fullPath, parentCollectionSlugs]);
 
     const handleKeyDown = (e: React.KeyboardEvent) => {
         if (e.key === "Enter" && newValueLabel.trim()) {
@@ -149,6 +160,7 @@ export function AddKanbanColumnAction({
             </div>
 
             <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
+                <DialogTitle hidden>{t("studio_add_kanban_column_title")}</DialogTitle>
                 <DialogContent className="max-w-md">
                     <Typography variant="h6" className="mb-4">
                         {t("studio_add_kanban_column_title")}

package/src/collection_editor/ui/CollectionViewHeaderAction.tsx

@@ -1,7 +1,6 @@
-import { useTranslation } from "@rebasepro/core";
-import { EntityCollection, EntityTableController, Property } from "@rebasepro/types";
-import { IconButton, Tooltip } from "@rebasepro/ui";
-import { SettingsIcon } from "lucide-react";
+import { useTranslation } from "@rebasepro/app";
+import { CollectionConfig, EntityTableController, Property } from "@rebasepro/types";
+import { IconButton, SettingsIcon, Tooltip } from "@rebasepro/ui";
 import React from "react";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 
@@ -10,7 +9,7 @@ export function CollectionViewHeaderAction({
     onHover,
     property,
     path,
-    parentCollectionIds,
+    parentCollectionSlugs, parentEntityIds,
     collection,
     tableController
 }: {
@@ -18,8 +17,8 @@ export function CollectionViewHeaderAction({
     propertyKey: string,
     onHover: boolean,
     path: string,
-    parentCollectionIds: string[],
-    collection: EntityCollection;
+    parentCollectionSlugs: string[], parentEntityIds: string[],
+    collection: CollectionConfig;
     tableController: EntityTableController;
 }) {
 
@@ -37,7 +36,8 @@ export function CollectionViewHeaderAction({
                         propertyKey,
                         property,
                         editedCollectionId: collection.slug,
-                        parentCollectionIds,
+                        parentCollectionSlugs,
+parentEntityIds,
                         collection,
                         existingEntities: tableController.data ?? []
                     });

package/src/collection_editor/ui/EditorCollectionAction.tsx

@@ -1,14 +1,13 @@
 import { useCollectionRegistryController } from "../_cms_internals";
-import { useAuthController, useTranslation } from "@rebasepro/core";
-import { EntityCollection, CollectionActionsProps } from "@rebasepro/types";
-import { IconButton, Tooltip } from "@rebasepro/ui";
-import { SettingsIcon } from "lucide-react";
+import { useAuthController, useTranslation } from "@rebasepro/app";
+import { CollectionConfig, CollectionActionsProps } from "@rebasepro/types";
+import { IconButton, SettingsIcon, Tooltip } from "@rebasepro/ui";
 
 import { useCollectionEditorController } from "../useCollectionEditorController";
 
 export function EditorCollectionAction({
     path,
-    parentCollectionIds,
+    parentCollectionSlugs, parentEntityIds,
     collection,
     tableController
 }: CollectionActionsProps) {
@@ -18,14 +17,9 @@ export function EditorCollectionAction({
     const collectionEditorController = useCollectionEditorController();
     const { t } = useTranslation();
 
-    const parentCollection = parentCollectionIds.length > 0 ? collectionRegistry.getCollection(parentCollectionIds[parentCollectionIds.length - 1]) : undefined;
+    const parentCollection = parentCollectionSlugs.length > 0 ? collectionRegistry.getCollection(parentCollectionSlugs[parentCollectionSlugs.length - 1]) : undefined;
 
-    const canEditCollection = !collectionEditorController.configController?.readOnly && (collectionEditorController.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user,
-            collection
-        }).editCollections
-        : true);
+    const canEditCollection = !collectionEditorController.configController?.readOnly;
 
     const tooltipTitle = collectionEditorController.configController?.readOnly
         ? (collectionEditorController.configController.readOnlyReason || t("studio_editor_collection_disabled"))
@@ -42,8 +36,9 @@ export function EditorCollectionAction({
                 ? () => collectionEditorController?.editCollection({
                     id: collection.slug,
                     path,
-                    parentCollectionIds,
-                    parentCollection: parentCollection as EntityCollection,
+                    parentCollectionSlugs,
+parentEntityIds,
+                    parentCollection: parentCollection as CollectionConfig,
                     existingEntities: tableController?.data ?? []
                 })
                 : undefined}>

package/src/collection_editor/ui/EditorCollectionActionStart.tsx

@@ -4,10 +4,9 @@ import {
     useAuthController,
     useSnackbarController,
     useTranslation
-} from "@rebasepro/core";
-import { EntityCollection, CollectionActionsProps } from "@rebasepro/types";
-import { Button, Tooltip } from "@rebasepro/ui";
-import { SaveIcon, UndoIcon } from "lucide-react";
+} from "@rebasepro/app";
+import { CollectionConfig, CollectionActionsProps } from "@rebasepro/types";
+import { Button, SaveIcon, Tooltip, UndoIcon } from "@rebasepro/ui";
 
 import { useCollectionEditorController } from "../useCollectionEditorController";
 import { useCollectionsConfigController } from "../useCollectionsConfigController";
@@ -15,7 +14,7 @@ import { mergeDeep } from "@rebasepro/utils";
 
 export function EditorCollectionActionStart({
     path,
-    parentCollectionIds,
+    parentCollectionSlugs, parentEntityIds,
     collection,
     tableController
 }: CollectionActionsProps) {
@@ -26,15 +25,10 @@ export function EditorCollectionActionStart({
     const snackbarController = useSnackbarController();
     const { t } = useTranslation();
 
-    const canEditCollection = collectionEditorController.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user,
-            collection
-        }).editCollections
-        : true;
+    const canEditCollection = !configController.readOnly;
 
     let saveDefaultFilterButton = null;
-    if (!equal(getObjectOrNull(tableController.filterValues), getObjectOrNull(collection.filter)) ||
+    if (!equal(getObjectOrNull(tableController.filterValues), getObjectOrNull(collection.defaultFilter)) ||
         !equal(getObjectOrNull(tableController.sortBy), getObjectOrNull(collection.sort))) {
         saveDefaultFilterButton = <>
             <Tooltip
@@ -46,10 +40,11 @@ export function EditorCollectionActionStart({
                     onClick={() => configController
                         ?.saveCollection({
                             id: collection.slug,
-                            parentCollectionIds,
-                            collectionData: mergeDeep(collection as EntityCollection,
+                            parentCollectionSlugs,
+parentEntityIds,
+                            collectionData: mergeDeep(collection as CollectionConfig,
                                 {
-                                    filter: tableController.filterValues ?? null,
+                                    defaultFilter: tableController.filterValues ?? null,
                                     sort: tableController.sortBy ?? null
                                 })
                         }).then(() => {
@@ -62,15 +57,15 @@ export function EditorCollectionActionStart({
                 </Button>
             </Tooltip>
 
-            {(collection.filter || collection.sort) && <Tooltip
+            {(collection.defaultFilter || collection.sort) && <Tooltip
                 title={t("studio_editor_collection_start_reset_filter")}>
                 <Button
                     size={"small"}
                     variant={"text"}
                     onClick={() => {
                         tableController.clearFilter?.();
-                        if (collection?.filter)
-                            tableController.setFilterValues?.(collection?.filter);
+                        if (collection?.defaultFilter)
+                            tableController.setFilterValues?.(collection?.defaultFilter);
                         if (collection?.sort)
                             tableController.setSortBy?.(collection?.sort);
                     }}>

package/src/collection_editor/ui/EditorEntityAction.tsx

@@ -1,14 +1,13 @@
 import { useCollectionRegistryController } from "../_cms_internals";
-import { useAuthController, useTranslation } from "@rebasepro/core";
-import { EntityCollection, PluginFormActionProps } from "@rebasepro/types";
-import { IconButton, Tooltip } from "@rebasepro/ui";
-import { SettingsIcon } from "lucide-react";
+import { useAuthController, useTranslation } from "@rebasepro/app";
+import { CollectionConfig, PluginFormActionProps } from "@rebasepro/types";
+import { IconButton, SettingsIcon, Tooltip } from "@rebasepro/ui";
 
 import { useCollectionEditorController } from "../useCollectionEditorController";
 
 export function EditorEntityAction({
     path,
-    parentCollectionIds,
+    parentCollectionSlugs, parentEntityIds,
     collection,
     formContext
 }: PluginFormActionProps) {
@@ -18,14 +17,9 @@ export function EditorEntityAction({
     const collectionEditorController = useCollectionEditorController();
     const { t } = useTranslation();
 
-    const parentCollection = parentCollectionIds.length > 0 ? collectionRegistry.getCollection(parentCollectionIds[parentCollectionIds.length - 1]) : undefined;
+    const parentCollection = parentCollectionSlugs.length > 0 ? collectionRegistry.getCollection(parentCollectionSlugs[parentCollectionSlugs.length - 1]) : undefined;
 
-    const canEditCollection = collectionEditorController.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user,
-            collection
-        }).editCollections
-        : true;
+    const canEditCollection = !collectionEditorController.configController?.readOnly;
 
     const isDirty = formContext?.formex.dirty ?? false;
 
@@ -39,8 +33,9 @@ export function EditorEntityAction({
                 ? () => collectionEditorController?.editCollection({
                     id: collection.slug,
                     path,
-                    parentCollectionIds,
-                    parentCollection: parentCollection as EntityCollection
+                    parentCollectionSlugs,
+parentEntityIds,
+                    parentCollection: parentCollection as CollectionConfig
                 })
                 : undefined}>
             <SettingsIcon/>

package/src/collection_editor/ui/HomePageEditorCollectionAction.tsx

@@ -3,10 +3,9 @@ import {
     useAuthController,
     useSnackbarController,
     useTranslation
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { PluginHomePageActionsProps } from "@rebasepro/types";
-import { IconButton, Menu, MenuItem } from "@rebasepro/ui";
-import { CopyIcon, MoreVerticalIcon, SettingsIcon, Trash2Icon } from "lucide-react";
+import { CopyIcon, IconButton, Menu, MenuItem, MoreVerticalIcon, SettingsIcon, Trash2Icon } from "@rebasepro/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 import { useState } from "react";
 import { useCollectionsConfigController } from "../useCollectionsConfigController";
@@ -22,21 +21,15 @@ export function HomePageEditorCollectionAction({
     const collectionEditorController = useCollectionEditorController();
     const { t } = useTranslation();
 
-    const permissions = collectionEditorController?.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user,
-            collection
-        })
-        : {
-            createCollections: false,
-            editCollections: false,
-            deleteCollections: false
-        };
+    const canCreateCollections = !configController.readOnly;
+    const canEditCollections = !configController.readOnly;
+    const canDeleteCollections = !configController.readOnly;
 
     const onEditCollectionClicked = () => {
         collectionEditorController?.editCollection({
             id: collection.slug,
-            parentCollectionIds: []
+            parentCollectionSlugs: [],
+            parentEntityIds: []
         });
     };
 
@@ -45,7 +38,8 @@ export function HomePageEditorCollectionAction({
         // The editor will handle clearing name, path, and id
         collectionEditorController?.createCollection({
             copyFrom: collection,
-            parentCollectionIds: [],
+            parentCollectionSlugs: [],
+            parentEntityIds: [],
             redirect: true,
             sourceClick: "home_page_duplicate"
         });
@@ -66,13 +60,13 @@ export function HomePageEditorCollectionAction({
     return <>
 
         <div>
-            {permissions.deleteCollections &&
+            {canDeleteCollections &&
                 <Menu
                     trigger={<IconButton size={"small"}>
                         <MoreVerticalIcon/>
                     </IconButton>}
                 >
-                    {permissions.createCollections &&
+                    {canCreateCollections &&
                         <MenuItem
                             dense={true}
                             onClick={(event: React.MouseEvent) => {
@@ -99,11 +93,11 @@ export function HomePageEditorCollectionAction({
 
             }
 
-            {permissions.editCollections &&
+            {canEditCollections &&
                 <IconButton
                     size={"small"}
                     onClick={(event: React.MouseEvent) => {
-                        onEditCollectionClicked();
+                         onEditCollectionClicked();
                     }}>
                     <SettingsIcon/>
                 </IconButton>}

package/src/collection_editor/ui/KanbanSetupAction.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { useTranslation } from "@rebasepro/core";
-import { EntityCollection } from "@rebasepro/types";
+import { useTranslation } from "@rebasepro/app";
+import { CollectionConfig } from "@rebasepro/types";
 import { Button } from "@rebasepro/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 
@@ -11,11 +11,12 @@ import { useCollectionEditorController } from "../useCollectionEditorController"
 export function KanbanSetupAction({
     collection,
     fullPath,
-    parentCollectionIds
+    parentCollectionSlugs,
+    parentEntityIds
 }: {
-    collection: EntityCollection;
+    collection: CollectionConfig;
     fullPath: string;
-    parentCollectionIds: string[];
+    parentCollectionSlugs: string[], parentEntityIds: string[];
 }) {
     const collectionEditorController = useCollectionEditorController();
     const { t } = useTranslation();
@@ -23,7 +24,8 @@ export function KanbanSetupAction({
     const handleConfigureClick = () => {
         collectionEditorController.editCollection({
             id: collection.slug,
-            parentCollectionIds,
+            parentCollectionSlugs,
+parentEntityIds,
             initialView: "display",
             expandKanban: true
         });

package/src/collection_editor/ui/MissingReferenceWidget.tsx

@@ -1,5 +1,5 @@
 import { useCollectionRegistryController } from "../_cms_internals";
-import { ErrorView, useTranslation } from "@rebasepro/core";
+import { ErrorView, useTranslation } from "@rebasepro/app";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 import { Button } from "@rebasepro/ui";
 import { prettifyIdentifier } from "@rebasepro/utils";
@@ -10,7 +10,8 @@ export function MissingReferenceWidget({ path: pathProp }: {
 }) {
     const registry = useCollectionRegistryController();
     const path = getLastSegment(pathProp);
-    const parentCollectionIds = registry.getParentCollectionIds(pathProp);
+    const parentCollectionSlugs = registry.getParentCollectionSlugs(pathProp);
+    const parentEntityIds = registry.getParentEntityIds(pathProp);
     const collectionEditor = useCollectionEditorController();
     const { t } = useTranslation();
     return <div className={"p-1 flex flex-col items-center"}>
@@ -21,7 +22,8 @@ export function MissingReferenceWidget({ path: pathProp }: {
                 collectionEditor.createCollection({
                     initialValues: { path,
 name: prettifyIdentifier(path) },
-                    parentCollectionIds,
+                    parentCollectionSlugs,
+parentEntityIds,
                     redirect: false,
                     sourceClick: "missing_reference"
                 });

package/src/collection_editor/ui/NewCollectionButton.tsx

@@ -1,7 +1,6 @@
-import { Button } from "@rebasepro/ui";
-import { PlusIcon } from "lucide-react";
+import { Button, PlusIcon } from "@rebasepro/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";
-import { useAdminModeController, useTranslation } from "@rebasepro/core";
+import { useAdminModeController, useTranslation } from "@rebasepro/app";
 
 export function NewCollectionButton() {
     const adminModeController = useAdminModeController();
@@ -16,7 +15,8 @@ export function NewCollectionButton() {
         <Button className={"min-w-fit"}
 
             onClick={() => collectionEditorController.createCollection({
-                parentCollectionIds: [],
+                parentCollectionSlugs: [],
+                parentEntityIds: [],
                 redirect: true,
                 sourceClick: "new_collection_button"
             })}>

package/src/collection_editor/ui/NewCollectionCard.tsx

@@ -1,10 +1,9 @@
 import {
     useAuthController,
     useTranslation
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { PluginHomePageAdditionalCardsProps } from "@rebasepro/types";
-import { Card, cls, Typography } from "@rebasepro/ui";
-import { PlusIcon } from "lucide-react";
+import { Card, cls, PlusIcon, Typography } from "@rebasepro/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 
 export function NewCollectionCard({
@@ -12,25 +11,21 @@ export function NewCollectionCard({
     context
 }: PluginHomePageAdditionalCardsProps) {
 
-    if (!context.navigationStateController?.topLevelNavigation)
-        return null;
-
     const authController = useAuthController();
-
     const collectionEditorController = useCollectionEditorController();
     const { t } = useTranslation();
-    const canCreateCollections = collectionEditorController.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user
-        }).createCollections
-        : true;
+
+    if (!context.navigationStateController?.topLevelNavigation)
+        return null;
+    const canCreateCollections = !collectionEditorController?.configController?.readOnly;
 
     return (
         <Card className={cls("h-full p-4 min-h-[124px]")}
             onClick={collectionEditorController && canCreateCollections
                 ? () => collectionEditorController.createCollection({
                     initialValues: group ? { group } : undefined,
-                    parentCollectionIds: [],
+                    parentCollectionSlugs: [],
+                    parentEntityIds: [],
                     redirect: true,
                     sourceClick: "new_collection_card"
                 })

package/src/collection_editor/ui/PropertyAddColumnComponent.tsx

@@ -1,34 +1,28 @@
 import {
     useAuthController,
     useTranslation
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { getDefaultPropertiesOrder } from "../_cms_internals";
-import { EntityCollection, EntityTableController } from "@rebasepro/types";
-import { Tooltip } from "@rebasepro/ui";
-import { PlusIcon } from "lucide-react";
+import { CollectionConfig, EntityTableController } from "@rebasepro/types";
+import { PlusIcon, Tooltip } from "@rebasepro/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 
 export function PropertyAddColumnComponent({
     path,
-    parentCollectionIds,
+    parentCollectionSlugs, parentEntityIds,
     collection,
     tableController
 }: {
     path: string,
-    parentCollectionIds: string[],
-    collection: EntityCollection;
+    parentCollectionSlugs: string[], parentEntityIds: string[],
+    collection: CollectionConfig;
     tableController: EntityTableController;
 }) {
 
     const authController = useAuthController();
     const collectionEditorController = useCollectionEditorController();
     const { t } = useTranslation();
-    const canEditCollection = collectionEditorController.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user,
-            collection
-        }).editCollections
-        : true;
+    const canEditCollection = !collectionEditorController.configController?.readOnly;
 
     return (
         <Tooltip
@@ -37,15 +31,16 @@ export function PropertyAddColumnComponent({
             <div
                 className={"p-0.5 w-20 h-full flex items-center justify-center cursor-pointer bg-surface-100/40 bg-surface-100/40 hover:bg-surface-100 dark:bg-surface-900 dark:bg-opacity-40 dark:bg-surface-900/40 dark:hover:bg-surface-800"}
                 // className={onHover ? "bg-white dark:bg-surface-900" : undefined}
-                onClick={() => {
+                onClick={canEditCollection ? () => {
                     collectionEditorController.editProperty({
                         editedCollectionId: collection.slug,
-                        parentCollectionIds,
+                        parentCollectionSlugs,
+parentEntityIds,
                         currentPropertiesOrder: getDefaultPropertiesOrder(collection),
                         collection,
                         existingEntities: tableController.data
                     });
-                }}>
+                } : undefined}>
                 <PlusIcon/>
             </div>
         </Tooltip>