Skip to content

Commit

Permalink
enable useSearchMappedEquipmentAssetMappings query only when initialA…
Browse files Browse the repository at this point in the history
…ssetMappings value is loaded
  • Loading branch information
pramodcog committed Aug 20, 2024
1 parent b5b0e12 commit db65218
Showing 1 changed file with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand All @@ -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 };
Expand Down Expand Up @@ -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
});
};

Expand Down

0 comments on commit db65218

Please sign in to comment.