Merge branch 'MAGETWO-87986-Media-Folder-Structure-CMS-Images' of github.com:magento-trigger/magento2ce into MAGETWO-87986-Media-Folder-Structure-CMS-Images

danmooney2 · danmooney2 · commit 17e3e45fa48c · 2018-03-13T13:35:02.000-05:00
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
@@ -173,6 +173,7 @@
                         </uploaderConfig>
                         <previewTmpl>Magento_Catalog/image-preview</previewTmpl>
                         <openDialogTitle>Media Gallery</openDialogTitle>
+                        <initialMediaGalleryOpenSubpath>catalog/category</initialMediaGalleryOpenSubpath>
                         <allowedExtensions>jpg jpeg gif png</allowedExtensions>
                         <maxFileSize>4194304</maxFileSize>
                     </settings>
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
@@ -95,9 +95,19 @@ public function getTreeJson()
      */
     public function getTreeLoaderUrl()
     {
+        $params = [
+            'use_storage_root' => (int) $this->getRequest()->getParam('use_storage_root')
+        ];
+
+        $currentTreePath = $this->getRequest()->getParam('current_tree_path');
+
+        if (strlen($currentTreePath)) {
+            $params['current_tree_path'] = $currentTreePath;
+        }
+
         return $this->getUrl(
             'cms/*/treeJson',
-            ['use_storage_root' => (int) $this->getRequest()->getParam('use_storage_root')]
+            $params
         );
     }
 
@@ -119,7 +129,14 @@ public function getRootNodeName()
     public function getTreeCurrentPath()
     {
         $treePath = ['root'];
-        if ($path = $this->_coreRegistry->registry('storage')->getSession()->getCurrentPath()) {
+
+        if ($idEncodedPath = $this->getRequest()->getParam('current_tree_path')) {
+            $path = base64_decode($idEncodedPath);
+        } else {
+            $path = $this->_coreRegistry->registry('storage')->getSession()->getCurrentPath();
+        }
+
+        if (strlen($path)) {
             $path = str_replace($this->_cmsWysiwygImages->getStorageRoot(), '', $path);
             $relative = [];
             foreach (explode('/', $path) as $dirName) {
@@ -129,6 +146,7 @@ public function getTreeCurrentPath()
                 }
             }
         }
+
         return $treePath;
     }
 
