@tap-payments/os-micro-frontend-shared 0.1.373-test.3-test.4-test.5-test.6-test.7 → 0.1.373-test.3-test.4-test.5-test.6-test.7-test.8

package/build/components/TableHeader/TableView/utils.d.ts

@@ -43,7 +43,8 @@ export declare const transformTemplatesToViewMenuItems: (templates: Array<{
  */
 export declare const convertColumnsToLayoutSection: (columns: ColumnViewProps[], mode: TableMode, lang?: string) => LayoutSection;
 /**
- * Initialize columns for editing mode
+ * Initialize columns for editing mode.
+ * Preserves the order from editingColumns (saved view), then appends any columns from availableColumns not in the saved view.
  */
 export declare const initializeEditingColumns: (editingColumns: ColumnViewProps[], availableColumns: ColumnViewProps[]) => ColumnViewProps[];
 /**
@@ -51,7 +52,8 @@ export declare const initializeEditingColumns: (editingColumns: ColumnViewProps[
  */
 export declare const initializeCreateColumns: (availableColumns: ColumnViewProps[]) => ColumnViewProps[];
 /**
- * Initialize columns for create mode with current tableViews state (preserves checked/unchecked values)
+ * Initialize columns for create mode with current tableViews state (preserves checked/unchecked values).
+ * Preserves the order from currentTableViews (current table columns), then appends any columns from availableColumns not in the table.
  */
 export declare const initializeCreateColumnsWithCurrentState: (availableColumns: ColumnViewProps[], currentTableViews: ColumnViewProps[]) => ColumnViewProps[];
 /**

package/build/components/TableHeader/TableView/utils.js

@@ -183,16 +183,31 @@ export const convertColumnsToLayoutSection = (columns, mode, lang = 'en') => {
     };
 };
 /**
- * Initialize columns for editing mode
+ * Initialize columns for editing mode.
+ * Preserves the order from editingColumns (saved view), then appends any columns from availableColumns not in the saved view.
  */
 export const initializeEditingColumns = (editingColumns, availableColumns) => {
-    return availableColumns
-        .filter((col) => !isDateColumn(col.name))
-        .map((col) => {
-        var _a;
-        const savedCol = editingColumns.find((ec) => ec.name === col.name);
-        return (savedCol || Object.assign(Object.assign({}, col), { selected: false, menuItems: (_a = col.menuItems) === null || _a === void 0 ? void 0 : _a.map((item) => (Object.assign(Object.assign({}, item), { selected: false }))) }));
-    });
+    var _a, _b;
+    const editingOrder = editingColumns.filter((col) => !isDateColumn(col.name)).map((col) => col.name);
+    const availableByName = new Map(availableColumns.filter((c) => !isDateColumn(c.name)).map((c) => [c.name, c]));
+    const result = [];
+    for (const name of editingOrder) {
+        const savedCol = editingColumns.find((ec) => ec.name === name);
+        const availCol = availableByName.get(name);
+        if (availCol) {
+            result.push(savedCol !== null && savedCol !== void 0 ? savedCol : Object.assign(Object.assign({}, availCol), { selected: false, menuItems: (_a = availCol.menuItems) === null || _a === void 0 ? void 0 : _a.map((item) => (Object.assign(Object.assign({}, item), { selected: false }))) }));
+        }
+        else if (savedCol) {
+            result.push(savedCol);
+        }
+    }
+    for (const [, availCol] of availableByName) {
+        if (!editingOrder.includes(availCol.name)) {
+            const savedCol = editingColumns.find((ec) => ec.name === availCol.name);
+            result.push(savedCol !== null && savedCol !== void 0 ? savedCol : Object.assign(Object.assign({}, availCol), { selected: false, menuItems: (_b = availCol.menuItems) === null || _b === void 0 ? void 0 : _b.map((item) => (Object.assign(Object.assign({}, item), { selected: false }))) }));
+        }
+    }
+    return result;
 };
 /**
  * Initialize columns for create mode (all unchecked except date)
@@ -206,23 +221,34 @@ export const initializeCreateColumns = (availableColumns) => {
     });
 };
 /**
- * Initialize columns for create mode with current tableViews state (preserves checked/unchecked values)
+ * Initialize columns for create mode with current tableViews state (preserves checked/unchecked values).
+ * Preserves the order from currentTableViews (current table columns), then appends any columns from availableColumns not in the table.
  */
 export const initializeCreateColumnsWithCurrentState = (availableColumns, currentTableViews) => {
-    return availableColumns
-        .filter((col) => !isDateColumn(col.name))
-        .map((col) => {
-        var _a, _b, _c;
-        const currentCol = currentTableViews.find((tc) => tc.name === col.name);
-        if (currentCol) {
-            return Object.assign(Object.assign({}, col), { selected: (_a = currentCol.selected) !== null && _a !== void 0 ? _a : false, menuItems: (_b = col.menuItems) === null || _b === void 0 ? void 0 : _b.map((item) => {
+    var _a, _b, _c, _d;
+    const availableByName = new Map(availableColumns.filter((c) => !isDateColumn(c.name)).map((c) => [c.name, c]));
+    const currentOrder = currentTableViews.filter((c) => !isDateColumn(c.name)).map((c) => c.name);
+    const result = [];
+    for (const name of currentOrder) {
+        const currentCol = currentTableViews.find((tc) => tc.name === name);
+        const availCol = availableByName.get(name);
+        if (availCol && currentCol) {
+            result.push(Object.assign(Object.assign({}, availCol), { selected: (_a = currentCol.selected) !== null && _a !== void 0 ? _a : false, menuItems: (_b = availCol.menuItems) === null || _b === void 0 ? void 0 : _b.map((item) => {
                     var _a, _b;
                     const currentMenuItem = (_a = currentCol.menuItems) === null || _a === void 0 ? void 0 : _a.find((mi) => mi.name === item.name);
                     return Object.assign(Object.assign({}, item), { selected: (_b = currentMenuItem === null || currentMenuItem === void 0 ? void 0 : currentMenuItem.selected) !== null && _b !== void 0 ? _b : false });
-                }) });
+                }) }));
         }
-        return Object.assign(Object.assign({}, col), { selected: false, menuItems: (_c = col.menuItems) === null || _c === void 0 ? void 0 : _c.map((item) => (Object.assign(Object.assign({}, item), { selected: false }))) });
-    });
+        else if (availCol) {
+            result.push(Object.assign(Object.assign({}, availCol), { selected: false, menuItems: (_c = availCol.menuItems) === null || _c === void 0 ? void 0 : _c.map((item) => (Object.assign(Object.assign({}, item), { selected: false }))) }));
+        }
+    }
+    for (const [, availCol] of availableByName) {
+        if (!currentOrder.includes(availCol.name)) {
+            result.push(Object.assign(Object.assign({}, availCol), { selected: false, menuItems: (_d = availCol.menuItems) === null || _d === void 0 ? void 0 : _d.map((item) => (Object.assign(Object.assign({}, item), { selected: false }))) }));
+        }
+    }
+    return result;
 };
 /**
  * Reset columns to their default selection state

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@tap-payments/os-micro-frontend-shared",
   "description": "Shared components and utilities for Tap Payments micro frontends",
-  "version": "0.1.373-test.3-test.4-test.5-test.6-test.7",
-  "testVersion": 7,
+  "version": "0.1.373-test.3-test.4-test.5-test.6-test.7-test.8",
+  "testVersion": 8,
   "type": "module",
   "main": "build/index.js",
   "module": "build/index.js",