Merge remote-tracking branch 'origin/AC-13054' into spartans_pr_11122024

Author: glo60612

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 2024 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/Theme/Ui/Component/Design/Config/DataProvider.php

@@ -1,14 +1,15 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 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\RequestInterface;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -25,6 +26,11 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
      */
     protected $storeManager;
 
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
     /**
      * @param string $name
      * @param string $primaryFieldName
@@ -34,6 +40,7 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
      * @param RequestInterface $request
      * @param FilterBuilder $filterBuilder
      * @param StoreManagerInterface $storeManager
+     * @param ResourceConnection $resourceConnection
      * @param array $meta
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -47,6 +54,7 @@ public function __construct(
         RequestInterface $request,
         FilterBuilder $filterBuilder,
         StoreManagerInterface $storeManager,
+        ResourceConnection $resourceConnection,
         array $meta = [],
         array $data = []
     ) {
@@ -62,6 +70,7 @@ public function __construct(
             $data
         );
         $this->storeManager = $storeManager;
+        $this->resourceConnection = $resourceConnection;
     }
 
     /**
@@ -87,11 +96,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"