Merge branch 'feature/update-to-4-1' into 'release/2.0'

Release 2.0.0 - upgrade to 4.1

See merge request b2bcode/oro/extensions/cms-form-builder!2

Author: dnahrebecki

composer.json

@@ -17,7 +17,7 @@
     ]
   },
   "require": {
-    "oro/commerce": "3.1.*"
+    "oro/commerce": "4.1.x-dev"
   },
   "minimum-stability": "dev"
 }

src/B2bCode/Bundle/CmsFormBundle/Resources/config/jsmodules.yml

@@ -0,0 +1,6 @@
+app-modules:
+    - b2bcodecmsform/js/app/modules/grapesjs-module
+dynamic-imports:
+    b2bcodecmsform:
+        - b2bcodecmsform/js/app/components/field-options-component
+        - b2bcodecmsform/js/app/components/sortable-fields-component

src/B2bCode/Bundle/CmsFormBundle/Resources/config/services.yml

@@ -24,6 +24,7 @@ services:
             - !tagged b2b_code_cms_form.field_type_provider
 
     B2bCode\Bundle\CmsFormBundle\Builder\FormBuilderInterface:
+        public: true
         class: B2bCode\Bundle\CmsFormBundle\Builder\FormBuilder
         arguments:
             - '@form.factory'
@@ -33,6 +34,7 @@ services:
             - '@B2bCode\Bundle\CmsFormBundle\Validator\ConstraintProviderInterface'
 
     B2bCode\Bundle\CmsFormBundle\Provider\GeneralFieldProvider:
+        public: true
         class: B2bCode\Bundle\CmsFormBundle\Provider\GeneralFieldProvider
 
     B2bCode\Bundle\CmsFormBundle\Form\Extension\FieldOptionsExtension:
@@ -70,6 +72,7 @@ services:
             - { name: kernel.event_listener, event: oro_datagrid.orm_datasource.result.after.b2bcode-cms-form-responses-grid, method: onResultAfter }
 
     B2bCode\Bundle\CmsFormBundle\Notification\NotificationInterface:
+        public: true
         class: B2bCode\Bundle\CmsFormBundle\Notification\SendEmailNotification
         arguments:
             - '@oro_message_queue.message_producer'
@@ -106,6 +109,7 @@ services:
     b2b_code_cms_form.field_manager.api:
         class: Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager
         parent: oro_soap.manager.entity_manager.abstract
+        public: true
         arguments:
             - B2bCode\Bundle\CmsFormBundle\Entity\CmsFormField
             - '@doctrine.orm.entity_manager'

src/B2bCode/Bundle/CmsFormBundle/Resources/public/js/app/grapesjs/type-builders/cms-form-type-builder.js

