Merge remote-tracking branch 'trigger/team3-bugs' into cms-team-1-delivery

Author: cspruiell

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

@@ -157,7 +157,7 @@
                 <loading>false</loading>
                 <selectionsProvider>${ $.ns }.${ $.ns }.columns.ids</selectionsProvider>
                 <autoRender>true</autoRender>
-                <dataScope>select_id</dataScope>
+                <dataScope>block_id</dataScope>
                 <ns>pagebuilder_block_select_grid</ns>
                 <dataLinks>
                     <imports>false</imports>

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_default.less

@@ -182,6 +182,19 @@ div[data-role='tabs'] {
     .tabs-content {
         border: 1px solid @color-gray;
         border-top: none;
+
+        [data-role='tab-item'] &:not(.empty-placeholder) {
+            box-sizing: content-box;
+            min-height: inherit;
+
+            &:not(:first-child) {
+                display: none;
+            }
+
+            > * {
+                min-height: inherit;
+            }
+        }
     }
 }
 

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/block/preview.js

@@ -64,7 +64,7 @@ define([
             var requestData = $.extend(true, {}, this.requestData);
 
             // The component hasn't be configured yet. Nothing to do.
-            if (!this.id() || !this.requestParameter || !this.dataUrlConfigPath) {
+            if  (!this.id().length || !this.requestParameter || !this.dataUrlConfigPath) {
                 this.meta({});
                 return;
             }

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/block-chooser.js

@@ -112,7 +112,8 @@ export default class Preview extends BasePreview {
             this.placeholderText("");
         }
 
-        if (!data[identifierName] || data.template.length === 0) {
+        if (!data[identifierName] || (data[identifierName] && data[identifierName].length === 0) ||
+            data.template.length === 0) {
             this.showBlockPreview(false);
             this.placeholderText(this.messages.NOT_SELECTED);
             return;