fix(react-components): various small fixes

cognitedata · Aug 13, 2024 · 93ec1d6 · 93ec1d6
1 parent d61d0bb
commit 93ec1d6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/react-components/src/components/CacheProvider/RevisionFdmNodeCache.ts b/react-components/src/components/CacheProvider/RevisionFdmNodeCache.ts
@@ -237,16 +237,18 @@ export class RevisionFdmNodeCache {
     mappingConnections: FdmCadConnection[],
     nodes: Node3D[]
   ): Array<{ connection: FdmCadConnection; treeIndex: TreeIndex }> {
-    return mappingConnections.map((connection) => {
+    return mappingConnections.reduce((acc, connection) => {
       const nodeInConnection = nodes.find((node) => node.id === connection.nodeId);
 
-      assert(nodeInConnection !== undefined);
+      if (nodeInConnection !== undefined) {
+        acc.push({
+          connection,
+          treeIndex: nodeInConnection.treeIndex
+        });
+      }
 
-      return {
-        connection,
-        treeIndex: nodeInConnection.treeIndex
-      };
-    });
+      return acc;
+    }, new Array<{ connection: FdmCadConnection; treeIndex: TreeIndex }>());
   }
 
   private async getMappingConnectionsForAncestors(

diff --git a/react-components/src/data-providers/FdmSDK.ts b/react-components/src/data-providers/FdmSDK.ts
@@ -561,7 +561,7 @@ function hoistInstanceProperties(
   });
 }
 
-function makeSureNonEmptyFilterForRequest(
+export function makeSureNonEmptyFilterForRequest(
   filter: InstanceFilter | undefined
 ): InstanceFilter | undefined {
   return filter !== undefined && Object.keys(filter).length === 0 ? undefined : filter;

diff --git a/react-components/src/data-providers/legacy-fdm-provider/createMappedEquipmentQuery.ts b/react-components/src/data-providers/legacy-fdm-provider/createMappedEquipmentQuery.ts
@@ -2,7 +2,12 @@
  * Copyright 2024 Cognite AS
  */
 import { type AddModelOptions } from '@cognite/reveal';
-import { type InstanceFilter, type Query, type Source } from '../FdmSDK';
+import {
+  makeSureNonEmptyFilterForRequest,
+  type InstanceFilter,
+  type Query,
+  type Source
+} from '../FdmSDK';
 import { SYSTEM_3D_EDGE_SOURCE } from './dataModels';
 
 export function createMappedEquipmentQuery(
@@ -12,6 +17,8 @@ export function createMappedEquipmentQuery(
   limit: number = 10000,
   cursors?: Record<string, string>
 ): Query {
+  instanceFilter = makeSureNonEmptyFilterForRequest(instanceFilter);
+
   return {
     with: {
       mapped_edges: {

diff --git a/react-components/src/query/useSearchMappedEquipmentAssetMappings.tsx b/react-components/src/query/useSearchMappedEquipmentAssetMappings.tsx
@@ -208,7 +208,7 @@ export const useMappingsForAssetIds = (
             nextCursor.model.revisionId === model.revisionId
         )?.cursor;
 
-        if (nextCursor === undefined) {
+        if (nextCursor === undefined || assetIds.length === 0) {
           return { mappings: { items: [] }, model };
         }