MAGETWO-48516: Most of category fields don't have Use Default Value option in Store/StoreView scope on the redesigned category page

Author: shiftedreality

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

@@ -197,7 +197,12 @@ private function addUseDefaultValueCheckbox(Category $category, array $meta)
                 && $category->getStoreId();
             $attributePath = $this->getArrayManager()->findPath($attributeCode, $meta);
 
-            if (!$attributePath || !$canDisplayUseDefault) {
+            if (
+                !$attributePath
+                || !$canDisplayUseDefault
+                || in_array($attributeCode, $this->elementsWithUseConfigSetting
+                )
+            ) {
                 continue;
             }
 
@@ -494,15 +499,6 @@ public function getDefaultMetaData($result)
         $result['use_config.available_sort_by']['default'] = true;
         $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;
-        }
 
         return $result;
     }
@@ -542,7 +538,6 @@ protected function getFieldsMap()
                 [
                     'url_key',
                     'url_key_create_redirect',
-                    'use_default.url_key',
                     'url_key_group',
                     'meta_title',
                     'meta_keywords',

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

@@ -375,19 +375,6 @@
                         <item name="source" xsi:type="string">category</item>
                         <item name="label" xsi:type="string" translate="true">URL Key</item>
                         <item name="sortOrder" xsi:type="number">10</item>
-                        <item name="imports" xsi:type="array">
-                            <item name="disabled" xsi:type="string">${ $.provider }:data.use_default.url_key</item>
-                        </item>
-                    </item>
-                </argument>
-            </field>
-            <field name="use_default.url_key">
-                <argument name="data" xsi:type="array">
-                    <item name="config" xsi:type="array">
-                        <item name="description" xsi:type="string" translate="true">Use Default</item>
-                        <item name="dataType" xsi:type="string">boolean</item>
-                        <item name="formElement" xsi:type="string">checkbox</item>
-                        <item name="sortOrder" xsi:type="number">20</item>
                     </item>
                 </argument>
             </field>