@rebasepro/admin 0.5.0 → 0.6.1

package/src/util/previews.ts

@@ -22,16 +22,18 @@ export function getEntityPreviewKeys(
     if (listProperties && listProperties.length > 0) {
         return listProperties;
     } else {
-        listProperties = allProperties;
+        const hasExplicitOrder = !!(targetCollection.propertiesOrder as string[] | undefined);
+        listProperties = (targetCollection.propertiesOrder as string[]) || allProperties;
         return listProperties
             .filter(key => {
                 const prop = targetCollection.properties[key];
                 const isIdProp = prop && typeof prop === "object" && "isId" in prop && Boolean((prop as { isId?: boolean }).isId);
-                return !isIdProp;
+                return !isIdProp && key !== "id";
             })
             .filter(key => {
                 const property = targetCollection.properties[key];
-                return property && !isPropertyBuilder(property) && !isReferenceProperty(property) && !isRelationProperty(property) && !isHiddenProperty(property);
+                return property && !isPropertyBuilder(property) && !isReferenceProperty(property) && !isHiddenProperty(property)
+                    && (hasExplicitOrder || !isRelationProperty(property));
             }).slice(0, limit);
     }
 }
@@ -40,8 +42,27 @@ export function getEntityTitlePropertyKey<M extends Record<string, unknown>>(col
     if (collection.titleProperty) {
         return collection.titleProperty as string;
     }
-    
+
+    const hasExplicitOrder = !!(collection.propertiesOrder as string[] | undefined);
     const orderToSearch = (collection.propertiesOrder as string[]) || Object.keys(collection.properties);
+
+    // If explicit propertiesOrder is set, allow the first non-ID relation or string to be the titleKey
+    if (hasExplicitOrder) {
+        for (const key of orderToSearch) {
+            const property = collection.properties[key];
+            if (property && !isPropertyBuilder(property)) {
+                const prop = property as Property;
+                const isIdProp = prop && typeof prop === "object" && "isId" in prop && Boolean((prop as { isId?: boolean }).isId);
+                if (isIdProp || key === "id" || isHiddenProperty(prop)) {
+                    continue;
+                }
+                if (prop.type === "relation" || prop.type === "string") {
+                    return key;
+                }
+            }
+        }
+    }
+
     let firstStringCandidate: string | undefined;
 
     for (const key of orderToSearch) {
@@ -65,3 +86,79 @@ export function getEntityTitlePropertyKey<M extends Record<string, unknown>>(col
     return firstStringCandidate;
 }
 
+/**
+ * Attempt to turn a title value (which might be a relation, reference, date, array, or other complex object)
+ * into a renderable, human-readable string.
+ */
+export function resolveTitleToString(title: any): string {
+    if (title === null || title === undefined) {
+        return "";
+    }
+
+    if (typeof title !== "object") {
+        return String(title);
+    }
+
+    // Check if it's a relation shape: { __type: "relation", id, path, data }
+    if ("__type" in title && title.__type === "relation") {
+        if (title.data && title.data.values) {
+            const values = title.data.values;
+            // Prioritize common title fields in eagerly loaded relation data
+            for (const key of ["name", "title", "label", "displayName"]) {
+                if (values[key] !== undefined && values[key] !== null) {
+                    return String(values[key]);
+                }
+            }
+            // Fallback: search for first short string value in values
+            for (const val of Object.values(values)) {
+                if (typeof val === "string" && val.length > 0 && val.length < 200) {
+                    return val;
+                }
+            }
+        }
+        if (title.id !== undefined && title.id !== null) {
+            return String(title.id);
+        }
+    }
+
+    // Check if it's a reference shape: { isEntityReference() } or similar
+    if ("isEntityReference" in title && typeof title.isEntityReference === "function" && title.isEntityReference()) {
+        return String(title.id);
+    }
+    if ("id" in title && "path" in title && !("__type" in title)) {
+        // Flat reference/relation-like object
+        return String(title.id);
+    }
+
+    // Check if it's a Date
+    if (title instanceof Date) {
+        return title.toLocaleDateString();
+    }
+
+    // Check if it has a string/number property like name/title/label/id
+    if ("name" in title && title.name !== undefined && title.name !== null && typeof title.name !== "object") {
+        return String(title.name);
+    }
+    if ("title" in title && title.title !== undefined && title.title !== null && typeof title.title !== "object") {
+        return String(title.title);
+    }
+    if ("label" in title && title.label !== undefined && title.label !== null && typeof title.label !== "object") {
+        return String(title.label);
+    }
+    if ("id" in title && title.id !== undefined && title.id !== null && typeof title.id !== "object") {
+        return String(title.id);
+    }
+
+    // Fallback: try converting to string, or JSON.stringify if it looks like a generic object
+    try {
+        const str = String(title);
+        if (str !== "[object Object]") {
+            return str;
+        }
+        return JSON.stringify(title);
+    } catch {
+        return "";
+    }
+}
+
+