From db652180ec9bfdebdfc362d14b608b17059654ff Mon Sep 17 00:00:00 2001
From: Pramod S <pramod.s@cognite.com>
Date: Tue, 20 Aug 2024 09:19:35 +0200
Subject: [PATCH] enable useSearchMappedEquipmentAssetMappings query only when
 initialAssetMappings value is loaded

---
 .../query/useSearchMappedEquipmentAssetMappings.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/react-components/src/query/useSearchMappedEquipmentAssetMappings.tsx b/react-components/src/query/useSearchMappedEquipmentAssetMappings.tsx
index 658ec82b311..dda094ff1a4 100644
--- a/react-components/src/query/useSearchMappedEquipmentAssetMappings.tsx
+++ b/react-components/src/query/useSearchMappedEquipmentAssetMappings.tsx
@@ -49,7 +49,8 @@ export const useSearchMappedEquipmentAssetMappings = (
   const { data: assetMappingList, isFetched } = useAssetMappedNodesForRevisions(
     models.map((model) => ({ ...model, type: 'cad' }))
   );
-  const initialAssetMappings = useAllMappedEquipmentAssetMappings(models, sdk);
+  const { data: initialAssetMappings, isLoading: isInitialAssetMappingsLoading } =
+    useAllMappedEquipmentAssetMappings(models, sdk);
 
   return useInfiniteQuery({
     queryKey: [
@@ -60,11 +61,11 @@ export const useSearchMappedEquipmentAssetMappings = (
       ...models.map((model) => [model.modelId, model.revisionId])
     ],
     queryFn: async ({ pageParam }: { pageParam: string | undefined }) => {
-      if (initialAssetMappings.data === undefined) {
+      if (initialAssetMappings === undefined) {
         return { assets: [], nextCursor: undefined };
       }
       if (query === '') {
-        const assets = initialAssetMappings.data?.pages.flatMap((modelWithAssets) =>
+        const assets = initialAssetMappings.pages.flatMap((modelWithAssets) =>
           modelWithAssets.modelsAssets.flatMap((modelsAsset) => modelsAsset.assets).flat()
         );
         return { assets, nextCursor: undefined };
@@ -100,7 +101,11 @@ export const useSearchMappedEquipmentAssetMappings = (
       const lastPageData = allPages[allPages.length - 1];
       return lastPageData.nextCursor;
     },
-    enabled: isFetched && assetMappingList !== undefined && assetMappingList.length > 0
+    enabled:
+      !isInitialAssetMappingsLoading &&
+      isFetched &&
+      assetMappingList !== undefined &&
+      assetMappingList.length > 0
   });
 };