@adaptabletools/adaptable 15.4.2 → 16.0.0-canary.0

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;
 }

package/src/Api/Implementation/CustomSortApiImpl.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const CustomSortRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CustomSortRedux"));
 const ApiBase_1 = require("./ApiBase");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const CustomSortInternalApi_1 = require("../Internal/CustomSortInternalApi");
 class CustomSortApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
@@ -15,10 +14,6 @@ class CustomSortApiImpl extends ApiBase_1.ApiBase {
     getCustomSortState() {
         return this.getAdaptableState().CustomSort;
     }
-    getAllCustomSort(config) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CustomSortApi', 'getAllCustomSort', 'getCustomSorts');
-        return this.getCustomSorts(config);
-    }
     getCustomSorts(config) {
         var _a;
         return ((_a = this.handleLayoutAssociatedObjects(this.getCustomSortState().CustomSorts, 'CustomSort', config)) !== null && _a !== void 0 ? _a : []);
@@ -26,17 +21,9 @@ class CustomSortApiImpl extends ApiBase_1.ApiBase {
     getCustomSortById(id) {
         return this.getCustomSorts().find((customSort) => customSort.Uuid === id);
     }
-    getAllActiveCustomSort() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CustomSortApi', 'getAllActiveCustomSort', 'getActiveCustomSorts');
-        return this.getActiveCustomSorts();
-    }
     getActiveCustomSorts(config) {
         return this.getCustomSorts(config).filter((customSort) => !customSort.IsSuspended);
     }
-    getAllSuspendedCustomSort() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CustomSortApi', 'getAllSuspendedCustomSort', 'getSuspendedCustomSorts');
-        return this.getSuspendedCustomSorts();
-    }
     getSuspendedCustomSorts(config) {
         return this.getCustomSorts(config).filter((customSort) => customSort.IsSuspended);
     }
@@ -77,9 +64,6 @@ class CustomSortApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(CustomSortRedux.CustomSortUnSuspend(customSort));
         return this.getCustomSortById(customSort.Uuid);
     }
-    showCustomSortPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CustomSortApi', 'showCustomSortPopup', 'openCustomSortSettingsPanel');
-    }
     openCustomSortSettingsPanel() {
         this.showModulePopup(ModuleConstants.CustomSortModuleId);
     }

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

@@ -2,7 +2,6 @@ import { ApiBase } from './ApiBase';
 import { DashboardApi } from '../DashboardApi';
 import { DashboardState, DashboardTab } from '../../PredefinedConfig/DashboardState';
 import { AdaptableDashboardToolbar, AdaptableDashboardToolbars, AdaptableModuleButtons } from '../../PredefinedConfig/Common/Types';
-import { DashboardChangedInfo } from '../Events/DashboardChanged';
 import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
 import { DashboardButtonContext } from '../../types';
 import { CustomToolbar } from '../../AdaptableOptions/DashboardOptions';
