@adaptabletools/adaptable 15.4.2 → 16.0.0-canary.0

package/src/Api/Implementation/AlertApiImpl.js

@@ -11,7 +11,6 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectF
 const AdaptableAlert_1 = require("../../PredefinedConfig/Common/AdaptableAlert");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const AlertInternalApi_1 = require("../Internal/AlertInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class AlertApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -41,10 +40,6 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(AlertRedux.AlertDefinitionAdd(alertDefinition));
         return this.getAlertDefinitionById(alertDefinition.Uuid);
     }
-    async displayAlert(alertToShow) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'AlertApi', 'displayAlert', 'showAdaptableAlert');
-        await this.showAdaptableAlert(alertToShow);
-    }
     async showAdaptableAlert(alertToShow) {
         var _a, _b;
         // 3 things we always do with an alert are:
@@ -55,6 +50,8 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         const alertFiredInfo = {
             adaptableApi: this.adaptable.api,
             alert: alertToShow,
+            userName: this.adaptable.api.optionsApi.getUserName(),
+            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
         };
         const results = await this.adaptable.api.eventApi.emit('AlertFired', alertFiredInfo);
         const showPopup = results.reduce((endResult, aResult) => {
@@ -137,10 +134,6 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             }
         }
     }
-    displayMessageAlertPopup(alertToDisplayAsPopup) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'AlertApi', 'displayMessageAlertPopup', 'showAdaptableAlertAsToast');
-        this.showAdaptableAlertAsToast(alertToDisplayAsPopup);
-    }
     showAdaptableAlertAsToast(alert) {
         this.dispatchAction(PopupRedux.PopupShowAlert(alert));
     }
@@ -164,10 +157,6 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
     openAlertSettingsPanel() {
         this.showModulePopup(ModuleConstants.AlertModuleId);
     }
-    showAlertPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'AlertApi', 'showAlertPopup', 'openAlertSettingsPanel');
-        this.openAlertSettingsPanel();
-    }
     editAlertDefinition(alertDefinition) {
         this.dispatchAction(AlertRedux.AlertDefinitionEdit(alertDefinition));
         return this.getAlertDefinitionById(alertDefinition.Uuid);
@@ -183,7 +172,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
     evaluateAlertDefinitions(alertDefinitions) {
         const filterScopeAllDefinitions = (alertDefinition) => {
             if (this.getAdaptableApi().scopeApi.scopeIsAll(alertDefinition.Scope) &&
-                !this.getAdaptableApi().queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule)) {
+                !this.getAdaptableApi().expressionApi.getAdaptableQueryExpression(alertDefinition.Rule)) {
                 // we don't support scope ALL without an expression
                 // the predicates for scope ALL do NOT make any sense for a programmatic evaluation
                 return false;
@@ -216,7 +205,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
     getRelevantColumnIdsForAlertDefinition(alertDefinition) {
         //  if there is an Expression defined, extract only the columns from there (in that case the Scope would be 'All' anyway)
         // columns referenced in rule expression
-        const ruleExpression = this.getAdaptableApi().queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
+        const ruleExpression = this.getAdaptableApi().expressionApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (this.getAdaptableApi().scopeApi.scopeIsAll(alertDefinition.Scope) &&
             StringExtensions_1.default.IsNotNullOrEmpty(ruleExpression)) {
             // return only first referenced column (otherwise we would generate multiple alerts for the same row)
@@ -254,84 +243,5 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         });
         return cellDataChangeInfos;
     }
-    /**
-     *  DEPRECATED INTERNAL METHODS
-     */
-    executeAlertAction(actionName, details) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'executeAlertAction');
-        this.internalApi.executeAlertAction(actionName, details);
-    }
-    executeAlertButton(button, context) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'executeAlertButton');
-        this.internalApi.executeAlertButton(button, context);
-    }
-    getActiveNonReactiveAlertDefinitions() {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getActiveNonReactiveAlertDefinitions');
-        return this.internalApi.getActiveNonReactiveAlertDefinitions();
-    }
-    getActiveReactiveAlertDefinitions() {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getActiveReactiveAlertDefinitions');
-        return this.internalApi.getActiveReactiveAlertDefinitions();
-    }
-    getAlertDefinitionsWithAllowEdit() {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertDefinitionsWithAllowEdit');
-        return this.internalApi.getAlertDefinitionsWithAllowEdit();
-    }
-    getAlertDefinitionsWithPreventEdit() {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertDefinitionsWithPreventEdit');
-        return this.internalApi.getAlertDefinitionsWithPreventEdit();
-    }
-    getAlertDescription(alertDefinition, cellDataChangedInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertDescription');
-        return this.internalApi.getAlertDescription(alertDefinition, cellDataChangedInfo);
-    }
-    getAlertMessageHeader(alertDefinition, cellDataChangedInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertMessageHeader');
-        return this.internalApi.getAlertMessageHeader(alertDefinition, cellDataChangedInfo);
-    }
-    getAlertPredicateDefsForScope(scope) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertPredicateDefsForScope');
-        return this.internalApi.getAlertPredicateDefsForScope(scope);
-    }
-    getAlertRuleDescription(alertDefinition) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertRuleDescription');
-        return this.internalApi.getAlertRuleDescription(alertDefinition);
-    }
-    getAlertTypeForAdaptableAlert(alert) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getAlertTypeForAdaptableAlert');
-        return this.internalApi.getAlertTypeForAdaptableAlert(alert);
-    }
-    getCustomAlertDescription(alertDefinition, dataChangedInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getCustomAlertDescription');
-        return this.internalApi.getCustomAlertDescription(alertDefinition, dataChangedInfo);
-    }
-    getCustomAlertMessageHeader(alertDefinition, dataChangedInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getCustomAlertMessageHeader');
-        return this.internalApi.getCustomAlertMessageHeader(alertDefinition, dataChangedInfo);
-    }
-    getNonReactiveAlertDefinitions() {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getNonReactiveAlertDefinitions');
-        return this.internalApi.getNonReactiveAlertDefinitions();
-    }
-    getReactiveAlertDefinitions() {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'getReactiveAlertDefinitions');
-        return this.internalApi.getReactiveAlertDefinitions();
-    }
-    isCellChangedAdaptableAlert(alert) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'isCellChangedAdaptableAlert');
-        return this.internalApi.isCellChangedAdaptableAlert(alert);
-    }
-    isGenericAdaptableAlert(alert) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'isGenericAdaptableAlert');
-        return this.internalApi.isGenericAdaptableAlert(alert);
-    }
-    isRowChangedAdaptableAlert(alert) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'isRowChangedAdaptableAlert');
-        return this.internalApi.isRowChangedAdaptableAlert(alert);
-    }
-    publishAlertFiredEvent(alertToFire) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'AlertApi', 'publishAlertFiredEvent');
-        return this.internalApi.publishAlertFiredEvent(alertToFire);
-    }
 }
 exports.AlertApiImpl = AlertApiImpl;

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

