@wavemaker/react-runtime 11.14.3-rc.6401 → 11.15.0-2.247

package/components/data/table/utils/crud-handlers.js

@@ -16,7 +16,7 @@ var _findIndex = _interopRequireDefault(require("lodash-es/findIndex"));
 var _slice = _interopRequireDefault(require("lodash-es/slice"));
 var _forEach = _interopRequireDefault(require("lodash-es/forEach"));
 var _some = _interopRequireDefault(require("lodash-es/some"));
-var _types = require("../../types");
+var _types = require("@wavemaker/react-runtime/components/data/types");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 // ==================== DATASOURCE UTILITIES ====================
@@ -62,17 +62,18 @@ var handleOperationResult = function handleOperationResult(operation, response,
     onRowCallback = options.onRowCallback,
     message = options.message,
     onError = options.onError,
-    errormessage = options.errormessage;
+    errormessage = options.errormessage,
+    widget = options.widget;
   if (error) {
     showToast === null || showToast === void 0 || showToast(error || errormessage, "Error");
-    onError === null || onError === void 0 || onError(operation, error);
+    onError === null || onError === void 0 || onError(null, widget, error, operation);
     return false;
   }
   if (!onRowCallback && showToast && message) {
     showToast(message, "Success");
   }
   onSuccess === null || onSuccess === void 0 || onSuccess(operation, response);
-  onRowCallback === null || onRowCallback === void 0 || onRowCallback(null, response);
+  onRowCallback === null || onRowCallback === void 0 || onRowCallback(null, widget, response);
   return true;
 };
 