@@ -0,0 +1,154 @@
+import _ from 'underscore';
+import __ from 'orotranslation/js/translator';
+import BaseTypeBuilder from 'orocms/js/app/grapesjs/type-builders/base-type-builder';
+import DialogWidget from 'oro/dialog-widget';
+import template from 'tpl-loader!b2bcodecmsform/templates/grapesjs-cms-form.html';
+import routing from 'routing';
+
+/**
+ * CMS form type builder
+ */
+const CmsFormTypeBuilder = BaseTypeBuilder.extend({
+    button: {
+        label: __('b2bcode.cmsform.wysiwyg.component.cms_form.label'),
+        category: 'Basic',
+        attributes: {
+            'class': 'fa fa-file-text'
+        }
+    },
+
+    editorEvents: {
+        'canvas:drop': 'onDrop'
+    },
+
+    commands: {
+        'cms-form-settings': (editor, sender, componentModel) => {
+            const datagridName = 'b2bcode-cms-forms-grid';
+            const container = editor.Commands.isActive('fullscreen') ? editor.getEl() : 'body';
+            const routeParams = {
+                gridName: datagridName
+            };
+
+            const dialog = new DialogWidget({
+                title: __('b2bcode.cmsform.wysiwyg.component.cms_form.dialog.title'),
+                url: routing.generate(
+                    'oro_datagrid_widget',
+                    routeParams
+                ),
+                loadingElement: container,
+                dialogOptions: {
+                    modal: true,
+                    resizable: true,
+                    autoResize: true,
+                    appendTo: container,
+                    close: function() {
+                        if (componentModel.cid && !componentModel.get('cmsForm')) {
+                            componentModel.remove();
+                        }
+                    }
+                }
+            });
+
+            dialog.on('contentLoad', function(data, widget) {
+                const gridWidget = widget.componentManager.get(datagridName);
+                gridWidget.grid.columns.remove(_.last(gridWidget.grid.columns.models));
+            });
+
+            dialog.on('grid-row-select', function(data) {
+                let selected = editor.getSelected();
+
+                if (componentModel.cid) {
+                    selected = componentModel;
+                }
+
+                selected.set('cmsForm', data.model);
+                dialog.remove();
+            });
+
+            dialog.render();
+        }
+    },
+
+    modelMixin: {
+        defaults: {
+            tagName: 'div',
+            classes: ['cms-form', 'content-placeholder'],
+            cmsForm: null,
+            droppable: false
+        },
+
+        initialize(...args) {
+            this.constructor.__super__.initialize.call(this, ...args);
+
+            const toolbar = this.get('toolbar');
+            const commandExists = _.some(toolbar, {
+                command: 'cms-form-settings'
+            });
+
+            if (!commandExists) {
+                toolbar.unshift({
+                    attributes: {
+                        'class': 'fa fa-gear',
+                        'label': __('b2bcode.cmsform.wysiwyg.component.cms_form.block_setting')
+                    },
+                    command: 'cms-form-settings'
+                });
+
+                this.set('toolbar', toolbar);
+            }
+
+            this.listenTo(this, 'change:cmsForm', this.onCmsFormChange, this);
+        },
+
+        onCmsFormChange(model, cmsForm) {
+            this.set('attributes', {
+                'data-title': cmsForm.get('name')
+            });
+
+            this.set('content', '{{ b2b_code_form("' + cmsForm.get('alias') + '") }}');
+            this.view.render();
+        }
+    },
+
+    viewMixin: {
+        onRender() {
+            let title;
+            const cmsForm = this.model.get('cmsForm');
+
+            if (cmsForm) {
+                title = cmsForm.cid ? cmsForm.get('name') : cmsForm.name;
+            } else {
+                title = this.$el.attr('data-title');
+            }
+
+            this.$el.html(template({title}));
+        }
+    },
+
+    /**
+     * @inheritDoc
+     */
+    constructor: function CmsFormTypeBuilder(options) {
+        CmsFormTypeBuilder.__super__.constructor.call(this, options);
+    },
+
+    onDrop(DataTransfer, model) {
+        if (model instanceof this.Model) {
+            this.editor.runCommand('cms-form-settings', model);
+        }
+    },
+
+    isComponent(el) {
+        let result = null;
+
+        if (el.tagName === 'DIV' && el.classList.contains('cms-form')) {
+            result = {
+                type: this.componentType
+            };
+        }
+
+        return result;
+    }
+});
+
+export default CmsFormTypeBuilder;

src/B2bCode/Bundle/CmsFormBundle/Resources/public/js/app/modules/grapesjs-module.js

@@ -0,0 +1,8 @@
+import ComponentManager from 'orocms/js/app/grapesjs/plugins/components/component-manager';
+import CmsFormTypeBuilder from 'b2bcodecmsform/js/app/grapesjs/type-builders/cms-form-type-builder';
+
+ComponentManager.registerComponentTypes({
+    'cms-form': {
+        Constructor: CmsFormTypeBuilder
+    },
+});

src/B2bCode/Bundle/CmsFormBundle/Resources/public/templates/grapesjs-cms-form.html

@@ -0,0 +1,6 @@
+<% if (title) { %>
+<div class="cms-form-placeholder">
+    <h3 class="cms-form-placeholder-title"><%- title %></h3>
+    <p><%- _.__('b2bcode.cmsform.wysiwyg.component.cms_form.label') %></p>
+</div>
+<% } %>

src/B2bCode/Bundle/CmsFormBundle/Resources/translations/jsmessages.en.yml

@@ -7,3 +7,10 @@ b2bcode:
                 success: Your form has been successfully submitted
             reorder:
                 error: Error
+        wysiwyg:
+            component:
+                cms_form:
+                    label: CMS Form
+                    dialog:
+                        title: Select CMS Form
+                    block_setting: Settings

src/B2bCode/Bundle/CmsFormBundle/Resources/translations/messages.en.yml

@@ -157,6 +157,8 @@ b2bcode:
         saved_message: Form saved
 
         cmsformresponse:
+            resolved:
+                label: Resolved
             field_responses:
                 label: Field response
             form:

src/B2bCode/Bundle/CmsFormBundle/Resources/views/Form/responses.html.twig

@@ -1,5 +1,6 @@
 {% extends 'OroUIBundle:actions:view.html.twig' %}
 {% import 'OroDataGridBundle::macros.html.twig' as dataGrid %}
+{% import 'OroUIBundle::macros.html.twig' as UI %}
 
 {% oro_title_set({params : {"%name%": entity.name }}) %}
 

src/B2bCode/Bundle/CmsFormBundle/Resources/views/Form/view.html.twig

@@ -1,5 +1,6 @@
 {% extends 'OroUIBundle:actions:view.html.twig' %}
 {% import 'OroDataGridBundle::macros.html.twig' as dataGrid %}
+{% import 'OroUIBundle::macros.html.twig' as UI %}
 
 {% oro_title_set({params : {"%name%": entity.name }}) %}