@datorama/core 21.4.0-rc.2 → 21.4.0-rc.5

package/fesm2015/datorama-core.js

@@ -10081,14 +10081,24 @@ let GridQuery = class GridQuery extends Query {
         return settings;
     }
     getSort() {
-        const { sort, colId } = this.api.grid.getSortModel().pop() || {};
-        const column = this.api.columns.getColumn(colId);
-        const secondaryColumns = this.api.columns.getSecondaryColumns();
-        const pivotedColumn = secondaryColumns && secondaryColumns.find(col => col.getColId() === colId);
-        const sortColumn = column || pivotedColumn;
-        const sortField = sortColumn && getColField(sortColumn.getColDef());
-        const pivotColIndex = secondaryColumns && pivotedColumn && secondaryColumns.indexOf(pivotedColumn);
-        return { colId: sortField, sort, pivotColIndex };
+        if (this.gridRef.gridOptions.pivotMode) {
+            const { sort, colId } = this.api.grid.getSortModel().pop() || {};
+            const column = this.api.columns.getColumn(colId);
+            const secondaryColumns = this.api.columns.getSecondaryColumns();
+            const pivotedColumn = secondaryColumns && secondaryColumns.find(col => col.getColId() === colId);
+            if (pivotedColumn) {
+                const uniquePivotParents = uniq(secondaryColumns.map(column => column.getParent()));
+                const secondaryColumn = secondaryColumns.find(col => col.getColId() === pivotedColumn.getColId());
+                const pivotColIndex = uniquePivotParents.indexOf(secondaryColumn.getParent());
+                return { colId: getColField(pivotedColumn.getColDef()), sort, pivotColIndex };
+            }
+            else if (column) {
+                return { colId: getColField(column.getColDef()), sort };
+            }
+        }
+        else {
+            return this.api.grid.getSortModel().pop();
+        }
     }
     selectSort() {
         return this.select(state => state.settings.sort);
@@ -10112,6 +10122,17 @@ let GridQuery = class GridQuery extends Query {
     selectFilter() {
         return this.select(state => state.settings.filter);
     }
+    filterChanged() {
+        return this.selectFilter().pipe(map$1(filter => {
+            return Object.keys(filter).reduce((filters, key) => {
+                if (filter[key]) {
+                    const { conditional, pivotFieldsMap } = filter[key];
+                    filters.push({ column: key, filter: conditional, pivotFieldsMap });
+                }
+                return filters;
+            }, []);
+        }));
+    }
     getSearchTerm() {
         return this.getValue().settings.searchTerm;
     }
@@ -10261,7 +10282,7 @@ var OperatorTypes;
 
 function validateStringCondition(rowValue, { condition, value: filterValue }) {
     const filterTextLowerCase = filterValue ? filterValue.toLowerCase() : '';
-    const valueLowerCase = rowValue ? rowValue.toLowerCase() : '';
+    const valueLowerCase = rowValue ? `${rowValue}`.toLowerCase() : '';
     switch (condition) {
         case DatoFilterConditions.EQUALS:
             return valueLowerCase === filterTextLowerCase;
@@ -10347,7 +10368,7 @@ function validateFilter({ row, api }, activeFilters) {
             const currentRowPivotKeys = row.parent.childrenMapped && getRowPivotKeys(row.parent.childrenMapped);
             const rowValue = api.getValue(filter, row);
             /** If value is under a pivoted column but doesn't match the filter pivot */
-            if (pivotKeys && !isArrayValuesEqual(pivotKeys, currentRowPivotKeys)) {
+            if (pivotKeys && pivotKeys.length > 0 && !isArrayValuesEqual(pivotKeys, currentRowPivotKeys)) {
                 return true;
             }
             if (conditional) {
@@ -11313,7 +11334,10 @@ let DatoGridFilterComponent = class DatoGridFilterComponent {
         const filter = {};
         filter.pivotKeys = this.pivotKeys;
         if (this.pivotColumn) {
-            filter.pivotFields = this.getPivotFields(this.pivotColumn.getParent());
+            filter.pivotFieldsMap = this.getPivotFields(this.pivotColumn.getParent()).reduce((fieldMap, field, index) => {
+                fieldMap[field] = this.pivotKeys[index];
+                return fieldMap;
+            }, {});
         }
         if (this.filterSections.Conditional) {
             this.setConditionalFilter(filter, conditional);
@@ -11626,10 +11650,11 @@ let DatoGridFilterComponent = class DatoGridFilterComponent {
      */
     getPivotFields(parent, fields = []) {
         const grandParent = parent.getParent();
+        const headerClass = parent.getOriginalColumnGroup().getColGroupDef().headerClass;
         if (grandParent) {
             this.getPivotFields(grandParent, fields);
         }
-        fields.push(parent.getOriginalColumnGroup().getColGroupDef().headerClass);
+        headerClass && fields.push(headerClass[0]);
         return fields;
     }
 };
@@ -13074,7 +13099,7 @@ let GridService = class GridService {
      */
     initPivotSecondaryColsProcess({ gridOptions }) {
         gridOptions.processSecondaryColDef = colDef => {
-            const api = colDef.headerComponentParams.gridQuery.api;
+            const api = colDef.headerComponentParams && colDef.headerComponentParams.gridQuery.api;
             if (api) {
                 const valueColumns = colDef.headerComponentParams.gridQuery.api.columns.getValueColumns();
                 const originalColDef = valueColumns
@@ -13091,8 +13116,22 @@ let GridService = class GridService {
         gridOptions.processSecondaryColGroupDef = (colGroupDef) => {
             if (colGroupDef.headerName) {
                 const { field, value } = JSON.parse(colGroupDef.headerName);
-                colGroupDef.headerClass = field;
+                colGroupDef.headerClass = [field];
                 colGroupDef.headerName = value;
+                if (colGroupDef.children && colGroupDef.children.length > 1) {
+                    colGroupDef.headerClass.push('group-pivot-cell');
+                }
+            }
+            else if (colGroupDef.children) {
+                const [colChild] = colGroupDef.children;
+                const pivotTotalColumnIds = colChild && colChild.pivotTotalColumnIds;
+                if (pivotTotalColumnIds && pivotTotalColumnIds.length > 0) {
+                    colGroupDef.headerClass = ['total-pivot-cell'];
+                    colGroupDef.headerName = 'Total';
+                }
+            }
+            else {
+                colGroupDef.headerClass = ['empty-pivot-header'];
             }
             if (colGroupDef.pivotKeys) {
                 colGroupDef.pivotKeys = colGroupDef.pivotKeys.map(key => JSON.parse(key).value);
@@ -13596,7 +13635,7 @@ let DatoGridControllerComponent = class DatoGridControllerComponent {
         this.gridService.setRows(data);
     }
     onFilterChanged() {
-        return this.gridQuery.selectFilter();
+        return this.gridQuery.filterChanged();
     }
     onSortChanged() {
         return this.gridQuery.selectSort();