feat: throw error if FDM config not provided when using FDM (#3516)

* feat: make FDM config argument mandatory * chore: change naming convention to adhere to FDM standard * feat: throw error if config undefined instead * fix: argument reorder unnecessary changes * chore: lint fix * chore: lint fix --------- Co-authored-by: Savelii Novikov <45129444+Savokr@users.noreply.github.com> Co-authored-by: Savelii Novikov <kvaka2000@gmail.com>
cognitedata · Jul 31, 2023 · a46d43f · a46d43f
1 parent 4b4f1cf
commit a46d43f
Showing 1 changed file with 16 additions and 24 deletions.
diff --git a/react-components/src/hooks/useFdmAssetMappings.tsx b/react-components/src/hooks/useFdmAssetMappings.tsx
@@ -7,39 +7,31 @@ import { type UseQueryResult, useQuery } from '@tanstack/react-query';
 import { type FdmAssetMappingsConfig, type ThreeDModelMappings } from './types';
 import { DEFAULT_QUERY_STALE_TIME } from '../utilities/constants';
 
-const DefaultFdmConfig: FdmAssetMappingsConfig = {
-  source: {
-    space: 'fdm-3d-test-savelii',
-    version: '1',
-    type: 'view',
-    externalId: 'CDF_3D_Connection_Data'
-  },
-  assetFdmSpace: 'bark-corporation'
-};
-
 /**
  * This hook fetches the list of FDM asset mappings for the given external ids
  */
 export const useFdmAssetMappings = (
   fdmAssetExternalIds: CogniteExternalId[],
-  fdmConfig: FdmAssetMappingsConfig = DefaultFdmConfig
+  fdmConfig?: FdmAssetMappingsConfig
 ): UseQueryResult<ThreeDModelMappings[]> => {
   const fdmSdk = useFdmSdk();
 
-  const fdmAssetMappingFilter = {
-    in: {
-      property: ['edge', 'startNode'],
-      values: fdmAssetExternalIds.map((externalId) => ({
-        space: fdmConfig.assetFdmSpace,
-        externalId
-      }))
-    }
-  };
-
   return useQuery(
     ['reveal', 'react-components', fdmAssetExternalIds],
     async () => {
       if (fdmAssetExternalIds?.length === 0) return [];
+      if (fdmConfig === undefined)
+        throw Error('FDM config must be defined when using FDM asset mappings');
+
+      const fdmAssetMappingFilter = {
+        in: {
+          property: ['edge', 'startNode'],
+          values: fdmAssetExternalIds.map((externalId) => ({
+            space: fdmConfig.assetFdmSpace,
+            externalId
+          }))
+        }
+      };
 
       const instances = await fdmSdk.filterInstances(
         fdmAssetMappingFilter,
@@ -56,7 +48,7 @@ export const useFdmAssetMappings = (
           ];
 
         const modelId = Number.parseInt(instance.endNode.externalId.slice(9));
-        const revisionId = mappingProperty.RevisionId;
+        const revisionId = mappingProperty.revisionId;
 
         const isAdded = modelMappingsTemp.some(
           (mapping) => mapping.modelId === modelId && mapping.revisionId === revisionId
@@ -67,7 +59,7 @@ export const useFdmAssetMappings = (
             modelId,
             revisionId,
             mappings: [
-              { nodeId: mappingProperty.NodeId, externalId: instance.startNode.externalId }
+              { nodeId: mappingProperty.revisionNodeId, externalId: instance.startNode.externalId }
             ]
           });
         } else {
@@ -76,7 +68,7 @@ export const useFdmAssetMappings = (
           );
 
           modelMapping?.mappings.push({
-            nodeId: mappingProperty.NodeId,
+            nodeId: mappingProperty.revisionNodeId,
             externalId: instance.startNode.externalId
           });
         }