Merge branch 'ASI-1780' of github.com:Nazar65/magento2 into asi-delivery-24

Author: sivaschenko

app/code/Magento/Catalog/view/adminhtml/web/js/components/product-ui-select.js

@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @deprecated see Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
+ */
 define([
     'Magento_Ui/js/form/element/ui-select',
     'jquery',

app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Product/GetSelected.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryCatalogUi\Controller\Adminhtml\Product;
+
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Backend\App\Action\Context;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Backend\App\Action;
+
+/**
+ * Returns selected product by product id. for ui-select filter
+ */
+class GetSelected extends Action implements HttpGetActionInterface
+{
+    /**
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Catalog::products';
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     *  GetSelected constructor.
+     *
+     * @param JsonFactory $jsonFactory
+     * @param ProductRepositoryInterface $productRepository
+     * @param Context $context
+     */
+    public function __construct(
+        JsonFactory $jsonFactory,
+        ProductRepositoryInterface $productRepository,
+        Context $context
+    ) {
+        $this->resultJsonFactory = $jsonFactory;
+        $this->productRepository = $productRepository;
+        parent::__construct($context);
+    }
+
+    /**
+     * Return selected products options
+     *
+     * @return ResultInterface
+     */
+    public function execute() : ResultInterface
+    {
+        $productIds = $this->getRequest()->getParam('ids');
+        $options = [];
+
+        if (!is_array($productIds)) {
+            return $this->resultJsonFactory->create()->setData('parameter ids must be type of array');
+        }
+        foreach ($productIds as $id) {
+            try {
+                $product = $this->productRepository->getById($id);
+                $options[] = [
+                    'value' => $product->getId(),
+                    'label' => $product->getName(),
+                    'is_active' => $product->getSatus(),
+                    'path' => $product->getSku()
+                ];
+            } catch (\Exception $e) {
+                continue;
+            }
+        }
+
+        return $this->resultJsonFactory->create()->setData($options);
+    }
+}

app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php

@@ -58,7 +58,7 @@
                 provider="${ $.parentName }"
                 sortOrder="10"
                 class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Asset"
-                component="Magento_Ui/js/form/element/ui-select"
+                component="Magento_Ui/js/grid/filters/elements/ui-select"
                 template="Magento_MediaGalleryUi/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -74,6 +74,7 @@
                         <item name="filterRateLimitMethod" xsi:type="string" translate="true">notifyWhenChangesStop</item>
                         <item name="searchOptions" xsi:type="boolean">true</item>
                         <item name="searchUrl" xsi:type="url" path="media_gallery/asset/search" />
+                        <item name="validationUrl" xsi:type="url" path="media_gallery/asset/getSelected"/>
                         <item name="levelsVisibility" xsi:type="number">1</item>
                     </item>
                 </argument>

app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml

@@ -13,8 +13,7 @@
                     name="product_id"
                     provider="${ $.parentName }"
                     sortOrder="110"
-                    class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Filters\UsedInProducts"
-                    component="Magento_Catalog/js/components/product-ui-select"
+                    component="Magento_Ui/js/grid/filters/elements/ui-select"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -30,7 +29,7 @@
                         <item name="filterRateLimitMethod" xsi:type="string">notifyWhenChangesStop</item>
                         <item name="levelsVisibility" xsi:type="number">1</item>
                         <item name="searchUrl" xsi:type="url" path="catalog/product/search"/>
-                        <item name="validationUrl" xsi:type="url" path="catalog/product/getSelected"/>
+                        <item name="validationUrl" xsi:type="url" path="media_gallery_catalog/product/getSelected"/>
                     </item>
                 </argument>
                 <settings>

app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml

@@ -13,8 +13,7 @@
                     name="product_id"
                     provider="${ $.parentName }"
                     sortOrder="110"
-                    class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Filters\UsedInProducts"
-                    component="Magento_Catalog/js/components/product-ui-select"
+                    component="Magento_Ui/js/grid/filters/elements/ui-select"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -30,7 +29,7 @@
                         <item name="filterRateLimitMethod" xsi:type="string">notifyWhenChangesStop</item>
                         <item name="levelsVisibility" xsi:type="number">1</item>
                         <item name="searchUrl" xsi:type="url" path="catalog/product/search"/>
-                        <item name="validationUrl" xsi:type="url" path="catalog/product/getSelected"/>
+                        <item name="validationUrl" xsi:type="url" path="media_gallery_catalog/product/getSelected"/>
                     </item>
                 </argument>
                 <settings>

app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml

@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryCmsUi\Controller\Adminhtml\Block;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\ResultInterface;
+
+/**
+ * Controller to get selected block for ui-select component
+ */
+class GetSelected extends Action implements HttpGetActionInterface
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Cms::block';
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var BlockRepositoryInterface
+     */
+    private $blockRepository;
+
+    /**
+     * @param JsonFactory $resultFactory
+     * @param BlockRepositoryInterface $blockRepository
+     * @param Context $context
+     */
+    public function __construct(
+        JsonFactory $resultFactory,
+        BlockRepositoryInterface $blockRepository,
+        Context $context
+    ) {
+        $this->resultJsonFactory = $resultFactory;
+        $this->blockRepository = $blockRepository;
+        parent::__construct($context);
+    }
+
+    /**
+     * Return selected blocks options.
+     *
+     * @return ResultInterface
+     */
+    public function execute(): ResultInterface
+    {
+        $options = [];
+        $blockIds = $this->getRequest()->getParam('ids');
+
+        if (!is_array($blockIds)) {
+            return $this->resultJsonFactory->create()->setData('parameter ids must be type of array');
+        }
+        foreach ($blockIds as $id) {
+            try {
+                $block = $this->blockRepository->getById($id);
+                $options[] = [
+                    'value' => $block->getId(),
+                    'label' => $block->getTitle(),
+                    'is_active' => $block->isActive(),
+                    'optgroup' => false
+                ];
+            } catch (\Exception $e) {
+                continue;
+            }
+        }
+
+        return $this->resultJsonFactory->create()->setData($options);
+    }
+}