This repository has been archived by the owner on Dec 19, 2019. It is now read-only.
128 extend store config coverage #130
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # CmsGraphQl | ||
|
|
||
| **CmsGraphQl** provides type information for the GraphQl module | ||
| to generate CMS fields information endpoints. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "name": "magento/module-cms-graph-ql", | ||
| "description": "N/A", | ||
| "type": "magento2-module", | ||
| "require": { | ||
| "php": "~7.1.3||~7.2.0", | ||
| "magento/framework": "*" | ||
| }, | ||
| "suggest": { | ||
| "magento/module-graph-ql": "*", | ||
| "magento/module-store-graph-ql": "*" | ||
| }, | ||
| "license": [ | ||
| "OSL-3.0", | ||
| "AFL-3.0" | ||
| ], | ||
| "autoload": { | ||
| "files": [ | ||
| "registration.php" | ||
| ], | ||
| "psr-4": { | ||
| "Magento\\CmsGraphQl\\": "" | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"> | ||
| <type name="Magento\StoreGraphQl\Model\Resolver\Store\ExtendedStoreConfigDataProvider"> | ||
| <arguments> | ||
| <argument name="extendedConfigs" xsi:type="array"> | ||
| <item name="front" xsi:type="string">web/default/front</item> | ||
|
There was a problem hiding this comment. Need to replace value on constants |
||
| <item name="cms_home_page" xsi:type="string">web/default/cms_home_page</item> | ||
| <item name="no_route" xsi:type="string">web/default/no_route</item> | ||
| <item name="cms_no_route" xsi:type="string">web/default/cms_no_route</item> | ||
| <item name="cms_no_cookies" xsi:type="string">web/default/cms_no_cookies</item> | ||
| <item name="show_cms_breadcrumbs" xsi:type="string">web/default/show_cms_breadcrumbs</item> | ||
| </argument> | ||
| </arguments> | ||
| </type> | ||
| </config> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd"> | ||
| <module name="Magento_CmsGraphQl"> | ||
| <sequence> | ||
| <module name="Magento_GraphQl"/> | ||
| </sequence> | ||
| </module> | ||
| </config> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| # Copyright © Magento, Inc. All rights reserved. | ||
| # See COPYING.txt for license details. | ||
| type StoreConfig @doc(description: "The type contains information about a store config") { | ||
| front : String @doc(description: "Default Web URL") | ||
| cms_home_page : String @doc(description: "CMS Home Page") | ||
| no_route : String @doc(description: "Default No-route URL") | ||
| cms_no_route : String @doc(description: "CMS No Route Page") | ||
| cms_no_cookies : String @doc(description: "CMS No Cookies Page") | ||
| show_cms_breadcrumbs : Int @doc(description: "Show Breadcrumbs for CMS Pages") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| use Magento\Framework\Component\ComponentRegistrar; | ||
|
|
||
| ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CmsGraphQl', __DIR__); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\StoreGraphQl\Model\Resolver\Store; | ||
|
|
||
| use Magento\Framework\App\Config\ScopeConfigInterface; | ||
| use Magento\Store\Model\ScopeInterface; | ||
|
|
||
| /** | ||
| * Extends default StoreConfigInterface for GraphQL request processing. | ||
| */ | ||
| class ExtendedStoreConfigDataProvider | ||
| { | ||
| /** | ||
| * @var ScopeConfigInterface | ||
| */ | ||
| private $scopeConfig; | ||
|
|
||
| /** | ||
| * @var array | ||
| */ | ||
| private $extendedConfigs; | ||
|
|
||
| /** | ||
| * @param ScopeConfigInterface $scopeConfig | ||
| * @param array $extendedConfigs | ||
| */ | ||
| public function __construct( | ||
| ScopeConfigInterface $scopeConfig, | ||
| array $extendedConfigs | ||
| ) { | ||
| $this->scopeConfig = $scopeConfig; | ||
| $this->extendedConfigs = $extendedConfigs; | ||
| } | ||
|
|
||
| /** | ||
| * Get data from ScopeConfig by path's defined in DI config | ||
| * @return array | ||
| */ | ||
| public function getExtendedConfigs() | ||
| { | ||
| $extendedConfigsData = []; | ||
| foreach ($this->extendedConfigs as $key => $path) { | ||
| $extendedConfigsData[$key] = $this->scopeConfig->getValue($path, ScopeInterface::SCOPE_STORE); | ||
| } | ||
|
|
||
| return $extendedConfigsData; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ | |
| use Magento\Framework\GraphQl\Query\Resolver\ValueFactory; | ||
| use Magento\Framework\GraphQl\Query\ResolverInterface; | ||
| use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; | ||
| use Magento\StoreGraphQl\Model\Resolver\Store\ExtendedStoreConfigDataProvider; | ||
| use Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider; | ||
|
|
||
| /** | ||
|
|
@@ -24,21 +25,29 @@ class StoreConfigResolver implements ResolverInterface | |
| */ | ||
| private $storeConfigDataProvider; | ||
|
|
||
| /** | ||
| * @var ExtendedStoreConfigDataProvider | ||
| */ | ||
| private $extendedStoreConfigsDataProvider; | ||
|
|
||
| /** | ||
| * @var ValueFactory | ||
| */ | ||
| private $valueFactory; | ||
|
|
||
| /** | ||
| * @param StoreConfigDataProvider $storeConfigsDataProvider | ||
| * @param ExtendedStoreConfigDataProvider $extendedStoreConfigsDataProvider | ||
| * @param ValueFactory $valueFactory | ||
| */ | ||
| public function __construct( | ||
| StoreConfigDataProvider $storeConfigsDataProvider, | ||
| ExtendedStoreConfigDataProvider $extendedStoreConfigsDataProvider, | ||
| ValueFactory $valueFactory | ||
| ) { | ||
| $this->valueFactory = $valueFactory; | ||
| $this->storeConfigDataProvider = $storeConfigsDataProvider; | ||
| $this->extendedStoreConfigsDataProvider = $extendedStoreConfigsDataProvider; | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -52,7 +61,10 @@ public function resolve( | |
| array $args = null | ||
| ) : Value { | ||
|
|
||
| $storeConfigData = array_merge( | ||
|
There was a problem hiding this comment. We should use just one config provider and the list of accessible fields should be filtered according to the extensible di.xml There was a problem hiding this comment. Hi @paliarush |
||
| $this->storeConfigDataProvider->getStoreConfig(), | ||
| $this->extendedStoreConfigsDataProvider->getExtendedConfigs() | ||
| ); | ||
|
|
||
| $result = function () use ($storeConfigData) { | ||
| return !empty($storeConfigData) ? $storeConfigData : []; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # ThemeGraphQlhQl | ||
|
|
||
| **ThemeGraphQlhQl** provides type information for the GraphQl module | ||
| to generate theme fields information endpoints. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "name": "magento/module-theme-graph-ql", | ||
| "description": "N/A", | ||
| "type": "magento2-module", | ||
| "require": { | ||
| "php": "~7.1.3||~7.2.0", | ||
| "magento/framework": "*" | ||
| }, | ||
| "suggest": { | ||
| "magento/module-graph-ql": "*", | ||
| "magento/module-store-graph-ql": "*" | ||
| }, | ||
| "license": [ | ||
| "OSL-3.0", | ||
| "AFL-3.0" | ||
| ], | ||
| "autoload": { | ||
| "files": [ | ||
| "registration.php" | ||
| ], | ||
| "psr-4": { | ||
| "Magento\\ThemeGraphQlhQl\\": "" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"> | ||
| <type name="Magento\StoreGraphQl\Model\Resolver\Store\ExtendedStoreConfigDataProvider"> | ||
| <arguments> | ||
| <argument name="extendedConfigs" xsi:type="array"> | ||
| <!-- Begin Design Configuration HTML Head Section--> | ||
| <item name="head_shortcut_icon" xsi:type="string">design/head/head_shortcut_icon</item> | ||
| <item name="default_title" xsi:type="string">design/head/default_title</item> | ||
| <item name="title_prefix" xsi:type="string">design/head/title_prefix</item> | ||
| <item name="title_suffix" xsi:type="string">design/head/title_suffix</item> | ||
| <item name="default_description" xsi:type="string">design/head/default_description</item> | ||
| <item name="default_keywords" xsi:type="string">design/head/default_keywords</item> | ||
| <item name="head_includes" xsi:type="string">design/head/includes</item> | ||
| <item name="demonotice" xsi:type="string">design/head/demonotice</item> | ||
| <!-- End Design Configuration HTML Head Section --> | ||
| <!-- Begin Design Configuration Header Section--> | ||
| <item name="header_logo_src" xsi:type="string">design/header/header_logo_src</item> | ||
| <item name="logo_width" xsi:type="string">design/header/logo_width</item> | ||
| <item name="logo_height" xsi:type="string">design/header/logo_height</item> | ||
| <item name="welcome" xsi:type="string">design/header/welcome</item> | ||
| <item name="logo_alt" xsi:type="string">design/header/logo_alt</item> | ||
| <!-- End Design Configuration Header Section --> | ||
| <!-- Begin Design Configuration Footer Section--> | ||
| <item name="copyright" xsi:type="string">design/footer/copyright</item> | ||
| <item name="absolute_footer" xsi:type="string">design/footer/absolute_footer</item> | ||
| <!-- End Design Configuration Footer Section --> | ||
| </argument> | ||
| </arguments> | ||
| </type> | ||
| </config> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd"> | ||
| <module name="Magento_ThemeGraphQl"> | ||
| <sequence> | ||
| <module name="Magento_GraphQl"/> | ||
| </sequence> | ||
| </module> | ||
| </config> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # Copyright © Magento, Inc. All rights reserved. | ||
| # See COPYING.txt for license details. | ||
| type StoreConfig @doc(description: "The type contains information about a store config") { | ||
| head_shortcut_icon : String @doc(description: "Favicon Icon") | ||
| default_title : String @doc(description: "Default Page Title") | ||
| title_prefix : String @doc(description: "Page Title Prefix") | ||
| title_suffix : String @doc(description: "Page Title Suffix") | ||
| default_description : String @doc(description: "Default Meta Description") | ||
| default_keywords : String @doc(description: "Default Meta Keywords") | ||
| head_includes : String @doc(description: "Scripts and Style Sheets") | ||
| demonotice : Int @doc(description: "Display Demo Store Notice") | ||
| header_logo_src : String @doc(description: "Logo Image") | ||
| logo_width : Int @doc(description: "Logo Attribute Width") | ||
| logo_height : Int @doc(description: "Logo Attribute Height") | ||
| welcome : String @doc(description: "Welcome Text") | ||
| logo_alt : String @doc(description: "Logo Image Alt") | ||
| absolute_footer : String @doc(description: "Footer Miscellaneous HTML") | ||
| copyright : String @doc(description: "Copyright") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| use Magento\Framework\Component\ComponentRegistrar; | ||
|
|
||
| ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_ThemeGraphQl', __DIR__); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we have dependency on CMS module (or at least
suggest, if there are no hard dependencies)?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi
I guess Travis will fail in this case with the "redundant dependency" error.