Skip to content
This repository was archived by the owner on Dec 19, 2019. It is now read-only.

Fixed #176 - Show only active CMS Blocks #221

Merged
merged 8 commits into from
Nov 23, 2018
Merged

Fixed #176 - Show only active CMS Blocks #221

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bf0030f
Update blocks
ronak2ram Oct 25, 2018
4eac0fc
Added warning log
ronak2ram Oct 26, 2018
60f91ee
Merge remote-tracking branch 'origin/2.3-develop' into Fixed-218
Nov 22, 2018
5c6f20f
Merge branch 'Fixed-218' of github.com:ronak2ram/graphql-ce into Fixe…
Nov 22, 2018
922d398
GraphQL-176: Show only active CMS Blocks
Nov 22, 2018
6d984eb
GraphQL-176: Show only active CMS Blocks
Nov 22, 2018
d3a22e9
GraphQL-176: Show only active CMS Blocks
Nov 22, 2018
772d4da
GraphQL-176: Show only active CMS Blocks
Nov 22, 2018
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
5 changes: 4 additions & 1 deletion app/code/Magento/CmsGraphQl/Model/Resolver/Blocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ private function getBlocksData(array $blockIdentifiers): array
$blocksData = [];
try {
foreach ($blockIdentifiers as $blockIdentifier) {
$blocksData[$blockIdentifier] = $this->blockDataProvider->getData($blockIdentifier);
$blockData = $this->blockDataProvider->getData($blockIdentifier);
if (!empty($blockData)) {
$blocksData[$blockIdentifier] = $blockData;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

We need to log the fact that some of the requested blocks were not found, please add this to the else.

Copy link
Contributor

Choose a reason for hiding this comment

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

I provided a little refactoring of this PR
Now blocks data is located in data section, and errors are located in errors section

Also, I removed the logging, because there it’s way to log overflow logfile if I send non-existent block id
And at the same time for the client, there is no information what is the actual error (error is only on the server)

}
} catch (NoSuchEntityException $e) {
throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function getData(string $blockIdentifier): array
$block = $this->blockRepository->getById($blockIdentifier);

if (false === $block->isActive()) {
throw new NoSuchEntityException();
return [];
}

$renderedContent = $this->widgetFilter->filter($block->getContent());
Expand Down