Merge remote-tracking branch 'origin/develop' into PR_04july

Author: maxwhite-ua

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

@@ -131,7 +131,7 @@ public function getHtml()
     public function getEscapedValue($index = null)
     {
         $value = $this->getValue($index);
-        if ($value instanceof \DateTime) {
+        if ($value instanceof \DateTimeInterface) {
             return $this->dateTimeFormatter->formatObject(
                 $value,
                 $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT)

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

@@ -147,7 +147,7 @@ public function getEscapedValue($index = null)
     {
         if ($this->getColumn()->getFilterTime()) {
             $value = $this->getValue($index);
-            if ($value instanceof \DateTime) {
+            if ($value instanceof \DateTimeInterface) {
                 return $this->_localeDate->formatDateTime($value);
             }
             return $value;

app/code/Magento/Backend/Model/Auth/Session.php

@@ -168,10 +168,13 @@ public function isLoggedIn()
      */
     public function prolong()
     {
+        $lifetime = $this->_config->getValue(self::XML_PATH_SESSION_LIFETIME);
         $cookieValue = $this->cookieManager->getCookie($this->getName());
+
         if ($cookieValue) {
             $this->setUpdatedAt(time());
             $cookieMetadata = $this->cookieMetadataFactory->createPublicCookieMetadata()
+                ->setDuration($lifetime)
                 ->setPath($this->sessionConfig->getCookiePath())
                 ->setDomain($this->sessionConfig->getCookieDomain())
                 ->setSecure($this->sessionConfig->getCookieSecure())

app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php

@@ -158,12 +158,21 @@ public function testProlong()
     {
         $name = session_name();
         $cookie = 'cookie';
+        $lifetime = 900;
         $path = '/';
         $domain = 'magento2';
         $secure = true;
         $httpOnly = true;
 
+        $this->config->expects($this->once())
+            ->method('getValue')
+            ->with(\Magento\Backend\Model\Auth\Session::XML_PATH_SESSION_LIFETIME)
+            ->willReturn($lifetime);
         $cookieMetadata = $this->getMock(\Magento\Framework\Stdlib\Cookie\PublicCookieMetadata::class);
+        $cookieMetadata->expects($this->once())
+            ->method('setDuration')
+            ->with($lifetime)
+            ->will($this->returnSelf());
         $cookieMetadata->expects($this->once())
             ->method('setPath')
             ->with($path)

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

@@ -108,7 +108,7 @@
         <section id="dev" translate="label" type="text" sortOrder="920" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Developer</label>
             <tab>advanced</tab>
-            <resource>Magento_Backend::dev</resource>
+            <resource>Magento_Config::dev</resource>
             <group id="debug" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Debug</label>
                 <field id="template_hints_storefront" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -408,7 +408,7 @@
         <section id="web" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Web</label>
             <tab>general</tab>
-            <resource>Magento_Backend::web</resource>
+            <resource>Magento_Config::web</resource>
             <group id="url" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Url Options</label>
                 <field id="use_store" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php

@@ -518,7 +518,7 @@ protected function getOptionInfo()
                                 'dataType' => Form\Element\DataType\Text::NAME,
                                 'formElement' => Form\Element\Select::NAME,
                                 'componentType' => Form\Field::NAME,
-                                'component' => 'Magento_Bundle/js/components/bundle-input-type',
+                                'component' => 'Magento_Ui/js/form/element/select',
                                 'parentContainer' => 'product_bundle_container',
                                 'selections' => 'bundle_selections',
                                 'isDefaultIndex' => 'is_default',
@@ -594,8 +594,11 @@ protected function getBundleSelections()
                     'config' => [
                         'componentType' => Container::NAME,
                         'isTemplate' => true,
-                        'component' => 'Magento_Ui/js/dynamic-rows/record',
-                        'is_collection' => true
+                        'component' => 'Magento_Bundle/js/components/bundle-record',
+                        'is_collection' => true,
+                        'imports' => [
+                            'onTypeChanged' => '${ $.provider }:${ $.bundleOptionsDataScope }.type'
+                        ]
                     ],
                 ],
             ],

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-checkbox.js

@@ -58,6 +58,10 @@ define([
 
             this.prefer = typeMap[type];
             this.elementTmpl(this.templates[typeMap[type]]);
+
+            if (this.prefer === 'radio' && this.checked()) {
+                this.clearValues();
+            }
         },
 
         /**

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows-grid.js

@@ -29,6 +29,7 @@ define([
                 recordIndex;
 
             this.parsePagesData(data);
+            this.templates.record.bundleOptionsDataScope = this.dataScope;
 
             if (newData.length) {
                 if (this.insertData().length) {

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-input-type.js

@@ -3,6 +3,11 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @deprecated Not used anymore
+ * @see Magento_Bundle/js/components/bundle-record
+ * @see Magento_Bundle/js/components/bundle-checkbox
+ */
 define([
     'Magento_Ui/js/form/element/select',
     'uiRegistry'

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-record.js

@@ -0,0 +1,23 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'Magento_Ui/js/dynamic-rows/record',
+    'uiRegistry'
+], function (Record, registry) {
+    'use strict';
+
+    return Record.extend({
+        /**
+         * @param {String} val - type of Input Type
+         */
+        onTypeChanged: function (val) {
+            var columnVisibility  = !(val === 'multi' || val === 'checkbox');
+
+            registry.async(this.name + '.' + 'selection_can_change_qty')(function (elem) {
+                elem.visible(columnVisibility);
+            });
+        }
+    });
+});