[#6229] fixed display fields extraction

ui/src/components/records/RecordsList.svelte

@@ -153,12 +153,11 @@
             listFields.unshift("*");
         }
 
-        const expandFields = [];
+        let expandFields = [];
         for (const field of relFields) {
-            const expandItem = CommonHelper.getExpandPresentableRelField(field, $collections, 2);
-            if (expandItem) {
-                expandFields.push(expandItem);
-            }
+            expandFields = expandFields.concat(
+                CommonHelper.getExpandPresentableRelFields(field, $collections, 2),
+            );
         }
 
         return ApiClient.collection(collection.id)

ui/src/components/records/RecordsPicker.svelte

@@ -61,22 +61,16 @@
     }
 
     function getExpand() {
-        let expand = "";
+        let expands = [];
 
         const presentableRelFields = collection?.fields?.filter(
             (f) => !f.hidden && f.presentable && f.type == "relation",
         );
         for (const field of presentableRelFields) {
-            const expandItem = CommonHelper.getExpandPresentableRelField(field, $collections, 2);
-            if (expandItem) {
-                if (expand != "") {
-                    expand += ",";
-                }
-                expand += expandItem;
-            }
+            expands = expands.concat(CommonHelper.getExpandPresentableRelFields(field, $collections, 2));
         }
 
-        return expand;
+        return expands.join(",");
     }
 
     async function loadSelected() {
@@ -259,6 +253,8 @@
         {#each list as record (record.id)}
             {@const selected = isSelected(record)}
 
+            <!-- svelte-ignore a11y-no-static-element-interactions -->
+            <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
             <div
                 tabindex="0"
                 class="list-item handle"

ui/src/components/records/fields/RelationField.svelte

@@ -64,18 +64,12 @@
 
         isLoading = true;
 
-        let expand = "";
+        let expands = [];
         const presentableRelFields = $collections
             .find((c) => c.id == field.collectionId)
             ?.fields?.filter((f) => !f.hidden && f.presentable && f.type == "relation");
         for (const field of presentableRelFields) {
-            const expandItem = CommonHelper.getExpandPresentableRelField(field, $collections, 2);
-            if (expandItem) {
-                if (expand != "") {
-                    expand += ",";
-                }
-                expand += expandItem;
-            }
+            expands = expands.concat(CommonHelper.getExpandPresentableRelFields(field, $collections, 2));
         }
 
         // batch load all selected records to avoid parser stack overflow errors
@@ -91,7 +85,7 @@
                 ApiClient.collection(field.collectionId).getFullList(batchSize, {
                     filter: filters.join("||"),
                     fields: "*:excerpt(200)",
-                    expand: expand,
+                    expand: expands.join(","),
                     requestKey: null,
                 }),
             );