@nova-design-system/nova-webcomponents 3.1.0 → 3.2.0

package/dist/collection/components/nv-datagrid/nv-datagrid.js

@@ -196,34 +196,37 @@ export class NvDatagrid {
                 header: col.header,
                 accessor: col.accessor,
                 repeatTemplate: col.hasAttribute('repeat-template'),
+                group: col.group,
             };
             this.columnData.push(colData);
         });
+        console.info('cacheTemplates this.columnData:', this.columnData);
     }
     parseDataAndColumns() {
-        if (this.dataJson) {
-            this.parseJsonData(this.dataJson);
-        }
-        else if (this.data && this.data.length > 0) {
+        if (this.data && this.data.length > 0) {
             this.parseDataArray(this.data, this.parsedData);
         }
-        if (this.columnsJson) {
-            this.parseJsonColumns(this.columnsJson, this.parsedColumns);
-        }
-        else if (this.columns && this.columns.length > 0) {
+        if (this.columns && this.columns.length > 0) {
             this.parseColumnsArray(this.columns, this.parsedColumns);
         }
         else if (this.headerTemplateCache.size > 0) {
             const headerKeys = Array.from(this.headerTemplateCache.keys());
-            const arrayColumnsConfig = headerKeys.map(key => (Object.assign({}, { accessor: key, header: key ? key.charAt(0).toUpperCase() + key.slice(1) : '' })));
+            const arrayColumnsConfig = headerKeys.map(key => {
+                var _a, _b;
+                return (Object.assign({}, { accessor: key, header: key ? key.charAt(0).toUpperCase() + key.slice(1) : '', group: (_b = (_a = this.columnData.find(x => x.accessor === key)) === null || _a === void 0 ? void 0 : _a.group) !== null && _b !== void 0 ? _b : 'ungrouped' }));
+            });
             this.parseColumnsArray(arrayColumnsConfig, this.parsedColumns);
         }
         else if (this.parsedData.length > 0) {
             const firstRow = this.parsedData[0];
-            const arrayColumnsConfig = Object.keys(firstRow).map(key => ({
-                accessor: key,
-                header: key.charAt(0).toUpperCase() + key.slice(1),
-            }));
+            const arrayColumnsConfig = Object.keys(firstRow).map(key => {
+                var _a, _b;
+                return ({
+                    accessor: key,
+                    header: key.charAt(0).toUpperCase() + key.slice(1),
+                    group: (_b = (_a = this.columnData.find(x => x.accessor === key)) === null || _a === void 0 ? void 0 : _a.group) !== null && _b !== void 0 ? _b : 'ungrouped',
+                });
+            });
             if (this.autoGenerateColumns) {
                 this.parseColumnsArray(arrayColumnsConfig, this.parsedColumns);
             }
@@ -266,6 +269,7 @@ export class NvDatagrid {
         var _a, _b, _c, _d;
         // Clear the previous table instance (if any)
         this.table = null;
+        console.info('initializeTable this.columnData:', this.columnData);
         // Set default options for the table
         const tableOptions = {
             columns: [],
@@ -326,10 +330,14 @@ export class NvDatagrid {
             if (hasData) {
                 // No parsed columns and data is available
                 const firstRow = this.parsedData[0];
-                const arrayColumnsConfig = Object.keys(firstRow).map(key => ({
-                    accessor: key,
-                    header: key.charAt(0).toUpperCase() + key.slice(1),
-                }));
+                const arrayColumnsConfig = Object.keys(firstRow).map(key => {
+                    var _a, _b;
+                    return ({
+                        accessor: key,
+                        header: key.charAt(0).toUpperCase() + key.slice(1),
+                        group: (_b = (_a = this.columnData.find(x => x.accessor === key)) === null || _a === void 0 ? void 0 : _a.group) !== null && _b !== void 0 ? _b : 'ungrouped',
+                    });
+                });
                 if (this.autoGenerateColumns) {
                     this.parseColumnsArray(arrayColumnsConfig, this.parsedColumns);
                 }
@@ -486,72 +494,76 @@ export class NvDatagrid {
     }
     // Helper function to generate column definitions
     generateColumns(validColumns, tableOptions) {
-        let generatedColumns = [];
+        console.info('generateColumns this.columnData:', this.columnData);
+        console.info('generateColumns validColumns:', validColumns);
+        let processedColumns = validColumns || [];
         const columnHelper = createColumnHelper();
-        if (validColumns.length > 0) {
-            // Use defined columns
-            generatedColumns = validColumns.map(column => {
+        // If no columns provided or autoGenerateColumns is true, generate them from data
+        if ((!validColumns && tableOptions.data && tableOptions.data.length > 0) ||
+            (validColumns.length <= 0 &&
+                tableOptions.data &&
+                tableOptions.data.length > 0)) {
+            const sampleRow = tableOptions.data[0];
+            processedColumns = Object.keys(sampleRow).map(key => {
                 var _a, _b;
-                const identifiedColumnDef = {
-                    header: (_b = (this.renderTemplate(this.headerTemplateCache.get(column.accessor), (_a = column.header) !== null && _a !== void 0 ? _a : column.accessor, null) ||
-                        column.header)) !== null && _b !== void 0 ? _b : column.accessor,
-                    cell: (info) => {
-                        var _a, _b, _c;
-                        const value = info.getValue();
-                        const cellAccessors = column.accessor;
-                        const row = info.row;
-                        return ((_a = this.columnData.find(x => x.accessor === cellAccessors)) === null || _a === void 0 ? void 0 : _a.repeatTemplate) && Array.isArray(value)
-                            ? value.map((item) => {
-                                var _a, _b;
-                                return (_b = (_a = (this.renderTemplate(this.templateCache.get(cellAccessors), item, row) ||
-                                    item)) !== null && _a !== void 0 ? _a : value) !== null && _b !== void 0 ? _b : this.fallbackValue;
-                            })
-                            : (_c = (_b = (this.renderTemplate(this.templateCache.get(cellAccessors), value, row) ||
-                                value)) !== null && _b !== void 0 ? _b : value) !== null && _c !== void 0 ? _c : this.fallbackValue;
-                    },
-                    enableGlobalFilter: this.enableGlobalFilter,
-                    enableSorting: this.enableSorting,
-                };
-                if (this.enableSorting) {
-                    identifiedColumnDef.sortUndefined = 'last'; // Force undefined values to the end
-                    identifiedColumnDef.sortDescFirst = false; // First sort order will be ascending (nullable values can mess up auto detection of sort order)
-                }
-                return columnHelper.accessor(column.accessor, identifiedColumnDef);
+                return ({
+                    header: key.charAt(0).toUpperCase() + key.slice(1),
+                    accessor: key,
+                    group: (_b = (_a = this.columnData.find(x => x.accessor === key)) === null || _a === void 0 ? void 0 : _a.group) !== null && _b !== void 0 ? _b : 'ungrouped',
+                    headerSlot: null,
+                    cellSlot: null,
+                });
             });
         }
-        else if (tableOptions.data && tableOptions.data.length > 0) {
-            // Generate columns from data keys
-            const sampleRow = tableOptions.data[0];
-            generatedColumns = Object.keys(sampleRow).map(key => {
-                const identifiedColumnDef = {
-                    header: this.renderTemplate(this.headerTemplateCache.get(key), key.charAt(0).toUpperCase() + key.slice(1), null) || key.charAt(0).toUpperCase() + key.slice(1), // Capitalize key for header
-                    cell: (info) => {
-                        var _a, _b, _c;
-                        const value = info.getValue();
-                        const cellAccessors = key;
-                        const row = info.row;
-                        return ((_a = this.columnData.find(x => x.accessor === cellAccessors)) === null || _a === void 0 ? void 0 : _a.repeatTemplate) && Array.isArray(value)
-                            ? value.map((item) => {
-                                var _a, _b;
-                                return (_b = (_a = (this.renderTemplate(this.templateCache.get(cellAccessors), item, row) ||
-                                    item)) !== null && _a !== void 0 ? _a : value) !== null && _b !== void 0 ? _b : this.fallbackValue;
-                            })
-                            : (_c = (_b = (this.renderTemplate(this.templateCache.get(cellAccessors), value, row) ||
-                                value)) !== null && _b !== void 0 ? _b : value) !== null && _c !== void 0 ? _c : this.fallbackValue;
-                    },
-                    enableGlobalFilter: this.enableGlobalFilter,
-                    enableSorting: this.enableSorting,
-                };
-                if (this.enableSorting) {
-                    identifiedColumnDef.sortUndefined = 'last'; // Force undefined values to the end
-                    identifiedColumnDef.sortDescFirst = false; // First sort order will be ascending (nullable values can mess up auto detection of sort order)
-                }
-                return columnHelper.accessor(key, identifiedColumnDef);
+        // Group columns by their group property
+        const groupedColumns = processedColumns.reduce((acc, column) => {
+            let group = column.group || 'ungrouped';
+            if (group == 'ungrouped') {
+                group = group + processedColumns.findIndex(x => x == column);
+            }
+            if (!acc[group]) {
+                acc[group] = [];
+            }
+            acc[group].push(column);
+            return acc;
+        }, {});
+        // Transform each column into a ColumnDef
+        const createColumnDef = (column) => {
+            var _a, _b, _c;
+            return columnHelper.accessor(column.accessor, {
+                header: (_c = (_b = this.renderTemplate(this.headerTemplateCache.get(column.accessor), (_a = column.header) !== null && _a !== void 0 ? _a : column.accessor, null)) !== null && _b !== void 0 ? _b : column.header) !== null && _c !== void 0 ? _c : column.accessor,
+                cell: (info) => {
+                    var _a, _b, _c;
+                    const value = info.getValue();
+                    const row = info.row;
+                    return ((_a = this.columnData.find(x => x.accessor === column.accessor)) === null || _a === void 0 ? void 0 : _a.repeatTemplate) && Array.isArray(value)
+                        ? value.map((item) => {
+                            var _a, _b, _c;
+                            return (_c = (_b = (_a = this.renderTemplate(this.templateCache.get(column.accessor), item, row)) !== null && _a !== void 0 ? _a : item) !== null && _b !== void 0 ? _b : value) !== null && _c !== void 0 ? _c : this.fallbackValue;
+                        })
+                        : (_c = (_b = this.renderTemplate(this.templateCache.get(column.accessor), value, row)) !== null && _b !== void 0 ? _b : value) !== null && _c !== void 0 ? _c : this.fallbackValue;
+                },
+                sortUndefined: 'last',
+                sortDescFirst: false,
+                enableSorting: this.enableSorting, // Explicitly set enableSorting based on the sorting prop
+                enableGlobalFilter: this.enableGlobalFilter, // Explicity set enableGlobalFilter based on the globalFiltering prop
             });
-        }
-        else {
-            // No columns and no data
-        }
+        };
+        // Create the final column structure
+        let generatedColumns = Object.entries(groupedColumns)
+            .map(([groupName, groupColumns]) => {
+            if (groupName.includes('ungrouped')) {
+                return groupColumns.map(createColumnDef);
+            }
+            return {
+                id: groupName,
+                header: groupName,
+                columns: groupColumns.map(createColumnDef),
+                enableSorting: this.enableSorting, // Also apply to column groups
+                enableGlobalFilter: this.enableGlobalFilter, // Also apply to column groups
+            };
+        })
+            .flat();
         if (this.enableRowSelection) {
             const rowSelection = columnHelper.accessor('select', {
                 header: ({ table }) => {
@@ -857,9 +869,9 @@ export class NvDatagrid {
         const sortIcon = this.getArrowSorting(header);
         const handleClick = this.createSortingClickHandler(header);
         if (this.enableRowSelection) {
-            return (h("th", { key: header.id }, content, " "));
+            return (h("th", { key: header.id, colSpan: header.colSpan }, content, " "));
         }
-        const returnHtml = (h("th", { key: header.id }, h("button", { type: "button", class: isSortable
+        const returnHtml = (h("th", { key: header.id, colSpan: header.colSpan }, h("button", { type: "button", class: isSortable
                 ? 'w-full text-left cursor-pointer select-none bg-transparent border-none p-0 m-0 focus:outline-none'
                 : 'w-full text-left bg-transparent border-none p-0 m-0 cursor-default', onClick: handleClick, title: sortTitle }, h("span", { class: "inline-flex items-center gap-1" }, content, sortIcon))));
         return returnHtml;
@@ -880,29 +892,9 @@ export class NvDatagrid {
     parseColumns(newValue, oldValue = []) {
         this.parseColumnsArray(newValue, oldValue);
     }
-    parseJsonColumns(newValue, oldValue) {
-        try {
-            const newItems = newValue ? JSON.parse(newValue) : [];
-            this.parseColumnsArray(newItems, oldValue);
-        }
-        catch (e) {
-            console.error('Invalid JSON format for columnsJson:', e.message);
-            this.parsedColumns = [];
-        }
-    }
     parseData(newValue, oldValue = []) {
         this.parseDataArray(newValue, oldValue);
     }
-    parseJsonData(newValue) {
-        try {
-            const newItems = newValue ? JSON.parse(newValue) : [];
-            this.parseDataArray(newItems, this.parsedData);
-        }
-        catch (e) {
-            console.error('Invalid JSON format for dataJson:', e.message);
-            this.parsedData = [];
-        }
-    }
     handleParsedChange() {
         this.initializeTable();
     }
@@ -994,7 +986,7 @@ export class NvDatagrid {
         const rows = !this.table || this.table === undefined || this.parsedData.length === 0
             ? []
             : (_c = (_b = this.table) === null || _b === void 0 ? void 0 : _b.getRowModel()) === null || _c === void 0 ? void 0 : _c.rows;
-        return (h(Host, { key: '7ed48645de6272bb3fed7897406e2a798021bba2' }, h("div", { key: '4ae6135c7ca302e06c3d26509dbf813128631a2e', class: "hidden" }, h("slot", { key: '3f8078b877a4e2ebe46842fc3a52d7059cb3cc68' })), h("slot", { key: 'c97cb30a0ce80dc8c25c2b855eb6086937dbe76b', name: "before" }), this.enableGlobalFilter && this.table && (h("div", { key: '68cd75ed6ecad3de049797ebfe7787f5a0b357fa', class: `search-container justify-${this.globalFilterPosition}` }, h("nv-fieldtext", { key: '80b4f8b50c3dda39555597a44707f3a296fbb8e6', value: this.globalFilterSearchTerm, onInput: this.handleGlobalFilteringOnInput, placeholder: "Search all columns..." }))), this.parsedColumns.length === 0 && this.parsedData.length === 0 ? (h("div", { class: "no-data" }, this.noColumnsNoDataMessage)) : (h("div", null, h("table", null, this.parsedColumns.length > 0 && headerGroups.length > 0 && (h("thead", null, this.parsedColumns.length > 0 && headerGroups
+        return (h(Host, { key: '90be657fa9c7f8755391f8d91418399de742ae1f' }, h("div", { key: 'f28596438b7c9c22b34789236c5faa644938d1dc', class: "hidden" }, h("slot", { key: 'fdc1670cc6bafb5f1efa8c63d41acbfd15659de6' })), h("slot", { key: '65afa2282af4842bcb23f8baa592545fe3b74fa3', name: "before" }), this.enableGlobalFilter && this.table && (h("div", { key: '8628a23712471690b6a6239a289dd8263aed423c', class: `search-container justify-${this.globalFilterPosition}` }, h("nv-fieldtext", { key: '42c56dd6ba426e2045c02b3754fae3562632c49f', value: this.globalFilterSearchTerm, onInput: this.handleGlobalFilteringOnInput, placeholder: "Search all columns..." }))), this.parsedColumns.length === 0 && this.parsedData.length === 0 ? (h("div", { class: "no-data" }, this.noColumnsNoDataMessage)) : (h("div", null, h("table", null, this.parsedColumns.length > 0 && headerGroups.length > 0 && (h("thead", null, this.parsedColumns.length > 0 && headerGroups
             ? headerGroups === null || headerGroups === void 0 ? void 0 : headerGroups.map(headerGroup => (h("tr", { key: headerGroup.id }, headerGroup.headers.map(header => {
                 return this.getHeaderCell(header);
             }))))
@@ -1005,7 +997,7 @@ export class NvDatagrid {
                 return (h("td", { key: cell.id, "data-row-id": rowId }, this.flexRender(cell.column.columnDef.cell, cell.getContext())));
             })));
         }))), this.table && this.enableRowSelection ? (h("tfoot", null, h("tr", null, h("td", { colSpan: 20 }, this.enableRowSelection && this.table ? (h("div", null, this.rowSelectionState &&
-            Object.keys(this.rowSelectionState).length > 0 ? (h("span", null, Object.keys(this.rowSelectionState).length, " of", ' ', ((_e = (_d = this.table.getPreFilteredRowModel()) === null || _d === void 0 ? void 0 : _d.rows) === null || _e === void 0 ? void 0 : _e.length) || 0, ' ', "Total Rows Selected")) : (h("span", null, "No rows selected")))) : null)))) : null), this.getPagination())), h("slot", { key: 'f7209e67ff423310bb4b59b866f486ade897781a', name: "after" })));
+            Object.keys(this.rowSelectionState).length > 0 ? (h("span", null, Object.keys(this.rowSelectionState).length, " of", ' ', ((_e = (_d = this.table.getPreFilteredRowModel()) === null || _d === void 0 ? void 0 : _d.rows) === null || _e === void 0 ? void 0 : _e.length) || 0, ' ', "Total Rows Selected")) : (h("span", null, "No rows selected")))) : null)))) : null), this.getPagination())), h("slot", { key: 'e1641d8fd103b0802e1df4f0848f0de921260065', name: "after" })));
     }
     static get is() { return "nv-datagrid"; }
     static get originalStyleUrls() {
@@ -1074,50 +1066,6 @@ export class NvDatagrid {
                 "setter": false,
                 "defaultValue": "[]"
             },
-            "dataJson": {
-                "type": "string",
-                "mutable": false,
-                "complexType": {
-                    "original": "string",
-                    "resolved": "string",
-                    "references": {}
-                },
-                "required": false,
-                "optional": true,
-                "docs": {
-                    "tags": [{
-                            "name": "example",
-                            "text": "`[{ \"name\": \"Alice\", \"age\": 25 }, { \"name\": \"Bob\", \"age\": 30 }]`"
-                        }],
-                    "text": "The data to display in the data grid.\nIt can be passed directly as an array of objects or as a JSON string.\nIf both `data` and `dataJson` are provided, `data` takes precedence."
-                },
-                "getter": false,
-                "setter": false,
-                "attribute": "data-json",
-                "reflect": true
-            },
-            "columnsJson": {
-                "type": "string",
-                "mutable": false,
-                "complexType": {
-                    "original": "string",
-                    "resolved": "string",
-                    "references": {}
-                },
-                "required": false,
-                "optional": true,
-                "docs": {
-                    "tags": [{
-                            "name": "example",
-                            "text": "`[{\"header\":\"Name\",\"accessor\":\"name\"},{\"header\":\"Age\",\"accessor\":\"age\"},{\"header\":\"Email\",\"accessor\":\"email\"}]`"
-                        }],
-                    "text": "The columns to display in the data grid.\nIt can be passed directly as an array of objects or as a JSON string.\nIf both `columns` and `columnsJson` are provided, `columns` takes precedence."
-                },
-                "getter": false,
-                "setter": false,
-                "attribute": "columns-json",
-                "reflect": true
-            },
             "fallbackValue": {
                 "type": "string",
                 "mutable": false,
@@ -1421,15 +1369,9 @@ export class NvDatagrid {
         return [{
                 "propName": "columns",
                 "methodName": "parseColumns"
-            }, {
-                "propName": "columnsJson",
-                "methodName": "parseJsonColumns"
             }, {
                 "propName": "data",
                 "methodName": "parseData"
-            }, {
-                "propName": "dataJson",
-                "methodName": "parseJsonData"
             }, {
                 "propName": "parsedColumns",
                 "methodName": "handleParsedChange"