feat: include node cache in keep-alive context

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

@@ -13,6 +13,7 @@ import { type DmsUniqueIdentifier } from '../../utilities/FdmSDK';
 import { type TypedReveal3DModel } from '../Reveal3DResources/types';
 import { type ThreeDModelMappings } from '../../hooks/types';
 import { DEFAULT_QUERY_STALE_TIME } from '../../utilities/constants';
+import { useRevealKeepAlive } from '../RevealKeepAlive/RevealKeepAliveContext';
 
 export type FdmNodeCacheContent = {
   cache: FdmNodeCache;
@@ -97,8 +98,15 @@ export const useFdmAssetMappings = (
 export function NodeCacheProvider({ children }: { children?: ReactNode }): ReactElement {
   const fdmClient = useFdmSdk();
   const cdfClient = useSDK();
+  const revealKeepAliveData = useRevealKeepAlive();
 
-  const fdmCache = useMemo(() => new FdmNodeCache(cdfClient, fdmClient), []);
+  const fdmCache = useMemo(() => {
+    const cache = revealKeepAliveData?.fdmNodeCache.current ?? new FdmNodeCache(cdfClient, fdmClient);
+    if (revealKeepAliveData !== undefined) {
+      revealKeepAliveData.fdmNodeCache.current = cache;
+    }
+    return cache;
+  }, []);
 
   return (
     <FdmNodeCacheContext.Provider value={{ cache: fdmCache }}>

react-components/src/components/RevealKeepAlive/RevealKeepAlive.tsx

@@ -5,18 +5,21 @@
 import { type Cognite3DViewer } from '@cognite/reveal';
 import { type ReactNode, type ReactElement, useRef, useEffect } from 'react';
 import { RevealKeepAliveContext } from './RevealKeepAliveContext';
+import { FdmNodeCache } from '../NodeCacheProvider/FdmNodeCache';
 
 export function RevealKeepAlive({ children }: { children?: ReactNode }): ReactElement {
   const viewerRef = useRef<Cognite3DViewer>();
   const isRevealContainerMountedRef = useRef<boolean>(false);
+  const fdmNodeCache = useRef<FdmNodeCache>();
+
   useEffect(() => {
     return () => {
       viewerRef.current?.dispose();
       viewerRef.current = undefined;
     };
   }, []);
   return (
-    <RevealKeepAliveContext.Provider value={{ viewerRef, isRevealContainerMountedRef }}>
+    <RevealKeepAliveContext.Provider value={{ viewerRef, isRevealContainerMountedRef, fdmNodeCache }}>
       {children}
     </RevealKeepAliveContext.Provider>
   );

react-components/src/components/RevealKeepAlive/RevealKeepAliveContext.ts

@@ -3,10 +3,12 @@
  */
 import { type Cognite3DViewer } from '@cognite/reveal';
 import { type MutableRefObject, createContext, useContext } from 'react';
+import { FdmNodeCache } from '../NodeCacheProvider/FdmNodeCache';
 
 export type RevealKeepAliveData = {
   viewerRef: MutableRefObject<Cognite3DViewer | undefined>;
   isRevealContainerMountedRef: MutableRefObject<boolean>;
+  fdmNodeCache: MutableRefObject<FdmNodeCache | undefined>;
 };
 
 export const RevealKeepAliveContext = createContext<RevealKeepAliveData | undefined>(undefined);