@solidxai/core-ui 0.1.8-beta.19 → 0.1.8-beta.20

package/dist/components/core/kanban/SolidKanbanView.js

@@ -80,36 +80,78 @@ import { getMediaTypeFromUrl } from "../../../helpers/mediaType";
 import { showToast } from "../../../redux/features/toastSlice";
 import { usePathname } from "../../../hooks/usePathname";
 import { useSearchParams } from "../../../hooks/useSearchParams";
+import { solidGet } from "../../../http/solidHttp";
 import { SolidHeaderRequestStatus } from "../../common/SolidHeaderRequestStatus";
 import { SolidButton, SolidConfirmDialog, SolidDialog, SolidDialogBody, SolidDialogClose, SolidDialogHeader, SolidDialogSeparator, SolidDialogTitle, SolidIcon, } from "../../shad-cn-ui";
 import { FilterMatchMode } from "../filter/filterMatchMode";
+import { kebabCase } from "lodash";
+var getKanbanSortParam = function (sortValue) {
+    if (!sortValue) {
+        return "id:asc";
+    }
+    return sortValue.includes(":") ? sortValue : "".concat(sortValue, ":asc");
+};
+var createEmptyKanbanGroup = function (definition, recordsInSwimlane) { return ({
+    groupName: definition.value,
+    groupLabel: definition.label,
+    groupData: {
+        records: [],
+        meta: {
+            totalRecords: 0,
+            perPage: recordsInSwimlane,
+            currentPage: 1,
+            prevPage: null,
+            nextPage: null,
+        },
+    },
+}); };
+var mergeKanbanGroupsWithDefinitions = function (groupRecords, swimlaneDefinitions, recordsInSwimlane) {
+    if (!swimlaneDefinitions.length) {
+        return groupRecords;
+    }
+    var groupMap = new Map((groupRecords || []).map(function (group) {
+        var _a;
+        return [
+            String(group === null || group === void 0 ? void 0 : group.groupName),
+            __assign(__assign({}, group), { groupName: String((_a = group === null || group === void 0 ? void 0 : group.groupName) !== null && _a !== void 0 ? _a : "") }),
+        ];
+    }));
+    return swimlaneDefinitions.map(function (definition) {
+        var existingGroup = groupMap.get(definition.value);
+        if (existingGroup) {
+            return __assign(__assign({}, existingGroup), { groupName: definition.value, groupLabel: definition.label });
+        }
+        return createEmptyKanbanGroup(definition, recordsInSwimlane);
+    });
+};
 export var SolidKanbanView = function (params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     var visibleNavbar = useSelector(function (state) { var _a; return (_a = state.navbarState) === null || _a === void 0 ? void 0 : _a.visibleNavbar; });
     var dispatch = useDispatch();
     var solidGlobalSearchElementRef = useRef();
     var router = useRouter();
     var searchParams = useSearchParams();
     // TODO: The initial filter state will be created based on the fields which are present on this kanban view. 
-    var _w = useState(), filters = _w[0], setFilters = _w[1];
-    var _x = useState([]), toPopulate = _x[0], setToPopulate = _x[1];
-    var _y = useState([]), toPopulateMedia = _y[0], setToPopulateMedia = _y[1];
-    var _z = useState([]), actionsAllowed = _z[0], setActionsAllowed = _z[1];
-    var _0 = useState(false), showGlobalSearchElement = _0[0], setShowGlobalSearchElement = _0[1];
-    var _1 = useState(false), showArchived = _1[0], setShowArchived = _1[1];
+    var _m = useState(), filters = _m[0], setFilters = _m[1];
+    var _o = useState([]), toPopulate = _o[0], setToPopulate = _o[1];
+    var _p = useState([]), toPopulateMedia = _p[0], setToPopulateMedia = _p[1];
+    var _q = useState([]), actionsAllowed = _q[0], setActionsAllowed = _q[1];
+    var _r = useState(false), showGlobalSearchElement = _r[0], setShowGlobalSearchElement = _r[1];
+    var _s = useState(false), showArchived = _s[0], setShowArchived = _s[1];
     var sizeOptions = [
         { label: 'Compact', value: 'small', image: CompactImage },
         { label: 'Cozy', value: 'normal', image: CozyImage },
         { label: 'Comfortable', value: 'large', image: ComfortableImage }
     ];
-    var _2 = useState(sizeOptions[1].value), size = _2[0], setSize = _2[1];
-    var _3 = useState([]), viewModes = _3[0], setViewModes = _3[1];
-    var _4 = useState(""), groupByFieldName = _4[0], setGroupByFieldName = _4[1];
+    var _t = useState(sizeOptions[1].value), size = _t[0], setSize = _t[1];
+    var _u = useState([]), viewModes = _u[0], setViewModes = _u[1];
+    var _v = useState(""), groupByFieldName = _v[0], setGroupByFieldName = _v[1];
     var triggerCheckIfPermissionExists = useLazyCheckIfPermissionExistsQuery()[0];
-    var _5 = useState(false), openLightbox = _5[0], setOpenLightbox = _5[1];
-    var _6 = useState([]), lightboxUrls = _6[0], setLightboxUrls = _6[1];
-    var _7 = useState(), filterQueryString = _7[0], setFilterQueryString = _7[1];
-    var _8 = useState(false), isLayoutDialogVisible = _8[0], setLayoutDialogVisible = _8[1];
+    var _w = useState(false), openLightbox = _w[0], setOpenLightbox = _w[1];
+    var _x = useState([]), lightboxUrls = _x[0], setLightboxUrls = _x[1];
+    var _y = useState(), filterQueryString = _y[0], setFilterQueryString = _y[1];
+    var _z = useState(false), isLayoutDialogVisible = _z[0], setLayoutDialogVisible = _z[1];
+    var _0 = useState([]), swimlaneDefinitions = _0[0], setSwimlaneDefinitions = _0[1];
     var lightboxSlides = Array.isArray(lightboxUrls)
         ? lightboxUrls
             .map(function (item) {
@@ -188,7 +230,7 @@ export var SolidKanbanView = function (params) {
     }, {
         encodeValuesOnly: true,
     });
-    var _9 = useState({}), kanbanViewMetaData = _9[0], setKanbanViewMetaData = _9[1];
+    var _1 = useState({}), kanbanViewMetaData = _1[0], setKanbanViewMetaData = _1[1];
     var solidKanbanViewMetaData = useGetSolidViewLayoutQuery(kanbanViewMetaDataQs).data;
     var initialFilterMethod = function () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
@@ -283,56 +325,57 @@ export var SolidKanbanView = function (params) {
         }
     }, [solidKanbanViewMetaData]);
     // All kanban view state.
