MC-30963: [Magento Cloud] CMS blocks with identical identifiers

Author: nikita-shcherbatykh

app/code/Magento/Cms/Model/ResourceModel/Block.php

@@ -185,13 +185,9 @@ public function getIsUniqueBlockToStores(AbstractModel $object)
         $entityMetadata = $this->metadataPool->getMetadata(BlockInterface::class);
         $linkField = $entityMetadata->getLinkField();
 
-        $stores = (array)$object->getData('store_id');
-        $isDefaultStore = $this->_storeManager->isSingleStoreMode()
-            || array_search(Store::DEFAULT_STORE_ID, $stores) !== false;
-
-        if (!$isDefaultStore) {
-            $stores[] = Store::DEFAULT_STORE_ID;
-        }
+        $stores = $this->_storeManager->isSingleStoreMode()
+            ? [Store::DEFAULT_STORE_ID]
+            : (array)$object->getData('store_id');
 
         $select = $this->getConnection()->select()
             ->from(['cb' => $this->getMainTable()])
@@ -200,11 +196,8 @@ public function getIsUniqueBlockToStores(AbstractModel $object)
                 'cb.' . $linkField . ' = cbs.' . $linkField,
                 []
             )
-            ->where('cb.identifier = ?  ', $object->getData('identifier'));
-
-        if (!$isDefaultStore) {
-            $select->where('cbs.store_id IN (?)', $stores);
-        }
+            ->where('cb.identifier = ?  ', $object->getData('identifier'))
+            ->where('cbs.store_id IN (?)', $stores);
 
         if ($object->getId()) {
             $select->where('cb.' . $entityMetadata->getIdentifierField() . ' <> ?', $object->getId());

app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml

@@ -56,12 +56,23 @@
         <seeInCurrentUrl url="cms/block/new" stepKey="VerifyNewBlockPageIsOpened1"/>
         <!--Add new BLock with the same data-->
         <actionGroup ref="FillOutBlockContent" stepKey="FillOutBlockContent1"/>
-        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="Default Store View" stepKey="selectDefaultStoreView" />
-        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="{{customStore.name}}" stepKey="selectSecondStoreView1" />
         <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="ClickToSaveBlock1"/>
         <waitForPageLoad stepKey="waitForPageLoad6"/>
         <!--Verify that corresponding message is displayed-->
         <see userInput="A block identifier with the same properties already exists in the selected store." stepKey="VerifyBlockIsSaved1"/>
+        <!--Click to go back and add new block-->
+        <click selector="{{BlockNewPagePageActionsSection.back}}" stepKey="ClickToGoBack1"/>
+        <waitForPageLoad stepKey="waitForPageLoad7"/>
+        <click selector="{{BlockPageActionsSection.addNewBlock}}" stepKey="ClickToAddNewBlock2"/>
+        <waitForPageLoad stepKey="waitForPageLoad8"/>
+        <seeInCurrentUrl url="cms/block/new" stepKey="VerifyNewBlockPageIsOpened2"/>
+        <!--Add new BLock with the same data for another store view-->
+        <actionGroup ref="FillOutBlockContent" stepKey="FillOutBlockContent2"/>
+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="Default Store View" stepKey="selectDefaultStoreView" />
+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="{{customStore.name}}" stepKey="selectSecondStoreView1" />
+        <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="ClickToSaveBlock2"/>
+        <waitForPageLoad stepKey="waitForPageLoad9"/>
+        <see userInput="You saved the block." stepKey="VerifyBlockIsSaved2"/>
 
         <after>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">