Merge pull request #168 from magento/1.0.0-release

Sync develop with release branch

Author: Cari Spruiell

.gitignore

@@ -4,3 +4,5 @@
 **.d.js
 /dev/tests/acceptance/vendor
 static-error-log.xml
+.DS_Store
+.vscode

CONTRIBUTING.md

@@ -1,27 +1,5 @@
 # Contributing to Magento 2 code
 
-<!--{% comment %}-->
-## Navigation
-
-1. [Introduction]
-2. [Installation guide]
-3. **Contribution guide**
-    1. [Overview](#overview)
-    1. [Contribution requirements](#contribution-requirements)
-    1. [Contribution process](#contribution-process)
-    1. [Code of Conduct](#code-of-conduct)
-4. [Developer documentation]
-5. [Roadmap and known issues]
-6. [How to create custom PageBuilder content type container]
-
-[Introduction]: docs/introduction.md
-[Installation guide]: docs/install.md
-[Developer documentation]: docs/developer-documentation.md
-[Roadmap and Known Issues]: docs/roadmap.md
-[How to create custom PageBuilder content type container]: docs/how-to-create-custom-content-type-container.md
-<!--{% endcomment %}-->
-
-<!-- {% raw %} -->
 ## Overview
 
 Contributions to the Magento 2 codebase are done using the fork & pull model.
@@ -31,25 +9,23 @@ Contributions can take the form of new components/features, changes to existing
 
 The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor for two weeks, the issue is closed.
 
-
 ## Contribution requirements
 
 1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v2.0/coding-standards/bk-coding-standards.html).
 2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request to be merged quickly and without additional clarification requests.
 3. Commits must be accompanied by meaningful commit messages.
 4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
-3. PRs which include new logic or new features must be submitted along with:
-* Unit/integration test coverage where applicable.
-* Updated documentation in the module directory `app/code/PageBuilder/docs`.
-4. For large features or changes, please [open an issue](https://github.com/magento/magento2/issues) and discuss first. This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
-5. All automated tests are passed successfully locally. After PR submitted Magento team will run builds on continuous integration environment.
+5. PRs which include new logic or new features must be submitted along with:
+    * Unit/integration test coverage where applicable.
+    * Updated documentation in the `docs` directory at the root level.
+6. For large features or changes, please [open an issue](https://github.com/magento/magento2/issues) and discuss first. This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
+7. All automated tests are passed successfully locally. After PR submitted Magento team will run builds on continuous integration environment.
 
 ## Contribution process
 
 If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, “fork” the Magento 2 project and be able to easily send “pull requests”.
 
-1. Search current [listed issues](https://github.com/magento/magento2-page-builder/issues) on GitHub (open or closed) and [list of known issues](docs/roadmap.md#Known Issues) on our roadmap for similar proposals of intended contribution before starting work on a new contribution.
-2. Please contact us in Slack chanel if you want to work on issue from [list of known issues](docs/roadmap.md#Known Issues).
+1. Search current [listed issues](https://github.com/magento/magento2-page-builder/issues) on GitHub (open or closed) before starting work on a new contribution.
 2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
 3. Create and test your work.
 4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request). Instructions written for `https://github.com/magento/magento2` repository, but they also apply to `https://github.com/magento/magento2-page-builder`.
@@ -59,5 +35,3 @@ If you are a new GitHub user, we recommend that you create your own [free github
 
 Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
 The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).
-
-<!-- {% endraw %} -->

README.md

@@ -9,72 +9,77 @@ The PageBuilder Early Access Program (EAP) gives partners the following perks:
 * Explore PageBuilder extension points to build custom modules and integrations for 3rd party services, such as Facebook, Instagram, etc.
 * Try out PageBuilder customization options and extend its functionality beyond its default features.
 * Preview PageBuilder to prepare a migration plan from BlueFoot 1.0 to PageBuilder.
- 
+
 **Note:**
 *This program should not be used to design and launch a production website using early code.*
 
 ## Installation
 
 We offer one method for installing PageBuilder:
 
+* As a [Composer package] - use this option if you do not plan to contribute to the PageBuilder code repository.
+* Using the [GitHub repository] - use this option to install PageBuilder from the GitHub repository and contribute to the code.
 
-* Using the [GitHub repository] - use this option to install PageBuilder from the GitHub repository and contribute to the code 
+[Composer package]: docs/install-pagebuilder.md#composer-installation
+[GitHub repository]: docs/install-pagebuilder.md#github-installation
 
-[Composer package]: docs/install.md#composer-installation
-[GitHub repository]: docs/install.md#github-installation
+<!-- {% comment %} -->
 
 ## Developer documentation
 
-This project repository contains PageBuilder developer documentation on the following topics:
-
-1. [Architecture overview]
-1. [BlueFoot to PageBuilder data migration]
-1. [Third-party content type migration]
-1. [Iconography]
-1. [Module integration]
-1. [Additional data configuration]
-1. [Content type configuration]
-1. [How to add a new content type]
-1. [Events]
-1. [Bindings]
-1. [Master format]
-1. [Visual select]
-1. [Custom Toolbar]
-
-[Architecture overview]: docs/architecture-overview.md
-[BlueFoot to PageBuilder data migration]: docs/bluefoot-data-migration.md
-[Third-party content type migration]: docs/new-content-type-example.md
-[Iconography]: docs/iconography.md
-[Module integration]: docs/module-integration.md
-[Additional data configuration]: docs/custom-configuration.md
-[Content type configuration]: docs/content-type-configuration.md
-[How to add a new content type]: docs/how-to-add-new-content-type.md
-[Events]: docs/events.md
-[Bindings]: docs/bindings.md
-[Master format]: docs/master-format.md
-[Visual select]: docs/visual-select.md
-[Custom Toolbar]: docs/toolbar.md
+### Getting Started
 
-## Contribute to PageBuilder
+1. [Introduction](docs/getting-started/introduction.md)
+2. [Install Page Builder](docs/getting-started/install-pagebuilder.md)
+3. [Activate Page Builder](docs/getting-started/activate-pagebuilder.md)
+
+### Customizations
+
+* [Block chooser](docs/customizations/block-chooser.md)
+* [Full-width page layouts](docs/customizations/full-width-page-layouts.md)
+* [Responsive layouts](docs/customizations/responsive-layouts.md)
+* [Storefront customization](docs/customizations/storefront-customization.md)
+* [Visual selects](docs/customizations/visual-selects.md)
+* [Additional data configuration](docs/customizations/additional-data-configuration.md)
+* [Product conditions](docs/customizations/product-conditions.md)
+* [Server-side rendered previews](docs/customizations/server-side-rendered-previews.md)
+
+### How Tos
+
+* [How to develop a new content type](docs/how-to/how-to-develop-new-content-type.md)
+* [How to develop a container content type](docs/how-to/how-to-develop-container-content-type.md)
+* [How to use the Image Uploader](docs/how-to/how-to-use-image-uploader.md)
+* [How to add inline text editing](docs/how-to/how-to-add-inline-text-editing.md)
+* [How to add a custom toolbar](docs/how-to/how-to-add-custom-toolbar.md)
+* [How to convert product attribute fields to use Page Builder](docs/how-to/how-to-convert-product-attributes-to-use-pagebuilder.md)
+* [How to store a component master format as a widget-directive](docs/how-to/how-to-store-master-format-as-widget-directive.md)
+
+### Reference
 
-We appreciate any and all contributions to PageBuilder. 
-A good place to start is by looking at our [features roadmap] and list of [known issues].
+* [Architecture](docs/reference/architecture.md)
+* [Events](docs/reference/events.md)
+* [Knockout bindings](docs/reference/knockout-bindings.md)
+* [Configuration](docs/reference/configuration.md)
+* [Master format](docs/reference/master-format.md)
 
-If you are interested in contributing to this repository, please see our [Contribution Guide].
+### Migration
+
+* [Migrate from BlueFoot](docs/migration/migrate-from-bluefoot.md)
+* [Migrate custom content types from BlueFoot](docs/migration/migrate-custom-content-types-from-bluefoot.md)
+  
+<!-- {% endcomment %} -->
+
+## Contribute to PageBuilder
+
+We appreciate any and all contributions to PageBuilder. If you are interested in contributing to this repository, please see our [Contribution Guide].
 
 [Contribution Guide]: CONTRIBUTING.md
-[features roadmap]: docs/roadmap.md#planned-features-and-functionality
-[known issues]: docs/roadmap.md#known-issues
 
 ## PageBuilder updates from the Magento core team
 
 The PageBuilder team updates the code every 2 weeks.
 **These changes may introduce breaking changes.**
 
-To help you prepare for these changes, we are publishing a [roadmap] of features and issues that we are going to work on in the following months.
-
-[roadmap]: docs/roadmap.md
-
 ## Provide feedback
 
 We want to hear what you think of PageBuilder!

app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/Upload.php

@@ -5,12 +5,12 @@
  */
 namespace Magento\PageBuilder\Controller\Adminhtml\ContentType\Image;
 
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Class Upload
  */
-class Upload extends \Magento\Backend\App\Action
+class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     const UPLOAD_DIR = 'wysiwyg';
 
@@ -94,7 +94,12 @@ public function execute()
         $fileUploader->setAllowRenameFiles(true);
         $fileUploader->setAllowedExtensions(['jpeg','jpg','png','gif']);
         $fileUploader->setAllowCreateFolders(true);
+
         try {
+            if (!$fileUploader->checkMimeType(['image/png', 'image/jpeg', 'image/gif'])) {
+                throw new \Magento\Framework\Exception\LocalizedException(__('File validation failed.'));
+            }
+
             $result = $fileUploader->save($this->getUploadDir());
             $baseUrl = $this->storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
             $result['id'] = $this->cmsWysiwygImages->idEncode($result['file']);

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

@@ -10,6 +10,9 @@
 use Magento\Framework\Config\DataInterfaceFactory;
 use Magento\Ui\Config\Converter;
 
+/**
+ * Retrieve fields and default values from associated UI component forms for content types
+ */
 class UiComponentConfig
 {
     /**
@@ -31,7 +34,7 @@ public function __construct(
     /**
      * Retrieve fields for UI Component
      *
-     * @param $componentName
+     * @param string $componentName
      *
      * @return array
      */
@@ -61,32 +64,11 @@ function ($item, $key) {
         return $fields;
     }
 
-    /**
-     * Retrieve buttons associated with a UI component
-     *
-     * @param $componentName
-     *
-     * @return array
-     */
-    public function getButtons($componentName) : array
-    {
-        $componentConfig = $this->configFactory->create(
-            ['componentName' => $componentName]
-        )->get($componentName);
-
-        // Does the component have any buttons assigned?
-        if (isset($componentConfig[Converter::DATA_ARGUMENTS_KEY]['data']['buttons'])) {
-            return $componentConfig[Converter::DATA_ARGUMENTS_KEY]['data']['buttons'];
-        }
-
-        return [];
-    }
-
     /**
      * Iterate over components within the configuration and run a defined callback function
      *
-     * @param $config
-     * @param $callback
+     * @param array $config
+     * @param \Closure $callback
      * @param bool $key
      *
      * @return array
@@ -96,6 +78,10 @@ private function iterateComponents($config, $callback, $key = false) : array
         $values = $callback($config, $key) ?: [];
         if (isset($config[Converter::DATA_COMPONENTS_KEY])
             && !empty($config[Converter::DATA_COMPONENTS_KEY])
+            && (!isset($config[Converter::DATA_ARGUMENTS_KEY]['data']['config']['componentType'])
+                || isset($config[Converter::DATA_ARGUMENTS_KEY]['data']['config']['componentType'])
+                && $config[Converter::DATA_ARGUMENTS_KEY]['data']['config']['componentType'] !== 'dynamicRows'
+            )
         ) {
             foreach ($config[Converter::DATA_COMPONENTS_KEY] as $key => $child) {
                 $values = array_merge(

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/AdvancedSliderItem.php

@@ -59,11 +59,23 @@ public function render(array $itemData, array $additionalData = []) : string
         ];
 
         $formData = $itemData['formData'] ?? [];
-        $formData['background_image'] = '';
+        $backgroundImages = '';
+        $backgroundImagesAttr = '{}';
+
         if (isset($eavData['background_image'])) {
-            $formData['background_image'] = $eavData['background_image'];
+            $backgroundImages = $eavData['background_image'];
         } elseif (isset($eavData['image'])) {
-            $formData['background_image'] = $eavData['image'];
+            $backgroundImages = $eavData['image'];
+        }
+
+        if ($backgroundImages) {
+            $backgroundImagesAttr = '{\"'
+                . 'desktop_image\":\"'
+                . '{{media url=wysiwyg'
+                . $backgroundImages
+                . '}}\",\"'
+                . 'mobile_image\":\"'
+                . '{}\"}';
         }
 
         $margin = $this->styleExtractor->extractStyle($formData, ['margin']);
@@ -72,8 +84,9 @@ public function render(array $itemData, array $additionalData = []) : string
         }
 
         $wrapperDivElementAttributes = [
-            'data-element' => 'mobile_image',
-            'class' => 'pagebuilder-slide-wrapper pagebuilder-mobile-only'
+            'data-element' => 'wrapper',
+            'data-background-images' => $backgroundImagesAttr,
+            'class' => 'pagebuilder-slide-wrapper'
         ];
         $style = $this->styleExtractor->extractStyle($formData);
         if ($style) {
@@ -122,22 +135,6 @@ public function render(array $itemData, array $additionalData = []) : string
             . $buttonElementHtml
             . '</div></div></div>';
 
-        // non-mobile wrapper div
-        $wrapperDivElementAttributes['data-element'] = 'desktop_image';
-        $wrapperDivElementAttributes['class'] = 'pagebuilder-slide-wrapper ' .
-            'pagebuilder-mobile-hidden';
-        $rootElementHtml .= '<div'
-            . $this->printAttributes($wrapperDivElementAttributes)
-            . '><div'
-            . $this->printAttributes($overlayDivElementAttributes)
-            . '><div class="pagebuilder-poster-content">'
-            . '<div data-element="content"><h3>'
-            . ($eavData['title'] ?? $eavData['title_tag'] ?? '')
-            . '</h3>'
-            . '<div>' . ($eavData['textarea'] ?? '') . '</div></div>'
-            . $buttonElementHtml
-            . '</div></div></div>';
-
         $rootElementHtml .= '</div></div>';
 
         return $rootElementHtml;