-    var _10 = useState([]), kanbanViewData = _10[0], setKanbanViewData = _10[1];
-    var _11 = useState({}), kanbanLoadMoreData = _11[0], setKanbanLoadMoreData = _11[1];
-    var _12 = useState(10), recordsInSwimlane = _12[0], setRecordsInSwimlane = _12[1];
-    var _13 = useState([]), selectedRecords = _13[0], setSelectedRecords = _13[1];
-    var _14 = useState(true), loading = _14[0], setLoading = _14[1];
-    var _15 = useState(false), isDialogVisible = _15[0], setDialogVisible = _15[1];
-    var _16 = useState(), createButtonUrl = _16[0], setCreateButtonUrl = _16[1];
-    var _17 = useState(), editButtonUrl = _17[0], setEditButtonUrl = _17[1];
-    var _18 = useState({}), createActionQueryParams = _18[0], setCreateActionQueryParams = _18[1];
-    var _19 = useState({}), editActionQueryParams = _19[0], setEditActionQueryParams = _19[1];
-    var _20 = useState(5), columnsCount = _20[0], setColumnsCount = _20[1];
-    var _21 = useState(1), swimLaneCurrentPageNumber = _21[0], setSwimLaneCurrentPageNumber = _21[1];
-    var _22 = useState(false), queryDataLoaded = _22[0], setQueryDataLoaded = _22[1];
-    var _23 = useState(false), showSaveFilterPopup = _23[0], setShowSaveFilterPopup = _23[1];
-    var _24 = useState(0), maxSwimLanesCount = _24[0], setMaxSwimLanesCount = _24[1];
+    var _2 = useState([]), kanbanViewData = _2[0], setKanbanViewData = _2[1];
+    var _3 = useState({}), kanbanLoadMoreData = _3[0], setKanbanLoadMoreData = _3[1];
+    var _4 = useState(10), recordsInSwimlane = _4[0], setRecordsInSwimlane = _4[1];
+    var _5 = useState([]), selectedRecords = _5[0], setSelectedRecords = _5[1];
+    var _6 = useState(true), loading = _6[0], setLoading = _6[1];
+    var _7 = useState(false), isDialogVisible = _7[0], setDialogVisible = _7[1];
+    var _8 = useState(), createButtonUrl = _8[0], setCreateButtonUrl = _8[1];
+    var _9 = useState(), editButtonUrl = _9[0], setEditButtonUrl = _9[1];
+    var _10 = useState({}), createActionQueryParams = _10[0], setCreateActionQueryParams = _10[1];
+    var _11 = useState({}), editActionQueryParams = _11[0], setEditActionQueryParams = _11[1];
+    var _12 = useState(5), columnsCount = _12[0], setColumnsCount = _12[1];
+    var _13 = useState(1), swimLaneCurrentPageNumber = _13[0], setSwimLaneCurrentPageNumber = _13[1];
+    var _14 = useState(false), queryDataLoaded = _14[0], setQueryDataLoaded = _14[1];
+    var _15 = useState(false), showSaveFilterPopup = _15[0], setShowSaveFilterPopup = _15[1];
+    var _16 = useState(0), maxSwimLanesCount = _16[0], setMaxSwimLanesCount = _16[1];
+    var _17 = useState([]), rawKanbanGroupRecords = _17[0], setRawKanbanGroupRecords = _17[1];
+    var _18 = useState(0), serverSwimLaneCount = _18[0], setServerSwimLaneCount = _18[1];
     var pathname = usePathname();
     // @ts-ignore
     var editBaseUrl = normalizeSolidListTreeKanbanActionPath(pathname, editButtonUrl || "form");
     // Get the kanban view data.
     // const [triggerGetSolidEntitiesForKanban, { data: solidEntityKanbanViewData, isLoading, error }] = useLazyGetSolidKanbanEntitiesQuery();
-    var _25 = useLazyGetSolidEntitiesQuery(), triggerGetSolidEntities = _25[0], solidEntityKanbanViewData = _25[1].data;
+    var _19 = useLazyGetSolidEntitiesQuery(), triggerGetSolidEntities = _19[0], solidEntityKanbanViewData = _19[1].data;
     // Delete mutation 
