@adaptabletools/adaptable 15.4.3 → 16.0.0-canary.1

package/src/Api/FormatColumnApi.d.ts

@@ -1,6 +1,5 @@
 import { FormatColumn, FormatColumnState } from '../PredefinedConfig/FormatColumnState';
-import { AdaptableColumn, AdaptableFormat, AdaptableObjectLookupCriteria, AdaptablePredicateDef, AdaptableScope } from '../types';
-import { IRowNode } from '@ag-grid-community/core';
+import { AdaptableColumn, AdaptableObjectLookupCriteria } from '../types';
 /**
  * Provides run-time access to the Format Column Module and associated state
  */
@@ -111,93 +110,4 @@ export interface FormatColumnApi {
      * @param flashingCellLookupCriteria lookup criteria
      */
     findFormatColumns(formatColumnLookupCriteria: AdaptableObjectLookupCriteria): FormatColumn[];
-    /**
-     * TO BE REMOVED
-     */
-    /**
-     * @deprecated use `getFormatColumns()` instead
-     */
-    getAllFormatColumn(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): FormatColumn[];
-    /**
-     * @deprecated use `getActiveFormatColumns()` instead
-     */
-    getAllActiveFormatColumn(): FormatColumn[];
-    /**
-     * @deprecated use `getSuspendedFormatColumns()` instead
-     */
-    getAllSuspendedFormatColumn(): FormatColumn[];
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getAllFormatColumnWithStyle(): FormatColumn[];
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getAllFormatColumnWithStyleAndCellAlignment(): FormatColumn[];
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getAllFormatColumnWithDisplayFormat(): FormatColumn[];
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getAllFormatColumnWithCellAlignment(): FormatColumn[];
-    /**
-     * @deprecated use `openFormatColumnSettingsPanel()` instead
-     */
-    showFormatColumnPopup(): void;
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getFormatColumnsWithStyleForColumn(column: AdaptableColumn, config?: {
-        includeSuspended?: boolean;
-    }): FormatColumn[];
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn, config?: {
-        includeSuspended?: boolean;
-    }): FormatColumn[];
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getFormatColumnsWithDisplayFormatForColumn(column: AdaptableColumn, config?: {
-        includeSuspended?: boolean;
-    }): FormatColumn[];
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getNumberFormattedValue(value: any, node: IRowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): any;
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getStringFormattedValue(value: any, node: IRowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getDateFormattedValue(value: any, node: IRowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getFormatColumnDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    isFormatColumnRelevantForColumn(formatColumn: FormatColumn, column: AdaptableColumn, params: {
-        node: IRowNode;
-        value: any;
-    }): boolean;
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getFormatColumnsRelevantForColumn(formatColumns: FormatColumn[], column: AdaptableColumn, params: {
-        node: IRowNode;
-        value: any;
-    }): FormatColumn[];
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getFormatColumnsWithExpression(): FormatColumn[] | undefined;
 }

package/src/Api/FreeTextColumnApi.d.ts

@@ -1,5 +1,4 @@
 import { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue } from '../PredefinedConfig/FreeTextColumnState';
-import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { IRowNode } from '@ag-grid-community/core';
 /**
  * Provides run-time access to FreeTextColumn Module and associated state
@@ -57,13 +56,6 @@ export interface FreeTextColumnApi {
      * @param replaceAction Function Behaviour: 'All' replaces ALL existing Stored Values; 'Conflicting' adds all stored values and replaces those which clash; 'None' only adds where no existing
      */
     setStoredValues(columnId: string, storedValues: FreeTextStoredValue[], replaceAction: 'All' | 'Conflicting' | 'None'): void;
-    /**
-     * Adds Stored Values to Existing FreeTextColumn
-     * @param columnId Free Text Column to which to add Stored Values
-     * @param storedValues Stored Values to Add
-     * @param replaceAction Function Behaviour: 'All' replaces ALL existing Stored Values; 'Conflicting' adds all stored values and replaces those which clash; 'None' only adds where no existing
-     */
-    addStoredValuesToFreeTextColumn(columnId: string, storedValues: FreeTextStoredValue[], replaceAction: 'All' | 'Conflicting' | 'None'): void;
     /**
      * Retrieves a Free Text Column value for a given row node
      * @param freeTextColumn column to lookup
@@ -74,35 +66,4 @@ export interface FreeTextColumnApi {
      * Opens Settings Panel with Free Text Column section selected and visible
      */
     openFreeTextColumnSettingsPanel(): void;
-    /**
-     * TO BE REMOVED
-     */
-    /**
-     * @deprecated use `getFreeTextColumns()` instead
-     */
-    getAllFreeTextColumn(): FreeTextColumn[];
-    /**
-     * @deprecated use `setStoredValue()` instead
-     */
-    addEditFreeTextColumnStoredValue(freeTextColumn: FreeTextColumn, storedValue: FreeTextStoredValue): FreeTextColumn;
-    /**
-     * @deprecated use `setStoredValues()` instead
-     */
-    addStoredValuesToFreeTextColumn(columnId: string, storedValues: FreeTextStoredValue[], replaceAction: 'All' | 'Conflicting' | 'None'): void;
-    /**
-     * @deprecated use `getFreeTextColumnValueForRowNode()` instead
-     */
-    getFreeTextColumnValueFromRowNode(freeTextColumn: FreeTextColumn, rowNode: IRowNode): any;
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    checkFreeTextColumnForDataChange(cellDataChangedInfo: CellDataChangedInfo): void;
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    getFreeTextColumnModuleReferences(freeTextColumn: FreeTextColumn): string[];
-    /**
-     * @deprecated use `openFreeTextColumnSettingsPanel()` instead
-     */
-    showFreeTextColumnPopup(): void;
 }

