diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index 751d17afc9..3d945edc9e 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -218,7 +218,7 @@ export default { navigateBackToIndex: 'vn-item-descriptor vn-icon[icon="chevron_left"]' }, itemBasicData: { - basicDataButton: `vn-left-menu a[ui-sref="item.card.data"]`, + basicDataButton: `vn-left-menu a[ui-sref="item.card.basicData"]`, goToItemIndexButton: 'vn-item-descriptor [ui-sref="item.index"]', typeAutocomplete: `vn-autocomplete[field="$ctrl.item.typeFk"]`, intrastatAutocomplete: `vn-autocomplete[field="$ctrl.item.intrastatFk"]`, diff --git a/e2e/paths/04-item-module/02_basic_data.spec.js b/e2e/paths/04-item-module/02_basic_data.spec.js index 257b12e17b..8e6ecacfc1 100644 --- a/e2e/paths/04-item-module/02_basic_data.spec.js +++ b/e2e/paths/04-item-module/02_basic_data.spec.js @@ -8,7 +8,7 @@ describe('Item Edit basic data path', () => { nightmare .loginAndModule('buyer', 'item') .accessToSearchResult('Melee weapon combat first 15cm') - .accessToSection('item.card.data'); + .accessToSection('item.card.basicData'); }); it(`should check the descritor edit button is visible for buyer`, async() => { @@ -39,7 +39,7 @@ describe('Item Edit basic data path', () => { it(`should confirm the item name was edited`, async() => { const result = await nightmare - .reloadSection('item.card.data') + .reloadSection('item.card.basicData') .waitToGetProperty(selectors.itemBasicData.nameInput, 'value'); expect(result).toEqual('Rose of Purity'); diff --git a/e2e/paths/04-item-module/12_descriptor.spec.js b/e2e/paths/04-item-module/12_descriptor.spec.js index e5b6b2c2fd..d008d0d4e2 100644 --- a/e2e/paths/04-item-module/12_descriptor.spec.js +++ b/e2e/paths/04-item-module/12_descriptor.spec.js @@ -7,7 +7,7 @@ describe('Item descriptor path', () => { nightmare .loginAndModule('buyer', 'item') .accessToSearchResult(1) - .accessToSection('item.card.data'); + .accessToSection('item.card.basicData'); }); it('should check the descriptor inactive icon is dark as the item is active', async() => { @@ -30,7 +30,7 @@ describe('Item descriptor path', () => { it('should reload the section and check the inactive icon is bright', async() => { let brightIcon = await nightmare - .reloadSection('item.card.data') + .reloadSection('item.card.basicData') .waitForClassPresent(selectors.itemDescriptor.inactiveIcon, 'bright') .isVisible(selectors.itemDescriptor.inactiveIcon); diff --git a/modules/item/front/data/index.html b/modules/item/front/basic-data/index.html similarity index 97% rename from modules/item/front/data/index.html rename to modules/item/front/basic-data/index.html index 4f9bf33667..b12e9fc531 100644 --- a/modules/item/front/data/index.html +++ b/modules/item/front/basic-data/index.html @@ -76,7 +76,6 @@ label="Density" field="$ctrl.item.density"> - diff --git a/modules/item/front/data/index.js b/modules/item/front/basic-data/index.js similarity index 91% rename from modules/item/front/data/index.js rename to modules/item/front/basic-data/index.js index 6096a4bfa9..123aa59cdc 100644 --- a/modules/item/front/data/index.js +++ b/modules/item/front/basic-data/index.js @@ -15,7 +15,7 @@ class Controller { Controller.$inject = ['$scope', '$timeout']; -ngModule.component('vnItemData', { +ngModule.component('vnItemBasicData', { template: require('./index.html'), bindings: { item: '<' diff --git a/modules/item/front/data/locale/es.yml b/modules/item/front/basic-data/locale/es.yml similarity index 100% rename from modules/item/front/data/locale/es.yml rename to modules/item/front/basic-data/locale/es.yml diff --git a/modules/item/front/create/index.js b/modules/item/front/create/index.js index b983078eab..646baa8cd8 100644 --- a/modules/item/front/create/index.js +++ b/modules/item/front/create/index.js @@ -11,7 +11,7 @@ class Controller { onSubmit() { this.$.watcher.submit().then( - json => this.$state.go('item.card.data', {id: json.data.id}) + json => this.$state.go('item.card.basicData', {id: json.data.id}) ); } } diff --git a/modules/item/front/create/index.spec.js b/modules/item/front/create/index.spec.js index 14d7bf5133..cb58cdaa31 100644 --- a/modules/item/front/create/index.spec.js +++ b/modules/item/front/create/index.spec.js @@ -30,7 +30,7 @@ describe('Item', () => { spyOn($state, 'go'); controller.onSubmit(); - expect(controller.$state.go).toHaveBeenCalledWith('item.card.data', {id: 1}); + expect(controller.$state.go).toHaveBeenCalledWith('item.card.basicData', {id: 1}); }); }); }); diff --git a/modules/item/front/index.js b/modules/item/front/index.js index 4ff9e3e3f8..bc280d529d 100644 --- a/modules/item/front/index.js +++ b/modules/item/front/index.js @@ -7,7 +7,7 @@ import './create'; import './card'; import './descriptor'; import './descriptor-popover'; -import './data'; +import './basic-data'; import './fetched-tags'; import './tags'; import './tax'; diff --git a/modules/item/front/routes.json b/modules/item/front/routes.json index 3271ebe3a9..a85e31f372 100644 --- a/modules/item/front/routes.json +++ b/modules/item/front/routes.json @@ -5,7 +5,7 @@ "validations" : true, "dependencies": ["worker", "client", "ticket"], "menu": [ - {"state": "item.card.data", "icon": "settings"}, + {"state": "item.card.basicData", "icon": "settings"}, {"state": "item.card.tags", "icon": "icon-tags"}, {"state": "item.card.tax", "icon": "icon-tax"}, {"state": "item.card.niche", "icon": "place"}, @@ -41,9 +41,9 @@ "abstract": true, "component": "vn-item-card" }, { - "url" : "/data", - "state": "item.card.data", - "component": "vn-item-data", + "url" : "/basic-data", + "state": "item.card.basicData", + "component": "vn-item-basic-data", "description": "Basic data", "params": { "item": "$ctrl.item"