🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #14183: [Forwardport] Fix product attribute ordering when more than 10 attributes (by @rostyslav-hymon)
 - #14179: [Forwardport] Fix for Issue-13556 - Sorting in Product Listing via Quantity not work (by @dimonovp)
 - #14182: [Forwardport] Fix faulty admin spinner animation (by @dimonovp)
 - #14180: [Forwardport] Act better on existing input focus instead of removing it (by @mastiuhin-olexandr)
 - #14178: [Forwardport] Minicart should require dropdownDialog (by @rostyslav-hymon)
 - #14177: [Forwardport] Default Welcome message is broken on storefront with enabled translate-inline (by @dimonovp)
 - #14174: [Forwardport] Solved this issue : Drop down values are not showing in catalog produ� (by @dimonovp)
 - #14165: [Forwardport 2.3] Added mage/translate component to customers's ajax login (by @ccasciotti)
 - #13885: #5463 - Use specified hashing algo in \Magento\Framework\Encryption\Encryptor::getHash (by @k4emic)
 - #14158: Improve Customer GraphQL Model code quality (by @elzekool)


Fixed GitHub Issues:
 - #13556: Sorting in Product Listing via Quantity not work (reported by @LordHansolo) has been fixed in #14179 by @dimonovp in 2.3-develop branch
   Related commits:
     1. ce6dd85
     2. a6dc79a
     3. bcb553c
     4. 551fa25

 - #13988: Mini search field looses focus after its JavaScript is initialized (reported by @krzksz) has been fixed in #14180 by @mastiuhin-olexandr in 2.3-develop branch
   Related commits:
     1. 2f624a4

 - #12711: Default Welcome message is broken on storefront with enabled translate-inline (reported by @alena-marchenko) has been fixed in #14177 by @dimonovp in 2.3-develop branch
   Related commits:
     1. 4147b53
     2. 0610449
     3. 5367c47

 - #13006: Drop down values are not showing in catalog product grid magento2 (reported by @ramusadwika) has been fixed in #14174 by @dimonovp in 2.3-develop branch
   Related commits:
     1. 80887ac

 - #5463: The ability to store passwords using different hashing algorithms is limited (reported by @maderlock) has been fixed in #13885 by @k4emic in 2.3-develop branch
   Related commits:
     1. d537d56

Author: magento-engcom-team

app/code/Magento/CatalogInventory/Model/Source/Stock.php

@@ -26,4 +26,23 @@ public function getAllOptions()
             ['value' => \Magento\CatalogInventory\Model\Stock::STOCK_OUT_OF_STOCK, 'label' => __('Out of Stock')]
         ];
     }
+
+    /**
+     * Add Value Sort To Collection Select.
+     *
+     * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
+     * @param string $dir
+     *
+     * @return $this
+     */
+    public function addValueSortToCollection($collection, $dir = \Magento\Framework\Data\Collection::SORT_ORDER_DESC)
+    {
+        $collection->getSelect()->joinLeft(
+            ['stock_item_table' => 'cataloginventory_stock_item'],
+            "e.entity_id=stock_item_table.product_id",
+            []
+        );
+        $collection->getSelect()->order("stock_item_table.qty $dir");
+        return $this;
+    }
 }

