From 5a19e5801f9af4a12d0f7b9cdcc3daa0c92e28a7 Mon Sep 17 00:00:00 2001 From: vicent Date: Mon, 23 Jan 2023 11:50:54 +0100 Subject: [PATCH 1/5] fix: enabled button when an error occurs --- front/core/components/smart-table/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/front/core/components/smart-table/index.js b/front/core/components/smart-table/index.js index 770dcdf32..24d121aac 100644 --- a/front/core/components/smart-table/index.js +++ b/front/core/components/smart-table/index.js @@ -589,7 +589,8 @@ export default class SmartTable extends Component { refresh() { this.isRefreshing = true; this.model.refresh() - .then(() => this.isRefreshing = false); + .then(() => this.isRefreshing = false) + .catch(() => this.isRefreshing = false); } } -- 2.40.1 From 9eb65507b5d165f80fb39a3a798613c4137c23d9 Mon Sep 17 00:00:00 2001 From: vicent Date: Mon, 23 Jan 2023 14:43:31 +0100 Subject: [PATCH 2/5] fix: elimino this.model.refresh que siempre daba fallo --- front/core/components/smart-table/index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/front/core/components/smart-table/index.js b/front/core/components/smart-table/index.js index 24d121aac..79c5c17c8 100644 --- a/front/core/components/smart-table/index.js +++ b/front/core/components/smart-table/index.js @@ -231,7 +231,6 @@ export default class SmartTable extends Component { } this.model.order = order; - this.refresh(); } registerColumns() { @@ -479,7 +478,6 @@ export default class SmartTable extends Component { const params = {q: JSON.stringify(stateFilter)}; this.$state.go(this.$state.current.name, params, {location: 'replace'}); - this.refresh(); } applySort() { @@ -500,7 +498,6 @@ export default class SmartTable extends Component { const params = {q: JSON.stringify(stateFilter)}; this.$state.go(this.$state.current.name, params, {location: 'replace'}); - this.refresh(); } filterSanitizer(field) { -- 2.40.1 From 5a70fd4779d3c2bcd850c719b34761b8e0e32d0d Mon Sep 17 00:00:00 2001 From: vicent Date: Tue, 24 Jan 2023 14:45:35 +0100 Subject: [PATCH 3/5] fix: las peticiones no colisionan --- front/core/components/smart-table/index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/front/core/components/smart-table/index.js b/front/core/components/smart-table/index.js index 79c5c17c8..416d24d16 100644 --- a/front/core/components/smart-table/index.js +++ b/front/core/components/smart-table/index.js @@ -231,6 +231,7 @@ export default class SmartTable extends Component { } this.model.order = order; + this.refresh(); } registerColumns() { @@ -477,7 +478,8 @@ export default class SmartTable extends Component { const params = {q: JSON.stringify(stateFilter)}; - this.$state.go(this.$state.current.name, params, {location: 'replace'}); + this.$state.go(this.$state.current.name, params, {location: 'replace'}) + .then(() => this.refresh()); } applySort() { @@ -497,7 +499,8 @@ export default class SmartTable extends Component { stateFilter.tableOrder = order; const params = {q: JSON.stringify(stateFilter)}; - this.$state.go(this.$state.current.name, params, {location: 'replace'}); + this.$state.go(this.$state.current.name, params, {location: 'replace'}) + .then(() => this.refresh()); } filterSanitizer(field) { -- 2.40.1 From 51400b1c747e1cf9e1e2552c2e241de7dadb60e1 Mon Sep 17 00:00:00 2001 From: vicent Date: Thu, 26 Jan 2023 08:19:52 +0100 Subject: [PATCH 4/5] =?UTF-8?q?reactor:=20eliminado=20try=20y=20catch,=20y?= =?UTF-8?q?=20a=C3=B1adido=20finally?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/core/components/smart-table/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/front/core/components/smart-table/index.js b/front/core/components/smart-table/index.js index 416d24d16..ad9883950 100644 --- a/front/core/components/smart-table/index.js +++ b/front/core/components/smart-table/index.js @@ -589,8 +589,7 @@ export default class SmartTable extends Component { refresh() { this.isRefreshing = true; this.model.refresh() - .then(() => this.isRefreshing = false) - .catch(() => this.isRefreshing = false); + .finally(() => this.isRefreshing = false); } } -- 2.40.1 From 15429293dd19fdba7f8d9f3573679fbdc24d728a Mon Sep 17 00:00:00 2001 From: vicent Date: Thu, 2 Feb 2023 11:34:13 +0100 Subject: [PATCH 5/5] fix: frontTest --- front/core/components/smart-table/index.spec.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/front/core/components/smart-table/index.spec.js b/front/core/components/smart-table/index.spec.js index 5fd4c33b7..5a1be98e1 100644 --- a/front/core/components/smart-table/index.spec.js +++ b/front/core/components/smart-table/index.spec.js @@ -160,7 +160,7 @@ describe('Component smartTable', () => { describe('applySort()', () => { it('should call the $state go and model refresh without making changes on the model order', () => { controller.$state = { - go: jest.fn(), + go: jest.fn().mockReturnValue(new Promise(resolve => resolve())), current: { name: 'section' } @@ -171,13 +171,12 @@ describe('Component smartTable', () => { expect(controller.model.order).toBeUndefined(); expect(controller.$state.go).toHaveBeenCalled(); - expect(controller.refresh).toHaveBeenCalled(); }); it('should call the $state go and model refresh after setting model order according to the controller sortCriteria', () => { const orderBy = {field: 'myField', sortType: 'ASC'}; controller.$state = { - go: jest.fn(), + go: jest.fn().mockReturnValue(new Promise(resolve => resolve())), current: { name: 'section' } @@ -190,7 +189,6 @@ describe('Component smartTable', () => { expect(controller.model.order).toEqual(`${orderBy.field} ${orderBy.sortType}`); expect(controller.$state.go).toHaveBeenCalled(); - expect(controller.refresh).toHaveBeenCalled(); }); }); @@ -293,12 +291,10 @@ describe('Component smartTable', () => { controller.$inputsScope = { searchProps: {} }; - jest.spyOn(controller, 'refresh'); controller.defaultFilter(); expect(controller.model.addFilter).toHaveBeenCalled(); - expect(controller.refresh).toHaveBeenCalled(); }); }); -- 2.40.1