@rebasepro/admin 0.3.0 → 0.5.0

package/src/hooks/navigation/useResolvedViews.tsx

@@ -1,6 +1,6 @@
 
-import type { AppView, AppViewsBuilder, EffectiveRoleController, EntityCollection, RebasePlugin } from "@rebasepro/types";
-import React, { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { AppView, AppViewsBuilder, EffectiveRoleController, RebasePlugin } from "@rebasepro/types";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
 /**
  * Compare two view arrays by their slug identity.
@@ -17,14 +17,10 @@ function viewSlugsEqual(a: AppView[] | undefined, b: AppView[] | undefined): boo
     return true;
 }
 
-import { AuthController, RebaseData, User } from "@rebasepro/types";
-import { UserManagementDelegate } from "@rebasepro/types";
+import type { AuthController, RebaseData, User } from "@rebasepro/types";
 
 import { resolveAppViews } from "./useNavigationResolution";
 
-
-import { RolesView } from "../../components/admin/RolesView";
-
 export type UseResolvedViewsProps<USER extends User> = {
     authController: AuthController<USER>;
     views?: AppView[] | AppViewsBuilder;
@@ -33,7 +29,6 @@ export type UseResolvedViewsProps<USER extends User> = {
     plugins?: RebasePlugin[];
     adminMode?: "content" | "studio" | "settings";
     effectiveRoleController?: EffectiveRoleController;
-    userManagement?: UserManagementDelegate<USER>;
 };
 
 export type UseResolvedViewsResult = {
@@ -46,8 +41,7 @@ export type UseResolvedViewsResult = {
 
 /**
  * Hook that resolves view and admin view props (which may be async builders or arrays)
- * into concrete AppView[]. Also injects the Roles admin view when userManagement
- * is provided with roles.
+ * into concrete AppView[].
  *
  * Uses refs for potentially-unstable dependencies (driver, authController,
  * plugins) to avoid re-triggering effects when their object identity changes.
@@ -63,8 +57,7 @@ export function useResolvedViews<USER extends User>(
         data,
         plugins,
         adminMode = "content",
-        effectiveRoleController,
-        userManagement
+        effectiveRoleController
     } = props;
 
     const [loading, setLoading] = useState(true);
@@ -110,32 +103,6 @@ export function useResolvedViews<USER extends User>(
     const resolvedAuthControllerRef = useRef(resolvedAuthController);
     resolvedAuthControllerRef.current = resolvedAuthController;
 
-    // Memoize JSX element for injected Roles admin view to ensure stable reference.
-    const hasRoles = !!userManagement?.roles;
-    const rolesViewElement = useMemo(() =>
-        hasRoles ? <RolesView /> : null,
-        [hasRoles]
-    );
-
-    const injectedAdminViews: AppView[] = useMemo(() => {
-        const views: AppView[] = [];
-        const isUserAdmin = userManagement?.isAdmin !== false;
-        if (userManagement && isUserAdmin && userManagement.roles && rolesViewElement) {
-            views.push({
-                slug: "roles",
-                name: "Roles",
-                icon: "Shield",
-                view: rolesViewElement,
-                group: "Settings"
-            });
-        }
-        return views;
-    }, [userManagement, rolesViewElement]);
-
-    // Store injectedAdminViews in a ref for effect access
-    const injectedAdminViewsRef = useRef(injectedAdminViews);
-    injectedAdminViewsRef.current = injectedAdminViews;
-
     const initialLoading = resolvedAuthController.initialLoading;
     const user = resolvedAuthController.user;
 
@@ -146,20 +113,11 @@ export function useResolvedViews<USER extends User>(
 
         (async () => {
             try {
-                const [newViews, newAdminViewsProp] = await Promise.all([
+                const [newViews, newAdminViews] = await Promise.all([
                     resolveAppViews(viewsProp, resolvedAuthControllerRef.current, dataRef.current, pluginsRef.current),
                     resolveAppViews(adminViewsProp, resolvedAuthControllerRef.current, dataRef.current)
                 ]);
 
-                // Generic dedup: developer-provided admin views override any injected ones with the same slug.
-                // No hardcoded slug checks — works for any slug generically.
-                const customSlugs = new Set(newAdminViewsProp.flatMap(v => Array.isArray(v.slug) ? v.slug : [v.slug]));
-                const finalInjected = injectedAdminViewsRef.current.filter(v => {
-                    const slugs = Array.isArray(v.slug) ? v.slug : [v.slug];
-                    return slugs.every(s => !customSlugs.has(s));
-                });
-                const newAdminViews = [...newAdminViewsProp, ...finalInjected];
-
                 // Compare views by slug identity rather than deepEqual.
                 // Views contain React elements (JSX) whose internal properties
                 // change on every render, making deepEqual unreliable.

package/src/hooks/useBuildSideEntityController.tsx

@@ -26,7 +26,7 @@ export function getEntityViewWidth(props: EntitySidePanelProps<any>, small: bool
         selectedSecondaryForm
     } = resolvedSelectedEntityView(props.collection?.entityViews, customizationController, props.selectedTab);
 
-    const shouldUseSmallLayout = !props.selectedTab || props.selectedTab === JSON_TAB_VALUE || props.selectedTab === HISTORY_TAB_VALUE || Boolean(selectedSecondaryForm);
+    const shouldUseSmallLayout = !props.selectedTab || props.selectedTab === "edit" || props.selectedTab === JSON_TAB_VALUE || props.selectedTab === HISTORY_TAB_VALUE || Boolean(selectedSecondaryForm);
 
     let resolvedWidth: string | undefined;
     if (props.width) {
@@ -187,8 +187,8 @@ width: newWidth };
 
         sideDialogsController.open(
             propsToSidePanel({
-                selectedTab: defaultSelectedView,
-                ...props
+                ...props,
+                selectedTab: props.selectedTab ?? defaultSelectedView,
             },
                 urlController.buildUrlCollectionPath,
                 urlController.resolveDatabasePathsFrom,
@@ -241,6 +241,7 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
                 path: navigationEntry.slug,
                 entityId: navigationEntry.entityId,
                 copy: false,
+                collection: navigationEntry.parentCollection,
                 width: navigationEntry.parentCollection?.sideDialogWidth
             };
         } else if (navigationEntry.type === "custom_view") {
@@ -257,6 +258,22 @@ export function buildSidePanelsFromUrl(path: string, collections: EntityCollecti
 
     }
 
+    // When the URL doesn't contain a tab segment but the collection has a
+    // defaultSelectedView, resolve it so the panel opens with the correct
+    // width and the URL is updated on the next replace() cycle.
+    if (sidePanel && !sidePanel.selectedTab && sidePanel.collection) {
+        const defaultView = resolveDefaultSelectedView(
+            sidePanel.collection.defaultSelectedView,
+            {
+                status: sidePanel.copy ? "copy" : (sidePanel.entityId ? "existing" : "new"),
+                entityId: sidePanel.entityId
+            }
+        );
+        if (defaultView) {
+            sidePanel.selectedTab = defaultView;
+        }
+    }
+
     if (newFlag) {
         sidePanel = {
             path: lastCollectionPath,

package/src/index.ts

@@ -45,7 +45,7 @@ export {
     DefaultDrawer,
     DrawerFooterActions,
     AdminModeSyncer,
-    // ContentHomePage, UsersView, RolesView are lazy-loaded — not re-exported here
+    // ContentHomePage is lazy-loaded — not re-exported here
     RebaseCMS,
     RebaseShell,
     RebaseAuthGate,
@@ -53,12 +53,14 @@ export {
     RebaseLayout,
     RebaseRouteDefs,
     SideDialogs,
-    useApp
+    useApp,
+    CollectionPanel
 } from "./components";
 export type {
     EntityViewProps,
     EntitySelectionProps,
-    SelectableTableProps
+    SelectableTableProps,
+    CollectionPanelProps
 } from "./components";
 
 export * from "./hooks";
@@ -97,7 +99,6 @@ export * from "./data_export";
 // Collection editor — moved from @rebasepro/studio (CMS-dependent visual schema editor)
 export * from "./collection_editor";
 
-export { RolesFilterSelect } from "./components/admin/RolesFilterSelect";
-export { UserRolesSelectField } from "./components/admin/UserRolesSelectField";
+
 export { CreationResultDialog } from "./components/admin/CreationResultDialog";
 

package/src/util/entity_view_constants.ts

@@ -0,0 +1,6 @@
+/**
+ * Shared tab value constants used by EntityEditView and EntityDetailView.
+ */
+export const MAIN_TAB_VALUE = "__main_##Q$SC^#S6";
+export const JSON_TAB_VALUE = "__json";
+export const HISTORY_TAB_VALUE = "__rebase_history";

package/src/util/previews.ts

@@ -3,6 +3,11 @@ import { AuthController } from "@rebasepro/types";
 import { isPropertyBuilder } from "@rebasepro/common";
 import { isReferenceProperty, isRelationProperty } from "./property_utils";
 
+function isHiddenProperty(property: Property | undefined): boolean {
+    if (!property) return false;
+    return Boolean(property.ui?.hideFromCollection);
+}
+
 export function getEntityPreviewKeys(
     authController: AuthController,
     targetCollection: EntityCollection<any>,
@@ -26,7 +31,7 @@ export function getEntityPreviewKeys(
             })
             .filter(key => {
                 const property = targetCollection.properties[key];
-                return property && !isPropertyBuilder(property) && !isReferenceProperty(property) && !isRelationProperty(property);
+                return property && !isPropertyBuilder(property) && !isReferenceProperty(property) && !isRelationProperty(property) && !isHiddenProperty(property);
             }).slice(0, limit);
     }
 }
