Merge branch 'ACP2E-1568' of https://github.com/magento-l3/magento2-page-builder into PR-2023-02-24

Author: vkolesny

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

@@ -21,6 +21,7 @@ import {DataObject} from "../../data-store";
 import {moveContentType} from "../../drag-drop/move-content-type";
 import {getDraggedContentTypeConfig} from "../../drag-drop/registry";
 import {hiddenClass} from "../../drag-drop/sortable";
+import checkStageFullScreen from "../../utils/check-stage-full-screen";
 import {createStyleSheet} from "../../utils/create-stylesheet";
 import {default as ColumnGroupPreview} from "../column-group/preview";
 import {BindResizeHandleEventParamsInterface, InitElementEventParamsInterface} from "../column/column-events.types";
@@ -134,7 +135,7 @@ export default class Preview extends PreviewCollection {
         });
 
         events.on(
-            `stage:${this.contentType.stageId}:fullScreenModeChangeAfter`,
+            `stage:${this.contentType.stageId}:readyAfter`,
             this.moveContentsToNewColumnGroup.bind(this),
         );
 
@@ -624,7 +625,7 @@ export default class Preview extends PreviewCollection {
     private hasColumnLine(contentType: ContentTypeInterface | ContentTypeCollectionInterface): boolean {
         const children = this.contentType.getChildren()();
         let hasColumnLine = false;
-        if (children.length === 0) {
+        if (children.length === 0 && checkStageFullScreen(contentType.stageId)) {
             // new column group, so it has a column line
             hasColumnLine = true;
         }

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts

@@ -0,0 +1,43 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'ko',
+    'jquery',
+    'Magento_PageBuilder/js/content-type/column-group/preview',
+    'Magento_PageBuilder/js/config',
+    'Magento_PageBuilder/js/events'
+], function (ko,$, Preview, Config, Events) {
+    'use strict';
+
+    describe('Magento_PageBuilder/js/content-type/column-group/preview', function () {
+        var model;
+
+        beforeEach(function () {
+            Config.config = {content_types: {}};
+            model = new Preview(
+                {
+                    dataStore: {subscribe: jasmine.createSpy()},
+                    getChildren: function () {
+                        return ko.observableArray([]);
+                    },
+                    children: {subscribe: jasmine.createSpy()},
+                    stageId: 'STAGEID'
+                },
+                {config: {content_types: {}}});
+        });
+
+        describe('Stage readyAfter event', function () {
+            it('Should call methods to upgrade to column-line if needed', function () {
+                spyOn(model, 'getCurrentIndexInParent');
+                spyOn(model, 'hasColumnLine');
+                Events.trigger('stage:' + model.contentType.stageId + ':readyAfter');
+                expect(model.getCurrentIndexInParent).toHaveBeenCalled();
+                expect(model.hasColumnLine).toHaveBeenCalled();
+            });
+        });
+    });
+});