Merge pull request #450 from ergonode/develop

Release v0.9.0

.eslintrc.js

@@ -41,22 +41,22 @@ module.exports = {
             },
         ],
         'import/extensions': 'off',
-        "import/no-extraneous-dependencies": ["error", {"devDependencies": ["cypress/**/*.js", "**/**/*.test.js", "**/**/*.spec.js"]}],
+        'import/no-extraneous-dependencies': ['error', { devDependencies: ['cypress/**/*.js', '**/**/*.test.js', '**/**/*.spec.js'] }],
         'no-console': 'off',
         'no-alert': 'off',
         'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
         'import/no-unresolved': ['off'],
         'import/prefer-default-export': ['off'],
         'vue/html-indent': ['error', 4],
         'vue/html-closing-bracket-newline': ['off'],
-        'indent': ['error', 4],
+        indent: ['error', 4],
         'no-param-reassign': ['error', {
             props: true,
             ignorePropertyModificationsFor: [
                 'state',
             ],
         }],
-        'camelcase': ['off'],
+        camelcase: ['off'],
         'class-methods-use-this': ['off'],
         'global-require': ['off'],
         'import/no-dynamic-require': ['off'],

.storybook/reset-storybook.scss

@@ -18,8 +18,6 @@ time, mark, audio, video {
     border: 0;
     padding: 0;
     margin: 0;
-    font: inherit;
-    font-size: 100%;
     vertical-align: baseline;
 }
 /* HTML5 display-role reset for older browsers */

CHANGELOG.md

@@ -1,6 +1,15 @@
 # CHANGELOG
 This changelog references the relevant changes.
 
+## CHANGELOG FOR v0.9.0
+ - feature [#384](https://github.com/ergonode/frontend/issues/384) Product variants
+ - feature [#418](https://github.com/ergonode/frontend/issues/418) GridCollectionLayout for product related Grid's
+ - feature [#428](https://github.com/ergonode/frontend/issues/428) Integrate TextArea/RTE
+ - feature [#430](https://github.com/ergonode/frontend/issues/430) Optimisation for D&D at Grid and AdvancedFilters
+ - feature dependencies update
+ - perf - Language inheritance communication
+ - bugfix - Product template updating draft values
+
 ## CHANGELOG FOR v0.8.0
  - feature [#365](https://github.com/ergonode/frontend/issues/365) Language inheritance - privileges
  - feature [#366](https://github.com/ergonode/frontend/issues/366) Language inheritance - product changes

README.md

@@ -7,7 +7,7 @@
 
 <p align="center">
   <a href="https://ergonode.com">
-    <img src="https://img.shields.io/badge/version-0.8.0-4c9aff.svg" alt="Version">
+    <img src="https://img.shields.io/badge/version-0.9.0-4c9aff.svg" alt="Version">
   </a>
   <a href="https://ergonode.com">
     <img src="https://img.shields.io/badge/version%20code-Vegas-00bc87.svg" alt="Code Version">

cypress/integration/1_attribute/1_addAttributeGroup.feature

@@ -7,17 +7,48 @@ Feature: Attribute group adding
     When I click on "new-attribute-group" button
     Then Element "modal" is "visible"
 
-  Scenario: Add attibute group
+  Scenario: Add attibute group and delete by request
     When I fill the "attribute-group-code" input with the "text_attribute_group" term
     When On "modal" element I click button with "CREATE" text
     Then I send a "POST" request and status code should be 201
     Then I close modal
     Then On "grid" I can see row 0 with columns data: "{'0': 'text_attribute_group', '2': '0'}"
+    And On "grid" I click on "delete" button for row 0
+    Then I close modal by button
+    And I remove "this" element by "DELETE" request
 
-  Scenario: Add attibute group 2
+  Scenario: Add attibute group and delete by grid button
     When I fill the "attribute-group-code" input with the "text_attribute_group2" term
     When On "modal" element I click button with "CREATE" text
     Then I send a "POST" request and status code should be 201
     Then I close modal
-    Then On "grid" I can see row 1 with columns data: "{'0': 'text_attribute_group2', '2': '0'}"
-    And I remove "this" element by "DELETE" request
+    Then On "grid" I can see row 0 with columns data: "{'0': 'text_attribute_group2', '2': '0'}"
+    And On "grid" I click on "delete" button for row 0
+    Then I confirm modal
+    And On "grid" I can not see row 0 with columns data: "{'0': 'text_attribute_group2'}"
+
+  Scenario: Add attibute group and delete from edit
+    When I fill the "attribute-group-code" input with the "text_attribute_group3" term
+    When On "modal" element I click button with "CREATE & EDIT" text
+    Then I send a "POST" request and status code should be 201
+    And I see "attribute-groups/group/%UUID%/general" page
+    Then Element "attribute-group-code" is "visible"
+    Then Element "title-bar-header" is "visible"
+    Then I can see "text_attribute_group3" text on "title-bar-header" element
+    When I click on "delete-attribute-group" button
+    Then I confirm modal
+    And I see "attribute-groups/grid" page
+
+  Scenario: Add attibute group for use in attribute
+    When I fill the "attribute-group-code" input with the "attribute_group" term
+    And On "modal" element I click button with "CREATE" text
+    Then I send a "POST" request and status code should be 201
+    And I close modal
+    Then On "grid" I can see row 0 with columns data: "{'0': 'attribute_group', '2': '0'}"
+    And On "grid" I click on "edit" button for row 0
+    And I see "attribute-groups/group/%UUID%/general" page
+    Then I click tab with "Translations" text
+    And I choose "[1]" options from "translation-language-select" multi select field
+    Then I fill the "attribute-group-name" input with the "attribute_group_EN" term for "en" translation
+    And I fill the "attribute-group-name" input with the "attribute_group_PL" term for "pl" translation
+    And I click on "save-attribute-group" button

cypress/integration/1_attribute/1_addAttributeGroup/index.test.js

@@ -2,9 +2,14 @@
  * Copyright © Bold Brand Commerce Sp. z o.o. All rights reserved.
  * See LICENSE for license details.
  */
-import { Then } from 'cypress-cucumber-preprocessor/steps';
+import { Then, And } from 'cypress-cucumber-preprocessor/steps';
 import {
-    sendRequest, getToken, checkGridRow, removeRequest,
+    sendPostRequest,
+    getToken,
+    checkGridRow,
+    removeRequest,
+    removeOnGrid,
+    noGridRow,
 } from '../../models/addingItems';
 
 beforeEach(() => {
@@ -13,13 +18,21 @@ beforeEach(() => {
 
 Then('I send a {string} request and status code should be {int}', (reqType, status) => {
     getToken();
-    sendRequest({ reqType, status, urlRegExp: /\/en\/attributes\/groups$/ });
+    sendPostRequest({ reqType, status, urlRegExp: /\/en\/attributes\/groups$/ });
 });
 
 Then('On {string} I can see row {int} with columns data: {string}', (gridId, rowNr, columns) => {
     checkGridRow({ gridId, rowNr, columns });
 });
 
+And('On {string} I can not see row {int} with columns data: {string}', (gridId, rowNr, columns) => {
+    noGridRow({ gridId, rowNr, columns });
+});
+
 Then('I remove {string} element by {string} request', (element, reqType) => {
     removeRequest({ element, reqType, path: 'en/attributes/groups' });
 });
+
+And('On {string} I click on {string} button for row {int}', (gridId, action, rowNr) => {
+    removeOnGrid({ gridId, action, rowNr });
+});