diff --git a/app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js b/app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js
@@ -84,7 +84,7 @@ define([
                 recursiveOpen = function () {
                     var el = $('[data-id="' + path.pop() + '"]');
 
-                    if (path.length > 1) {
+                    if (path.length) {
                         tree.jstree('open_node', el, recursiveOpen);
                     } else {
                         tree.jstree('open_node', el, function () {
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Ui\Component\Form\Element\DataType\Media;
 
 use Magento\Store\Model\StoreManagerInterface;
@@ -62,6 +65,7 @@ public function prepare()
     {
         // dynamically set max file size based on php ini config if not present in XML
         $maxFileSize = $this->getConfiguration()['maxFileSize'] ?? $this->fileSize->getMaxFileSize();
+        $initialMediaGalleryOpenSubpath = $this->getConfiguration()['initialMediaGalleryOpenSubpath'];
 
         $data = array_replace_recursive(
             $this->getData(),
@@ -71,6 +75,7 @@ public function prepare()
                     'mediaGallery' => [
                         'openDialogUrl' => $this->getContext()->getUrl('cms/wysiwyg_images/index'),
                         'openDialogTitle' => $this->getConfiguration()['openDialogTitle'] ?? __('Insert Images...'),
+                        'initialOpenSubpath' => base64_encode($initialMediaGalleryOpenSubpath),
                         'storeId' => $this->storeManager->getStore()->getId(),
                     ],
                 ],
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
@@ -362,6 +362,9 @@
                     <item name="openDialogTitle" type="string" xsi:type="xpath">
                         formElements/*[name(.)=../../@formElement]/settings/openDialogTitle
                     </item>
+                    <item name="initialMediaGalleryOpenSubpath" type="string" xsi:type="xpath">
+                        formElements/*[name(.)=../../@formElement]/settings/initialMediaGalleryOpenSubpath
+                    </item>
                     <item name="customEntry" type="string" xsi:type="xpath">
                         formElements/*[name(.)=../../@formElement]/settings/customEntry
                     </item>
@@ -427,6 +430,7 @@
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="openDialogTitle" type="string" translate="true" xsi:type="xpath">settings/openDialogTitle</item>
+                    <item name="initialMediaGalleryOpenSubpath" type="string" xsi:type="xpath">settings/initialMediaGalleryOpenSubpath</item>
                 </item>
             </argument>
         </schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
@@ -144,7 +144,11 @@
     <multiline class="Magento\Ui\Component\Form\Element\Multiline" component="Magento_Ui/js/form/components/group"/>
     <range class="Magento\Ui\Component\Form\Element\Range" component="Magento_Ui/js/grid/filters/range"/>
     <fileUploader class="Magento\Ui\Component\Form\Element\DataType\Media" component="Magento_Ui/js/form/element/file-uploader" template="ui/form/element/uploader/uploader"/>
-    <imageUploader class="Magento\Ui\Component\Form\Element\DataType\Media\Image" component="Magento_Ui/js/form/element/image-uploader" template="ui/form/element/uploader/image"/>
+    <imageUploader class="Magento\Ui\Component\Form\Element\DataType\Media\Image" component="Magento_Ui/js/form/element/image-uploader" template="ui/form/element/uploader/image">
+        <settings>
+            <initialMediaGalleryOpenSubpath>wysiwyg</initialMediaGalleryOpenSubpath>
+        </settings>
+    </imageUploader>
     <!-- Form elements -->
 
     <!-- Form element data types -->
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd
@@ -33,6 +33,13 @@
                     </xs:documentation>
                 </xs:annotation>
             </xs:element>
+            <xs:element name="initialMediaGalleryOpenSubpath" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Defines the initial subpath relative to root that will be open when opening media gallery
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
@@ -67,6 +67,10 @@ define([
                 '/store/' + this.mediaGallery.storeId +
                 '/type/image/use_storage_root/1?isAjax=true';
 
+            if (this.mediaGallery.initialOpenSubpath) {
+                openDialogUrl += '&current_tree_path=' + this.mediaGallery.initialOpenSubpath;
+            }
+
             browser.openDialog(openDialogUrl, null, null, this.mediaGallery.openDialogTitle);
         },
 
diff --git a/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/arbitrary/imageUploader.xml b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/arbitrary/imageUploader.xml
@@ -18,6 +18,7 @@
                 <item name="anySimpleType" active="false" xsi:type="string">string</item>
             </item>
             <item name="openDialogTitle" xsi:type="string" translate="true">string</item>
+            <item name="initialMediaGalleryOpenSubpath" xsi:type="string">string</item>
             <item name="visible" xsi:type="boolean">false</item>
             <item name="disabled" xsi:type="boolean">false</item>
             <item name="labelVisible" xsi:type="boolean">false</item>
diff --git a/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/expected/imageUploader.php b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/expected/imageUploader.php
@@ -49,6 +49,11 @@
                             'value' => 'string',
                             'translate' => 'true'
                         ],
+                        'initialMediaGalleryOpenSubpath' => [
+                            'name' => 'initialMediaGalleryOpenSubpath',
+                            'xsi:type' => 'string',
+                            'value' => 'string',
+                        ],
                         'uploaderConfig' => [
                             'name' => 'uploaderConfig',
                             'xsi:type' => 'array',
diff --git a/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/mixed/imageUploader.xml b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/mixed/imageUploader.xml
@@ -110,7 +110,8 @@
                 string
             </param>
         </uploaderConfig>
-        <openDialogTitle>string</openDialogTitle>
 
+        <openDialogTitle>string</openDialogTitle>
+        <initialMediaGalleryOpenSubpath>string</initialMediaGalleryOpenSubpath>
     </settings>
 </imageUploader>
diff --git a/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/semantic/imageUploader.xml b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/semantic/imageUploader.xml
@@ -113,5 +113,6 @@
         </uploaderConfig>
 
         <openDialogTitle>string</openDialogTitle>
+        <initialMediaGalleryOpenSubpath>string</initialMediaGalleryOpenSubpath>
     </settings>
 </imageUploader>
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/image-uploader.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/image-uploader.test.js
@@ -63,7 +63,8 @@ define([
                 component.mediaGallery = {
                     openDialogUrl: 'http://example.com/',
                     openDialogTitle: 'Hello world',
-                    storeId: 3
+                    storeId: 3,
+                    initialOpenSubpath: 'wysiwyg'
                 };
 
                 spyOn(browser, 'openDialog');
@@ -74,7 +75,7 @@ define([
 
                 expect(browser.openDialog).toHaveBeenCalledWith(
                     'http://example.com/target_element_id/theTargetId/store/3/type/image/' +
-                        'use_storage_root/1?isAjax=true',
+                        'use_storage_root/1?isAjax=true&current_tree_path=wysiwyg',
                     null,
                     null,
                     'Hello world'
