@adaptabletools/adaptable 15.4.3 → 16.0.0-canary.1

package/src/Api/Implementation/ApiBase.js

@@ -93,12 +93,27 @@ class ApiBase {
     getOptions() {
         return this.adaptable.adaptableOptions;
     }
-    getActionOptions() {
-        return this.getOptions().actionOptions;
+    getActionColumnOptions() {
+        return this.getOptions().actionColumnOptions;
+    }
+    getActionRowOptions() {
+        return this.getOptions().actionRowOptions;
     }
     getColumnOptions() {
         return this.getOptions().columnOptions;
     }
+    getCustomSortOptions() {
+        return this.getOptions().customSortOptions;
+    }
+    getDataSetOptions() {
+        return this.getOptions().dataSetOptions;
+    }
+    getCalendarOptions() {
+        return this.getOptions().calendarOptions;
+    }
+    getCellSummaryOptions() {
+        return this.getOptions().cellSummaryOptions;
+    }
     getContainerOptions() {
         return this.getOptions().containerOptions;
     }
@@ -117,8 +132,8 @@ class ApiBase {
     getExportOptions() {
         return this.getOptions().exportOptions;
     }
-    getGeneralOptions() {
-        return this.getOptions().generalOptions;
+    getGroupingOptions() {
+        return this.getOptions().groupingOptions;
     }
     getLayoutOptions() {
         return this.getOptions().layoutOptions;
@@ -168,8 +183,11 @@ class ApiBase {
     getAdaptableApi() {
         return this.adaptable.api;
     }
-    getActionApi() {
-        return this.getAdaptableApi().actionApi;
+    getActionColumnApi() {
+        return this.getAdaptableApi().actionColumnApi;
+    }
+    getActionRowApi() {
+        return this.getAdaptableApi().actionRowApi;
     }
     getApplicationApi() {
         return this.getAdaptableApi().applicationApi;
@@ -261,8 +279,8 @@ class ApiBase {
     getQueryApi() {
         return this.getAdaptableApi().queryApi;
     }
-    getQueryLanguageApi() {
-        return this.getAdaptableApi().queryLanguageApi;
+    getExpressionApi() {
+        return this.getAdaptableApi().expressionApi;
     }
     getPluginsApi() {
         return this.getAdaptableApi().pluginsApi;

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

@@ -8,19 +8,12 @@ export declare class CalculatedColumnApiImpl extends ApiBase implements Calculat
     constructor(adaptable: IAdaptable);
     getCalculatedColumnState(): CalculatedColumnState;
     getCalculatedColumns(): CalculatedColumn[];
-    getAllCalculatedColumn(): CalculatedColumn[];
     getCalculatedColumnById(id: CalculatedColumn['Uuid']): CalculatedColumn;
     addCalculatedColumn(calculatedColumn: CalculatedColumn): CalculatedColumn;
     getCalculatedColumnForColumnId(columnId: string): CalculatedColumn | undefined;
     editCalculatedColumn(calculatedColumn: CalculatedColumn): CalculatedColumn;
-    editCalculatedColumns(calculatedColumns: CalculatedColumn[]): CalculatedColumn[];
     deleteCalculatedColumn(column: string): void;
     openCalculatedColumnSettingsPanel(): void;
     refreshAggregatedCalculatedColumns(): void;
     refreshAggregatedCalculatedColumn(columnId: string): void;
-    showCalculatedColumnPopup(): void;
-    getCalculatedColumnModuleReferences(calculatedColumn: CalculatedColumn): string[];
-    getCalculatedColumnsReferencingColumnId(columnId: string): CalculatedColumn[];
-    getReferencedColumnIdsForCalculatedColumn(calculatedColumn: CalculatedColumn): string[];
-    getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId: string): string[];
 }

package/src/Api/Implementation/CalculatedColumnApiImpl.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const CalculatedColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CalculatedColumnRedux"));
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const CalculatedColumnInternalApi_1 = require("../Internal/CalculatedColumnInternalApi");
 class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
@@ -19,10 +18,6 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
         var _a;
         return (_a = this.getCalculatedColumnState().CalculatedColumns) !== null && _a !== void 0 ? _a : [];
     }
-    getAllCalculatedColumn() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CalculatedColumnApi', 'getAllCalculatedColumn', 'getCalculatedColumns');
-        return this.getCalculatedColumns();
-    }
     getCalculatedColumnById(id) {
         return this.getCalculatedColumns().find((column) => (column === null || column === void 0 ? void 0 : column.Uuid) === id);
     }
@@ -38,13 +33,6 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(CalculatedColumnRedux.CalculatedColumnEdit(calculatedColumn));
         return this.getCalculatedColumnById(calculatedColumn.Uuid);
     }
-    editCalculatedColumns(calculatedColumns) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'CalculatedColumnApi', 'editCalculatedColumns');
-        calculatedColumns.forEach((cc) => {
-            this.editCalculatedColumn(cc);
-        });
-        return calculatedColumns === null || calculatedColumns === void 0 ? void 0 : calculatedColumns.map((column) => this.getCalculatedColumnById(column === null || column === void 0 ? void 0 : column.Uuid));
-    }
     deleteCalculatedColumn(column) {
         let calcColumn = this.getCalculatedColumns().find((cc) => cc.ColumnId == column);
         this.dispatchAction(CalculatedColumnRedux.CalculatedColumnDelete(calcColumn));
@@ -86,25 +74,5 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
             this.getGridApi().refreshCells(null, [columnId]);
         }
     }
-    showCalculatedColumnPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CalculatedColumnApi', 'showCalculatedColumnPopup', 'openCalculatedColumnSettingsPanel');
-        this.showModulePopup(ModuleConstants.CalculatedColumnModuleId);
-    }
-    getCalculatedColumnModuleReferences(calculatedColumn) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'CalculatedColumnApi', 'getCalculatedColumnModuleReferences');
-        return this.internalApi.getCalculatedColumnModuleReferences(calculatedColumn);
-    }
-    getCalculatedColumnsReferencingColumnId(columnId) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'CalculatedColumnApi', 'getCalculatedColumnsReferencingColumnId');
-        return this.internalApi.getCalculatedColumnsReferencingColumnId(columnId);
-    }
-    getReferencedColumnIdsForCalculatedColumn(calculatedColumn) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'CalculatedColumnApi', 'getReferencedColumnIdsForCalculatedColumn');
-        return this.internalApi.getReferencedColumnIdsForCalculatedColumn(calculatedColumn);
-    }
-    getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'CalculatedColumnApi', 'getReferencedColumnIdsForCalculatedColumnId');
-        return this.internalApi.getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId);
-    }
 }
 exports.CalculatedColumnApiImpl = CalculatedColumnApiImpl;

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