-    var _26 = useDeleteMultipleSolidEntitiesMutation(), deleteManySolidEntities = _26[0], _27 = _26[1], isDeleteSolidEntitiesLoading = _27.isLoading, isDeleteSolidEntitiesSucess = _27.isSuccess;
-    var _28 = usePatchUpdateSolidEntityMutation(), patchKanbanView = _28[0], isPatchKanbanViewLoading = _28[1].isLoading;
+    var _20 = useDeleteMultipleSolidEntitiesMutation(), deleteManySolidEntities = _20[0], _21 = _20[1], isDeleteSolidEntitiesLoading = _21.isLoading, isDeleteSolidEntitiesSucess = _21.isSuccess;
+    var _22 = usePatchUpdateSolidEntityMutation(), patchKanbanView = _22[0], isPatchKanbanViewLoading = _22[1].isLoading;
     // After data is fetched populate the kanban view state so as to be able to render the data. 
     useEffect(function () {
         var _a;
         if (solidEntityKanbanViewData) {
-            // Merge groupRecords by groupName: update existing, add new
-            setMaxSwimLanesCount(((_a = solidEntityKanbanViewData === null || solidEntityKanbanViewData === void 0 ? void 0 : solidEntityKanbanViewData.meta) === null || _a === void 0 ? void 0 : _a.totalRecords) || 0);
-            var groupRecords = (solidEntityKanbanViewData === null || solidEntityKanbanViewData === void 0 ? void 0 : solidEntityKanbanViewData.groupRecords) || [];
-            var groupMap_1 = new Map((kanbanViewData || []).map(function (g) { return [g.groupName, g]; }));
-            groupRecords.forEach(function (newGroup) {
-                groupMap_1.set(newGroup.groupName, newGroup);
-            });
-            var latestKanbanGroupData = Array.from(groupMap_1.values());
-            setKanbanViewData(latestKanbanGroupData);
-            var loadmoredata = Object.entries(latestKanbanGroupData).reduce(function (acc, _a) {
-                var value = _a[1];
-                acc[value.groupName] = {
-                    offset: (value.groupData.meta.currentPage - 1) * value.groupData.meta.perPage,
-                    limit: value.groupData.meta.perPage,
-                    count: value.groupData.meta.totalRecords
-                };
-                return acc;
-            }, {});
-            setKanbanLoadMoreData(loadmoredata);
+            setServerSwimLaneCount(((_a = solidEntityKanbanViewData === null || solidEntityKanbanViewData === void 0 ? void 0 : solidEntityKanbanViewData.meta) === null || _a === void 0 ? void 0 : _a.totalRecords) || 0);
+            setRawKanbanGroupRecords((solidEntityKanbanViewData === null || solidEntityKanbanViewData === void 0 ? void 0 : solidEntityKanbanViewData.groupRecords) || []);
             setLoading(false);
         }
     }, [solidEntityKanbanViewData]);
+    useEffect(function () {
+        var mergedKanbanGroupData = mergeKanbanGroupsWithDefinitions(rawKanbanGroupRecords, swimlaneDefinitions, recordsInSwimlane);
+        setKanbanViewData(mergedKanbanGroupData);
+        setMaxSwimLanesCount(swimlaneDefinitions.length > 0 ? swimlaneDefinitions.length : serverSwimLaneCount);
+        var loadmoredata = Object.entries(mergedKanbanGroupData).reduce(function (acc, _a) {
+            var _b, _c, _d, _e, _f, _g, _h, _j;
+            var value = _a[1];
+            acc[value.groupName] = {
+                offset: ((((_c = (_b = value.groupData) === null || _b === void 0 ? void 0 : _b.meta) === null || _c === void 0 ? void 0 : _c.currentPage) || 1) - 1) * (((_e = (_d = value.groupData) === null || _d === void 0 ? void 0 : _d.meta) === null || _e === void 0 ? void 0 : _e.perPage) || recordsInSwimlane),
+                limit: ((_g = (_f = value.groupData) === null || _f === void 0 ? void 0 : _f.meta) === null || _g === void 0 ? void 0 : _g.perPage) || recordsInSwimlane,
+                count: ((_j = (_h = value.groupData) === null || _h === void 0 ? void 0 : _h.meta) === null || _j === void 0 ? void 0 : _j.totalRecords) || 0
+            };
+            return acc;
+        }, {});
+        setKanbanLoadMoreData(loadmoredata);
+    }, [rawKanbanGroupRecords, recordsInSwimlane, serverSwimLaneCount, swimlaneDefinitions]);
     useEffect(function () {
         var _a, _b, _c, _d, _e, _f, _g;
         if (solidKanbanViewMetaData) {
@@ -361,11 +404,79 @@ export var SolidKanbanView = function (params) {
             }
         }
     }, [solidKanbanViewMetaData]);
