@meshmakers/octo-services 3.4.900 → 3.4.930

package/fesm2022/meshmakers-octo-services.mjs

@@ -56,16 +56,37 @@ class OctoErrorLink extends ApolloLink {
     }
     showError(combinedGraphQLErrors) {
         const messageService = this.injector.get(MessageService);
-        let title = 'GraphQL error';
-        let details = '';
+        // Dedupe identical errors before rendering. A list query with one broken field produces one
+        // error PER ROW (observed on AB#4771: 13 rollup rows each yielded the same "Error trying to
+        // resolve field 'columns'" / INVALID_OPERATION), which used to flood the toast with the same
+        // message N times. Identical (message, code, OctoDetails) tuples collapse into one entry with
+        // an "(× N)" suffix; every raw error is still logged to the console individually.
+        const deduped = new Map();
         for (const error of combinedGraphQLErrors.errors) {
             console.error(error);
+            const key = JSON.stringify([
+                error.message,
+                error.extensions?.['code'] ?? null,
+                error.extensions?.['OctoDetails'] ?? null,
+            ]);
+            const entry = deduped.get(key);
+            if (entry) {
+                entry.count++;
+            }
+            else {
+                deduped.set(key, { error, count: 1 });
+            }
+        }
+        let title = 'GraphQL error';
+        let details = '';
+        for (const { error, count } of deduped.values()) {
+            const message = count > 1 ? `${error.message} (× ${count})` : `${error.message}`;
             if (title == 'GraphQL error') {
-                title = `${error.message}`;
+                title = message;
             }
             else {
                 details += `======================`;
-                details += `${error.message}`;
+                details += message;
             }
             if (error.extensions) {
                 // check for custom error properties, OctoDetails should be an array of MessageDetails
@@ -6268,6 +6289,8 @@ const GetEntitiesByCkTypeDocumentDto = gql `
         rtId
         ckTypeId
         rtWellKnownName
+        rtDisplayName
+        rtDisplayDescription
         rtCreationDateTime
         rtChangedDateTime
         attributes(resolveEnumValuesToNames: true) {
@@ -6312,7 +6335,9 @@ class RuntimeEntitySelectDataSource {
                 ckTypeId: this.ckTypeId,
                 first: take ?? 10,
                 fieldFilters: [
-                    { attributePath: 'rtId', operator: FieldFilterOperatorsDto.LikeDto, comparisonValue: filter }
+                    // Search by the engine-computed display name (AB#4813); rtId matching required exact
+                    // hex ids and never matched what users type into an entity search.
+                    { attributePath: 'rtDisplayName', operator: FieldFilterOperatorsDto.LikeDto, comparisonValue: filter }
                 ]
             }
         }));
@@ -6322,7 +6347,9 @@ class RuntimeEntitySelectDataSource {
             rtId: item.rtId,
             ckTypeId: item.ckTypeId,
             rtWellKnownName: item.rtWellKnownName ?? undefined,
-            displayName: item.rtWellKnownName || item.rtId
+            rtDisplayName: item.rtDisplayName,
+            rtDisplayDescription: item.rtDisplayDescription ?? undefined,
+            displayName: item.rtDisplayName
         }));
         return {
             totalCount: result.data?.runtime?.runtimeEntities?.totalCount ?? 0,
@@ -6348,16 +6375,18 @@ class RuntimeEntityDialogDataSource {
     }
     getColumns() {
         return [
+            { field: 'rtDisplayName', displayName: 'Name' },
+            { field: 'rtDisplayDescription', displayName: 'Description' },
             { field: 'rtId', displayName: 'RT-ID' },
-            { field: 'rtWellKnownName', displayName: 'Name' },
             { field: 'ckTypeId', displayName: 'CK Type' }
         ];
     }
     fetchData(options) {
         const fieldFilters = [];
         if (options.textSearch && options.textSearch.trim()) {
+            // Search by the engine-computed display name (AB#4813)
             fieldFilters.push({
-                attributePath: 'rtId',
+                attributePath: 'rtDisplayName',
                 operator: FieldFilterOperatorsDto.LikeDto,
                 comparisonValue: options.textSearch.trim()
             });
@@ -6376,7 +6405,9 @@ class RuntimeEntityDialogDataSource {
                 rtId: item.rtId,
                 ckTypeId: item.ckTypeId,
                 rtWellKnownName: item.rtWellKnownName ?? undefined,
-                displayName: item.rtWellKnownName || item.rtId
+                rtDisplayName: item.rtDisplayName,
+                rtDisplayDescription: item.rtDisplayDescription ?? undefined,
+                displayName: item.rtDisplayName
             }));
             return {
                 data: items,