@@ -6,4 +6,5 @@ export declare class CalendarApiImpl extends ApiBase implements CalendarApi {
     isWorkingDay(dateToCheck: Date): boolean;
     isHoliday(dateToCheck: Date): boolean;
     isSameDay(firstDateToCheck: Date, secondDateToCheck: Date): boolean;
+    private getHolidays;
 }

package/src/Api/Implementation/CalendarApiImpl.js

@@ -22,29 +22,16 @@ class CalendarApiImpl extends ApiBase_1.ApiBase {
         return counterDate;
     }
     isWorkingDay(dateToCheck) {
-        const holidays = this.getGeneralOptions().holidays;
+        const holidays = this.getHolidays();
         if (!holidays) {
             return dateToCheck.getDay() != 0 && dateToCheck.getDay() != 6;
         }
-        if (holidays.isHoliday) {
-            const context = {
-                dateToCheck: dateToCheck,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-                adaptableApi: this.getAdaptableApi(),
-            };
-            if (holidays.isHoliday(context)) {
+        for (let holiday of holidays) {
+            let holidayDate = new Date(holiday);
+            if (holidayDate.setHours(0, 0, 0, 0) == dateToCheck.setHours(0, 0, 0, 0)) {
                 return false;
             }
         }
-        if (Array.isArray(holidays.list)) {
-            for (let holiday of holidays.list) {
-                let holidayDate = new Date(holiday);
-                if (holidayDate.setHours(0, 0, 0, 0) == dateToCheck.setHours(0, 0, 0, 0)) {
-                    return false;
-                }
-            }
-        }
         return dateToCheck.getDay() != 0 && dateToCheck.getDay() != 6;
     }
     isHoliday(dateToCheck) {
@@ -55,5 +42,21 @@ class CalendarApiImpl extends ApiBase_1.ApiBase {
             firstDateToCheck.getMonth() === secondDateToCheck.getMonth() &&
             firstDateToCheck.getDate() === secondDateToCheck.getDate());
     }
+    getHolidays() {
+        const holidays = this.getCalendarOptions().holidays;
+        if (holidays) {
+            if (typeof holidays === 'function') {
+                const baseContext = {
+                    userName: this.getOptions().userName,
+                    adaptableId: this.getOptions().adaptableId,
+                    adaptableApi: this.getAdaptableApi(),
+                };
+                return holidays(baseContext);
+            }
+            else {
+                return holidays;
+            }
+        }
+    }
 }
 exports.CalendarApiImpl = CalendarApiImpl;

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

@@ -6,7 +6,6 @@ export declare class CellSummaryApiImpl extends ApiBase implements CellSummaryAp
     openCellSummaryPopupSettingsPanel(): void;
     getCurrentCellSummaryOperation(): CellSummaryOperation | string;
     getCellSummaryOperationDefinitions(): CellSummaryOperation[];
-    showCellSummaryPopup(): void;
     setCurrentCellSummaryOperation(operation: SummaryOperation | string): void;
     getCellSummaryOperationValue(operation: SummaryOperation | string): any;
     getCurrentCellSummaryOperationValue(): any;

package/src/Api/Implementation/CellSummaryApiImpl.js

@@ -7,7 +7,6 @@ const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const weightedAverage_1 = require("../../agGrid/weightedAverage");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class CellSummaryApiImpl extends ApiBase_1.ApiBase {
     openCellSummaryPopupSettingsPanel() {
         this.showModulePopup(ModuleConstants.CellSummaryModuleId);
@@ -17,7 +16,7 @@ class CellSummaryApiImpl extends ApiBase_1.ApiBase {
     }
     getCellSummaryOperationDefinitions() {
         var _a;
-        let cellSummaryOperations = (_a = this.getGeneralOptions().cellSummaryOperations) !== null && _a !== void 0 ? _a : [];
+        let cellSummaryOperations = (_a = this.getCellSummaryOptions().cellSummaryOperations) !== null && _a !== void 0 ? _a : [];
         if (this.isWeightedAverageCellSummaryAvailable()) {
             cellSummaryOperations = [
                 ...cellSummaryOperations,
@@ -26,10 +25,6 @@ class CellSummaryApiImpl extends ApiBase_1.ApiBase {
         }
         return cellSummaryOperations;
     }
-    showCellSummaryPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CellSummaryApi', 'showCellSummaryPopup', 'openCellSummaryPopupSettingsPanel');
-        this.openCellSummaryPopupSettingsPanel();
-    }
     setCurrentCellSummaryOperation(operation) {
         this.dispatchAction(SystemRedux.SystemCellSummaryChangeOperation(operation));
     }
@@ -55,6 +50,8 @@ class CellSummaryApiImpl extends ApiBase_1.ApiBase {
                 return cellSummary.Distinct;
             case Enums_1.SummaryOperation.Count:
                 return cellSummary.Count;
+            case Enums_1.SummaryOperation.Only:
+                return cellSummary.Only;
             default:
                 return cellSummary[operation];
         }

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

@@ -13,7 +13,6 @@ export declare class ChartingApiImpl extends ApiBase implements ChartingApi {
     saveCurrentCharts(): void;
     getPersistedCharts(): ChartModel[];
     getChartDefinitions(): ChartDefinition[];
-    getAllChartDefinitions(): ChartDefinition[];
     getChartDefinitionByUuid(uuid: string): ChartDefinition;
     getChartDefinitionByName(name: string): ChartDefinition | undefined;
     showPersistedCharts(): ChartRef[];

package/src/Api/Implementation/ChartingApiImpl.js

@@ -6,7 +6,6 @@ const ApiBase_1 = require("./ApiBase");
 const ChartingRedux = tslib_1.__importStar(require("./../../Redux/ActionsReducers/ChartingRedux"));
 const ChartingRedux_1 = require("./../../Redux/ActionsReducers/ChartingRedux");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const ChartingInternalApi_1 = require("../Internal/ChartingInternalApi");
 class ChartingApiImpl extends ApiBase_1.ApiBase {
@@ -38,10 +37,6 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         var _a;
         return (_a = (0, ChartingRedux_1.ChartingGetChartModels)(this.getAdaptableState())) !== null && _a !== void 0 ? _a : [];
     }
-    getAllChartDefinitions() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ChartingApi', 'getAllChartDefinitions', 'getChartDefinitions');
-        return this.getChartDefinitions();
-    }
     getChartDefinitionByUuid(uuid) {
         return this.getChartDefinitions().find((c) => c.Uuid == uuid);
     }

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

@@ -1,8 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { AdaptableColumn, AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnApi } from '../ColumnApi';
-import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
-import { Column, IRowNode } from '@ag-grid-community/core';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ColumnInternalApi } from '../Internal/ColumnInternalApi';
 export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
@@ -20,42 +18,24 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     autosizeAllColumns(): void;
     hideColumn(columnId: string): void;
     showColumn(columnId: string): void;
-    getAgGridColumnType(columnId: string): string | string[];
     isAutoRowGroupColumn(columnId: string): boolean;
     isAutoPivotColumn(columnId: string): boolean;
     isCalculatedColumn(columnId: string): boolean;
     isFreeTextColumn(columnId: string): boolean;
     isActionColumn(columnId: string): boolean;
-    isStyledNumericColumn(column: AdaptableColumn): boolean;
     getColumnWithColumnId(columnId: string, logWarning?: boolean): AdaptableColumn | undefined;
-    isNumericColumn(column: AdaptableColumn): boolean;
     hasNumberDataType(columnId: string): boolean;
-    isBooleanColumn(column: AdaptableColumn): boolean;
     hasBooleanDataType(columnId: string): boolean;
     hasArrayDataType(columnId: string): boolean;
-    isDateColumn(column: AdaptableColumn): boolean;
     hasDateDataType(columnId: string): boolean;
-    getColumnDataTypeFromColumnId(columnId: string): AdaptableColumnDataType | undefined;
     getColumnDataTypeForColumnId(columnId: string): AdaptableColumnDataType | undefined;
-    getFriendlyNameFromColumn(columnId: string, column: AdaptableColumn): string;
-    getFriendlyNameFromColumnId(columnId: string): string | undefined;
     getFriendlyNameForColumnId(columnId: string): string;
-    getFriendlyNamesFromColumnIds(columnIds: string[]): string[];
     getFriendlyNamesForColumnIds(columnIds: string[]): string[];
-    getColumnIdFromFriendlyName(friendlyName: string): string;
     getColumnIdForFriendlyName(friendlyName: string): string;
-    getColumnIdsFromFriendlyNames(friendlyNames: string[]): string[];
     getColumnIdsForFriendlyNames(friendlyNames: string[]): string[];
-    getColumnsFromFriendlyNames(friendlyNames: string[]): AdaptableColumn[];
     getColumnsWithFriendlyNames(friendlyNames: string[]): AdaptableColumn[];
-    getColumnsFromIds(columnIds: string[], logWarning?: boolean): AdaptableColumn[];
     getColumnsWithColumnIds(columnIds: string[], logWarning?: boolean): AdaptableColumn[];
-    doesColumnExist(columnId: string): boolean;
     isColumnInGrid(columnId: string): boolean;
-    getColumnFromId(columnId: string, logWarning?: boolean): AdaptableColumn | undefined;
-    getAgGridColumnFieldForAdaptableColumn(colId: string): string;
-    getAgGridColumnForAdaptableColumn(columnId: string): Column;
-    getColumnFromFriendlyName(columnName: string, logWarning?: boolean): AdaptableColumn;
     getColumnWithFriendlyName(columnFriendlyName: string, logWarning?: boolean): AdaptableColumn;
     getColumnsOfType(dataType: AdaptableColumnDataType): AdaptableColumn[];
     getNumericColumns(): AdaptableColumn[];
@@ -74,23 +54,8 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getQueryableColumns(): AdaptableColumn[];
     getExportableColumns(): AdaptableColumn[];
     private logMissingColumnWarning;
-    getDistinctDisplayValuesForColumn(columnId: string): any[];
-    getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string, showFilteredRowsOnly: boolean): Promise<{
-        values: any[];
-        suppressClientSideFilter: boolean;
-    }>;
-    getDistinctCustomSortDisplayValuesForColumn(columnId: string): Promise<any[]>;
-    getDistinctBulkUpdateDisplayValuesForColumn(columnId: string, selectedGridCells: GridCell[]): Promise<any[]>;
-    getDistinctVisibleDisplayValuesForColumn(columnId: string): any[];
-    getDistinctRawValuesForColumn(columnId: string, skipRowNode?: IRowNode): any[];
-    getUnsortedDistinctRawValuesForColumn(columnId: string, skipRowNode?: IRowNode): any[];
-    getDistinctVisibleRawValuesForColumn(columnId: string): any[];
     getPrimaryKeyColumn(): AdaptableColumn<any>;
-    getAllColumnFriendlyNames(): string[];
-    usesAdaptableFilterForm(columnId: string): boolean;
-    usesAdaptableQuickFilter(columnId: string): boolean;
     isActionRowButtonColumn(columnId: string): boolean;
     getDefaultAggFunc(columnId: string): string;
-    getTypesForColumn(columnId: string): string | string[] | undefined;
     isSpecialColumn(columnId: string): boolean;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -6,7 +6,6 @@ const ApiBase_1 = require("./ApiBase");
 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) {
@@ -55,10 +54,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     showColumn(columnId) {
         this.adaptable.showColumn(columnId);
     }
-    getAgGridColumnType(columnId) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getAgGridColumnType');
-        return this.internalApi.getAgGridColumnType(columnId);
-    }
     isAutoRowGroupColumn(columnId) {
         // put this here as there might be other indicators we are not aware of
         // perhaps with non auto groups ?
@@ -81,17 +76,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     }
     isActionColumn(columnId) {
         var _a;
-        return (((_a = this.adaptable.api.actionApi.getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) != null);
-    }
-    isStyledNumericColumn(column) {
-        (0, logDeprecation_1.logDeprecationExternal)(this.adaptable.logger, 'ColumnApi', 'isStyledNumericColumn', 'StyledColumnApi', 
-        // @ts-ignore
-        'hasPercentBarStyle() or StyledColumnApi.hasGradientStyle');
-        if (!column) {
-            return false;
-        }
-        return (this.getStyledColumnApi().hasPercentBarStyle(column.columnId) ||
-            this.getStyledColumnApi().hasGradientStyle(column.columnId));
+        return (((_a = this.adaptable.api.actionColumnApi.getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) != null);
     }
     getColumnWithColumnId(columnId, logWarning) {
         if (columnId == undefined) {
@@ -113,10 +98,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         return undefined;
     }
-    isNumericColumn(column) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ColumnApi', 'isNumericColumn', 'hasNumberDataType');
-        return this.hasNumberDataType(column === null || column === void 0 ? void 0 : column.columnId);
-    }
     hasNumberDataType(columnId) {
         const column = this.getColumnWithColumnId(columnId);
         if (!column) {
@@ -124,10 +105,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         return (column === null || column === void 0 ? void 0 : column.dataType) == 'Number';
     }
-    isBooleanColumn(column) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ColumnApi', 'isBooleanColumn', 'hasBooleanDataType');
-        return this.hasBooleanDataType(column === null || column === void 0 ? void 0 : column.columnId);
-    }
     hasBooleanDataType(columnId) {
         const column = this.getColumnWithColumnId(columnId);
         if (!column) {
@@ -144,10 +121,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
             (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)(this.adaptable.logger, 'ColumnApi', 'isDateColumn', 'hasDateDataType');
-        return this.hasDateDataType(column === null || column === void 0 ? void 0 : column.columnId);
-    }
     hasDateDataType(columnId) {
         const column = this.getColumnWithColumnId(columnId);
         if (!column) {
@@ -155,10 +128,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         return (column === null || column === void 0 ? void 0 : column.dataType) == 'Date';
     }
-    getColumnDataTypeFromColumnId(columnId) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ColumnApi', 'getColumnDataTypeFromColumnId', 'getColumnDataTypeForColumnId');
-        return this.getColumnDataTypeForColumnId(columnId);
-    }
     getColumnDataTypeForColumnId(columnId) {
         const column = this.getColumnWithColumnId(columnId); // this.getColumns().find(c => c.ColumnId == columnId);
         if (!column) {
@@ -166,21 +135,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         return column.dataType;
     }
-    getFriendlyNameFromColumn(columnId, column) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getFriendlyNameFromColumn');
-        if (columnId.includes(GeneralConstants.MISSING_COLUMN)) {
-            return columnId;
-        }
-        if (column) {
-            return column.friendlyName;
-        }
-        this.logMissingColumnWarning(columnId);
-        return columnId + GeneralConstants.MISSING_COLUMN;
-    }
-    getFriendlyNameFromColumnId(columnId) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ColumnApi', 'getFriendlyNameFromColumnId', 'getFriendlyNameForColumnId');
-        return this.getFriendlyNameForColumnId(columnId);
-    }
     getFriendlyNameForColumnId(columnId) {
         if (this.isAutoPivotColumn(columnId)) {
             return GeneralConstants.EMPTY_STRING;
@@ -199,10 +153,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         this.logMissingColumnWarning(columnId);
         return result;
     }
-    getFriendlyNamesFromColumnIds(columnIds) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ColumnApi', 'getFriendlyNamesFromColumnIds', 'getFriendlyNamesForColumnIds');
-        return this.getFriendlyNamesForColumnIds(columnIds);
-    }
     getFriendlyNamesForColumnIds(columnIds) {
         const friendlyNames = [];
         if (ArrayExtensions_1.default.IsNullOrEmpty(columnIds)) {
@@ -213,10 +163,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         });
         return friendlyNames;
     }
-    getColumnIdFromFriendlyName(friendlyName) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, '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"
@@ -228,10 +174,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         this.logMissingColumnWarning(friendlyName);
         return friendlyName + GeneralConstants.MISSING_COLUMN;
     }
-    getColumnIdsFromFriendlyNames(friendlyNames) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ColumnApi', 'getColumnIdsFromFriendlyNames', 'getColumnIdsForFriendlyNames');
-        return this.getColumnIdsForFriendlyNames(friendlyNames);
-    }
     getColumnIdsForFriendlyNames(friendlyNames) {
         const columnIds = [];
         if (ArrayExtensions_1.default.IsNullOrEmpty(friendlyNames)) {
@@ -242,19 +184,11 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         });
         return columnIds;
     }
