chore: more refactoring

react-components/src/components/NodeCacheProvider/FdmNodeCache.ts

@@ -11,14 +11,14 @@ import {
   SYSTEM_3D_EDGE_SOURCE,
   SYSTEM_SPACE_3D_SCHEMA
 } from '../../utilities/globalDataModels';
-import {
-  type ModelRevisionKey,
-  type ModelRevisionToEdgeMap
-} from '../../hooks/useMappedEquipmentBy3DModelsList';
+
+export type ModelRevisionKey = `${number}-${number}`;
+export type ModelRevisionToEdgeMap = Map<ModelRevisionKey, FdmEdgeWithNode[]>;
 
 import { partition } from 'lodash';
 
 import assert from 'assert';
+import { fetchNodesForNodeIds } from './requests';
 
 export class FdmNodeCache {
   private readonly _revisionNodeCaches = new Map<RevisionKey, RevisionFdmNodeCache>();
@@ -235,7 +235,7 @@ async function createModelNodeIdToNodeMap(revisionToNodeIdsMap: Map<RevisionId,
       const modelId = modelRevisionIds.find((p) => p.revisionId === revisionId)?.modelId;
       assert(modelId !== undefined);
 
-      const nodes = await nodeIdsToNodes(modelId, revisionId, nodeIds, cdfClient);
+      const nodes = await fetchNodesForNodeIds(modelId, revisionId, nodeIds, cdfClient);
       nodeIds.forEach((e, ind) => {
         const modelNodeIdKey = `${modelId}-${revisionId}-${e}` as const;
         revisionNodeIdToNode.set(modelNodeIdKey, nodes[ind]);
@@ -262,16 +262,3 @@ function createRevisionToNodeIdMap(edges: Array<FdmCadEdge>): Map<RevisionId, No
     return revisionNodeIdMap;
   }, new Map<RevisionId, NodeId[]>());
 }
-
-async function nodeIdsToNodes(
-  modelId: number,
-  revisionId: number,
-  nodeIds: number[],
-  cogniteClient: CogniteClient
-): Promise<Node3D[]> {
-  return await cogniteClient.revisions3D.retrieve3DNodes(
-    modelId,
-    revisionId,
-    nodeIds.map((id) => ({ id }))
-  );
-}

react-components/src/components/NodeCacheProvider/NodeCacheProvider.tsx

@@ -3,8 +3,7 @@
  */
 
 import { type ReactElement, type ReactNode, createContext, useContext, useMemo } from 'react';
-import { FdmNodeCache } from './FdmNodeCache';
-import { type ModelRevisionToEdgeMap } from '../../hooks/useMappedEquipmentBy3DModelsList';
+import { FdmNodeCache, ModelRevisionToEdgeMap } from './FdmNodeCache';
 import { type UseQueryResult, useQuery } from '@tanstack/react-query';
 import { useFdmSdk, useSDK } from '../RevealContainer/SDKProvider';
 import { type Fdm3dNodeData } from './types';
@@ -17,7 +16,7 @@ export type FdmNodeCacheContent = {
 
 export const FdmNodeCacheContext = createContext<FdmNodeCacheContent | undefined>(undefined);
 
-export const useGetAllExternalIds = (
+export const useMappedEdgesForRevisions = (
   modelRevisionIds: Array<{ modelId: number; revisionId: number }>,
   enabled: boolean
 ): UseQueryResult<ModelRevisionToEdgeMap> => {

react-components/src/components/NodeCacheProvider/RevisionFdmNodeCache.ts

@@ -4,7 +4,7 @@
 
 import { type CogniteClient, type Node3D } from '@cognite/sdk';
 import { type FdmSDK } from '../../utilities/FdmSDK';
-import { type TreeIndex } from './FdmNodeCache';
+import { type TreeIndex } from './types';
 
 import {
   fetchAncestorNodesForTreeIndex,

react-components/src/components/NodeCacheProvider/requests.ts

@@ -113,3 +113,16 @@ export async function treeIndexesToNodeIds(
     throw Error(`treeIndex-nodeId translation failed for treeIndexes ${treeIndexes.join(',')}`);
   }
 }
+
+export async function fetchNodesForNodeIds(
+  modelId: number,
+  revisionId: number,
+  nodeIds: number[],
+  cogniteClient: CogniteClient
+): Promise<Node3D[]> {
+  return await cogniteClient.revisions3D.retrieve3DNodes(
+    modelId,
+    revisionId,
+    nodeIds.map((id) => ({ id }))
+  );
+}

react-components/src/hooks/useCalculateModelsStyling.tsx

@@ -10,14 +10,14 @@ import {
   type NodeStylingGroup,
   type CadModelStyling
 } from '../components/CadModelContainer/CadModelContainer';
-import { useMappedEquipmentByRevisionList } from './useMappedEquipmentBy3DModelsList';
 import { type InModel3dEdgeProperties } from '../utilities/globalDataModels';
 import { type EdgeItem } from '../utilities/FdmSDK';
 import { type NodeAppearance } from '@cognite/reveal';
 import { type ThreeDModelMappings } from './types';
 import { type CogniteExternalId, type CogniteInternalId } from '@cognite/sdk';
 import { useFdmAssetMappings } from './useFdmAssetMappings';
 import { useEffect, useMemo } from 'react';
+import { useMappedEdgesForRevisions } from '../components/NodeCacheProvider/NodeCacheProvider';
 
 type ModelStyleGroup = {
   model: TypedReveal3DModel;
@@ -43,7 +43,7 @@ function useCalculateMappedStyling(models: TypedReveal3DModel[]): ModelStyleGrou
     (model) => model.styling?.mapped !== undefined
   );
   const shouldFetchAllMappedEquipment = modelsRevisionsWithMappedEquipment.length > 0;
-  const { data: mappedEquipmentEdges } = useMappedEquipmentByRevisionList(
+  const { data: mappedEquipmentEdges } = useMappedEdgesForRevisions(
     modelsRevisionsWithMappedEquipment,
     shouldFetchAllMappedEquipment
   );