@adaptabletools/adaptable 13.1.1 → 14.0.0-canary.1

package/src/Api/Implementation/ColumnApiImpl.js

@@ -3,12 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColumnApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 const GeneralConstants = tslib_1.__importStar(require("../../Utilities/Constants/GeneralConstants"));
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
+const logDeprecation_1 = require("../../Utilities/logDeprecation");
+const ColumnInternalApi_1 = require("../Internal/ColumnInternalApi");
 class ColumnApiImpl extends ApiBase_1.ApiBase {
+    constructor(adaptable) {
+        super(adaptable);
+        this.internalApi = new ColumnInternalApi_1.ColumnInternalApi(adaptable);
+    }
     getColumns() {
         var _a;
         return (_a = this.adaptable.api.gridApi.getGridState().Columns) !== null && _a !== void 0 ? _a : [];
@@ -52,7 +57,8 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.showColumn(columnId);
     }
     getAgGridColumnType(columnId) {
-        return this.adaptable.getAgGridColumnType(columnId);
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getAgGridColumnType');
+        return this.internalApi.getAgGridColumnType(columnId);
     }
     isAutoRowGroupColumn(columnId) {
         // put this here as there might be other indicators we are not aware of
@@ -66,81 +72,153 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     }
     isCalculatedColumn(columnId) {
         return (this.adaptable.api.calculatedColumnApi
-            .getAllCalculatedColumn()
+            .getCalculatedColumns()
             .find((cc) => cc.ColumnId == columnId) != null);
     }
     isFreeTextColumn(columnId) {
         return (this.adaptable.api.freeTextColumnApi
-            .getAllFreeTextColumn()
+            .getFreeTextColumns()
             .find((cc) => cc.ColumnId == columnId) != null);
     }
     isActionColumn(columnId) {
         var _a;
-        return (((_a = this.adaptable.api.actionApi.getAllActionColumn()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) !=
-            null);
+        return (((_a = this.adaptable.api.actionApi.getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) != null);
     }
     isStyledNumericColumn(column) {
-        if (column) {
-            const styledColmn = this.adaptable.api.styledColumnApi
-                .getAllActiveStyledColumn()
-                .find((sc) => !sc.CheckBoxStyle && sc.ColumnId == column.columnId);
-            return styledColmn != null;
+        (0, logDeprecation_1.logDeprecationExternal)('ColumnApi', 'isStyledNumericColumn', 'StyledColumnApi', 
+        // @ts-ignore
+        'hasPercentBarStyle() or StyledColumnApi.hasGradientStyle');
+        if (!column) {
+            return false;
+        }
+        return (this.getStyledColumnApi().hasPercentBarStyle(column.columnId) ||
+            this.getStyledColumnApi().hasGradientStyle(column.columnId));
+    }
+    getColumnWithColumnId(columnId, logWarning) {
+        if (columnId == undefined) {
+            return;
+        }
+        // just return null if no columns rather than logging a warning - otherwise get lots at startup
+        if (ArrayExtensions_1.default.IsNullOrEmpty(this.getColumns())) {
+            return;
+        }
+        if (this.isAutoPivotColumn(columnId)) {
+            return;
+        }
+        const foundColumn = this.getColumns().find((c) => c.columnId == columnId);
+        if (foundColumn) {
+            return foundColumn;
+        }
+        if (logWarning) {
+            this.logMissingColumnWarning(columnId);
         }
-        return false;
+        return undefined;
     }
     isNumericColumn(column) {
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'isNumericColumn', 'hasNumberDataType');
+        return this.hasNumberDataType(column === null || column === void 0 ? void 0 : column.columnId);
+    }
+    hasNumberDataType(columnId) {
+        const column = this.getColumnWithColumnId(columnId);
+        if (!column) {
+            return false;
+        }
         return (column === null || column === void 0 ? void 0 : column.dataType) == 'Number';
     }
     isBooleanColumn(column) {
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'isBooleanColumn', 'hasBooleanDataType');
+        return this.hasBooleanDataType(column === null || column === void 0 ? void 0 : column.columnId);
+    }
+    hasBooleanDataType(columnId) {
+        const column = this.getColumnWithColumnId(columnId);
+        if (!column) {
+            return false;
+        }
         return (column === null || column === void 0 ? void 0 : column.dataType) == 'Boolean';
     }
+    hasArrayDataType(columnId) {
+        const column = this.getColumnWithColumnId(columnId);
+        if (!column) {
+            return false;
+        }
+        return ((column === null || column === void 0 ? void 0 : column.dataType) == 'NumberArray' ||
+            (column === null || column === void 0 ? void 0 : column.dataType) == 'TupleNumberArray' ||
+            (column === null || column === void 0 ? void 0 : column.dataType) == 'ObjectNumberArray');
+    }
     isDateColumn(column) {
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'isDateColumn', 'hasDateDataType');
+        return this.hasDateDataType(column === null || column === void 0 ? void 0 : column.columnId);
+    }
+    hasDateDataType(columnId) {
+        const column = this.getColumnWithColumnId(columnId);
+        if (!column) {
+            return false;
+        }
         return (column === null || column === void 0 ? void 0 : column.dataType) == 'Date';
     }
     getColumnDataTypeFromColumnId(columnId) {
-        const column = this.getColumnFromId(columnId); // this.getColumns().find(c => c.ColumnId == columnId);
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getColumnDataTypeFromColumnId', 'getColumnDataTypeForColumnId');
+        return this.getColumnDataTypeForColumnId(columnId);
+    }
+    getColumnDataTypeForColumnId(columnId) {
+        const column = this.getColumnWithColumnId(columnId); // this.getColumns().find(c => c.ColumnId == columnId);
         if (!column) {
             return undefined;
         }
         return column.dataType;
     }
     getFriendlyNameFromColumn(columnId, column) {
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getFriendlyNameFromColumn');
         if (columnId.includes(GeneralConstants.MISSING_COLUMN)) {
             return columnId;
         }
         if (column) {
             return column.friendlyName;
         }
-        this.LogMissingColumnWarning(columnId);
+        this.logMissingColumnWarning(columnId);
         return columnId + GeneralConstants.MISSING_COLUMN;
     }
     getFriendlyNameFromColumnId(columnId) {
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getFriendlyNameFromColumnId', 'getFriendlyNameForColumnId');
+        return this.getFriendlyNameForColumnId(columnId);
+    }
+    getFriendlyNameForColumnId(columnId) {
         if (this.isAutoPivotColumn(columnId)) {
             return GeneralConstants.EMPTY_STRING;
         }
         const foundColumn = this.getColumns().find((c) => c.columnId == columnId);
         if (foundColumn) {
-            return this.getFriendlyNameFromColumn(columnId, foundColumn);
+            return foundColumn.friendlyName;
         }
         let result = columnId + GeneralConstants.MISSING_COLUMN;
-        const currentLayout = this.adaptable.api.layoutApi.getCurrentLayout();
-        if (this.isAutoRowGroupColumn(columnId) && (currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.RowGroupedColumns)) {
-            result = `[Grouped column: ${currentLayout.RowGroupedColumns.join(', ')}]`;
+        if (this.isAutoRowGroupColumn(columnId)) {
+            const currentLayout = this.adaptable.api.layoutApi.getCurrentLayout();
+            if (currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.RowGroupedColumns) {
+                result = `[Grouped column: ${currentLayout.RowGroupedColumns.join(', ')}]`;
+            }
         }
-        this.LogMissingColumnWarning(columnId);
+        this.logMissingColumnWarning(columnId);
         return result;
     }
     getFriendlyNamesFromColumnIds(columnIds) {
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getFriendlyNamesFromColumnIds', 'getFriendlyNamesForColumnIds');
+        return this.getFriendlyNamesForColumnIds(columnIds);
+    }
+    getFriendlyNamesForColumnIds(columnIds) {
         const friendlyNames = [];
         if (ArrayExtensions_1.default.IsNullOrEmpty(columnIds)) {
             return friendlyNames;
         }
         columnIds.forEach((c) => {
-            friendlyNames.push(this.getFriendlyNameFromColumnId(c));
+            friendlyNames.push(this.getFriendlyNameForColumnId(c));
         });
         return friendlyNames;
     }
     getColumnIdFromFriendlyName(friendlyName) {
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getColumnIdFromFriendlyName', 'getColumnIdForFriendlyName');
+        return this.getColumnIdForFriendlyName(friendlyName);
+    }
+    getColumnIdForFriendlyName(friendlyName) {
         if (friendlyName.includes(GeneralConstants.MISSING_COLUMN)) {
             return friendlyName.replace(GeneralConstants.MISSING_COLUMN, ''); // Ids should stay "pure"
         }
@@ -148,83 +226,80 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         if (foundColumn) {
             return foundColumn.columnId;
         }
-        this.LogMissingColumnWarning(friendlyName);
+        this.logMissingColumnWarning(friendlyName);
         return friendlyName + GeneralConstants.MISSING_COLUMN;
     }
     getColumnIdsFromFriendlyNames(friendlyNames) {
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getColumnIdsFromFriendlyNames', 'getColumnIdsForFriendlyNames');
+        return this.getColumnIdsForFriendlyNames(friendlyNames);
+    }
+    getColumnIdsForFriendlyNames(friendlyNames) {
         const columnIds = [];
         if (ArrayExtensions_1.default.IsNullOrEmpty(friendlyNames)) {
             return columnIds;
         }
         friendlyNames.forEach((c) => {
-            columnIds.push(this.getColumnIdFromFriendlyName(c));
+            columnIds.push(this.getColumnIdForFriendlyName(c));
         });
         return columnIds;
     }
     getColumnsFromFriendlyNames(friendlyNames) {
-        // not sure if this is right as might ignore bad cols
-        return friendlyNames.map((friendlyName) => this.getColumns().find((x) => x.friendlyName == friendlyName));
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getColumnsFromFriendlyNames', 'getColumnsWithFriendlyNames');
+        return this.getColumnsWithFriendlyNames(friendlyNames);
+    }
+    getColumnsWithFriendlyNames(friendlyNames) {
+        return friendlyNames
+            .map((friendlyName) => this.getColumns().find((x) => x.friendlyName == friendlyName))
+            .filter(Boolean);
     }
     getColumnsFromIds(columnIds, logWarning = true) {
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getColumnsFromIds', 'getColumnsWithColumnIds');
+        return this.getColumnsWithColumnIds(columnIds, logWarning);
+    }
+    getColumnsWithColumnIds(columnIds, logWarning = true) {
         let returnCols = [];
         columnIds.forEach((c) => {
-            returnCols.push(this.getColumnFromId(c, logWarning));
+            const column = this.getColumnWithColumnId(c, logWarning);
+            if (column) {
+                returnCols.push(column);
+            }
         });
         return returnCols;
     }
     doesColumnExist(columnId) {
-        return !!this.getColumnFromId(columnId, false);
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'doesColumnExist', 'isColumnInGrid');
+        return this.isColumnInGrid(columnId);
     }
-    getColumnFromId(columnId, logWarning = true) {
-        if (columnId == undefined) {
-            return;
-        }
-        // just return null if no columns rather than logging a warning - otherwise get lots at startup
-        if (ArrayExtensions_1.default.IsNullOrEmpty(this.getColumns())) {
-            return;
-        }
-        if (this.isAutoPivotColumn(columnId)) {
-            return;
-        }
-        const foundColumn = this.getColumns().find((c) => c.columnId == columnId);
-        if (foundColumn) {
-            return foundColumn;
-        }
-        if (logWarning) {
-            this.LogMissingColumnWarning(columnId);
-        }
-        return undefined;
+    isColumnInGrid(columnId) {
+        return !!this.getColumnWithColumnId(columnId, false);
     }
-    getColumnIdsFromId(columnId, logWarning = false) {
-        const col = this.getColumnFromId(columnId, logWarning);
-        if (col) {
-            if (this.isCalculatedColumn(col.columnId)) {
-                return this.adaptable.api.calculatedColumnApi.getReferencedColumnIdsForCalculatedColumnId(col.columnId);
-            }
-            else {
-                return [col.columnId];
-            }
-        }
-        return undefined;
+    getColumnFromId(columnId, logWarning = true) {
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getColumnFromId', 'getColumnWithColumnId');
+        return this.getColumnWithColumnId(columnId, logWarning);
     }
     getAgGridColumnFieldForAdaptableColumn(colId) {
-        const agGridColumn = this.getAgGridColumnForAdaptableColumn(colId);
-        return agGridColumn.getColDef().field || '';
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getAgGridColumnFieldForAdaptableColumn');
+        return this.internalApi.getAgGridColumnFieldForAdaptableColumn(colId);
     }
     getAgGridColumnForAdaptableColumn(columnId) {
-        return this.adaptable.getAgGridColumnForColumnId(columnId);
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getAgGridColumnForAdaptableColumn');
+        return this.internalApi.getAgGridColumnForAdaptableColumn(columnId);
     }
     getColumnFromFriendlyName(columnName, logWarning = true) {
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getColumnFromFriendlyName', 'getColumnWithFriendlyName');
+        return this.getColumnWithFriendlyName(columnName, logWarning);
+    }
+    getColumnWithFriendlyName(columnFriendlyName, logWarning = true) {
         // just return null if no columns rather than logging a warning - otherwise get lots at startup
         if (ArrayExtensions_1.default.IsNullOrEmpty(this.getColumns())) {
             return null;
         }
-        const foundColumn = this.getColumns().find((c) => c.friendlyName == columnName);
+        const foundColumn = this.getColumns().find((c) => c.friendlyName == columnFriendlyName);
         if (foundColumn) {
             return foundColumn;
         }
         if (logWarning) {
-            this.LogMissingColumnWarning(columnName);
+            this.logMissingColumnWarning(columnFriendlyName);
         }
         return null;
     }
@@ -240,6 +315,10 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
                 return this.getStringColumns();
             case 'NumberArray':
                 return this.getNumberArrayColumns();
+            case 'ObjectNumberArray':
+                return this.getObjectNumberArrayColumns();
+            case 'TupleNumberArray':
+                return this.getTupleNumberArrayColumns();
             default:
                 return this.getColumns();
         }
@@ -265,29 +344,39 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     getBooleanColumns() {
         return this.getColumns().filter((c) => c.dataType == 'Boolean');
     }
+    getArrayColumns() {
+        return this.getColumns().filter((c) => c.dataType == 'NumberArray' ||
+            c.dataType == 'TupleNumberArray' ||
+            c.dataType == 'ObjectNumberArray');
+    }
     getSortableColumns() {
         return this.getColumns().filter((c) => c.sortable);
     }
-    getFiltrableColumns() {
+    getFilterableColumns() {
         return this.getColumns().filter((c) => c.filterable);
     }
+    getFiltrableColumns() {
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getFiltrableColumns', 'getFilterableColumns');
+        return this.getFilterableColumns();
+    }
     getGroupableColumns() {
         return this.getColumns().filter((c) => c.groupable);
     }
     getPivotableColumns() {
         return this.getColumns().filter((c) => c.pivotable);
     }
+    getAggregatableColumns() {
+        return this.getColumns().filter((c) => c.aggregatable && c.dataType == 'Number');
+    }
     getAggregetableColumns() {
-        return this.getColumns()
-            .filter((c) => c.aggregatable)
-            .filter((c) => c.dataType == 'Number');
+        (0, logDeprecation_1.logDeprecation)('ColumnApi', 'getAggregetableColumns', 'getAggregatableColumns');
+        return this.getAggregatableColumns();
     }
     getQueryableColumns() {
         return this.getColumns().filter((c) => c.queryable);
     }
-    LogMissingColumnWarning(columnId) {
-        if (this.adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning &&
-            this.adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning === true) {
+    logMissingColumnWarning(columnId) {
+        if (this.adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning === true) {
             if (!this.isAutoRowGroupColumn(columnId) &&
                 !this.isCalculatedColumn(columnId) &&
                 !this.isFreeTextColumn(columnId) &&
@@ -297,166 +386,66 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
     }
     getDistinctDisplayValuesForColumn(columnId) {
-        const abColumn = this.getColumnFromId(columnId);
-        if (abColumn == undefined) {
-            return [];
-        }
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, false);
-        return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
-            return cv.normalisedValue;
-        });
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getDistinctDisplayValuesForColumn');
+        return this.getGridApi().internalApi.getDistinctDisplayValuesForColumn(columnId);
     }
     async getDistinctFilterDisplayValuesForColumn(columnId, filter, showFilteredRowsOnly) {
-        const abColumn = this.getColumnFromId(columnId);
-        if (abColumn == undefined) {
-            return {
-                values: [],
-                suppressClientSideFilter: false,
-            };
-        }
-        const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, showFilteredRowsOnly, filter);
-        return {
-            values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
-                return {
-                    label: cv.displayValue,
-                    value: cv.normalisedValue,
-                };
-            }),
-            suppressClientSideFilter,
-        };
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getDistinctFilterDisplayValuesForColumn');
+        return this.getGridApi().internalApi.getDistinctFilterDisplayValuesForColumn(columnId, filter, showFilteredRowsOnly);
     }
     async getDistinctCustomSortDisplayValuesForColumn(columnId) {
-        const abColumn = this.getColumnFromId(columnId);
-        if (abColumn == undefined) {
-            return [];
-        }
-        const gridCells = await this.adaptable.getDistinctCustomSortValuesForColumn(abColumn, false);
-        return this.sortDistinctValues(gridCells, abColumn).map((cv) => {
-            return cv.normalisedValue;
-        });
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getDistinctCustomSortDisplayValuesForColumn');
+        return this.getGridApi().internalApi.getDistinctCustomSortDisplayValuesForColumn(columnId);
     }
     async getDistinctBulkUpdateDisplayValuesForColumn(columnId, selectedGridCells) {
-        const abColumn = this.getColumnFromId(columnId);
-        if (abColumn == undefined) {
-            return [];
-        }
-        const gridCells = await this.adaptable.getDistinctBulkUpdateValuesForColumn(abColumn, false, selectedGridCells);
-        return this.sortDistinctValues(gridCells, abColumn).map((cv) => {
-            return cv.normalisedValue;
-        });
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getDistinctBulkUpdateDisplayValuesForColumn');
+        return this.getGridApi().internalApi.getDistinctBulkUpdateDisplayValuesForColumn(columnId, selectedGridCells);
     }
     getDistinctVisibleDisplayValuesForColumn(columnId) {
-        const abColumn = this.getColumnFromId(columnId);
-        if (abColumn == undefined) {
-            return [];
-        }
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, true);
-        return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
-            return cv.normalisedValue;
-        });
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getDistinctVisibleDisplayValuesForColumn');
+        return this.getGridApi().internalApi.getDistinctVisibleDisplayValuesForColumn(columnId);
     }
     getDistinctRawValuesForColumn(columnId, skipRowNode) {
-        const abColumn = this.getColumnFromId(columnId);
-        if (abColumn == undefined) {
-            return [];
-        }
-        return this.sortDistinctValues(this.getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode), abColumn).map((cv) => {
-            return cv.rawValue;
-        });
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getDistinctRawValuesForColumn');
+        return this.getGridApi().internalApi.getDistinctRawValuesForColumn(columnId, skipRowNode);
     }
     getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode) {
-        const abColumn = this.getColumnFromId(columnId);
-        if (abColumn == undefined) {
-            return [];
-        }
-        return this.adaptable.getDistinctValuesForColumn(abColumn, false, skipRowNode);
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getUnsortedDistinctRawValuesForColumn');
+        return this.getGridApi().internalApi.getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode);
     }
     getDistinctVisibleRawValuesForColumn(columnId) {
-        const abColumn = this.getColumnFromId(columnId);
-        if (abColumn == undefined) {
-            return [];
-        }
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, true);
-        return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
-            return cv.rawValue;
-        });
-    }
-    sortDistinctValues(returnValues, column) {
-        // this does NOT into account Custom Sort - far too hard for now...
-        let sortOrder = Enums_1.SortOrder.Asc;
-        if (this.getFilterOptions().sortColumnValuesInFilter) {
-            let columnSort = this.adaptable.api.gridApi.getColumnSortForColumn(column.columnId);
-            if (columnSort && columnSort.SortOrder == 'Desc') {
-                sortOrder = Enums_1.SortOrder.Desc;
-            }
-        }
-        if (this.isNumericColumn(column)) {
-            returnValues = ArrayExtensions_1.default.sortCellValueArrayNumeric(returnValues, sortOrder);
-        }
-        else if (this.isDateColumn(column)) {
-            returnValues = ArrayExtensions_1.default.sortCellValueArrayDates(returnValues, sortOrder);
-        }
-        else {
-            returnValues = ArrayExtensions_1.default.sortCellValueArray(returnValues, sortOrder);
-        }
-        return returnValues;
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getDistinctVisibleRawValuesForColumn');
+        return this.getGridApi().internalApi.getDistinctVisibleRawValuesForColumn(columnId);
     }
     getPrimaryKeyColumn() {
-        return this.getColumnFromId(this.adaptable.adaptableOptions.primaryKey);
+        return this.getColumnWithColumnId(this.adaptable.adaptableOptions.primaryKey);
     }
     getAllColumnFriendlyNames() {
-        return this.getColumns().map((c) => {
-            return c.friendlyName;
-        });
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getAllColumnFriendlyNames');
+        return this.internalApi.getAllColumnFriendlyNames();
     }
     usesAdaptableFilterForm(columnId) {
-        const useAdaptableFilterForm = this.getFilterOptions().useAdaptableFilterForm;
-        if (useAdaptableFilterForm == null || useAdaptableFilterForm == false) {
-            return false;
-        }
-        if (Array.isArray(useAdaptableFilterForm) && !useAdaptableFilterForm.includes(columnId)) {
-            return false;
-        }
-        return true;
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'usesAdaptableFilterForm');
+        return this.internalApi.usesAdaptableFilterForm(columnId);
     }
     usesAdaptableQuickFilter(columnId) {
-        const useAdaptableQuickFilter = this.getFilterOptions().useAdaptableQuickFilter;
-        if (useAdaptableQuickFilter == null || useAdaptableQuickFilter == false) {
-            return false;
-        }
-        if (Array.isArray(useAdaptableQuickFilter) && !useAdaptableQuickFilter.includes(columnId)) {
-            return false;
-        }
-        return true;
-    }
-    isColumnReferencedInExpression(columnId, expression) {
-        const colIds = this.adaptable.api.queryLanguageApi.getColumnsFromExpression(expression);
-        return colIds.some((c) => c === columnId);
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'usesAdaptableQuickFilter');
+        return this.internalApi.usesAdaptableQuickFilter(columnId);
     }
     isActionRowButtonColumn(columnId) {
         return columnId === GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS;
     }
     getDefaultAggFunc(columnId) {
         var _a, _b, _c;
-        const abColumn = this.getColumnFromId(columnId);
+        const abColumn = this.getColumnWithColumnId(columnId);
         const availableAggregationFunctions = abColumn.availableAggregationFunctions;
-        const agColumn = (_b = (_a = this.getAgGridColumnForAdaptableColumn(columnId)) === null || _a === void 0 ? void 0 : _a.getColDef) === null || _b === void 0 ? void 0 : _b.call(_a);
+        const agColumn = (_b = (_a = this.internalApi.getAgGridColumnForAdaptableColumn(columnId)) === null || _a === void 0 ? void 0 : _a.getColDef) === null || _b === void 0 ? void 0 : _b.call(_a);
         return (_c = agColumn === null || agColumn === void 0 ? void 0 : agColumn.defaultAggFunc) !== null && _c !== void 0 ? _c : availableAggregationFunctions[0];
     }
