@rebasepro/admin 0.2.4 → 0.2.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/admin",
   "type": "module",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Rebase CMS — content management views, forms, and routing",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -84,13 +84,13 @@
     "react-dropzone": "^14.4.1",
     "react-use-measure": "^2.1.7",
     "zod": "^3.25.76",
-    "@rebasepro/common": "0.2.4",
-    "@rebasepro/formex": "0.2.4",
-    "@rebasepro/core": "0.2.4",
-    "@rebasepro/schema-inference": "0.2.4",
-    "@rebasepro/types": "0.2.4",
-    "@rebasepro/utils": "0.2.4",
-    "@rebasepro/ui": "0.2.4"
+    "@rebasepro/common": "0.2.5",
+    "@rebasepro/core": "0.2.5",
+    "@rebasepro/formex": "0.2.5",
+    "@rebasepro/schema-inference": "0.2.5",
+    "@rebasepro/utils": "0.2.5",
+    "@rebasepro/ui": "0.2.5",
+    "@rebasepro/types": "0.2.5"
   },
   "peerDependencies": {
     "react": ">=19.0.0",

package/src/collection_editor/pgColumnToProperty.ts

@@ -158,12 +158,29 @@ label: prettifyIdentifier(v) })),
             };
 
         case "array":
-        case "ARRAY":
+        case "ARRAY": {
+            let innerType = "string";
+            let colType: ArrayProperty["columnType"] = undefined;
+            if (udt_name === "_text" || udt_name === "_varchar") {
+                innerType = "string";
+                colType = "text[]";
+            } else if (udt_name === "_int4" || udt_name === "_int2" || udt_name === "_int8") {
+                innerType = "number";
+                colType = "integer[]";
+            } else if (udt_name === "_bool") {
+                innerType = "boolean";
+                colType = "boolean[]";
+            } else if (udt_name === "_numeric") {
+                innerType = "number";
+                colType = "numeric[]";
+            }
             return {
                 type: "array",
                 name: prettifiedName,
-                of: { type: "string" }
+                columnType: colType,
+                of: { type: innerType }
             } as ArrayProperty;
+        }
 
         default:
             // Fallback: treat unknown types as string

package/src/components/DefaultDrawer.tsx

