Fixed #26118 Cms Block Scope wise value issue

Author: Shikha Mishra

app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php

@@ -9,7 +9,9 @@
 
 use Magento\Cms\Api\BlockRepositoryInterface;
 use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Widget\Model\Template\FilterEmulate;
 
 /**
@@ -26,17 +28,35 @@ class Block
      * @var FilterEmulate
      */
     private $widgetFilter;
+    
+    /**
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     */
+    protected $searchCriteriaBuilder;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
 
     /**
      * @param BlockRepositoryInterface $blockRepository
      * @param FilterEmulate $widgetFilter
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         BlockRepositoryInterface $blockRepository,
-        FilterEmulate $widgetFilter
+        FilterEmulate $widgetFilter,
+        SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->blockRepository = $blockRepository;
         $this->widgetFilter = $widgetFilter;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: \Magento\Framework
+            \App\ObjectManager::getInstance()->get(SearchCriteriaBuilder::class);
+        $this->storeManager = $storeManager ?: \Magento\Framework
+            \App\ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -48,9 +68,13 @@ public function __construct(
      */
     public function getData(string $blockIdentifier): array
     {
-        $block = $this->blockRepository->getById($blockIdentifier);
+        $searchCriteria = $this->searchCriteriaBuilder
+            ->addFilter('identifier', $blockIdentifier, 'eq')
+            ->addFilter('store_id', $this->storeManager->getStore()->getId(), 'eq')
+            ->addFilter('is_active', true, 'eq')->create();
+        $block = current($this->blockRepository->getList($searchCriteria)->getItems());
 
-        if (false === $block->isActive()) {
+        if (empty($block)) {
             throw new NoSuchEntityException(
                 __('The CMS block with the "%1" ID doesn\'t exist.', $blockIdentifier)
             );