fix(alarms): fix for asset-model alarms in kpi

awslabs · Oct 4, 2024 · b444ef3 · b444ef3
1 parent 4a78c3a
commit b444ef3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...iotSiteWiseQueryEditor/assetModelDataStreamExplorer/modelBasedQuery/useModelBasedQuery.ts b/...iotSiteWiseQueryEditor/assetModelDataStreamExplorer/modelBasedQuery/useModelBasedQuery.ts
@@ -29,6 +29,10 @@ export const useModelBasedQuery = () => {
     () => (firstWidget?.properties.queryConfig.query?.assetModels ?? []).at(0),
     [firstWidget]
   );
+  const alarmAssetModel = useMemo(
+    () => (firstWidget?.properties.queryConfig.query?.alarmModels ?? []).at(0),
+    [firstWidget]
+  );
 
   const updateModelBasedWidgets = useCallback(
     (updatedWidgets: QueryConfigWidget[]) => {
@@ -100,8 +104,8 @@ export const useModelBasedQuery = () => {
   );
 
   return {
-    assetModelId: assetModel?.assetModelId,
-    assetIds: assetModel?.assetIds,
+    assetModelId: assetModel?.assetModelId ?? alarmAssetModel?.assetModelId,
+    assetIds: assetModel?.assetIds ?? alarmAssetModel?.assetIds,
     hasModelBasedQuery: hasModelBasedQueryWidgets,
     modelBasedWidgets,
     updateModelBasedWidgets,

diff --git a/packages/dashboard/src/customization/widgets/utils/assignDefaultStyleSettings.ts b/packages/dashboard/src/customization/widgets/utils/assignDefaultStyleSettings.ts
@@ -16,6 +16,7 @@ const assignDefaults = (
     properties = [],
     assetModels = [],
     alarms = [],
+    alarmModels = [],
   }: IoTSiteWiseDataStreamQuery,
   resAndAggr: { aggregation?: AggregateType; resolution?: string },
   getId: () => string = uuid
@@ -45,6 +46,7 @@ const assignDefaults = (
     })),
   })),
   alarms,
+  alarmModels,
   requestSettings: {
     ...resAndAggr,
   },

diff --git a/...ks/useAlarms/hookHelpers/useInputPropertyTimeSeriesData/useInputPropertyTimeSeriesData.ts b/...ks/useAlarms/hookHelpers/useInputPropertyTimeSeriesData/useInputPropertyTimeSeriesData.ts
@@ -11,8 +11,8 @@ import { filterDataStreamsForAlarm } from './filterDatastreamsForAlarm';
 
 import { useTimeSeriesData } from '../../../useTimeSeriesData';
 
-const alarmDataAsComparable = ({ inputProperty }: AlarmData) =>
-  inputProperty?.map(({ property }) => property.id);
+const alarmDataAsComparable = ({ inputProperty, assetId }: AlarmData) =>
+  inputProperty?.map(({ property }) => ({ assetId, propertyId: property.id }));
 
 export const useInputPropertyTimeSeriesData = ({
   alarms,