@@ -34,10 +33,7 @@ export declare class DashboardApiImpl extends ApiBase implements DashboardApi {
     setActiveTabIndex(tabIndex: number): void;
     setActiveTab(tabName: string): void;
     getCurrentToolbars(): AdaptableDashboardToolbars | string[] | undefined;
-    fireDashboardChangedEvent: (trigger: string, oldDashboardState: DashboardState, newDashboardState: DashboardState) => void;
-    showDashboardPopup(): void;
     openDashboardSettingsPanel(): void;
-    hasCustomToolbarChanged(dashboardChangedInfo: DashboardChangedInfo, customToolbarName: string): 'hidden' | 'visible' | 'none';
     isDashboardCollapsed(): boolean;
     isDashboardExpanded(): boolean;
     isDashboardFloating(): boolean;

package/src/Api/Implementation/DashboardApiImpl.js

@@ -8,17 +8,9 @@ const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/
 const React = tslib_1.__importStar(require("react"));
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const DashboardInternalApi_1 = require("../Internal/DashboardInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class DashboardApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        // it's called synchronously by DASHBOARD_SET_ACTIVE_TAB & DASHBOARD_SET_IS_COLLAPSED,
-        // both firing the same events, thus this function being called twice;
-        // so we debounced to only get tha latest call
-        this.fireDashboardChangedEvent = (trigger, oldDashboardState, newDashboardState) => {
-            (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'DashboardApi', 'fireDashboardChangedEvent');
-            this.internalApi.fireDashboardChangedEvent(trigger, oldDashboardState, newDashboardState);
-        };
         this.internalApi = new DashboardInternalApi_1.DashboardInternalApi(adaptable);
     }
     getDashboardState() {
@@ -34,6 +26,8 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
         const api = this.getAdaptableApi();
         const dashboardContext = {
             adaptableApi: api,
+            userName: this.getOptions().userName,
+            adaptableId: this.getOptions().adaptableId,
             dashboardState: api.dashboardApi.getDashboardState(),
         };
         return this.getDashboardOptions().customDashboardButtons.find((cb) => {
@@ -118,25 +112,9 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
         }
         return currentTab.Toolbars;
     }
-    showDashboardPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'DashboardApi', 'showDashboardPopup', 'openDashboardSettingsPanel');
-        this.openDashboardSettingsPanel();
-    }
     openDashboardSettingsPanel() {
         this.showModulePopup(ModuleConstants.DashboardModuleId);
     }
-    hasCustomToolbarChanged(dashboardChangedInfo, customToolbarName) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'DashboardApi', 'hasCustomToolbarChanged', null, 'Use instead the information provided in the DashboardChanged event.');
-        const visibleInNewState = this.internalApi.isToolbarInActiveTab(customToolbarName, dashboardChangedInfo.newDashboardState);
-        const visibleInOldState = this.internalApi.isToolbarInActiveTab(customToolbarName, dashboardChangedInfo.oldDashboardState);
-        if (visibleInNewState && !visibleInOldState) {
-            return 'visible';
-        }
-        if (visibleInOldState && !visibleInNewState) {
-            return 'hidden';
-        }
-        return 'none';
-    }
     isDashboardCollapsed() {
         return this.getDashboardState().IsCollapsed;
     }

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

@@ -8,6 +8,5 @@ export declare class DataChangeHistoryApiImpl extends ApiBase implements DataCha
     suspendDataChangeHistory(): void;
     getDataChangeHistoryLog(): CellDataChangedInfo[];
     undoDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
-    showDataChangeHistoryPopup(): void;
     openDataChangeHistorySettingsPanel(): void;
 }

