diff --git a/.mergify.yml b/.mergify.yml index 3ff010dec..6eb1b81b4 100644 --- a/.mergify.yml +++ b/.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: diff --git a/frontend/src/global.d.ts b/frontend/src/global.d.ts index 1b83f9431..ab35e481a 100644 --- a/frontend/src/global.d.ts +++ b/frontend/src/global.d.ts @@ -1,4 +1,3 @@ -declare module 'frappe-ui' declare module '@/utils/dayjs' declare module 'dom-to-image' diff --git a/frontend/src2/charts/helpers.ts b/frontend/src2/charts/helpers.ts index 6e23cc64f..ec9c86847 100644 --- a/frontend/src2/charts/helpers.ts +++ b/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) { diff --git a/frontend/src2/components/DataTable.vue b/frontend/src2/components/DataTable.vue index a4074aa24..589ad3fee 100644 --- a/frontend/src2/components/DataTable.vue +++ b/frontend/src2/components/DataTable.vue @@ -788,6 +788,13 @@ function toggleNewColumn() { +
+ +
+
diff --git a/frontend/src2/components/DataTableFooter.vue b/frontend/src2/components/DataTableFooter.vue index 6fafd9732..1fa393f61 100644 --- a/frontend/src2/components/DataTableFooter.vue +++ b/frontend/src2/components/DataTableFooter.vue @@ -1,7 +1,7 @@