@@ -7,7 +7,7 @@ import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
-import { ActionApi, ActionOptions, AlertApi, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CellSummaryApi, ChartingApi, ChartingOptions, ColumnApi, ConfigApi, ContainerOptions, CustomSortApi, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, FilterApi, FilterOptions, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FreeTextColumnApi, GeneralOptions, GridApi, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, PluginsApi, PlusMinusApi, PredicateApi, QueryApi, QueryLanguageApi, QuickSearchApi, ScheduleApi, ScopeApi, SearchOptions, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, UserInterfaceApi, UserInterfaceOptions } from '../../types';
+import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ConfigApi, ContainerOptions, CustomSortApi, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, FilterApi, FilterOptions, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FreeTextColumnApi, GridApi, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, PluginsApi, PlusMinusApi, PredicateApi, QueryApi, QuickSearchApi, ScheduleApi, ScopeApi, SearchOptions, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, UserInterfaceApi, UserInterfaceOptions } from '../../types';
 import { NotificationsOptions } from '../../AdaptableOptions/NotificationsOptions';
 import { ToolPanelOptions } from '../../AdaptableOptions/ToolPanelOptions';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
@@ -15,6 +15,10 @@ import { AdaptableQLOptions } from '../../AdaptableOptions/AdaptableQLOptions';
 import { ExpressionOptions } from '../../AdaptableOptions/ExpressionOptions';
 import { AlertOptions } from '../../AdaptableOptions/AlertOptions';
 import { ColumnOptions } from '../../AdaptableOptions/ColumnOptions';
+import { GroupingOptions } from '../../AdaptableOptions/GroupingOptions';
+import { CustomSortOptions } from '../../AdaptableOptions/CustomSortOptions';
+import { ExpressionApi } from '../ExpressionApi';
+import { CalendarOptions } from '../../AdaptableOptions/CalendarOptions';
 export declare abstract class ApiBase {
     protected adaptable: IAdaptable;
     /**
@@ -55,15 +59,20 @@ export declare abstract class ApiBase {
     protected getModuleInfoByModuleId(module: AdaptableModule): ModuleInfo;
     protected showModulePopup(module: AdaptableModule, moduleParams?: ModuleParams): void;
     protected getOptions(): AdaptableOptions;
-    protected getActionOptions(): ActionOptions;
+    protected getActionColumnOptions(): ActionColumnOptions;
+    protected getActionRowOptions(): ActionRowOptions;
     protected getColumnOptions(): ColumnOptions;
+    protected getCustomSortOptions(): CustomSortOptions;
+    protected getDataSetOptions(): DataSetOptions;
+    protected getCalendarOptions(): CalendarOptions;
+    protected getCellSummaryOptions(): CellSummaryOptions;
     protected getContainerOptions(): ContainerOptions;
     protected getNotificationsOptions(): NotificationsOptions;
     protected getAlertOptions(): AlertOptions;
     protected getDashboardOptions(): DashboardOptions;
     protected getEditOptions(): EditOptions;
     protected getExportOptions(): ExportOptions;
-    protected getGeneralOptions(): GeneralOptions;
+    protected getGroupingOptions(): GroupingOptions;
     protected getLayoutOptions(): LayoutOptions;
     protected getMenuOptions(): MenuOptions;
     protected getFilterOptions(): FilterOptions;
@@ -80,7 +89,8 @@ export declare abstract class ApiBase {
     protected getFlashingCellOptions(): FlashingCellOptions;
     protected getSettingsPanelOptions(): SettingsPanelOptions;
     protected getAdaptableApi(): AdaptableApi;
-    protected getActionApi(): ActionApi;
+    protected getActionColumnApi(): ActionColumnApi;
+    protected getActionRowApi(): ActionRowApi;
     protected getApplicationApi(): ApplicationApi;
     protected getAlertApi(): AlertApi;
     protected getFlashingCellApi(): FlashingCellApi;
@@ -111,7 +121,7 @@ export declare abstract class ApiBase {
     protected getThemeApi(): ThemeApi;
     protected getUserInterfaceApi(): UserInterfaceApi;
     protected getQueryApi(): QueryApi;
-    protected getQueryLanguageApi(): QueryLanguageApi;
+    protected getExpressionApi(): ExpressionApi;
     protected getPluginsApi(): PluginsApi;
     protected getSettingsPanelApi(): SettingsPanelApi;
     protected getStyledColumnApi(): StyledColumnApi;

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

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