Merge branch 'master' into hflatval/optional-fdm-config

cognitedata · Aug 4, 2023 · 48b3342 · 48b3342
2 parents cb917f7 + 5c6b537
commit 48b3342
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 46 deletions.
diff --git a/react-components/src/components/Reveal3DResources/Reveal3DResources.tsx b/react-components/src/components/Reveal3DResources/Reveal3DResources.tsx
@@ -39,19 +39,19 @@ export type Reveal3DResourcesStyling = {
   groups?: FdmAssetStylingGroup[];
 };
 
-export type Reveal3DResourcesProps<NodeType = any> = {
+export type Reveal3DResourcesProps = {
   resources: AddResourceOptions[];
   fdmAssetMappingConfig?: FdmAssetMappingsConfig;
   styling?: Reveal3DResourcesStyling;
-  onNodeClick?: (node: NodeDataResult<NodeType> | undefined) => void;
+  onNodeClick?: (node: NodeDataResult | undefined) => void;
 };
 
-export const Reveal3DResources = <NodeType = any,>({
+export const Reveal3DResources = ({
   resources,
   styling,
   fdmAssetMappingConfig,
   onNodeClick
-}: Reveal3DResourcesProps<NodeType>): ReactElement => {
+}: Reveal3DResourcesProps): ReactElement => {
   const [reveal3DModels, setReveal3DModels] = useState<TypedReveal3DModel[]>([]);
   const [reveal3DModelsStyling, setReveal3DModelsStyling] = useState<
     Array<PointCloudModelStyling | CadModelStyling>
@@ -77,13 +77,7 @@ export const Reveal3DResources = <NodeType = any,>({
     const callback = (event: PointerEventData): void => {
       void (async (event: PointerEventData): Promise<void> => {
         if (onNodeClick === undefined) return;
-        const data = await queryMappedData<NodeType>(
-          viewer,
-          client,
-          fdmSdk,
-          event,
-          fdmAssetMappingConfig
-        );
+        const data = await queryMappedData(viewer, client, fdmSdk, event, fdmAssetMappingConfig);
 
         onNodeClick(data);
       })(event);

diff --git a/react-components/src/components/Reveal3DResources/queryMappedData.ts b/react-components/src/components/Reveal3DResources/queryMappedData.ts
@@ -8,21 +8,19 @@ import {
   type EdgeItem,
   type InspectResultList,
   type FdmSDK,
-  type DmsUniqueIdentifier,
-  type Source,
-  type FdmNode
+  type DmsUniqueIdentifier
 } from '../../utilities/FdmSDK';
 import { type FdmAssetMappingsConfig } from '../../hooks/types';
 import { type NodeDataResult } from './types';
 import assert from 'assert';
 
-export async function queryMappedData<NodeType>(
+export async function queryMappedData(
   viewer: Cognite3DViewer,
   cdfClient: CogniteClient,
   fdmClient: FdmSDK,
   clickEvent: PointerEventData,
   fdmConfig?: FdmAssetMappingsConfig
-): Promise<NodeDataResult<NodeType> | undefined> {
+): Promise<NodeDataResult | undefined> {
   if (fdmConfig === undefined) {
     throw Error('Must supply fdmConfig when using FDM queries');
   }
@@ -67,14 +65,8 @@ export async function queryMappedData<NodeType>(
   const dataView =
     inspectionResult.items[0]?.inspectionResults.involvedViewsAndContainers?.views[0];
 
-  const nodeData = await filterNodeData<NodeType>(fdmClient, dataNode, dataView);
-
-  if (nodeData === undefined) {
-    return undefined;
-  }
-
   return {
-    data: nodeData,
+    nodeExternalId: dataNode.externalId,
     view: dataView,
     cadNode: selectedNode,
     intersection: cadIntersection
@@ -157,20 +149,3 @@ async function inspectNode(
 
   return inspectionResult;
 }
-
-async function filterNodeData<NodeType>(
-  fdmClient: FdmSDK,
-  dataNode: DmsUniqueIdentifier,
-  dataView: Source
-): Promise<FdmNode<NodeType> | undefined> {
-  if (dataView === undefined) {
-    return undefined;
-  }
-
-  const dataQueryResult = await fdmClient.getByExternalIds<NodeType>(
-    [{ instanceType: 'node', ...dataNode }],
-    dataView
-  );
-
-  return dataQueryResult.items[0];
-}
diff --git a/react-components/src/components/Reveal3DResources/types.ts b/react-components/src/components/Reveal3DResources/types.ts
@@ -8,7 +8,7 @@ import {
   type CadIntersection
 } from '@cognite/reveal';
 import { type Matrix4 } from 'three';
-import { type FdmNode, type Source } from '../../utilities/FdmSDK';
+import { type Source } from '../../utilities/FdmSDK';
 import { type Node3D } from '@cognite/sdk/dist/src';
 
 export type AddImageCollection360Options = {
@@ -22,8 +22,8 @@ export type AddResourceOptions = AddReveal3DModelOptions | AddImageCollection360
 export type AddReveal3DModelOptions = AddModelOptions & { transform?: Matrix4 };
 export type TypedReveal3DModel = AddReveal3DModelOptions & { type: SupportedModelTypes | '' };
 
-export type NodeDataResult<NodeType> = {
-  data: FdmNode<NodeType>;
+export type NodeDataResult = {
+  nodeExternalId: string;
   view: Source;
   cadNode: Node3D;
   intersection: CadIntersection;

diff --git a/react-components/stories/HighlightNode.stories.tsx b/react-components/stories/HighlightNode.stories.tsx
@@ -60,9 +60,9 @@ const StoryContent = ({
 
   const [highlightedId, setHighlightedId] = useState<string | undefined>(undefined);
 
-  const callback = (nodeData: NodeDataResult<any> | undefined): void => {
-    setNodeData(nodeData?.data);
-    setHighlightedId(nodeData?.data?.externalId);
+  const callback = (nodeData: NodeDataResult | undefined): void => {
+    setNodeData(nodeData);
+    setHighlightedId(nodeData?.nodeExternalId);
 
     if (nodeData === undefined) return;