MC-40850: Not able to save downloadable product with sample link after creating a future staging update with end date from the Downloadable Product page

Author: SmVladyslav

app/code/Magento/Downloadable/Model/Sample/DeleteHandler.php

@@ -9,7 +9,7 @@
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
 /**
- * Class DeleteHandler
+ * Delete Handler for Downloadable Product Samples.
  */
 class DeleteHandler implements ExtensionInterface
 {
@@ -27,6 +27,8 @@ public function __construct(SampleRepository $sampleRepository)
     }
 
     /**
+     * Delete Downloadable Samples for the provided Entity.
+     *
      * @param object $entity
      * @param array $arguments
      * @return \Magento\Catalog\Api\Data\ProductInterface|object
@@ -42,6 +44,8 @@ public function execute($entity, $arguments = [])
         foreach ($this->sampleRepository->getList($entity->getSku()) as $sample) {
             $this->sampleRepository->delete($sample->getId());
         }
+        $entity->setDownloadableSamples(null);
+
         return $entity;
     }
 }

app/code/Magento/Downloadable/Model/Sample/ReadHandler.php

@@ -9,7 +9,7 @@
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
 /**
- * Class ReadHandler
+ * Read Handler for Downloadable Product Samples.
  */
 class ReadHandler implements ExtensionInterface
 {
@@ -27,6 +27,8 @@ public function __construct(SampleRepository $sampleRepository)
     }
 
     /**
+     * Read Downloadable Samples for the provided Entity.
+     *
      * @param object $entity
      * @param array $arguments
      * @return \Magento\Catalog\Api\Data\ProductInterface|object
@@ -40,10 +42,9 @@ public function execute($entity, $arguments = [])
         }
         $entityExtension = $entity->getExtensionAttributes();
         $samples = $this->sampleRepository->getSamplesByProduct($entity);
-        if ($samples) {
-            $entityExtension->setDownloadableProductSamples($samples);
-        }
+        $entityExtension->setDownloadableProductSamples($samples);
         $entity->setExtensionAttributes($entityExtension);
+
         return $entity;
     }
 }

app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AssertStorefrontNoSampleOnDownloadableProductPageActionGroup.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertStorefrontNoSampleOnDownloadableProductPageActionGroup">
+        <annotations>
+            <description>Validates that the provided Sample Title is NOT present on Downloadable Product details page.</description>
+        </annotations>
+        <arguments>
+            <argument name="sampleTitle" type="string" defaultValue="{{downloadableSampleUrl.title}}"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{StorefrontDownloadableProductSection.downloadableSamplesListSection}}" stepKey="waitForDownloadableSamplesList"/>
+        <dontSeeElement selector="{{StorefrontDownloadableProductSection.downloadableSampleLabel(sampleTitle)}}" stepKey="dontSeeDownloadableSample"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AssertStorefrontSampleOnDownloadableProductPageActionGroup.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertStorefrontSampleOnDownloadableProductPageActionGroup">
+        <annotations>
+            <description>Validates that the provided Sample Title is present on Downloadable Product details page.</description>
+        </annotations>
+        <arguments>
+            <argument name="sampleTitle" type="string" defaultValue="{{downloadableSampleUrl.title}}"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{StorefrontDownloadableProductSection.downloadableSamplesListSection}}" stepKey="waitForDownloadableSamplesList"/>
+        <seeElement selector="{{StorefrontDownloadableProductSection.downloadableSampleLabel(sampleTitle)}}" stepKey="seeDownloadableSample"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontDownloadableProductSection.xml

@@ -13,9 +13,10 @@
         <element name="downloadableLinkLabel" type="text" selector="//label[contains(., '{{title}}')]" parameterized="true" timeout="30"/>
         <element name="downloadableLinkByTitle" type="input" selector="//*[@id='downloadable-links-list']/*[contains(.,'{{title}}')]//input" parameterized="true" timeout="30"/>
         <element name="downloadableLinkSampleByTitle" type="text" selector="//label[contains(., '{{title}}')]/a[contains(@class, 'sample link')]" parameterized="true"/>
-        <element name="downloadableSampleLabel" type="text" selector="//a[contains(.,normalize-space('{{title}}'))]" parameterized="true" timeout="30"/>
+        <element name="downloadableSampleLabel" type="text" selector="//dd[@class='item samples-item']/a[contains(.,normalize-space('{{title}}'))]" parameterized="true" timeout="30"/>
         <element name="downloadableLinkSelectAllCheckbox" type="checkbox" selector="#links_all" />
         <element name="downloadableLinkSelectAllLabel" type="text" selector="label[for='links_all']" />
         <element name="downloadableLinksListSection" type="text" selector="#downloadable-links-list" timeout="30"/>
+        <element name="downloadableSamplesListSection" type="text" selector=".items.samples" timeout="30"/>
     </section>
 </sections>