Merge pull request #9422 from magento-gl/spartans_pr_11122024

[Spartans] Bugfixes Delivery

Author: glo71317

app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 -->
 <listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
@@ -16,5 +16,10 @@
                 <label translate="true">Theme Name</label>
             </settings>
         </column>
+        <column name="short_description" sortOrder="45">
+            <settings>
+                <label translate="true">Short Description</label>
+            </settings>
+        </column>
     </columns>
 </listing>

app/code/Magento/Catalog/Model/Product/Option/Type/Select.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Catalog\Model\Product\Option\Type;
@@ -70,6 +70,7 @@ public function __construct(
      * @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
      * @return $this
      * @throws LocalizedException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function validateUserValue($values)
     {
@@ -92,6 +93,8 @@ public function validateUserValue($values)
             if (!$this->_isSingleSelection()) {
                 if (is_string($value)) {
                     $value = explode(',', $value);
+                } elseif (!is_array($value)) {
+                    $value = [$value];
                 }
                 $valuesCollection = $option->getOptionValuesByOptionId($value, $this->getProduct()->getStoreId());
                 $valueCount = is_array($value) ? count($value) : 0;

app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js

@@ -59,13 +59,6 @@ define([
             this.exports.value = this.provider + ':' + this.exportDataLink;
         },
 
-        /** @inheritdoc */
-        destroy: function () {
-            this._super();
-
-            this.source.remove(this.exportDataLink);
-        },
-
         /**
          * Get HTML array from data scope.
          *

app/code/Magento/Theme/Ui/Component/Design/Config/DataProvider.php

@@ -1,14 +1,16 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Theme\Ui\Component\Design\Config;
 
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\ReportingInterface;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -25,6 +27,11 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
      */
     protected $storeManager;
 
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
     /**
      * @param string $name
      * @param string $primaryFieldName
@@ -36,6 +43,7 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
      * @param StoreManagerInterface $storeManager
      * @param array $meta
      * @param array $data
+     * @param ResourceConnection|null $resourceConnection
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -48,7 +56,8 @@ public function __construct(
         FilterBuilder $filterBuilder,
         StoreManagerInterface $storeManager,
         array $meta = [],
-        array $data = []
+        array $data = [],
+        ResourceConnection $resourceConnection = null
     ) {
         parent::__construct(
             $name,
@@ -62,6 +71,7 @@ public function __construct(
             $data
         );
         $this->storeManager = $storeManager;
+        $this->resourceConnection = $resourceConnection ?: ObjectManager::getInstance()->get(ResourceConnection::class);
     }
 
     /**
@@ -87,11 +97,38 @@ public function getData()
                     ->create()
             );
         }
+
+        $themeConfigData = $this->getCoreConfigData();
         $data = parent::getData();
         foreach ($data['items'] as & $item) {
             $item += ['default' => __('Global')];
+
+            $scope = ($item['store_id']) ? 'stores' : (($item['store_website_id']) ? 'websites' : 'default');
+            $scopeId = (int) $item['store_website_id'] ?? 0;
+            $themeId = (int) $item['theme_theme_id'] ?? 0;
+
+            $criteria = ['scope' => $scope, 'scope_id' => $scopeId, 'value' => $themeId];
+            $configData = array_filter($themeConfigData, function ($themeConfig) use ($criteria) {
+                return array_intersect_assoc($criteria, $themeConfig) === $criteria;
+            });
+
+            $item += ['short_description' => !$configData ? __('Using Default Theme') : ''];
         }
 
         return $data;
     }
+
+    /**
+     * Get the core config data related to theme
+     *
+     * @return array
+     */
+    private function getCoreConfigData(): array
+    {
+        $connection = $this->resourceConnection->getConnection();
+        return $connection->fetchAll(
+            $connection->select()->from($connection->getTableName('core_config_data'))
+                ->where('path = ?', 'design/theme/theme_id')
+        );
+    }
 }

app/code/Magento/Theme/i18n/en_US.csv

@@ -193,3 +193,4 @@ ID,ID
 View,View
 Action,Action
 "Display Report Bugs Link","Display Report Bugs Link"
+"Using Default Theme","Using Default Theme"

composer.json

@@ -22,6 +22,7 @@
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-dom": "*",
+        "ext-ftp": "*",
         "ext-gd": "*",
         "ext-hash": "*",
         "ext-iconv": "*",

lib/internal/Magento/Framework/composer.json

@@ -14,6 +14,7 @@
         "ext-bcmath": "*",
         "ext-curl": "*",
         "ext-dom": "*",
+        "ext-ftp": "*",
         "ext-gd": "*",
         "ext-hash": "*",
         "ext-iconv": "*",

package.json.sample

@@ -20,7 +20,7 @@
     "grunt-contrib-jasmine": "~4.0.0",
     "grunt-contrib-less": "~3.0.0",
     "grunt-contrib-watch": "~1.1.0",
-    "grunt-eslint": "~25.0.0",
+    "grunt-eslint": "~24.3.0",
     "grunt-exec": "~3.0.0",
     "grunt-replace": "~2.0.2",
     "grunt-styledocco": "~0.3.0",