Skip to content

Allow configuration paths based on system.xml #31621

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.

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

Merged
merged 3 commits into from
Jan 30, 2021

Conversation

navarr
Copy link
Member

@navarr navarr commented Jan 12, 2021

Description (*)

When merged, this code will update the path validator to consider system.xml paths valid (in addition to config.xml paths)

Fixed Issues (if relevant)

  1. Fixes bin/magento config:set expects config path to match display path #27678

Manual testing scenarios (*)

  1. Create sample module with system.xml like this
    <system>
        <section id="sales">
            <group id="general">
                <field id="keyid" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
                    <label>Key Id</label>
                </field>
            </group>
        </section>
    </system>
  1. Set some value via CLI
    bin/magento config:set sales/general/keyid 1
    We can see Value was saved. as expected.
  2. Add some config_path to system.xml like this
    <system>
        <section id="sales">
            <group id="general">
                <field id="keyid" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
                    <label>Key Id</label>
                    <config_path>custom_path/keyid</config_path>
                </field>
            </group>
        </section>
    </system>
  1. Clear cache config
  2. Try to set some value via CLI again
    bin/magento config:set sales/general/keyid 777

AR:

The "sales/general/keyid" path doesn't exist. Verify and try again.

ER:

Value was saved.

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 Jan 12, 2021

Hi @navarr. 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
  13. Semantic Version Checker

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.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

@m2-community-project m2-community-project bot added Progress: pending review Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. labels Jan 12, 2021
Copy link
Contributor

@ihor-sviziev ihor-sviziev left a comment

Choose a reason for hiding this comment

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

Hi @navarr,
Thank you for your contribution! Your change looks good to me.
Could you cover your change with some automated tests?

@ihor-sviziev
Copy link
Contributor

@magento run all tests

@ihor-sviziev ihor-sviziev added Auto-Tests: Not Covered Changes in Pull Request requires coverage by auto-tests Award: bug fix labels Jan 13, 2021
@engcom-Hotel engcom-Hotel self-assigned this Jan 13, 2021
@engcom-Hotel
Copy link
Contributor

@magento run Functional Tests CE, Functional Tests EE

@engcom-Hotel
Copy link
Contributor

@magento run all tests

@engcom-Hotel
Copy link
Contributor

@magento run Functional Tests B2B, Functional Tests EE

Copy link
Contributor

@ihor-sviziev ihor-sviziev left a comment

Choose a reason for hiding this comment

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

Please check my comments and also please add test coverage for new cases.

@@ -40,6 +40,11 @@ public function __construct(Structure $structure)
*/
public function validate($path)
{
$element = $this->structure->getElementByConfigPath($path);
if ($element && method_exists($element, 'getConfigPath') && $element->getConfigPath()!==null) {
Copy link
Contributor

Choose a reason for hiding this comment

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

  1. Instead of checking that method exists, could we check here that the element is an instance of some class, or maybe not an instance of an element group?

    if ($element instanceof \Magento\Config\Model\Config\Structure\Element\Group) {
    $this->_initGroup($element, $section, $fieldset);
    } else {
    $path = $element->getConfigPath() ?: $element->getPath($fieldPrefix);

  2. I believe if the $element->getConfigPath() will return empty string that's not also good option. I think we should just check if(... && $element->getConfigPath()) {. What do you think about it?

Copy link
Contributor

Choose a reason for hiding this comment

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

Has been refactored.

@@ -191,7 +191,7 @@ public function getElementByConfigPath($path)
{
$allPaths = $this->getFieldPaths();

if (isset($allPaths[$path])) {
if (isset($allPaths[$path]) && is_array($allPaths[$path])) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you explain why it wasn't needed earlier?

Copy link
Contributor

Choose a reason for hiding this comment

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

We didn't call it with empty $allPaths before and with the changes at the 'validate' method we can have an error at $path = array_shift($allPaths[$path]) because '$allPaths[$path]' could be 0 (int) instead of array.

@engcom-Hotel
Copy link
Contributor

@magento run all tests

@engcom-Hotel
Copy link
Contributor

@magento run Functional Tests B2B, Functional Tests CE

@magento-engcom-team
Copy link
Contributor

Hi @ihor-sviziev, thank you for the review.
ENGCOM-8701 has been created to process this Pull Request

@engcom-Alfa
Copy link
Contributor

✔️ QA Passed

Manual testing scenario:

  1. Create sample module with system.xml like this
    <system>
        <section id="sales">
            <group id="general">
                <field id="keyid" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
                    <label>Key Id</label>
                </field>
            </group>
        </section>
    </system>
  1. Set some value via CLI
    bin/magento config:set sales/general/keyid 1
    We can see Value was saved. as expected.
  2. Add some config_path to system.xml like this
    <system>
        <section id="sales">
            <group id="general">
                <field id="keyid" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
                    <label>Key Id</label>
                    <config_path>custom_path/keyid</config_path>
                </field>
            </group>
        </section>
    </system>
  1. Clear cache config
  2. Try to set some value via CLI again
    _bin/magento config:set sales/general/keyid 777;

Before: ✖️ The "sales/general/keyid" path doesn't exist. Verify and try again.

Screenshot from 2021-01-26 10-13-12

After: ✔️ Value was saved.

Screenshot from 2021-01-26 11-49-00

DB -> core_config_data

Screenshot from 2021-01-26 11-05-26

and setting configuration values work as expected.

@m2-assistant
Copy link

m2-assistant bot commented Jan 30, 2021

Hi @navarr, 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests Award: bug fix Component: Config Partner: Blue Acorn iCi partners-contribution Pull Request is created by Magento Partner Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Progress: accept QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope Release Line: 2.4 Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. tech-partners-contribution Technology Partner: Vertex Type: Bug Fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bin/magento config:set expects config path to match display path
8 participants