Merge branch 'main' into table-use-local-storage-for-columns

Author: jake-bassett

package-lock.json

@@ -59,7 +59,7 @@
     "d3-shape": "^1.3.5",
     "d3-transition": "^1.2.0",
     "d3-zoom": "^1.8.3",
-    "graphql": "^15.6.1",
+    "graphql": "^15.7.0",
     "graphql-tag": "^2.12.6",
     "iso8601-duration": "^1.3.0",
     "lodash-es": "^4.17.21",

package.json

@@ -195,4 +195,8 @@ export abstract class TableWidgetBaseModel extends BaseModel {
   public isResizable(): boolean {
     return this.resizable;
   }
+
+  public getLoadingConfig(): LoadAsyncConfig | undefined {
+    return this.loadingConfig;
+  }
 }

projects/observability/src/shared/dashboard/widgets/table/table-widget-base.model.ts

@@ -97,7 +97,7 @@ import { TableWidgetModel } from './table-widget.model';
           [selectionMode]="this.model.getSelectionMode()"
           [display]="this.model.style"
           [data]="this.data$ | async"
-          [loadingConfig]="this.model.loadingConfig"
+          [loadingConfig]="this.model.getLoadingConfig()"
           [filters]="this.combinedFilters$ | async"
           [queryProperties]="this.queryProperties$ | async"
           [pageable]="this.api.model.isPageable()"

projects/observability/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts

@@ -1,4 +1,4 @@
-import { TableDataSource, TableRow, TableSelectionMode } from '@hypertrace/components';
+import { LoadAsyncConfig, TableDataSource, TableRow, TableSelectionMode } from '@hypertrace/components';
 import { ArrayPropertyTypeInstance } from '@hypertrace/dashboards';
 import { ARRAY_PROPERTY, Model, ModelApi, ModelOnInit, ModelProperty, ModelPropertyType } from '@hypertrace/hyperdash';
 import { ModelInject, MODEL_API } from '@hypertrace/hyperdash-angular';
@@ -118,4 +118,8 @@ export class TableWidgetViewToggleModel extends TableWidgetModel implements Mode
   public getSelectControlOptions(): TableWidgetControlSelectOptionModel[] {
     return this.delegateModel?.getSelectControlOptions() ?? this.selectOptions;
   }
+
+  public getLoadingConfig(): LoadAsyncConfig | undefined {
+    return this.delegateModel?.getLoadingConfig();
+  }
 }