@@ -293,21 +294,23 @@ var refreshDataSource = exports.refreshDataSource = /*#__PURE__*/function () {
 }();
 var handleServerOperation = exports.handleServerOperation = /*#__PURE__*/function () {
   var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(options) {
-    var datasource, binddataset, isNewRow, rowId, currentEditingData, wmTableColumns, setInternalDataset, onNewRowAdded, onRowUpdate, showToast, insertmessage, updatemessage, onRowinsert, onRowupdate, onSuccess, onError, errormessage, tableInstance, isServerSidePagination, formData, response, _yield$getDatasourceI, isApiAware, currentPageNum, shouldUseServer, _datasource$paginatio4, totalElements, _datasource$paginatio5, size, lastPage, _datasource$paginatio6;
+    var _listener$Widgets;
+    var datasource, binddataset, isNewRow, rowId, currentEditingData, wmTableColumns, setInternalDataset, onNewRowAdded, onRowUpdate, showToast, insertmessage, updatemessage, onRowinsert, onRowupdate, onSuccess, onError, errormessage, tableInstance, isServerSidePagination, listener, widgetName, widget, formData, response, _yield$getDatasourceI, isApiAware, currentPageNum, shouldUseServer, _datasource$paginatio4, totalElements, _datasource$paginatio5, size, lastPage, _datasource$paginatio6;
     return _regenerator["default"].wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          datasource = options.datasource, binddataset = options.binddataset, isNewRow = options.isNewRow, rowId = options.rowId, currentEditingData = options.currentEditingData, wmTableColumns = options.wmTableColumns, setInternalDataset = options.setInternalDataset, onNewRowAdded = options.onNewRowAdded, onRowUpdate = options.onRowUpdate, showToast = options.showToast, insertmessage = options.insertmessage, updatemessage = options.updatemessage, onRowinsert = options.onRowinsert, onRowupdate = options.onRowupdate, onSuccess = options.onSuccess, onError = options.onError, errormessage = options.errormessage, tableInstance = options.tableInstance, isServerSidePagination = options.isServerSidePagination;
-          _context5.prev = 1;
+          datasource = options.datasource, binddataset = options.binddataset, isNewRow = options.isNewRow, rowId = options.rowId, currentEditingData = options.currentEditingData, wmTableColumns = options.wmTableColumns, setInternalDataset = options.setInternalDataset, onNewRowAdded = options.onNewRowAdded, onRowUpdate = options.onRowUpdate, showToast = options.showToast, insertmessage = options.insertmessage, updatemessage = options.updatemessage, onRowinsert = options.onRowinsert, onRowupdate = options.onRowupdate, onSuccess = options.onSuccess, onError = options.onError, errormessage = options.errormessage, tableInstance = options.tableInstance, isServerSidePagination = options.isServerSidePagination, listener = options.listener, widgetName = options.widgetName; // Get widget reference for callbacks
+          widget = widgetName ? listener === null || listener === void 0 || (_listener$Widgets = listener.Widgets) === null || _listener$Widgets === void 0 ? void 0 : _listener$Widgets[widgetName] : undefined;
+          _context5.prev = 2;
           formData = collectFormData(currentEditingData, wmTableColumns, isNewRow);
           response = currentEditingData;
           if (!datasource) {
             _context5.next = 37;
             break;
           }
-          _context5.next = 7;
+          _context5.next = 8;
           return getDatasourceInfo(datasource);
-        case 7:
+        case 8:
           _yield$getDatasourceI = _context5.sent;
           isApiAware = _yield$getDatasourceI.isApiAware;
           currentPageNum = _yield$getDatasourceI.currentPageNum;
@@ -317,59 +320,55 @@ var handleServerOperation = exports.handleServerOperation = /*#__PURE__*/functio
             break;
           }
           if (!(!isApiAware && binddataset)) {
-            _context5.next = 17;
+            _context5.next = 18;
             break;
           }
-          _context5.next = 15;
+          _context5.next = 16;
           return handleNonApiAwareOperation(datasource, binddataset, formData, isNewRow ? "ADD_ITEM" : "SET_ITEM");
-        case 15:
+        case 16:
           _context5.next = 37;
           break;
-        case 17:
-          _context5.next = 19;
+        case 18:
+          _context5.next = 20;
           return datasource.execute(isNewRow ? _types.DataSource.Operation.INSERT_RECORD : _types.DataSource.Operation.UPDATE_RECORD, {
             row: formData,
             skipNotification: true
           });
-        case 19:
+        case 20:
           response = _context5.sent;
           if (!response.error) {
-            _context5.next = 22;
+            _context5.next = 23;
             break;
           }
           throw response.error;
-        case 22:
+        case 23:
           if (!(isNewRow && isServerSidePagination && datasource.pagination)) {
-            _context5.next = 34;
+            _context5.next = 35;
             break;
           }
           _datasource$paginatio4 = datasource.pagination, totalElements = _datasource$paginatio4.totalElements, _datasource$paginatio5 = _datasource$paginatio4.size, size = _datasource$paginatio5 === void 0 ? 10 : _datasource$paginatio5;
           if (!(totalElements !== undefined && size > 0)) {
-            _context5.next = 32;
+            _context5.next = 33;
             break;
           }
           lastPage = Math.ceil((totalElements + 1) / size);
           if (!(tableInstance && lastPage > currentPageNum)) {
-            _context5.next = 30;
+            _context5.next = 31;
             break;
           }
           tableInstance.setPageIndex(lastPage - 1);
-          _context5.next = 32;
+          _context5.next = 33;
           break;
-        case 30:
-          _context5.next = 32;
+        case 31:
+          _context5.next = 33;
           return refreshDataSource(datasource, {
             page: currentPageNum,
             pagesize: size
           });
-        case 32:
+        case 33:
           _context5.next = 37;
           break;
-        case 34:
-          if (!isServerSidePagination) {
-            _context5.next = 37;
-            break;
-          }
+        case 35:
           _context5.next = 37;
           return refreshDataSource(datasource, {
             page: currentPageNum,
@@ -389,21 +388,23 @@ var handleServerOperation = exports.handleServerOperation = /*#__PURE__*/functio
             onSuccess: onSuccess,
             onRowCallback: isNewRow ? onRowinsert : onRowupdate,
             message: isNewRow ? insertmessage : updatemessage,
-            onError: onError
+            onError: onError,
+            widget: widget
           }));
         case 41:
           _context5.prev = 41;
-          _context5.t0 = _context5["catch"](1);
+          _context5.t0 = _context5["catch"](2);
           return _context5.abrupt("return", handleOperationResult(isNewRow ? "insert" : "update", null, _context5.t0, {
             showToast: showToast,
             onError: onError,
-            errormessage: errormessage
+            errormessage: errormessage,
+            widget: widget
           }));
         case 44:
         case "end":
           return _context5.stop();
       }
