@rebasepro/admin 0.1.2 → 0.2.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/admin",
   "type": "module",
-  "version": "0.1.2",
+  "version": "0.2.3",
   "description": "Rebase CMS — content management views, forms, and routing",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -34,12 +34,17 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "development": "./src/index.ts",
+      "development": "./dist/index.js",
       "import": "./dist/index.js"
     },
+    "./editor": {
+      "types": "./dist/editor.d.ts",
+      "development": "./dist/editor.js",
+      "import": "./dist/editor.js"
+    },
     "./collection_editor_ui": {
       "types": "./dist/collection_editor_ui.d.ts",
-      "development": "./src/collection_editor_ui.ts",
+      "development": "./dist/collection_editor_ui.js",
       "import": "./dist/collection_editor_ui.js"
     },
     "./package.json": "./package.json"
@@ -48,42 +53,44 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
-    "@floating-ui/dom": "^1.7.4",
-    "@radix-ui/react-portal": "^1.1.10",
-    "@radix-ui/react-slot": "^1.2.4",
+    "@dnd-kit/utilities": "^3.2.2",
+    "@floating-ui/dom": "^1.7.6",
+    "cmdk": "^1.1.1",
     "date-fns": "^3.6.0",
+    "exceljs": "^4.4.0",
     "fast-equals": "6.0.0",
     "fractional-indexing": "3.2.0",
+    "fuse.js": "^7.3.0",
     "json5": "^2.2.3",
-    "markdown-it": "^14.1.0",
+    "markdown-it": "^14.1.1",
     "markdown-it-ins": "^4.0.0",
     "markdown-it-mark": "^4.0.0",
     "markdown-it-task-lists": "^2.1.1",
     "prism-react-renderer": "^2.4.1",
-    "prosemirror-commands": "^1.6.0",
-    "prosemirror-dropcursor": "^1.8.1",
-    "prosemirror-gapcursor": "^1.3.2",
-    "prosemirror-history": "^1.4.1",
+    "prosemirror-commands": "^1.7.1",
+    "prosemirror-dropcursor": "^1.8.2",
+    "prosemirror-gapcursor": "^1.4.1",
+    "prosemirror-history": "^1.5.0",
     "prosemirror-inputrules": "^1.5.1",
-    "prosemirror-keymap": "^1.2.2",
-    "prosemirror-markdown": "^1.13.0",
-    "prosemirror-model": "^1.22.3",
-    "prosemirror-schema-list": "^1.4.1",
-    "prosemirror-state": "^1.4.3",
+    "prosemirror-keymap": "^1.2.3",
+    "prosemirror-markdown": "^1.13.4",
+    "prosemirror-model": "^1.25.7",
+    "prosemirror-schema-list": "^1.5.1",
+    "prosemirror-state": "^1.4.4",
     "prosemirror-tables": "^1.8.5",
-    "prosemirror-transform": "^1.10.0",
-    "prosemirror-view": "^1.33.8",
-    "react-dropzone": "^14.3.8",
+    "prosemirror-transform": "^1.12.0",
+    "prosemirror-view": "^1.41.8",
+    "react-compiler-runtime": "1.0.0",
+    "react-dropzone": "^14.4.1",
     "react-use-measure": "^2.1.7",
