chore: merge develop into version-3-hotfix

.mergify.yml

@@ -1,33 +1,28 @@
 pull_request_rules:
-    - name: Auto-close PRs on stable branch
-      conditions:
+  - name: Auto-close PRs on stable branch
+    conditions:
+      - and:
           - and:
-                - and:
-                      - author!=nextchamp-saqib
-                      - author!=shahzeelahmed
-                      - author!=frappe-pr-bot
-                      - author!=mergify[bot]
-                - or:
-                      - base=main
-                      - base=version-3
-      actions:
-          close:
-          comment:
-              message: |
-                  @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on develop branch.
+              - author!=nextchamp-saqib
+              - author!=shahzeelahmed
+              - author!=frappe-pr-bot
+              - author!=mergify[bot]
+          - or:
+              - base=main
+              - base=version-3
+    actions:
+      close:
+      comment:
+        message: |
+          @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on develop branch.
 
-    - name: backport to version-3-hotfix
-      conditions:
-          - label="backport version-3-hotfix"
-      actions:
-          backport:
-              branches:
-                  - version-3-hotfix
-              assignees:
-                  - "{{ author }}"
+  - name: backport to version-3-hotfix
+    conditions:
+      - label="backport version-3-hotfix"
+    actions:
+      backport:
+        branches:
+          - version-3-hotfix
+        assignees:
+          - "{{ author }}"
 
-    - name: Auto-delete merged branches
-      conditions:
-          - merged
-      actions:
-          delete_head_branch:

frontend/src/global.d.ts

@@ -1,4 +1,3 @@
-declare module 'frappe-ui'
 declare module '@/utils/dayjs'
 declare module 'dom-to-image'
 

frontend/src2/charts/helpers.ts

@@ -353,6 +353,13 @@ function getXAxis(x_axis: XAxis) {
 			width: 100,
 			overflow: 'truncate',
 			ellipsis: '...',
+			...(x_axis.dimension.granularity === 'fiscal_year'
+				? {
+						formatter: (value: any) => {
+							return getFormattedDate(value, 'fiscal_year')
+						},
+				  }
+				: null),
 		},
 	}
 }
