[CMS Team 3] Sprint 1

app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/EnableField.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\PageBuilder\Block\Adminhtml\System\Config;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+class EnableField extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $json;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\Serialize\Serializer\Json $json
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Serialize\Serializer\Json $json,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->json = $json;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        $html = parent::_getElementHtml($element);
+        $enablePageBuilderSelector = '#cms_pagebuilder_enabled';
+
+        $jsString = '<script type="text/x-magento-init"> {"' .
+            $enablePageBuilderSelector . '": {
+            "Magento_PageBuilder/js/system/config/enable-field": {"modalTitleText": ' .
+            $this->json->serialize($this->getModalTitleText()) . ', "modalContentBody": ' .
+            $this->json->serialize($this->getModalContentBody())
+            . '}}}</script>';
+
+        $html .= $jsString;
+        return $html;
+    }
+
+    /**
+     * Get text for the modal title heading when user switches to disable
+     *
+     * @return string
+     */
+    private function getModalTitleText()
+    {
+        return __('Are You Sure You Want to Turn Off Page Builder?');
+    }
+
+    /**
+     * Get HTML for the modal content body when user switches to disable
+     *
+     * @return string
+     */
+    private function getModalContentBody()
+    {
+        $templateFileName = $this->getTemplateFile(
+            'Magento_PageBuilder::system/config/enableField/modalContentBody.phtml'
+        );
+
+        return $this->fetchView($templateFileName);
+    }
+}

app/code/Magento/PageBuilder/Block/Element/Editor.php

@@ -7,6 +7,32 @@
 
 class Editor extends \Magento\Framework\Data\Form\Element\Editor
 {
+    /**
+     * @var \Magento\PageBuilder\Model\State
+     */
+    private $pageBuilderState;
+
+    /**
+     * Editor constructor.
+     * @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
+     * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
+     * @param \Magento\Framework\Escaper $escaper
+     * @param \Magento\PageBuilder\Model\State $pageBuilderState
+     * @param array $data
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     */
+    public function __construct(
+        \Magento\Framework\Data\Form\Element\Factory $factoryElement,
+        \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
+        \Magento\Framework\Escaper $escaper,
+        \Magento\PageBuilder\Model\State $pageBuilderState,
+        $data = [],
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+    ) {
+        $this->pageBuilderState = $pageBuilderState;
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
+    }
+
     /**
      * Return HTML button to toggling WYSIWYG
      *
@@ -16,12 +42,11 @@ class Editor extends \Magento\Framework\Data\Form\Element\Editor
     protected function _getToggleButtonHtml($visible = true)
     {
         $buttonHtml = '';
-        if ($this->getConfig()->getData('pagebuilder_button') !== false) {
+        if ($this->getConfig()->getData('pagebuilder_button') === true && $this->isPageBuilderUsed()) {
             $buttonHtml .= $this->_getButtonHtml(
                 [
-                    'title' => $this->translate('Enable Advanced CMS'),
-                    'class' => 'magento-pagebuilder init-magento-pagebuilder action-default scalable action'
-                        . ' action-secondary',
+                    'title' => $this->translate('Edit with Page Builder'),
+                    'class' => 'magento-pagebuilder init-magento-pagebuilder action-default scalable action',
                     'id' => 'magento-pagebuilder' . $this->getHtmlId()
                 ]
             );
@@ -37,6 +62,17 @@ protected function _getToggleButtonHtml($visible = true)
         return $buttonHtml . parent::_getToggleButtonHtml($visible);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function isEnabled()
+    {
+        if ($this->isPageBuilderUsed()) {
+            return true;
+        }
+        return parent::isEnabled();
+    }
+
     /**
      * Is the stage aspect of the system enabled
      *
@@ -46,4 +82,28 @@ protected function isStageEnabled()
     {
         return true;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getInlineJs($jsSetupObject, $forceLoad)
+    {
+        if ($this->isPageBuilderUsed()) {
+            return '';
+        }
+
+        return parent::getInlineJs($jsSetupObject, $forceLoad);
+    }
+
+    /**
+     * Return if page builder will be used instead of wysiwyg editor
+     *
+     * @return bool
+     */
+    private function isPageBuilderUsed()
+    {
+        $config = $this->getConfig();
+        return $config->getData('activeEditorPath') === 'Magento_PageBuilder/pageBuilderAdapter'
+            && $config->getData('enable_pagebuilder') !== false;
+    }
 }

