@rebasepro/admin 0.2.3 → 0.3.0

package/src/form/field_bindings/UserSelectFieldBinding.tsx

@@ -19,18 +19,18 @@ type UserSelectProps = FieldProps<StringProperty>;
  * @group Form fields
  */
 export function UserSelectFieldBinding({
-    propertyKey,
-    value,
-    setValue,
-    error,
-    showError,
-    disabled,
-    autoFocus,
-    touched,
-    property,
-    includeDescription,
-    size = "large"
-}: UserSelectProps) {
+                                           propertyKey,
+                                           value,
+                                           setValue,
+                                           error,
+                                           showError,
+                                           disabled,
+                                           autoFocus,
+                                           touched,
+                                           property,
+                                           includeDescription,
+                                           size = "large"
+                                       }: UserSelectProps) {
 
     const selectorSize: "small" | "medium" | undefined = size === "large" ? "medium" : size;
 
@@ -46,7 +46,7 @@ export function UserSelectFieldBinding({
             </PropertyIdCopyTooltip>
 
             <UserSelector
-                value={value ?? null}
+                value={value as string | null | undefined}
                 onValueChange={(userId) => {
                     setValue(userId);
                 }}
@@ -56,10 +56,10 @@ export function UserSelectFieldBinding({
             />
 
             <FieldHelperText includeDescription={includeDescription}
-                showError={showError}
-                error={error}
-                disabled={disabled}
-                property={property}/>
+                             showError={showError}
+                             error={error}
+                             disabled={disabled}
+                             property={property}/>
 
         </>
     );

package/src/form/validation.ts

@@ -7,7 +7,7 @@ import { getValueInPath, hydrateRegExp } from "@rebasepro/utils";
 
 export type CustomFieldValidator = (props: {
     name: string,
-    value: any,
+    value: unknown,
     property: Property,
     entityId?: string | number,
     parentProperty?: MapProperty | ArrayProperty,
@@ -18,13 +18,13 @@ interface PropertyContext<P extends Property> {
     parentProperty?: MapProperty | ArrayProperty,
     entityId?: string | number,
     customFieldValidator?: CustomFieldValidator,
-    name?: any
+    name?: string
 }
 
 export function getEntitySchema<M extends Record<string, unknown>>(
     entityId: string | number | undefined,
     properties: Properties,
-    customFieldValidator?: CustomFieldValidator): z.ZodObject<any> {
+    customFieldValidator?: CustomFieldValidator): z.ZodObject<Record<string, ZodTypeAny>> {
     const shape: Record<string, ZodTypeAny> = {};
     Object.entries(properties as Record<string, Property>)
         .forEach(([name, property]) => {
@@ -153,14 +153,14 @@ function getZodStringSchema({
         const allowedValues = (isRequired ? entries : [...entries, null])
             .map((enumValueConfig) => enumValueConfig?.id ?? null);
         schema = schema.refine(
-            (value: any) => allowedValues.includes(value),
+            (value: unknown) => allowedValues.includes(value as string | null),
             { message: `Must be one of: ${allowedValues.filter(Boolean).join(", ")}` }
         );
     }
 
     if (isRequired && !property.enum) {
         schema = schema.refine(
-            (value: any) => value !== undefined && value !== null && value !== "",
+            (value: unknown) => value !== undefined && value !== null && value !== "",
             { message: validation?.requiredMessage ? validation.requiredMessage : "Required" }
         );
     }
@@ -168,36 +168,36 @@ function getZodStringSchema({
     if (validation) {
 
         if (validation.min || validation.min === 0) schema = schema.refine(
-            (value: any) => value == null || value.length >= validation.min!,
+            (value: unknown) => value == null || (typeof value === "string" && value.length >= validation.min!),
             { message: `${property.name} must be min ${validation.min} characters long` }
         );
         if (validation.max || validation.max === 0) schema = schema.refine(
-            (value: any) => value == null || value.length <= validation.max!,
+            (value: unknown) => value == null || (typeof value === "string" && value.length <= validation.max!),
             { message: `${property.name} must be max ${validation.max} characters long` }
         );
         if (validation.matches) {
             const regExp = typeof validation.matches === "string" ? hydrateRegExp(validation.matches) : validation.matches;
             if (regExp) {
                 schema = schema.refine(
-                    (value: any) => value == null || regExp.test(value),
+                    (value: unknown) => value == null || (typeof value === "string" && regExp.test(value)),
                     { message: validation.matchesMessage ?? "Invalid format" }
                 );
             }
         }
-        if (validation.trim) schema = z.preprocess((v: any) => typeof v === "string" ? v.trim() : v, schema);
-        if (validation.lowercase) schema = z.preprocess((v: any) => typeof v === "string" ? v.toLowerCase() : v, schema);
-        if (validation.uppercase) schema = z.preprocess((v: any) => typeof v === "string" ? v.toUpperCase() : v, schema);
+        if (validation.trim) schema = z.preprocess((v: unknown) => typeof v === "string" ? v.trim() : v, schema);
+        if (validation.lowercase) schema = z.preprocess((v: unknown) => typeof v === "string" ? v.toLowerCase() : v, schema);
+        if (validation.uppercase) schema = z.preprocess((v: unknown) => typeof v === "string" ? v.toUpperCase() : v, schema);
         if (property.email) schema = schema.refine(
-            (value: any) => value == null || /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value),
+            (value: unknown) => value == null || (typeof value === "string" && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)),
             { message: `${property.name} must be an email` }
         );
         if (property.ui?.url) {
             if (!property.storage || property.storage?.storeUrl) {
                 schema = schema.refine(
-                    (value: any) => {
+                    (value: unknown) => {
                         if (value == null) return true;
                         try {
-                            new URL(value);
+                            new URL(value as string);
                             return true;
                         } catch {
                             return false;
@@ -236,7 +236,7 @@ function getZodNumberSchema({
 
     if (isRequired) {
         schema = schema.refine(
-            (value: any) => value !== undefined && value !== null,
+            (value: unknown) => value !== undefined && value !== null,
             { message: validation?.requiredMessage ? validation.requiredMessage : "Required" }
         );
     }
@@ -244,31 +244,31 @@ function getZodNumberSchema({
     if (validation) {
 
         if (validation.min || validation.min === 0) schema = schema.refine(
-            (value: any) => value == null || value >= validation.min!,
+            (value: unknown) => value == null || (typeof value === "number" && value >= validation.min!),
             { message: `${property.name} must be higher or equal to ${validation.min}` }
         );
         if (validation.max || validation.max === 0) schema = schema.refine(
-            (value: any) => value == null || value <= validation.max!,
+            (value: unknown) => value == null || (typeof value === "number" && value <= validation.max!),
             { message: `${property.name} must be lower or equal to ${validation.max}` }
         );
         if (validation.lessThan || validation.lessThan === 0) schema = schema.refine(
-            (value: any) => value == null || value < validation.lessThan!,
+            (value: unknown) => value == null || (typeof value === "number" && value < validation.lessThan!),
             { message: `${property.name} must be higher than ${validation.lessThan}` }
         );
         if (validation.moreThan || validation.moreThan === 0) schema = schema.refine(
-            (value: any) => value == null || value > validation.moreThan!,
+            (value: unknown) => value == null || (typeof value === "number" && value > validation.moreThan!),
             { message: `${property.name} must be lower than ${validation.moreThan}` }
         );
         if (validation.positive) schema = schema.refine(
-            (value: any) => value == null || value > 0,
+            (value: unknown) => value == null || (typeof value === "number" && value > 0),
             { message: `${property.name} must be positive` }
         );
         if (validation.negative) schema = schema.refine(
-            (value: any) => value == null || value < 0,
+            (value: unknown) => value == null || (typeof value === "number" && value < 0),
             { message: `${property.name} must be negative` }
         );
         if (validation.integer) schema = schema.refine(
-            (value: any) => value == null || Number.isInteger(value),
+            (value: unknown) => value == null || (typeof value === "number" && Number.isInteger(value)),
             { message: `${property.name} must be an integer` }
         );
     }
@@ -288,7 +288,7 @@ function getZodGeoPointSchema({
 
     if (validation?.required) {
         schema = schema.refine(
-            (value: any) => value !== undefined && value !== null,
+            (value: unknown) => value !== undefined && value !== null,
             { message: validation.requiredMessage ? validation.requiredMessage : "Required" }
         );
     }
@@ -315,17 +315,17 @@ function getZodDateSchema({
     if (validation) {
         if (validation.required) {
             schema = schema.refine(
-                (value: any) => value !== undefined && value !== null,
+                (value: unknown) => value !== undefined && value !== null,
                 { message: validation?.requiredMessage ? validation.requiredMessage : "Required" }
             );
         }
 
         if (validation.min) schema = schema.refine(
-            (value: any) => value == null || value >= validation.min!,
+            (value: unknown) => value == null || (value instanceof Date && value >= validation.min!),
             { message: `${property.name} must be after ${validation.min}` }
         );
         if (validation.max) schema = schema.refine(
-            (value: any) => value == null || value <= validation.max!,
+            (value: unknown) => value == null || (value instanceof Date && value <= validation.max!),
             { message: `${property.name} must be before ${validation.min}` }
         );
     }
@@ -345,7 +345,7 @@ function getZodReferenceSchema({
     if (validation) {
         if (validation.required) {
             schema = schema.refine(
-                (value: any) => value !== undefined && value !== null,
+                (value: unknown) => value !== undefined && value !== null,
                 { message: validation?.requiredMessage ? validation.requiredMessage : "Required" }
             );
         }
@@ -370,7 +370,7 @@ function getZodRelationSchema({
     if (validation) {
         if (validation.required) {
             schema = schema.refine(
-                (value: any) => {
+                (value: unknown) => {
                     if (isMany) {
                         return value !== undefined && value !== null && Array.isArray(value) && value.length > 0;
                     }
@@ -397,7 +397,7 @@ function getZodBooleanSchema({
     if (validation) {
         if (validation.required) {
             schema = schema.refine(
-                (value: any) => value !== undefined && value !== null,
+                (value: unknown) => value !== undefined && value !== null,
                 { message: validation?.requiredMessage ? validation.requiredMessage : "Required" }
             );
         }
@@ -480,13 +480,13 @@ function getZodArraySchema({
             if (arrayUniqueFields) {
                 if (typeof arrayUniqueFields === "boolean") {
                     arraySchema = arraySchema.refine(
-                        (values: any) => !values || values.length === new Set(values.map((v: any) => v)).size,
+                        (values: unknown) => !values || !Array.isArray(values) || values.length === new Set(values).size,
                         { message: `${property.name} should have unique values within the array` }
                     );
                 } else if (Array.isArray(arrayUniqueFields)) {
                     arrayUniqueFields.forEach(([fieldName, childProperty]) => {
                         arraySchema = arraySchema.refine(
-                            (values: any) => !values || values.length === new Set(values.map((v: any) => v && v[fieldName])).size,
+                            (values: unknown) => !values || !Array.isArray(values) || values.length === new Set(values.map((v: unknown) => v && typeof v === "object" ? (v as Record<string, unknown>)[fieldName] : v)).size,
                             { message: `${property.name} → ${childProperty.name ?? fieldName}: should have unique values within the array` }
                         );
                     });
@@ -499,22 +499,22 @@ function getZodArraySchema({
     if (validation) {
         if (validation.required) {
             arraySchema = arraySchema.refine(
-                (value: any) => value !== undefined && value !== null && value.length > 0,
+                (value: unknown) => value !== undefined && value !== null && Array.isArray(value) && value.length > 0,
                 { message: validation?.requiredMessage ? validation.requiredMessage : "Required" }
             );
         }
         if (validation.min || validation.min === 0) arraySchema = arraySchema.refine(
-            (value: any) => !value || value.length >= validation.min!,
+            (value: unknown) => !value || !Array.isArray(value) || value.length >= validation.min!,
             { message: `${property.name} should be min ${validation.min} entries long` }
         );
         if (validation.max) arraySchema = arraySchema.refine(
-            (value: any) => !value || value.length <= validation.max!,
+            (value: unknown) => !value || !Array.isArray(value) || value.length <= validation.max!,
             { message: `${property.name} should be max ${validation.max} entries long` }
         );
         // Handle uniqueInArray at the array level
         if (validation.uniqueInArray) {
             arraySchema = arraySchema.refine(
-                (values: any) => !values || values.length === new Set(values.map((v: any) => v)).size,
+                (values: unknown) => !values || !Array.isArray(values) || values.length === new Set(values).size,
                 { message: `${property.name} should have unique values within the array` }
             );
         }
@@ -526,12 +526,12 @@ function getZodVectorSchema({
     property
 }: PropertyContext<VectorProperty>): ZodTypeAny {
     let schema: ZodTypeAny = z.preprocess(
-        (val: any) => {
-            if (val && typeof val === "object" && "__type" in val && val.__type === "Vector") {
-                return val.value;
+        (val: unknown) => {
+            if (val && typeof val === "object" && "__type" in val && (val as Record<string, unknown>).__type === "Vector") {
+                return (val as Record<string, unknown>).value;
             }
-            if (val && typeof val === "object" && "value" in val && Array.isArray(val.value)) {
-                return val.value;
+            if (val && typeof val === "object" && "value" in val && Array.isArray((val as Record<string, unknown>).value)) {
+                return (val as Record<string, unknown>).value;
             }
             return val;
         },
@@ -540,14 +540,14 @@ function getZodVectorSchema({
     
     if (property.dimensions) {
         schema = schema.refine(
-            (val: any) => val === null || val === undefined || val.length === property.dimensions,
+            (val: unknown) => val === null || val === undefined || (Array.isArray(val) && val.length === property.dimensions),
             { message: `${property.name ?? "Vector"} must have exactly ${property.dimensions} dimensions` }
         );
     }
     
     if (property.validation?.required) {
         schema = schema.refine(
-            (val: any) => val !== null && val !== undefined && val.length > 0,
+            (val: unknown) => val !== null && val !== undefined && Array.isArray(val) && val.length > 0,
             { message: property.validation?.requiredMessage ?? "Required" }
         );
     }
@@ -563,7 +563,7 @@ function getZodBinarySchema({
 
     if (validation?.required) {
         schema = schema.nullable().optional().refine(
-            (value: any) => value !== undefined && value !== null && value !== "",
+            (value: unknown) => value !== undefined && value !== null && value !== "",
             { message: validation.requiredMessage ? validation.requiredMessage : "Required" }
         );
     }

package/src/hooks/navigation/useBuildNavigationStateController.tsx

@@ -59,7 +59,6 @@ export function useBuildNavigationStateController<EC extends EntityCollection, U
         userManagement
     } = props;
 
-    // Step 1: Resolve collections
     const {
         collections,
         loading: collectionsLoading,
@@ -71,10 +70,10 @@ export function useBuildNavigationStateController<EC extends EntityCollection, U
         data,
         plugins,
         disabled,
-        collectionRegistryController
+        collectionRegistryController,
+        userManagement
     });
 
-    // Step 2: Resolve views and admin views
     const {
         views,
         adminViews,
@@ -89,8 +88,7 @@ export function useBuildNavigationStateController<EC extends EntityCollection, U
         plugins,
         adminMode,
         effectiveRoleController,
-        userManagement,
-        collections
+        userManagement
     });
 
     // Step 3: Compute top-level navigation (pure derived state)

package/src/hooks/navigation/useResolvedCollections.ts

@@ -3,7 +3,8 @@ import { useCallback, useEffect, useRef, useState, useMemo } from "react";
 
 import { AuthController, CollectionRegistryController, RebaseData, User } from "@rebasepro/types";
 import type { EntityCollectionsBuilder } from "@rebasepro/types";
-import { CollectionRegistry } from "@rebasepro/common";
+import { CollectionRegistry, defaultUsersCollection } from "@rebasepro/common";
+import { UserManagementDelegate } from "@rebasepro/types";
 
 import { resolveCollections } from "./useNavigationResolution";
 import { areCollectionListsEqual } from "./utils";
@@ -15,6 +16,7 @@ export type UseResolvedCollectionsProps<EC extends EntityCollection, USER extend
     plugins?: RebasePlugin[];
     disabled?: boolean;
     collectionRegistryController: CollectionRegistryController<EC> & { collectionRegistryRef: React.MutableRefObject<CollectionRegistry> };
+    userManagement?: UserManagementDelegate<USER>;
 };
 
 export type UseResolvedCollectionsResult = {
@@ -28,6 +30,10 @@ export type UseResolvedCollectionsResult = {
  * Hook that resolves collection props (which may be async builders or arrays)
  * into concrete EntityCollection[], and registers them with the CollectionRegistry.
  *
+ * When userManagement is provided, the default users collection is always
+ * prepended. Developer collections override via generic slug-based dedup
+ * (Map keyed by slug, last-write-wins). No hardcoded string checks.
+ *
  * Uses refs for potentially-unstable dependencies (driver, authController,
  * plugins) to avoid re-triggering effects when their object identity changes.
  */
@@ -41,7 +47,8 @@ export function useResolvedCollections<EC extends EntityCollection, USER extends
         data,
         plugins,
         disabled,
-        collectionRegistryController
+        collectionRegistryController,
+        userManagement
     } = props;
 
     const [loading, setLoading] = useState(true);
@@ -63,6 +70,8 @@ export function useResolvedCollections<EC extends EntityCollection, USER extends
     authControllerRef.current = authController;
     const pluginsRef = useRef(plugins);
     pluginsRef.current = plugins;
+    const userManagementRef = useRef(userManagement);
+    userManagementRef.current = userManagement;
 
     // Ref for resolved collections change detection
     const resolvedCollectionsRef = useRef<EntityCollection[]>([]);
@@ -86,17 +95,27 @@ export function useResolvedCollections<EC extends EntityCollection, USER extends
 
                 if (cancelled) return;
 
+                // Prepend system defaults; developer collections override via generic dedup.
+                // Map keyed by slug — last-write-wins, so developer collections overwrite defaults.
+                const defaults: EntityCollection[] = [];
+                if (userManagementRef.current) {
+                    defaults.push(defaultUsersCollection);
+                }
+                const deduped = Array.from(
+                    new Map([...defaults, ...resolved].map(c => [c.slug, c])).values()
+                );
+
                 // Register with the CollectionRegistry; returns true if changed
-                const changed = collectionRegistryController.collectionRegistryRef.current.registerMultiple(resolved);
+                const changed = collectionRegistryController.collectionRegistryRef.current.registerMultiple(deduped);
 
                 if (changed) {
-                    console.debug("Collections have changed", resolved);
+                    console.debug("Collections have changed", deduped);
                 }
 
                 // Only update state if collections actually changed
-                if (!areCollectionListsEqual(resolvedCollectionsRef.current, resolved)) {
-                    resolvedCollectionsRef.current = resolved;
-                    setResolvedCollections(resolved);
+                if (!areCollectionListsEqual(resolvedCollectionsRef.current, deduped)) {
+                    resolvedCollectionsRef.current = deduped;
+                    setResolvedCollections(deduped);
                 }
 
                 setError(undefined);
@@ -131,3 +150,4 @@ export function useResolvedCollections<EC extends EntityCollection, USER extends
         refresh
     }), [resolvedCollections, loading, error, refresh]);
 }
+

package/src/hooks/navigation/useResolvedViews.tsx

@@ -23,9 +23,7 @@ import { UserManagementDelegate } from "@rebasepro/types";
 import { resolveAppViews } from "./useNavigationResolution";
 
 
-// Lazy-load admin views — only rendered when navigation reaches /users or /roles
-const UsersView = lazy(() => import("../../components/admin/UsersView").then(m => ({ default: m.UsersView })));
-const RolesView = lazy(() => import("../../components/admin/RolesView").then(m => ({ default: m.RolesView })));
+import { RolesView } from "../../components/admin/RolesView";
 
 export type UseResolvedViewsProps<USER extends User> = {
     authController: AuthController<USER>;
@@ -36,7 +34,6 @@ export type UseResolvedViewsProps<USER extends User> = {
     adminMode?: "content" | "studio" | "settings";
     effectiveRoleController?: EffectiveRoleController;
     userManagement?: UserManagementDelegate<USER>;
-    collections?: EntityCollection[];
 };
 
 export type UseResolvedViewsResult = {
@@ -49,8 +46,8 @@ export type UseResolvedViewsResult = {
 
 /**
  * Hook that resolves view and admin view props (which may be async builders or arrays)
- * into concrete AppView[]. Also injects Users/Roles admin views when userManagement
- * is provided.
+ * into concrete AppView[]. Also injects the Roles admin view when userManagement
+ * is provided with roles.
  *
  * Uses refs for potentially-unstable dependencies (driver, authController,
  * plugins) to avoid re-triggering effects when their object identity changes.
@@ -67,8 +64,7 @@ export function useResolvedViews<USER extends User>(
         plugins,
         adminMode = "content",
         effectiveRoleController,
-        userManagement,
-        collections
+        userManagement
     } = props;
 
     const [loading, setLoading] = useState(true);
@@ -114,43 +110,27 @@ export function useResolvedViews<USER extends User>(
     const resolvedAuthControllerRef = useRef(resolvedAuthController);
     resolvedAuthControllerRef.current = resolvedAuthController;
 
-    // Memoize JSX elements for injected admin views to ensure stable references.
-    const usersViewElement = useMemo(() =>
-        userManagement ? <Suspense fallback={null}><UsersView userManagement={userManagement as unknown as UserManagementDelegate<User>}/></Suspense> : null,
-        [userManagement]
-    );
+    // Memoize JSX element for injected Roles admin view to ensure stable reference.
+    const hasRoles = !!userManagement?.roles;
     const rolesViewElement = useMemo(() =>
-        userManagement?.roles ? <Suspense fallback={null}><RolesView userManagement={userManagement as unknown as UserManagementDelegate<User>}/></Suspense> : null,
-        [userManagement]
+        hasRoles ? <RolesView /> : null,
+        [hasRoles]
     );
 
     const injectedAdminViews: AppView[] = useMemo(() => {
         const views: AppView[] = [];
         const isUserAdmin = userManagement?.isAdmin !== false;
-        if (userManagement && isUserAdmin && usersViewElement) {
-            const hasUsersCollection = collections?.some(c => c.slug === "users");
-            if (!hasUsersCollection) {
-                views.push({
-                    slug: "users",
-                    name: "Users",
-                    icon: "Headset",
-                    view: usersViewElement,
-                    group: "Settings"
-                });
-            }
-            const hasRolesCollection = collections?.some(c => c.slug === "roles");
-            if (userManagement.roles && rolesViewElement && !hasRolesCollection) {
-                views.push({
-                    slug: "roles",
-                    name: "Roles",
-                    icon: "Shield",
-                    view: rolesViewElement,
-                    group: "Settings"
-                });
-            }
+        if (userManagement && isUserAdmin && userManagement.roles && rolesViewElement) {
+            views.push({
+                slug: "roles",
+                name: "Roles",
+                icon: "Shield",
+                view: rolesViewElement,
+                group: "Settings"
+            });
         }
         return views;
-    }, [userManagement, usersViewElement, rolesViewElement, collections]);
+    }, [userManagement, rolesViewElement]);
 
     // Store injectedAdminViews in a ref for effect access
     const injectedAdminViewsRef = useRef(injectedAdminViews);
@@ -171,12 +151,12 @@ export function useResolvedViews<USER extends User>(
                     resolveAppViews(adminViewsProp, resolvedAuthControllerRef.current, dataRef.current)
                 ]);
 
-                const hasCustomUsers = newAdminViewsProp.some(v => v.slug === "users");
-                const hasCustomRoles = newAdminViewsProp.some(v => v.slug === "roles");
+                // 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 => {
-                    if (v.slug === "users" && hasCustomUsers) return false;
-                    if (v.slug === "roles" && hasCustomRoles) return false;
-                    return true;
+                    const slugs = Array.isArray(v.slug) ? v.slug : [v.slug];
+                    return slugs.every(s => !customSlugs.has(s));
                 });
                 const newAdminViews = [...newAdminViewsProp, ...finalInjected];
 
@@ -215,8 +195,7 @@ export function useResolvedViews<USER extends User>(
         refreshTrigger,
         adminMode,
         initialLoading,
-        user,
-        collections
+        user
     ]);
 
     return useMemo(() => ({
@@ -227,3 +206,4 @@ export function useResolvedViews<USER extends User>(
         refresh
     }), [resolvedViews, resolvedAdminViews, loading, error, refresh]);
 }
+

package/src/index.ts

@@ -42,6 +42,8 @@ export {
     Scaffold,
     AppBar,
     Drawer,
+    DefaultDrawer,
+    DrawerFooterActions,
     AdminModeSyncer,
     // ContentHomePage, UsersView, RolesView are lazy-loaded — not re-exported here
     RebaseCMS,

package/src/preview/PropertyPreview.tsx

@@ -57,7 +57,7 @@ export const PropertyPreview = React.memo(function PropertyPreview<P extends Pro
     if (property === null) {
         content = <EmptyValue/>;
     } else if (property.ui?.Preview) {
-        const ResolvedPreview = resolveComponentRef(property.ui.Preview);
+        const ResolvedPreview = resolveComponentRef(property.ui.Preview) as React.ComponentType<PropertyPreviewProps<Property>> | undefined;
         if (ResolvedPreview) {
             content = <Suspense fallback={null}>
                 {createElement(ResolvedPreview,
@@ -205,7 +205,7 @@ path: stringProperty.reference.path })}
         }
     } else if (property.type === "reference") {
         if (typeof property.path === "string") {
-            if (typeof value === "object" && "isEntityReference" in value && value.isEntityReference()) {
+            if (typeof value === "object" && value !== null && "isEntityReference" in value && (value as EntityReference).isEntityReference()) {
                 content = <ReferencePreview
                     disabled={!property.path}
                     previewProperties={property.ui?.previewProperties}

package/src/preview/components/ImagePreview.tsx

@@ -3,6 +3,7 @@ import React, { CSSProperties, useMemo, useState, useEffect } from "react";impor
 import { PreviewSize } from "../../types/components/PropertyPreviewProps";
 import { getThumbnailMeasure } from "../util";
 import { useTranslation } from "@rebasepro/core";
+import { sanitizeUrl } from "./UrlComponentPreview";
 
 /**
  * @group Preview components
@@ -127,7 +128,7 @@ maxHeight: "100%" }}>
                         className="invisible group-hover:visible"
                         variant={"filled"}
                         component={"a" as React.ElementType}
-                        href={url}
+                        href={sanitizeUrl(url)}
                         rel="noopener noreferrer"
                         target="_blank"
                         size={"smallest"}