From 30de79dba72b8ce74c79a0c746835f89ca6cb606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Flatval?= Date: Tue, 10 Sep 2024 14:39:15 +0200 Subject: [PATCH 1/2] fix(react-components): make cdm-clicks work before "show contextualized" is clicked --- ...nnectionsForNodeIds.ts => getFdmConnectionsForNodes.ts} | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) rename react-components/src/data-providers/core-dm-provider/{getFdmConnectionsForNodeIds.ts => getFdmConnectionsForNodes.ts} (96%) diff --git a/react-components/src/data-providers/core-dm-provider/getFdmConnectionsForNodeIds.ts b/react-components/src/data-providers/core-dm-provider/getFdmConnectionsForNodes.ts similarity index 96% rename from react-components/src/data-providers/core-dm-provider/getFdmConnectionsForNodeIds.ts rename to react-components/src/data-providers/core-dm-provider/getFdmConnectionsForNodes.ts index c6b59140968..69b42417757 100644 --- a/react-components/src/data-providers/core-dm-provider/getFdmConnectionsForNodeIds.ts +++ b/react-components/src/data-providers/core-dm-provider/getFdmConnectionsForNodes.ts @@ -59,7 +59,9 @@ export async function getFdmConnectionsForNodes( result.items.cad_nodes.forEach((cadNode) => { const props = cadNode.properties[CORE_DM_SPACE][COGNITE_CAD_NODE_VIEW_VERSION_KEY]; - const revisionIndex = props.revisions.findIndex((id) => id === revisionRef); + const revisionIndex = props.revisions.findIndex( + (id) => id.externalId === revisionRef.externalId && id.space === revisionRef.space + ); const treeIndex = props.treeIndexes[revisionIndex]; const relevant = treeIndexSet.has(treeIndex); @@ -141,7 +143,8 @@ const cadConnectionQuery = { objects_3d: { nodes: { from: 'cad_nodes', - through: { view: COGNITE_CAD_NODE_SOURCE, identifier: 'object3D' } + through: { view: COGNITE_CAD_NODE_SOURCE, identifier: 'object3D' }, + direction: 'outwards' } }, assets: { From 62f05ad36e2eb02a5caff355ec2c0e47db5b6e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Flatval?= Date: Tue, 10 Sep 2024 14:44:55 +0200 Subject: [PATCH 2/2] chore: fix import path --- .../src/data-providers/core-dm-provider/CoreDm3dDataProvider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react-components/src/data-providers/core-dm-provider/CoreDm3dDataProvider.ts b/react-components/src/data-providers/core-dm-provider/CoreDm3dDataProvider.ts index c5758b6fd16..a43931f9d7d 100644 --- a/react-components/src/data-providers/core-dm-provider/CoreDm3dDataProvider.ts +++ b/react-components/src/data-providers/core-dm-provider/CoreDm3dDataProvider.ts @@ -17,7 +17,7 @@ import { type TaggedAddResourceOptions } from '../../components/Reveal3DResource import { COGNITE_3D_OBJECT_SOURCE } from './dataModels'; import { getDMSModels } from './getDMSModels'; import { getEdgeConnected3dInstances } from './getEdgeConnected3dInstances'; -import { getFdmConnectionsForNodes } from './getFdmConnectionsForNodeIds'; +import { getFdmConnectionsForNodes } from './getFdmConnectionsForNodes'; import { type Node3D } from '@cognite/sdk'; import { getDMSRevision } from './getDMSRevision'; import { listAllMappedFdmNodes, listMappedFdmNodes } from './listMappedFdmNodes';