Merge branch '2.3.3-develop' of github.com:magento/magento2ce into MC-18721

Author: nathanjosiah

app/code/Magento/Catalog/Model/ProductLink/Search.php

@@ -10,7 +10,9 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 
-/** Returns collection of product visible in catalog by search key */
+/**
+ * Returns collection of product visible in catalog by search key
+ */
 class Search
 {
     /**
@@ -58,7 +60,6 @@ public function prepareCollection(
     ): \Magento\Catalog\Model\ResourceModel\Product\Collection {
         $productCollection = $this->productCollectionFactory->create();
         $productCollection->addAttributeToSelect(ProductInterface::NAME);
-        $productCollection->setVisibility($this->catalogVisibility->getVisibleInCatalogIds());
         $productCollection->setPage($pageNum, $limit);
         $this->filter->addFilter($productCollection, 'fulltext', ['fulltext' => $searchKey]);
         $productCollection->setPage($pageNum, $limit);

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php

@@ -78,11 +78,20 @@ public function getOptions()
                 \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection::SORT_ORDER_ASC
             );
 
-        return $collection->getData();
+        $collectionData = $collection->getData() ?? [];
+
+        array_walk(
+            $collectionData,
+            function (&$attribute) {
+                $attribute['__disableTmpl'] = true;
+            }
+        );
+
+        return $collectionData;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -116,17 +125,20 @@ public function modifyMeta(array $meta)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyData(array $data)
     {
-        return array_replace_recursive($data, [
-            $this->locator->getProduct()->getId() => [
-                self::DATA_SOURCE_DEFAULT => [
-                    'attribute_set_id' => $this->locator->getProduct()->getAttributeSetId()
-                ],
+        return array_replace_recursive(
+            $data,
+            [
+                $this->locator->getProduct()->getId() => [
+                    self::DATA_SOURCE_DEFAULT => [
+                        'attribute_set_id' => $this->locator->getProduct()->getAttributeSetId()
+                    ],
+                ]
             ]
-        ]);
+        );
     }
 }

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/SearchTest.php

@@ -38,7 +38,8 @@ public function testExecuteNonExistingSearchKey() : void
             ->setPostValue('limit', 50);
         $this->dispatch('backend/catalog/product/search');
         $responseBody = $this->getResponse()->getBody();
-        $this->assertContains('{"options":[],"total":0}', $responseBody);
+        $jsonResponse = json_decode($responseBody, true);
+        $this->assertEmpty($jsonResponse['options']);
     }
 
     /**
@@ -57,6 +58,24 @@ public function testExecuteNotVisibleIndividuallyProducts() : void
             ->setPostValue('limit', 50);
         $this->dispatch('backend/catalog/product/search');
         $responseBody = $this->getResponse()->getBody();
-        $this->assertContains('{"options":[],"total":0}', $responseBody);
+        $jsonResponse = json_decode($responseBody, true);
+        $this->assertEquals(1, $jsonResponse['total']);
+        $this->assertCount(1, $jsonResponse['options']);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/multiple_mixed_products.php
+     */
+    public function testExecuteEnabledAndDisabledProducts() : void
+    {
+        $this->getRequest()
+            ->setPostValue('searchKey', 'simple')
+            ->setPostValue('page', 1)
+            ->setPostValue('limit', 50);
+        $this->dispatch('backend/catalog/product/search');
+        $responseBody = $this->getResponse()->getBody();
+        $jsonResponse = json_decode($responseBody, true);
+        $this->assertEquals(7, $jsonResponse['total']);
+        $this->assertCount(7, $jsonResponse['options']);
     }
 }