Merge pull request #5461 from magento-tango/Tango-PR-03-17-2020-24

Tango PR 03-17-2020 v2.4

Author: dhorytskyi

app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php

@@ -365,11 +365,6 @@ protected function isRowValidSample(array $rowData)
 
         $sampleData = $this->prepareSampleData($rowData[static::COL_DOWNLOADABLE_SAMPLES]);
 
-        if ($this->sampleGroupTitle($rowData) == '') {
-            $result = true;
-            $this->_entityModel->addRowError(self::ERROR_GROUP_TITLE_NOT_FOUND, $this->rowNum);
-        }
-
         $result = $result ?? $this->isTitle($sampleData);
 
         foreach ($sampleData as $link) {
@@ -406,11 +401,6 @@ protected function isRowValidLink(array $rowData)
 
         $linkData = $this->prepareLinkData($rowData[self::COL_DOWNLOADABLE_LINKS]);
 
-        if ($this->linksAdditionalAttributes($rowData, 'group_title', self::DEFAULT_GROUP_TITLE) == '') {
-            $this->_entityModel->addRowError(self::ERROR_GROUP_TITLE_NOT_FOUND, $this->rowNum);
-            $result = true;
-        }
-
         $result = $result ?? $this->isTitle($linkData);
 
         foreach ($linkData as $link) {

dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_link_url_and_sample_url.php

@@ -44,8 +44,6 @@
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
     ->setLinksPurchasedSeparately(true)
-    ->setLinksTitle('Links')
-    ->setSamplesTitle('Samples')
     ->setStockData(
         [
             'qty' => 100,

lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js

@@ -168,17 +168,22 @@ define([
                     /(<span class="[^"]*magento-widget[^"]*"[^>]*>)?<img([^>]+id="[^>]+)>(([^>]*)<\/span>)?/i,
                     function (match) {
                         var attributes = wysiwyg.parseAttributesString(match[2]),
-                            widgetCode;
+                            widgetCode,
+                            result = match[0];
 
                         if (attributes.id) {
-                            widgetCode = Base64.idDecode(attributes.id);
+                            try {
+                                widgetCode = Base64.idDecode(attributes.id);
+                            } catch (e) {
+                                // Ignore and continue.
+                            }
 
-                            if (widgetCode.indexOf('{{widget') !== -1) {
-                                return widgetCode;
+                            if (widgetCode && widgetCode.indexOf('{{widget') !== -1) {
+                                result = widgetCode;
                             }
                         }
 
-                        return match[0];
+                        return result;
                     }
                 );
             },