@rebasepro/admin 0.7.0 → 0.8.0

package/src/collection_editor/ui/collection_editor/utils/update_property_for_widget.ts

@@ -14,10 +14,8 @@ export function updatePropertyFromWidget(propertyData: any,
                 type: "string",
                 propertyConfig: "text_field",
                 storage: undefined,
-                multiline: undefined,
-                markdown: undefined,
+                ui: { multiline: undefined, markdown: undefined, url: undefined },
                 email: undefined,
-                url: undefined,
                 enum: undefined,
                 userSelect: undefined
             } as StringProperty
@@ -29,10 +27,8 @@ export function updatePropertyFromWidget(propertyData: any,
                 type: "string",
                 propertyConfig: "user_select",
                 storage: undefined,
-                multiline: undefined,
-                markdown: undefined,
+                ui: { multiline: undefined, markdown: undefined, url: undefined },
                 email: undefined,
-                url: undefined,
                 enum: undefined,
                 userSelect: true
             } as StringProperty
@@ -43,11 +39,9 @@ export function updatePropertyFromWidget(propertyData: any,
             {
                 type: "string",
                 propertyConfig: "multiline",
-                multiline: true,
+                ui: { multiline: true, markdown: undefined, url: undefined },
                 storage: undefined,
-                markdown: undefined,
                 email: undefined,
-                url: undefined,
                 enum: undefined,
                 userSelect: undefined
             } as StringProperty
@@ -59,10 +53,8 @@ export function updatePropertyFromWidget(propertyData: any,
                 type: "string",
                 propertyConfig: "markdown",
                 storage: undefined,
-                multiline: undefined,
-                markdown: true,
+                ui: { multiline: undefined, markdown: true, url: undefined },
                 email: undefined,
-                url: undefined,
                 userSelect: undefined
             } as StringProperty
         );
@@ -73,10 +65,8 @@ export function updatePropertyFromWidget(propertyData: any,
                 type: "string",
                 propertyConfig: "url",
                 storage: undefined,
-                multiline: undefined,
-                markdown: undefined,
+                ui: { multiline: undefined, markdown: undefined, url: true },
                 email: undefined,
-                url: true,
                 enum: undefined,
                 userSelect: undefined
             } as StringProperty
@@ -88,10 +78,8 @@ export function updatePropertyFromWidget(propertyData: any,
                 type: "string",
                 propertyConfig: "email",
                 storage: undefined,
-                multiline: undefined,
-                markdown: undefined,
+                ui: { multiline: undefined, markdown: undefined, url: undefined },
                 email: true,
-                url: undefined,
                 enum: undefined,
                 userSelect: undefined
             } as StringProperty
@@ -103,10 +91,8 @@ export function updatePropertyFromWidget(propertyData: any,
                 type: "string",
                 propertyConfig: "select",
                 storage: undefined,
-                multiline: undefined,
-                markdown: undefined,
+                ui: { multiline: undefined, markdown: undefined, url: undefined },
                 email: undefined,
-                url: undefined,
                 enum: propertyData.enum ?? [],
                 userSelect: undefined
             } as StringProperty
@@ -206,14 +192,6 @@ export function updatePropertyFromWidget(propertyData: any,
                 propertyConfig: "reference"
             } as Property
         );