-    getColumnsFromFriendlyNames(friendlyNames) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, '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)(this.adaptable.logger, 'ColumnApi', 'getColumnsFromIds', 'getColumnsWithColumnIds');
-        return this.getColumnsWithColumnIds(columnIds, logWarning);
-    }
     getColumnsWithColumnIds(columnIds, logWarning = true) {
         let returnCols = [];
         columnIds.forEach((c) => {
@@ -265,29 +199,9 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         });
         return returnCols;
     }
-    doesColumnExist(columnId) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ColumnApi', 'doesColumnExist', 'isColumnInGrid');
-        return this.isColumnInGrid(columnId);
-    }
     isColumnInGrid(columnId) {
         return !!this.getColumnWithColumnId(columnId, false);
     }
-    getColumnFromId(columnId, logWarning = true) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ColumnApi', 'getColumnFromId', 'getColumnWithColumnId');
-        return this.getColumnWithColumnId(columnId, logWarning);
-    }
-    getAgGridColumnFieldForAdaptableColumn(colId) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getAgGridColumnFieldForAdaptableColumn');
-        return this.internalApi.getAgGridColumnFieldForAdaptableColumn(colId);
-    }
-    getAgGridColumnForAdaptableColumn(columnId) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getAgGridColumnForAdaptableColumn');
-        return this.internalApi.getAgGridColumnForAdaptableColumn(columnId);
-    }
-    getColumnFromFriendlyName(columnName, logWarning = true) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, '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())) {
@@ -379,53 +293,9 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
             }
         }
     }
