feat(composer): update convert to attached scene component and load d…

…ata from it
awslabs · Apr 24, 2024 · 86c92ce · 86c92ce
1 parent 1e506ec
commit 86c92ce
Show file tree

Hide file tree

Showing 20 changed files with 1,460 additions and 134 deletions.
diff --git a/packages/scene-composer/src/common/constants.ts b/packages/scene-composer/src/common/constants.ts
@@ -165,9 +165,7 @@ export const FONT_AWESOME_PREFIX = 'fas';
 /******************************************************************************
  * Matterport Constants
  ******************************************************************************/
-export const SCENE_CAPABILITY_MATTERPORT = 'MATTERPORT';
 export const SECRET_MANAGER_MATTERPORT_TAG = 'AWSIoTTwinMaker_Matterport';
-export const MATTERPORT_SECRET_ARN = 'MATTERPORT_SECRET_ARN';
 export const MATTERPORT_ACCESS_TOKEN = 'MATTERPORT_ACCESS_TOKEN';
 export const MATTERPORT_APPLICATION_KEY = 'MATTERPORT_APPLICATION_KEY';
 export const MATTERPORT_ERROR = 'MATTERPORT_ERROR';

diff --git a/packages/scene-composer/src/components/SceneComposerInternal.spec.tsx b/packages/scene-composer/src/components/SceneComposerInternal.spec.tsx
@@ -4,6 +4,7 @@ import { cleanup, renderHook } from '@testing-library/react-hooks';
 import str2ab from 'string-to-arraybuffer';
 import flushPromises from 'flush-promises';
 import { Object3D, Event, Mesh, MeshBasicMaterial, Color } from 'three';
+import { TwinMakerSceneMetadataModule } from '@iot-app-kit/source-iottwinmaker';
 
 import { useSceneComposerApi, SceneComposerApi } from '..';
 import { testScenes } from '../../tests/testData';
