chore: minor refactors from QA

cognitedata · Aug 14, 2023 · c3f30df · c3f30df
1 parent 9b09131
commit c3f30df
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 43 deletions.
diff --git a/react-components/src/hooks/useCalculateModelsStyling.tsx b/react-components/src/hooks/useCalculateModelsStyling.tsx
@@ -179,8 +179,8 @@ function getModelMappings(
       (mapping) => mapping.modelId === model.modelId && mapping.revisionId === model.revisionId
     )
     .reduce(
+      // reduce is added to avoid duplication of a models that span several pages.
       (acc, mapping) => {
-        // reduce is added to avoid duplicate models from several pages.
         mergeMaps(acc.mappings, mapping.mappings);
         return acc;
       },

diff --git a/react-components/src/hooks/useMappedEquipmentBy3DModelsList.tsx b/react-components/src/hooks/useMappedEquipmentBy3DModelsList.tsx
@@ -46,9 +46,9 @@ function groupToModelRevision(
     const edgesForModel = map.get(modelRevisionIdKey);
     if (edgesForModel === undefined) {
       map.set(modelRevisionIdKey, [edge]);
-      return map;
+    } else {
+      edgesForModel.push(edge);
     }
-    edgesForModel.push(edge);
 
     return map;
   }, new Map<ModelRevisionId, Array<EdgeItem<InModel3dEdgeProperties>>>());

diff --git a/react-components/src/utilities/FdmSDK.ts b/react-components/src/utilities/FdmSDK.ts
@@ -132,19 +132,24 @@ export class FdmSDK {
 
     const edgeResult = result.data.items as Array<EdgeItem<Record<string, any>>>;
 
-    if (source !== undefined) {
+    hoistEdgeProperties();
+
+    return {
+      edges: result.data.items as Array<EdgeItem<PropertiesType>>,
+      nextCursor: result.data.nextCursor
+    };
+
+    function hoistEdgeProperties(): void {
+      if (source === undefined) {
+        return;
+      }
       const propertyKey = `${source.externalId}/${source.version}`;
       edgeResult.forEach((edge) => {
         if (edge.properties[source.space][propertyKey] !== undefined) {
           edge.properties = edge.properties[source.space][propertyKey];
         }
       });
     }
-
-    return {
-      edges: result.data.items as Array<EdgeItem<PropertiesType>>,
-      nextCursor: result.data.nextCursor
-    };
   }
 
   public async filterAllInstances<PropertiesType = Record<string, any>>(

diff --git a/react-components/stories/Reveal3DResources.stories.tsx b/react-components/stories/Reveal3DResources.stories.tsx
@@ -3,10 +3,9 @@
  */
 import type { Meta, StoryObj } from '@storybook/react';
 import { Reveal3DResources, RevealContainer } from '../src';
-import { Color } from 'three';
+import { Color, Matrix4 } from 'three';
 import { CameraController } from '../src/';
 import { createSdkByUrlToken } from './utilities/createSdkByUrlToken';
-import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 
 const meta = {
   title: 'Example/Reveal3DResources',
@@ -23,16 +22,21 @@ export const Main: Story = {
   args: {
     resources: [
       {
-        modelId: 2231774635735416,
-        revisionId: 912809199849811,
-        styling: {
-          default: {
-            color: new Color('#efefef')
-          },
-          mapped: {
-            color: new Color('#c5cbff')
-          }
-        }
+        modelId: 1791160622840317,
+        revisionId: 498427137020189,
+        transform: new Matrix4().makeTranslation(40, 0, 0)
+      },
+      {
+        modelId: 1791160622840317,
+        revisionId: 498427137020189,
+        transform: new Matrix4().makeTranslation(40, 10, 0)
+      },
+      {
+        siteId: 'c_RC_2'
+      },
+      {
+        modelId: 3865289545346058,
+        revisionId: 4160448151596909
       }
     ]
   },
@@ -47,28 +51,7 @@ export const Main: Story = {
             placement: 'topRight'
           }
         }}>
-        <ReactQueryDevtools />
-        <Reveal3DResources
-          resources={resources}
-          instanceStyling={[
-            {
-              fdmAssetExternalIds: [
-                { space: 'pdms-mapping', externalId: 'EQ-l-2231774635735416-2232218418169407' },
-                { space: 'pdms-mapping', externalId: 'EQ-l-2231774635735416-5658577936769408' },
-                { space: 'pdms-mapping', externalId: 'EQ-l-2231774635735416-850382017588429' },
-                { space: 'pdms-mapping', externalId: 'EQ-l-2231774635735416-3070761313703702' },
-                { space: 'pdms-mapping', externalId: 'EQ-l-2231774635735416-3951638513367021' },
-                { space: 'pdms-mapping', externalId: 'EQ-l-2231774635735416-7062796113231733' },
-                { space: 'pdms-mapping', externalId: 'EQ-l-2231774635735416-2890847372912846' },
-                { space: 'pdms-mapping', externalId: 'EQ-l-2231774635735416-329414570333157' },
-                { space: 'pdms-mapping', externalId: 'EQ-l-2231774635735416-3629108135100276' },
-                { space: 'pdms-mapping', externalId: 'EQ-l-2231774635735416-6317623811412748' },
-                { space: 'pdms-mapping', externalId: 'EQ-l-2231774635735416-3132072649556228' }
-              ],
-              style: { cad: { color: new Color('#ff0000') } }
-            }
-          ]}
-        />
+        <Reveal3DResources resources={resources} />
         <CameraController
           initialFitCamera={{
             to: 'allModels'