+    useEffect(function () {
+        var loadSwimlaneDefinitions = function () { return __awaiter(void 0, void 0, void 0, function () {
+            var fieldMeta, layoutAttrs, staticDefinitions, orderBy, relationUserKeyField_1, response, records, relationDefinitions, error_1;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
+                    case 0:
+                        fieldMeta = (_b = (_a = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data) === null || _a === void 0 ? void 0 : _a.solidFieldsMetadata) === null || _b === void 0 ? void 0 : _b[groupByFieldName];
+                        layoutAttrs = ((_e = (_d = (_c = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data) === null || _c === void 0 ? void 0 : _c.solidView) === null || _d === void 0 ? void 0 : _d.layout) === null || _e === void 0 ? void 0 : _e.attrs) || {};
+                        if (!groupByFieldName || !fieldMeta) {
+                            setSwimlaneDefinitions([]);
+                            return [2 /*return*/];
+                        }
+                        if (fieldMeta.type === "selectionStatic" && Array.isArray(fieldMeta.selectionStaticValues)) {
+                            staticDefinitions = fieldMeta.selectionStaticValues
+                                .map(function (item) {
+                                var _a;
+                                var _b = String(item).split(":"), rawValue = _b[0], rawLabel = _b[1];
+                                var value = (rawValue !== null && rawValue !== void 0 ? rawValue : "").trim();
+                                var label = ((_a = rawLabel !== null && rawLabel !== void 0 ? rawLabel : rawValue) !== null && _a !== void 0 ? _a : "").trim();
+                                return { value: value, label: label };
+                            })
+                                .filter(function (item) { return item.value !== ""; });
+                            setSwimlaneDefinitions(staticDefinitions);
+                            return [2 /*return*/];
+                        }
+                        if (!(fieldMeta.type === "relation" &&
+                            fieldMeta.relationType === "many-to-one" &&
+                            fieldMeta.relationCoModelSingularName)) return [3 /*break*/, 4];
+                        _k.label = 1;
+                    case 1:
+                        _k.trys.push([1, 3, , 4]);
+                        orderBy = getKanbanSortParam(layoutAttrs.swimlanesOrderBy);
+                        relationUserKeyField_1 = ((_g = (_f = fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.relationModel) === null || _f === void 0 ? void 0 : _f.userKeyField) === null || _g === void 0 ? void 0 : _g.name) || "id";
+                        return [4 /*yield*/, solidGet("/".concat(kebabCase(fieldMeta.relationCoModelSingularName)), {
+                                params: {
+                                    offset: 0,
+                                    limit: 100,
+                                    sort: [orderBy],
+                                },
+                            })];
+                    case 2:
+                        response = _k.sent();
+                        records = ((_j = (_h = response === null || response === void 0 ? void 0 : response.data) === null || _h === void 0 ? void 0 : _h.data) === null || _j === void 0 ? void 0 : _j.records) || [];
+                        relationDefinitions = records
+                            .map(function (record) {
+                            var _a, _b, _c;
+                            return ({
+                                value: String((_a = record === null || record === void 0 ? void 0 : record.id) !== null && _a !== void 0 ? _a : ""),
+                                label: String((_c = (_b = record === null || record === void 0 ? void 0 : record[relationUserKeyField_1]) !== null && _b !== void 0 ? _b : record === null || record === void 0 ? void 0 : record.id) !== null && _c !== void 0 ? _c : ""),
+                            });
+                        })
+                            .filter(function (item) { return item.value !== ""; });
+                        setSwimlaneDefinitions(relationDefinitions);
+                        return [2 /*return*/];
+                    case 3:
+                        error_1 = _k.sent();
+                        console.error(ERROR_MESSAGES.API_ERROR, error_1);
+                        return [3 /*break*/, 4];
+                    case 4:
+                        setSwimlaneDefinitions([]);
+                        return [2 /*return*/];
+                }
+            });
+        }); };
+        loadSwimlaneDefinitions();
+    }, [groupByFieldName, solidKanbanViewMetaData]);
     // Fetch data after toPopulate has been populated...
     useEffect(function () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         if (solidKanbanViewMetaData) {
             var swimlanesCount = ((_c = (_b = (_a = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data.solidView) === null || _a === void 0 ? void 0 : _a.layout) === null || _b === void 0 ? void 0 : _b.attrs) === null || _c === void 0 ? void 0 : _c.swimlanesCount) || 5;
+            var resolvedSwimlanesCount = swimlaneDefinitions.length > 0 ? swimlaneDefinitions.length : swimlanesCount;
             if (groupByFieldName) {
                 var queryObject = getFilterObjectFromLocalStorage();
                 var queryString = "";
@@ -389,7 +500,7 @@ export var SolidKanbanView = function (params) {
                     // }
                     var queryData = {
                         offset: 0,
-                        limit: Number(queryObject.limit) + Number(queryObject.offset),
+                        limit: swimlaneDefinitions.length > 0 ? swimlaneDefinitions.length : Number(queryObject.limit) + Number(queryObject.offset),
                         // fields: queryObject.fields || [`${groupByFieldName}`, `count(${groupByFieldName})`],
                         groupBy: queryObject.groupBy || groupByFieldName,
                         // @ts-ignore
@@ -420,7 +531,7 @@ export var SolidKanbanView = function (params) {
                     var _o = initialFilterMethod(), recordsInSwimlane_2 = _o.recordsInSwimlane, toPopulate_2 = _o.toPopulate, toPopulateMedia_2 = _o.toPopulateMedia;
                     var queryData = {
                         offset: 0,
-                        limit: swimlanesCount,
+                        limit: resolvedSwimlanesCount,
                         // fields: [`${groupByFieldName}`, `count(${groupByFieldName})`],
                         groupBy: groupByFieldName,
                         populateMedia: toPopulateMedia_2,
@@ -447,7 +558,7 @@ export var SolidKanbanView = function (params) {
                 setSelectedRecords([]);
             }
         }
-    }, [isDeleteSolidEntitiesSucess, groupByFieldName, solidKanbanViewMetaData]);
+    }, [groupByFieldName, isDeleteSolidEntitiesSucess, solidKanbanViewMetaData, swimlaneDefinitions]);
     // clickable link allowing one to open the detail / form view.
     // handle bulk deletion
     var deleteBulk = function () {
@@ -465,7 +576,7 @@ export var SolidKanbanView = function (params) {
     };
     // Individual Swimlane Load More
     var handleLoadMore = function (groupByField) { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, offset, limit, queryData, queryString, data, newRecords, mergeData, updatedData, loadmoredata, error_1;
+        var _a, offset, limit, queryData, queryString, data, newRecords, mergeData, updatedData_1, error_2;
         var _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -511,22 +622,21 @@ export var SolidKanbanView = function (params) {
                         }
                         return originalData;
                     };
-                    updatedData = mergeData(kanbanViewData, newRecords, groupByField);
-                    setKanbanViewData(updatedData);
-                    loadmoredata = Object.entries(updatedData).reduce(function (acc, _a) {
-                        var value = _a[1];
-                        acc[value.groupName] = {
-                            offset: (value.groupData.meta.currentPage - 1) * value.groupData.meta.perPage,
-                            limit: value.groupData.meta.perPage,
-                            count: value.groupData.meta.totalRecords
-                        };
-                        return acc;
-                    }, {});
-                    setKanbanLoadMoreData(loadmoredata);
+                    updatedData_1 = mergeData(kanbanViewData, newRecords, groupByField);
+                    setKanbanViewData(updatedData_1);
+                    setRawKanbanGroupRecords(function (previousGroups) {
+                        var existingGroups = Array.isArray(previousGroups) ? previousGroups : [];
+                        return updatedData_1
+                            .filter(function (group) { var _a, _b; return (((_b = (_a = group.groupData) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.totalRecords) || 0) > 0; })
+                            .map(function (group) {
+                            var existingGroup = existingGroups.find(function (item) { return String(item.groupName) === String(group.groupName); });
+                            return existingGroup ? __assign(__assign({}, existingGroup), group) : group;
+                        });
+                    });
                     return [3 /*break*/, 4];
                 case 3:
-                    error_1 = _c.sent();
-                    console.error(ERROR_MESSAGES.LOAD_MORE_DATA, error_1);
+                    error_2 = _c.sent();
+                    console.error(ERROR_MESSAGES.LOAD_MORE_DATA, error_2);
                     return [3 /*break*/, 4];
                 case 4: return [2 /*return*/];
             }
@@ -535,10 +645,11 @@ export var SolidKanbanView = function (params) {
     // Handle drag-and-drop functionality
     // @ts-ignore
     var onDragEnd = function (result) { return __awaiter(void 0, void 0, void 0, function () {
-        var source, destination, sourceGroupName, destinationGroupName, sourceGroupIndex, destinationGroupIndex, sourceGroup, destinationGroup, sourceRecords, destinationRecords, movedItem, updatedItem, oldkanbanViewData, formData, kanbanUpdateResponse, error_2;
+        var source, destination, sourceGroupName, destinationGroupName, sourceGroupIndex, destinationGroupIndex, sourceGroup, destinationGroup, sourceRecords, destinationRecords, movedItem, updatedItem, oldkanbanViewData, formData, kanbanUpdateResponse, error_3;
         var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     source = result.source, destination = result.destination;
                     if (!destination)
@@ -569,16 +680,17 @@ export var SolidKanbanView = function (params) {
                     sourceRecords = __spreadArray([], sourceGroup.groupData.records, true);
                     destinationRecords = __spreadArray([], destinationGroup.groupData.records, true);
                     movedItem = sourceRecords.splice(source.index, 1)[0];
-                    updatedItem = __assign(__assign({}, movedItem), { status: destinationGroupName });
+                    updatedItem = groupByFieldName
+                        ? __assign(__assign({}, movedItem), (_a = {}, _a[groupByFieldName] = destinationGroupName, _a)) : movedItem;
                     // Add the updated item to the destination
                     destinationRecords.splice(destination.index, 0, updatedItem);
                     // Update the group data
                     sourceGroup.groupData.records = sourceRecords;
                     destinationGroup.groupData.records = destinationRecords;
                     oldkanbanViewData = structuredClone(kanbanViewData);
-                    _b.label = 1;
+                    _c.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, , 4]);
+                    _c.trys.push([1, 3, , 4]);
                     formData = new FormData();
                     formData.append(groupByFieldName, destinationGroupName);
                     // Update the kanbanViewData state
@@ -595,7 +707,7 @@ export var SolidKanbanView = function (params) {
                     });
                     return [4 /*yield*/, patchKanbanView({ id: +movedItem.id, data: formData }).unwrap()];
                 case 2:
-                    kanbanUpdateResponse = _b.sent();
+                    kanbanUpdateResponse = _c.sent();
                     if ((kanbanUpdateResponse === null || kanbanUpdateResponse === void 0 ? void 0 : kanbanUpdateResponse.statusCode) === 200) {
                         dispatch(showToast({ severity: "success", summary: ERROR_MESSAGES.IS_SUCCESS, detail: ERROR_MESSAGES.KANBAN_UPDATED }));
                     }
@@ -606,10 +718,10 @@ export var SolidKanbanView = function (params) {
                     }
                     return [3 /*break*/, 4];
                 case 3:
-                    error_2 = _b.sent();
+                    error_3 = _c.sent();
                     // 6. Handle 500 or network errors
-                    console.error(ERROR_MESSAGES.API_ERROR, error_2);
-                    dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.SOMETHING_WRONG, detail: ((_a = error_2 === null || error_2 === void 0 ? void 0 : error_2.data) === null || _a === void 0 ? void 0 : _a.message) || ERROR_MESSAGES.SOMETHING_WRONG }));
+                    console.error(ERROR_MESSAGES.API_ERROR, error_3);
+                    dispatch(showToast({ severity: "error", summary: ERROR_MESSAGES.SOMETHING_WRONG, detail: ((_b = error_3 === null || error_3 === void 0 ? void 0 : error_3.data) === null || _b === void 0 ? void 0 : _b.message) || ERROR_MESSAGES.SOMETHING_WRONG }));
                     setKanbanViewData(oldkanbanViewData);
                     return [3 /*break*/, 4];
                 case 4: return [2 /*return*/];
@@ -618,16 +730,17 @@ export var SolidKanbanView = function (params) {
     }); };
     // Handle SwimLane Pagination
     var handleSwimLanePagination = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var swimlanesCount, queryData, queryString, data, updatedData;
