@meshmakers/octo-meshboard 3.4.1430 → 3.4.1440

package/fesm2022/meshmakers-octo-meshboard.mjs

@@ -1,4 +1,4 @@
-import { FieldFilterOperatorsDto, CkTypeSelectorService, RuntimeEntitySelectDataSource as RuntimeEntitySelectDataSource$2, RuntimeEntityDialogDataSource as RuntimeEntityDialogDataSource$2, DeleteStrategiesDto, AssociationModOptionsDto, CkModelService, QueryModeDto, GraphDirectionDto, AttributeSelectorService, GraphQL, GetCkTypeAvailableQueryColumnsDtoGQL, SortOrdersDto, SeriesResolutionSignalDto, HealthService, TENANT_ID_PROVIDER, AssetRepoService, JobManagementService } from '@meshmakers/octo-services';
+import { FieldFilterOperatorsDto, CkTypeSelectorService, RuntimeEntitySelectDataSource, RuntimeEntityDialogDataSource, DeleteStrategiesDto, AssociationModOptionsDto, CkModelService, QueryModeDto, GraphDirectionDto, AttributeSelectorService, GraphQL, GetCkTypeAvailableQueryColumnsDtoGQL, SortOrdersDto, SeriesResolutionSignalDto, HealthService, TENANT_ID_PROVIDER, AssetRepoService, JobManagementService } from '@meshmakers/octo-services';
 export { RuntimeEntityDialogDataSource, RuntimeEntitySelectDataSource, TENANT_ID_PROVIDER } from '@meshmakers/octo-services';
 import * as i0 from '@angular/core';
 import { Injectable, inject, EventEmitter, forwardRef, Output, Input, ViewChild, ChangeDetectionStrategy, Component, Injector, EnvironmentInjector, ApplicationRef, signal, computed, effect, untracked, Directive, ElementRef, NgZone, makeEnvironmentProviders, provideAppInitializer, InjectionToken } from '@angular/core';