-    getMinValueForNumericColumn(column) {
-        if (column.dataType !== 'Number') {
-            return undefined;
-        }
-        return this.adaptable.getMinMaxCachedValueForColumn(column, 'min');
-    }
-    getMaxValueForNumericColumn(column) {
-        if (column.dataType !== 'Number') {
-            return undefined;
-        }
-        return this.adaptable.getMinMaxCachedValueForColumn(column, 'max');
-    }
     getTypesForColumn(columnId) {
         var _a;
+        (0, logDeprecation_1.logDeprecationInternal)('ColumnApi', 'getTypesForColumn');
+        // nobody uses this, we should delete it
         const agGridColumn = this.getAgGridColumnForAdaptableColumn(columnId);
         return (_a = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef()) === null || _a === void 0 ? void 0 : _a.type;
     }

package/src/Api/Implementation/ConfigApiImpl.d.ts

@@ -16,7 +16,7 @@ import { ApplicationState } from '../../PredefinedConfig/ApplicationState';
 import { FreeTextColumnState } from '../../PredefinedConfig/FreeTextColumnState';
 import { ToolPanelState } from '../../PredefinedConfig/ToolPanelState';
 import { ConfigApi } from '../ConfigApi';
-import { AdaptableStateKey, AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { AdaptableModule, AdaptableStateKey } from '../../PredefinedConfig/Common/Types';
 import { AdaptableSearchState, AdaptableSortState, ScheduleState } from '../../types';
 import { QueryState } from '../../PredefinedConfig/QueryState';
 import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';

package/src/Api/Implementation/ConfigApiImpl.js

@@ -109,7 +109,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     getAdaptableSortState() {
         const adaptableSortState = {
             columnSorts: this.adaptable.api.gridApi.getColumnSorts(),
-            customSorts: this.adaptable.api.customSortApi.getAllCustomSort(),
+            customSorts: this.adaptable.api.customSortApi.getCustomSorts(),
         };
         return adaptableSortState;
     }

package/src/Api/Implementation/CustomSortApiImpl.d.ts

@@ -1,13 +1,27 @@
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { CustomSortApi } from '../CustomSortApi';
-import { CustomSortState, CustomSort } from '../../PredefinedConfig/CustomSortState';
+import { CustomSort, CustomSortState } from '../../PredefinedConfig/CustomSortState';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { CustomSortInternalApi } from '../Internal/CustomSortInternalApi';
 export declare class CustomSortApiImpl extends ApiBase implements CustomSortApi {
+    internalApi: CustomSortInternalApi;
+    constructor(adaptable: IAdaptable);
     getCustomSortState(): CustomSortState;
     getAllCustomSort(config?: LayoutAssociatedObjectLoadConfig): CustomSort[];
+    getCustomSorts(config?: {
+        includeLayoutNotAssociatedObjects?: boolean;
+    }): CustomSort[];
     getCustomSortById(id: CustomSort['Uuid']): CustomSort;
     getAllActiveCustomSort(): CustomSort[];
+    getActiveCustomSorts(config?: {
+        includeLayoutNotAssociatedObjects?: boolean;
+    }): CustomSort[];
     getAllSuspendedCustomSort(): CustomSort[];
+    getSuspendedCustomSorts(config?: {
+        includeLayoutNotAssociatedObjects?: boolean;
+    }): CustomSort[];
     getCustomSortByColumn(column: string): CustomSort;
+    getCustomSortForColumn(columnId: string): CustomSort | undefined;
     addCustomSort(customSort: CustomSort): CustomSort;
     createCustomSort(columnId: string, values: string[]): CustomSort;
     editCustomSort(columnId: string, values: string[]): CustomSort;
@@ -15,4 +29,5 @@ export declare class CustomSortApiImpl extends ApiBase implements CustomSortApi
     suspendCustomSort(customSort: CustomSort): CustomSort;
     unSuspendCustomSort(customSort: CustomSort): CustomSort;
     showCustomSortPopup(): void;
+    openCustomSortSettingsPanel(): void;
 }