-    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
-    "zod": "^3.25.0",
-    "@rebasepro/common": "0.1.2",
-    "@rebasepro/core": "0.1.2",
-    "@rebasepro/formex": "0.1.2",
-    "@rebasepro/schema-inference": "0.1.2",
-    "@rebasepro/types": "0.1.2",
-    "@rebasepro/ui": "0.1.2",
-    "@rebasepro/utils": "0.1.2"
+    "zod": "^3.25.76",
+    "@rebasepro/common": "0.2.3",
+    "@rebasepro/formex": "0.2.3",
+    "@rebasepro/core": "0.2.3",
+    "@rebasepro/schema-inference": "0.2.3",
+    "@rebasepro/ui": "0.2.3",
+    "@rebasepro/utils": "0.2.3",
+    "@rebasepro/types": "0.2.3"
   },
   "peerDependencies": {
     "react": ">=19.0.0",
@@ -92,21 +99,21 @@
     "react-router-dom": "^7.0.0"
   },
   "devDependencies": {
-    "@jest/globals": "^30.2.0",
-    "@testing-library/react": "^16.3.0",
+    "@jest/globals": "^30.4.1",
+    "@testing-library/react": "^16.3.2",
     "@types/jest": "^29.5.14",
-    "@types/node": "^20.19.17",
-    "@types/react": "^19.0.8",
-    "@types/react-dom": "^19.0.3",
+    "@types/markdown-it": "^14.1.2",
+    "@types/node": "^20.19.41",
+    "@types/react": "^19.2.15",
+    "@types/react-dom": "^19.2.3",
     "@types/react-measure": "^2.0.12",
-    "@vitejs/plugin-react": "^4.3.4",
-    "eslint-plugin-react-compiler": "^19.1.0-rc.2",
+    "@vitejs/plugin-react": "^4.7.0",
     "jest": "^29.7.0",
-    "react-router": "^7.0.0",
-    "react-router-dom": "^7.0.0",
-    "ts-jest": "^29.4.5",
+    "react-router": "^7.15.1",
+    "react-router-dom": "^7.15.1",
+    "ts-jest": "^29.4.10",
     "typescript": "^5.9.3",
-    "vite": "^7.2.4"
+    "vite": "^7.3.3"
   },
   "files": [
     "dist",

package/src/collection_editor/ConfigControllerProvider.tsx

@@ -6,7 +6,7 @@ import { deepEqual as equal } from "fast-equals";
 import { CollectionsConfigController } from "./types/config_controller";
 import { useCustomizationController, useRebaseContext, useAuthController, useSnackbarController } from "@rebasepro/core";
 import { getTableName } from "@rebasepro/common";
-import { useNavigate } from "react-router";
+import { useNavigate } from "react-router-dom";
 import { CollectionEditorController } from "./types/collection_editor_controller";
 import { CollectionEditorPermissionsBuilder } from "./types/config_permissions";
 import { CollectionInference } from "./types/collection_inference";

package/src/collection_editor/ui/AddKanbanColumnAction.tsx

@@ -8,8 +8,18 @@ import {
 import { getPropertyInPath } from "../_cms_internals";
 import { EntityCollection, 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,
+    IconButton,
+    PlusIcon,
+    TextField,
+    Typography
+} from "@rebasepro/ui";
 import { useCollectionsConfigController } from "../useCollectionsConfigController";
 import { toSnakeCase } from "@rebasepro/utils";
 

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 { IconButton, SettingsIcon, Tooltip } from "@rebasepro/ui";
 import React from "react";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 

package/src/collection_editor/ui/EditorCollectionAction.tsx

@@ -1,8 +1,7 @@
 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 { IconButton, SettingsIcon, Tooltip } from "@rebasepro/ui";
 
 import { useCollectionEditorController } from "../useCollectionEditorController";
 

package/src/collection_editor/ui/EditorCollectionActionStart.tsx

@@ -6,8 +6,7 @@ import {
     useTranslation
 } from "@rebasepro/core";
 import { EntityCollection, CollectionActionsProps } from "@rebasepro/types";
-import { Button, Tooltip } from "@rebasepro/ui";
-import { SaveIcon, UndoIcon } from "lucide-react";
+import { Button, SaveIcon, Tooltip, UndoIcon } from "@rebasepro/ui";
 
 import { useCollectionEditorController } from "../useCollectionEditorController";
 import { useCollectionsConfigController } from "../useCollectionsConfigController";

package/src/collection_editor/ui/EditorEntityAction.tsx

@@ -1,8 +1,7 @@
 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 { IconButton, SettingsIcon, Tooltip } from "@rebasepro/ui";
 
 import { useCollectionEditorController } from "../useCollectionEditorController";
 

package/src/collection_editor/ui/HomePageEditorCollectionAction.tsx

@@ -5,8 +5,7 @@ import {
     useTranslation
 } from "@rebasepro/core";
 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";

package/src/collection_editor/ui/NewCollectionButton.tsx

@@ -1,5 +1,4 @@
-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";
 

package/src/collection_editor/ui/NewCollectionCard.tsx

@@ -3,8 +3,7 @@ import {
     useTranslation
 } from "@rebasepro/core";
 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,13 +11,12 @@ export function NewCollectionCard({
     context
 }: PluginHomePageAdditionalCardsProps) {
 
-    if (!context.navigationStateController?.topLevelNavigation)
-        return null;
-
     const authController = useAuthController();
-
     const collectionEditorController = useCollectionEditorController();
     const { t } = useTranslation();
+
+    if (!context.navigationStateController?.topLevelNavigation)
+        return null;
     const canCreateCollections = collectionEditorController.configPermissions
         ? collectionEditorController.configPermissions({
             user: authController.user

package/src/collection_editor/ui/PropertyAddColumnComponent.tsx

@@ -4,8 +4,7 @@ import {
 } from "@rebasepro/core";
 import { getDefaultPropertiesOrder } from "../_cms_internals";
 import { EntityCollection, EntityTableController } from "@rebasepro/types";
-import { Tooltip } from "@rebasepro/ui";
-import { PlusIcon } from "lucide-react";
+import { PlusIcon, Tooltip } from "@rebasepro/ui";
 import { useCollectionEditorController } from "../useCollectionEditorController";
 
 export function PropertyAddColumnComponent({

package/src/collection_editor/ui/collection_editor/AICollectionGeneratorPopover.tsx

@@ -4,8 +4,16 @@ import { useCollectionRegistryController } from "../../_cms_internals";
 import React, { useState } from "react";
 import { useSnackbarController } from "@rebasepro/core";
 import { EntityCollection } from "@rebasepro/types";
-import { Button, CircularProgress, IconButton, Menu, TextField, Tooltip, Typography } from "@rebasepro/ui";
-import { SendIcon } from "lucide-react";
+import {
+    Button,
+    CircularProgress,
+    IconButton,
+    Menu,
+    SendIcon,
+    TextField,
+    Tooltip,
+    Typography
+} from "@rebasepro/ui";
 import {
     CollectionGenerationCallback,
     CollectionGenerationApiError,

package/src/collection_editor/ui/collection_editor/CollectionDetailsForm.tsx

@@ -5,8 +5,24 @@ import React, { useMemo, useState } from "react";
 import { useAuthController, useCustomizationController } from "@rebasepro/core";
 import { getFieldConfig, PropertyConfigBadge, SearchIconsView } from "../../_cms_internals";
 import { EntityCollection, Property } from "@rebasepro/types";
-import { BooleanSwitchWithLabel, Chip, cls, Container, DebouncedTextField, Dialog, IconButton, Select, SelectItem, TextField, Tooltip, Typography, Button, iconSize } from "@rebasepro/ui";
-import { XIcon, HistoryIcon } from "lucide-react";
+import {
+    BooleanSwitchWithLabel,
+    Button,
+    Chip,
+    cls,
+    Container,
+    DebouncedTextField,
+    Dialog,
+    HistoryIcon,
+    IconButton,
+    iconSize,
+    Select,
+    SelectItem,
+    TextField,
+    Tooltip,
+    Typography,
+    XIcon
+} from "@rebasepro/ui";
 
 import { Field, getIn, useFormex } from "@rebasepro/formex";
 import { useCollectionEditorController } from "../../useCollectionEditorController";

package/src/collection_editor/ui/collection_editor/CollectionEditorDialog.tsx

@@ -5,16 +5,30 @@ import * as React from "react";
 import { useEffect, useRef, useState } from "react";
 import { ConfirmationDialog, ErrorView, useAuthController, useCustomizationController, useSnackbarController } from "@rebasepro/core";
 import { CircularProgressCenter } from "@rebasepro/ui";
-import { ArrowLeftIcon, CheckIcon } from "lucide-react";
+import {
+    ArrowLeftIcon,
+    Button,
+    CheckIcon,
+    cls,
+    coolIconKeys,
+    defaultBorderMixin,
+    Dialog,
+    DialogActions,
+    DialogContent,
+    DialogTitle,
+    IconButton,
+    LoadingButton,
+    Tab,
+    Tabs,
+    Typography
+} from "@rebasepro/ui";
 import { Entity, EntityCollection, MapProperty, Properties, Property, PropertyConfig, User, getDataSourceCapabilities } from "@rebasepro/types";
 import type { PostgresCollection } from "@rebasepro/types";
 import { getSubcollections, isPropertyBuilder, removeInitialAndTrailingSlashes, getTableName } from "@rebasepro/common";
-import { Button, cls, coolIconKeys, defaultBorderMixin, Dialog, DialogActions, DialogContent, DialogTitle, IconButton, LoadingButton, Tab, Tabs, Typography } from "@rebasepro/ui";
 import { CollectionEditorSchema } from "./CollectionYupValidation";
 import { GeneralSettingsForm } from "./GeneralSettingsForm";
 import { DisplaySettingsForm } from "./DisplaySettingsForm";
 import { CollectionPropertiesEditorForm } from "./CollectionPropertiesEditorForm";
-import { CollectionRelationsTab } from "./CollectionRelationsTab";
 import { CollectionsConfigController } from "../../types/config_controller";
 import { CollectionEditorWelcomeView } from "./CollectionEditorWelcomeView";
 import { CollectionInference } from "../../types/collection_inference";
@@ -148,7 +162,6 @@ type EditorView = "welcome"
     | "properties"
     | "loading"
     | "extra_view"
-    | "relations"
     | "rls";
 
 export function CollectionEditor(props: CollectionEditorDialogProps & {
@@ -418,7 +431,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                 if (success) {
                     aiModifiedPaths?.clearAllPaths();
                     formexController.resetForm({ values: newCollectionState });
-                    handleClose(newCollectionState as unknown as EntityCollection);
+                    handleClose(newCollectionState as EntityCollection);
                 }
                 return;
             }
@@ -456,7 +469,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                 if (success) {
                     formexController.resetForm({ values: initialValues });
                     setNextMode();
-                    handleClose(newCollectionState as unknown as EntityCollection);
+                    handleClose(newCollectionState as EntityCollection);
                 }
             } else {
                 setNextMode();
@@ -475,7 +488,7 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
     const validation = (col: EntityCollection<M>) => {
 
         let errors: Record<string, string> = {};
-        const schema = (currentView === "properties" || currentView === "relations" || currentView === "general") && CollectionEditorSchema;
+        const schema = (currentView === "properties" || currentView === "general") && CollectionEditorSchema;
         if (schema) {
             const result = schema.safeParse(col);
             if (!result.success) {
@@ -548,8 +561,8 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
     function onImportDataSet(data: object[], propertiesOrder?: string[]) {
         importConfig.setInUse(true);
         buildEntityPropertiesFromData(data, getInferenceType)
-            .then((properties: Record<string, unknown>) => {
-                const res = cleanPropertiesFromImport(properties as unknown as Properties);
+            .then((properties: any) => {
+                const res = cleanPropertiesFromImport(properties as Properties);
 
                 importConfig.setIdColumn(res.idColumn);
                 importConfig.setImportData(data);
@@ -629,9 +642,6 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                             {getDataSourceCapabilities(values.driver).supportsRLS && <Tab value={"rls"}>
                                 RLS
                             </Tab>}
-                            {getDataSourceCapabilities(values.driver).supportsRelations && <Tab value={"relations"}>
-                                Relations
-                            </Tab>}
                         </Tabs>
                     </div>
                     <div className="flex items-center gap-4">
@@ -737,10 +747,6 @@ function CollectionEditorInternal<M extends Record<string, unknown>>({
                             <DisplaySettingsForm expandKanban={expandKanban}/>
                         }
 
-                        {currentView === "relations" && getDataSourceCapabilities(values.driver).supportsRelations &&
-                            <CollectionRelationsTab/>
-                        }
-
                         {currentView === "rls" && getDataSourceCapabilities(values.driver).supportsRLS &&
                             <CollectionRLSTab/>
                         }
@@ -914,7 +920,7 @@ function applyPropertiesConfig(property: Property, propertyConfigs: Record<strin
     if (propertyConfigs && internalProperty && typeof internalProperty === "object" && internalProperty.propertyConfig) {
         const propertyConfig = propertyConfigs[internalProperty.propertyConfig];
         if (propertyConfig && isPropertyBuilder(propertyConfig.property as Property)) {
-            internalProperty = propertyConfig.property as unknown as Property;
+            internalProperty = propertyConfig.property as Property;
         } else {
 
             if (propertyConfig) {

package/src/collection_editor/ui/collection_editor/CollectionEditorWelcomeView.tsx

@@ -3,8 +3,22 @@ import { AIIcon } from "@rebasepro/core";
 import React, { useState } from "react";
 ;
 import { EntityCollection } from "@rebasepro/types";
-import { Button, Card, Chip, cls, Container, Tooltip, Typography , iconSize } from "@rebasepro/ui";
-import { CodeIcon, TableIcon, ShoppingCartIcon, UserIcon, FileTextIcon, FileIcon } from "lucide-react";
+import {
+    Button,
+    Card,
+    Chip,
+    cls,
+    CodeIcon,
+    Container,
+    FileIcon,
+    FileTextIcon,
+    iconSize,
+    ShoppingCartIcon,
+    TableIcon,
+    Tooltip,
+    Typography,
+    UserIcon
+} from "@rebasepro/ui";
 import { CollectionJsonImportDialog } from "./CollectionJsonImportDialog";
 
 import { productsCollectionTemplate } from "./templates/products_template";

package/src/collection_editor/ui/collection_editor/CollectionJsonImportDialog.tsx

@@ -1,7 +1,17 @@
 
 import React, { useCallback, useState } from "react";
-import { Button, cls, Dialog, DialogActions, DialogContent, DialogTitle, Typography , iconSize } from "@rebasepro/ui";
-import { CodeIcon } from "lucide-react";
+import {
+    Alert,
+    Button,
+    cls,
+    CodeIcon,
+    Dialog,
+    DialogActions,
+    DialogContent,
+    DialogTitle,
+    iconSize,
+    Typography
+} from "@rebasepro/ui";
 import { EntityCollection } from "@rebasepro/types";
 import { validateCollectionJson, CollectionValidationError } from "../../validateCollectionJson";
 
@@ -112,13 +122,13 @@ export function CollectionJsonImportDialog({
                 />
 
                 {errors.length > 0 && touched && (
-                    <div className="p-3 bg-red-50 dark:bg-red-900/20 rounded-md border border-red-200 dark:border-red-800">
-                        <Typography variant="body2" className="font-medium text-red-700 dark:text-red-400 mb-2">
+                    <Alert color="error">
+                        <Typography variant="body2" className="font-medium mb-2">
                             Validation errors:
                         </Typography>
                         <ul className="list-disc list-inside space-y-1">
                             {errors.map((error, index) => (
-                                <li key={index} className="text-sm text-red-600 dark:text-red-400">
+                                <li key={index} className="text-sm">
                                     {error.path ? (
                                         <>
                                             <code className="bg-red-100 dark:bg-red-900/40 px-1 rounded">
@@ -132,15 +142,15 @@ export function CollectionJsonImportDialog({
                                 </li>
                             ))}
                         </ul>
-                    </div>
+                    </Alert>
                 )}
 
                 {isValid && (
-                    <div className="p-3 bg-green-50 dark:bg-green-900/20 rounded-md border border-green-200 dark:border-green-800">
-                        <Typography variant="body2" className="text-green-700 dark:text-green-400">
+                    <Alert color="success">
+                        <Typography variant="body2">
                             ✓ JSON is valid and ready to import
                         </Typography>
-                    </div>
+                    </Alert>
                 )}
             </DialogContent>
             <DialogActions>

package/src/collection_editor/ui/collection_editor/CollectionPropertiesEditorForm.tsx

@@ -7,10 +7,21 @@ import {
     useSnackbarController
 } from "@rebasepro/core";
 import { ErrorBoundary } from "@rebasepro/ui";
-import { PlusIcon, CodeIcon, FileSearchIcon } from "lucide-react";
+import {
+    Button,
+    CircularProgress,
+    cls,
+    CodeIcon,
+    DebouncedTextField,
+    defaultBorderMixin,
+    FileSearchIcon,
+    IconButton,
+    PlusIcon,
+    Tooltip,
+    Typography
+} from "@rebasepro/ui";
 import { EntityCollection, MapProperty, Properties, Property, PropertyConfig, User } from "@rebasepro/types";
 import { isPropertyBuilder } from "@rebasepro/common";
-import { Button, CircularProgress, cls, DebouncedTextField, defaultBorderMixin, IconButton, Tooltip, Typography } from "@rebasepro/ui";
 
 import { getFullId, idToPropertiesPath, namespaceToPropertiesOrderPath } from "./util";
 import { OnPropertyChangedParams, PropertyForm, PropertyFormDialog } from "./PropertyEditView";

package/src/collection_editor/ui/collection_editor/CollectionRLSTab.tsx

@@ -13,8 +13,30 @@ function sanitizeSqlIdentifier(name: string): string {
     }
     return `"${name}"`;
 }
-import { Button, IconButton, Typography, cls, defaultBorderMixin, Chip, Paper, Container, Tooltip, CircularProgress, Dialog, DialogTitle, DialogContent, DialogActions, TextField, Select, SelectItem, MultiSelect, MultiSelectItem , iconSize } from "@rebasepro/ui";
-import { KeyIcon, Trash2Icon } from "lucide-react";
+import {
+    Button,
+    Chip,
+    CircularProgress,
+    cls,
+    Container,
+    defaultBorderMixin,
+    Dialog,
+    DialogActions,
+    DialogContent,
+    DialogTitle,
+    IconButton,
+    iconSize,
+    KeyIcon,
+    MultiSelect,
+    MultiSelectItem,
+    Paper,
+    Select,
+    SelectItem,
+    TextField,
+    Tooltip,
+    Trash2Icon,
+    Typography
+} from "@rebasepro/ui";
 import { useFormex } from "@rebasepro/formex";
 import { useRebaseContext } from "@rebasepro/core";
 

package/src/collection_editor/ui/collection_editor/CollectionRelationsTab.tsx

@@ -1,7 +1,26 @@
 
 import React, { useState } from "react";
-import { Button, IconButton, Typography, Table, TableHeader, TableCell, TableBody, TableRow, TextField, Select, SelectItem, Container, Dialog, DialogTitle, DialogContent, DialogActions, cls, defaultBorderMixin } from "@rebasepro/ui";
-import { Trash2Icon } from "lucide-react";
+import {
+    Button,
+    cls,
+    Container,
+    defaultBorderMixin,
+    Dialog,
+    DialogActions,
+    DialogContent,
+    DialogTitle,
+    IconButton,
+    Select,
+    SelectItem,
+    Table,
+    TableBody,
+    TableCell,
+    TableHeader,
+    TableRow,
+    TextField,
+    Trash2Icon,
+    Typography
+} from "@rebasepro/ui";
 import { useFormex } from "@rebasepro/formex";
 import { PostgresCollection, Relation } from "@rebasepro/types";
 import { useCollectionsConfigController } from "../../useCollectionsConfigController";
@@ -148,7 +167,7 @@ relationName: e.target.value } : null)}
                                                 const targetFn = () => collections?.find(c => c.slug === val) || { slug: val };
                                                 (targetFn as { slug?: string }).slug = val;
                                                 return { ...prev,
-target: targetFn as unknown as Relation["target"] };
+target: targetFn as Relation["target"] };
                                             });
                                         }}
                                     >

package/src/collection_editor/ui/collection_editor/CollectionStudioView.tsx

@@ -3,8 +3,7 @@ import { useUnsavedChangesDialog, UnsavedChangesDialog } from "@rebasepro/core";
 import { useUrlController } from "../../_cms_internals";
 import * as React from "react";
 import { useState, useMemo, useEffect } from "react";
-import { Typography, Button } from "@rebasepro/ui";
-import { PlusIcon } from "lucide-react";
+import { Button, PlusIcon, Typography } from "@rebasepro/ui";
 import { useSnackbarController } from "@rebasepro/core";
 import { CollectionEditorDialogProps } from "./CollectionEditorDialog";
 import { AIModifiedPathsProvider } from "./AIModifiedPathsContext";

package/src/collection_editor/ui/collection_editor/CollectionsStudioView.tsx

@@ -4,8 +4,17 @@ import { IconForView } from "@rebasepro/core";
 import { useUrlController } from "../../_cms_internals";
 import React, { useState, useEffect } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
-import { cls, defaultBorderMixin, ResizablePanels, Typography, IconButton, Button , iconSize, Tooltip } from "@rebasepro/ui";
-import { PlusIcon } from "lucide-react";
+import {
+    Button,
+    cls,
+    defaultBorderMixin,
+    IconButton,
+    iconSize,
+    PlusIcon,
+    ResizablePanels,
+    Tooltip,
+    Typography
+} from "@rebasepro/ui";
 ;
 import { CollectionsConfigController } from "../../types/config_controller";
 import { CollectionStudioView } from "./CollectionStudioView";