Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change error to code is reserved key instead of code already exists #28663

Merged
merged 13 commits into from
Sep 24, 2020
Merged

change error to code is reserved key instead of code already exists #28663

merged 13 commits into from
Sep 24, 2020

Conversation

AbdulRahmanAbouzaid
Copy link
Contributor

@AbdulRahmanAbouzaid AbdulRahmanAbouzaid commented Jun 10, 2020 •
edited
Loading

Description (*)

Change error message caused by creating product attribute with product_type and type_id codes to be more descriptive.

Fixed Issues (if relevant)

  1. Fixes Product attributes product_type, type_id cannot be created/edited form admin #28479

Manual testing scenarios (*)

  1. Go to Stores > Attributes > Product
  2. Create new attribute with product_type or type_id code

Questions or comments

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds are green)

@m2-assistant
Copy link

m2-assistant bot commented Jun 10, 2020

Hi @AbdulRahmanAbouzaid. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE,
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

@ghost ghost added this to Pending Review in Pull Requests Dashboard Jun 10, 2020
@AbdulRahmanAbouzaid
Copy link
Contributor Author

@magento run all tests

@ghost ghost added Priority: P3 May be fixed according to the position in the backlog. Severity: S4 Affects aesthetics, professional look and feel, “quality” or “usability”. labels Jun 12, 2020
@AbdulRahmanAbouzaid AbdulRahmanAbouzaid mentioned this pull request Jun 12, 2020
Closed
5 tasks
lenaorobei
lenaorobei requested changes Aug 24, 2020
View reviewed changes
Copy link
Contributor

@lenaorobei lenaorobei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's move reserved attributes to the private constant.

Please consider covering this change with MFTF test.

@ghost ghost moved this from Pending Review to Changes Requested in Pull Requests Dashboard Aug 24, 2020
@ghost ghost assigned lenaorobei Aug 24, 2020
@AbdulRahmanAbouzaid
Copy link
Contributor Author

@lenaorobei changes and test provided. Can you please review it again?

@AbdulRahmanAbouzaid
Copy link
Contributor Author

@magento run all tests

@AbdulRahmanAbouzaid
Copy link
Contributor Author

@magento run all tests

@AbdulRahmanAbouzaid
Copy link
Contributor Author

@magento run Functional Tests CE

lenaorobei
lenaorobei reviewed Aug 28, 2020
View reviewed changes
app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php Outdated
: __('An attribute with the same code (%1) already exists.', $attributeCode);

if ($attribute->getId() && !$attributeId || in_array($attributeCode, static::RESERVED_CODES)) {
if (in_array($attributeCode, static::RESERVED_CODES)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's simplify logic in this condition. The same in_array is being called twice.
Please use self instead of static for constant access.

@AbdulRahmanAbouzaid
Copy link
Contributor Author

@magento run all tests

@AbdulRahmanAbouzaid
Copy link
Contributor Author

@lenaorobei Changes provided

@AbdulRahmanAbouzaid
Copy link
Contributor Author

@magento run Functional Tests B2B, Functional Tests CE, Functional Tests EE

@AbdulRahmanAbouzaid
Copy link
Contributor Author

@magento run all tests

@AbdulRahmanAbouzaid
Copy link
Contributor Author

@engcom-Alfa phrase added to the translation file

@ghost ghost moved this from Changes Requested to Ready for Testing in Pull Requests Dashboard Sep 21, 2020
@engcom-Alfa engcom-Alfa moved this from Ready for Testing to Testing in Progress in Pull Requests Dashboard Sep 22, 2020
@engcom-Alfa
Copy link
Contributor

✔️ QA Passed

Manual testing scenario:

  1. Go to Stores > Attributes > Product;
  2. Create new attribute with product_type or type_id code;

Before: ✖️ Either of following messages appear An attribute with this code already exists. OR An attribute with the same code (product_type) already exists.

Screenshot from 2020-09-18 14-16-10

After: ✔️ Attribute is not saved. Error message is shown

✔️ text: Code "product_type" is a reserved key and cannot be used as an attribute code.

Screenshot from 2020-09-18 15-18-47

✔️ text: Code "type_id" a reserved key and cannot be used as attribute code.

Screenshot from 2020-09-18 15-20-04

@engcom-Alfa engcom-Alfa added the QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope label Sep 22, 2020
@engcom-Alfa engcom-Alfa moved this from Testing in Progress to Extended Testing (optional) in Pull Requests Dashboard Sep 22, 2020
@engcom-Echo
Copy link
Contributor

@magento run all tests

@engcom-Echo
Copy link
Contributor

@magento run all tests

@engcom-Echo engcom-Echo moved this from Extended Testing (optional) to Merge in Progress in Pull Requests Dashboard Sep 23, 2020
magento-engcom-team pushed a commit that referenced this pull request Sep 24, 2020
@sidolov
ENGCOM-8178: change error to code is reserved key instead of code alr…
b87c1b7 
…eady exists #28663
@magento-engcom-team magento-engcom-team merged commit 6e8f85f into magento:2.4-develop Sep 24, 2020
@m2-assistant
Copy link

m2-assistant bot commented Sep 24, 2020

Hi @AbdulRahmanAbouzaid, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@ghost ghost moved this from Merge in Progress to Recently Merged in Pull Requests Dashboard Sep 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lenaorobei lenaorobei lenaorobei approved these changes

@engcom-Alfa engcom-Alfa Awaiting requested review from engcom-Alfa

Assignees

@lenaorobei lenaorobei

@engcom-Alfa engcom-Alfa

@engcom-Echo engcom-Echo

Labels
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Component: Catalog Partner: Pinpoint partners-contribution Pull Request is created by Magento Partner Priority: P3 May be fixed according to the position in the backlog. Progress: accept QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope Release Line: 2.4 Risk: low Severity: S4 Affects aesthetics, professional look and feel, “quality” or “usability”.
Projects
Pull Requests Dashboard
  
Recently Merged
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Product attributes product_type, type_id cannot be created/edited form admin
6 participants
@AbdulRahmanAbouzaid @lenaorobei @gabrieldagama @engcom-Echo @magento-engcom-team @engcom-Alfa