fix(dashboard): bugfix for color reset on new property drop

awslabs · Mar 30, 2023 · 05c04e6 · 05c04e6
1 parent 2fa8758
commit 05c04e6
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/packages/dashboard/src/customization/widgets/utils/assignDefaultStyleSettings.ts b/packages/dashboard/src/customization/widgets/utils/assignDefaultStyleSettings.ts
@@ -3,6 +3,7 @@ import type { SiteWiseAssetQuery } from '@iot-app-kit/source-iotsitewise';
 import { v4 as uuid } from 'uuid';
 import type { QueryWidget } from '../types';
 import { assignDefaultColor } from '@iot-app-kit/core-util';
+import { isDefined } from '~/util/isDefined';
 
 const assignDefaultRefId = (siteWiseAssetQuery: SiteWiseAssetQuery, getId: () => string = uuid) => ({
   assets: siteWiseAssetQuery.assets.map(({ properties, ...others }) => ({
@@ -19,16 +20,13 @@ const assignDefaultColors = (
   siteWiseAssetQuery: SiteWiseAssetQuery,
   colorIndexOffset = 0
 ): StyleSettingsMap => {
-  const properties = siteWiseAssetQuery.assets.flatMap((asset) =>
-    asset.properties.map(({ refId }) => ({
-      refId,
-    }))
-  );
-
-  return properties.reduce((acc: StyleSettingsMap, { refId }, index) => {
-    if (refId && !styleSettings[refId]) {
-      acc[refId] = assignDefaultColor({}, index + colorIndexOffset);
-    }
+  const refIds = siteWiseAssetQuery.assets
+    .flatMap((asset) => asset.properties.map(({ refId }) => refId))
+    .filter(isDefined);
+
+  return refIds.reduce((acc: StyleSettingsMap, refId, index) => {
+    const existing = styleSettings[refId] || {};
+    acc[refId] = assignDefaultColor(existing, index + colorIndexOffset);
     return acc;
   }, {});
 };
@@ -38,7 +36,7 @@ export const assignDefaultStyles = (widget: QueryWidget): QueryWidget => {
 
   if (!siteWiseAssetQuery) return widget;
 
-  let styleSettings = {};
+  let styleSettings = widget.properties.styleSettings || {};
 
   const assetQueriesWithRefIds = assignDefaultRefId(siteWiseAssetQuery);
   styleSettings = assignDefaultColors(styleSettings, assetQueriesWithRefIds);