@meshmakers/octo-ui 3.4.1240 → 3.4.1260

package/fesm2022/meshmakers-octo-ui.mjs

@@ -5974,6 +5974,7 @@ const GetTreeAssociationTargetsDocumentDto = gql `
   runtime {
     runtimeEntities(rtId: $rtId, ckId: $ckTypeId, first: 1) {
       items {
+        rtId
         associations {
           targets(
             roleId: $roleId
@@ -5986,7 +5987,14 @@ const GetTreeAssociationTargetsDocumentDto = gql `
               rtId
               rtDisplayName
               rtDisplayDescription
+              rtWellKnownName
               ckTypeId
+              attributes(attributeNames: ["name"]) {
+                items {
+                  attributeName
+                  value
+                }
+              }
             }
           }
         }
@@ -6018,7 +6026,14 @@ const GetTreesDocumentDto = gql `
         rtId
         rtDisplayName
         rtDisplayDescription
+        rtWellKnownName
         ckTypeId
+        attributes(attributeNames: ["name"]) {
+          items {
+            attributeName
+            value
+          }
+        }
         associations {
           targets(
             roleId: "System/ParentChild"
@@ -6924,6 +6939,13 @@ const GET_ROOT_ENTITIES_BY_CK_TYPE = gql `
           ckTypeId
           rtDisplayName
           rtDisplayDescription
+          rtWellKnownName
+          attributes(attributeNames: ["name"]) {
+            items {
+              attributeName
+              value
+            }
+          }
         }
       }
     }
@@ -7450,12 +7472,34 @@ class RuntimeBrowserDataSource extends OctoGraphQlHierarchyDataSource {
         return `assoc:${parentCkTypeId}@${parentRtId}:${role.roleId}:${role.targetCkTypeId}`;
     }
     /**
-     * Resolves the display label of an entity: the engine-computed rtDisplayName (AB#4813).
-     * The backend guarantees a value ("<ckTypeId>@<rtId>" fallback when the CK type declares
-     * no displayNameRule).
+     * Resolves the display label of an entity.
+     *
+     * The engine-computed rtDisplayName (AB#4813) wins when it carries a real value, but it is
+     * written when the entity is stored, so an entity that predates the feature or arrived
+     * through an import has none. The backend then answers with the synthetic
+     * "<ckTypeId>@<rtId>" form, which is indistinguishable from a genuine label to a caller that
+     * only checks for null - and a whole tree of "Basic/Tree@3ef2ac82..." is what the browser
+     * used to render. So the synthetic form is recognised and treated as absent, and the entity's
+     * own name attribute is used instead.
      */
     extractDisplayName(entity) {
-        return entity.rtDisplayName || 'Unknown';
+        const fallback = `${entity.ckTypeId}@${entity.rtId}`;
+        const computed = entity.rtDisplayName?.trim();
+        if (computed && computed !== fallback) {
+            return computed;
+        }
+        const name = entity.attributes?.items
+            ?.find((a) => a?.attributeName === 'name')
+            ?.value;
+        // A name attribute is a scalar, not necessarily a string - a numeric name reads better
+        // than the id it would otherwise fall through to.
+        if (typeof name === 'string' || typeof name === 'number') {
+            const text = String(name).trim();
+            if (text !== '') {
+                return text;
+            }
+        }
+        return entity.rtWellKnownName?.trim() || fallback;
     }
     /** Resolves the tooltip of an entity: the engine-computed rtDisplayDescription. */
     extractTooltip(entity) {
@@ -7496,10 +7540,8 @@ class RuntimeBrowserDataSource extends OctoGraphQlHierarchyDataSource {
                     if (!metaData) {
                         metaData = new CkTypeMetaData(item?.ckTypeId || 'Unknown', item?.ckTypeId || 'Unknown', item?.ckTypeId || 'Unknown', code);
                     }
-                    // Engine-computed display fields (AB#4813); backend guarantees a display name
-                    const text = item.rtDisplayName || item.ckTypeId || 'Unknown';
-                    const tooltip = item.rtDisplayDescription ||
-                        `${item.ckTypeId} - ${item.rtId}`;
+                    const text = this.extractDisplayName(item);
+                    const tooltip = this.extractTooltip(item);
                     result.push(new TreeItemDataTyped(`${item.ckTypeId}@${item.rtId}`, text, tooltip, item, metaData.svgIcon, (item?.associations?.targets?.totalCount ?? 0) > 0));
                 }
             }
@@ -7933,8 +7975,10 @@ class EntitySelectorDialogComponent {
             this.selectedEntity = {
                 rtId: entity.rtId,
                 ckTypeId: entity.ckTypeId,
-                // Engine-computed display name (AB#4813); the backend guarantees a value
-                name: entity.rtDisplayName,
+                // The node's text, not the raw rtDisplayName: the backend answers "<ckTypeId>@<rtId>"
+                // for entities that carry no computed name, and handing that id back as the label
+                // would undo what the tree already resolved (see extractDisplayName, AB#5285).
+                name: node.text,
             };
         }
         else {
@@ -11015,7 +11059,10 @@ class EntityDetailComponent {
     getEntityDisplayName() {
         if (!this.entity)
             return 'Unknown Entity';
-        // Engine-computed display name (AB#4813); the backend guarantees a value
+        // Engine-computed display name (AB#4813). The backend never answers null - it falls back
+        // to "<ckTypeId>@<rtId>", so this header shows an id for entities written before the
+        // feature or imported. The tree resolves that through
+        // RuntimeBrowserDataSource.extractDisplayName; this header reads the raw field.
         return this.entity.rtDisplayName || 'Unknown Entity';
     }
     onPropertyChange(event) {