Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into v1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fridgepoet committed Aug 23, 2023
2 parents 633692c + 2264a67 commit 73f243d
Show file tree
Hide file tree
Showing 7 changed files with 2,952 additions and 2,856 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@

- Update grafana-aws-sdk to v0.19.1 to add `il-central-1` to the opt-in region list

## v1.6.3
- fix visibility of data overlays on parent objects
- add entity binding support
- fix raycast issues
- add support for selection events on data overlays

## v1.6.2
- Setting up sticky video controls for Video Player
- Error handling for Matterport scenes
Expand Down
3 changes: 2 additions & 1 deletion cspell.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"Unsubscribable",
"videoplayer",
"commitish",
"matterport"
"matterport",
"raycast"
]
}
Binary file removed libs/aws-iot-twinmaker-grafana-utils-1.0.0.tgz
Binary file not shown.
Binary file added libs/aws-iot-twinmaker-grafana-utils-2.0.0.tgz
Binary file not shown.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@
"@aws-sdk/client-kinesis-video": "3.327.0",
"@aws-sdk/client-kinesis-video-archived-media": "3.327.0",
"@aws-sdk/client-s3": "3.327.0",
"@iot-app-kit/core": "3.3.0",
"@iot-app-kit/react-components": "3.3.0",
"@iot-app-kit/scene-composer": "3.3.0",
"@iot-app-kit/source-iottwinmaker": "3.3.0",
"aws-iot-twinmaker-grafana-utils": "file:libs/aws-iot-twinmaker-grafana-utils-1.0.0.tgz",
"@iot-app-kit/core": "3.4.0",
"@iot-app-kit/react-components": "3.4.0",
"@iot-app-kit/scene-composer": "3.4.0",
"@iot-app-kit/source-iottwinmaker": "3.4.0",
"aws-iot-twinmaker-grafana-utils": "file:libs/aws-iot-twinmaker-grafana-utils-2.0.0.tgz",
"aws-sdk": "^2.978.0",
"query-string": "^7.0.1",
"react-use": "^17.3.1",
Expand Down
6 changes: 3 additions & 3 deletions src/panels/scene-viewer/SceneViewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
IWidgetClickEvent,
ISelectionChangedEvent,
useSceneComposerApi,
ITagData
} from '@iot-app-kit/scene-composer';

const valueTypeToDataType: Record<ValueType, DataType> = {
Expand Down Expand Up @@ -137,7 +138,7 @@ export const SceneViewer = (props: SceneViewerPropsFromParent) => {
const anchorData =
objectData.additionalComponentData?.[
objectData.componentTypes.findIndex((type) => type === KnownComponentType.Tag)
];
] as ITagData | undefined;

if (anchorData) {
const targetLink = getValidHttpUrl(anchorData.navLink);
Expand All @@ -152,8 +153,7 @@ export const SceneViewer = (props: SceneViewerPropsFromParent) => {
const anchorData =
objectData.additionalComponentData?.[
objectData.componentTypes.findIndex((type) => type === KnownComponentType.Tag)
];

] as ITagData | undefined;
if (objectData.nodeRef && anchorData) {
const dashboardId = anchorData?.navLink?.params?.[MERGE_DASHBOARD_TARGET_ID_KEY];
mergeDashboard(dashboardId).then((options) => {
Expand Down
Loading

0 comments on commit 73f243d

Please sign in to comment.