MAGETWO-89670: Introduce Product Link type

- fix after review

Author: irenelagno

app/code/Magento/Catalog/Controller/Adminhtml/Product/Search.php

@@ -76,6 +76,7 @@ public function execute() : \Magento\Framework\Controller\ResultInterface
         $productCollection = $this->productCollectionFactory->create();
         $productCollection->addAttributeToSelect(ProductInterface::NAME);
         $productCollection->setVisibility($this->catalogVisibility->getVisibleInCatalogIds());
+        $productCollection->setPage($pageNum, $limit);
         $this->addFilter($productCollection, 'fulltext', $searchKey);
         $totalVaues = $productCollection->getSize();
         $productCollection->setPage($pageNum, $limit);

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

@@ -12,23 +12,20 @@ define([
 
     return Select.extend({
         defaults: {
-            validationUrl: false
+            validationUrl: false,
+            loadedOption: [],
+            validationLoading: true
         },
 
-        /**
-         * Get selected element labels
-         *
-         * @returns {Array} array labels
-         */
-        getSelected: function () {
-            var options = this._super();
+        /** @inheritdoc */
+        initialize: function () {
+            this._super();
 
-            if (this.validationUrl && _.isEmpty(options)) {
+            if (this.value()) {
                 $.ajax({
                     url: this.validationUrl,
                     type: 'GET',
                     dataType: 'json',
-                    async: false,
                     context: this,
                     data: {
                         productId: this.value()
@@ -37,15 +34,35 @@ define([
                     /** @param {Object} response */
                     success: function (response) {
                         if (!_.isEmpty(response)) {
-                            options = [response];
+                            this.options([response]);
+                            this.loadedOption = response;
                         }
                     },
 
                     /** set empty array if error occurs */
                     error: function () {
-                        options = [];
+                        this.options([]);
+                    },
+
+                    /** stop loader */
+                    complete: function () {
+                        this.validationLoading(false);
+                        this.setCaption();
                     }
                 });
+            } else {
+                this.validationLoading(false);
+            }
+
+            return this;
+        },
+
+        /** @inheritdoc */
+        getSelected: function () {
+            var options = this._super();
+
+            if (!_.isEmpty(this.loadedOption)) {
+                return this.value() === this.loadedOption.value ? [this.loadedOption] : options;
             }
 
             return options;

app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_href.phtml

@@ -6,5 +6,6 @@
 
 // @codingStandardsIgnoreFile
 /** @var Magento\Catalog\Block\Widget\Link $block */
+// @codingStandardsIgnoreFile
 ?>
 <?= $block->escapeHtml($block->getHref()) ?>

app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js

@@ -175,6 +175,7 @@ define([
             cachedSearchResults: {},
             pageLimit: 50,
             deviation: 30,
+            validationLoading: false,
             isRemoveSelectedIcon: true,
             missingValuePlaceholder: $t('Entity with ID: %s doesn\'t exist'),
             isDisplayMissingValuePlaceholder: false,
@@ -322,7 +323,9 @@ define([
                 'itemsQuantity',
                 'filterInputValue',
                 'filterOptionsFocus',
-                'loading'
+                'loading',
+                'validationLoading',
+                'isDisplayMissingValuePlaceholder'
             ]);
 
             this.filterInputValue.extend({

app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html

@@ -42,21 +42,30 @@
             }
     ">
         <div class="admin__action-multiselect-text"
-             data-role="selected-option"
-             data-bind="
-             css: {warning: warn().length},
-             text: setCaption()
-        ">
+         data-role="selected-option"
+         ifnot="validationLoading"
+         data-bind="
+         css: {warning: warn().length},
+         text: setCaption()
+    ">
+    </div>
+        <button if="isRemoveSelectedIcon && hasData() || !validationLoading"
+                class="action-close"
+                type="button"
+                data-action="remove-selected-item"
+                tabindex="-1"
+                click="clear"
+        >
+            <span class="action-close-text" translate="'Close'"></span>
+        </button>
+        <div data-role="spinner"
+             class="admin__data-grid-loading-mask"
+             visible="validationLoading"
+             if="validationLoading">
+            <div class="spinner">
+                <span repeat="8"/>
+            </div>
         </div>
-            <button if="isRemoveSelectedIcon && hasData()"
-                    class="action-close"
-                    type="button"
-                    data-action="remove-selected-item"
-                    tabindex="-1"
-                    click="clear"
-            >
-                <span class="action-close-text" translate="'Close'"></span>
-            </button>
     </div>
     <!-- /ko -->
     <!-- ko if: chipsEnabled -->