@@ -502,7 +509,7 @@ export function getDonutChartOptions(config: DonutChartConfig, result: QueryResu
 function getDonutChartData(
 	columns: QueryResultColumn[],
 	rows: QueryResultRow[],
-	maxSlices: number
+	maxSlices: number,
 ) {
 	const measureColumn = columns.find((c) => FIELDTYPES.MEASURE.includes(c.type))
 	if (!measureColumn) {
@@ -632,7 +639,7 @@ export function getFunnelChartOptions(config: FunnelChartConfig, result: QueryRe
 function getMapChartData(
 	columns: QueryResultColumn[],
 	rows: QueryResultRow[],
-	config?: MapChartConfig
+	config?: MapChartConfig,
 ) {
 	const measureColumn = columns.find((c) => FIELDTYPES.MEASURE.includes(c.type))
 	if (!measureColumn) {
@@ -888,7 +895,9 @@ export function getBubbleChartOptions(config: BubbleChartConfig, result: QueryRe
 	// calculate symbol size
 	let symbolSizeConfig: any = 10
 	if (sizeColumnName) {
-		const allSizes = _rows.map((r) => r[sizeColumnName]).filter((val) => val != null && !isNaN(val))
+		const allSizes = _rows
+			.map((r) => r[sizeColumnName])
+			.filter((val) => val != null && !isNaN(val))
 		if (allSizes.length > 0) {
 			const minSize = Math.min(...allSizes)
 			const maxSize = Math.max(...allSizes)
@@ -1042,16 +1051,17 @@ export function getSankeyChartOptions(config: SankeyChartConfig, result: QueryRe
 	const sourceColumn = columns.find(
 		(c) =>
 			c.name === config.source_column?.dimension_name ||
-			c.name === config.source_column?.column_name
+			c.name === config.source_column?.column_name,
 	)?.name
 	const targetColumn = columns.find(
 		(c) =>
 			c.name === config.target_column?.dimension_name ||
-			c.name === config.target_column?.column_name
+			c.name === config.target_column?.column_name,
 	)?.name
 	const valueColumn = columns.find(
 		(c) =>
-			c.name === config.value_column?.measure_name || c.name === config.value_column?.column_name
+			c.name === config.value_column?.measure_name ||
+			c.name === config.value_column?.column_name,
 	)?.name
 
 	if (!sourceColumn || !targetColumn || !valueColumn) {

frontend/src2/components/DataTable.vue

@@ -788,6 +788,13 @@ function toggleNewColumn() {
 		</slot>
 	</div>
 
+	<div
+		v-else-if="props.loading && !props.filtering"
+		class="absolute top-10 flex h-[calc(100%-2.5rem)] rounded-b w-full items-center justify-center bg-white/30 backdrop-blur-sm"
+	>
+		<LoadingIndicator class="h-5 w-5 text-gray-500" />
+	</div>
+
 	<div v-else class="flex h-full w-full items-center justify-center">
 		<div class="flex flex-col items-center gap-2">
 			<Table2Icon class="h-16 w-16 text-gray-300" stroke-width="1.5" />

frontend/src2/components/DataTableFooter.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { ref } from 'vue'
 import { Button, LoadingIndicator, Tooltip } from 'frappe-ui'
 import { ChevronLeft, ChevronRight, RefreshCw } from 'lucide-vue-next'
-import { ref } from 'vue'
 import type { PaginationState } from '../composables/usePagination'
 
 const props = defineProps<{

frontend/src2/dashboard/Filter.vue

@@ -25,7 +25,7 @@ const state = reactive(
 	copy({
 		operator: filterOperator.value || operatorOptions.value[0].value,
 		value: filterValue.value,
-	})
+	}),
 )
 
 const valueSelectorType = computed(() => {
@@ -51,6 +51,21 @@ function clearFilter() {
 	filterValue.value = undefined
 	emit('close')
 }
+
+// For a bried period, the value of a date filter with 'between' operator is stored as `from_date,to_date` string. This computed property helps to convert it to array and vice versa for the DateRangePicker component.
+const dateRangeVal = computed({
+	get() {
+		let val = state.value
+		if (typeof val === 'string') {
+			const [from_date, to_date] = val.split(',')
+			return [from_date, to_date]
+		}
+		return val
+	},
+	set(val: string) {
+		state.value = val.split(',')
+	},
+})
 </script>
 
 <template>
@@ -59,7 +74,7 @@ function clearFilter() {
 			v-if="filterType === 'Number'"
 			class="w-[200px]"
 			v-model:operator="state.operator"
-			v-model:value="(state.value as number)"
+			v-model:value="state.value as number"
 		/>
 		<template v-else>
 			<div id="operator" class="!min-w-[200px] flex-1">
@@ -72,27 +87,27 @@ function clearFilter() {
 				/>
 			</div>
 			<div id="value" class="!min-w-[200px] flex-1 flex-shrink-0">
-					<DatePicker
+				<DatePicker
 					v-if="valueSelectorType === 'date'"
 					:modelValue="state.value as string"
 					@update:modelValue="state.value = $event"
 				/>
 				<DateRangePicker
 					v-else-if="valueSelectorType === 'date_range'"
-					v-model="(state.value as string[])"
+					v-model="dateRangeVal as string[]"
 				/>
 				<RelativeDatePicker
 					v-else-if="valueSelectorType === 'relative_date'"
-					v-model="(state.value as string)"
+					v-model="state.value as string"
 				/>
 				<ColumnFilterValueSelector
 					v-else-if="valueSelectorType === 'select'"
-					v-model="(state.value as string[])"
+					v-model="state.value as string[]"
 					:valuesProvider="props.valuesProvider"
 				/>
 				<FormControl
 					v-else-if="valueSelectorType === 'text'"
-					v-model="state.value"
+					v-model="state.value as string"
 					placeholder="Value"
 					autocomplete="off"
 				/>

frontend/src2/query/components/ColumnFilterValueSelector.vue

@@ -26,7 +26,7 @@ watchDebounced(
 			.then((values: string[]) => (distinctColumnValues.value = values))
 			.finally(() => (fetchingValues.value = false))
 	},
-	{ debounce: 300, immediate: true }
+	{ debounce: 300, immediate: true },
 )
 
 const sortedValues = computed(() => {

frontend/src2/query/components/NativeQueryEditor.vue

@@ -113,7 +113,7 @@ const completions = computed(() => {
 				<div class="flex flex-shrink-0 items-center gap-1 border-b p-1">
 					<DataSourceSelector v-model="data_source" placeholder="Select a data source" />
 					<ContentEditable
-						class="flex h-7 cursor-text items-center justify-center rounded bg-white px-2 text-base text-gray-800 focus-visible:ring-1 focus-visible:ring-gray-600"
+						class="flex h-7 cursor-text items-center justify-center rounded bg-white px-2 text-base leading-7 text-gray-800 focus-visible:ring-1 focus-visible:ring-gray-600"
 						placeholder="Untitled Dashboard"
 						:modelValue="query.doc.title"
 						@returned="query.doc.title = $event"

frontend/src2/query/components/QueryDataTable.vue

@@ -167,6 +167,7 @@ function onFilterChange(filters: Record<string, string>) {
 
 <template>
 	<DataTable
+		v-if="props.query.isloaded"
 		:loading="props.query.executing && !isFiltering"
 		:filtering="props.query.executing && isFiltering"
 		:columns="columns"

frontend/src2/query/components/ScriptQueryEditor.vue

@@ -52,7 +52,7 @@ function handleSaveVariables(variables: any[]) {
 		<div class="relative flex h-[55%] w-full flex-col rounded border">
 			<div class="flex flex-shrink-0 items-center gap-1 border-b p-1">
 				<ContentEditable
-					class="flex h-7 cursor-text items-center justify-center rounded bg-white px-2 text-base text-gray-800 focus-visible:ring-1 focus-visible:ring-gray-600"
+					class="flex h-7 cursor-text items-center justify-center rounded bg-white px-2 text-base leading-7 text-gray-800 focus-visible:ring-1 focus-visible:ring-gray-600"
 					:modelValue="query.doc.title"
 					@returned="query.doc.title = $event"
 					@blur="query.doc.title = $event"

frontend/src2/query/components/filter_utils.ts

@@ -31,13 +31,13 @@ export function getOperatorOptions(filterType: FilterType) {
 		options.push({ label: __('is not set'), value: 'is_not_set' })
 	}
 	if (filterType === 'Date') {
+		options.push({ label: __('between'), value: 'between' })
 		options.push({ label: __('equals'), value: '=' })
 		options.push({ label: __('not equals'), value: '!=' })
 		options.push({ label: __('greater than'), value: '>' })
 		options.push({ label: __('greater than or equals'), value: '>=' })
 		options.push({ label: __('less than'), value: '<' })
 		options.push({ label: __('less than or equals'), value: '<=' })
-		options.push({ label: __('between'), value: 'between' })
 		options.push({ label: __('within'), value: 'within' })
 		options.push({ label: __('is set'), value: 'is_set' })
 		options.push({ label: __('is not set'), value: 'is_not_set' })

frontend/src2/query/helpers.ts

@@ -131,7 +131,11 @@ export function getFormattedRows(result: QueryResult, operations: Operation[]) {
 				formattedRow[column.name] = getFormattedDate(row[column.name], granularity)
 			}
 
-			if (FIELDTYPES.TEXT.includes(column.type) && typeof row[column.name] === 'string' && row[column.name]) {
+			if (
+				FIELDTYPES.TEXT.includes(column.type) &&
+				typeof row[column.name] === 'string' &&
+				row[column.name]
+			) {
 				const htmlTagRegex = /<[^>]*>/g
 				if (htmlTagRegex.test(row[column.name])) {
 					htmlTagRegex.lastIndex = 0
@@ -146,13 +150,13 @@ export function getFormattedRows(result: QueryResult, operations: Operation[]) {
 	})
 	return formattedRows
 }
-
-export function getFormattedDate(date: string, granularity: GranularityType) {
+export function getFormattedDate(date: string, granularity: string) {
 	if (!date) return ''
+	const fy = useSettings()
 
 	if (granularity === 'fiscal_year') {
 		const d = dayjs(date)
-		const fiscalYearStart = useSettings().doc.fiscal_year_start || '04-01'
+		const fiscalYearStart = fy.doc.fiscal_year_start
 		const fiscalStartMonth = dayjs(fiscalYearStart).month()
 		const fiscalStartDay = dayjs(fiscalYearStart).date()
 
@@ -386,7 +390,10 @@ export const query_operation_types = {
 		icon: Braces,
 		color: 'gray',
 		class: 'text-gray-600 bg-gray-100',
-		init: (args: CustomOperationArgs): CustomOperation => ({ type: 'custom_operation', ...args }),
+		init: (args: CustomOperationArgs): CustomOperation => ({
+			type: 'custom_operation',
+			...args,
+		}),
 		getDescription: (op: CustomOperation) => {
 			return `${op.expression.expression}`
 		},
@@ -399,7 +406,7 @@ export const query_operation_types = {
 		class: 'text-gray-600 bg-gray-100',
 		init: (args: SQLArgs): SQL => ({ type: 'sql', ...args }),
 		getDescription: (op: SQL) => {
-			return __("SQL")
+			return __('SQL')
 		},
 	},
 	code: {
@@ -410,7 +417,7 @@ export const query_operation_types = {
 		class: 'text-gray-600 bg-gray-100',
 		init: (args: CodeArgs): Code => ({ type: 'code', ...args }),
 		getDescription: (op: Code) => {
-			return __("Code")
+			return __('Code')
 		},
 	},
 }
@@ -484,5 +491,7 @@ export function matchesFilter(value: any, parsed: ParsedFilter): boolean {
 		}
 	}
 	// text: case-insensitive substring match
-	return String(value ?? '').toLowerCase().includes(parsed.text.toLowerCase())
+	return String(value ?? '')
+		.toLowerCase()
+		.includes(parsed.text.toLowerCase())
 }

frontend/src2/settings/settings.ts

@@ -19,7 +19,7 @@ function makeSettings() {
 			allowed_origins: '',
 			max_records_to_sync: 10_00_000,
 			max_memory_usage: 512,
-			fiscal_year_start: '2024-04-01',
+			fiscal_year_start: '',
 			week_starts_on: 'Monday',
 			enable_data_store: false,
 			apply_user_permissions: false,

insights/insights/doctype/insights_data_source_v3/connectors/duckdb.py

@@ -2,6 +2,7 @@
 # For license information, please see license.txt
 
 import os
+from contextlib import suppress
 from urllib.parse import urlparse
 
 import frappe
@@ -32,6 +33,10 @@ def get_local_duckdb_connection(db_name, read_only=True, allowed_dir=None):
 
     if allowed_dir:
         escaped_dir = allowed_dir.replace("'", "''")
+        # Some environments start with external access already disabled.
+        # Best effort: try enabling it first, then configure directory allowlist.
+        with suppress(Exception):
+            db.raw_sql("SET enable_external_access = true")
         db.raw_sql(f"SET allowed_directories = ['{escaped_dir}']")
 
     db.raw_sql("SET enable_external_access = false")