Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-48223

Author: shiftedreality

app/code/Magento/Catalog/Model/Category/DataProvider.php

@@ -384,9 +384,11 @@ public function getDefaultMetaData($result)
         $result['use_config.default_sort_by']['default'] = true;
         $result['use_config.filter_price_range']['default'] = true;
         if ($this->request->getParam('store') && $this->request->getParam('id')) {
+            $result['use_default.url_key']['checked'] = true;
             $result['use_default.url_key']['default'] = true;
             $result['use_default.url_key']['visible'] = true;
         } else {
+            $result['use_default.url_key']['checked'] = false;
             $result['use_default.url_key']['default'] = false;
             $result['use_default.url_key']['visible'] = false;
         }

app/code/Magento/Catalog/view/adminhtml/web/js/components/url-key-handle-changes.js

@@ -4,35 +4,36 @@
  */
 
 define([
-    'Magento_Ui/js/form/element/abstract'
-], function (Abstract) {
+    'Magento_Ui/js/form/element/single-checkbox'
+], function (Checkbox) {
     'use strict';
 
-    return Abstract.extend({
+    return Checkbox.extend({
+        defaults: {
+            imports: {
+                handleUseDefault: '${ $.parentName }.use_default.url_key:checked',
+                urlKey: '${ $.provider }:data.url_key'
+            },
+            listens: {
+                urlKey: 'handleChanges'
+            },
+            modules: {
+                useDefault: '${ $.parentName }.use_default.url_key'
+            }
+        },
 
         /**
-         * Disable checkbox field, when 'url_key' field without changes
+         * Disable checkbox field, when 'url_key' field without changes or 'use default' field is checked
          */
         handleChanges: function (newValue) {
-            if (newValue !== this.getInitialValue()) {
-                this.disabled(false);
-            } else {
-                this.disabled(true);
-            }
+            this.disabled(newValue === this.valueMap['true'] || this.useDefault.checked);
         },
 
         /**
-         * Set real 'url_key' to 'url_key_create_redirect' when field is checked
+         * Disable checkbox field, when 'url_key' field without changes or 'use default' field is checked
          */
-        onUpdate: function () {
-            this._super();
-
-            if (this.value()) {
-                this.value(this.initialValue);
-            } else {
-                this.value(0);
-            }
-            this._super();
+        handleUseDefault: function (checkedUseDefault) {
+            this.disabled(this.urlKey === this.valueMap['true'] || checkedUseDefault);
         }
     });
 });

app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php

@@ -25,15 +25,14 @@ public function afterGetAttributesMeta(
         if (isset($result['url_key'])) {
             if ($category && $category->getId()) {
                 if ($category->getLevel() == 1) {
-                    $result['url_key']['arguments']['data']['config']['visible'] = false;
-                    $result['url_key_create_redirect']['arguments']['data']['config']['visible'] = false;
-                    $result['url_key_group']['arguments']['data']['disabled'] = true;
+                    $result['url_key_group']['componentDisabled'] = true;
                 } else {
-                    $result['url_key_create_redirect']['arguments']['data']['config']['value'] = $category->getUrlKey();
-                    $result['url_key_create_redirect']['arguments']['data']['config']['disabled'] = true;
+                    $result['url_key_create_redirect']['valueMap']['true'] = $category->getUrlKey();
+                    $result['url_key_create_redirect']['value'] = $category->getUrlKey();
+                    $result['url_key_create_redirect']['disabled'] = true;
                 }
             } else {
-                $result['url_key_create_redirect']['arguments']['data']['config']['visible'] = false;
+                $result['url_key_create_redirect']['visible'] = false;
             }
         }
         return $result;

app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php

@@ -5,11 +5,11 @@
  */
 namespace Magento\CatalogUrlRewrite\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterface as AC;
 use Magento\Ui\Component\Form\Element\Checkbox;
 use Magento\Ui\Component\Form\Element\DataType\Text;
 use Magento\Ui\Component\Form\Field;
@@ -80,7 +80,7 @@ public function modifyData(array $data)
      */
     protected function addUrlRewriteCheckbox(array $meta)
     {
-        $urlPath = $this->getElementArrayPath($meta, ProductAttributeInterface::CODE_SEO_FIELD_URL_KEY);
+        $urlPath = $this->getElementArrayPath($meta, AC::CODE_SEO_FIELD_URL_KEY);
 
         if ($urlPath) {
             $containerPath = $this->arrayManager->slicePath($urlPath, 0, -2);
@@ -105,14 +105,16 @@ protected function addUrlRewriteCheckbox(array $meta)
                 'componentType' => Field::NAME,
                 'formElement' => Checkbox::NAME,
                 'dataType' => Text::NAME,
-                'component' => 'Magento_CatalogUrlRewrite/js/components/url-key-handle-changes',
+                'component' => 'Magento_Catalog/js/components/url-key-handle-changes',
                 'valueMap' => [
                     'false' => '',
                     'true' => $urlKey
                 ],
                 'imports' => [
+                    'urlKey' => '${ $.provider }:data.product.' . AC::CODE_SEO_FIELD_URL_KEY,
+                    'handleUseDefault' => '${ $.parentName }.url_key:isUseDefault',
                     'handleChanges' => '${ $.provider }:data.product.'
-                        . ProductAttributeInterface::CODE_SEO_FIELD_URL_KEY,
+                        . AC::CODE_SEO_FIELD_URL_KEY,
                 ],
                 'description' => __('Create Permanent Redirect for old URL'),
                 'dataScope' => 'url_key_create_redirect',

app/code/Magento/CatalogUrlRewrite/view/adminhtml/ui_component/category_form.xml

@@ -15,8 +15,11 @@
                         <item name="description" xsi:type="string" translate="true">Create Permanent Redirect for old URL</item>
                         <item name="dataType" xsi:type="string">boolean</item>
                         <item name="formElement" xsi:type="string">checkbox</item>
-                        <item name="disabled" xsi:type="boolean">true</item>
                         <item name="sortOrder" xsi:type="number">15</item>
+                        <item name="component" xsi:type="string">Magento_Catalog/js/components/url-key-handle-changes</item>
+                        <item name="valueMap" xsi:type="array">
+                            <item name="false" xsi:type="number">0</item>
+                        </item>
                     </item>
                 </argument>
             </field>

app/code/Magento/CatalogUrlRewrite/view/adminhtml/web/js/components/url-key-handle-changes.js

@@ -56,7 +56,7 @@ define([
          */
         applyAction: function (action) {
             var targetName = action.targetName,
-                params = action.params,
+                params = action.params || [],
                 actionName = action.actionName,
                 target;
 
@@ -66,7 +66,8 @@ define([
             target = registry.async(targetName);
 
             if (target && typeof target === 'function' && actionName) {
-                target(actionName, params);
+                params.unshift(actionName);
+                target.apply(target, params);
             }
         },
 

app/code/Magento/Ui/view/base/web/js/form/components/button.js

@@ -14,35 +14,39 @@ define([
      * Get page actions element.
      *
      * @param {String} elem
-     * @param {String} actionsSelector
+     * @param {String} actionsClass
      * @returns {String}
      */
-    function getPageActions(elem, actionsSelector) {
-        var $el = $('<div/>').html(elem),
-            $wrapper = $('<div/>').addClass('page-main-actions');
+    function getPageActions(elem, actionsClass) {
+        var el = document.createElement('div');
 
-        return $wrapper.html($el.find(actionsSelector)).get(0).outerHTML;
+        el.innerHTML = elem;
+
+        return el.getElementsByClassName(actionsClass)[0];
     }
 
     /**
      * Return element without page actions toolbar
      *
      * @param {String} elem
-     * @param {String} actionsSelector
+     * @param {String} actionsClass
      * @returns {String}
      */
-    function removePageActions(elem, actionsSelector) {
-        var $el = $('<div/>').html(elem);
+    function removePageActions(elem, actionsClass) {
+        var el = document.createElement('div'),
+            actions;
 
-        $el.find(actionsSelector).remove();
+        el.innerHTML = elem;
+        actions = el.getElementsByClassName(actionsClass)[0];
+        el.removeChild(actions);
 
-        return $el.html();
+        return el.innerHTML;
     }
 
     return Insert.extend({
         defaults: {
             externalFormName: '${ $.ns }.${ $.ns }',
-            pageActionsSelector: '.page-actions',
+            pageActionsClass: 'page-actions',
             exports: {
                 prefix: '${ $.externalFormName }:selectorPrefix'
             },
@@ -96,12 +100,12 @@ define([
 
         /** @inheritdoc */
         onRender: function (data) {
-            var actions = getPageActions(data, this.pageActionsSelector);
+            var actions = getPageActions(data, this.pageActionsClass);
 
             if (!data.length) {
                 return this;
             }
-            data = removePageActions(data, this.pageActionsSelector);
+            data = removePageActions(data, this.pageActionsClass);
             this.renderActions(actions);
             this._super(data);
         },

app/code/Magento/Ui/view/base/web/js/form/components/insert-form.js

@@ -126,7 +126,8 @@ define([
             self.previousParams = params || {};
 
             $.async({
-                component: this.name
+                component: this.name,
+                ctx: '.' + this.contentSelector
             }, function (el) {
                 self.contentEl = $(el);
                 self.startRender = true;
@@ -235,8 +236,6 @@ define([
         onRender: function (data) {
             this.loading(false);
             this.set('content', data);
-            this.contentEl.children().applyBindings();
-            this.contentEl.trigger('contentUpdated');
             this.isRendered = true;
             this.startRender = false;
         },

app/code/Magento/Ui/view/base/web/js/form/components/insert.js

@@ -23,9 +23,7 @@ define([
          */
         initConfig: function () {
             this._super();
-
-            //this.dateFormat = utils.normalizeDate(this.dateFormat);
-            this.dateFormat = utils.normalizeDate('MM/dd/YYYY');
+            this.dateFormat = utils.normalizeDate(this.dateFormat);
 
             return this;
         },

app/code/Magento/Ui/view/base/web/js/form/element/date.js

@@ -32,11 +32,11 @@ define([
          *
          * @returns {String} Formatted date.
          */
-        getLabel: function () {
+        getLabel: function (value, format) {
             var date = moment(this._super());
 
             date = date.isValid() ?
-                date.format(this.dateFormat) :
+                date.format(format || this.dateFormat) :
                 '';
 
             return date;