Merge branch 'corrected-media-gallery-url' of github.com:sivaschenko/magento2-page-builder into 422_adding-conditions-combination-to-conditions-filter-fix

Author: omiroshnichenko

app/code/Magento/PageBuilder/Component/Form/HtmlCode.php

@@ -8,8 +8,10 @@
 
 use Magento\Backend\Model\UrlInterface as BackendUrlInterface;
 use Magento\Cms\Helper\Wysiwyg\Images;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\Form\Element\DataType\Media\OpenDialogUrl;
 use Magento\Variable\Model\Variable\Config as VariableConfig;
 
 /**
@@ -39,12 +41,18 @@ class HtmlCode extends \Magento\Ui\Component\Form\Field
      */
     private $currentTreePath;
 
+    /**
+     * @var OpenDialogUrl
+     */
+    private $openDialogUrl;
+
     /**
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
      * @param BackendUrlInterface $backendUrl
      * @param Images $imagesHelper
      * @param VariableConfig $variableConfig
+     * @param OpenDialogUrl|null $openDialogUrl
      * @param string $currentTreePath
      * @param array $components
      * @param array $data
@@ -55,6 +63,7 @@ public function __construct(
         BackendUrlInterface $backendUrl,
         Images $imagesHelper,
         VariableConfig $variableConfig,
+        OpenDialogUrl $openDialogUrl = null,
         $currentTreePath = 'wysiwyg',
         $components = [],
         array $data = []
@@ -63,6 +72,7 @@ public function __construct(
         $this->imagesHelper = $imagesHelper;
         $this->variableConfig = $variableConfig;
         $this->currentTreePath = $currentTreePath;
+        $this->openDialogUrl = $openDialogUrl ?: ObjectManager::getInstance()->get(OpenDialogUrl::class);
         parent::__construct($context, $uiComponentFactory, $components, $data);
     }
 
@@ -82,7 +92,7 @@ public function prepare()
             ]
         );
         $config['imageUrl'] = $this->backendUrl->getUrl(
-            'cms/wysiwyg_images/index',
+            $this->openDialogUrl->get(),
             [
                 'current_tree_path' => $this->imagesHelper->idEncode($this->currentTreePath),
                 'target_element_id' => self::HTML_ID_PLACEHOLDER