Merge branch 'main' into i-frame

Author: jyothishjose6190

projects/graphql-client/src/graphql-request.service.ts

@@ -1,8 +1,8 @@
 import { Inject, Injectable } from '@angular/core';
 import { Apollo, gql } from 'apollo-angular';
-import { includes, uniq } from 'lodash-es';
+import { includes, isNil, uniq } from 'lodash-es';
 import { defer, EMPTY, Observable, Observer, of, Subject, zip } from 'rxjs';
-import { buffer, catchError, debounceTime, filter, map, mergeMap, take } from 'rxjs/operators';
+import { buffer, catchError, debounceTime, filter, map, mergeMap, take, tap } from 'rxjs/operators';
 import {
   GraphQlHandler,
   GraphQlHandlerType,
@@ -151,15 +151,31 @@ export class GraphQlRequestService {
         errorPolicy: 'all',
         fetchPolicy: options.cacheability
       })
-      .pipe(map(response => response.data));
+      .pipe(
+        tap(response => {
+          if (!isNil(response.errors)) {
+            // tslint:disable-next-line: no-console
+            console.error(`Query response error(s) for request '${requestString}'`, response.errors);
+          }
+        }),
+        map(response => response.data)
+      );
   }
 
   private executeMutation<TResponse extends { [key: string]: unknown }>(requestString: string): Observable<TResponse> {
     return this.apollo
       .mutate<TResponse>({
         mutation: gql(`mutation ${requestString}`)
       })
-      .pipe(mergeMap(response => (response.data ? of(response.data) : EMPTY)));
+      .pipe(
+        tap(response => {
+          if (!isNil(response.errors)) {
+            // tslint:disable-next-line: no-console
+            console.error(`Mutation response error(s) for request '${requestString}'`, response.errors);
+          }
+        }),
+        mergeMap(response => (response.data ? of(response.data) : EMPTY))
+      );
   }
 
   private getResultForRequest<T>(request: GraphQlRequest): Observable<T> {

projects/observability/src/pages/explorer/explorer-dashboard-builder.ts

@@ -304,6 +304,7 @@ export class ExplorerDashboardBuilder {
             title: 'API Boundary Type',
             width: '1',
             visible: false,
+            filterable: true,
             value: {
               type: 'attribute-specification',
               attribute: 'apiBoundaryType'
@@ -317,6 +318,7 @@ export class ExplorerDashboardBuilder {
             title: 'API Discovery State',
             width: '1',
             visible: false,
+            filterable: true,
             value: {
               type: 'attribute-specification',
               attribute: 'apiDiscoveryState'
@@ -330,6 +332,7 @@ export class ExplorerDashboardBuilder {
             title: 'API ID',
             width: '1',
             visible: false,
+            filterable: true,
             value: {
               type: 'attribute-specification',
               attribute: 'apiId'
@@ -343,6 +346,7 @@ export class ExplorerDashboardBuilder {
             title: 'Entry Span ID',
             width: '1',
             visible: false,
+            filterable: true,
             value: {
               type: 'attribute-specification',
               attribute: 'apiTraceId'
@@ -356,6 +360,7 @@ export class ExplorerDashboardBuilder {
             title: 'Service ID',
             width: '1',
             visible: false,
+            filterable: true,
             value: {
               type: 'attribute-specification',
               attribute: 'serviceId'
@@ -369,6 +374,7 @@ export class ExplorerDashboardBuilder {
             title: 'Trace ID',
             width: '1',
             visible: false,
+            filterable: true,
             value: {
               type: 'attribute-specification',
               attribute: 'traceId'
@@ -382,6 +388,7 @@ export class ExplorerDashboardBuilder {
             title: 'Request URL',
             width: '1',
             visible: false,
+            filterable: true,
             value: {
               type: 'attribute-specification',
               attribute: 'requestUrl'
@@ -504,6 +511,7 @@ export class ExplorerDashboardBuilder {
           {
             type: 'table-widget-column',
             visible: false,
+            filterable: true,
             value: {
               type: 'attribute-specification',
               attribute: 'traceId'

projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts

@@ -55,13 +55,13 @@ export class TableWidgetColumnsService {
       width: '1',
       visible: false,
       editable: true,
-      filterable: this.isFilterable(attribute),
+      filterable: this.isFilterable(attribute.type),
       specification: new SpecificationBuilder().attributeSpecificationForKey(attribute.name)
     };
   }
 
-  private isFilterable(attribute: AttributeMetadata): boolean {
-    return this.filterBuilderLookupService.isBuildableType(toFilterAttributeType(attribute.type));
+  private isFilterable(type?: AttributeMetadataType): boolean {
+    return type === undefined ? false : this.filterBuilderLookupService.isBuildableType(toFilterAttributeType(type));
   }
 
   private lookupDisplayType(type: AttributeMetadataType): string {