fix: cannot get & update granularity

frappe · Feb 14, 2025 · 06e6d10 · 06e6d10
1 parent 0aad6c0
commit 06e6d10
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 26 deletions.
diff --git a/frontend/src2/charts/chart.ts b/frontend/src2/charts/chart.ts
@@ -10,7 +10,7 @@ import {
 	AxisChartConfig,
 	DonutChartConfig,
 	NumberChartConfig,
-	TableChartConfig,
+	TableChartConfig
 } from '../types/chart.types'
 import { FilterArgs, Measure, Operation } from '../types/query.types'
 import { WorkbookChart } from '../types/workbook.types'
@@ -300,17 +300,25 @@ function makeChart(workbookChart: WorkbookChart) {
 	}
 
 	function updateGranularity(column_name: string, granularity: GranularityType) {
-		Object.entries(chart.doc.config).forEach(([_, value]) => {
-			if (Array.isArray(value)) {
-				const index = value.findIndex((v) => v.dimension_name === column_name)
-				if (index > -1) {
-					value[index].granularity = granularity
-				}
+		if ('x_axis' in chart.doc.config) {
+			if (chart.doc.config.x_axis?.dimension?.dimension_name === column_name) {
+				chart.doc.config.x_axis.dimension.granularity = granularity
 			}
-			if (value && value.dimension_name === column_name) {
-				value.granularity = granularity
+		}
+
+		if ('date_column' in chart.doc.config) {
+			if (chart.doc.config.date_column?.dimension_name === column_name) {
+				chart.doc.config.date_column.granularity = granularity
 			}
-		})
+		}
+
+		if ('rows' in chart.doc.config) {
+			chart.doc.config.rows.forEach((row) => {
+				if (row.dimension_name === column_name) {
+					row.granularity = granularity
+				}
+			})
+		}
 	}
 
 	function setChartFilters() {

diff --git a/frontend/src2/charts/helpers.ts b/frontend/src2/charts/helpers.ts
@@ -753,23 +753,29 @@ export function setDimensionNames(config: any) {
 }
 
 export function getGranularity(dimension_name: string, config: ChartConfig) {
-	const column = Object.entries(config).find(([_, value]) => {
-		if (!value) return false
-		if (Array.isArray(value)) {
-			return value.some((v) => v.dimension_name === dimension_name)
-		}
-		if (typeof value === 'object') {
-			return value.dimension_name === dimension_name
-		}
-		return false
-	})
-	if (!column) return
+	if ('x_axis' in config && config.x_axis.dimension.dimension_name === dimension_name) {
+		return config.x_axis.dimension.granularity
+	}
+
+	if ('split_by' in config && config.split_by?.dimension_name === dimension_name) {
+		return config.split_by.granularity
+	}
 
-	if (Array.isArray(column[1])) {
-		const granularity = column[1].find((v) => v.dimension_name === dimension_name)?.granularity
-		return granularity as GranularityType
+	if ('date_column' in config && config.date_column?.dimension_name === dimension_name) {
+		return config.date_column.granularity
 	}
 
-	const granularity = column[1].granularity
-	return granularity as GranularityType
+	if ('label_column' in config && config.label_column?.dimension_name === dimension_name) {
+		return config.label_column.granularity
+	}
+
+	if ('rows' in config) {
+		const row = config.rows.find((r: any) => r.dimension_name === dimension_name)
+		if (row) return row.granularity
+	}
+
+	if ('columns' in config) {
+		const column = config.columns.find((c: any) => c.dimension_name === dimension_name)
+		if (column) return column.granularity
+	}
 }