@@ -44,8 +45,17 @@ function createSceneLoaderMock(sceneContent: string) {
 }
 
 describe('SceneComposerInternal', () => {
+  const getSceneInfo = jest.fn();
+  const mockSceneMetadataModule = {
+    getSceneInfo,
+  } as unknown as TwinMakerSceneMetadataModule;
+
   beforeEach(() => {
     jest.clearAllMocks();
+    getSceneInfo.mockResolvedValue({
+      capabilities: [],
+      sceneMetadata: {},
+    });
   });
 
   describe('useSceneComposerApi', () => {
@@ -62,6 +72,7 @@ describe('SceneComposerInternal', () => {
               sceneComposerId={sceneComposerId}
               config={{ mode: 'Editing' }}
               sceneLoader={createSceneLoaderMock(testScenes.scene1)}
+              sceneMetadataModule={mockSceneMetadataModule}
             />
           );
         };
@@ -81,6 +92,7 @@ describe('SceneComposerInternal', () => {
             sceneComposerId={sceneComposerId}
             config={{ mode: 'Editing' }}
             sceneLoader={createSceneLoaderMock(testScenes.waterTank)}
+            sceneMetadataModule={mockSceneMetadataModule}
           />
         );
       };

diff --git a/packages/scene-composer/src/components/SceneComposerInternalSnap.spec.tsx b/packages/scene-composer/src/components/SceneComposerInternalSnap.spec.tsx
@@ -2,6 +2,7 @@ import * as React from 'react';
 import { create, act } from 'react-test-renderer';
 import str2ab from 'string-to-arraybuffer';
 import flushPromises from 'flush-promises';
+import { TwinMakerSceneMetadataModule } from '@iot-app-kit/source-iottwinmaker';
 
 import * as SceneLayoutComponents from '../layouts/SceneLayout';
 import { invalidTestScenes, testScenes } from '../../tests/testData';
@@ -33,15 +34,28 @@ function createSceneLoaderMock(sceneContent: string) {
 }
 
 describe('SceneComposerInternal', () => {
+  const getSceneInfo = jest.fn();
+  const mockSceneMetadataModule = {
+    getSceneInfo,
+  } as unknown as TwinMakerSceneMetadataModule;
+
   beforeEach(() => {
     jest.clearAllMocks();
+    getSceneInfo.mockResolvedValue({
+      capabilities: [],
+      sceneMetadata: {},
+    });
   });
 
   it('should render correctly with an empty scene in editing mode', async () => {
     let container;
     await act(async () => {
       container = create(
-        <SceneComposerInternal config={{ mode: 'Editing' }} sceneLoader={createSceneLoaderMock('')} />,
+        <SceneComposerInternal
+          config={{ mode: 'Editing' }}
+          sceneLoader={createSceneLoaderMock('')}
+          sceneMetadataModule={mockSceneMetadataModule}
+        />,
       );
 
       await flushPromises();
@@ -55,7 +69,11 @@ describe('SceneComposerInternal', () => {
     let container;
     await act(async () => {
       container = create(
-        <SceneComposerInternal config={{ mode: 'Viewing' }} sceneLoader={createSceneLoaderMock('')} />,
+        <SceneComposerInternal
+          config={{ mode: 'Viewing' }}
+          sceneLoader={createSceneLoaderMock('')}
+          sceneMetadataModule={mockSceneMetadataModule}
+        />,
       );
 
       await flushPromises();
@@ -69,7 +87,11 @@ describe('SceneComposerInternal', () => {
     let container;
     await act(async () => {
       container = create(
-        <SceneComposerInternal config={{ mode: 'Editing' }} sceneLoader={createSceneLoaderMock(testScenes.scene1)} />,
+        <SceneComposerInternal
+          config={{ mode: 'Editing' }}
+          sceneLoader={createSceneLoaderMock(testScenes.scene1)}
+          sceneMetadataModule={mockSceneMetadataModule}
+        />,
       );
 
       await flushPromises();
@@ -86,6 +108,7 @@ describe('SceneComposerInternal', () => {
         <SceneComposerInternal
           config={{ mode: 'Editing' }}
           sceneLoader={createSceneLoaderMock(invalidTestScenes.unsupportedMinorVersionScene)}
+          sceneMetadataModule={mockSceneMetadataModule}
         />,
       );
 
@@ -102,6 +125,7 @@ describe('SceneComposerInternal', () => {
         <SceneComposerInternal
           config={{ mode: 'Editing' }}
           sceneLoader={createSceneLoaderMock(invalidTestScenes.unsupportedMajorVersion)}
+          sceneMetadataModule={mockSceneMetadataModule}
         />,
       );
 
@@ -118,6 +142,7 @@ describe('SceneComposerInternal', () => {
         <SceneComposerInternal
           config={{ mode: 'Editing' }}
           sceneLoader={createSceneLoaderMock(invalidTestScenes.invalidSpecVersionScene)}
+          sceneMetadataModule={mockSceneMetadataModule}
         />,
       );
 
@@ -132,8 +157,16 @@ describe('SceneComposerInternal', () => {
     await act(async () => {
       container = create(
         <div>
-          <SceneComposerInternal config={{ mode: 'Editing' }} sceneLoader={createSceneLoaderMock(testScenes.scene1)} />
-          <SceneComposerInternal config={{ mode: 'Editing' }} sceneLoader={createSceneLoaderMock(testScenes.scene2)} />
+          <SceneComposerInternal
+            config={{ mode: 'Editing' }}
+            sceneLoader={createSceneLoaderMock(testScenes.scene1)}
+            sceneMetadataModule={mockSceneMetadataModule}
+          />
+          <SceneComposerInternal
+            config={{ mode: 'Editing' }}
+            sceneLoader={createSceneLoaderMock(testScenes.scene2)}
+            sceneMetadataModule={mockSceneMetadataModule}
+          />
         </div>,
       );
 
@@ -152,8 +185,13 @@ describe('SceneComposerInternal', () => {
           <SceneComposerInternal
             config={{ mode: 'Editing' }}
             sceneLoader={createSceneLoaderMock(invalidTestScenes.invalidJson)}
+            sceneMetadataModule={mockSceneMetadataModule}
+          />
+          <SceneComposerInternal
+            config={{ mode: 'Editing' }}
+            sceneLoader={createSceneLoaderMock(testScenes.scene1)}
+            sceneMetadataModule={mockSceneMetadataModule}
           />
-          <SceneComposerInternal config={{ mode: 'Editing' }} sceneLoader={createSceneLoaderMock(testScenes.scene1)} />
         </div>,
       );
 
@@ -170,6 +208,7 @@ describe('SceneComposerInternal', () => {
         <SceneComposerInternal
           config={{ mode: 'Editing' }}
           sceneLoader={createSceneLoaderMock(invalidTestScenes.invalidJson)}
+          sceneMetadataModule={mockSceneMetadataModule}
         />,
       );
 
@@ -185,7 +224,11 @@ describe('SceneComposerInternal', () => {
     });
 
     const container = create(
-      <SceneComposerInternal config={{ mode: 'Editing' }} sceneLoader={createSceneLoaderMock('')} />,
+      <SceneComposerInternal
+        config={{ mode: 'Editing' }}
+        sceneLoader={createSceneLoaderMock('')}
+        sceneMetadataModule={mockSceneMetadataModule}
+      />,
     );
 
     await flushPromises();