@@ -317,7 +317,7 @@ export function DrawerToggle({
     const { t } = useTranslation();
 
     return (
-        <div className="shrink-0 mt-auto px-2 py-2">
+        <div className="shrink-0 mt-auto px-4 pt-0.5 pb-2">
             <Tooltip
                 title={isExpanded ? t("collapse") : t("expand")}
                 side="right"
@@ -486,7 +486,7 @@ export function DrawerFooterActions({
     }
 
     return (
-        <div className="shrink-0 pb-1" ref={portalRef}>
+        <div className="shrink-0 pt-2 pb-0" ref={portalRef}>
             {avatarComponent && (
                 <div className="flex items-center px-[16px] py-1">
                     <Menu

package/src/components/EntityCollectionView/EntityCollectionCardView.tsx

@@ -109,6 +109,8 @@ export function EntityCollectionCardView<M extends Record<string, unknown> = Rec
 
     // Infinite scroll with Intersection Observer — stable deps only
     useEffect(() => {
+        if (!loadMoreRef.current) return;
+
         const observer = new IntersectionObserver(
             (entries) => {
                 const { paginationEnabled: pe, noMoreToLoad: nm, dataLoading: dl, itemCount: ic, pageSize: ps } = paginationStateRef.current;
@@ -124,12 +126,10 @@ export function EntityCollectionCardView<M extends Record<string, unknown> = Rec
             }
         );
 
-        if (loadMoreRef.current) {
-            observer.observe(loadMoreRef.current);
-        }
+        observer.observe(loadMoreRef.current);
 
         return () => observer.disconnect();
-    }, [setItemCount]);
+    }, [setItemCount, data.length]);
 
     // Scroll restoration — deferred to after layout paint
     useEffect(() => {

package/src/components/EntityCollectionView/EntityCollectionListView.tsx

@@ -139,6 +139,13 @@ function getScrollParent(element: HTMLElement | null): HTMLElement | null {
  * PropertyPreview in list row columns (because it would blow up height).
  */
 function isComplexPropertyType(property: Property): boolean {
+    if (property.type === "array") {
+        const ofProp = "of" in property ? property.of : undefined;
+        const innerProp = ofProp ? (Array.isArray(ofProp) ? ofProp[0] : ofProp) : undefined;
+        if (innerProp && typeof innerProp === "object" && "enum" in innerProp && innerProp.enum) {
+            return false;
+        }
+    }
     return property.type === "array"
         || property.type === "map"
         || property.type === "reference"

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -1092,7 +1092,10 @@ export const EntityCollectionView = React.memo(
                 ) : (
                     <div className="flex flex-col w-full h-full">
                         {toolbarNode}
-                        <div className="flex-1 flex flex-col overflow-y-auto">
+                        <div className={cls(
+                            "flex-1 flex flex-col",
+                            viewMode === "list" && "overflow-y-auto"
+                        )}>
                             {viewMode === "list" ? (
                                 <div
                                     className={cls(

package/src/components/RebaseRouteDefs.tsx

@@ -5,13 +5,12 @@ import {
     RebaseRoutes,
     UserSettingsView,
     UIReferenceView,
-    NotFoundPage,
-    useInternalUserManagementController
+    NotFoundPage
 } from "@rebasepro/core";
 import { CircularProgressCenter } from "@rebasepro/ui";
 
 import { ContentHomePage } from "./HomePage/ContentHomePage";
-import { RolesView } from "./admin/RolesView";
+
 import { RebaseRoute } from "../routes/RebaseRoute";
 import { CustomViewRoute } from "../routes/CustomViewRoute";
 import { useNavigationStateController } from "../hooks/navigation/contexts/NavigationStateContext";
@@ -48,7 +47,7 @@ export interface RebaseRouteDefsProps {
  * Route definitions for the CMS.
  *
  * Defines all standard routes: home, studio home, collection view,
- * settings, users, roles, debug, custom views, and a catch-all 404.
+ * settings, debug, custom views, and a catch-all 404.
  *
  * **Independently usable**: Use this when you want Rebase routes
  * inside your own layout/navigation setup.
@@ -64,7 +63,6 @@ export interface RebaseRouteDefsProps {
  */
 export function RebaseRouteDefs({ children, layout }: RebaseRouteDefsProps) {
     const registry = useRebaseRegistry();
-    const userManagement = useInternalUserManagementController();
     const navigationStateController = useNavigationStateController();
 
     const cmsHomePage = registry.cmsConfig?.homePage ?? <Suspense fallback={<CircularProgressCenter/>}><ContentHomePage/></Suspense>;
@@ -85,7 +83,7 @@ export function RebaseRouteDefs({ children, layout }: RebaseRouteDefsProps) {
 
             <Route path={"/c/*"} element={<RebaseRoute/>}/>
             <Route path={"/settings"} element={<SettingsView/>}/>
-            {userManagement && <Route path={"/roles"} element={<RolesView userManagement={userManagement}/>}/>}
+
 
             {/* Hidden debug route */}
             <Route path={"/debug/ui"} element={<UIReferenceView/>}/>

package/src/components/admin/index.ts

@@ -1,3 +1 @@
-export * from "./UsersView";
-export * from "./RolesView";
-export * from "./RoleChip";
+export * from "./CreationResultDialog";

package/src/components/index.ts

@@ -32,9 +32,7 @@ export * from "./field_configs";
 
 export * from "./SideEntityProvider";
 export * from "./AdminModeSyncer";
-// Admin views are lazy-loaded by RebaseRouteDefs and useResolvedViews
-// export * from "./admin/RolesView";
-// export * from "./admin/UsersView";
+// Admin views: only CreationResultDialog remains (used by resetPasswordAction)
 export * from "./app/AppBar";
 export * from "./app/Drawer";
 export * from "./app/Scaffold";

package/src/hooks/navigation/useBuildNavigationStateController.tsx

@@ -33,7 +33,7 @@ export type BuildNavigationStateProps<EC extends EntityCollection, USER extends
  * NavigationStateController. This is a thin composition of three focused hooks:
  *
  * - useResolvedCollections: resolves collection props and registers with CollectionRegistry
- * - useResolvedViews: resolves view/admin view props and injects Users/Roles views
+ * - useResolvedViews: resolves view/admin view props
  * - useTopLevelNavigation: computes the NavigationResult from resolved data
  *
  * The NavigationStateController type is preserved as a public API.
@@ -87,8 +87,7 @@ export function useBuildNavigationStateController<EC extends EntityCollection, U
         data,
         plugins,
         adminMode,
-        effectiveRoleController,
-        userManagement
+        effectiveRoleController
     });
 
     // Step 3: Compute top-level navigation (pure derived state)

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/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,
@@ -97,7 +97,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/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;