@@ -43,6 +48,9 @@ export function getEntityTitlePropertyKey<M extends Record<string, unknown>>(col
         const property = collection.properties[key];
         if (property && !isPropertyBuilder(property)) {
             const prop = property as Property;
+            if (isHiddenProperty(prop)) {
+                continue;
+            }
             if (prop.type === "string" && !prop.ui?.multiline && !prop.ui?.markdown && !prop.storage && !prop.isId) {
                 if (!firstStringCandidate) {
                     firstStringCandidate = key;

package/src/util/resolutions.ts

@@ -1,10 +1,7 @@
 import { HistoryIcon } from "@rebasepro/ui";
-import React, { lazy } from "react";
-import type { EntityCustomView, EntityCollection } from "@rebasepro/types";
-import type { CustomizationController, EntityAction } from "@rebasepro/types";
+import React from "react";
+import type { CustomizationController, EntityAction, EntityCustomView } from "@rebasepro/types";
 
-// Lazy-load: only resolved when HistoryIcon tab is visited
-const EntityHistoryView = lazy(() => import("../components/history").then(m => ({ default: m.EntityHistoryView })));
 /**
  * Built-in entity views that are resolved by token name.
  * These are always available without needing to be registered
@@ -15,7 +12,6 @@ const BUILTIN_ENTITY_VIEWS: Record<string, EntityCustomView> = {
         key: "__rebase_history",
         name: "History",
         tabComponent: React.createElement(HistoryIcon, { size: 20 }),
-        Builder: EntityHistoryView,
         position: "end"
     }
 };