-    }, _callee5, null, [[1, 41]]);
+    }, _callee5, null, [[2, 41]]);
   }));
   return function handleServerOperation(_x10) {
     return _ref6.apply(this, arguments);
@@ -411,62 +412,64 @@ var handleServerOperation = exports.handleServerOperation = /*#__PURE__*/functio
 }();
 var handleDeleteOperation = exports.handleDeleteOperation = /*#__PURE__*/function () {
   var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(options) {
-    var rowData, tableInstance, internalDataset, setInternalDataset, datasource, binddataset, onRowDelete, showToast, deletemessage, onSuccess, onRowdelete, onError, errormessage, isServerSidePagination, rowIndex, response, _yield$getDatasourceI2, isApiAware, currentPageNum, shouldUseServer, newDataset, paginationResult, _datasource$paginatio7;
+    var _listener$Widgets2;
+    var rowData, tableInstance, internalDataset, setInternalDataset, datasource, binddataset, onRowDelete, showToast, deletemessage, onSuccess, onRowdelete, onError, errormessage, isServerSidePagination, listener, widgetName, widget, rowIndex, response, _yield$getDatasourceI2, isApiAware, currentPageNum, shouldUseServer, newDataset, paginationResult, _datasource$paginatio7;
     return _regenerator["default"].wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          rowData = options.rowData, tableInstance = options.tableInstance, internalDataset = options.internalDataset, setInternalDataset = options.setInternalDataset, datasource = options.datasource, binddataset = options.binddataset, onRowDelete = options.onRowDelete, showToast = options.showToast, deletemessage = options.deletemessage, onSuccess = options.onSuccess, onRowdelete = options.onRowdelete, onError = options.onError, errormessage = options.errormessage, isServerSidePagination = options.isServerSidePagination;
-          _context6.prev = 1;
+          rowData = options.rowData, tableInstance = options.tableInstance, internalDataset = options.internalDataset, setInternalDataset = options.setInternalDataset, datasource = options.datasource, binddataset = options.binddataset, onRowDelete = options.onRowDelete, showToast = options.showToast, deletemessage = options.deletemessage, onSuccess = options.onSuccess, onRowdelete = options.onRowdelete, onError = options.onError, errormessage = options.errormessage, isServerSidePagination = options.isServerSidePagination, listener = options.listener, widgetName = options.widgetName; // Get widget reference for callbacks
+          widget = widgetName ? listener === null || listener === void 0 || (_listener$Widgets2 = listener.Widgets) === null || _listener$Widgets2 === void 0 ? void 0 : _listener$Widgets2[widgetName] : undefined;
+          _context6.prev = 2;
           // Find row first
           rowIndex = (0, _findIndex["default"])(internalDataset, function (row) {
             return row._wmTableRowId === rowData._wmTableRowId || row.id !== undefined && row.id === rowData.id;
           });
           if (!(rowIndex === -1)) {
-            _context6.next = 6;
+            _context6.next = 7;
             break;
           }
           console.warn("Row not found for deletion");
           return _context6.abrupt("return", false);
-        case 6:
+        case 7:
           response = rowData; // Handle server operations first, before updating local dataset
           if (!datasource) {
-            _context6.next = 25;
+            _context6.next = 26;
             break;
           }
-          _context6.next = 10;
+          _context6.next = 11;
           return getDatasourceInfo(datasource);
-        case 10:
+        case 11:
           _yield$getDatasourceI2 = _context6.sent;
           isApiAware = _yield$getDatasourceI2.isApiAware;
           currentPageNum = _yield$getDatasourceI2.currentPageNum;
           shouldUseServer = _yield$getDatasourceI2.shouldUseServer;
           if (!shouldUseServer) {
-            _context6.next = 25;
+            _context6.next = 26;
             break;
           }
           if (!(!isApiAware && binddataset)) {
-            _context6.next = 20;
+            _context6.next = 21;
             break;
           }
-          _context6.next = 18;
+          _context6.next = 19;
           return handleNonApiAwareOperation(datasource, binddataset, rowData, "REMOVE_ITEM");
-        case 18:
-          _context6.next = 25;
+        case 19:
+          _context6.next = 26;
           break;
-        case 20:
-          _context6.next = 22;
+        case 21:
+          _context6.next = 23;
           return datasource.execute(_types.DataSource.Operation.DELETE_RECORD, {
             row: rowData,
             skipNotification: true
           });
-        case 22:
+        case 23:
           response = _context6.sent;
           if (!response.error) {
-            _context6.next = 25;
+            _context6.next = 26;
             break;
           }
           throw response.error;
-        case 25:
+        case 26:
           // Only update dataset after successful server operation
           newDataset = (0, _filter["default"])(internalDataset, function (row) {
             return row._wmTableRowId !== rowData._wmTableRowId && (row.id === undefined || row.id !== rowData.id);
@@ -476,41 +479,43 @@ var handleDeleteOperation = exports.handleDeleteOperation = /*#__PURE__*/functio
           });
 
           // Handle pagination
-          _context6.next = 29;
+          _context6.next = 30;
           return adjustPaginationAfterDelete(tableInstance, internalDataset, datasource, isServerSidePagination || false);
-        case 29:
+        case 30:
           paginationResult = _context6.sent;
           if (!(isServerSidePagination && paginationResult.shouldRefresh && datasource)) {
-            _context6.next = 33;
+            _context6.next = 34;
             break;
           }
-          _context6.next = 33;
+          _context6.next = 34;
           return datasource.invoke({
             page: paginationResult.targetPage,
             pagesize: ((_datasource$paginatio7 = datasource.pagination) === null || _datasource$paginatio7 === void 0 ? void 0 : _datasource$paginatio7.size) || 10
           });
-        case 33:
+        case 34:
           onRowDelete === null || onRowDelete === void 0 || onRowDelete(rowData, rowIndex, newDataset);
           return _context6.abrupt("return", handleOperationResult("delete", response, null, {
             showToast: showToast,
             onSuccess: onSuccess,
             onRowCallback: onRowdelete,
             message: deletemessage,
-            onError: onError
+            onError: onError,
+            widget: widget
           }));
-        case 37:
-          _context6.prev = 37;
-          _context6.t0 = _context6["catch"](1);
+        case 38:
+          _context6.prev = 38;
+          _context6.t0 = _context6["catch"](2);
           return _context6.abrupt("return", handleOperationResult("delete", null, _context6.t0, {
             showToast: showToast,
             onError: onError,
-            errormessage: errormessage
+            errormessage: errormessage,
+            widget: widget
           }));
-        case 40:
+        case 41:
         case "end":
           return _context6.stop();
       }
-    }, _callee6, null, [[1, 37]]);
+    }, _callee6, null, [[2, 38]]);
   }));
   return function handleDeleteOperation(_x11) {
     return _ref7.apply(this, arguments);

package/components/data/table/utils/groupHeaderUtils.js

@@ -0,0 +1,102 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasTableGroups = exports.generateHeaderRows = exports.calculateMaxDepth = exports.calculateColspan = void 0;
+/**
+ * Calculate the colspan for a group based on visible child columns
+ */
+var calculateColspan = exports.calculateColspan = function calculateColspan(group) {
+  var _countVisibleColumns = function countVisibleColumns(items) {
+    var count = 0;
+    items.forEach(function (item) {
+      if ("isGroup" in item && item.isGroup) {
+        // Recursively count columns in nested groups
+        count += _countVisibleColumns(item.columns);
+      } else {
+        // It's a column - check if it's visible
+        var column = item;
+        if (column.show !== false) {
+          count++;
+        }
+      }
+    });
+    return count;
+  };
+  var colspan = _countVisibleColumns(group.columns);
+  return colspan || 1; // Return at least 1 to avoid invalid colspan
+};
+
+/**
+ * Calculate the maximum depth of the hierarchical structure
+ */
+var _calculateMaxDepth = exports.calculateMaxDepth = function calculateMaxDepth(structure) {
+  var maxDepth = 1;
+  structure.forEach(function (item) {
+    if ("isGroup" in item && item.isGroup) {
+      var groupDepth = 1 + _calculateMaxDepth(item.columns);
+      maxDepth = Math.max(maxDepth, groupDepth);
+    }
+  });
+  return maxDepth;
+};
+
+/**
+ * Generate header rows with proper colspan and rowspan values
+ */
+var generateHeaderRows = exports.generateHeaderRows = function generateHeaderRows(structure, maxDepth) {
+  var headerRows = [];
+
+  // Initialize empty rows
+  for (var i = 0; i < maxDepth; i++) {
+    headerRows.push([]);
+  }
+  var _processStructure = function processStructure(items) {
+    var currentLevel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    items.forEach(function (item) {
+      if ("isGroup" in item && item.isGroup) {
+        // It's a group - add to current level with colspan
+        var groupItem = item;
+        var colspan = calculateColspan(groupItem);
+        headerRows[currentLevel].push({
+          isGroup: true,
+          field: groupItem.field,
+          displayName: groupItem.displayName || "",
+          colspan: colspan,
+          textAlignment: groupItem.textAlignment,
+          backgroundColor: groupItem.backgroundColor,
+          "class": groupItem["class"],
+          colClass: groupItem.colClass,
+          styles: groupItem.styles
+        });
+
+        // Process children at next level
+        _processStructure(groupItem.columns, currentLevel + 1);
+      } else {
+        // It's a column - add with rowspan to reach bottom
+        var column = item;
+        if (column.show !== false) {
+          var rowspan = maxDepth - currentLevel;
+          headerRows[currentLevel].push({
+            isGroup: false,
+            field: column.field || column.binding || "",
+            displayName: column.caption || column.displayName || "",
+            rowspan: rowspan,
+            column: column
+          });
+        }
+      }
+    });
+  };
+  _processStructure(structure);
+  return headerRows;
+};
+/**
+ * Check if the table has any groups
+ */
+var hasTableGroups = exports.hasTableGroups = function hasTableGroups(structure) {
+  return structure.some(function (item) {
+    return "isGroup" in item && item.isGroup;
+  });
+};