Skip to content

Commit

Permalink
feat(props): adapt props for synchro-charts (#133)
Browse files Browse the repository at this point in the history 
* feat(props): adapt props for synchro-charts

* add testing for new props

* fix(tests): cleanup tests from devwork

* Update changelog

* update tests to wait for intercepts

Co-authored-by: Norbert Nader <Norbert.Nader@gmail.com>
  • Loading branch information
@jmbuss @NorbertNader
jmbuss and NorbertNader authored Jul 8, 2022
1 parent 960f53f commit a1191ae
Show file tree
Hide file tree
Showing 28 changed files with 692 additions and 84 deletions.
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.4.0",
"version": "1.5.0",
"packages": [
"packages/*"
],
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
"test:unit": "lerna run test --stream --concurrency 1",
"test:git": "git diff --exit-code",
"pack": "lerna run pack",
"versionup:auto": "lerna version --conventional-commits --no-push --no-git-tag-version --yes",
"versionup:patch": "lerna version patch --conventional-commits --no-push --no-git-tag-version --yes",
"versionup:minor": "lerna version minor --conventional-commits --no-push --no-git-tag-version --yes",
"versionup:major": "lerna version major --conventional-commits --no-push --no-git-tag-version --yes",
"versionup:auto": "lerna version --conventional-commits --no-changelog --no-push --no-git-tag-version --yes",
"versionup:patch": "lerna version patch --conventional-commits --no-changelog --no-push --no-git-tag-version --yes",
"versionup:minor": "lerna version minor --conventional-commits --no-changelog --no-push --no-git-tag-version --yes",
"versionup:major": "lerna version major --conventional-commits --no-changelog --no-push --no-git-tag-version --yes",
"publishToNpm": "lerna publish from-package --no-verify-access --yes"
},
"devDependencies": {
Expand Down
72 changes: 72 additions & 0 deletions packages/components/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,78 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# 1.5.0 (2022-07-09)


### Features

* synchro-charts version updated to 5.0.0

* Added properties to the following components:

IotBarChart:
* alarms
* axis
* gestures
* layout
* legend
* messageOverrides
* movement
* scale
* size
* trends

IotKpi:
* messageOverrides

IotLineChart:
* axis
* gestures
* layout
* legend
* messageOverrides
* movement
* scale
* size
* trends

IotScatterChart:
* alarms
* axis
* gestures
* layout
* legend
* messageOverrides
* movement
* scale
* size
* trends

IotStatusGrid:
* labelsConfig

IotStatusTimeline:
* alarms
* annotations
* axis
* gestures
* layout
* messageOverrides
* movement
* scale
* size

IotTable:
* messageOverrides
* trends

### Fixes

* integration tests asset model and asset summary mocks updated to return current response.




# 1.4.0 (2022-06-09)


Expand Down
Binary file modified ...ion/iot-bar-chart/iot-bar-chart.spec.component.ts/bar chart -- renders.snap.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions packages/components/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"publishConfig": {
"access": "public"
},
"version": "1.4.0",
"version": "1.5.0",
"description": "IoT App Kit Components",
"main": "dist/index.cjs.js",
"module": "dist/custom-elements/index.js",
Expand Down Expand Up @@ -41,11 +41,11 @@
"@awsui/collection-hooks": "^1.0.0",
"@awsui/components-react": "^3.0.0",
"@awsui/design-tokens": "^3.0.0",
"@iot-app-kit/core": "^1.4.0",
"@iot-app-kit/related-table": "^1.4.0",
"@iot-app-kit/source-iotsitewise": "^1.4.0",
"@iot-app-kit/core": "^1.5.0",
"@iot-app-kit/related-table": "^1.5.0",
"@iot-app-kit/source-iotsitewise": "^1.5.0",
"@stencil/core": "^2.7.0",
"@synchro-charts/core": "^4.0.1",
"@synchro-charts/core": "^5.0.0",
"styled-components": "^5.3.0"
},
"devDependencies": {
Expand Down
86 changes: 84 additions & 2 deletions packages/components/src/components.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,37 @@
* It contains typing information for all components that exist in this project.
*/
import { HTMLStencilElement, JSXBase } from "@stencil/core/internal";
import { Annotations, TableColumn } from "@synchro-charts/core";
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 { BranchReference, SiteWiseAssetTreeNode } from "@iot-app-kit/source-iotsitewise";
import { ColumnDefinition, FilterTexts } from "./components/iot-resource-explorer/types";
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 {
interface IotBarChart {
"alarms"?: AlarmsConfig;
"annotations": Annotations;
"axis"?: Axis.Options;
"gestures"?: boolean;
"isEditing": boolean | undefined;
"layout"?: LayoutConfig;
"legend"?: LegendConfig;
"messageOverrides"?: MessageOverrides;
"movement"?: MovementConfig;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"scale"?: ScaleConfig;
"settings": TimeSeriesDataRequestSettings;
"size"?: MinimalSizeConfig;
"styleSettings": StyleSettingsMap | undefined;
"trends": Trend[];
"viewport": Viewport;
"widgetId": string;
}
interface IotKpi {
"annotations": Annotations;
"isEditing": boolean | undefined;
"messageOverrides"?: MessageOverrides;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"settings": TimeSeriesDataRequestSettings;
"styleSettings": StyleSettingsMap | undefined;
Expand All @@ -33,10 +44,19 @@ export namespace Components {
}
interface IotLineChart {
"annotations": Annotations;
"axis": Axis.Options;
"gestures"?: boolean;
"isEditing": boolean | undefined;
"layout"?: LayoutConfig;
"legend"?: LegendConfig;
"messageOverrides": MessageOverrides;
"movement"?: MovementConfig;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"scale"?: ScaleConfig;
"settings": TimeSeriesDataRequestSettings;
"size"?: MinimalSizeConfig;
"styleSettings": StyleSettingsMap | undefined;
"trends": Trend[];
"viewport": Viewport;
"widgetId": string;
}
Expand All @@ -58,38 +78,59 @@ export namespace Components {
interface IotResourceExplorerDemo {
}
interface IotScatterChart {
"alarms"?: AlarmsConfig;
"annotations": Annotations;
"axis"?: Axis.Options;
"gestures"?: boolean;
"isEditing": boolean | undefined;
"layout"?: LayoutConfig;
"legend"?: LegendConfig;
"messageOverrides"?: MessageOverrides;
"movement"?: MovementConfig;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"scale"?: ScaleConfig;
"settings": TimeSeriesDataRequestSettings;
"size"?: MinimalSizeConfig;
"styleSettings": StyleSettingsMap | undefined;
"trends": Trend[];
"viewport": Viewport;
"widgetId": string;
}
interface IotStatusGrid {
"annotations": Annotations;
"isEditing": boolean | undefined;
"labelsConfig": LabelsConfig;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"settings": TimeSeriesDataRequestSettings;
"styleSettings": StyleSettingsMap | undefined;
"viewport": Viewport;
"widgetId": string;
}
interface IotStatusTimeline {
"annotations": Annotations;
"alarms"?: AlarmsConfig;
"annotations"?: Annotations;
"axis"?: Axis.Options;
"gestures"?: boolean;
"isEditing": boolean | undefined;
"layout"?: LayoutConfig;
"messageOverrides"?: MessageOverrides;
"movement"?: MovementConfig;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"scale"?: ScaleConfig;
"settings": TimeSeriesDataRequestSettings;
"size"?: MinimalSizeConfig;
"styleSettings": StyleSettingsMap | undefined;
"viewport": Viewport;
"widgetId": string;
}
interface IotTable {
"annotations": Annotations;
"messageOverrides"?: MessageOverrides;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"settings": TimeSeriesDataRequestSettings;
"styleSettings": StyleSettingsMap | undefined;
"tableColumns": TableColumn[];
"trends": Trend[];
"viewport": Viewport;
"widgetId": string;
}
Expand Down Expand Up @@ -239,17 +280,28 @@ declare global {
}
declare namespace LocalJSX {
interface IotBarChart {
"alarms"?: AlarmsConfig;
"annotations"?: Annotations;
"axis"?: Axis.Options;
"gestures"?: boolean;
"isEditing"?: boolean | undefined;
"layout"?: LayoutConfig;
"legend"?: LegendConfig;
"messageOverrides"?: MessageOverrides;
"movement"?: MovementConfig;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"scale"?: ScaleConfig;
"settings"?: TimeSeriesDataRequestSettings;
"size"?: MinimalSizeConfig;
"styleSettings"?: StyleSettingsMap | undefined;
"trends"?: Trend[];
"viewport": Viewport;
"widgetId"?: string;
}
interface IotKpi {
"annotations"?: Annotations;
"isEditing"?: boolean | undefined;
"messageOverrides"?: MessageOverrides;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"settings"?: TimeSeriesDataRequestSettings;
"styleSettings"?: StyleSettingsMap | undefined;
Expand All @@ -258,10 +310,19 @@ declare namespace LocalJSX {
}
interface IotLineChart {
"annotations"?: Annotations;
"axis"?: Axis.Options;
"gestures"?: boolean;
"isEditing"?: boolean | undefined;
"layout"?: LayoutConfig;
"legend"?: LegendConfig;
"messageOverrides"?: MessageOverrides;
"movement"?: MovementConfig;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"scale"?: ScaleConfig;
"settings"?: TimeSeriesDataRequestSettings;
"size"?: MinimalSizeConfig;
"styleSettings"?: StyleSettingsMap | undefined;
"trends"?: Trend[];
"viewport": Viewport;
"widgetId"?: string;
}
Expand All @@ -283,38 +344,59 @@ declare namespace LocalJSX {
interface IotResourceExplorerDemo {
}
interface IotScatterChart {
"alarms"?: AlarmsConfig;
"annotations"?: Annotations;
"axis"?: Axis.Options;
"gestures"?: boolean;
"isEditing"?: boolean | undefined;
"layout"?: LayoutConfig;
"legend"?: LegendConfig;
"messageOverrides"?: MessageOverrides;
"movement"?: MovementConfig;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"scale"?: ScaleConfig;
"settings"?: TimeSeriesDataRequestSettings;
"size"?: MinimalSizeConfig;
"styleSettings"?: StyleSettingsMap | undefined;
"trends"?: Trend[];
"viewport": Viewport;
"widgetId"?: string;
}
interface IotStatusGrid {
"annotations"?: Annotations;
"isEditing"?: boolean | undefined;
"labelsConfig"?: LabelsConfig;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"settings"?: TimeSeriesDataRequestSettings;
"styleSettings"?: StyleSettingsMap | undefined;
"viewport": Viewport;
"widgetId"?: string;
}
interface IotStatusTimeline {
"alarms"?: AlarmsConfig;
"annotations"?: Annotations;
"axis"?: Axis.Options;
"gestures"?: boolean;
"isEditing"?: boolean | undefined;
"layout"?: LayoutConfig;
"messageOverrides"?: MessageOverrides;
"movement"?: MovementConfig;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"scale"?: ScaleConfig;
"settings"?: TimeSeriesDataRequestSettings;
"size"?: MinimalSizeConfig;
"styleSettings"?: StyleSettingsMap | undefined;
"viewport": Viewport;
"widgetId"?: string;
}
interface IotTable {
"annotations"?: Annotations;
"messageOverrides"?: MessageOverrides;
"queries": TimeQuery<TimeSeriesData[], TimeSeriesDataRequest>[];
"settings"?: TimeSeriesDataRequestSettings;
"styleSettings"?: StyleSettingsMap | undefined;
"tableColumns"?: TableColumn[];
"trends"?: Trend[];
"viewport": Viewport;
"widgetId"?: string;
}
Expand Down
Loading

0 comments on commit a1191ae

Please sign in to comment.