Merge remote-tracking branch 'origin/main' into feature-table

# Conflicts: # packages/components/package.json # packages/components/src/components.d.ts # packages/components/src/components/iot-table/iot-table.tsx # packages/components/src/testing/testing-ground/siteWiseQueries.ts # packages/components/src/testing/testing-ground/testing-ground.tsx # yarn.lock
awslabs · Jul 29, 2022 · edd73ee · edd73ee
2 parents 29296ca + c80bf86
commit edd73ee
Showing 1 changed file with 1 addition and 31 deletions.
diff --git a/packages/components/src/components.d.ts b/packages/components/src/components.d.ts
@@ -7,10 +7,9 @@
 import { HTMLStencilElement, JSXBase } from "@stencil/core/internal";
 import { Provider, StyleSettingsMap, TimeQuery, TimeSeriesData, TimeSeriesDataRequest, TimeSeriesDataRequestSettings, TreeQuery, Viewport } from "@iot-app-kit/core";
 import { AlarmsConfig, Annotations, Axis, LabelsConfig, LayoutConfig, LegendConfig, MessageOverrides, MinimalSizeConfig, MovementConfig, ScaleConfig, TableColumn, Trend } from "@synchro-charts/core";
-import { Item, TableItem, TableProps } from "@iot-app-kit/table";
 import { BranchReference, SiteWiseAssetTreeNode } from "@iot-app-kit/source-iotsitewise";
 import { ColumnDefinition, FilterTexts } from "./components/iot-resource-explorer/types";
-import { TableProps as TableProps1 } from "@awsui/components-react/table";
+import { TableProps } from "@awsui/components-react/table";
 import { EmptyStateProps, ITreeNode, UseTreeCollection } from "@iot-app-kit/related-table";
 import { NonCancelableCustomEvent } from "@awsui/components-react";
 export namespace Components {
@@ -61,12 +60,6 @@ export namespace Components {
         "viewport": Viewport;
         "widgetId": string;
     }
-    interface IotReactTable {
-        "columnDefinitions": TableProps['columnDefinitions'];
-        "items": TableItem[];
-        "propertyFiltering": TableProps['propertyFiltering'];
-        "sorting": TableProps['sorting'];
-    }
     interface IotResourceExplorer {
         "columnDefinitions": ColumnDefinition<any>[];
         "empty"?: EmptyStateProps;
@@ -132,13 +125,9 @@ export namespace Components {
     }
     interface IotTable {
         "annotations": Annotations;
-        "columnDefinitions": TableProps['columnDefinitions'];
-        "items": Item[];
         "messageOverrides"?: MessageOverrides;
-        "propertyFiltering": TableProps['propertyFiltering'];
         "queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
         "settings": TimeSeriesDataRequestSettings;
-        "sorting": TableProps['sorting'];
         "styleSettings": StyleSettingsMap | undefined;
         "tableColumns": TableColumn[];
         "trends": Trend[];
@@ -199,12 +188,6 @@ declare global {
         prototype: HTMLIotLineChartElement;
         new (): HTMLIotLineChartElement;
     };
-    interface HTMLIotReactTableElement extends Components.IotReactTable, HTMLStencilElement {
-    }
-    var HTMLIotReactTableElement: {
-        prototype: HTMLIotReactTableElement;
-        new (): HTMLIotReactTableElement;
-    };
     interface HTMLIotResourceExplorerElement extends Components.IotResourceExplorer, HTMLStencilElement {
     }
     var HTMLIotResourceExplorerElement: {
@@ -281,7 +264,6 @@ declare global {
         "iot-bar-chart": HTMLIotBarChartElement;
         "iot-kpi": HTMLIotKpiElement;
         "iot-line-chart": HTMLIotLineChartElement;
-        "iot-react-table": HTMLIotReactTableElement;
         "iot-resource-explorer": HTMLIotResourceExplorerElement;
         "iot-resource-explorer-demo": HTMLIotResourceExplorerDemoElement;
         "iot-scatter-chart": HTMLIotScatterChartElement;
@@ -344,12 +326,6 @@ declare namespace LocalJSX {
         "viewport": Viewport;
         "widgetId"?: string;
     }
-    interface IotReactTable {
-        "columnDefinitions": TableProps['columnDefinitions'];
-        "items": TableItem[];
-        "propertyFiltering"?: TableProps['propertyFiltering'];
-        "sorting"?: TableProps['sorting'];
-    }
     interface IotResourceExplorer {
         "columnDefinitions"?: ColumnDefinition<any>[];
         "empty"?: EmptyStateProps;
@@ -415,13 +391,9 @@ declare namespace LocalJSX {
     }
     interface IotTable {
         "annotations"?: Annotations;
-        "columnDefinitions": TableProps['columnDefinitions'];
-        "items": Item[];
         "messageOverrides"?: MessageOverrides;
-        "propertyFiltering"?: TableProps['propertyFiltering'];
         "queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
         "settings"?: TimeSeriesDataRequestSettings;
-        "sorting"?: TableProps['sorting'];
         "styleSettings"?: StyleSettingsMap | undefined;
         "tableColumns"?: TableColumn[];
         "trends"?: Trend[];
@@ -466,7 +438,6 @@ declare namespace LocalJSX {
         "iot-bar-chart": IotBarChart;
         "iot-kpi": IotKpi;
         "iot-line-chart": IotLineChart;
-        "iot-react-table": IotReactTable;
         "iot-resource-explorer": IotResourceExplorer;
         "iot-resource-explorer-demo": IotResourceExplorerDemo;
         "iot-scatter-chart": IotScatterChart;
@@ -488,7 +459,6 @@ declare module "@stencil/core" {
             "iot-bar-chart": LocalJSX.IotBarChart & JSXBase.HTMLAttributes<HTMLIotBarChartElement>;
             "iot-kpi": LocalJSX.IotKpi & JSXBase.HTMLAttributes<HTMLIotKpiElement>;
             "iot-line-chart": LocalJSX.IotLineChart & JSXBase.HTMLAttributes<HTMLIotLineChartElement>;
-            "iot-react-table": LocalJSX.IotReactTable & JSXBase.HTMLAttributes<HTMLIotReactTableElement>;
             "iot-resource-explorer": LocalJSX.IotResourceExplorer & JSXBase.HTMLAttributes<HTMLIotResourceExplorerElement>;
             "iot-resource-explorer-demo": LocalJSX.IotResourceExplorerDemo & JSXBase.HTMLAttributes<HTMLIotResourceExplorerDemoElement>;
             "iot-scatter-chart": LocalJSX.IotScatterChart & JSXBase.HTMLAttributes<HTMLIotScatterChartElement>;