fix: disallow save until table renders (#380) (#381)

correct mode of payment summary

(cherry picked from commit 56ba10a)

Co-authored-by: Tyler Matteson <support@agritheory.dev>

Author: github-actions[bot]

check_run/check_run/doctype/check_run/check_run.js

@@ -5,6 +5,7 @@ frappe.provide('check_run')
 
 frappe.ui.form.on('Check Run', {
 	setup: frm => {
+		frm.disable_save()
 		frappe.realtime.on('process_check_run_progress', data => {
 			show_progress_bar(frm, data, 'Processing')
 		})
@@ -29,9 +30,9 @@ frappe.ui.form.on('Check Run', {
 		}
 		frm.doc.transactions = JSON.stringify(check_run.transactions)
 	},
-	refresh: frm => {
+	refresh: async frm => {
+		frm.disable_save()
 		frm.layout.show_message('')
-		frm.trigger('update_primary_action')
 		if (frm.doc.__onload && frm.doc.__onload.errors) {
 			frm.set_intro(
 				__('<a href="" style="color: var(--red)" id="check-run-error">This Check Run has errors, click to view.</a>'),
@@ -68,7 +69,6 @@ frappe.ui.form.on('Check Run', {
 	onload_post_render: frm => {
 		frm.page.wrapper.find('.layout-side-section').hide()
 		permit_first_user(frm)
-		frm.trigger('update_primary_action')
 		$(frm.wrapper).on('dirty', () => {
 			frm.trigger('update_primary_action')
 		})
@@ -239,11 +239,24 @@ function set_queries(frm) {
 }
 
 function get_entries(frm) {
-	return new Promise(function (resolve, reject) {
-		if (!frm.doc.transactions && check_run.transactions) {
-			frm.dirty()
+	return new Promise(async (resolve, reject) => {
+		try {
+			if (!frm.doc.transactions && check_run.transactions) {
+				frm.dirty()
+			}
+
+			// Wait for mount to complete
+			await window.check_run.mount(frm)
+
+			// Wait an additional tick to ensure Vue rendering is complete
+			await new Promise(resolve => setTimeout(resolve, 0))
+
+			// Trigger update and resolve
+			frm.trigger('update_primary_action')
+			resolve()
+		} catch (error) {
+			reject(error)
 		}
-		resolve(window.check_run.mount(frm))
 	})
 }
 

check_run/public/js/check_run/ModeOfPaymentSummary.vue

@@ -30,6 +30,7 @@ function format_currency(v2, currency, decimals) {
 
 function calculate_totals() {
 	let modes_of_payments = aggregate(props.transactions, 'mode_of_payment', 'amount', 'pay')
+	console.log(modes_of_payments)
 	let results = []
 	if (!(frm.value.doc && frm.value.settings)) {
 		return
@@ -60,27 +61,25 @@ function calculate_totals() {
 	})
 }
 
-function aggregate(arr, on, who, filter) {
-	const agg = arr.reduce((a, b) => {
-		let whoValue = null
-		const onValue = b[on]
-		if (b[filter]) {
-			whoValue = b[who]
-		}
-		if (a[onValue]) {
-			a[onValue] = {
-				[on]: onValue,
-				[who]: [...a[onValue][who], whoValue],
+function aggregate(transactions, groupByField, valueField, filterField) {
+	const groups = transactions
+		.filter(transaction => transaction[filterField])
+		.reduce((accumulator, transaction) => {
+			let groupKey = transaction[groupByField]
+			const value = transaction[valueField]
+			if (!groupKey) {
+				groupKey = 'None'
 			}
-		} else {
-			a[onValue] = {
-				[on]: onValue,
-				[who]: [whoValue],
+			if (!accumulator[groupKey]) {
+				accumulator[groupKey] = {
+					[groupByField]: groupKey,
+					[valueField]: [],
+				}
 			}
-		}
-		return a
-	}, {})
-	return Object.values(agg)
+			accumulator[groupKey][valueField].push(value)
+			return accumulator
+		}, {})
+	return Object.values(groups)
 }
 </script>
 <style scoped>

check_run/public/js/check_run/check_run.js

@@ -1,3 +1,6 @@
+// Copyright (c) 2025, AgriTheory and contributors
+// For license information, please see license.txt
+
 import CheckRun from './CheckRun.vue'
 import { createApp, reactive, ref, unref } from 'vue'
 
@@ -32,23 +35,38 @@ check_run.get_entries = frm => {
 }
 
 check_run.mount = frm => {
-	check_run.transactions = reactive({})
-	check_run.modes_of_payment = ref([])
-	check_run.filters = reactive({
-		key: 'posting_date',
-		posting_date: 1,
-		mode_of_payment: 1,
-		amount: 1,
-		due_date: 1,
-		party: '',
+	return new Promise(async (resolve, reject) => {
+		try {
+			check_run.transactions = reactive({})
+			check_run.modes_of_payment = ref([])
+			check_run.filters = reactive({
+				key: 'posting_date',
+				posting_date: 1,
+				mode_of_payment: 1,
+				amount: 1,
+				due_date: 1,
+				party: '',
+			})
+
+			if (frm.$check_run != undefined && frm.$check_run._isVue) {
+				frm.$check_run.unmount()
+			}
+
+			await check_run.get_entries(frm)
+			$(frm.fields_dict['check_run_table'].wrapper).html($("<div id='check-run-vue'></div>").get(0))
+			frm.$check_run = createApp(CheckRun)
+			frm.$check_run.provide('$check_run', check_run)
+			frm.$check_run.mount('#check-run-vue')
+
+			const { nextTick } = await import('vue')
+			await nextTick()
+			await new Promise(resolve => requestAnimationFrame(resolve))
+
+			resolve()
+		} catch (error) {
+			reject(error)
+		}
 	})
-	if (frm.$check_run != undefined && frm.$check_run._isVue) {
-		return
-	}
-	$(frm.fields_dict['check_run_table'].wrapper).html($("<div id='check-run-vue'></div>").get(0))
-	frm.$check_run = createApp(CheckRun)
-	frm.$check_run.mount('#check-run-vue')
-	frm.$check_run.provide('$check_run', check_run)
 }
 
 check_run.total = frm => {