@@ -557,8 +557,8 @@ class RuntimeEntitySelectorComponent {
         this.selectedCkType = ckType;
         this.selectedEntity = null;
         // Create new data sources for entity selection
-        this.entityDataSource = new RuntimeEntitySelectDataSource$2(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
-        this.entityDialogDataSource = new RuntimeEntityDialogDataSource$2(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
+        this.entityDataSource = new RuntimeEntitySelectDataSource(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
+        this.entityDialogDataSource = new RuntimeEntityDialogDataSource(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
         this.ckTypeSelected.emit(ckType);
         this.emitValue();
     }
@@ -598,8 +598,8 @@ class RuntimeEntitySelectorComponent {
         if (ckType) {
             this.selectedCkType = ckType;
             // Create data sources
-            this.entityDataSource = new RuntimeEntitySelectDataSource$2(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
-            this.entityDialogDataSource = new RuntimeEntityDialogDataSource$2(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
+            this.entityDataSource = new RuntimeEntitySelectDataSource(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
+            this.entityDialogDataSource = new RuntimeEntityDialogDataSource(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
             // Set the CK Type in the selector
             if (this.ckTypeSelector) {
                 this.ckTypeSelector.writeValue(ckType);
@@ -2775,6 +2775,7 @@ const GetDashboardEntityDocumentDto = gql `
         rtId
         ckTypeId
         rtWellKnownName
+        rtDisplayName
         rtCreationDateTime
         rtChangedDateTime
         attributes(resolveEnumValuesToNames: true) {
@@ -3450,6 +3451,7 @@ const GetAssociationTargetsDocumentDto = gql `
               rtId
               ckTypeId
               rtWellKnownName
+              rtDisplayName
               attributes(attributeNames: $attributeNames, resolveEnumValuesToNames: true) {
                 items {
                   attributeName
@@ -3772,6 +3774,7 @@ class MeshBoardDataService {
             rtId: entity.rtId,
             ckTypeId: entity.ckTypeId,
             rtWellKnownName: entity.rtWellKnownName ?? undefined,
+            rtDisplayName: entity.rtDisplayName ?? undefined,
             rtCreationDateTime: entity.rtCreationDateTime ?? undefined,
             rtChangedDateTime: entity.rtChangedDateTime ?? undefined,
             attributes,
@@ -4047,6 +4050,7 @@ class MeshBoardDataService {
                 rtId: t.rtId,
                 ckTypeId: t.ckTypeId,
                 rtWellKnownName: t.rtWellKnownName ?? undefined,
+                rtDisplayName: t.rtDisplayName ?? undefined,
                 attributes: (t.attributes?.items ?? [])
                     .filter((a) => a !== null && a.attributeName !== null)
                     .map(a => ({
@@ -4745,8 +4749,8 @@ class EntityCardConfigDialogComponent {
         this.selectedCkType = ckType;
         this.selectedEntity = null; // Reset entity when type changes
         // Create new data sources for the selected type
-        this.entityDataSource = new RuntimeEntitySelectDataSource$2(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
-        this.entityDialogDataSource = new RuntimeEntityDialogDataSource$2(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
+        this.entityDataSource = new RuntimeEntitySelectDataSource(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
+        this.entityDialogDataSource = new RuntimeEntityDialogDataSource(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
     }
     onCkTypeCleared() {
         this.selectedCkType = null;
@@ -6647,8 +6651,8 @@ class KpiConfigDialogComponent {
     onCkTypeSelected(ckType) {
         this.selectedCkType = ckType;
         this.selectedEntity = null;
-        this.entityDataSource = new RuntimeEntitySelectDataSource$2(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
-        this.entityDialogDataSource = new RuntimeEntityDialogDataSource$2(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
+        this.entityDataSource = new RuntimeEntitySelectDataSource(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
+        this.entityDialogDataSource = new RuntimeEntityDialogDataSource(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
         // Load available attributes for this CK type (fullName is required for the GraphQL query)
         this.loadAvailableAttributes(ckType.fullName);
     }
@@ -8435,7 +8439,7 @@ class EntityAssociationsWidgetComponent {
         }
         else {
             expanded.add(key);
-            // Load target attributes when expanding, if configured
+            // Load the targets (display names, plus attributes when configured) on expand
             this.loadTargetAttributes(group);
         }
         this._expandedGroups.set(expanded);
@@ -8454,7 +8458,7 @@ class EntityAssociationsWidgetComponent {
             return cached.map(t => ({
                 rtId: t.rtId,
                 ckTypeId: t.ckTypeId,
-                displayName: t.rtWellKnownName || t.rtId,
+                displayName: t.rtDisplayName || t.rtWellKnownName || t.rtId,
                 attributes: t.attributes
             }));
         }
@@ -8508,9 +8512,10 @@ class EntityAssociationsWidgetComponent {
         return `${group.direction}-${group.roleId}-${group.targetType}`;
     }
     loadTargetAttributes(group) {
-        const targetAttributePaths = this.config?.targetAttributePaths;
-        if (!targetAttributePaths?.length)
-            return;
+        // Always fetch on expand, also without configured target attributes: the
+        // same query carries each target's rtDisplayName, and the fallback list
+        // built from the bare association rows can only show rtIds.
+        const targetAttributePaths = this.config?.targetAttributePaths ?? [];
         const cacheKey = this.getGroupCacheKey(group);
         // Skip if already cached or loading
         if (this._targetAttributesCache().has(cacheKey) || this._loadingTargetGroups().has(cacheKey))
@@ -8667,102 +8672,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.5", ngImpor
                 }]
         }], ctorParameters: () => [{ type: i1.Apollo }] });
 
-/**
- * Data source for entity autocomplete - filters by ckTypeId
- */
-let RuntimeEntitySelectDataSource$1 = class RuntimeEntitySelectDataSource {
-    getEntitiesByCkTypeGQL;
-    ckTypeId;
-    constructor(getEntitiesByCkTypeGQL, ckTypeId) {
-        this.getEntitiesByCkTypeGQL = getEntitiesByCkTypeGQL;
-        this.ckTypeId = ckTypeId;
-    }
-    async onFilter(filter, take) {
-        const result = await firstValueFrom(this.getEntitiesByCkTypeGQL.fetch({
-            variables: {
-                ckTypeId: this.ckTypeId,
-                first: take ?? 10,
-                fieldFilters: [
-                    { attributePath: 'rtId', operator: FieldFilterOperatorsDto.LikeDto, comparisonValue: filter }
-                ]
-            }
-        }));
-        const items = (result.data?.runtime?.runtimeEntities?.items ?? [])
-            .filter((item) => item !== null)
-            .map(item => ({
-            rtId: item.rtId,
-            ckTypeId: item.ckTypeId,
-            rtWellKnownName: item.rtWellKnownName ?? undefined,
-            displayName: item.rtWellKnownName || item.rtId
-        }));
-        return {
-            totalCount: result.data?.runtime?.runtimeEntities?.totalCount ?? 0,
-            items
-        };
-    }
-    onDisplayEntity(entity) {
-        return entity.displayName;
-    }
-    getIdEntity(entity) {
-        return entity.rtId;
-    }
-};
-/**
- * Dialog data source for entity selection grid
- */
-let RuntimeEntityDialogDataSource$1 = class RuntimeEntityDialogDataSource {
-    getEntitiesByCkTypeGQL;
-    ckTypeId;
-    constructor(getEntitiesByCkTypeGQL, ckTypeId) {
-        this.getEntitiesByCkTypeGQL = getEntitiesByCkTypeGQL;
-        this.ckTypeId = ckTypeId;
-    }
-    getColumns() {
-        return [
-            { field: 'rtId', displayName: 'RT-ID' },
-            { field: 'rtWellKnownName', displayName: 'Name' },
-            { field: 'ckTypeId', displayName: 'CK Type' }
-        ];
-    }
-    fetchData(options) {
-        // Build field filters for text search
-        const fieldFilters = [];
-        if (options.textSearch && options.textSearch.trim()) {
-            fieldFilters.push({
-                attributePath: 'rtId',
-                operator: FieldFilterOperatorsDto.LikeDto,
-                comparisonValue: options.textSearch.trim()
-            });
-        }
-        return from(this.getEntitiesByCkTypeGQL.fetch({
-            variables: {
-                ckTypeId: this.ckTypeId,
-                first: options.take,
-                after: options.skip > 0 ? btoa(`arrayconnection:${options.skip - 1}`) : undefined,
-                fieldFilters: fieldFilters.length > 0 ? fieldFilters : undefined
-            }
-        })).pipe(map(result => {
-            const items = (result.data?.runtime?.runtimeEntities?.items ?? [])
-                .filter((item) => item !== null)
-                .map(item => ({
-                rtId: item.rtId,
-                ckTypeId: item.ckTypeId,
-                rtWellKnownName: item.rtWellKnownName ?? undefined,
-                displayName: item.rtWellKnownName || item.rtId
-            }));
-            return {
-                data: items,
-                totalCount: result.data?.runtime?.runtimeEntities?.totalCount ?? 0
-            };
-        }));
-    }
-    onDisplayEntity(entity) {
-        return entity.displayName;
-    }
-    getIdEntity(entity) {
-        return entity.rtId;
-    }
-};
 /**
  * Configuration dialog for EntityWithAssociations widget.
  * Allows selecting a CK Type, runtime entity, direction filters, and role filters.
@@ -8891,7 +8800,8 @@ class AssociationsConfigDialogComponent {
                     rtId: entity.rtId,
                     ckTypeId: entity.ckTypeId,
                     rtWellKnownName: entity.rtWellKnownName ?? undefined,
-                    displayName: entity.rtWellKnownName || entity.rtId
+                    rtDisplayName: entity.rtDisplayName,
+                    displayName: entity.rtDisplayName
                 };
             }
         }
@@ -8905,8 +8815,8 @@ class AssociationsConfigDialogComponent {
         this.selectedRoles = [];
         this.selectedEntityAttributes = [];
         // Create data sources for entity selection
-        this.entityDataSource = new RuntimeEntitySelectDataSource$1(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
-        this.entityDialogDataSource = new RuntimeEntityDialogDataSource$1(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
+        this.entityDataSource = new RuntimeEntitySelectDataSource(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
+        this.entityDialogDataSource = new RuntimeEntityDialogDataSource(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
         // Load available association roles and entity attributes in parallel
         await Promise.all([
             this.loadAssociationRoles(ckType.rtCkTypeId),
@@ -11578,8 +11488,8 @@ class GaugeConfigDialogComponent {
     onCkTypeSelected(ckType) {
         this.selectedCkType = ckType;
         this.selectedEntity = null;
-        this.entityDataSource = new RuntimeEntitySelectDataSource$2(this.getEntitiesByCkTypeGQL, ckType.fullName);
-        this.entityDialogDataSource = new RuntimeEntityDialogDataSource$2(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
+        this.entityDataSource = new RuntimeEntitySelectDataSource(this.getEntitiesByCkTypeGQL, ckType.fullName);
+        this.entityDialogDataSource = new RuntimeEntityDialogDataSource(this.getEntitiesByCkTypeGQL, ckType.rtCkTypeId);
         // Load available attributes for this CK type (fullName is required for the GraphQL query)
         this.loadAvailableAttributes(ckType.fullName);
     }
@@ -27322,102 +27232,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.5", ngImpor
                 args: ['containerRef']
             }] } });
 
-/**
- * Data source for entity autocomplete - filters by ckTypeId
- */
-class RuntimeEntitySelectDataSource {
-    getEntitiesByCkTypeGQL;
-    ckTypeId;
-    constructor(getEntitiesByCkTypeGQL, ckTypeId) {
-        this.getEntitiesByCkTypeGQL = getEntitiesByCkTypeGQL;
-        this.ckTypeId = ckTypeId;
-    }
-    async onFilter(filter, take) {
-        const result = await firstValueFrom(this.getEntitiesByCkTypeGQL.fetch({
-            variables: {
-                ckTypeId: this.ckTypeId,
-                first: take ?? 10,
-                fieldFilters: filter ? [
-                    { attributePath: 'rtId', operator: FieldFilterOperatorsDto.LikeDto, comparisonValue: filter }
-                ] : undefined
-            }
-        }));
-        const items = (result.data?.runtime?.runtimeEntities?.items ?? [])
-            .filter((item) => item !== null)
-            .map(item => ({
-            rtId: item.rtId,
-            ckTypeId: item.ckTypeId,
-            rtWellKnownName: item.rtWellKnownName ?? undefined,
-            displayName: item.rtWellKnownName || item.rtId
-        }));
-        return {
-            totalCount: result.data?.runtime?.runtimeEntities?.totalCount ?? 0,
-            items
-        };
-    }
-    onDisplayEntity(entity) {
-        return entity.displayName;
-    }
-    getIdEntity(entity) {
-        return entity.rtId;
-    }
-}
-/**
- * Dialog data source for entity selection grid
- */
-class RuntimeEntityDialogDataSource {
-    getEntitiesByCkTypeGQL;
-    ckTypeId;
-    constructor(getEntitiesByCkTypeGQL, ckTypeId) {
-        this.getEntitiesByCkTypeGQL = getEntitiesByCkTypeGQL;
-        this.ckTypeId = ckTypeId;
-    }
-    getColumns() {
-        return [
-            { field: 'rtId', displayName: 'RT-ID' },
-            { field: 'rtWellKnownName', displayName: 'Name' },
-            { field: 'ckTypeId', displayName: 'CK Type' }
-        ];
-    }
-    fetchData(options) {
-        // Build field filters for text search
-        const fieldFilters = [];
-        if (options.textSearch && options.textSearch.trim()) {
-            fieldFilters.push({
-                attributePath: 'rtId',
-                operator: FieldFilterOperatorsDto.LikeDto,
-                comparisonValue: options.textSearch.trim()
-            });
-        }
-        return from(this.getEntitiesByCkTypeGQL.fetch({
-            variables: {
-                ckTypeId: this.ckTypeId,
-                first: options.take,
-                after: options.skip > 0 ? btoa(`arrayconnection:${options.skip - 1}`) : undefined,
-                fieldFilters: fieldFilters.length > 0 ? fieldFilters : undefined
-            }
-        })).pipe(map(result => {
-            const items = (result.data?.runtime?.runtimeEntities?.items ?? [])
-                .filter((item) => item !== null)
-                .map(item => ({
-                rtId: item.rtId,
-                ckTypeId: item.ckTypeId,
-                rtWellKnownName: item.rtWellKnownName ?? undefined,
-                displayName: item.rtWellKnownName || item.rtId
-            }));
-            return {
-                data: items,
-                totalCount: result.data?.runtime?.runtimeEntities?.totalCount ?? 0
-            };
-        }));
-    }
-    onDisplayEntity(entity) {
-        return entity.displayName;
-    }
-    getIdEntity(entity) {
-        return entity.rtId;
-    }
-}
 /**
  * Configuration dialog for Process Widget.
  * Allows selecting a stored diagram, display options, and data binding.
@@ -27716,10 +27530,11 @@ class ProcessConfigDialogComponent {
         await this.loadAttributesForCkType(this.initialBindingCkTypeId);
         // Pre-select entity if provided
         if (this.initialBindingRtId) {
-            // Create a mock entity item - the actual display name will be updated when the combobox loads
+            // Placeholder item labelled by its rtId - the display name arrives when the combobox loads
             this.selectedEntity = {
                 rtId: this.initialBindingRtId,
                 ckTypeId: this.initialBindingCkTypeId,
+                rtDisplayName: this.initialBindingRtId,
                 displayName: this.initialBindingRtId
             };
         }
@@ -31365,8 +31180,8 @@ class EntitySelectorEditorComponent {
     }
     updateDefaultEntityDataSources() {
         if (this.editCkTypeId) {
-            this.defaultEntityDataSource = new RuntimeEntitySelectDataSource$2(this.getEntitiesByCkTypeGQL, this.editCkTypeId);
-            this.defaultEntityDialogDataSource = new RuntimeEntityDialogDataSource$2(this.getEntitiesByCkTypeGQL, this.editCkTypeId);
+            this.defaultEntityDataSource = new RuntimeEntitySelectDataSource(this.getEntitiesByCkTypeGQL, this.editCkTypeId);
+            this.defaultEntityDialogDataSource = new RuntimeEntityDialogDataSource(this.getEntitiesByCkTypeGQL, this.editCkTypeId);
         }
         else {
             this.defaultEntityDataSource = null;
@@ -31452,10 +31267,10 @@ class EntitySelectorToolbarComponent {
         for (const selector of this.entitySelectors) {
             // Reuse cached data source if same CK type
             if (!this.dataSourceCache.has(selector.ckTypeId)) {
-                this.dataSourceCache.set(selector.ckTypeId, new RuntimeEntitySelectDataSource$2(this.getEntitiesByCkTypeGQL, selector.ckTypeId));
+                this.dataSourceCache.set(selector.ckTypeId, new RuntimeEntitySelectDataSource(this.getEntitiesByCkTypeGQL, selector.ckTypeId));
             }
             if (!this.dialogDataSourceCache.has(selector.ckTypeId)) {
-                this.dialogDataSourceCache.set(selector.ckTypeId, new RuntimeEntityDialogDataSource$2(this.getEntitiesByCkTypeGQL, selector.ckTypeId));
+                this.dialogDataSourceCache.set(selector.ckTypeId, new RuntimeEntityDialogDataSource(this.getEntitiesByCkTypeGQL, selector.ckTypeId));
             }
             this.selectorDataSources.set(selector.id, this.dataSourceCache.get(selector.ckTypeId));
             this.selectorDialogDataSources.set(selector.id, this.dialogDataSourceCache.get(selector.ckTypeId));
@@ -34045,7 +33860,12 @@ class MeshBoardViewComponent {
             // variable resolution so widgets bound to this selector can scope their
             // stream-data query by the resolved source rtIds.
             await this.resolveEntitySelectorScopeRtIds(selector, rtId);
-            return entity.rtWellKnownName || entity.rtId;
+            // Label the selection the way the pick dialog does: by the engine's
+            // display name (the type's displayNameRule — "2026" for a fiscal year),
+            // not the well-known name, which most entities do not carry. Without it
+            // a board opened on its defaultRtId showed the raw rtId in the toolbar
+            // until the user re-picked the very same entity.
+            return entity.rtDisplayName || entity.rtWellKnownName || entity.rtId;
         }
         catch (error) {
             console.error(`Error resolving entity selector '${selector.id}':`, error);