🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #13328: Add indexes to timestamp field in oauth_nonce (by @KarlDeux)
 - #15621: fix typo for setCateroryIds (by @neeta-wagento)
 - #15645: [Resolved : Menu widget submenu alignment #7897] (by @hitesh-wagento)
 - #15615: [Backport] Removed comma(,) from translate attribute (by @dmytro-ch)
 - #15585: Fix #13415 : Duplicated elements id (by @julienanquetil)
 - #15594: Remove extra semicolon from the files (by @saurabh-aureate)
 - #15349: Resolve Knockout non-unique elements id in console error (by @neeta-wagento)


Fixed GitHub Issues:
 - #10346: Deadlock occurs using REST API & OAuth 1.0a under high concurrency  (reported by @careys7) has been fixed in #13328 by @KarlDeux in 2.2-develop branch
   Related commits:
     1. 521d11b

 - #15590: Typo in tests / setCateroryIds([]) (reported by @kmddevdani) has been fixed in #15621 by @neeta-wagento in 2.2-develop branch
   Related commits:
     1. 1d47b28

 - #7897: Menu widget submenu alignment (reported by @slackerzz) has been fixed in #15645 by @hitesh-wagento in 2.2-develop branch
   Related commits:
     1. 2694906

 - #13415: Duplicated elements id in checkout page (reported by @angelo983) has been fixed in #15585 by @julienanquetil in 2.2-develop branch
   Related commits:
     1. 2e4bd95
     2. 187c529
     3. b90d93d

 - #15348: Multiple Payment Methods Enabled is giving error in console "Found 3 Elements with non - unique Id" (reported by @neeta-wagento) has been fixed in #15349 by @neeta-wagento in 2.2-develop branch
   Related commits:
     1. 20d8e6a
     2. 3c8f6f4

Author: magento-engcom-team

app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html

@@ -9,7 +9,9 @@
     <!-- ko template: getTemplate() --><!-- /ko -->
     <!--/ko-->
     <form data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
-        <fieldset id="billing-new-address-form" class="fieldset address">
+        <fieldset
+                data-bind="attr: { id:'billing-new-address-form-'+index, value:index}"
+                class="billing-new-address-form fieldset address">
             <!-- ko foreach: getRegion('additional-fieldsets') -->
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->

app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html

@@ -12,26 +12,24 @@
     <div class="gift-options-content">
         <fieldset class="fieldset">
             <div class="field field-to">
-                <label for="gift-message-whole-to" class="label">
+                <label data-bind="attr: {for: 'gift-message-whole-to-' + index }" class="label">
                     <span data-bind="i18n: 'To:'"></span>
                 </label>
                 <div class="control">
                     <input type="text"
-                           id="gift-message-whole-to"
                            class="input-text"
-                           data-bind="value: getObservable('recipient')">
+                           data-bind="value: getObservable('recipient'), attr: { id: 'gift-message-whole-to-' + index }">
                 </div>
             </div>
 
             <div class="field field-from">
-                <label for="gift-message-whole-from" class="label">
+                <label data-bind="attr: {for: 'gift-message-whole-from-' + index }" class="label">
                     <span data-bind="i18n: 'From:'"></span>
                 </label>
                 <div class="control">
                     <input type="text"
-                           id="gift-message-whole-from"
                            class="input-text"
-                           data-bind="value: getObservable('sender')">
+                           data-bind="value: getObservable('sender'), attr: { id: 'gift-message-whole-from-' + index }">
                 </div>
             </div>
             <div class="field text">
@@ -46,7 +44,6 @@
                 </div>
             </div>
         </fieldset>
-
     </div>
 </div>
 <!-- /ko -->

app/code/Magento/Integration/Setup/UpgradeSchema.php

@@ -71,6 +71,16 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
             $setup->getConnection()->createTable($table);
         }
 
+        if (version_compare($context->getVersion(), '2.2.1', '<')) {
+            $connection = $setup->getConnection();
+
+            $connection->addIndex(
+                $setup->getTable('oauth_nonce'),
+                $setup->getIdxName('oauth_nonce', ['timestamp']),
+                ['timestamp']
+            );
+        }
+
         $setup->endSetup();
     }
 }

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

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Integration" setup_version="2.2.0">
+    <module name="Magento_Integration" setup_version="2.2.1">
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_User"/>

app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php

@@ -71,7 +71,7 @@ public function testGetOrderIdsWithEmptyIdsArray()
     public function testGetOrderIds()
     {
         $ids = [100, 102, 103];
-        $this->sessionMock->method('getOrderIds')->willReturn($ids);;
+        $this->sessionMock->method('getOrderIds')->willReturn($ids);
 
         $this->assertEquals($ids, $this->model->getOrderIds());
     }

app/code/Magento/Sales/etc/adminhtml/system.xml

@@ -106,15 +106,15 @@
                     <comment>We'll use the default error above if you leave this empty.</comment>
                 </field>
             </group>
-            <group id="dashboard" translate="label,comment" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
+            <group id="dashboard" translate="label" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Dashboard</label>
-                <field id="use_aggregated_data" translate="label" sortOrder="10" type="select" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="use_aggregated_data" translate="label comment" sortOrder="10" type="select" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Use Aggregated Data</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Improves dashboard performance but provides non-realtime data.</comment>
                 </field>
             </group>
-            <group id="orders" translate="label,comment" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
+            <group id="orders" translate="label" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Orders Cron Settings</label>
                 <field id="delete_pending_after" translate="label" type="text" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Pending Payment Order Lifetime (minutes)</label>

app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php

@@ -531,7 +531,7 @@ protected function processProductItems(
         $total->setSubtotalInclTax($subtotalInclTax);
         $total->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
         $total->setBaseSubtotalInclTax($baseSubtotalInclTax);
-        $shippingAssignment->getShipping()->getAddress()->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);;
+        $shippingAssignment->getShipping()->getAddress()->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
 
         return $this;
     }

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml

@@ -12,7 +12,7 @@
         <element name="isPaymentSection" type="text" selector="//*[@class='opc-progress-bar']/li[contains(@class, '_active') and span[contains(.,'Review &amp; Payments')]]"/>
         <element name="availablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div:nth-child(2)>div.payment-method-title.field.choice"/>
         <element name="notAvailablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div.payment-method._active>div.payment-method-title.field.choice"/>
-        <element name="billingNewAddressForm" type="text" selector="#billing-new-address-form"/>
+        <element name="billingNewAddressForm" type="text" selector=".billing-new-address-form"/>
         <element name="placeOrderDisabled" type="button" selector="#checkout-payment-method-load button.disabled"/>
         <element name="update" type="button" selector=".payment-method-billing-address .action.action-update"/>
         <element name="guestFirstName" type="input" selector=".billing-address-form input[name*='firstname']"/>

dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products.php

@@ -15,7 +15,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData(['qty' => 100, 'is_in_stock' => 1])
     ->setIsObjectNew(true)
     ->save();

dev/tests/integration/testsuite/Magento/Bundle/_files/multiple_products.php

@@ -28,7 +28,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData([
         'use_config_manage_stock' => 1,
         'qty' => 100,
@@ -59,7 +59,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData([
         'use_config_manage_stock' => 1,
         'qty' => 50,
@@ -85,7 +85,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData([
         'use_config_manage_stock' => 1,
         'qty' => 140,
@@ -116,7 +116,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData([
         'use_config_manage_stock' => 1,
         'qty' => 20,
@@ -147,7 +147,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setCateroryIds([])
+    ->setCategoryIds([])
     ->setStockData([
         'use_config_manage_stock' => 1,
         'qty' => 15,