app/code/Magento/CatalogInventory/Test/Unit/Model/Source/StockTest.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Test\Unit\Model\Source;
+
+use PHPUnit\Framework\TestCase;
+
+class StockTest extends TestCase
+{
+    /**
+     * @var \Magento\CatalogInventory\Model\Source\Stock
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new \Magento\CatalogInventory\Model\Source\Stock();
+    }
+
+    public function testAddValueSortToCollection()
+    {
+        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $collectionMock = $this->createMock(\Magento\Eav\Model\Entity\Collection\AbstractCollection::class);
+        $collectionMock->expects($this->atLeastOnce())->method('getSelect')->willReturn($selectMock);
+
+        $selectMock->expects($this->once())
+            ->method('joinLeft')
+            ->with(
+                ['stock_item_table' => 'cataloginventory_stock_item'],
+                "e.entity_id=stock_item_table.product_id",
+                []
+            )
+            ->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('order')
+            ->with("stock_item_table.qty DESC")
+            ->willReturnSelf();
+
+        $this->model->addValueSortToCollection($collectionMock);
+    }
+}

app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js

@@ -10,7 +10,8 @@ define([
     'ko',
     'underscore',
     'sidebar',
-    'mage/translate'
+    'mage/translate',
+    'mage/dropdown'
 ], function (Component, customerData, $, ko, _) {
     'use strict';
 

app/code/Magento/Customer/view/frontend/web/js/action/login.js

@@ -7,8 +7,9 @@ define([
     'jquery',
     'mage/storage',
     'Magento_Ui/js/model/messageList',
-    'Magento_Customer/js/customer-data'
-], function ($, storage, globalMessageList, customerData) {
+    'Magento_Customer/js/customer-data',
+    'mage/translate'
+], function ($, storage, globalMessageList, customerData, $t) {
     'use strict';
 
     var callbacks = [],
@@ -48,7 +49,7 @@ define([
                 }
             }).fail(function () {
                 messageContainer.addErrorMessage({
-                    'message': 'Could not authenticate. Please try again later'
+                    'message': $t('Could not authenticate. Please try again later')
                 });
                 callbacks.forEach(function (callback) {
                     callback(loginData);

app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php

@@ -6,11 +6,12 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\CustomerGraphQl\Model\Resolver\Customer\CustomerDataProvider;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\GraphQl\Model\ResolverInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\GraphQl\Model\ResolverContextInterface;
 
 /**
@@ -24,10 +25,10 @@ class Customer implements ResolverInterface
     private $customerResolver;
 
     /**
-     * @param \Magento\CustomerGraphQl\Model\Resolver\Customer\CustomerDataProvider $customerResolver
+     * @param CustomerDataProvider $customerResolver
      */
     public function __construct(
-        \Magento\CustomerGraphQl\Model\Resolver\Customer\CustomerDataProvider $customerResolver
+        CustomerDataProvider $customerResolver
     ) {
         $this->customerResolver = $customerResolver;
     }
@@ -37,7 +38,7 @@ public function __construct(
      */
     public function resolve(array $args, ResolverContextInterface $context)
     {
-        if ((!$context->getUserId()) || $context->getUserType() == 4) {
+        if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
             throw new GraphQlAuthorizationException(
                 __(
                     'Current customer does not have access to the resource "%1"',

app/code/Magento/CustomerGraphQl/composer.json

@@ -6,6 +6,7 @@
   "require": {
     "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
     "magento/module-customer": "100.2.*",
+    "magento/module-authorization": "100.3.*",
     "magento/module-graph-ql": "100.0.*",
     "magento/framework": "100.3.*"
   },

app/code/Magento/CustomerGraphQl/etc/module.xml

@@ -9,6 +9,7 @@
     <module name="Magento_CustomerGraphQl" >
         <sequence>
             <module name="Magento_Customer"/>
+            <module name="Magento_Authorization"/>
             <module name="Magento_GraphQl"/>
         </sequence>
     </module>

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php

@@ -44,8 +44,8 @@ public function addOptionValueToCollection($collection, $attribute, $valueExpr)
         );
         $valueExpr = $connection->getCheckSql(
             "{$optionTable2}.value_id IS NULL",
-            "{$optionTable1}.value",
-            "{$optionTable2}.value"
+            "{$optionTable1}.option_id",
+            "{$optionTable2}.option_id"
         );
 
         $collection->getSelect()->joinLeft(

app/code/Magento/Search/view/frontend/web/form-mini.js

@@ -98,7 +98,9 @@ define([
                 }, this), 250);
             }, this));
 
-            this.element.trigger('blur');
+            if (this.element.get(0) === document.activeElement) {
+                this.setActiveState(true);
+            }
 
             this.element.on('focus', this.setActiveState.bind(this, true));
             this.element.on('keydown', this._onKeyDown);

app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js

@@ -312,7 +312,7 @@ define([
          */
         _sortAttributes: function () {
             this.options.jsonConfig.attributes = _.sortBy(this.options.jsonConfig.attributes, function (attribute) {
-                return attribute.position;
+                return parseInt(attribute.position, 10);
             });
         },