-    } else if (selectedWidgetId === "reference_as_string") {
-        updatedProperty = mergeDeep(
-            propertyData,
-            {
-                type: "string",
-                propertyConfig: "reference_as_string"
-            } as Property
-        );
     } else if (selectedWidgetId === "multi_references") {
         updatedProperty = mergeDeep(
             propertyData,

package/src/collection_editor/useJsonCollectionsConfigController.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import type { EntityCollection, NavigationGroupMapping, Property } from "@rebasepro/types";
+import type { EngineProperties, EntityCollection, NavigationGroupMapping, Property } from "@rebasepro/types";
 import type {
     CollectionsConfigController,
     SaveCollectionParams,
@@ -171,7 +171,7 @@ export function useJsonCollectionsConfigController({
             collection.properties = {
                 ...collection.properties,
                 [propertyKey]: property,
-            };
+            } as EngineProperties;
             if (newPropertiesOrder) {
                 collection.propertiesOrder = newPropertiesOrder as typeof collection.propertiesOrder;
             }

package/src/components/DefaultDrawer.tsx

@@ -178,7 +178,7 @@ function CMSNavigationContent() {
     // Studio mode shows Studio dev views + admin entries (Users/Roles).
     // Content mode shows collections, CMS custom views, and admin entries — but not Studio dev views.
     const filteredEntries = adminModeController.mode === "studio"
-        ? allNavigationEntries.filter(e => e.type === "view" || e.type === "admin")
+        ? allNavigationEntries.filter(e => (e.type === "view" && studioViewSlugs.has(e.slug)) || e.type === "admin")
         : allNavigationEntries.filter(e => e.type !== "view" || !studioViewSlugs.has(e.slug));
 
     // Derive groups from the filtered entries, preserving the order from topLevelNavigation.groups

package/src/components/EntityCollectionTable/EntityCollectionTable.tsx

@@ -42,7 +42,7 @@ import { getValueInPath } from "@rebasepro/utils";
  * @see VirtualTable
  * @group Components
  */
-export const EntityCollectionTable = function EntityCollectionTable<M extends Record<string, unknown> = any, USER extends User = any>
+export const EntityCollectionTable = function EntityCollectionTable<M extends Record<string, unknown> = Record<string, unknown>, USER extends User = User>
     ({
         className,
         style,
@@ -113,7 +113,7 @@ export const EntityCollectionTable = function EntityCollectionTable<M extends Re
     const additionalFieldsMap: Record<string, AdditionalFieldDelegate<M, USER>> = useMemo(() => {
         return (additionalFields
             ? additionalFields
-                .map((aC) => ({ [aC.key]: aC as AdditionalFieldDelegate<M, any> }))
+                .map((aC) => ({ [aC.key]: aC as AdditionalFieldDelegate<M, USER> }))
                 .reduce((a, b) => ({ ...a,
 ...b }), {})
             : {}) as Record<string, AdditionalFieldDelegate<M, USER>>;
@@ -132,9 +132,10 @@ export const EntityCollectionTable = function EntityCollectionTable<M extends Re
         isDragging,
         isDraggable,
         frozen
-    }: CellRendererParams<any>) => {
+    }: CellRendererParams<Entity<M>>) => {
 
-        const entity: Entity<M> = rowData;
+        const entity: Entity<M> | undefined = rowData;
+        if (!entity) return null;
 
         const propertyKey = column.key;
 
@@ -192,9 +193,10 @@ export const EntityCollectionTable = function EntityCollectionTable<M extends Re
         isDragging,
         isDraggable,
         frozen
-    }: CellRendererParams<any>) => {
+    }: CellRendererParams<Entity<M>>) => {
 
-        const entity: Entity<M> = rowData;
+        const entity: Entity<M> | undefined = rowData;
+        if (!entity) return null;
 
         const additionalField = additionalFieldsMap[column.key as string];
         const value = additionalField.dependencies
@@ -293,7 +295,7 @@ export const EntityCollectionTable = function EntityCollectionTable<M extends Re
             : collectionColumns) as VirtualTableColumn[]
     ], [idColumn, displayedColumnIds, collectionColumns]);
 
-    const cellRenderer = useCallback((props: CellRendererParams<any>) => {
+    const cellRenderer = useCallback((props: CellRendererParams<Entity<M>>) => {
         const column = props.column;
         const columns = props.columns;
         const columnKey = column.key;
@@ -302,13 +304,13 @@ export const EntityCollectionTable = function EntityCollectionTable<M extends Re
             if (props.columnIndex === 0) {
                 if (tableRowActionsBuilder)
                     return tableRowActionsBuilder({
-                        entity: props.rowData,
+                        entity: props.rowData!,
                         size,
                         width: column.width,
                         frozen: column.frozen
                     });
                 else
-                    return <EntityCollectionRowActions entity={props.rowData}
+                    return <EntityCollectionRowActions entity={props.rowData!}
                         width={column.width}
                         frozen={column.frozen}
                         isSelected={false}

package/src/components/EntityCollectionTable/fields/TableMultipleRelationField.tsx

@@ -1,5 +1,6 @@
 import { useEntitySelectionDialog } from "../../../hooks/useEntitySelectionDialog";
 import type { EntityCollection } from "@rebasepro/types";
+import { getCollectionDataPath } from "@rebasepro/types";
 import React, { useCallback } from "react";
 import { deepEqual as equal } from "fast-equals";
 
@@ -58,7 +59,7 @@ export const TableMultipleRelationFieldInternal = React.memo(
 
         const relationDialogController = useEntitySelectionDialog({
             multiselect: true,
-            path: collection.slug,
+            path: getCollectionDataPath(collection),
             collection,
             onMultipleEntitiesSelected,
             selectedEntityIds,

package/src/components/EntityCollectionTable/fields/TableRelationField.tsx

@@ -1,5 +1,6 @@
 import { useEntitySelectionDialog } from "../../../hooks/useEntitySelectionDialog";
 import type { EntityCollection } from "@rebasepro/types";
+import { getCollectionDataPath } from "@rebasepro/types";
 import React, { useCallback } from "react";
 import { deepEqual as equal } from "fast-equals"
 
@@ -90,7 +91,7 @@ export const TableRelationFieldInternal = React.memo(
 
         const relationDialogController = useEntitySelectionDialog({
             multiselect,
-            path: collection.slug,
+            path: getCollectionDataPath(collection),
             collection,
             onMultipleEntitiesSelected,
             onSingleEntitySelected,

package/src/components/EntityCollectionTable/fields/TableStorageUpload.tsx

@@ -8,7 +8,7 @@ import { useDropzone } from "react-dropzone";
 import { PropertyPreview } from "../../../preview";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { cls, IconButton, PencilIcon, Typography } from "@rebasepro/ui";
-import { useSnackbarController, useStorageSource, useTranslation, StorageFieldItem, useStorageUploadController } from "@rebasepro/core";
+import { useSnackbarController, useStorageSource, useTranslation, StorageFieldItem, useStorageUploadController, StorageSourceContext } from "@rebasepro/core";
 import { getThumbnailMeasure } from "../../../preview/util";
 import { StorageUploadProgress } from "../../../form/components/StorageUploadProgress";
 import { EntityTableCellActions } from "../internal/EntityTableCellActions";
@@ -64,7 +64,8 @@ export function TableStorageUpload(props: {
         storage,
         onFileUploadComplete,
         storagePathBuilder,
-        multipleFilesSupported
+        multipleFilesSupported,
+        resolvedStorageSource
     } = useStorageUploadController({
         entityValues: entity.values,
         entityId: entity.id,
@@ -79,24 +80,26 @@ export function TableStorageUpload(props: {
 
     return (
 
-        <StorageUpload
-            internalValue={internalValue}
-            setInternalValue={setInternalValue}
-            name={propertyKey}
-            disabled={disabled}
-            autoFocus={false}
-            openPopup={openPopup}
-            error={error}
-            selected={selected}
-            property={property}
-            onChange={updateValue}
-            entity={entity}
-            storagePathBuilder={storagePathBuilder}
-            storage={storage}
-            multipleFilesSupported={multipleFilesSupported}
-            onFilesAdded={onFilesAdded}
-            onFileUploadComplete={onFileUploadComplete}
-            previewSize={previewSize}/>
+        <StorageSourceContext.Provider value={resolvedStorageSource}>
+            <StorageUpload
+                internalValue={internalValue}
+                setInternalValue={setInternalValue}
+                name={propertyKey}
+                disabled={disabled}
+                autoFocus={false}
+                openPopup={openPopup}
+                error={error}
+                selected={selected}
+                property={property}
+                onChange={updateValue}
+                entity={entity}
+                storagePathBuilder={storagePathBuilder}
+                storage={storage}
+                multipleFilesSupported={multipleFilesSupported}
+                onFilesAdded={onFilesAdded}
+                onFileUploadComplete={onFileUploadComplete}
+                previewSize={previewSize}/>
+        </StorageSourceContext.Provider>
 
     );
 }

package/src/components/EntityCollectionTable/index.tsx

@@ -11,4 +11,4 @@ export * from "./EntityCollectionRowActions";
 
 export * from "./column_utils";
 
-export { VirtualTableInput } from "./fields/VirtualTableInput";
+export { VirtualTableInput } from "@rebasepro/ui";

package/src/components/EntityCollectionTable/table_bindings.tsx

@@ -1,12 +1,14 @@
 import React from "react";
 import { ArrayProperty, DateProperty, Entity, EntityReference, EntityRelation, NumberProperty, Property, ReferenceProperty, RelationProperty, StringProperty } from "@rebasepro/types";
-import { TableSize } from "@rebasepro/core";
+import { TableSize, useCustomizationController } from "@rebasepro/core";
+import {
+    VirtualTableInput,
+    VirtualTableNumberInput,
+    VirtualTableSwitch,
+    VirtualTableDateField
+} from "@rebasepro/ui";
 
-import { VirtualTableInput } from "./fields/VirtualTableInput";
 import { VirtualTableSelect } from "./fields/VirtualTableSelect";
-import { VirtualTableNumberInput } from "./fields/VirtualTableNumberInput";
-import { VirtualTableSwitch } from "./fields/VirtualTableSwitch";
-import { VirtualTableDateField } from "./fields/VirtualTableDateField";
 import { VirtualTableUserSelect } from "./fields/VirtualTableUserSelect";
 import { TableStorageUpload } from "./fields/TableStorageUpload";
 import { TableReferenceField } from "./fields/TableReferenceField";
@@ -63,33 +65,7 @@ export function getTableBindingForProperty(
 ): TableFieldConfig | undefined {
     const isAStorageProperty = isStorageProperty(property);
 
-    if (property.type === "string" && (property as StringProperty).reference?.path) {
-        return {
-            Component: ({ propertyKey, property, internalValue, updateValue, disabled, size, path }: TableFieldBindingProps) => {
-                const referenceProperty = (property as StringProperty).reference;
-                if (!referenceProperty) return null;
-                const referenceValue = internalValue ? new EntityReference({ id: internalValue as string,
- path: referenceProperty.path as string }) : undefined;
-                return (
-                    <TableReferenceField
-                        name={propertyKey}
-                        internalValue={referenceValue}
-                        updateValue={(v) => updateValue(v ? (v as EntityReference).id : null)}
-                        disabled={disabled}
-                        size={size}
-                        path={referenceProperty.path as string}
-                        multiselect={false}
-                        previewProperties={referenceProperty.ui?.previewProperties}
-                        includeId={referenceProperty.includeId}
-                        includeEntityLink={referenceProperty.includeEntityLink}
-                        title={property.name}
-                        fixedFilter={referenceProperty.fixedFilter}
-                    />
-                );
-            },
-            allowScroll: false
-        };
-    } else if (isAStorageProperty) {
+    if (isAStorageProperty) {
         return {
             Component: ({ validationError, error, disabled, selected, openPopup, property, entity, path, internalValue, size, updateValue, propertyKey }: TableFieldBindingProps) => (
                 <TableStorageUpload
@@ -183,7 +159,7 @@ export function getTableBindingForProperty(
                 ),
                 fullHeight: true
             };
-        } else if (stringProperty.ui?.markdown || !stringProperty.storage || !stringProperty.reference) {
+        } else if (stringProperty.ui?.markdown || !stringProperty.storage) {
             const multiline = Boolean(stringProperty.ui?.multiline) || Boolean(stringProperty.ui?.markdown);
             return {
                 Component: ({ error, validationError, disabled, selected, internalValue, updateValue }: TableFieldBindingProps) => (
@@ -213,17 +189,21 @@ export function getTableBindingForProperty(
         };
     } else if (property.type === "date") {
         return {
-            Component: ({ propertyKey, error, validationError, disabled, selected, property, internalValue, updateValue }: TableFieldBindingProps) => (
-                <VirtualTableDateField
-                    name={propertyKey}
-                    error={validationError ?? error}
-                    disabled={disabled}
-                    mode={(property as DateProperty).mode}
-                    focused={selected}
-                    internalValue={internalValue as Date}
-                    updateValue={updateValue}
-                />
-            ),
+            Component: ({ propertyKey, error, validationError, disabled, selected, property, internalValue, updateValue }: TableFieldBindingProps) => {
+                const { locale } = useCustomizationController();
+                return (
+                    <VirtualTableDateField
+                        name={propertyKey}
+                        error={validationError ?? error}
+                        disabled={disabled}
+                        mode={(property as DateProperty).mode}
+                        focused={selected}
+                        internalValue={internalValue as Date}
+                        updateValue={updateValue}
+                        locale={locale}
+                    />
+                );
+            },
             fullHeight: true,
             hideOverflow: false,
             allowScroll: false

package/src/components/EntityCollectionView/EntityCollectionBoardView.tsx

@@ -281,7 +281,7 @@ parentEntityIds,
         }).catch(e => console.warn("Failed to get total count:", e));
 
         accessor.count({
-            where: { [orderProperty]: "neq.null" }
+            where: { [orderProperty]: ["!=", null] }
         }).then(count => {
             orderedCount = count;
             completed++;

package/src/components/EntityCollectionView/EntityCollectionListView.tsx

@@ -402,7 +402,18 @@ export function EntityCollectionListView<M extends Record<string, unknown> = Rec
             "id"
         ]);
 
-        const availableExtraKeys = allKeys.filter(k => !usedKeys.has(k) && resolvedCollection.properties[k]);
+        const availableExtraKeys = allKeys.filter(k => {
+            if (usedKeys.has(k)) return false;
+            const prop = resolvedCollection.properties[k] as Property | undefined;
+            if (!prop) return false;
+            // Exclude storage/image properties — they are already rendered in the image slot
+            if (prop.type === "string" && (prop.storage || prop.ui?.url === "image")) return false;
+            if (prop.type === "array" && prop.of && !Array.isArray(prop.of)) {
+                const inner = prop.of;
+                if (inner.type === "string" && (inner.storage || inner.ui?.url === "image")) return false;
+            }
+            return true;
+        });
 
         availableExtraKeys.forEach(key => {
             const prop = resolvedCollection.properties[key] as Property;

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -7,10 +7,10 @@ import { useSearchParams } from "react-router-dom";
 import { deepEqual as equal } from "fast-equals"
 
 
-const EMPTY_ARRAY: any[] = [];
+const EMPTY_ARRAY: never[] = [];
 const DEFAULT_ENTITY_OPEN_MODE = "split";
 
-import { CollectionSize, Entity, EntityReference, EntityTableController, FilterValues, PartialEntityCollection, ViewMode } from "@rebasepro/types";
+import { CollectionSize, Entity, EntityReference, EntityTableController, FilterValues, getCollectionDataPath, PartialEntityCollection, ViewMode } from "@rebasepro/types";
 import {
     EntityCollectionRowActions,
     EntityCollectionTable
@@ -163,7 +163,7 @@ const EntityCollectionViewInner = React.memo(
         const collectionRegistry = useCollectionRegistryController();
         const urlController = useUrlController();
         const breadcrumbs = useBreadcrumbsController();
-        const path = pathProp ?? collectionProp.slug;
+        const path = pathProp ?? getCollectionDataPath(collectionProp);
         const dataClient = useData();
         const sideEntityController = useSideEntityController();
         const authController = useAuthController();
@@ -215,7 +215,7 @@ const EntityCollectionViewInner = React.memo(
             }, 2400);
         }, [highlightedEntity]);
 
-        const checkInlineEditing = useCallback((entity?: Entity<any>): boolean => {
+        const checkInlineEditing = useCallback((entity?: Entity<M>): boolean => {
             const collection = collectionRef.current;
             if (!canEdit(collection, path, entity ?? null)) {
                 return false;
@@ -894,7 +894,7 @@ parentEntityIds,
                     collection={collection}
                     tableController={tableController}
                     path={path}
-                    relativePath={collection.slug}
+                    relativePath={getCollectionDataPath(collection)}
                     selectionController={usedSelectionController}
                     collectionEntitiesCount={docsCount ?? undefined}
                     resolvedProperties={resolvedCollection.properties}
@@ -909,7 +909,7 @@ parentEntityIds,
                         onNewClick={onNewClick}
                         openNewDocument={openNewDocument}
                         path={path}
-                        relativePath={collection.slug}
+                        relativePath={getCollectionDataPath(collection)}
                         selectionController={usedSelectionController}
                         selectionEnabled={activeSelectionEnabled}
                         collectionEntitiesCount={docsCount ?? undefined}
@@ -1301,25 +1301,8 @@ function EntitiesCount({
 
         let cancelled = false;
 
-        // Convert filterValues to PostgREST where clause
-        const whereMap: Record<string, string> = {};
-        if (filter) {
-            Object.entries(filter).forEach(([key, value]) => {
-                if (value && Array.isArray(value)) {
-                    const [op, val] = value;
-                    const postgrestOp = op === "==" ? "eq" : op === "!=" ? "neq" : op === ">" ? "gt" : op === ">=" ? "gte" : op === "<" ? "lt" : op === "<=" ? "lte" : op === "in" ? "in" : op === "not-in" ? "nin" : op === "array-contains" ? "cs" : op === "array-contains-any" ? "csa" : "eq";
-
-                    let stringVal: string;
-                    if (Array.isArray(val)) {
-                        stringVal = `(${val.join(",")})`;
-                    } else {
-                        stringVal = String(val);
-                    }
-                    whereMap[key] = `${postgrestOp}.${stringVal}`;
-                }
-            });
-        }
-        const whereParams = Object.keys(whereMap).length > 0 ? whereMap : undefined;
+        // filterValues is already FilterValues — pass directly
+        const whereParams = filter && Object.keys(filter).length > 0 ? filter : undefined;
         const orderByParams = sortByProperty ? `${String(sortByProperty)}:${currentSort}` : undefined;
 
         // Deduplicate inflight count requests (e.g. React StrictMode double-mount)

package/src/components/EntityCollectionView/hooks/useCollectionInlineEditor.ts

@@ -22,7 +22,7 @@ export function useCollectionInlineEditor<M extends Record<string, unknown>>({
         async ({ name, value, property, entityId }: Parameters<UniqueFieldValidator>[0]) => {
             const accessor = dataClient.collection(path);
             const res = await accessor.find({
-                where: { [name]: "eq." + value }
+                where: { [name]: ["==", value] }
             });
 
             const conflictingEntities = res.data;

package/src/components/EntityCollectionView/useBoardDataController.tsx

@@ -238,25 +238,11 @@ export function useBoardDataController<M extends Record<string, unknown> = any,
             return;
         }
 
-        // Build where map for this column
-        const whereMap: Record<string, string> = {};
-        if (currentFilterValues) {
-            Object.entries(currentFilterValues).forEach(([key, value]) => {
-                if (value && Array.isArray(value)) {
-                    const [op, val] = value;
-                    const postgrestOp = op === "==" ? "eq" : op === "!=" ? "neq" : op === ">" ? "gt" : op === ">=" ? "gte" : op === "<" ? "lt" : op === "<=" ? "lte" : op === "in" ? "in" : op === "not-in" ? "nin" : op === "array-contains" ? "cs" : op === "array-contains-any" ? "csa" : "eq";
-
-                    let stringVal: string;
-                    if (Array.isArray(val)) {
-                        stringVal = `(${val.join(",")})`;
-                    } else {
-                        stringVal = String(val);
-                    }
-                    whereMap[key] = `${postgrestOp}.${stringVal}`;
-                }
-            });
-        }
-        whereMap[currentColumnProperty] = `eq.${column}`;
+        // Build filter map for this column — pass FilterValues directly
+        const whereFilter: FilterValues<string> = {
+            ...(currentFilterValues ?? {}),
+            [currentColumnProperty]: ["==", column]
+        };
 
         const orderByParam = currentOrderProperty ? `${currentOrderProperty}:asc` : undefined;
 
@@ -420,14 +406,14 @@ values: { ...e.values,
         const accessor = currentDataClient.collection(currentResolvedPath);
         if (accessor.listen) {
             const unsubscribe = accessor.listen({
-                where: whereMap,
+                where: whereFilter,
                 limit: itemCount,
                 orderBy: orderByParam
             }, res => onUpdate(res.data as Entity<M>[]), onError);
             unsubscribersRef.current[column] = unsubscribe;
         } else {
             accessor.find({
-                where: whereMap,
+                where: whereFilter,
                 limit: itemCount,
                 orderBy: orderByParam
             })
@@ -479,27 +465,13 @@ values: { ...e.values,
                 const accessor = currentDataClient.collection(currentResolvedPath);
                 if (accessor.count) {
 
-                    const whereMap: Record<string, string> = {};
-                    if (currentFilterValues) {
-                        Object.entries(currentFilterValues).forEach(([key, value]) => {
-                            if (value && Array.isArray(value)) {
-                                const [op, val] = value;
-                                const postgrestOp = op === "==" ? "eq" : op === "!=" ? "neq" : op === ">" ? "gt" : op === ">=" ? "gte" : op === "<" ? "lt" : op === "<=" ? "lte" : op === "in" ? "in" : op === "not-in" ? "nin" : op === "array-contains" ? "cs" : op === "array-contains-any" ? "csa" : "eq";
-
-                                let stringVal: string;
-                                if (Array.isArray(val)) {
-                                    stringVal = `(${val.join(",")})`;
-                                } else {
-                                    stringVal = String(val);
-                                }
-                                whereMap[key] = `${postgrestOp}.${stringVal}`;
-                            }
-                        });
-                    }
-                    whereMap[currentColumnProperty] = `eq.${column}`;
+                    const whereFilter: FilterValues<string> = {
+                        ...(currentFilterValues ?? {}),
+                        [currentColumnProperty]: ["==", column]
+                    };
 
                     accessor.count({
-                        where: whereMap
+                        where: whereFilter
                     }).then(count => {
                         if (isCleaningUpRef.current) return;
                         setColumnData(prev => ({

package/src/components/EntityCollectionView/useEntityPreviewSlots.ts

@@ -194,8 +194,8 @@ export function resolveCollectionSlotKeys(
         : [...previewKeys].sort((a, b) => {
             const propA = collection.properties[a] as Property | undefined;
             const propB = collection.properties[b] as Property | undefined;
-            const scoreA = propA?.type === "string" ? (propA.multiline ? 2 : 1) : 0;
-            const scoreB = propB?.type === "string" ? (propB.multiline ? 2 : 1) : 0;
+            const scoreA = propA?.type === "string" ? (propA.ui?.multiline ? 2 : 1) : 0;
+            const scoreB = propB?.type === "string" ? (propB.ui?.multiline ? 2 : 1) : 0;
             return scoreB - scoreA;
         });
     const subtitleKey = sortedPreviewKeys.length > 0 ? sortedPreviewKeys[0] : undefined;
@@ -468,7 +468,7 @@ function resolveRelationDisplayName(
 
             // Helper to check if a property is a visible, non-id string
             const isDisplayCandidate = (p: Property): boolean => {
-                return p.type === "string" && !p.multiline && !p.markdown && !p.storage
+                return p.type === "string" && !p.ui?.multiline && !p.ui?.markdown && !p.storage
                     && !("isId" in p && p.isId) && !isHiddenProp(p);
             };
 

package/src/components/EntityDetailView.tsx

@@ -2,7 +2,7 @@ import type { ComponentRef, EntityCollection, EntityCustomViewParams, FormViewCo
 import type { FormContext } from "../types/fields";
 import type { PluginFormActionProps } from "@rebasepro/types";
 import React, { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Entity, EntityStatus, Property } from "@rebasepro/types";
+import { Entity, EntityStatus, getCollectionDataPath, Property } from "@rebasepro/types";
 import { PluginProviderStack, resolveComponentRef, useComponentOverride, CollectionComponentOverrideProvider } from "@rebasepro/core";
 
 import { EntityCollectionView, EntityView } from "../components";
@@ -347,7 +347,7 @@ entityId }
     // Subcollection views
     const subCollectionsViews = subcollections && subcollections.map((subcollection) => {
         const subcollectionId = subcollection.slug;
-        const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollection.slug)}` : undefined;
+        const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(getCollectionDataPath(subcollection))}` : undefined;
 
         if (activeTab !== subcollectionId) return null;
         return (