@adaptabletools/adaptable 16.2.4 → 17.0.0-canary.1

package/src/Api/Implementation/SystemStatusApiImpl.js

@@ -1,29 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemStatusApiImpl = void 0;
-const tslib_1 = require("tslib");
-const SystemStatusRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemStatusRedux"));
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
-const ApiBase_1 = require("./ApiBase");
-const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
-const react_1 = require("react");
-const UIHelper_1 = tslib_1.__importDefault(require("../../View/UIHelper"));
-const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
-const SystemStatusInternalApi_1 = require("../Internal/SystemStatusInternalApi");
-class SystemStatusApiImpl extends ApiBase_1.ApiBase {
+import * as SystemStatusRedux from '../../Redux/ActionsReducers/SystemStatusRedux';
+import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import { ApiBase } from './ApiBase';
+import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
+import ObjectFactory from '../../Utilities/ObjectFactory';
+import { createElement } from 'react';
+import UIHelper from '../../View/UIHelper';
+import StringExtensions from '../../Utilities/Extensions/StringExtensions';
+import { SystemStatusInternalApi } from '../Internal/SystemStatusInternalApi';
+export class SystemStatusApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new SystemStatusInternalApi_1.SystemStatusInternalApi(adaptable);
+        this.internalApi = new SystemStatusInternalApi(adaptable);
     }
     setSystemStatus(statusMessage, messageType, statusFurtherInformation) {
-        let systemStatusMessageInfo = ObjectFactory_1.default.CreateSystemStatusMessageInfo(statusMessage, messageType, statusFurtherInformation ? statusFurtherInformation : '');
+        let systemStatusMessageInfo = ObjectFactory.CreateSystemStatusMessageInfo(statusMessage, messageType, statusFurtherInformation ? statusFurtherInformation : '');
         this.internalApi.addSystemStatusMessageInfo(systemStatusMessageInfo);
         // publish the event
         this.internalApi.fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo);
         if (this.getNotificationsOptions().showSystemStatusMessageNotifications) {
             let fullMessage = statusMessage;
-            if (StringExtensions_1.default.IsNotNullOrEmpty(statusFurtherInformation)) {
+            if (StringExtensions.IsNotNullOrEmpty(statusFurtherInformation)) {
                 fullMessage += '\n' + statusFurtherInformation;
             }
             switch (messageType) {
@@ -56,11 +52,11 @@ class SystemStatusApiImpl extends ApiBase_1.ApiBase {
             }
         }
         if (this.systemStatusDiv) {
-            if (StringExtensions_1.default.IsNotNullOrEmpty(statusFurtherInformation)) {
+            if (StringExtensions.IsNotNullOrEmpty(statusFurtherInformation)) {
                 statusMessage += statusFurtherInformation;
             }
-            const foreColor = messageType ? UIHelper_1.default.getColorByMessageType(messageType) : 'black';
-            this.adaptable.renderReactRoot((0, react_1.createElement)('span', { style: { color: foreColor } }, statusMessage), this.systemStatusDiv);
+            const foreColor = messageType ? UIHelper.getColorByMessageType(messageType) : 'black';
+            this.adaptable.renderReactRoot(createElement('span', { style: { color: foreColor } }, statusMessage), this.systemStatusDiv);
         }
     }
     setErrorSystemStatus(statusMessage, statusFurtherInformation) {
@@ -91,4 +87,3 @@ class SystemStatusApiImpl extends ApiBase_1.ApiBase {
         super.destroy();
     }
 }
-exports.SystemStatusApiImpl = SystemStatusApiImpl;

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -1,17 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TeamSharingApiImpl = void 0;
-const tslib_1 = require("tslib");
-const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const ApiBase_1 = require("./ApiBase");
-const TeamSharingRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/TeamSharingRedux"));
-const TeamSharingRedux_1 = require("../../Redux/ActionsReducers/TeamSharingRedux");
-const TeamSharingInternalApi_1 = require("../Internal/TeamSharingInternalApi");
-const TeamSharingState_1 = require("../../PredefinedConfig/TeamSharingState");
-class TeamSharingApiImpl extends ApiBase_1.ApiBase {
+import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
+import { ApiBase } from './ApiBase';
+import * as TeamSharingRedux from '../../Redux/ActionsReducers/TeamSharingRedux';
+import { TeamSharingCheckForUpdates } from '../../Redux/ActionsReducers/TeamSharingRedux';
+import { TeamSharingInternalApi } from '../Internal/TeamSharingInternalApi';
+import { isAdaptableSharedEntity, isCustomSharedEntity, } from '../../PredefinedConfig/TeamSharingState';
+export class TeamSharingApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new TeamSharingInternalApi_1.TeamSharingInternalApi(adaptable);
+        this.internalApi = new TeamSharingInternalApi(adaptable);
     }
     async loadSharedEntities() {
         if (!this.isTeamSharingAvailable()) {
@@ -68,7 +64,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
             .isModuleFullEntitlement(ModuleConstants.TeamSharingModuleId);
     }
     checkForUpdates() {
-        this.dispatchAction((0, TeamSharingRedux_1.TeamSharingCheckForUpdates)());
+        this.dispatchAction(TeamSharingCheckForUpdates());
     }
     openTeamSharingSettingsPanel() {
         this.showModulePopup(ModuleConstants.TeamSharingModuleId);
@@ -95,7 +91,7 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(TeamSharingRedux.TeamSharingRemoveItem(entityId));
     }
     importSharedEntry(sharedEntity) {
-        if ((0, TeamSharingState_1.isAdaptableSharedEntity)(sharedEntity)) {
+        if (isAdaptableSharedEntity(sharedEntity)) {
             this.dispatchAction(TeamSharingRedux.TeamSharingImportItem(sharedEntity));
         }
         else {
@@ -118,13 +114,12 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         return this.getTeamSharingState().SharedEntities;
     }
     getLoadedAdaptableSharedEntities() {
-        return this.getLoadedSharedEntities().filter(TeamSharingState_1.isAdaptableSharedEntity);
+        return this.getLoadedSharedEntities().filter(isAdaptableSharedEntity);
     }
     getLoadedCustomSharedEntities() {
-        return this.getLoadedSharedEntities().filter(TeamSharingState_1.isCustomSharedEntity);
+        return this.getLoadedSharedEntities().filter(isCustomSharedEntity);
     }
     refreshTeamSharing() {
         this.dispatchAction(TeamSharingRedux.TeamSharingGet());
     }
 }
-exports.TeamSharingApiImpl = TeamSharingApiImpl;

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,10 +61,10 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         return undefined;
     }
     getPermittedValuesForColumn(column) {
-        if (ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(this.getPermittedValuesItems())) {
+        const allPermittedValues = this.getPermittedValuesItems();
+        if (ArrayExtensions.IsNullOrEmpty(allPermittedValues)) {
             return undefined;
         }
-        const allPermittedValues = this.getPermittedValuesItems();
         let permittedValuesColumn = this.getPermittedValuesForScope(column, allPermittedValues);
         if (!permittedValuesColumn) {
             return undefined;
@@ -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

@@ -12,7 +12,9 @@ export declare class ActionRowInternalApi extends ApiBase {
     private getFormDescription;
     private buildFormParamContext;
     private buildActionRowFields;
+    private showColumnInActionRowForm;
     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 = {
@@ -50,17 +47,31 @@ class ActionRowInternalApi extends ApiBase_1.ApiBase {
             type: type,
         };
     }
-    buildActionRowFields(type, rowNode) {
+    buildActionRowFields(actionRowType, rowNode) {
         const relevantColumns = this.getAdaptableApi()
             .columnApi.getColumns()
             .filter((column) => {
             // if there is NO rowNode, do NOT display the non-editable fields as they will be empty
             return !!rowNode || this.isColumnEditable(column, rowNode);
         })
-            .filter((column) => !this.getAdaptableApi().columnApi.internalApi.isActionRowButtonColumn(column.columnId));
-        return relevantColumns.map((column) => this.buildFormField(type, column, rowNode));
+            .filter((column) => !this.getAdaptableApi().columnApi.internalApi.isActionRowButtonColumn(column.columnId) &&
+            this.showColumnInActionRowForm(column, actionRowType));
+        return relevantColumns.map((column) => this.buildFormField(actionRowType, column, rowNode));
+    }
+    showColumnInActionRowForm(adaptableColumn, actionRowType) {
+        const showColumnFn = this.getActionRowOptions().actionRowFormOptions.showColumninActionRowForm;
+        if (typeof showColumnFn === 'function') {
+            return showColumnFn({
+                adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
+                adaptableColumn,
+                actionRowType
+            });
+        }
+        return true;
     }
-    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 +92,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 +105,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 +117,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 +198,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

@@ -8,8 +8,6 @@ import { GridDataChangedInfo } from '../Events/GridDataChanged';
 import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
-import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
-import { ButtonStyle } from '../../PredefinedConfig/Common/ButtonStyle';
 import { IRowNode } from '@ag-grid-community/core';
 export declare class AlertInternalApi extends ApiBase {
     getExpressionForAlertRule(alertRule: AlertRule): string | undefined;
@@ -129,11 +127,7 @@ export declare class AlertInternalApi extends ApiBase {
      * @param alert AdaptableAlert to check
      */
     getAlertTypeForAdaptableAlert(alert: AdaptableAlert): 'cellChanged' | 'rowChanged' | 'generic';
-    getAdaptableFormFromAlertForm(alertForm: string | AlertButtonForm, context: any, defaultMessageType?: AdaptableMessageType): (Omit<AdaptableForm<AlertFormContext>, 'buttons'> & {
-        buttons?: (Omit<AdaptableButton<AlertFormContext>, 'buttonStyle'> & {
-            buttonStyle?: ButtonStyle;
-        })[];
-    }) | undefined;
+    getAdaptableFormFromAlertForm(alertForm: string | AlertButtonForm, context: any, defaultMessageType?: AdaptableMessageType): AdaptableForm<AlertFormContext> | undefined;
     getAdaptableAlerts(): AdaptableAlert[];
     getAdaptableCellChangedAlerts(): AdaptableCellChangedAlert[];
     getAdaptableRowChangedAlerts(): AdaptableRowChangedAlert[];
@@ -148,4 +142,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;
 }