-    getDistinctDisplayValuesForColumn(columnId) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getDistinctDisplayValuesForColumn');
-        return this.getGridApi().internalApi.getDistinctDisplayValuesForColumn(columnId);
-    }
-    async getDistinctFilterDisplayValuesForColumn(columnId, filter, showFilteredRowsOnly) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getDistinctFilterDisplayValuesForColumn');
-        return this.getGridApi().internalApi.getDistinctFilterDisplayValuesForColumn(columnId, filter, showFilteredRowsOnly);
-    }
-    async getDistinctCustomSortDisplayValuesForColumn(columnId) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getDistinctCustomSortDisplayValuesForColumn');
-        return this.getGridApi().internalApi.getDistinctCustomSortDisplayValuesForColumn(columnId);
-    }
-    async getDistinctBulkUpdateDisplayValuesForColumn(columnId, selectedGridCells) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getDistinctBulkUpdateDisplayValuesForColumn');
-        return this.getGridApi().internalApi.getDistinctBulkUpdateDisplayValuesForColumn(columnId, selectedGridCells);
-    }
-    getDistinctVisibleDisplayValuesForColumn(columnId) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getDistinctVisibleDisplayValuesForColumn');
-        return this.getGridApi().internalApi.getDistinctVisibleDisplayValuesForColumn(columnId);
-    }
-    getDistinctRawValuesForColumn(columnId, skipRowNode) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getDistinctRawValuesForColumn');
-        return this.getGridApi().internalApi.getDistinctRawValuesForColumn(columnId, skipRowNode);
-    }
-    getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getUnsortedDistinctRawValuesForColumn');
-        return this.getGridApi().internalApi.getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode);
-    }
-    getDistinctVisibleRawValuesForColumn(columnId) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getDistinctVisibleRawValuesForColumn');
-        return this.getGridApi().internalApi.getDistinctVisibleRawValuesForColumn(columnId);
-    }
     getPrimaryKeyColumn() {
         return this.getColumnWithColumnId(this.adaptable.adaptableOptions.primaryKey);
     }