app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php

@@ -10,16 +10,18 @@
 use Magento\Ui\Component\Wysiwyg\ConfigInterface;
 use Magento\Catalog\Api\CategoryAttributeRepositoryInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\PageBuilder\Model\State as PageBuilderState;
 
 class Wysiwyg extends \Magento\Ui\Component\Form\Element\Wysiwyg
 {
     /**
-     * Constructor
+     * Wysiwyg constructor.
      *
-     * @param \Magento\Framework\View\Element\UiComponent\ContextInterface $context
-     * @param \Magento\Framework\Data\FormFactory $formFactory
-     * @param \Magento\Ui\Component\Wysiwyg\ConfigInterface $wysiwygConfig
-     * @param \Magento\Catalog\Api\CategoryAttributeRepositoryInterface $attrRepository
+     * @param ContextInterface $context
+     * @param FormFactory $formFactory
+     * @param ConfigInterface $wysiwygConfig
+     * @param CategoryAttributeRepositoryInterface $attrRepository
+     * @param PageBuilderState $pageBuilderState
      * @param array $components
      * @param array $data
      * @param array $config
@@ -29,10 +31,12 @@ public function __construct(
         FormFactory $formFactory,
         ConfigInterface $wysiwygConfig,
         CategoryAttributeRepositoryInterface $attrRepository,
+        PageBuilderState $pageBuilderState,
         array $components = [],
         array $data = [],
         array $config = []
     ) {
+        $wysiwygConfigData = isset($config['wysiwygConfigData']) ? $config['wysiwygConfigData'] : [];
         // If a dataType is present we're dealing with an attribute
         if (isset($config['dataType'])) {
             try {
@@ -43,14 +47,19 @@ public function __construct(
                 // This model is used by non product attributes
             }
         }
+        $isEnablePageBuilder = isset($wysiwygConfigData['enable_pagebuilder'])
+            && !$wysiwygConfigData['enable_pagebuilder']
+            || false;
+        if (!$pageBuilderState->isPageBuilderInUse($isEnablePageBuilder)) {
+            // This is not done using definition.xml due to https://github.com/magento/magento2/issues/5647
+            $data['config']['component'] = 'Magento_PageBuilder/js/form/element/wysiwyg';
 
-        // This is not done using definition.xml due to https://github.com/magento/magento2/issues/5647
-        $data['config']['component'] = 'Magento_PageBuilder/js/form/element/wysiwyg';
-
-        // Override the templates to include our KnockoutJS code
-        $data['config']['template'] = 'Magento_PageBuilder/wysiwyg';
-        $data['config']['elementTmpl'] = 'Magento_PageBuilder/wysiwyg';
-
+            // Override the templates to include our KnockoutJS code
+            $data['config']['template'] = 'Magento_PageBuilder/wysiwyg';
+            $data['config']['elementTmpl'] = 'Magento_PageBuilder/wysiwyg';
+            $wysiwygConfigData['activeEditorPath'] = 'Magento_PageBuilder/pageBuilderAdapter';
+            $config['wysiwygConfigData'] = $wysiwygConfigData;
+        }
         parent::__construct($context, $formFactory, $wysiwygConfig, $components, $data, $config);
     }
 }

app/code/Magento/PageBuilder/Model/Config.php

@@ -5,20 +5,31 @@
  */
 namespace Magento\PageBuilder\Model;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
 class Config extends \Magento\Framework\Config\Data implements \Magento\PageBuilder\Model\Config\ConfigInterface
 {
+    const IS_PAGEBUILDER_ENABLED = 'cms/pagebuilder/enabled';
+
     /**
-     * Constructor
-     *
-     * @param \Magento\PageBuilder\Model\Config\Reader $reader
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Config constructor.
+     * @param Config\Reader $reader
      * @param \Magento\Framework\Config\CacheInterface $cache
+     * @param ScopeConfigInterface $scopeConfig
      * @param string $cacheId
      */
     public function __construct(
         \Magento\PageBuilder\Model\Config\Reader $reader,
         \Magento\Framework\Config\CacheInterface $cache,
+        ScopeConfigInterface $scopeConfig,
         $cacheId = 'gene_bluefoot_content_types'
     ) {
+        $this->scopeConfig = $scopeConfig;
         parent::__construct($reader, $cache, $cacheId);
     }
 
@@ -59,4 +70,16 @@ public function getContentType($name)
     {
         return $this->get('types/' . $name);
     }
+
+    /**
+     * Returns config setting if page builder enabled
+     *
+     * @return int
+     */
+    public function isEnabled()
+    {
+        return (int)$this->scopeConfig->getValue(
+            \Magento\PageBuilder\Model\Config::IS_PAGEBUILDER_ENABLED
+        );
+    }
 }

app/code/Magento/PageBuilder/Model/State.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+
+namespace Magento\PageBuilder\Model;
+
+class State
+{
+    /**
+     * @var \Magento\PageBuilder\Model\Config
+     */
+    private $config;
+
+    /**
+     * State constructor.
+     * @param Config $config
+     */
+    public function __construct(Config $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * Returns information if use page builder based on system configuration and xml configuration
+     * @param $isPageBuilderUsed
+     * @return bool
+     */
+    public function isPageBuilderInUse($isPageBuilderUsed)
+    {
+        return $isPageBuilderUsed || !$this->config->isEnabled();
+    }
+}

app/code/Magento/PageBuilder/README.md

@@ -1,3 +1,50 @@
-Magento_PageBuilder module provides an alternative interface for building content.
+# Magento_PageBuilder module
 
+The Magento_PageBuilder module provides an enhancement for the default Magento WYSIWYG editor. It installs an alternative editor in the Admin area for building content.
 
+The PageBuilder editor can be used on the following content pages:
+
+* Category Pages
+* CMS Pages
+* CMS Blocks
+* Dynamic Blocks
+
+## Enable the module
+
+The PageBuilder module and the editor is enabled by default after installation.
+
+The editor itself is enabled globally in the Admin area under *Stores > Configuration > Content Management > Advanced Content Tool > Enable Page Builder*.
+This setting determines the `is_pagebuilder_enabled` configuration value.
+
+## Disable the module
+
+You can disable the PageBuilder module for a specific field by adding the following entry to a field configuration in an XML configuration file:
+
+```
+<item name="wysiwygConfigData" xsi:type="array">
+    <item name="enable_pagebuilder" xsi:type="boolean">false</item>
+</item>
+```
+
+### Example
+
+The following example disables the PageBuilder editor for the content field.
+
+```
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <fieldset name="content" sortOrder="10">
+        <field name="content" formElement="wysiwyg">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="source" xsi:type="string">page</item>
+                    <item name="wysiwygConfigData" xsi:type="array">
+                        <item name="enable_pagebuilder" xsi:type="boolean">false</item>
+                    </item>
+                </item>
+            </argument>
+        </field>
+    </fieldset>
+</form>
+```
+
+**Note:** Disabling the editor this way overrides the value of `is_pagebuilder_enabled` for the specified field.

app/code/Magento/PageBuilder/composer.json

@@ -8,6 +8,7 @@
         "magento/module-backend": "100.3.*",
         "magento/module-cms": "101.2.0-dev",
         "magento/module-catalog": "101.2.0-dev",
+        "magento/module-config": "100.3.*",
         "magento/module-ui": "100.3.*",
         "magento/module-search": "100.3.*",
         "magento/module-newsletter": "100.3.*",