package/src/Api/GridApi.d.ts

@@ -38,10 +38,6 @@ export interface GridApi {
      * @param data any data from any datasource that is suitable for AG Grid
      */
     setInitialGridData(data: any): void;
-    /**
-     * @deprecated
-     */
-    loadGridData(data: any): void;
     /**
      * Updates Adaptable (and AG Grid) with rows that have changed
      * @param dataRows rows which have been updated - send whole row and Adaptable will take care of the rest
@@ -519,31 +515,4 @@ export interface GridApi {
      * Returns the current AG Grid Row Model Type
      */
     getRowModelType(): RowModelType;
-    /**
-     * TO BE REMOVED
-     */
-    /**
-     * @deprecated use `collapseAllRowGroups()` instead
-     */
-    closeAllRowGroups(): void;
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    fireGridSortedEvent(): void;
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    fireCellChangedEvent(cellChangedInfo: CellDataChangedInfo): void;
-    /**
-     * @deprecated internal method, will be removed in next major release
-     */
-    fireGridDataChangedEvent(dataRows: any[], rowNodes: IRowNode[], rowTrigger: 'Add' | 'Edit' | 'Delete'): void;
-    /**
-     * @deprecated use `openGridInfoSettingsPanel()` instead
-     */
-    showGridInfoPopup(): void;
-    /**
-     * @deprecated use `isEveryCellEditable()` instead
-     */
-    areCellsEditable(gridCells: GridCell[]): boolean;
 }

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

@@ -0,0 +1,7 @@
+import { ActionColumn, ActionColumnApi } from '../../../types';
+import { ApiBase } from './ApiBase';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+export declare class ActionColumnApiImpl extends ApiBase implements ActionColumnApi {
+    constructor(adaptable: IAdaptable);
+    getActionColumns(): ActionColumn[];
+}