+        var swimlanesCount, resolvedSwimlanesCount, queryData, queryString, data_1;
         var _a, _b, _c, _d;
         return __generator(this, function (_e) {
             switch (_e.label) {
                 case 0:
                     if (!solidKanbanViewMetaData) return [3 /*break*/, 2];
                     swimlanesCount = ((_c = (_b = (_a = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data.solidView) === null || _a === void 0 ? void 0 : _a.layout) === null || _b === void 0 ? void 0 : _b.attrs) === null || _c === void 0 ? void 0 : _c.swimlanesCount) || 5;
+                    resolvedSwimlanesCount = swimlaneDefinitions.length > 0 ? swimlaneDefinitions.length : swimlanesCount;
                     queryData = {
                         offset: swimLaneCurrentPageNumber * swimlanesCount,
-                        limit: swimlanesCount,
+                        limit: resolvedSwimlanesCount,
                         // fields: [`${groupByFieldName}`, `count(${groupByFieldName})`],
                         groupBy: groupByFieldName,
                         populateMedia: toPopulateMedia,
@@ -647,10 +760,15 @@ export var SolidKanbanView = function (params) {
                     });
                     return [4 /*yield*/, triggerGetSolidEntities(queryString)];
                 case 1:
-                    data = _e.sent();
-                    if (data && ((_d = data === null || data === void 0 ? void 0 : data.data) === null || _d === void 0 ? void 0 : _d.groupRecords.length) > 0) {
-                        updatedData = __spreadArray(__spreadArray([], kanbanViewData, true), data.data.groupRecords, true);
-                        setKanbanViewData(updatedData);
+                    data_1 = _e.sent();
+                    if (data_1 && ((_d = data_1 === null || data_1 === void 0 ? void 0 : data_1.data) === null || _d === void 0 ? void 0 : _d.groupRecords.length) > 0) {
+                        setRawKanbanGroupRecords(function (previousGroups) {
+                            var groupMap = new Map((previousGroups || []).map(function (group) { return [String(group.groupName), group]; }));
+                            data_1.data.groupRecords.forEach(function (group) {
+                                groupMap.set(String(group.groupName), group);
+                            });
+                            return Array.from(groupMap.values());
+                        });
                     }
                     setSwimLaneCurrentPageNumber(swimLaneCurrentPageNumber + 1);
                     _e.label = 2;
@@ -662,7 +780,7 @@ export var SolidKanbanView = function (params) {
     var handleApplyCustomFilter = function (filterPredicates, persistFilter) {
         if (persistFilter === void 0) { persistFilter = false; }
         return __awaiter(void 0, void 0, void 0, function () {
-            var queryfilter, customFilter, updatedFilter, swimlanesCount, queryData, queryString, urlData, data, updatedData;
+            var queryfilter, customFilter, updatedFilter, swimlanesCount, resolvedSwimlanesCount, queryData, queryString, urlData, data;
             var _a, _b, _c, _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
@@ -692,9 +810,10 @@ export var SolidKanbanView = function (params) {
                         // Then update state
                         setFilters(updatedFilter);
                         swimlanesCount = ((_c = (_b = (_a = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data.solidView) === null || _a === void 0 ? void 0 : _a.layout) === null || _b === void 0 ? void 0 : _b.attrs) === null || _c === void 0 ? void 0 : _c.swimlanesCount) || 5;
+                        resolvedSwimlanesCount = swimlaneDefinitions.length > 0 ? swimlaneDefinitions.length : swimlanesCount;
                         queryData = {
                             offset: 0,
-                            limit: swimlanesCount,
+                            limit: resolvedSwimlanesCount,
                             // fields: [`${groupByFieldName}`, `count(${groupByFieldName})`],
                             groupBy: groupByFieldName,
                             populateMedia: toPopulateMedia,
@@ -731,8 +850,10 @@ export var SolidKanbanView = function (params) {
                         // Update the kanban view data with the new data based on filter
                         setSwimLaneCurrentPageNumber(1);
                         if (data && ((_d = data === null || data === void 0 ? void 0 : data.data) === null || _d === void 0 ? void 0 : _d.groupRecords.length) > 0) {
-                            updatedData = __spreadArray([], data.data.groupRecords, true);
-                            setKanbanViewData(updatedData);
+                            setRawKanbanGroupRecords(__spreadArray([], data.data.groupRecords, true));
+                        }
+                        else {
+                            setRawKanbanGroupRecords([]);
                         }
                         setSelectedRecords([]);
                         _e.label = 2;
@@ -756,13 +877,7 @@ export var SolidKanbanView = function (params) {
     }, [solidKanbanViewMetaData]);
     var kanbanViewTitle = (_b = (_a = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data) === null || _a === void 0 ? void 0 : _a.solidView) === null || _b === void 0 ? void 0 : _b.displayName;
     var entityDisplayName = ((_e = (_d = (_c = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data) === null || _c === void 0 ? void 0 : _c.solidView) === null || _d === void 0 ? void 0 : _d.model) === null || _e === void 0 ? void 0 : _e.displayName) || params.modelName;
-    var headerRequestStatusLabel = isDeleteSolidEntitiesLoading
-        ? "Deleting..."
-        : isPatchKanbanViewLoading
-            ? "Updating..."
-            : loading || !queryDataLoaded
-                ? "Loading..."
-                : null;
+    var headerRequestStatusLabel = isDeleteSolidEntitiesLoading ? "Deleting..." : isPatchKanbanViewLoading ? "Updating..." : loading || !queryDataLoaded ? "Loading..." : null;
     var toggleBothSidebars = function () {
         if (visibleNavbar) {
             dispatch(toggleNavbar()); // close both
@@ -771,13 +886,12 @@ export var SolidKanbanView = function (params) {
             dispatch(showNavbar()); // open both
         }
     };
+    console.log("Logging kanban data: ", solidKanbanViewMetaData);
     return (_jsxs("div", { className: "page-parent-wrapper solid-list-page-wrapper flex h-full min-h-0 overflow-hidden", children: [_jsx("div", { className: "solid-list-content h-full flex flex-column flex-grow-1", children: _jsxs("div", { className: "solid-list-surface solid-kanban-surface flex flex-column flex-1 min-h-0", children: [_jsxs("div", { className: "page-header solid-list-toolbar solid-kanban-toolbar flex-column lg:flex-row", children: [_jsxs("div", { className: "flex justify-content-between w-full", children: [_jsxs("div", { className: "flex gap-3 align-items-center w-full solid-list-toolbar-left", children: [params.embeded !== true &&
-                                                    _jsx("div", { className: "apps-icon block md:hidden cursor-pointer", onClick: toggleBothSidebars, children: _jsx(SolidIcon, { name: "si-th-large", "aria-hidden": true }) }), _jsx("p", { className: "m-0 view-title solid-text-wrapper", children: kanbanViewTitle }), ((_h = (_g = (_f = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data) === null || _f === void 0 ? void 0 : _f.solidView) === null || _g === void 0 ? void 0 : _g.layout) === null || _h === void 0 ? void 0 : _h.attrs.enableGlobalSearch) === true &&
-                                                    _jsx("div", { className: "hidden lg:flex", children: _jsx(SolidGlobalSearchElement, { viewType: "kanban", showSaveFilterPopup: showSaveFilterPopup, setShowSaveFilterPopup: setShowSaveFilterPopup, ref: solidGlobalSearchElementRef, viewData: solidKanbanViewMetaData, handleApplyCustomFilter: handleApplyCustomFilter }) })] }), _jsxs("div", { className: "flex align-items-center solid-header-buttons-wrapper solid-list-toolbar-actions", children: [_jsx(SolidHeaderRequestStatus, { label: headerRequestStatusLabel }), ((_l = (_k = (_j = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data) === null || _j === void 0 ? void 0 : _j.solidView) === null || _k === void 0 ? void 0 : _k.layout) === null || _l === void 0 ? void 0 : _l.attrs.enableGlobalSearch) === true &&
-                                                    _jsx("div", { className: "flex lg:hidden", children: _jsx(SolidButton, { type: "button", variant: "outline", size: "sm", className: "solid-icon-button", onClick: function () { return setShowGlobalSearchElement(!showGlobalSearchElement); }, "aria-label": "Toggle search", leftIcon: _jsx(SolidIcon, { name: "si-search", "aria-hidden": true }) }) }), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'create'))) && ((_p = (_o = (_m = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data) === null || _m === void 0 ? void 0 : _m.solidView) === null || _o === void 0 ? void 0 : _o.layout) === null || _p === void 0 ? void 0 : _p.attrs.create) !== false &&
-                                                    _jsx(SolidCreateButton, { createButtonUrl: createButtonUrl, createActionQueryParams: createActionQueryParams, responsiveIconOnly: true }), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'delete'))) && ((_s = (_r = (_q = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data) === null || _q === void 0 ? void 0 : _q.solidView) === null || _r === void 0 ? void 0 : _r.layout) === null || _s === void 0 ? void 0 : _s.attrs.delete) !== false && selectedRecords.length > 0 && _jsx(SolidButton, { type: "button", variant: "destructive", size: "sm", onClick: function () { return setDialogVisible(true); }, children: "Delete" }), _jsx(SolidButton, { type: "button", variant: "outline", size: "sm", className: "solid-icon-button", onClick: function () {
+                                                    _jsx("div", { className: "apps-icon block md:hidden cursor-pointer", onClick: toggleBothSidebars, children: _jsx(SolidIcon, { name: "si-th-large", "aria-hidden": true }) }), _jsx("p", { className: "m-0 view-title solid-text-wrapper", children: kanbanViewTitle }), _jsx("div", { className: "hidden lg:flex", children: _jsx(SolidGlobalSearchElement, { viewType: "kanban", showSaveFilterPopup: showSaveFilterPopup, setShowSaveFilterPopup: setShowSaveFilterPopup, ref: solidGlobalSearchElementRef, viewData: solidKanbanViewMetaData, handleApplyCustomFilter: handleApplyCustomFilter }) })] }), _jsxs("div", { className: "flex align-items-center solid-header-buttons-wrapper solid-list-toolbar-actions", children: [_jsx(SolidHeaderRequestStatus, { label: headerRequestStatusLabel }), _jsx("div", { className: "flex lg:hidden", children: _jsx(SolidButton, { type: "button", variant: "outline", size: "sm", className: "solid-icon-button", onClick: function () { return setShowGlobalSearchElement(!showGlobalSearchElement); }, "aria-label": "Toggle search", leftIcon: _jsx(SolidIcon, { name: "si-search", "aria-hidden": true }) }) }), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'create'))) && ((_h = (_g = (_f = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data) === null || _f === void 0 ? void 0 : _f.solidView) === null || _g === void 0 ? void 0 : _g.layout) === null || _h === void 0 ? void 0 : _h.attrs.create) !== false &&
+                                                    _jsx(SolidCreateButton, { createButtonUrl: createButtonUrl, createActionQueryParams: createActionQueryParams, responsiveIconOnly: true }), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'delete'))) && ((_l = (_k = (_j = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data) === null || _j === void 0 ? void 0 : _j.solidView) === null || _k === void 0 ? void 0 : _k.layout) === null || _l === void 0 ? void 0 : _l.attrs.delete) !== false && selectedRecords.length > 0 && _jsx(SolidButton, { type: "button", variant: "destructive", size: "sm", onClick: function () { return setDialogVisible(true); }, children: "Delete" }), _jsx(SolidButton, { type: "button", variant: "outline", size: "sm", className: "solid-icon-button", onClick: function () {
                                                         window.location.reload();
-                                                    }, "aria-label": "Refresh board", leftIcon: _jsx(SolidIcon, { name: "si-refresh", "aria-hidden": true }) }), _jsx(SolidKanbanViewConfigure, { solidKanbanViewMetaData: solidKanbanViewMetaData, modelName: params.modelName, actionsAllowed: actionsAllowed, viewModes: viewModes, setLayoutDialogVisible: setLayoutDialogVisible, setShowSaveFilterPopup: setShowSaveFilterPopup, filters: filters, handleRefreshView: function () { return window.location.reload(); } })] })] }), ((_v = (_u = (_t = solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data) === null || _t === void 0 ? void 0 : _t.solidView) === null || _u === void 0 ? void 0 : _u.layout) === null || _v === void 0 ? void 0 : _v.attrs.enableGlobalSearch) === true && showGlobalSearchElement && (_jsx("div", { className: "flex lg:hidden", children: _jsx(SolidGlobalSearchElement, { viewType: "kanban", showSaveFilterPopup: showSaveFilterPopup, setShowSaveFilterPopup: setShowSaveFilterPopup, ref: solidGlobalSearchElementRef, viewData: solidKanbanViewMetaData, handleApplyCustomFilter: handleApplyCustomFilter }) }))] }), _jsx("style", { children: ".p-datatable .p-datatable-loading-overlay {background-color: rgba(0, 0, 0, 0.0);}" }), solidKanbanViewMetaData && kanbanViewData &&
+                                                    }, "aria-label": "Refresh board", leftIcon: _jsx(SolidIcon, { name: "si-refresh", "aria-hidden": true }) }), _jsx(SolidKanbanViewConfigure, { solidKanbanViewMetaData: solidKanbanViewMetaData, modelName: params.modelName, actionsAllowed: actionsAllowed, viewModes: viewModes, setLayoutDialogVisible: setLayoutDialogVisible, setShowSaveFilterPopup: setShowSaveFilterPopup, filters: filters, handleRefreshView: function () { return window.location.reload(); } })] })] }), showGlobalSearchElement && (_jsx("div", { className: "flex lg:hidden", children: _jsx(SolidGlobalSearchElement, { viewType: "kanban", showSaveFilterPopup: showSaveFilterPopup, setShowSaveFilterPopup: setShowSaveFilterPopup, ref: solidGlobalSearchElementRef, viewData: solidKanbanViewMetaData, handleApplyCustomFilter: handleApplyCustomFilter }) }))] }), _jsx("style", { children: ".p-datatable .p-datatable-loading-overlay {background-color: rgba(0, 0, 0, 0.0);}" }), solidKanbanViewMetaData && kanbanViewData &&
                             _jsx(KanbanBoard, { groupByFieldName: groupByFieldName, kanbanViewData: kanbanViewData, maxSwimLanesCount: maxSwimLanesCount, solidKanbanViewMetaData: solidKanbanViewMetaData === null || solidKanbanViewMetaData === void 0 ? void 0 : solidKanbanViewMetaData.data, setKanbanViewData: setKanbanViewData, handleLoadMore: handleLoadMore, onDragEnd: onDragEnd, handleSwimLanePagination: handleSwimLanePagination, setLightboxUrls: setLightboxUrls, setOpenLightbox: setOpenLightbox, editButtonUrl: editBaseUrl })] }) }), _jsx(SolidConfirmDialog, { open: isDialogVisible, onCancel: onDeleteClose, onConfirm: deleteBulk, className: "solid-shadcn-confirm-dialog solid-delete-confirm-dialog", headerClassName: "solid-shadcn-dialog-head", bodyClassName: "solid-shadcn-dialog-body", footerClassName: "solid-shadcn-dialog-actions", separatorClassName: "solid-shadcn-dialog-sep", showSeparator: true, title: "Delete ".concat(entityDisplayName), message: _jsx("p", { className: "solid-shadcn-dialog-text", children: "Are you sure you want to delete the selected ".concat(entityDisplayName, " records?") }), confirmLabel: "Delete", cancelLabel: "Cancel" }), openLightbox && (_jsx(SolidLightbox, { open: openLightbox, slides: lightboxSlides, onClose: function () { return setOpenLightbox(false); } })), _jsxs(SolidDialog, { open: isLayoutDialogVisible, onOpenChange: setLayoutDialogVisible, className: "solid-kanban-layout-dialog", style: { width: "min(800px, calc(100vw - 32px))" }, children: [_jsxs(SolidDialogHeader, { children: [_jsx(SolidDialogTitle, { children: "Change Kanban Layout" }), _jsx(SolidDialogClose, {})] }), _jsx(SolidDialogSeparator, {}), _jsx(SolidDialogBody, { className: "solid-kanban-layout-dialog-body", children: _jsx(KanbanUserViewLayout, { solidKanbanViewMetaData: solidKanbanViewMetaData, setLayoutDialogVisible: setLayoutDialogVisible }) })] })] }));
 };
 //# sourceMappingURL=SolidKanbanView.js.map