@rebasepro/admin 0.1.2 → 0.2.1

package/src/components/EntityEditView.tsx

@@ -7,7 +7,21 @@ import { PluginProviderStack, resolveComponentRef } from "@rebasepro/core";
 
 import { EntityCollectionView, EntityView } from "../components";
 import { CircularProgressCenter, iconSize } from "@rebasepro/ui";
-import { CodeIcon, HistoryIcon, Maximize2Icon } from "lucide-react";
+import {
+    CenteredView,
+    CircularProgress,
+    cls,
+    CodeIcon,
+    defaultBorderMixin,
+    HistoryIcon,
+    IconButton,
+    Maximize2Icon,
+    Skeleton,
+    Tab,
+    Tabs,
+    Tooltip,
+    Typography
+} from "@rebasepro/ui";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { ErrorView } from "@rebasepro/core";
 import {
@@ -16,7 +30,6 @@ import {
     resolveDefaultSelectedView
 } from "@rebasepro/common";
 import { resolvedSelectedEntityView } from "../util/resolutions";
-import { CenteredView, CircularProgress, cls, defaultBorderMixin, IconButton, Tab, Tabs, Tooltip, Typography, Skeleton } from "@rebasepro/ui";
 import {
     useCustomizationController,
     useEntityFetch,
@@ -69,7 +82,8 @@ export interface EntityEditViewProps<M extends Record<string, unknown> = Record<
     onValuesModified?: (modified: boolean, values: M) => void;
     onSaved?: (params: OnUpdateParams) => void;
     onTabChange?: (props: OnTabChangeParams<M>) => void;
-    layout?: "side_panel" | "full_screen" | "split";
+    navigateBack?: () => void;
+    layout?: "side_panel" | "full_screen" | "split" | "dialog";
     barActions?: (params: BarActionsParams) => any;
     formProps?: Partial<EntityFormProps<M>>,
     /**
@@ -152,6 +166,7 @@ export function EntityEditViewInner<M extends Record<string, unknown>>({
     onValuesModified,
     onSaved,
     onTabChange,
+    navigateBack,
     entity,
     initialDirtyValues,
     dataLoading,
@@ -209,9 +224,11 @@ export function EntityEditViewInner<M extends Record<string, unknown>>({
         }
     ), [collection, status, entityId]);
 
-    const [selectedTab, setSelectedTab] = useState<string>(selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE);
+    const [selectedTab, setSelectedTab] = useState<string>(
+        selectedTabProp === "edit" ? MAIN_TAB_VALUE : (selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE)
+    );
     useEffect(() => {
-        const target = selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE;
+        const target = selectedTabProp === "edit" ? MAIN_TAB_VALUE : (selectedTabProp ?? defaultSelectedView ?? MAIN_TAB_VALUE);
         if (target !== selectedTab) {
             setSelectedTab(target);
         }
@@ -231,7 +248,7 @@ export function EntityEditViewInner<M extends Record<string, unknown>>({
         selectedSecondaryForm
     } = resolvedSelectedEntityView(customViews, customizationController, selectedTab, canEdit);
 
-    const actionsAtTheBottom = layout === "side_panel" || selectedEntityView?.includeActions === "bottom";
+    const actionsAtTheBottom = layout === "side_panel" || layout === "dialog" || selectedEntityView?.includeActions === "bottom";
 
     const mainViewVisible = selectedTab === MAIN_TAB_VALUE || Boolean(selectedSecondaryForm);
 
@@ -310,7 +327,7 @@ export function EntityEditViewInner<M extends Record<string, unknown>>({
                             parentCollectionSlugs={parentCollectionSlugs} parentEntityIds={parentEntityIds}
                             entity={usedEntity}
                             modifiedValues={usedFormContext?.formex?.values ?? usedEntity?.values}
-                            formContext={usedFormContext as unknown as FormContext<Record<string, unknown>>}
+                            formContext={usedFormContext as FormContext<Record<string, unknown>>}
                         />}
                     </Suspense>
                 </ErrorBoundary>
@@ -424,6 +441,7 @@ export function EntityEditViewInner<M extends Record<string, unknown>>({
         className={cls((!mainViewVisible || !canEdit) && !selectedSecondaryForm ? "hidden" : "", formProps?.className)}
         EntityFormActionsComponent={EntityEditViewFormActions}
         disabled={!canEdit}
+        navigateBack={navigateBack}
         {...formProps}
         onEntityChange={(entity) => {
             setUsedEntity(entity);
@@ -476,14 +494,15 @@ export function EntityEditViewInner<M extends Record<string, unknown>>({
             </Tab>
         );
 
-    const shouldShowTopBar = Boolean(barActions) || hasAdditionalViews || layout === "side_panel";
+    const shouldShowTopBar = Boolean(barActions) || hasAdditionalViews || layout === "side_panel" || layout === "dialog";
 
-    const fullScreenButton = !barActions && (layout === "side_panel" || layout === "split") && entityId ? (
+    const fullScreenButton = !barActions && (layout === "side_panel" || layout === "split" || layout === "dialog") && entityId ? (
         <Tooltip title={"Open full screen"}>
             <IconButton
                 size="small"
                 onClick={() => {
-                    const entityUrl = urlController.buildUrlCollectionPath(`${path}/${entityId}`);
+                    const editSuffix = collection.defaultEntityAction === "view" ? "/edit" : "";
+                    const entityUrl = urlController.buildUrlCollectionPath(`${path}/${entityId}${editSuffix}`);
                     navigate(`${entityUrl}#full`);
                 }}
             >

package/src/components/EntityEditViewFormActions.tsx

@@ -9,8 +9,7 @@ import { copyEntityAction, deleteEntityAction } from "../components";
 import { mergeEntityActions } from "../util/entity_actions";
 import { resolveEntityAction } from "../util/resolutions";
 import { Button, CircularProgress, cls, defaultBorderMixin, DialogActions, IconButton, LoadingButton, Tooltip, Typography } from "@rebasepro/ui";
-import { AlertCircleIcon } from "lucide-react";
-import { iconSize } from "@rebasepro/ui";
+import { AlertCircleIcon, iconSize } from "@rebasepro/ui";
 import {
     useCustomizationController,
     useSnackbarController,
@@ -51,15 +50,16 @@ export function EntityEditViewFormActions({
             .filter(Boolean) as EntityAction[];
         const createEnabled = canCreate(collection, path);
         const deleteEnabled = entity ? canDelete(collection, path, entity) : false;
+        const disableActions = collection.disableDefaultActions ?? [];
         const actions: EntityAction[] = [];
-        if (createEnabled)
+        if (createEnabled && !disableActions.includes("copy"))
             actions.push(copyEntityAction);
-        if (deleteEnabled)
+        if (deleteEnabled && !disableActions.includes("delete"))
             actions.push(deleteEntityAction);
         if (customEntityActions)
             return mergeEntityActions(actions, customEntityActions);
         return actions;
-    }, [canCreate, canDelete, collection, path, customizationController.entityActions?.length, entity]);
+    }, [canCreate, canDelete, collection, path, customizationController.entityActions?.length, entity, collection.disableDefaultActions]);
 
     const formActions = showDefaultActions ? entityActions.filter(a => a.includeInForm === undefined || a.includeInForm) : [];
 
@@ -123,7 +123,7 @@ type ActionsViewProps<M extends Record<string, unknown>> = {
     status: "new" | "existing" | "copy",
     sideDialogContext: SideDialogController,
     pluginActions?: any[],
-    openEntityMode: "side_panel" | "full_screen" | "split";
+    openEntityMode: "side_panel" | "full_screen" | "split" | "dialog";
     navigateBack: () => void;
     formContext: FormContext,
     formex: FormexController<any>;
@@ -151,7 +151,7 @@ function buildBottomActions<M extends Record<string, unknown>>({
 }: ActionsViewProps<M>) {
 
     const hasErrors = Object.keys(formex.errors).length > 0 && formex.submitCount > 0;
-    const canClose = openEntityMode === "side_panel";
+    const canClose = openEntityMode === "side_panel" || openEntityMode === "dialog";
     return <DialogActions
         className={className}
         position={"absolute"}>
@@ -200,6 +200,14 @@ function buildBottomActions<M extends Record<string, unknown>>({
             type="reset">
             {status === "existing" ? t("discard") : t("clear")}
         </Button>
+        {collection.defaultEntityAction === "view" && status === "existing" && (
+            <Button variant="text"
+                color="primary"
+                disabled={disabled}
+                onClick={navigateBack}>
+                {t("back_to_detail") ?? "Back to details"}
+            </Button>
+        )}
         <Button variant={canClose ? "text" : "filled"}
             color="primary"
             type="submit"
@@ -265,6 +273,11 @@ function buildSideActions<M extends Record<string, unknown>>({
         <Button fullWidth={true} variant="text" disabled={disabled || formex.isSubmitting} type="reset">
             {status === "existing" ? t("discard") : t("clear")}
         </Button>
+        {collection.defaultEntityAction === "view" && status === "existing" && (
+            <Button fullWidth={true} variant="text" disabled={disabled} onClick={navigateBack}>
+                {t("back_to_detail") ?? "Back to details"}
+            </Button>
+        )}
 
         {pluginActions}
 

package/src/components/EntityPreview.tsx

@@ -6,8 +6,15 @@ import { useEffect, useMemo } from "react";
 import { Entity } from "@rebasepro/types";
 import type { PreviewSize } from "../types/components/PropertyPreviewProps";
 import { getEntityImagePreviewPropertyKey } from "@rebasepro/common";
-import { cls, defaultBorderMixin, IconButton, Skeleton, Tooltip, Typography } from "@rebasepro/ui";
-import { ArrowRightToLineIcon } from "lucide-react";
+import {
+    ArrowRightToLineIcon,
+    cls,
+    defaultBorderMixin,
+    IconButton,
+    Skeleton,
+    Tooltip,
+    Typography
+} from "@rebasepro/ui";
 import { PropertyPreview, SkeletonPropertyComponent } from "../preview";
 import {
     useAuthController,
@@ -77,6 +84,11 @@ export function EntityPreviewData({
 
     const collection = collectionProp ?? collectionRegistryController.getCollection(entity.path);
 
+    const listProperties = useMemo(() => {
+        if (!collection) return [];
+        return previewKeys ?? getEntityPreviewKeys(authController, collection, customizationController.propertyConfigs, previewKeys, size === "medium" || size === "large" ? 3 : 2);
+    }, [previewKeys, collection, size, authController, customizationController.propertyConfigs]);
+
     if (!collection) {
         return (
             <>
@@ -85,9 +97,6 @@ export function EntityPreviewData({
         );
     }
 
-    const listProperties = useMemo(() => previewKeys ?? getEntityPreviewKeys(authController, collection, customizationController.propertyConfigs, previewKeys, size === "medium" || size === "large" ? 3 : 2),
-        [previewKeys, collection, size]);
-
     const titleProperty = includeTitle ? getEntityTitlePropertyKey(collection, customizationController.propertyConfigs) : undefined;
     const imagePropertyKey = includeImage ? getEntityImagePreviewPropertyKey(collection) : undefined;
     const imageProperty = imagePropertyKey ? collection.properties[imagePropertyKey] : undefined;

package/src/components/EntitySidePanel.tsx

@@ -1,13 +1,13 @@
 import type { EntityCollection } from "@rebasepro/types";
 import type { EntitySidePanelProps } from "@rebasepro/types";
-import React, { useCallback, useEffect, useMemo } from "react";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 
 import type { OnUpdateParams } from "../types/components/EntityFormProps";
 import { ErrorBoundary } from "@rebasepro/ui";
-import { Maximize2Icon, XIcon } from "lucide-react";
+import { IconButton, Maximize2Icon, XIcon } from "@rebasepro/ui";
 import { EntityEditView } from "./EntityEditView";
+import { EntityDetailView } from "./EntityDetailView";
 import { useSideDialogContext } from "./SideDialogs";
-import { IconButton } from "@rebasepro/ui";
 import { useLocation, useNavigate } from "react-router-dom";
 import { removeInitialAndTrailingSlashes } from "@rebasepro/common";
 import { saveEntityToMemoryCache } from "@rebasepro/core";
@@ -28,6 +28,7 @@ export function EntitySidePanel(props: EntitySidePanelProps) {
         allowFullScreen = true,
         path,
         entityId,
+        selectedTab,
         formProps
     } = props;
 
@@ -59,12 +60,13 @@ export function EntitySidePanel(props: EntitySidePanelProps) {
         if (props.onUpdate) {
             props.onUpdate(params);
         }
+        setShowEditInPanel(false);
         if (params.status !== "existing") {
             sideEntityController.replace({
                 path: params.path,
                 entityId: params.entityId,
                 selectedTab: params.selectedTab,
-                updateUrl: true,
+                updateUrl: collection?.openEntityMode !== "dialog",
                 collection: params.collection
             });
         }
@@ -86,6 +88,14 @@ export function EntitySidePanel(props: EntitySidePanelProps) {
 
     const collection = collectionRegistryController.getCollection(path) ?? props.collection;
 
+    const [showEditInPanel, setShowEditInPanel] = useState(selectedTab === "edit");
+    const isDetailMode = collection?.defaultEntityAction === "view" && !showEditInPanel && Boolean(entityId);
+
+    // Reset edit mode when switching entities
+    useEffect(() => {
+        setShowEditInPanel(selectedTab === "edit");
+    }, [entityId, selectedTab]);
+
     // Note: beforeunload is handled by useUnsavedChangesDialog in SideDialogView,
     // which listens to the same `blocked` state via SideDialogContext.
 
@@ -103,64 +113,108 @@ export function EntitySidePanel(props: EntitySidePanelProps) {
     return (
         <>
             <ErrorBoundary>
-                <EntityEditView
-                    {...props}
-                    layout={"side_panel"}
-                    collection={collection as EntityCollection}
-                    parentCollectionSlugs={parentCollectionSlugs} parentEntityIds={parentEntityIds}
-                    onValuesModified={onValuesModified}
-                    onSaved={onUpdate}
-                    barActions={({
-                        status,
-                        values
-                    }) => <div className="flex gap-1">
-                            <IconButton
-                                className="self-center"
-                                size={"small"}
-                                onClick={onClose}>
-                                <XIcon/>
-                            </IconButton>
-                            {allowFullScreen && <IconButton
-                                className="self-center"
-                                size={"small"}
-                                onClick={() => {
-                                    const key = (status === "new" || status === "copy") ? path + "#new" : path + "/" + entityId;
-                                    saveEntityToMemoryCache(key, values);
-                                    // Clear blocked so no unsaved-changes dialog fires
-                                    setBlocked(false);
-                                    setBlockedNavigationMessage(undefined);
-                                    // IMPORTANT: useLocation() returns the frozen base_location from RebaseRoutes
-                                    // (the collection URL), not the actual browser URL.
-                                    // Build the full-screen URL directly from props using urlController.
-                                    if (entityId) {
-                                        const fullScreenUrl = urlController.buildUrlCollectionPath(`${path}/${entityId}`);
-                                        navigate(fullScreenUrl, { state: null });
-                                    } else {
-                                        const fullScreenUrl = urlController.buildUrlCollectionPath(path);
-                                        navigate(fullScreenUrl + "#new", { state: null });
-                                    }
-                                }}>
-                                <Maximize2Icon/>
-                            </IconButton>}
-                        </div>}
-                    onTabChange={({
-                        entityId,
-                        selectedTab,
-                        collection
-                    }) => {
-                        // Only update the URL to reflect the new tab — don't call
-                        // sideEntityController.replace() which would recreate the
-                        // entire EntitySidePanel component, causing a full
-                        // unmount/remount and expensive re-render of the form.
-                        if (entityId) {
-                            const collectionPath = removeInitialAndTrailingSlashes(path);
-                            const tabSuffix = selectedTab ? "/" + selectedTab : "";
-                            const fullUrl = urlController.buildUrlCollectionPath(`${collectionPath}/${entityId}${tabSuffix}#side`);
-                            navigate(fullUrl, { replace: true, state: location.state });
-                        }
-                    }}
-                    formProps={formProps}
-                />
+                {isDetailMode
+                    ? <EntityDetailView
+                        path={path}
+                        layout={collection?.openEntityMode === "dialog" ? "dialog" : "side_panel"}
+                        collection={collection as EntityCollection}
+                        entityId={entityId!}
+                        parentCollectionSlugs={parentCollectionSlugs}
+                        parentEntityIds={parentEntityIds}
+                        onEditClick={() => setShowEditInPanel(true)}
+                        barActions={({
+                            status,
+                            values
+                        }) => <div className="flex gap-1">
+                                <IconButton
+                                    className="self-center"
+                                    size={"small"}
+                                    onClick={onClose}>
+                                    <XIcon/>
+                                </IconButton>
+                                {allowFullScreen && <IconButton
+                                    className="self-center"
+                                    size={"small"}
+                                    onClick={() => {
+                                        if (entityId) {
+                                            const fullScreenUrl = urlController.buildUrlCollectionPath(`${path}/${entityId}`);
+                                            navigate(fullScreenUrl, { state: null });
+                                        }
+                                    }}>
+                                    <Maximize2Icon/>
+                                </IconButton>}
+                            </div>}
+                        onTabChange={({
+                            entityId: tabEntityId,
+                            selectedTab,
+                            collection: paramCollection
+                        }) => {
+                            if (collection?.openEntityMode === "dialog" || paramCollection?.openEntityMode === "dialog") {
+                                return;
+                            }
+                            if (tabEntityId) {
+                                const collectionPath = removeInitialAndTrailingSlashes(path);
+                                const tabSuffix = selectedTab ? "/" + selectedTab : "";
+                                const fullUrl = urlController.buildUrlCollectionPath(`${collectionPath}/${tabEntityId}${tabSuffix}#side`);
+                                navigate(fullUrl, { replace: true, state: location.state });
+                            }
+                        }}
+                    />
+                    : <EntityEditView
+                        {...props}
+                        layout={collection?.openEntityMode === "dialog" ? "dialog" : "side_panel"}
+                        collection={collection as EntityCollection}
+                        parentCollectionSlugs={parentCollectionSlugs} parentEntityIds={parentEntityIds}
+                        onValuesModified={onValuesModified}
+                        onSaved={onUpdate}
+                        navigateBack={() => setShowEditInPanel(false)}
+                        barActions={({
+                            status,
+                            values
+                        }) => <div className="flex gap-1">
+                                <IconButton
+                                    className="self-center"
+                                    size={"small"}
+                                    onClick={onClose}>
+                                    <XIcon/>
+                                </IconButton>
+                                {allowFullScreen && <IconButton
+                                    className="self-center"
+                                    size={"small"}
+                                    onClick={() => {
+                                        const key = (status === "new" || status === "copy") ? path + "#new" : path + "/" + entityId;
+                                        saveEntityToMemoryCache(key, values);
+                                        setBlocked(false);
+                                        setBlockedNavigationMessage(undefined);
+                                        if (entityId) {
+                                            const fullScreenUrl = urlController.buildUrlCollectionPath(`${path}/${entityId}`);
+                                            navigate(fullScreenUrl, { state: null });
+                                        } else {
+                                            const fullScreenUrl = urlController.buildUrlCollectionPath(path);
+                                            navigate(fullScreenUrl + "#new", { state: null });
+                                        }
+                                    }}>
+                                    <Maximize2Icon/>
+                                </IconButton>}
+                            </div>}
+                        onTabChange={({
+                            entityId,
+                            selectedTab,
+                            collection: paramCollection
+                        }) => {
+                            if (collection?.openEntityMode === "dialog" || paramCollection?.openEntityMode === "dialog") {
+                                return;
+                            }
+                            if (entityId) {
+                                const collectionPath = removeInitialAndTrailingSlashes(path);
+                                const tabSuffix = selectedTab ? "/" + selectedTab : "";
+                                const fullUrl = urlController.buildUrlCollectionPath(`${collectionPath}/${entityId}${tabSuffix}#side`);
+                                navigate(fullUrl, { replace: true, state: location.state });
+                            }
+                        }}
+                        formProps={formProps}
+                    />
+                }
             </ErrorBoundary>
 
         </>

package/src/components/EntityView.tsx

@@ -3,8 +3,7 @@ import type { EntityCollection } from "@rebasepro/types";
 import type { CustomizationController } from "@rebasepro/types";
 import React from "react";
 import { Entity } from "@rebasepro/types";
-import { cls, defaultBorderMixin, IconButton, Typography } from "@rebasepro/ui";
-import { ExternalLinkIcon } from "lucide-react";
+import { cls, defaultBorderMixin, ExternalLinkIcon, IconButton, Typography } from "@rebasepro/ui";
 ;
 import { useCustomizationController } from "@rebasepro/core";
 import { useAuthController } from "@rebasepro/core";

package/src/components/HomePage/ContentHomePage.tsx

@@ -362,7 +362,7 @@ export function ContentHomePage({
                     modifiers={dndModifiers}
                 >
                     <SortableContext
-                        key={JSON.stringify(containers)}
+                        key={containers.join(",")}
                         items={containers}
                         strategy={verticalListSortingStrategy}
                     >

package/src/components/HomePage/FavouritesView.tsx

@@ -1,8 +1,7 @@
 import type { NavigationEntry } from "@rebasepro/types";
 import { useNavigate } from "react-router-dom";
 ;
-import { Chip, Collapse } from "@rebasepro/ui";
-import { StarIcon } from "lucide-react";
+import { Chip, Collapse, StarIcon } from "@rebasepro/ui";
 import { useUserConfigurationPersistence } from "@rebasepro/core";
 import { useNavigationStateController } from "../../index";
 

package/src/components/HomePage/NavigationCard.tsx

@@ -1,5 +1,4 @@
-import { Card, cls, Markdown, Typography } from "@rebasepro/ui";
-import { ArrowRightIcon } from "lucide-react";
+import { ArrowRightIcon, Card, cls, Markdown, Typography } from "@rebasepro/ui";
 import React from "react";
 
 export type NavigationCardProps = {

package/src/components/HomePage/NavigationCardBinding.tsx

@@ -1,8 +1,7 @@
 import type { NavigationEntry, EntityCollection } from "@rebasepro/types";
 import { useNavigate } from "react-router-dom";
 ;
-import { IconButton, Tooltip } from "@rebasepro/ui";
-import { StarIcon } from "lucide-react";
+import { IconButton, StarIcon, Tooltip } from "@rebasepro/ui";
 import { NavigationCard } from "./NavigationCard";
 import { SmallNavigationCard } from "./SmallNavigationCard";
 import React from "react";

package/src/components/HomePage/NavigationGroup.tsx

@@ -1,6 +1,5 @@
 import React, { PropsWithChildren, useState } from "react";
-import { cls, IconButton, Typography, ExpandablePanel , iconSize } from "@rebasepro/ui";
-import { PencilIcon } from "lucide-react";
+import { cls, ExpandablePanel, IconButton, iconSize, PencilIcon, Typography } from "@rebasepro/ui";
 import { useTranslation } from "@rebasepro/core";
 
 export function NavigationGroup({

package/src/components/HomePage/SmallNavigationCard.tsx

@@ -1,5 +1,4 @@
-import { cardClickableMixin, cardMixin, cls, Typography } from "@rebasepro/ui";
-import { ArrowRightIcon } from "lucide-react";
+import { ArrowRightIcon, cardClickableMixin, cardMixin, cls, Typography } from "@rebasepro/ui";
 
 import { Link } from "react-router-dom";
 

package/src/components/PropertyIdCopyTooltip.tsx

@@ -1,5 +1,4 @@
-import { IconButton, Tooltip, Typography } from "@rebasepro/ui";
-import { CopyIcon } from "lucide-react";
+import { CopyIcon, IconButton, Tooltip, Typography } from "@rebasepro/ui";
 import { useCallback, useState } from "react";
 
 export function PropertyIdCopyTooltip({

package/src/components/RebaseAuthGate.tsx

@@ -5,6 +5,7 @@ import {
 } from "@rebasepro/core";
 import { CircularProgressCenter } from "@rebasepro/ui";
 import { LoginView } from "@rebasepro/core";
+import type { AuthControllerExtended } from "@rebasepro/types";
 
 /**
  * Auth gate component that handles the authentication flow.
@@ -27,7 +28,6 @@ export function RebaseAuthGate({ children }: { children: React.ReactNode }) {
     const registry = useRebaseRegistry();
     const authController = useAuthController();
 
-    console.log("[AuthGate] initialLoading:", authController?.initialLoading, "user:", authController?.user?.email ?? null);
 
     if (authController?.initialLoading) {
         return <CircularProgressCenter size={"large"}/>;
@@ -35,7 +35,7 @@ export function RebaseAuthGate({ children }: { children: React.ReactNode }) {
 
     if (!authController?.user) {
         const ActiveLoginView = registry.authConfig?.loginView ?? (
-            <LoginView authController={authController as any}/>
+            <LoginView authController={authController as AuthControllerExtended}/>
         );
         return <>{ActiveLoginView}</>;
     }

package/src/components/RebaseNavigation.tsx

@@ -13,10 +13,12 @@ import {
     CustomizationControllerContext
 } from "@rebasepro/core";
 import { CircularProgressCenter } from "@rebasepro/ui";
-import type { AppView, CollectionEditorOptions, EntityCustomView, EntityAction } from "@rebasepro/types";
+import type { AppView, CollectionEditorOptions, EntityCustomView, EntityAction, EntityCollection } from "@rebasepro/types";
+import type { CollectionRegistryController } from "@rebasepro/types";
+import type { UrlController, NavigationStateController } from "@rebasepro/types";
 
-const EMPTY_PLUGINS: any[] = [];
-const EMPTY_COLLECTIONS: any[] = [];
+const EMPTY_PLUGINS: unknown[] = [];
+const EMPTY_COLLECTIONS: EntityCollection[] = [];
 
 import { useBuildNavigationStateController } from "../hooks/navigation/useBuildNavigationStateController";
 import { useBuildUrlController } from "../hooks/navigation/useBuildUrlController";
@@ -146,7 +148,7 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
         collectionRegistryController,
         urlController,
         adminMode: adminModeController?.mode,
-        userManagement: userManagement as any
+        userManagement
     });
 
     // ── Merge CMS-registered entityViews/entityActions into the customization controller ──
@@ -222,9 +224,9 @@ function BridgeAutoRegistrar({
     urlController,
     navigationStateController
 }: {
-    collectionRegistryController: any;
-    urlController: any;
-    navigationStateController: any;
+    collectionRegistryController: CollectionRegistryController;
+    urlController: UrlController;
+    navigationStateController: NavigationStateController;
 }) {
     useBridgeRegistration("collectionRegistry", collectionRegistryController);
     useBridgeRegistration("urlController", urlController);

package/src/components/ReferenceTable/EntitySelectionTable.tsx

@@ -15,8 +15,7 @@ import {
     usePermissions
 } from "@rebasepro/core";
 import { ErrorView } from "@rebasepro/core";
-import { Button, DialogActions, Typography } from "@rebasepro/ui";
-import { PlusIcon } from "lucide-react";
+import { Button, DialogActions, PlusIcon, Typography } from "@rebasepro/ui";
 import { IconForView } from "@rebasepro/core";
 import { useSelectionController } from "../EntityCollectionView/useSelectionController";
 
@@ -92,6 +91,16 @@ export interface EntitySelectionProps<M extends Record<string, unknown>> {
  * @group Components
  */
 export function EntitySelectionTable<M extends Record<string, unknown>>(
+    props: EntitySelectionProps<M>
+) {
+    if (!props.collection) {
+        return <ErrorView
+            error={"Could not find collection"}/>
+    }
+    return <EntitySelectionTableInternal {...props} collection={props.collection} />;
+}
+
+function EntitySelectionTableInternal<M extends Record<string, unknown>>(
     {
         onSingleEntitySelected,
         onMultipleEntitiesSelected,
@@ -102,7 +111,7 @@ export function EntitySelectionTable<M extends Record<string, unknown>>(
         description,
         fixedFilter,
         maxSelection
-    }: EntitySelectionProps<M>) {
+    }: EntitySelectionProps<M> & { collection: EntityCollection<M> }) {
 
     const sideDialogContext = useSideDialogContext();
     const sideEntityController = useSideEntityController();
@@ -248,11 +257,6 @@ export function EntitySelectionTable<M extends Record<string, unknown>>(
         sideDialogContext.close(false);
     }, [sideDialogContext]);
 
-    if (!collection) {
-        return <ErrorView
-            error={"Could not find collection with id " + collection}/>
-    }
-
     const displayedColumnIds = useColumnIds(collection, false);
 
     const tableController = useDataTableController<M>({