PB-108 MFTF stabilisation - take maxima of non empty column count from all column lines

Author: paras89

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

@@ -53,10 +53,14 @@ export function resizeGrid(
 
     validateNewGridSize(columnGroup, newGridSize);
 
-    // if we have more columns than the new grid size allows, remove empty columns until we are at the correct size
-    if (newGridSize < columnGroup.getChildren()().length) {
-        removeEmptyColumnsToFit(columnGroup, newGridSize);
-    }
+    columnGroup.getChildren()().forEach(
+        (columnLine: ContentTypeCollectionInterface<ColumnLinePreview>, index: number) => {
+            // if we have more columns than the new grid size allows, remove empty columns until we are at the correct size
+            console.log(columnLine.getChildren()().length);
+            if (newGridSize < columnLine.getChildren()().length) {
+                removeEmptyColumnsToFit(columnLine, newGridSize);
+            }
+        });
 
     // update column widths
     redistributeColumnWidths(columnGroup, newGridSize, gridSizeHistory);
@@ -78,7 +82,7 @@ function validateNewGridSize(columnGroup: ContentTypeCollectionInterface<ColumnG
 
     // Validate that the operation will be successful
 
-
+    let doThrowException = false;
     columnGroup.getChildren()().forEach(
         (columnLine: ContentTypeCollectionInterface<ColumnLinePreview>, index: number) => {
             let numEmptyColumns = 0;
@@ -92,12 +96,16 @@ function validateNewGridSize(columnGroup: ContentTypeCollectionInterface<ColumnG
                     }
                 });
                 if (newGridSize < numCols - numEmptyColumns) {
-                    throw new GridSizeError(
-                        $t("Grid size cannot be smaller than the current total amount of columns, minus any empty columns."),
-                    );
+                    doThrowException = true;
                 }
             }
         });
+
+    if (doThrowException) {
+        throw new Error(
+            $t("Grid size cannot be smaller than the current total amount of columns, minus any empty columns."),
+        );
+    }
 }
 
 /**
@@ -106,14 +114,14 @@ function validateNewGridSize(columnGroup: ContentTypeCollectionInterface<ColumnG
  * @param {ContentTypeCollectionInterface<Preview>} columnGroup
  * @param {number} newGridSize
  */
-function removeEmptyColumnsToFit(columnGroup: ContentTypeCollectionInterface<ColumnGroupPreview>, newGridSize: number) {
-    const columns = columnGroup.getChildren()() as Array<ContentTypeCollectionInterface<ColumnPreview>>;
+function removeEmptyColumnsToFit(columnLine: ContentTypeCollectionInterface<ColumnLinePreview>, newGridSize: number) {
+    const columns = columnLine.getChildren()() as Array<ContentTypeCollectionInterface<ColumnPreview>>;
     let numColumns = columns.length;
     let i;
     for (i = numColumns - 1; i >= 0; i--) {
         const column: ContentTypeCollectionInterface<ColumnPreview> = columns[i];
         if (newGridSize < numColumns && column.getChildren()().length === 0) {
-            columnGroup.removeChild(column);
+            columnLine.removeChild(column);
             numColumns--;
         }
     }

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

@@ -41,6 +41,7 @@ import {
 import {createColumn, createColumnLine} from "./factory";
 import {getDefaultGridSize, getMaxGridSize, GridSizeError, resizeGrid} from "./grid-size";
 import {getDragColumn, removeDragColumn, setDragColumn} from "./registry";
+import ColumnLinePreview from "Magento_PageBuilder/js/content-type/column-line/preview";
 
 /**
  * @api
@@ -155,7 +156,7 @@ export default class Preview extends PreviewCollection {
 
         const appearance = this.contentType.dataStore.get("appearance") ? this.contentType.dataStore.get("appearance") : "default";
         this.contentType.dataStore.set("appearance", appearance);
-        this.contentType.dataStore.set("non_empty_column_count", numCols - numEmptyColumns);
+        this.contentType.dataStore.set("non_empty_column_count", this.getNonEmptyColumnCount());
         this.contentType.dataStore.set("max_grid_size", getMaxGridSize());
         this.contentType.dataStore.set("initial_grid_size", this.contentType.dataStore.get("grid_size"));
         super.openEdit();
@@ -1131,6 +1132,33 @@ export default class Preview extends PreviewCollection {
             this.gridSizeHistory.set(newGridSize, columnWidths);
         }
     }
+
+    /**
+     * Figure out the maximum number of non-empty columns in various column lines
+     * @private
+     */
+    private getNonEmptyColumnCount(): number {
+
+        let nonEmptyColumnCount = 0;
+        this.contentType.getChildren()().forEach(
+            (columnLine: ContentTypeCollectionInterface<ColumnLinePreview>, index: number) => {
+                let numEmptyColumns = 0;
+                const numCols = columnLine.getChildren()().length;
+                    columnLine.getChildren()().forEach(
+                        (column: ContentTypeCollectionInterface<ColumnPreview>) => {
+                            if (column.getChildren()().length === 0) {
+                                numEmptyColumns++;
+                            }
+                        });
+
+                if (numCols - numEmptyColumns > nonEmptyColumnCount) {
+                    nonEmptyColumnCount = numCols - numEmptyColumns;
+                }
+
+            });
+
+        return nonEmptyColumnCount;
+    }
 }
 
 export interface GroupPositionCache {