package/src/Api/Implementation/ActionColumnApiImpl.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActionColumnApiImpl = void 0;
+const ApiBase_1 = require("./ApiBase");
+class ActionColumnApiImpl extends ApiBase_1.ApiBase {
+    constructor(adaptable) {
+        super(adaptable);
+    }
+    getActionColumns() {
+        var _a;
+        return (_a = this.getActionColumnOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
+    }
+}
+exports.ActionColumnApiImpl = ActionColumnApiImpl;

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

@@ -0,0 +1,12 @@
+import { ActionRowApi, ActionRowButtonType } from '../../../types';
+import { ApiBase } from './ApiBase';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { ActionRowInternalApi } from '../Internal/ActionRowInternalApi';
+export declare class ActionRowApiImpl extends ApiBase implements ActionRowApi {
+    internalApi: ActionRowInternalApi;
+    constructor(adaptable: IAdaptable);
+    getActionRowButtons(): ActionRowButtonType[];
+    displayEditActionRow(primaryKey: any): void;
+    displayCreateActionRow(): void;
+    displayCloneActionRow(primaryKey?: any): void;
+}

package/src/Api/Implementation/{ActionApiImpl.js → ActionRowApiImpl.js}

@@ -1,24 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionApiImpl = void 0;
+exports.ActionRowApiImpl = void 0;
 const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
 const ApiBase_1 = require("./ApiBase");
-const ActionInternalApi_1 = require("../Internal/ActionInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
-class ActionApiImpl extends ApiBase_1.ApiBase {
+const ActionRowInternalApi_1 = require("../Internal/ActionRowInternalApi");
+class ActionRowApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new ActionInternalApi_1.ActionInternalApi(adaptable);
-    }
-    getActionColumns() {
-        var _a;
-        return (_a = this.getActionOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
+        this.internalApi = new ActionRowInternalApi_1.ActionRowInternalApi(adaptable);
     }
     getActionRowButtons() {
-        const actionRowButtons = this.getActionOptions().actionRowButtons;
+        const actionRowButtons = this.getActionRowOptions().actionRowButtons;
         return typeof actionRowButtons === 'function'
             ? actionRowButtons({
                 adaptableApi: this.getAdaptableApi(),
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
             })
             : actionRowButtons !== null && actionRowButtons !== void 0 ? actionRowButtons : [];
     }
@@ -59,9 +56,5 @@ class ActionApiImpl extends ApiBase_1.ApiBase {
             },
         }));
     }
-    getAllActionColumn() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ActionApi', 'getAllActionColumn', 'getActionColumns');
-        return this.getActionColumns();
-    }
 }
-exports.ActionApiImpl = ActionApiImpl;
+exports.ActionRowApiImpl = ActionRowApiImpl;

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

@@ -29,7 +29,7 @@ import { ThemeApi } from '../ThemeApi';
 import { GridApi } from '../GridApi';
 import { ScheduleApi } from '../ScheduleApi';
 import { QueryApi } from '../QueryApi';
-import { QueryLanguageApi } from '../QueryLanguageApi';
+import { ExpressionApi } from '../ExpressionApi';
 import { TeamSharingApi } from '../TeamSharingApi';
 import { ColumnApi } from '../ColumnApi';
 import { ApplicationApi } from '../ApplicationApi';
@@ -39,13 +39,15 @@ import { DataChangeHistoryApi } from '../DataChangeHistoryApi';
 import { FlashingCellApi } from '../FlashingCellApi';
 import { ChartingApi } from '../ChartingApi';
 import { StatusBarApi } from '../StatusBarApi';
-import { ActionApi } from '../../../types';
 import { StyledColumnApi } from '../StyledColumnApi';
