From c1125916f61e5f251b5e91ddd857709d0c6c8840 Mon Sep 17 00:00:00 2001 From: bernat Date: Sat, 31 Oct 2020 11:22:56 +0100 Subject: [PATCH 1/5] supplier basicData --- modules/supplier/front/basic-data/index.html | 42 +++++++++++++++++++ modules/supplier/front/basic-data/index.js | 10 +++++ .../supplier/front/basic-data/locale/es.yml | 2 + modules/supplier/front/index.js | 1 + modules/supplier/front/routes.json | 10 +++++ 5 files changed, 65 insertions(+) create mode 100644 modules/supplier/front/basic-data/index.html create mode 100644 modules/supplier/front/basic-data/index.js create mode 100644 modules/supplier/front/basic-data/locale/es.yml diff --git a/modules/supplier/front/basic-data/index.html b/modules/supplier/front/basic-data/index.html new file mode 100644 index 000000000..55239e25f --- /dev/null +++ b/modules/supplier/front/basic-data/index.html @@ -0,0 +1,42 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/modules/supplier/front/basic-data/index.js b/modules/supplier/front/basic-data/index.js new file mode 100644 index 000000000..447118ebb --- /dev/null +++ b/modules/supplier/front/basic-data/index.js @@ -0,0 +1,10 @@ +import ngModule from '../module'; +import Section from 'salix/components/section'; + +ngModule.vnComponent('vnSupplierBasicData', { + template: require('./index.html'), + controller: Section, + bindings: { + supplier: '<' + } +}); diff --git a/modules/supplier/front/basic-data/locale/es.yml b/modules/supplier/front/basic-data/locale/es.yml new file mode 100644 index 000000000..26067c3db --- /dev/null +++ b/modules/supplier/front/basic-data/locale/es.yml @@ -0,0 +1,2 @@ +Notes: Notas +Is Active: Es activo \ No newline at end of file diff --git a/modules/supplier/front/index.js b/modules/supplier/front/index.js index a4017bbd9..9fefd5b73 100644 --- a/modules/supplier/front/index.js +++ b/modules/supplier/front/index.js @@ -7,3 +7,4 @@ import './index/'; import './search-panel'; import './log'; import './summary'; +import './basic-data'; diff --git a/modules/supplier/front/routes.json b/modules/supplier/front/routes.json index 24e8d8692..fed6a688a 100644 --- a/modules/supplier/front/routes.json +++ b/modules/supplier/front/routes.json @@ -9,6 +9,7 @@ {"state": "supplier.index", "icon": "icon-supplier"} ], "card": [ + {"state": "supplier.card.basicData", "icon": "settings"}, {"state": "supplier.card.log", "icon": "history"} ] }, @@ -42,6 +43,15 @@ "state": "supplier.card.log", "component": "vn-supplier-log", "description": "Log" + }, { + "url": "/basic-data", + "state": "supplier.card.basicData", + "component": "vn-supplier-basic-data", + "description": "Basic data", + "acl": ["administrative"], + "params": { + "supplier": "$ctrl.supplier" + } } ] } \ No newline at end of file -- 2.40.1 From 8765a18bbbd60f23fd6f95b01039be50ce9e83eb Mon Sep 17 00:00:00 2001 From: bernat Date: Thu, 5 Nov 2020 11:46:15 +0100 Subject: [PATCH 2/5] fix supplier routes --- modules/supplier/front/routes.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/supplier/front/routes.json b/modules/supplier/front/routes.json index 6da70fefb..10727fecf 100644 --- a/modules/supplier/front/routes.json +++ b/modules/supplier/front/routes.json @@ -48,6 +48,7 @@ "state": "supplier.card.basicData", "component": "vn-supplier-basic-data", "description": "Basic data", + "acl": ["administrative"], "params": { "supplier": "$ctrl.supplier" } @@ -65,13 +66,7 @@ "state": "supplier.card.log", "component": "vn-supplier-log", "description": "Log" - }, { - "url": "/basic-data", - "state": "supplier.card.basicData", - "component": "vn-supplier-basic-data", - "description": "Basic data", - "acl": ["administrative"], - }, + }, { "url": "/contact", "state": "supplier.card.contact", -- 2.40.1 From 18ed685c75fed92e045bed97b50d245eaa1fd4d1 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 5 Nov 2020 13:53:19 +0100 Subject: [PATCH 3/5] e2e path for supplier basic data --- e2e/helpers/selectors.js | 6 +- e2e/paths/13-supplier/02_basic_data.spec.js | 60 +++++++++++++++++++ ...{02_contact.spec.js => 04_contact.spec.js} | 0 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 e2e/paths/13-supplier/02_basic_data.spec.js rename e2e/paths/13-supplier/{02_contact.spec.js => 04_contact.spec.js} (100%) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 02c749b3c..3df6eec8c 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -925,7 +925,11 @@ export default { thirdContactDeleteButton: 'vn-supplier-contact div:nth-child(3) vn-icon-button[icon="delete"]' }, supplierBasicData: { - + alias: 'vn-supplier-basic-data vn-textfield[ng-model="$ctrl.supplier.nickname"]', + isOfficial: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isOfficial"]', + isActive: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isActive"]', + notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]', + saveButton: 'vn-supplier-basic-data button[type="submit"]', }, supplierFiscalData: { socialName: 'vn-supplier-fiscal-data vn-textfield[ng-model="$ctrl.supplier.name"]', diff --git a/e2e/paths/13-supplier/02_basic_data.spec.js b/e2e/paths/13-supplier/02_basic_data.spec.js new file mode 100644 index 000000000..1e283749d --- /dev/null +++ b/e2e/paths/13-supplier/02_basic_data.spec.js @@ -0,0 +1,60 @@ +import selectors from '../../helpers/selectors.js'; +import getBrowser from '../../helpers/puppeteer'; + +describe('Supplier basic data path', () => { + let browser; + let page; + + beforeAll(async() => { + browser = await getBrowser(); + page = browser.page; + await page.loginAndModule('administrative', 'supplier'); + await page.accessToSearchResult('1'); + await page.accessToSection('supplier.card.basicData'); + }); + + afterAll(async() => { + await browser.close(); + }); + + it('should edit the basic data', async() => { + await page.clearInput(selectors.supplierBasicData.alias); + await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL'); + await page.waitToClick(selectors.supplierBasicData.isOfficial); + await page.waitToClick(selectors.supplierBasicData.isActive); + await page.write(selectors.supplierBasicData.notes, 'Some notes'); + + await page.waitToClick(selectors.supplierBasicData.saveButton); + const message = await page.waitForSnackbar(); + + expect(message.text).toBe('Data saved!'); + }); + + it('should reload the section', async() => { + await page.reloadSection('supplier.card.basicData'); + }); + + it('should check the alias was edited', async() => { + const result = await page.waitToGetProperty(selectors.supplierBasicData.alias, 'value'); + + expect(result).toEqual('Plants Nick SL'); + }); + + it('should check the isOffical checkbox is now unchecked', async() => { + const result = await page.checkboxState(selectors.supplierBasicData.isOfficial); + + expect(result).toBe('unchecked'); + }); + + it('should check the isActive checkbox is now unchecked', async() => { + const result = await page.checkboxState(selectors.supplierBasicData.isActive); + + expect(result).toBe('unchecked'); + }); + + it('should check the notes were edited', async() => { + const result = await page.waitToGetProperty(selectors.supplierBasicData.notes, 'value'); + + expect(result).toEqual('Some notes'); + }); +}); diff --git a/e2e/paths/13-supplier/02_contact.spec.js b/e2e/paths/13-supplier/04_contact.spec.js similarity index 100% rename from e2e/paths/13-supplier/02_contact.spec.js rename to e2e/paths/13-supplier/04_contact.spec.js -- 2.40.1 From a4ad852390a90728fd5fe886057428c2e97f27f1 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 5 Nov 2020 13:59:24 +0100 Subject: [PATCH 4/5] translations refactor --- modules/supplier/front/basic-data/index.html | 4 ++-- modules/supplier/front/basic-data/locale/es.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/supplier/front/basic-data/index.html b/modules/supplier/front/basic-data/index.html index 55239e25f..03622cf38 100644 --- a/modules/supplier/front/basic-data/index.html +++ b/modules/supplier/front/basic-data/index.html @@ -18,11 +18,11 @@ diff --git a/modules/supplier/front/basic-data/locale/es.yml b/modules/supplier/front/basic-data/locale/es.yml index 26067c3db..c810be508 100644 --- a/modules/supplier/front/basic-data/locale/es.yml +++ b/modules/supplier/front/basic-data/locale/es.yml @@ -1,2 +1,3 @@ Notes: Notas -Is Active: Es activo \ No newline at end of file +Active: Activo +Official: Oficial \ No newline at end of file -- 2.40.1 From 9b7edb0830ae363cf0484dcbf7f8a57d54da6e63 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Thu, 5 Nov 2020 14:18:48 +0100 Subject: [PATCH 5/5] updated path for log records --- e2e/paths/13-supplier/02_basic_data.spec.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/e2e/paths/13-supplier/02_basic_data.spec.js b/e2e/paths/13-supplier/02_basic_data.spec.js index 1e283749d..dfb33b6b0 100644 --- a/e2e/paths/13-supplier/02_basic_data.spec.js +++ b/e2e/paths/13-supplier/02_basic_data.spec.js @@ -57,4 +57,14 @@ describe('Supplier basic data path', () => { expect(result).toEqual('Some notes'); }); + + it('should navigate to the log section', async() => { + await page.accessToSection('supplier.card.log'); + }); + + it('should check the changes have been recorded', async() => { + const result = await page.waitToGetProperty('#newInstance:nth-child(3)', 'innerText'); + + expect(result).toEqual('note: Some notes'); + }); }); -- 2.40.1