package/src/Api/Implementation/DataChangeHistoryApiImpl.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class DataChangeHistoryApiImpl extends ApiBase_1.ApiBase {
     getDataChangeHistoryMode() {
         return this.getAdaptableState().System.DataChangeHistory.currentMode;
@@ -41,10 +40,6 @@ class DataChangeHistoryApiImpl extends ApiBase_1.ApiBase {
     undoDataChangeHistoryEntry(dataChangeInfo) {
         this.dispatchAction((0, SystemRedux_1.SystemDataChangeHistoryUndo)(dataChangeInfo));
     }
-    showDataChangeHistoryPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'DataChangeHistoryApi', 'showDataChangeHistoryPopup', 'openDataChangeHistorySettingsPanel');
-        this.openDataChangeHistorySettingsPanel();
-    }
     openDataChangeHistorySettingsPanel() {
         this.showModulePopup(ModuleConstants.DataChangeHistoryModuleId);
     }

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

@@ -1,18 +1,15 @@
 import { ApiBase } from './ApiBase';
 import { DataSetApi } from '../DataSetApi';
-import { DataSet } from '../../AdaptableOptions/GeneralOptions';
+import { DataSet } from '../../AdaptableOptions/DataSetOptions';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { DataSetInternalApi } from '../Internal/DataSetInternalApi';
 export declare class DataSetApiImpl extends ApiBase implements DataSetApi {
     internalApi: DataSetInternalApi;
     constructor(adaptable: IAdaptable);
-    getAllDataSets(): DataSet[];
     getDataSets(): DataSet[];
     getCurrentDataSet(): DataSet | undefined;
     getDataSetByName(dataSetName: string): DataSet | undefined;
     setDataSet(dataSetName: string): void;
     clearCurrentDataSet(): void;
-    showDataSetPopup(): void;
     openDataSetSettingsPanel(): void;
-    fireDataSetSelectedEvent(dataSet: DataSet): void;
 }

package/src/Api/Implementation/DataSetApiImpl.js

@@ -6,19 +6,14 @@ const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 const ApiBase_1 = require("./ApiBase");
 const DataSetInternalApi_1 = require("../Internal/DataSetInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class DataSetApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
         this.internalApi = new DataSetInternalApi_1.DataSetInternalApi(adaptable);
     }
-    getAllDataSets() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'DataSetApi', 'getAllDataSets', 'getDataSets');
-        return this.getDataSets();
-    }
     getDataSets() {
         var _a, _b, _c;
-        return (_c = (_b = (_a = this.adaptable.adaptableOptions) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.dataSets) !== null && _c !== void 0 ? _c : [];
+        return (_c = (_b = (_a = this.adaptable.adaptableOptions) === null || _a === void 0 ? void 0 : _a.dataSetOptions) === null || _b === void 0 ? void 0 : _b.dataSets) !== null && _c !== void 0 ? _c : [];
     }
     getCurrentDataSet() {
         let currentDataSetName = this.getAdaptableState().System.CurrentDataSet;
@@ -36,16 +31,8 @@ class DataSetApiImpl extends ApiBase_1.ApiBase {
     clearCurrentDataSet() {
         this.dispatchAction(SystemRedux.SystemDataSetSelect(null));
     }
-    showDataSetPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'DataSetApi', 'showDataSetPopup', 'openDataSetSettingsPanel');
-        this.openDataSetSettingsPanel();
-    }
     openDataSetSettingsPanel() {
         this.showModulePopup(ModuleConstants.DataSetModuleId);
     }
-    fireDataSetSelectedEvent(dataSet) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'DataSetApi', 'fireDataSetSelectedEvent');
-        this.internalApi.fireDataSetSelectedEvent(dataSet);
-    }
 }
 exports.DataSetApiImpl = DataSetApiImpl;

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

@@ -2,8 +2,7 @@ import { ExportApi } from '../ExportApi';
 import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } from '../../PredefinedConfig/ExportState';
 import { ApiBase } from './ApiBase';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { AdaptableReportColumn, CustomDestination, ExportFormContext, ServerReport } from '../../AdaptableOptions/ExportOptions';
+import { AdaptableReportColumn, CustomDestination, ExportFormContext, ExternalReport } from '../../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExportInternalApi } from '../Internal/ExportInternalApi';
@@ -19,28 +18,23 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     getCurrentDestination(): ExportDestination | CustomDestination;
     getAvailableSystemReports(): SystemReportNames;
     getAvailableExportDestinations(): ExportDestination[];
-    getAllReports(): Report[];
     getReports(): Report[];
     getReportSchedules(): ReportSchedule[];
     sendReport(reportName: string, destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
     selectReport(reportName: string): void;
     selectDestination(destinationName: string): void;
-    getAllCustomDestination(): CustomDestination[];
     getCustomDestinations(): CustomDestination[];
     isExportDestinationCustom(destinationName: string): boolean;
     getExportDestinationForm(destinationName: string): AdaptableForm<ExportFormContext> | undefined;
     canExportToExcel(): boolean;
     exportDataToExcel(reportData: ReportData, fileName: string): void;
-    showExportPopup(): void;
     openExportSettingsPanel(): void;
     editReport(report: Report): Report;
     editReports(reports: Report[]): Report[];
-    isDataChangeInReport(cellDataChangedInfo: CellDataChangedInfo, report: Report): boolean;
     exportVisualDataToExcel(): void;
-    getAllServerReports(): ServerReport[] | undefined;
-    getServerReports(): ServerReport[];
-    isServerReport(report: Report): boolean;
-    runServerReport(serverReportName: string): ReportData | undefined;
+    getExternalReports(): ExternalReport[];
+    isExternalReport(report: Report): boolean;
+    runExternalReport(externalReportName: string): ReportData | undefined;
     getReportDataForReport(reportName: string): ReportData | undefined;
     isColumnExportable(adaptableColumn: AdaptableReportColumn): boolean;
 }