+import { ActionColumnApi } from '../ActionColumnApi';
+import { ActionRowApi } from '../ActionRowApi';
 export declare class AdaptableApiImpl implements AdaptableApi {
     protected adaptable: IAdaptable;
     internalApi: AdaptableInternalApi;
     optionsApi: OptionsApi;
-    actionApi: ActionApi;
+    actionColumnApi: ActionColumnApi;
+    actionRowApi: ActionRowApi;
     applicationApi: ApplicationApi;
     alertApi: AlertApi;
     flashingCellApi: FlashingCellApi;
@@ -77,7 +79,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     themeApi: ThemeApi;
     userInterfaceApi: UserInterfaceApi;
     queryApi: QueryApi;
-    queryLanguageApi: QueryLanguageApi;
+    expressionApi: ExpressionApi;
     settingsPanelApi: SettingsPanelApi;
     styledColumnApi: StyledColumnApi;
     toolPanelApi: ToolPanelApi;

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -35,11 +35,12 @@ const ColumnApiImpl_1 = require("./ColumnApiImpl");
 const ApplicationApiImpl_1 = require("./ApplicationApiImpl");
 const ScopeApiImpl_1 = require("./ScopeApiImpl");
 const DataChangeHistoryApiImpl_1 = require("./DataChangeHistoryApiImpl");
-const QueryLanguageApiImpl_1 = require("./QueryLanguageApiImpl");
+const ExpressionApiImpl_1 = require("./ExpressionApiImpl");
 const FlashingCellApiImpl_1 = require("./FlashingCellApiImpl");
 const ChartingApiImpl_1 = require("./ChartingApiImpl");
 const SettingsPanelApiImpl_1 = require("./SettingsPanelApiImpl");
-const ActionApiImpl_1 = require("./ActionApiImpl");
+const ActionColumnApiImpl_1 = require("./ActionColumnApiImpl");
+const ActionRowApiImpl_1 = require("./ActionRowApiImpl");
 const StyledColumnApiImpl_1 = require("./StyledColumnApiImpl");
 const CalendarApiImpl_1 = require("./CalendarApiImpl");
 const EntitlementApiImpl_1 = require("./EntitlementApiImpl");
@@ -50,7 +51,8 @@ class AdaptableApiImpl {
         this.destroyed = false;
         this.adaptable = adaptable;
         this.optionsApi = new OptionsApiImpl_1.OptionsApiImpl(adaptable);
-        this.actionApi = new ActionApiImpl_1.ActionApiImpl(adaptable);
+        this.actionColumnApi = new ActionColumnApiImpl_1.ActionColumnApiImpl(adaptable);
+        this.actionRowApi = new ActionRowApiImpl_1.ActionRowApiImpl(adaptable);
         this.applicationApi = new ApplicationApiImpl_1.ApplicationApiImpl(adaptable);
         this.alertApi = new AlertApiImpl_1.AlertApiImpl(adaptable);
         this.flashingCellApi = new FlashingCellApiImpl_1.FlashingCellApiImpl(adaptable);
@@ -83,7 +85,7 @@ class AdaptableApiImpl {
         this.themeApi = new ThemeApiImpl_1.ThemeApiImpl(adaptable);
         this.userInterfaceApi = new UserInterfaceApiImpl_1.UserInterfaceApiImpl(adaptable);
         this.queryApi = new QueryApiImpl_1.QueryApiImpl(adaptable);
-        this.queryLanguageApi = new QueryLanguageApiImpl_1.QueryLanguageApiImpl(adaptable);
+        this.expressionApi = new ExpressionApiImpl_1.ExpressionApiImpl(adaptable);
         this.styledColumnApi = new StyledColumnApiImpl_1.StyledColumnApiImpl(adaptable);
         this.toolPanelApi = new ToolPanelApiImpl_1.ToolPanelApiImpl(adaptable);
         this.teamSharingApi = new TeamSharingApiImpl_1.TeamSharingApiImpl(adaptable);
@@ -129,7 +131,7 @@ class AdaptableApiImpl {
         this.plusMinusApi = null;
         this.predicateApi = null;
         this.queryApi = null;
-        this.queryLanguageApi = null;
+        this.expressionApi = null;
         this.quickSearchApi = null;
         this.scheduleApi = null;
         this.scopeApi = null;

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

@@ -1,14 +1,8 @@
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { AlertApi } from '../AlertApi';
-import { AdaptableAlertAction, AlertButton, AlertDefinition, AlertProperties, AlertState } from '../../PredefinedConfig/AlertState';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
-import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
+import { AlertDefinition, AlertProperties, AlertState } from '../../PredefinedConfig/AlertState';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableFormData } from '../../PredefinedConfig/Common/AdaptableForm';
-import { AlertFormContext } from '../../AdaptableOptions/AlertOptions';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
-import { GridDataChangedInfo } from '../Events/GridDataChanged';
 import { AdaptableObjectLookupCriteria } from '../../PredefinedConfig/Common/AdaptableObject';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AlertInternalApi } from '../Internal/AlertInternalApi';
@@ -26,9 +20,7 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
     deleteAlertDefinition(alertDefinition: AlertDefinition): void;
     getAlertDefinitionById(id: AlertDefinition['Uuid']): AlertDefinition;
     addAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
-    displayAlert(alertToShow: AdaptableAlert): Promise<void>;
     showAdaptableAlert(alertToShow: AdaptableAlert): Promise<void>;
-    displayMessageAlertPopup(alertToDisplayAsPopup: AdaptableAlert): void;
     showAdaptableAlertAsToast(alert: AdaptableAlert): void;
     showAlert(alertHeader: string, alertMessage: string, messageType: AdaptableMessageType, alertProperties?: AlertProperties): Promise<void>;
     showAlertInfo(alertHeader: string, alertMessage: string, alertProperties?: AlertProperties): Promise<void>;
@@ -36,7 +28,6 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
     showAlertWarning(alertHeader: string, alertMessage: string, alertProperties?: AlertProperties): Promise<void>;
     showAlertError(alertHeader: string, alertMessage: string, alertProperties?: AlertProperties): Promise<void>;
     openAlertSettingsPanel(): void;
-    showAlertPopup(): void;
     editAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
     suspendAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
     unSuspendAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
@@ -44,37 +35,4 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
     findAlertDefinitions(criteria: AdaptableObjectLookupCriteria): AlertDefinition[];
     private getRelevantColumnIdsForAlertDefinition;
     private createCellDataChangeInfoStubs;
-    /**
-     *  DEPRECATED INTERNAL METHODS
-     */
-    executeAlertAction(actionName: AdaptableAlertAction | string, details: {
-        alertDefinition: AlertDefinition;
-        cellDataChangedInfo?: CellDataChangedInfo;
-        gridDataChangedInfo?: GridDataChangedInfo;
-        formData?: AdaptableFormData;
-    }): void;
-    executeAlertButton(button: AlertButton<AlertFormContext>, context: AlertFormContext): void;
-    getActiveNonReactiveAlertDefinitions(): AlertDefinition[];
-    getActiveReactiveAlertDefinitions(): AlertDefinition[];
-    getAlertDefinitionsWithAllowEdit(): AlertDefinition[];
-    getAlertDefinitionsWithPreventEdit(): AlertDefinition[];
-    getAlertDescription(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
-    getAlertMessageHeader(alertDefinition: AlertDefinition, cellDataChangedInfo?: CellDataChangedInfo): string;
-    getAlertPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
-    getAlertRuleDescription(alertDefinition: AlertDefinition): string;
-    getAlertTypeForAdaptableAlert(alert: AdaptableAlert): 'cellChanged' | 'rowChanged' | 'generic';
-    getCustomAlertDescription(alertDefinition: AlertDefinition, dataChangedInfo?: {
-        cellDataChangedInfo?: CellDataChangedInfo;
-        gridDataChangedInfo?: GridDataChangedInfo;
-    }): string;
-    getCustomAlertMessageHeader(alertDefinition: AlertDefinition, dataChangedInfo?: {
-        cellDataChangedInfo?: CellDataChangedInfo;
-        gridDataChangedInfo?: GridDataChangedInfo;
-    }): string;
-    getNonReactiveAlertDefinitions(): AlertDefinition[];
-    getReactiveAlertDefinitions(): AlertDefinition[];
-    isCellChangedAdaptableAlert(alert: AdaptableAlert): boolean;
-    isGenericAdaptableAlert(alert: AdaptableAlert): boolean;
-    isRowChangedAdaptableAlert(alert: AdaptableAlert): boolean;
-    publishAlertFiredEvent(alertToFire: AdaptableAlert): void;
 }

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;