Skip to content

Exception are not translated to store scope #32953

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

Merged
merged 21 commits into from
Apr 12, 2022
Merged

Exception are not translated to store scope #32953

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1b4a3bc
Exception are not translated to store scope
rikwillems May 5, 2021
f096a71
Update per Backward Compatibility Policy
rikwillems May 10, 2021
f05bec2
Fix double semicolon
rikwillems May 10, 2021
e7c2ee9
Fix typehint
rikwillems May 14, 2021
6265480
Merge branch '2.4-develop' into 31351-translations-graphql
Aug 1, 2021
ab5d921
Added Valid store check to avoid Fatal errors
shikhamis11 Aug 18, 2021
dcfa3b9
Merge branch '2.4-develop' into 31351-translations-graphql
Aug 18, 2021
511ab01
Refactor testProductFromSpecificAndDefaultStore
shikhamis11 Aug 18, 2021
77e8af4
Merge branch '2.4-develop' into 31351-translations-graphql
cpartica Aug 23, 2021
01a3904
Added Test for Translation
shikhamis11 Aug 26, 2021
cd123f5
Merge branch '2.4-develop' into 31351-translations-graphql
Sep 20, 2021
e565f3f
Fixed static test
shikhamis11 Sep 21, 2021
b51f420
Fixed static test
shikhamis11 Sep 21, 2021
379d2b0
Fixed static test
shikhamis11 Sep 21, 2021
ab8b8b4
Merge branch '2.4-develop' into 31351-translations-graphql
cpartica Sep 27, 2021
0cef678
Fixed fatal error with non existing store
shikhamis11 Sep 29, 2021
f6329fe
Merge branch '2.4-develop' into 31351-translations-graphql
Sep 29, 2021
f3fc159
Fixed Static test
shikhamis11 Sep 29, 2021
2f656a6
Fixed Parameters order
shikhamis11 Oct 1, 2021
c7ed1e5
Updated constructor comment
shikhamis11 Dec 7, 2021
4635cf1
Merge branch '2.4-develop' into 31351-translations-graphql
Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion app/code/Magento/GraphQl/Controller/GraphQl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

namespace Magento\GraphQl\Controller;

use Magento\Framework\App\Area;
use Magento\Framework\App\AreaList;
use Magento\Framework\App\FrontControllerInterface;
use Magento\Framework\App\Request\Http;
use Magento\Framework\App\RequestInterface;
Expand Down Expand Up @@ -88,6 +90,11 @@ class GraphQl implements FrontControllerInterface
* @var ContextFactoryInterface
*/
private $contextFactory;

/**
* @var AreaList $areaList
*/
private $appState;
Copy link

Choose a reason for hiding this comment

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

I think private $appState; should be change into private $areaList;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed. Stupid me. I had an error here before but only half fixed it.


/**
* @param Response $response
Expand All @@ -114,7 +121,8 @@ public function __construct(
QueryFields $queryFields,
JsonFactory $jsonFactory = null,
HttpResponse $httpResponse = null,
ContextFactoryInterface $contextFactory = null
ContextFactoryInterface $contextFactory = null,
AreaList $areaList
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
AreaList $areaList
AreaList $areaList = null

) {
$this->response = $response;
$this->schemaGenerator = $schemaGenerator;
Expand All @@ -127,6 +135,7 @@ public function __construct(
$this->jsonFactory = $jsonFactory ?: ObjectManager::getInstance()->get(JsonFactory::class);
$this->httpResponse = $httpResponse ?: ObjectManager::getInstance()->get(HttpResponse::class);
$this->contextFactory = $contextFactory ?: ObjectManager::getInstance()->get(ContextFactoryInterface::class);
$this->areaList = $areaList;
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
$this->areaList = $areaList;
$this->areaList = $areaList ?: ObjectManager::getInstance()->get(AreaList::class);

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Please see the updated PR.

}

/**
Expand All @@ -138,6 +147,8 @@ public function __construct(
*/
public function dispatch(RequestInterface $request) : ResponseInterface
{
$this->areaList->getArea(Area::AREA_GRAPHQL)->load(Area::PART_TRANSLATE);

$statusCode = 200;
$jsonResult = $this->jsonFactory->create();
try {
Expand Down