diff --git a/cypress/integration/list_view.js b/cypress/integration/list_view.js index 1cf7f4e6d8..8d37b19c89 100644 --- a/cypress/integration/list_view.js +++ b/cypress/integration/list_view.js @@ -21,11 +21,11 @@ context('List View', () => { url:'api/method/frappe.model.workflow.bulk_workflow_approval' }).as('bulk-approval'); cy.route({ - method: 'GET', - url:'api/method/frappe.desk.reportview.get*' - }).as('update-list'); + method: 'POST', + url:'api/method/frappe.desk.reportview.get' + }).as('real-time-update'); cy.wrap(elements).contains('Approve').click(); - cy.wait(['@bulk-approval', '@update-list']); + cy.wait(['@bulk-approval', '@real-time-update']); cy.get('.list-row-container:visible').should('contain', 'Approved'); }); }); diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 5f9aac0afb..5c4a23962b 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -380,6 +380,14 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { } render() { + this.render_list(); + this.on_row_checked(); + this.render_count(); + this.render_tags(); + } + + render_list() { + // clear rows this.$result.find('.list-row-container').remove(); if (this.data.length > 0) { // append rows @@ -390,9 +398,6 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { }).join('') ); } - this.on_row_checked(); - this.render_count(); - this.render_tags(); } render_count() { @@ -1025,7 +1030,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { // in the listview according to filters applied // let's remove it manually this.data = this.data.filter(d => d.name !== name); - this.render(); + this.render_list(); return; } @@ -1059,7 +1064,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { return return_value; }); this.toggle_result_area(); - this.render(); + this.render_list(); }); }); } diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index aaed05ca3a..3747eaa75b 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -59,7 +59,7 @@ def create_todo_records(): @frappe.whitelist() def setup_workflow(): - from frappe.workflow.doctype.workflow.test_workflow import create_todo_workflow - create_todo_workflow() - create_todo_records() - frappe.clear_cache() + from frappe.workflow.doctype.workflow.test_workflow import create_todo_workflow + create_todo_workflow() + create_todo_records() + frappe.clear_cache()