fix(dashboard): modeled datastreams are displayed in msw

awslabs · Dec 18, 2023 · a2833a1 · a2833a1
1 parent 1618d50
commit a2833a1
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 8 deletions.
diff --git a/packages/dashboard/src/msw/iot-sitewise/handlers/listAssets/listAssetsHandler.ts b/packages/dashboard/src/msw/iot-sitewise/handlers/listAssets/listAssetsHandler.ts
@@ -1,4 +1,4 @@
-import { type ListAssetsResponse } from '@aws-sdk/client-iotsitewise';
+import { type AssetSummary, type ListAssetsResponse } from '@aws-sdk/client-iotsitewise';
 import { rest } from 'msw';
 
 import { LIST_ASSETS_URL } from './constants';
@@ -7,11 +7,19 @@ import { summarizeAsset } from '../../resources/assets/summarizeAssetDescription
 
 export function listAssetsHandler() {
   return rest.get(LIST_ASSETS_URL, (_req, res, ctx) => {
-    const rootAssets = ASSET_HIERARCHY.getRootAssets();
-    const rootAssetSummaries = rootAssets.map(summarizeAsset);
+    const url = new URL(_req.url);
+    const assetModelId = url.searchParams.get('assetModelId');
+    let assetSummaries: AssetSummary[] = [];
+    if (assetModelId) {
+      const assets = ASSET_HIERARCHY.getAssetsByAssetModelId(assetModelId);
+      assetSummaries = assets.map(summarizeAsset);
+    } else {
+      const rootAssets = ASSET_HIERARCHY.getRootAssets();
+      assetSummaries = rootAssets.map(summarizeAsset);
+    }
 
     const response: ListAssetsResponse = {
-      assetSummaries: rootAssetSummaries,
+      assetSummaries: assetSummaries,
       nextToken: undefined,
     };
 

diff --git a/packages/dashboard/src/msw/iot-sitewise/resources/assets/AssetFactory.ts b/packages/dashboard/src/msw/iot-sitewise/resources/assets/AssetFactory.ts
@@ -12,22 +12,26 @@ export class AssetFactory {
 
   public create({ assetName }: Pick<Asset, 'assetName'>): Asset {
     const asset = {
-      ...this.#createDefaults(),
+      ...this.#createDefaults(assetName),
       assetName,
     };
 
     return asset;
   }
 
-  #createDefaults() {
+  #createDefaults(assetName: string | undefined) {
     const assetId = uuid();
     const assetArn = `arn:aws:iotsitewise:us-east-1:123456789012:asset/${assetId}`;
     const assetModelId = this.#assetModel.assetModelId;
     const assetProperties =
       this.#assetModel.assetModelProperties?.map(({ id, name, dataType }) => ({
         id,
-        name,
-        dataType,
+        name: name,
+        dataType: dataType,
+        path: [
+          { id: assetId, name: assetName ?? '' },
+          { id: id, name: name },
+        ],
       })) ?? [];
     const assetHierarchies = this.#assetModel.assetModelHierarchies;
     const assetCreationDate = new Date();

diff --git a/packages/dashboard/src/msw/iot-sitewise/resources/assets/index.ts b/packages/dashboard/src/msw/iot-sitewise/resources/assets/index.ts
@@ -27,6 +27,11 @@ class AssetHierarchyClient {
     return rootAssets;
   }
 
+  public getAssetsByAssetModelId(assetModelId: string): Asset[] {
+    const assetList = this.#searchByAssetModelId(assetModelId, this.#assetHierarchy);
+    return assetList;
+  }
+
   public findAssetById(assetId: string): Asset | undefined {
     const node = this.#searchById(assetId, this.#assetHierarchy);
     const asset = node?.asset;
@@ -69,6 +74,20 @@ class AssetHierarchyClient {
     }
   }
 
+  #searchByAssetModelId(assetModelId: string, assetHierarchy: AssetHierarchy, assetList?: Asset[]) {
+    const assetsMatchingModelIdList = assetList ? assetList : [];
+    for (const node of assetHierarchy) {
+      if (node.asset.assetModelId === assetModelId) {
+        assetsMatchingModelIdList.push(node.asset);
+      }
+
+      if (node.children) {
+        this.#searchByAssetModelId(assetModelId, node.children, assetsMatchingModelIdList);
+      }
+    }
+    return assetsMatchingModelIdList;
+  }
+
   #searchParentById(
     assetId: string,
     assetHierarchy: AssetHierarchy,