Merge pull request #381 from magento-obsessive-owls/PB-390

[Owls] PB-390: Nested Page Builder content can fail to save when action is performed quickly

Author: davemacaulay

app/code/Magento/PageBuilder/etc/db_schema.xml

@@ -15,7 +15,7 @@
         <column xsi:type="int" name="template_id" identity="true" comment="Template ID Auto Increment" />
         <column xsi:type="varchar" name="name" length="1024" nullable="false" comment="Template Name" />
         <column xsi:type="varchar" name="preview_image" nullable="true" length="1024" comment="Template Preview Image"/>
-        <column xsi:type="text" name="template" nullable="false" comment="Master Format HTML"/>
+        <column xsi:type="longtext" name="template" nullable="false" comment="Master Format HTML"/>
         <column xsi:type="varchar" name="created_for" length="255" nullable="true" comment="Created For" />
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Creation Time"/>

app/code/Magento/PageBuilder/etc/db_schema_whitelist.json

@@ -0,0 +1,24 @@
+{
+    "catalog_eav_attribute": {
+        "column": {
+            "is_pagebuilder_enabled": true
+        }
+    },
+    "pagebuilder_template": {
+        "column": {
+            "template_id": true,
+            "name": true,
+            "preview_image": true,
+            "template": true,
+            "created_for": true,
+            "created_at": true,
+            "updated_at": true
+        },
+        "index": {
+            "PAGEBUILDER_TEMPLATE_NAME": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_stage_template_grid.xml

@@ -71,6 +71,7 @@
                 <sorting>asc</sorting>
                 <resizeEnabled>true</resizeEnabled>
                 <resizeDefaultWidth>80</resizeDefaultWidth>
+                <draggable>false</draggable>
             </settings>
         </column>
         <column name="preview_image" class="Magento\PageBuilder\Ui\Component\Listing\Columns\PreviewImage" component="Magento_PageBuilder/js/grid/columns/preview-image" sortOrder="20">
@@ -79,13 +80,15 @@
                 <hasPreview>1</hasPreview>
                 <label translate="true">Preview Image</label>
                 <sortable>false</sortable>
+                <draggable>false</draggable>
             </settings>
         </column>
         <column name="name" sortOrder="30">
             <settings>
                 <dataType>text</dataType>
                 <filter>text</filter>
                 <label translate="true">Template Name</label>
+                <draggable>false</draggable>
             </settings>
         </column>
         <column name="created_for" component="Magento_Ui/js/grid/columns/select" sortOrder="40">
@@ -97,18 +100,21 @@
                 </editor>
                 <dataType>select</dataType>
                 <label translate="true">Created For</label>
+                <draggable>false</draggable>
             </settings>
         </column>
         <column name="created_at" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date" sortOrder="50">
             <settings>
                 <filter>dateRange</filter>
                 <dataType>date</dataType>
                 <label translate="true">Created</label>
+                <draggable>false</draggable>
             </settings>
         </column>
         <selectionsColumn name="ids" component="Magento_PageBuilder/js/grid/cells/template-apply" sortOrder="60">
             <settings>
                 <indexField>template</indexField>
+                <draggable>false</draggable>
             </settings>
         </selectionsColumn>
     </columns>

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_template_grid.xml

@@ -71,6 +71,7 @@
                 <sorting>asc</sorting>
                 <resizeEnabled>true</resizeEnabled>
                 <resizeDefaultWidth>80</resizeDefaultWidth>
+                <draggable>false</draggable>
             </settings>
         </column>
         <column name="preview_image" class="Magento\PageBuilder\Ui\Component\Listing\Columns\PreviewImage" component="Magento_PageBuilder/js/grid/columns/preview-image" sortOrder="20">
@@ -79,13 +80,15 @@
                 <hasPreview>1</hasPreview>
                 <label translate="true">Preview Image</label>
                 <sortable>false</sortable>
+                <draggable>false</draggable>
             </settings>
         </column>
         <column name="name" sortOrder="30">
             <settings>
                 <dataType>text</dataType>
                 <filter>text</filter>
                 <label translate="true">Template Name</label>
+                <draggable>false</draggable>
             </settings>
         </column>
         <column name="created_for" component="Magento_Ui/js/grid/columns/select" sortOrder="40">
@@ -97,18 +100,21 @@
                 </editor>
                 <dataType>select</dataType>
                 <label translate="true">Created For</label>
+                <draggable>false</draggable>
             </settings>
         </column>
         <column name="created_at" class="Magento\Ui\Component\Listing\Columns\Date" component="Magento_Ui/js/grid/columns/date" sortOrder="50">
             <settings>
                 <filter>dateRange</filter>
                 <dataType>date</dataType>
                 <label translate="true">Created</label>
+                <draggable>false</draggable>
             </settings>
         </column>
         <actionsColumn name="actions" class="Magento\PageBuilder\Ui\Component\Listing\Columns\TemplateManagerActions">
             <settings>
                 <indexField>template_id</indexField>
+                <draggable>false</draggable>
             </settings>
         </actionsColumn>
     </columns>

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/form-mixin.js

@@ -41,7 +41,8 @@ define([
          */
         save: function (redirect, data) {
             var submit = this._super.bind(this, redirect, data),
-                timeout;
+                timeout,
+                locks;
 
             if (_.isEmpty(this.pageBuilderInstances)) {
                 submit();
@@ -56,7 +57,9 @@ define([
                 $.when.apply(
                     null,
                     this.pageBuilderInstances.map(function (instance) {
-                        return instance.stage.renderingLock;
+                        locks = instance.stage.renderingLocks;
+
+                        return locks[locks.length - 1];
                     })
                 ).then(function () {
                     $('body').trigger('processStop');