From 4cb37c129b76cb0128bd2522e15c8e8f0d3db9ed Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Feb 2022 10:34:38 +0530 Subject: [PATCH] fix(minor): test and linting --- cypress/integration/list_view.js | 1 + frappe/public/js/frappe/form/grid_row.js | 8 ++++---- frappe/public/js/frappe/list/base_list.js | 6 ++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cypress/integration/list_view.js b/cypress/integration/list_view.js index b161af2df7..b7a96db4bc 100644 --- a/cypress/integration/list_view.js +++ b/cypress/integration/list_view.js @@ -12,6 +12,7 @@ context('List View', () => { cy.get('.list-row-container .list-row-checkbox').click({ multiple: true, force: true }); cy.get('.actions-btn-group button').contains('Actions').should('be.visible'); cy.intercept('/api/method/frappe.desk.reportview.get').as('list-refresh'); + cy.wait(300); // wait before you hit another refresh cy.get('button[data-original-title="Refresh"]').click(); cy.wait('@list-refresh'); cy.get('.list-row-container .list-row-checkbox:checked').should('be.visible'); diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 0ee5a180e0..ec89d26213 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -340,7 +340,7 @@ export default class GridRow {
-

+ ${__('Add / Remove Columns')} @@ -420,10 +420,10 @@ export default class GridRow { data-label='${docfield.label}' data-type='${docfield.fieldtype}'>

-
+ -
+
${__(docfield.label)}
@@ -431,7 +431,7 @@ export default class GridRow { value='${docfield.columns || cint(d.columns)}' data-fieldname='${docfield.fieldname}' style='background-color: #ffff; display: inline'>
-
+
diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index 1ba729c6a3..b7cb5a05df 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -467,7 +467,7 @@ frappe.views.BaseList = class BaseList { refresh() { let args = this.get_call_args(); if (this.no_change(args)) { - console.log('throttled'); + // console.log('throttled'); return Promise.resolve(); } this.freeze(true); @@ -494,7 +494,9 @@ frappe.views.BaseList = class BaseList { return true; } this.last_args = JSON.stringify(args); - setTimeout(() => { this.last_args = null}, 3000); + setTimeout(() => { + this.last_args = null; + }, 3000); return false; }