-    getAllColumnFriendlyNames() {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'getAllColumnFriendlyNames');
-        return this.internalApi.getAllColumnFriendlyNames();
-    }
-    usesAdaptableFilterForm(columnId) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'usesAdaptableFilterForm');
-        return this.internalApi.usesAdaptableFilterForm(columnId);
-    }
-    usesAdaptableQuickFilter(columnId) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ColumnApi', 'usesAdaptableQuickFilter');
-        return this.internalApi.usesAdaptableQuickFilter(columnId);
-    }
     isActionRowButtonColumn(columnId) {
         return columnId === GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS;
     }
@@ -436,13 +306,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         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];
     }
-    getTypesForColumn(columnId) {
-        var _a;
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, '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;
-    }
     isSpecialColumn(columnId) {
         return (this.isCalculatedColumn(columnId) ||
             this.isFreeTextColumn(columnId) ||

package/src/Api/Implementation/ConfigApiImpl.js

@@ -71,6 +71,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                         adaptableStateKey: adaptableOptions.adaptableStateKey,
                         adaptableId: adaptableOptions.adaptableId,
                         adaptableApi: this.adaptable.api,
+                        userName: this.adaptable.api.optionsApi.getUserName(),
                     };
                     this.adaptable.api.eventApi.emit('AdaptableStateReloaded', stateReloadedInfo);
                 });
@@ -100,7 +101,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
             dataSet: this.adaptable.api.dataSetApi.getCurrentDataSet(),
             currentQuery,
             queryAST: currentQuery
-                ? this.adaptable.api.queryLanguageApi.getASTForExpression(currentQuery)
+                ? this.adaptable.api.expressionApi.getASTForExpression(currentQuery)
                 : null,
             columnFilters: this.adaptable.api.filterApi.getColumnFilters(),
         };

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

@@ -1,4 +1,4 @@
-import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
+import { ApiBase } from './ApiBase';
 import { CustomSortApi } from '../CustomSortApi';
 import { CustomSort, CustomSortState } from '../../PredefinedConfig/CustomSortState';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
@@ -7,16 +7,13 @@ 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[];
@@ -28,6 +25,5 @@ export declare class CustomSortApiImpl extends ApiBase implements CustomSortApi
     deleteCustomSort(column: string): void;
     suspendCustomSort(customSort: CustomSort): CustomSort;
     unSuspendCustomSort(customSort: CustomSort): CustomSort;
-    showCustomSortPopup(): void;
     openCustomSortSettingsPanel(): void;
 }