@adaptabletools/adaptable 16.2.4 → 17.0.0-canary.0

package/src/Api/Implementation/ThemeApiImpl.js

@@ -1,17 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ThemeApiImpl = void 0;
-const tslib_1 = require("tslib");
-const ThemeRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ThemeRedux"));
-const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const ApiBase_1 = require("./ApiBase");
-const themes_1 = require("../../themes");
-const ThemeInternalApi_1 = require("../Internal/ThemeInternalApi");
-const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
-class ThemeApiImpl extends ApiBase_1.ApiBase {
+import * as ThemeRedux from '../../Redux/ActionsReducers/ThemeRedux';
+import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
+import { ApiBase } from './ApiBase';
+import { StaticThemes } from '../../themes';
+import { ThemeInternalApi } from '../Internal/ThemeInternalApi';
+import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
+export class ThemeApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new ThemeInternalApi_1.ThemeInternalApi(adaptable);
+        this.internalApi = new ThemeInternalApi(adaptable);
     }
     getThemeState() {
         return this.getAdaptableState().Theme;
@@ -44,7 +40,7 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
         return themes.map((theme) => {
             var _a, _b;
             if (typeof theme === 'string') {
-                const description = (_b = (_a = themes_1.StaticThemes.find((staticTheme) => staticTheme.Name === theme)) === null || _a === void 0 ? void 0 : _a.Description) !== null && _b !== void 0 ? _b : theme;
+                const description = (_b = (_a = StaticThemes.find((staticTheme) => staticTheme.Name === theme)) === null || _a === void 0 ? void 0 : _a.Description) !== null && _b !== void 0 ? _b : theme;
                 return {
                     Name: theme,
                     Description: description,
@@ -91,11 +87,10 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
         }
     }
     addUserTheme(theme) {
-        AdaptableHelper_1.default.addUuidAndSource(theme);
+        AdaptableHelper.addUuidAndSource(theme);
         this.dispatchAction(ThemeRedux.ThemeAdd(theme));
     }
     deleteUserTheme(theme) {
         this.dispatchAction(ThemeRedux.ThemeDelete(theme));
     }
 }
-exports.ThemeApiImpl = ThemeApiImpl;

package/src/Api/Implementation/ToolPanelApiImpl.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToolPanelApiImpl = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("./ApiBase");
-const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const ToolPanelRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ToolPanelRedux"));
-const ToolPanelRedux_1 = require("../../Redux/ActionsReducers/ToolPanelRedux");
-class ToolPanelApiImpl extends ApiBase_1.ApiBase {
+import { ApiBase } from './ApiBase';
+import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
+import * as ToolPanelRedux from '../../Redux/ActionsReducers/ToolPanelRedux';
+import { ToolPanelSetModuleButtons } from '../../Redux/ActionsReducers/ToolPanelRedux';
+export class ToolPanelApiImpl extends ApiBase {
     getToolPanelState() {
         return this.getAdaptableState().ToolPanel;
     }
@@ -53,7 +49,7 @@ class ToolPanelApiImpl extends ApiBase_1.ApiBase {
         }
     }
     setModuleButtons(moduleButtons) {
-        this.dispatchAction((0, ToolPanelRedux_1.ToolPanelSetModuleButtons)(moduleButtons));
+        this.dispatchAction(ToolPanelSetModuleButtons(moduleButtons));
     }
     getModuleButtons() {
         var _a, _b;
@@ -66,4 +62,3 @@ class ToolPanelApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(ToolPanelRedux.ToolPanelCollapseToolPanel(toolPanelName));
     }
 }
-exports.ToolPanelApiImpl = ToolPanelApiImpl;

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -1,16 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserInterfaceApiImpl = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("./ApiBase");
-const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
-const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
-const UserInterfaceInternalApi_1 = require("../Internal/UserInterfaceInternalApi");
-const WindowPopups_1 = require("../../View/Components/Popups/WindowPopups/WindowPopups");
-class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
+import { ApiBase } from './ApiBase';
+import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
+import { ArrayExtensions } from '../../Utilities/Extensions/ArrayExtensions';
+import { UserInterfaceInternalApi } from '../Internal/UserInterfaceInternalApi';
+import { CUSTOM_WINDOW_FACTORY_ID } from '../../View/Components/Popups/WindowPopups/WindowPopups';
+export class UserInterfaceApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new UserInterfaceInternalApi_1.UserInterfaceInternalApi(adaptable);
+        this.internalApi = new UserInterfaceInternalApi(adaptable);
     }
     getColorPalette() {
         let colorPalette = this.getUserInterfaceOptions().colorPalette;
@@ -22,7 +18,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         }
         else {
             let arr = colorPalette;
-            if (arr && ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(arr)) {
+            if (arr && ArrayExtensions.IsNotNullOrEmpty(arr)) {
                 return arr;
             }
         }
@@ -65,7 +61,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         return undefined;
     }
     getPermittedValuesForColumn(column) {
-        if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(this.getPermittedValuesItems())) {
+        if (ArrayExtensions.IsNullOrEmpty(this.getPermittedValuesItems())) {
             return undefined;
         }
         const allPermittedValues = this.getPermittedValuesItems();
@@ -88,7 +84,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         }
         else {
             let arr = permittedValues;
-            if (arr && ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(arr)) {
+            if (arr && ArrayExtensions.IsNotNullOrEmpty(arr)) {
                 return arr;
             }
         }
@@ -100,7 +96,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     }
     getFilterPermittedValuesForColumn(column) {
         const allFilterPermittedValuesItems = this.getAllFilterPermittedValuesItems();
-        if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(allFilterPermittedValuesItems)) {
+        if (ArrayExtensions.IsNullOrEmpty(allFilterPermittedValuesItems)) {
             return undefined;
         }
         return this.getPermittedValuesForScope(column, allFilterPermittedValuesItems);
@@ -111,7 +107,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     }
     getCustomSortPermittedValuesForColumn(column) {
         const allFilterPermittedValuesItems = this.getAllCustomSortPermittedValuesItems();
-        if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(allFilterPermittedValuesItems)) {
+        if (ArrayExtensions.IsNullOrEmpty(allFilterPermittedValuesItems)) {
             return undefined;
         }
         return this.getPermittedValuesForScope(column, allFilterPermittedValuesItems);
@@ -122,7 +118,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     }
     getBulkUpdatePermittedValuesForColumn(column) {
         const allFilterPermittedValuesItems = this.getAllBulkUpdatePermittedValuesItems();
-        if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(allFilterPermittedValuesItems)) {
+        if (ArrayExtensions.IsNullOrEmpty(allFilterPermittedValuesItems)) {
             return undefined;
         }
         return this.getPermittedValuesForScope(column, allFilterPermittedValuesItems);
@@ -171,7 +167,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         }
         else {
             let arr = objectTags;
-            if (arr && ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(arr)) {
+            if (arr && ArrayExtensions.IsNotNullOrEmpty(arr)) {
                 return arr;
             }
         }
@@ -199,7 +195,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         const action = PopupRedux.PopupShowWindow({
             Id: config.id,
             Title: config.title,
-            FactoryId: WindowPopups_1.CUSTOM_WINDOW_FACTORY_ID,
+            FactoryId: CUSTOM_WINDOW_FACTORY_ID,
             PopupProps: {
                 render: config.render,
                 frameworkComponent: config.frameworkComponent,
@@ -214,4 +210,3 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(PopupRedux.PopupHideWindow(windowId));
     }
 }
-exports.UserInterfaceApiImpl = UserInterfaceApiImpl;

package/src/Api/Internal/ActionRowInternalApi.d.ts

@@ -13,6 +13,7 @@ export declare class ActionRowInternalApi extends ApiBase {
     private buildFormParamContext;
     private buildActionRowFields;
     private buidActionRowButtons;
+    private prepareEditData;
     private isColumnEditable;
     private buildFormField;
     private getFormFieldLabel;

package/src/Api/Internal/ActionRowInternalApi.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionRowInternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-class ActionRowInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+export class ActionRowInternalApi extends ApiBase {
     buildRowEditForm(rowNode) {
         return this.buildActionRow('rowEdited', rowNode);
     }
@@ -17,7 +14,7 @@ class ActionRowInternalApi extends ApiBase_1.ApiBase {
     }
     buildActionRow(type, rowNode) {
         const formFields = this.buildActionRowFields(type, rowNode);
-        const formButtons = this.buidActionRowButtons(type, rowNode);
+        const formButtons = this.buidActionRowButtons(type, rowNode, formFields);
         const formTitle = this.getFormTitle(type, rowNode);
         const formDescription = this.getFormDescription(type, rowNode);
         const actionRowForm = {
@@ -60,7 +57,7 @@ class ActionRowInternalApi extends ApiBase_1.ApiBase {
             .filter((column) => !this.getAdaptableApi().columnApi.internalApi.isActionRowButtonColumn(column.columnId));
         return relevantColumns.map((column) => this.buildFormField(type, column, rowNode));
     }
-    buidActionRowButtons(type, rowNode) {
+    buidActionRowButtons(type, rowNode, formFields) {
         // 1. check if there are custom user provided buttons
         if (Array.isArray(this.actionRowFormOptions.formButtons)) {
             return this.actionRowFormOptions.formButtons;
@@ -81,6 +78,8 @@ class ActionRowInternalApi extends ApiBase_1.ApiBase {
             },
             onClick: (button, context) => {
                 var _a, _b;
+                // textOutput should not be saved, their values are set to display values
+                // we need to filter out the textOutput fields and add the primaryKey
                 const eventInfo = type === 'rowCreated'
                     ? {
                         type: 'rowCreated',
@@ -92,7 +91,7 @@ class ActionRowInternalApi extends ApiBase_1.ApiBase {
                     }
                     : {
                         type: 'rowEdited',
-                        formData: context.formData,
+                        formData: this.prepareEditData(formFields, context),
                         rowNode: rowNode,
                         adaptableApi: context.adaptableApi,
                         userName: this.getOptions().userName,
@@ -104,6 +103,17 @@ class ActionRowInternalApi extends ApiBase_1.ApiBase {
         };
         return [cancelButton, saveButton];
     }
+    prepareEditData(formFields, context) {
+        const dataToSave = Object.assign({}, context.formData);
+        for (const formField of formFields) {
+            if (formField.fieldType === 'textOutput') {
+                delete dataToSave[formField.name];
+            }
+        }
+        const pkValue = this.adaptable.getPrimaryKeyValueFromRowNode(context.rowNode);
+        dataToSave[this.getOptions().primaryKey] = pkValue;
+        return dataToSave;
+    }
     isColumnEditable(column, rowNode) {
         return rowNode
             ? this.adaptableInstance.isCellEditable(rowNode, this.adaptableInstance.getAgGridColumnForColumnId(column.columnId))
@@ -174,4 +184,3 @@ class ActionRowInternalApi extends ApiBase_1.ApiBase {
         }));
     }
 }
-exports.ActionRowInternalApi = ActionRowInternalApi;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -1,19 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableInternalApi = void 0;
-const tslib_1 = require("tslib");
-const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
-const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
-const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
-const DeadRedux = tslib_1.__importStar(require("../../Redux/DeadRedux"));
-const ApiBase_1 = require("../Implementation/ApiBase");
-const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
-const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const waitForCondition_1 = require("../../Utilities/waitForCondition");
-const Icon_1 = require("../../components/Icon");
-const uuid_1 = require("../../components/utils/uuid");
-class AdaptableInternalApi extends ApiBase_1.ApiBase {
+import * as PopupRedux from '../../Redux/ActionsReducers/PopupRedux';
+import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import { SystemProgressIndicatorHide, SystemProgressIndicatorShow, } from '../../Redux/ActionsReducers/SystemRedux';
+import * as GridRedux from '../../Redux/ActionsReducers/GridRedux';
+import * as DeadRedux from '../../Redux/DeadRedux';
+import { ApiBase } from '../Implementation/ApiBase';
+import StringExtensions from '../../Utilities/Extensions/StringExtensions';
+import { ADAPTABLE_ID, ADAPTABLE_ROW_ACTION_BUTTONS, } from '../../Utilities/Constants/GeneralConstants';
+import { waitForCondition } from '../../Utilities/waitForCondition';
+import { isAdaptableCustomIcon, isAdaptableSystemIcon } from '../../components/Icon';
+import { createUuid } from '../../components/utils/uuid';
+export class AdaptableInternalApi extends ApiBase {
     getSystemState() {
         return this.getAdaptableState().System;
     }
@@ -62,9 +58,9 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     }
     getToolbarTitle() {
         let toolbarTitle = this.adaptable.api.dashboardApi.getDashboardState().DashboardTitle;
-        if (StringExtensions_1.default.IsNullOrEmpty(toolbarTitle)) {
+        if (StringExtensions.IsNullOrEmpty(toolbarTitle)) {
             toolbarTitle = this.adaptable.adaptableOptions.adaptableId;
-            if (toolbarTitle == GeneralConstants_1.ADAPTABLE_ID) {
+            if (toolbarTitle == ADAPTABLE_ID) {
                 toolbarTitle = 'Adaptable ';
             }
         }
@@ -180,7 +176,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         if (!buttonIcon) {
             return;
         }
-        if ((0, Icon_1.isAdaptableSystemIcon)(buttonIcon) || (0, Icon_1.isAdaptableCustomIcon)(buttonIcon)) {
+        if (isAdaptableSystemIcon(buttonIcon) || isAdaptableCustomIcon(buttonIcon)) {
             const defaultIconWidth = (_a = defaultWidthHeight === null || defaultWidthHeight === void 0 ? void 0 : defaultWidthHeight.width) !== null && _a !== void 0 ? _a : 'var(--ab-cmp-simple-button__width)';
             const defaultIconHeight = (_b = defaultWidthHeight === null || defaultWidthHeight === void 0 ? void 0 : defaultWidthHeight.height) !== null && _b !== void 0 ? _b : 'var(--ab-cmp-simple-button__height)';
             const buttonIconStyle = Object.assign({}, { width: defaultIconWidth, height: defaultIconHeight }, buttonIcon.style);
@@ -226,7 +222,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         else {
             // adaptable may not be initialized yet if the framework component is part of the initial render
             // AFL 2021.10.14 - not really sure if this is necessary anymore?! (see the other changes in this commit)
-            (0, waitForCondition_1.waitForCondition)(() => this.adaptable.isInitialised).then(() => {
+            waitForCondition(() => this.adaptable.isInitialised).then(() => {
                 createComponentFn();
             });
         }
@@ -248,7 +244,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         }
     }
     executeWithProgressIndicator(label, executeFn, errorHandlingFn) {
-        this.dispatchReduxAction((0, SystemRedux_1.SystemProgressIndicatorShow)(label));
+        this.dispatchReduxAction(SystemProgressIndicatorShow(label));
         // setTimeout required to give the ProgressIndicator rendering a head-start (see RAF in ProgressIndicator implementation)
         setTimeout(() => {
             try {
@@ -262,7 +258,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         }, 16);
     }
     hideProgressIndicator() {
-        this.dispatchReduxAction((0, SystemRedux_1.SystemProgressIndicatorHide)());
+        this.dispatchReduxAction(SystemProgressIndicatorHide());
     }
     getCorrectEnglishVariant(wordToSpell) {
         if (wordToSpell.includes('our')) {
@@ -448,10 +444,10 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     getActionButtonsAndActionColumn(colDef) {
         var _a;
         let actionColumn;
-        if (colDef.colId == GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS) {
+        if (colDef.colId == ADAPTABLE_ROW_ACTION_BUTTONS) {
             const actionButtons = this.adaptable.getActionRowButtonDefs();
             actionColumn = {
-                columnId: GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS,
+                columnId: ADAPTABLE_ROW_ACTION_BUTTONS,
                 actionColumnButton: actionButtons,
             };
         }
@@ -484,8 +480,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
             ? actionColumn.actionColumnButton
             : [actionColumn.actionColumnButton];
         // actionButtons don't have IDs, so we need to generate them to be used later as a react component key
-        actionButtons = actionButtons.map((actionButton) => (Object.assign(Object.assign({}, actionButton), { Uuid: (0, uuid_1.createUuid)() })));
+        actionButtons = actionButtons.map((actionButton) => (Object.assign(Object.assign({}, actionButton), { Uuid: createUuid() })));
         return { actionButtons, actionColumn };
     }
 }
-exports.AdaptableInternalApi = AdaptableInternalApi;

package/src/Api/Internal/AlertInternalApi.d.ts

@@ -148,4 +148,5 @@ export declare class AlertInternalApi extends ApiBase {
     showAlertForDefinitions(dataChangedInfo: CellDataChangedInfo | GridDataChangedInfo, alertDefinitions?: AlertDefinition[]): void;
     showAlertsForGridDataChanges(gridDataChangedInfo: GridDataChangedInfo, alertDefinitions: AlertDefinition[]): void;
     shouldFireAlertOnClient(alertDefinition: AlertDefinition): boolean;
+    getDefaultAlertNotificationForm(): AlertButtonForm;
 }

package/src/Api/Internal/AlertInternalApi.js

@@ -1,15 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AlertInternalApi = void 0;
-const tslib_1 = require("tslib");
-const ApiBase_1 = require("../Implementation/ApiBase");
-const AdaptableQuery_1 = require("../../PredefinedConfig/Common/AdaptableQuery");
-const AdaptableAlert_1 = require("../../PredefinedConfig/Common/AdaptableAlert");
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
-const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
-const IAlertService_1 = require("../../Utilities/Services/Interface/IAlertService");
-const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-class AlertInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import { isReactiveQuery } from '../../PredefinedConfig/Common/AdaptableQuery';
+import { isAdaptableCellChangedAlert, isAdaptableRowChangedAlert, } from '../../PredefinedConfig/Common/AdaptableAlert';
+import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
+import { AlertModuleId } from '../../Utilities/Constants/ModuleConstants';
+import { isCellDataChangedInfo } from '../../Utilities/Services/Interface/IAlertService';
+import ObjectFactory from '../../Utilities/ObjectFactory';
+export class AlertInternalApi extends ApiBase {
     getExpressionForAlertRule(alertRule) {
         var expression;
         expression = alertRule.BooleanExpression
@@ -37,7 +33,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
     getNonReactiveAlertDefinitions() {
         return this.getAlertApi()
             .getAlertDefinitions()
-            .filter((alertDef) => !(0, AdaptableQuery_1.isReactiveQuery)(alertDef.Rule));
+            .filter((alertDef) => !isReactiveQuery(alertDef.Rule));
     }
     /**
      * Retrieves all active (non-suspended) Alert Definitions in Alert State which are NOT Reactive (BooleanQuery)
@@ -54,7 +50,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
     getReactiveAlertDefinitions() {
         return this.getAlertApi()
             .getAlertDefinitions()
-            .filter((alertDef) => (0, AdaptableQuery_1.isReactiveQuery)(alertDef.Rule));
+            .filter((alertDef) => isReactiveQuery(alertDef.Rule));
     }
     /**
      *
@@ -111,10 +107,10 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
                 buttonOnClick === null || buttonOnClick === void 0 ? void 0 : buttonOnClick.handler(button, context);
                 this.executeAlertAction(action, {
                     alertDefinition: context.alert.alertDefinition,
-                    cellDataChangedInfo: (0, AdaptableAlert_1.isAdaptableCellChangedAlert)(context.alert)
+                    cellDataChangedInfo: isAdaptableCellChangedAlert(context.alert)
                         ? context.alert.cellDataChangedInfo
                         : null,
-                    gridDataChangedInfo: (0, AdaptableAlert_1.isAdaptableRowChangedAlert)(context.alert)
+                    gridDataChangedInfo: isAdaptableRowChangedAlert(context.alert)
                         ? context.alert.gridDataChangedInfo
                         : null,
                     formData: context.formData,
@@ -374,10 +370,10 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
         return (_a = this.getAdaptableState().System.AdaptableAlerts) !== null && _a !== void 0 ? _a : [];
     }
     getAdaptableCellChangedAlerts() {
-        return this.getAdaptableAlerts().filter(AdaptableAlert_1.isAdaptableCellChangedAlert);
+        return this.getAdaptableAlerts().filter(isAdaptableCellChangedAlert);
     }
     getAdaptableRowChangedAlerts() {
-        return this.getAdaptableAlerts().filter(AdaptableAlert_1.isAdaptableRowChangedAlert);
+        return this.getAdaptableAlerts().filter(isAdaptableRowChangedAlert);
     }
     getAdaptableAlertWithHighlightCell(columnId, rowNode) {
         // only alerts triggered by cell changes are relevant for HighlightCell actions
@@ -425,9 +421,9 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
         const allActiveNonReactiveDefinitions = this.getActiveNonReactiveAlertDefinitions();
         let relatedAlertDefinitions = allActiveNonReactiveDefinitions
             .filter((v) => this.getAdaptableApi().scopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
-            .filter((alertDefinition) => !(0, AdaptableQuery_1.isReactiveQuery)(alertDefinition.Rule));
+            .filter((alertDefinition) => !isReactiveQuery(alertDefinition.Rule));
         let triggeredAlerts = [];
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(relatedAlertDefinitions)) {
+        if (ArrayExtensions.IsNotNullOrEmpty(relatedAlertDefinitions)) {
             relatedAlertDefinitions.forEach((alertDefinition) => {
                 if (alertDefinition.Rule.BooleanExpression) {
                     let expression = alertDefinition.Rule.BooleanExpression;
@@ -470,7 +466,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
         }
         const aggregatedBooleanValue = this.getAdaptableApi()
             .internalApi.getQueryLanguageService()
-            .computeAggregatedBooleanValue(alertDefinition.Rule.AggregatedBooleanExpression, ModuleConstants_1.AlertModuleId);
+            .computeAggregatedBooleanValue(alertDefinition.Rule.AggregatedBooleanExpression, AlertModuleId);
         return aggregatedBooleanValue;
     }
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
@@ -494,10 +490,10 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
             this.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition));
     }
     showAlertForDefinitions(dataChangedInfo, alertDefinitions = []) {
-        if ((0, IAlertService_1.isCellDataChangedInfo)(dataChangedInfo)) {
+        if (isCellDataChangedInfo(dataChangedInfo)) {
             alertDefinitions.forEach((alertDefinition) => {
                 if (this.shouldFireAlertOnClient(alertDefinition)) {
-                    const alert = ObjectFactory_1.default.CreateCellChangedAlert(this.getAlertMessageHeader(alertDefinition, dataChangedInfo), this.getAlertDescription(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
+                    const alert = ObjectFactory.CreateCellChangedAlert(this.getAlertMessageHeader(alertDefinition, dataChangedInfo), this.getAlertDescription(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
                     this.getAdaptableApi().alertApi.showAdaptableAlert(alert);
                 }
             });
@@ -525,7 +521,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
                 const alertMessage = alertDefinition.MessageText
                     ? alertDefinition.MessageText
                     : customMessage !== null && customMessage !== void 0 ? customMessage : defaultMessage;
-                const alert = ObjectFactory_1.default.CreateRowChangedAlert(customHeader !== null && customHeader !== void 0 ? customHeader : alertHeader, alertMessage, alertDefinition, gridDataChangedInfo);
+                const alert = ObjectFactory.CreateRowChangedAlert(customHeader !== null && customHeader !== void 0 ? customHeader : alertHeader, alertMessage, alertDefinition, gridDataChangedInfo);
                 this.getAlertApi().showAdaptableAlert(alert);
             }
         });
@@ -543,5 +539,19 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
         }
         return true;
     }
+    getDefaultAlertNotificationForm() {
+        // we still need the default Notification Form  for historical reasons
+        // (i.e. to be able to display the AlertForm with the default buttons when the user has not defined any buttons)
+        return {
+            fields: [],
+            Buttons: [
+                {
+                    Label: 'OK',
+                    ButtonStyle: {
+                        variant: 'raised',
+                    },
+                },
+            ],
+        };
+    }
 }
-exports.AlertInternalApi = AlertInternalApi;

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CalculatedColumnInternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+export class CalculatedColumnInternalApi extends ApiBase {
     /**
      * Returns all the references in the AdaptableState of the given CalculatedColumn
      * @param calculatedColumn CalculatedColumn to be checked
@@ -75,4 +72,3 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
             .getNodesFromExpression(input, 'QUANT')) === null || _a === void 0 ? void 0 : _a.length);
     }
 }
-exports.CalculatedColumnInternalApi = CalculatedColumnInternalApi;

package/src/Api/Internal/ChartingInternalApi.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChartingInternalApi = void 0;
-const ApiBase_1 = require("../Implementation/ApiBase");
-const ObjectFactory_1 = require("../../Utilities/ObjectFactory");
-class ChartingInternalApi extends ApiBase_1.ApiBase {
+import { ApiBase } from '../Implementation/ApiBase';
+import { createBaseContext } from '../../Utilities/ObjectFactory';
+export class ChartingInternalApi extends ApiBase {
     getContainerElement(chartContainer) {
         const element = typeof (chartContainer === null || chartContainer === void 0 ? void 0 : chartContainer.element) === 'string'
             ? document.querySelector(chartContainer.element)
@@ -34,35 +31,34 @@ class ChartingInternalApi extends ApiBase_1.ApiBase {
         if (!chartDefinition) {
             return false;
         }
-        return externalChartingOptions.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        return externalChartingOptions.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.adaptable.api)));
     }
     onHideExternalChart(chartDefinition) {
         const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onHideChart)) {
             return;
         }
-        externalChartingOptions.onHideChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        externalChartingOptions.onHideChart(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.adaptable.api)));
     }
     onShowExternalChart(chartDefinition, container) {
         const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onShowChart)) {
             return;
         }
-        externalChartingOptions.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        externalChartingOptions.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, createBaseContext(this.adaptable.api)));
     }
     onPreviewExternalChart(chartDefinition, container) {
         const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onPreviewChart)) {
             return;
         }
-        return externalChartingOptions.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        return externalChartingOptions.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, createBaseContext(this.adaptable.api)));
     }
     onDeleteExternalChart(chartDefinition) {
         const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onDeleteChart)) {
             return;
         }
-        externalChartingOptions.onDeleteChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        externalChartingOptions.onDeleteChart(Object.assign({ chartDefinition: chartDefinition }, createBaseContext(this.adaptable.api)));
     }
 }
-exports.ChartingInternalApi = ChartingInternalApi;

package/src/Api/Internal/{FilterInternalApi.d.ts → ColumnFilterInternalApi.d.ts}

@@ -6,7 +6,7 @@ import { ColumnFilter } from '../../PredefinedConfig/Common/ColumnFilter';
 import { IRowNode } from '@ag-grid-community/core';
 import { LayoutColumnFilterAction } from '../../Redux/ActionsReducers/LayoutRedux';
 import * as Redux from 'redux';
-export declare class FilterInternalApi extends ApiBase {
+export declare class ColumnFilterInternalApi extends ApiBase {
     /**
      * Returns Predicate Definition for given Column and Quick Filter shortcut
      * @param shortcut Quick Filter shortcut to lookup
@@ -46,9 +46,9 @@ export declare class FilterInternalApi extends ApiBase {
      */
     shouldNewColumnFilterTriggerGridFiltering(action: LayoutColumnFilterAction | Redux.Action): boolean;
     /**
-     * Fires Filter Applied Event - typically used to enable filtering on the server
+     * Fires Column Filter Applied Event - typically used to enable filtering on the server
      */
-    fireFilterAppliedEvent(): void;
+    fireColumnFilterAppliedEvent(): void;
     /**
      * Compares to sets of Column Filters to see if they are identical
      * @param filters1