Merge master into dependabot/npm_and_yarn/examples/micromatch-4.0.8

cognitedata · Sep 6, 2024 · e916d41 · e916d41
2 parents fc41b9f + 3bbb849
commit e916d41
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/react-components/src/query/use3dRelatedDirectConnections.ts b/react-components/src/query/use3dRelatedDirectConnections.ts
@@ -15,7 +15,12 @@ export function use3dRelatedDirectConnections(
   const fdmDataProvider = useFdm3dDataProvider();
 
   return useQuery({
-    queryKey: ['reveal-react-components', 'get-3d-related-direct-connections'],
+    queryKey: [
+      'reveal-react-components',
+      'get-3d-related-direct-connections',
+      instance?.externalId,
+      instance?.space
+    ],
     queryFn: async () => {
       assert(instance !== undefined);
       const views = await fdmSdk.inspectInstances({

diff --git a/react-components/src/query/useSearchAssetsMapped360Annotations.tsx b/react-components/src/query/useSearchAssetsMapped360Annotations.tsx
@@ -23,7 +23,13 @@ export const useAllAssetsMapped360Annotations = (
   image360AnnotationFilterOptions: Image360AnnotationFilterOptions = { status: `approved` }
 ): UseQueryResult<Image360AnnotationMappedAssetData[]> => {
   return useQuery({
-    queryKey: ['reveal', 'react-components', 'all-assets-mapped-360-annotations', siteIds],
+    queryKey: [
+      'reveal',
+      'react-components',
+      'all-assets-mapped-360-annotations',
+      siteIds,
+      image360AnnotationFilterOptions.status
+    ],
     queryFn: async () => {
       const assetMappings = await getAssetsMapped360Annotations(
         sdk,
@@ -54,7 +60,8 @@ export const useSearchAssetsMapped360Annotations = (
       'react-components',
       'search-assets-mapped-360-annotations',
       query,
-      siteIds
+      siteIds,
+      image360AnnotationFilterOptions?.status
     ],
     queryFn: async () => {
       if (query === '') {

diff --git a/react-components/src/query/useSearchMappedEquipmentAssetMappings.tsx b/react-components/src/query/useSearchMappedEquipmentAssetMappings.tsx
@@ -54,6 +54,7 @@ export const useSearchMappedEquipmentAssetMappings = (
       'react-components',
       'search-mapped-asset-mappings',
       query,
+      limit,
       ...models.map((model) => [model.modelId, model.revisionId])
     ],
     queryFn: async ({ pageParam }: { pageParam: string | undefined }) => {
@@ -123,6 +124,7 @@ export const useAllMappedEquipmentAssetMappings = (
       'reveal',
       'react-components',
       'all-mapped-equipment-asset-mappings',
+      limit,
       ...models.map((model) => [model.modelId, model.revisionId])
     ],
     queryFn: async ({ pageParam }) => {

diff --git a/react-components/src/query/useSearchMappedEquipmentFDM.tsx b/react-components/src/query/useSearchMappedEquipmentFDM.tsx
@@ -38,7 +38,16 @@ export const useSearchMappedEquipmentFDM = (
   );
 
   return useQuery({
-    queryKey: ['reveal', 'react-components', 'search-mapped-fdm', query, models, viewsToSearch],
+    queryKey: [
+      'reveal',
+      'react-components',
+      'search-mapped-fdm',
+      query,
+      models,
+      viewsToSearch,
+      instancesFilter,
+      limit
+    ],
     queryFn: async () => {
       if (models.length === 0) {
         return [];
@@ -123,7 +132,7 @@ export const useAllMappedEquipmentFDM = (
   const fdmDataProvider = useFdm3dDataProvider();
 
   return useQuery({
-    queryKey: ['reveal', 'react-components', 'all-mapped-equipment-fdm', viewsToSearch],
+    queryKey: ['reveal', 'react-components', 'all-mapped-equipment-fdm', viewsToSearch, models],
     queryFn: async () => {
       const viewSources = await createSourcesFromViews(viewsToSearch, fdmSdk);