@adaptabletools/adaptable 18.0.0-canary.19 → 18.0.0-canary.20

package/src/agGrid/AdaptableAgGrid.js

@@ -254,6 +254,7 @@ export class AdaptableAgGrid {
     async _initAdaptableAgGrid(config) {
         var _a, _b;
         // Phase 1: Preprocess Adaptable Options
+        this._isDetailGrid = config.isDetailGrid === true;
         this.lifecycleState = 'preprocessOptions';
         this._rawAdaptableOptions = config.adaptableOptions;
         if (StringExtensions.IsNullOrEmptyOrWhiteSpace(this._rawAdaptableOptions.adaptableId)) {
@@ -458,15 +459,13 @@ export class AdaptableAgGrid {
     }
     refreshQuickFilter() {
         const isQuickFilterVisible = this.api.internalApi.getSystemState().IsQuickFilterVisible;
-        const isQuickFilterAvailable = this.isQuickFilterAvailable();
-        if (isQuickFilterVisible === isQuickFilterAvailable) {
-            return;
-        }
-        if (isQuickFilterAvailable) {
-            this.api.columnFilterApi.showQuickFilterBar();
-        }
-        else {
-            this.api.columnFilterApi.hideQuickFilterBar();
+        if (this.isQuickFilterAvailable()) {
+            if (isQuickFilterVisible) {
+                this.api.columnFilterApi.showQuickFilterBar();
+            }
+            else {
+                this.api.columnFilterApi.hideQuickFilterBar();
+            }
         }
     }
     applyColumnFiltering() {
@@ -892,6 +891,17 @@ export class AdaptableAgGrid {
             // we need this here just to register the original excelStyles in the service
             return original_excelStyles;
         });
+        /**
+         * `processPivotResultColDef`
+         */
+        this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'processPivotResultColDef', () => {
+            return (colDef) => {
+                if (this.adaptableOptions.columnFilterOptions.useAdaptableColumnFiltering) {
+                    colDef.floatingFilter = false;
+                    colDef.filter = false;
+                }
+            };
+        });
         /**
          * `columnTypes`
          */
@@ -954,6 +964,9 @@ export class AdaptableAgGrid {
             return revertedDateTypeDefinitions;
         });
     }
+    isDetailGrid() {
+        return this._isDetailGrid;
+    }
     /**
      * Either initializes the AG Grid instance or delegates it to the framework wrappers (React/Anglar)
      */
@@ -1033,7 +1046,9 @@ export class AdaptableAgGrid {
                 else {
                     if (!isSpecialColDef(colDef)) {
                         // if it's not a special column, return it as is
-                        return colDef;
+                        // without a minWidth, columns in details grid are VERY wide
+                        // so the line below fixes https://github.com/AdaptableTools/adaptable/issues/2559
+                        return Object.assign({ minWidth: 10 }, colDef);
                     }
                     const newlyCreatedSpecialColDef = specialColDefs.find((specialColDef) => specialColDef.colId === colDef.colId);
                     if (newlyCreatedSpecialColDef) {
@@ -1041,7 +1056,9 @@ export class AdaptableAgGrid {
                         processedSpecialColDefIds.push(colDef.colId);
                         // merge the user defined colDef with the special col def
                         // this way the user may provide some custom settings for the special col def (tooltip, etc)
-                        const mergedColDef = Object.assign(Object.assign({}, colDef), newlyCreatedSpecialColDef);
+                        const mergedColDef = Object.assign(Object.assign({ 
+                            // see above comment for minWidth
+                            minWidth: 10 }, colDef), newlyCreatedSpecialColDef);
                         return mergedColDef;
                     }
                     else {
@@ -1349,6 +1366,7 @@ export class AdaptableAgGrid {
         // ADD filter event
         this.agGridAdapter.getAgGridApi().addGlobalListener((this.listenerGlobalColumnEventsThatTriggerAutoLayoutSave = (type) => {
             if (columnEventsThatTriggersAutoLayoutSave.indexOf(type) > -1) {
+                this.logger.info('Column Event Triggering Auto Layout Save', type);
                 this.debouncedSaveGridLayout();
             }
         }));
@@ -1649,7 +1667,7 @@ export class AdaptableAgGrid {
             // TODO AFL MIG: check why this assertion is here
             .getAllDisplayedColumnGroups();
         const groupsCount = {};
-        const colsToGroups = columnGroupChildren.reduce((acc, columnGroup) => {
+        const colsToGroups = (columnGroupChildren !== null && columnGroupChildren !== void 0 ? columnGroupChildren : []).reduce((acc, columnGroup) => {
             var _a, _b, _c;
             if (!((_b = (_a = columnGroup.getProvidedColumnGroup) === null || _a === void 0 ? void 0 : _a.call(columnGroup)) === null || _b === void 0 ? void 0 : _b.getColGroupDef())) {
                 return acc;
@@ -2181,8 +2199,9 @@ export class AdaptableAgGrid {
         });
         this.deriveAdaptableColumnStateFromAgGrid();
     }
-    getSortedColumnStateForVisibleColumns(visibleColumnList, columnState) {
+    getSortedColumnStateForVisibleColumns(visibleColumnList, columnState, isPivot) {
         columnState = columnState || this.agGridAdapter.getAgGridApi().getColumnState();
+        const pivotMode = isPivot !== null && isPivot !== void 0 ? isPivot : this.api.layoutApi.isCurrentLayoutPivot();
         const NewVisibleColumnIdsMap = visibleColumnList.reduce((acc, colId, index) => {
             acc[colId] = index;
             return acc;
@@ -2201,6 +2220,19 @@ export class AdaptableAgGrid {
             const colId2 = colState2.colId;
             const originalIndex1 = columnsStateIndexes[colId1];
             const originalIndex2 = columnsStateIndexes[colId2];
+            if (pivotMode) {
+                const isRowGroup1 = this.api.columnApi.isAutoRowGroupColumn(colId1);
+                const isRowGroup2 = this.api.columnApi.isAutoRowGroupColumn(colId2);
+                if (isRowGroup1 && isRowGroup2) {
+                    return 1;
+                }
+                if (isRowGroup1) {
+                    return -1;
+                }
+                if (isRowGroup2) {
+                    return 1;
+                }
+            }
             if (newVisibleColumnsMap[colId1] != null && newVisibleColumnsMap[colId2] == null) {
                 return -1;
             }
@@ -3117,7 +3149,8 @@ export class AdaptableAgGrid {
         return this.ReportService.getCellExportValueFromRowNode(rowNode, columnId);
     }
     isQuickFilterAvailable() {
-        if (this.api.layoutApi.getCurrentLayout().EnablePivot) {
+        if (this.api.layoutApi.isCurrentLayoutPivot() &&
+            this.adaptableOptions.columnFilterOptions.useAdaptableColumnFiltering) {
             // hide completely the quick filter if pivot is enabled
             return false;
         }
@@ -3188,7 +3221,7 @@ export class AdaptableAgGrid {
                 .getPivotResultColumns()) === null || _b === void 0 ? void 0 : _b.map((column) => column.getColId())) || [];
         let isChanged = false;
         const colsToAutoSize = {};
-        let newColumnsState = this.getSortedColumnStateForVisibleColumns(columnsToShow, columnsState);
+        let newColumnsState = this.getSortedColumnStateForVisibleColumns(columnsToShow, columnsState, !!layout.EnablePivot);
         newColumnsState = newColumnsState
             .map((colState) => {
             var _a, _b, _c;
@@ -3927,31 +3960,4 @@ export class AdaptableAgGrid {
             };
         });
     }
-    setPinnedRows(pinnedRows, location) {
-        const gridApi = this.agGridAdapter.getAgGridApi();
-        switch (location) {
-            case 'top':
-                gridApi.setGridOption('pinnedTopRowData', pinnedRows);
-                break;
-            case 'bottom':
-                gridApi.setGridOption('pinnedBottomRowData', pinnedRows);
-                break;
-        }
-    }
-    setupRowSummaries() {
-        var _a;
-        const rowSummaries = (_a = this.api.internalApi.getAdaptableState().System.RowSummary.rowSummaries) !== null && _a !== void 0 ? _a : [];
-        const { top, bottom } = rowSummaries.reduce((acc, summaryRow) => {
-            const row = summaryRow.RowData;
-            if (summaryRow.Position === 'Bottom' || !summaryRow.Position) {
-                acc.bottom.push(row);
-            }
-            else {
-                acc.top.push(row);
-            }
-            return acc;
-        }, { top: [], bottom: [] });
-        this.setPinnedRows(top, 'top');
-        this.setPinnedRows(bottom, 'bottom');
-    }
 }

package/src/agGrid/AgGridColumnAdapter.js

@@ -360,12 +360,19 @@ export class AgGridColumnAdapter {
     setupColumnFloatingFilter({ col, colDef }) {
         const isFloatingFilterDisabled = !colDef.floatingFilter ||
             !this.adaptableOptions.columnFilterOptions.useAdaptableColumnFiltering;
+        this.adaptableOptions.columnFilterOptions.quickFilterOptions.showQuickFilter;
         this.setColDefProperty(col, 'floatingFilterComponent', () => {
             if (isFloatingFilterDisabled) {
                 return;
             }
             return FloatingFilterWrapperFactory(this.adaptableInstance);
         });
+        this.setColDefProperty(col, 'floatingFilter', (original_floatingFilter) => {
+            if (isFloatingFilterDisabled) {
+                return;
+            }
+            return FloatingFilterWrapperFactory(this.adaptableInstance);
+        });
         this.setColDefProperty(col, 'suppressFloatingFilterButton', () => {
             return !isFloatingFilterDisabled;
         });

package/src/components/Select/Select.js

@@ -9,6 +9,8 @@ const commonStyles = ({ isFocused, isDisabled, }) => {
         background: isDisabled
             ? 'var(--ab-cmp-input--disabled__background)'
             : 'var(--ab-cmp-input__background)',
+        fontSize: 'var(--ab-cmp-select__font-size)',
+        fontFamily: 'var(--ab-cmp-select__font-family)',
     };
 };
 export const Select = function (props) {

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1711969907121 || Date.now(),
-    VERSION: "18.0.0-canary.19" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1712070469439 || Date.now(),
+    VERSION: "18.0.0-canary.20" || '--current-version--',
 };