package/src/Api/Implementation/ExportApiImpl.js

@@ -9,7 +9,6 @@ const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const ExportInternalApi_1 = require("../Internal/ExportInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class ExportApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -62,18 +61,14 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         });
         return systemDestinations;
     }
-    getAllReports() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ExportApi', 'getAllReports', 'getReports');
-        return this.getReports();
-    }
     getReports() {
         const reports = this.getAvailableSystemReports()
             .map((s) => this.getReportByName(s))
             .concat(this.getExportState().Reports);
-        const serverReports = this.getServerReports();
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(serverReports)) {
-            reports.push(...serverReports.map((c) => {
-                return ObjectFactory_1.default.CreateServerReport(c.name);
+        const externalReports = this.getExternalReports();
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(externalReports)) {
+            reports.push(...externalReports.map((c) => {
+                return ObjectFactory_1.default.CreateExternalReport(c.name);
             }));
         }
         return reports;
@@ -93,10 +88,6 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
     selectDestination(destinationName) {
         this.dispatchAction(ExportRedux.DestinationSelect(destinationName));
     }
-    getAllCustomDestination() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ExportApi', 'getAllCustomDestination', 'getCustomDestinations');
-        return this.getCustomDestinations();
-    }
     getCustomDestinations() {
         var _a;
         return (_a = this.getExportOptions().customDestinations) !== null && _a !== void 0 ? _a : [];
@@ -114,10 +105,6 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
     exportDataToExcel(reportData, fileName) {
         this.adaptable.exportToExcel(reportData, fileName);
     }
-    showExportPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ExportApi', 'showExportPopup', 'openExportSettingsPanel');
-        this.openExportSettingsPanel();
-    }
     openExportSettingsPanel() {
         this.showModulePopup(ModuleConstants.ExportModuleId);
     }
@@ -131,33 +118,25 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         });
         return reports === null || reports === void 0 ? void 0 : reports.map((report) => this.getReportById(report.Uuid));
     }
-    isDataChangeInReport(cellDataChangedInfo, report) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ExportApi', 'isDataChangeInReport');
-        return this.internalApi.isDataChangeInReport(cellDataChangedInfo, report);
-    }
     exportVisualDataToExcel() {
         this.adaptable.exportVisualDataToExcel();
     }
-    getAllServerReports() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ExportApi', 'getAllServerReports', 'getServerReports');
-        return this.getServerReports();
-    }
-    getServerReports() {
+    getExternalReports() {
         var _a;
-        return (_a = this.getExportOptions().serverReports) !== null && _a !== void 0 ? _a : [];
+        return (_a = this.getExportOptions().externalReports) !== null && _a !== void 0 ? _a : [];
     }
-    isServerReport(report) {
+    isExternalReport(report) {
         var _a;
-        return ((_a = this.getServerReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
+        return ((_a = this.getExternalReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
     }
-    runServerReport(serverReportName) {
+    runExternalReport(externalReportName) {
         var _a;
-        const serverReport = (_a = this.getServerReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == serverReportName);
-        if (!serverReport) {
-            this.logWarn(`Server Report '${serverReportName}' not found!`);
+        const externalReport = (_a = this.getExternalReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == externalReportName);
+        if (!externalReport) {
+            this.logWarn(`External Report '${externalReportName}' not found!`);
             return undefined;
         }
-        return serverReport.onRunReport();
+        return externalReport.onRunReport();
     }
     getReportDataForReport(reportName) {
         const report = this.getReportByName(reportName);
@@ -172,6 +151,8 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         if (typeof isExportableFn === 'function') {
             return isExportableFn({
                 adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
                 adaptableColumn,
             });
         }