fix: default resolution and aggregation

awslabs · Oct 5, 2023 · e5afdc0 · e5afdc0
1 parent 06207f9
commit e5afdc0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/packages/dashboard/src/customization/propertiesSections/aggregationSettings/index.tsx b/packages/dashboard/src/customization/propertiesSections/aggregationSettings/index.tsx
@@ -47,7 +47,7 @@ const RenderAggregationsPropertiesSection = ({
 }) => {
   const [aggregationMaybe, updateAggregation] = useProperty(
     // Default resolution is auto. We ensure the aggregation is defaulted to average instead of raw.
-    ({ aggregationType, resolution }) => (resolution == null && aggregationType == null ? 'AVERAGE' : aggregationType),
+    ({ aggregationType }) => aggregationType,
     (properties, updatedAggregationType) => {
       return {
         ...properties,

diff --git a/...es/dashboard/src/customization/propertiesSections/lineAndScatterStyleSettings/section.tsx b/...es/dashboard/src/customization/propertiesSections/lineAndScatterStyleSettings/section.tsx
@@ -86,8 +86,8 @@ const RenderLineAndScatterStyleSettingsSection = ({
   );
 
   const [aggregationMaybe, updateAggregation] = useProperty(
-    // Default resolution is auto. We ensure the aggregation is defaulted to average instead of raw.
-    ({ aggregationType, resolution }) => (resolution == null && aggregationType == null ? 'AVERAGE' : aggregationType),
+    // Default resolution is auto. We ensure the aggregation is defaulted to average instead of no aggregation.
+    ({ aggregationType }) => aggregationType,
     (properties, updatedAggregationType) => ({
       ...properties,
       queryConfig: {

diff --git a/packages/dashboard/src/customization/widgets/barChart/plugin.tsx b/packages/dashboard/src/customization/widgets/barChart/plugin.tsx
@@ -14,6 +14,8 @@ export const barChartPlugin: DashboardPlugin = {
         icon: BarIcon,
       },
       properties: () => ({
+        aggregationType: 'AVERAGE',
+        resolution: undefined,
         queryConfig: {
           source: 'iotsitewise',
           query: undefined,

diff --git a/packages/dashboard/src/customization/widgets/lineScatterChart/plugin.tsx b/packages/dashboard/src/customization/widgets/lineScatterChart/plugin.tsx
@@ -14,6 +14,8 @@ export const lineScatterChartPlugin: DashboardPlugin = {
         icon: LineIcon,
       },
       properties: () => ({
+        aggregationType: 'AVERAGE',
+        resolution: undefined,
         queryConfig: {
           source: 'iotsitewise',
           query: undefined,

diff --git a/packages/dashboard/src/customization/widgets/types.ts b/packages/dashboard/src/customization/widgets/types.ts
@@ -136,6 +136,8 @@ export type BarChartProperties = QueryProperties & {
   thresholdSettings?: ThresholdSettings;
   axis?: AxisSettings;
   significantDigits?: number;
+  resolution?: string;
+  aggregationType?: AggregateType;
 };
 export type BarChartPropertiesKeys = keyof BarChartProperties;