@adaptabletools/adaptable 11.0.9 → 11.1.0

package/src/Strategy/AlertModule.js

@@ -34,7 +34,14 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     return;
                 }
             }
-            this.handleDataSourceChanged(dataChangedInfo);
+            this.handleCellDataChanged(dataChangedInfo);
+        });
+        this.api.eventApi.on('GridDataChanged', (gridDataChangedInfo) => {
+            if (gridDataChangedInfo.rowTrigger === 'Edit') {
+                // changed row alerts should be handled by standard 'Any' ('AnyChange') Predicate
+                return;
+            }
+            this.handleGridDataChanged(gridDataChangedInfo);
         });
         this.api.internalApi
             .getAlertService()
@@ -87,25 +94,40 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const items = [];
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn && menuContext.rowNode) {
-                let currentAlerts = this.api.internalApi
-                    .getAdaptableAlerts()
-                    .filter((a) => { var _a; return a.dataChangedInfo && ((_a = a.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightCell); });
-                if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(currentAlerts)) {
-                    let relevantAlert = currentAlerts.find((a) => this.api.scopeApi.isColumnInScope(menuContext.adaptableColumn, a.alertDefinition.Scope) && a.dataChangedInfo.rowNode == menuContext.rowNode);
-                    if (relevantAlert) {
-                        items.push(this.createColumnMenuItemReduxAction('Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
-                    }
+                let relevantAlert;
+                // find alerts which highlight the current cell
+                relevantAlert = this.api.internalApi.getAdaptableAlertWithHighlightCell(menuContext.adaptableColumn.columnId, menuContext.rowNode);
+                if (!relevantAlert) {
+                    // find alerts which highlight the current row
+                    relevantAlert = this.api.internalApi.getAdaptableAlertWithHighlightRow(menuContext.rowNode);
+                }
+                if (relevantAlert) {
+                    items.push(this.createColumnMenuItemReduxAction('Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
                 }
             }
         }
         return items;
     }
-    handleDataSourceChanged(dataChangedInfo) {
-        const alertDefinitions = this.getAlertDefinitionsForDataChange(dataChangedInfo);
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(alertDefinitions)) {
+    handleCellDataChanged(dataChangedInfo) {
+        const alertDefinitions = this.getAlertDefinitionsForCellDataChange(dataChangedInfo);
+        if (alertDefinitions === null || alertDefinitions === void 0 ? void 0 : alertDefinitions.length) {
             this.showAlertForDefinitions(dataChangedInfo, alertDefinitions);
         }
     }
+    handleGridDataChanged(gridDataChangedInfo) {
+        const alertDefinitions = this.getAlertDefinitionsForGridDataChange(gridDataChangedInfo);
+        const rowAdded = gridDataChangedInfo.rowTrigger === 'Add';
+        const numberOfChangedRows = gridDataChangedInfo.rowNodes.length;
+        const actionName = rowAdded ? 'Added' : 'Removed';
+        const alertHeader = numberOfChangedRows > 1 ? `${actionName} Rows` : `${actionName} Row `;
+        const alertMessage = numberOfChangedRows > 1
+            ? `${numberOfChangedRows} rows were ${actionName.toLowerCase()}`
+            : `${numberOfChangedRows} row was ${actionName.toLowerCase()}`;
+        alertDefinitions === null || alertDefinitions === void 0 ? void 0 : alertDefinitions.forEach((alertDefinition) => {
+            const alert = ObjectFactory_1.default.CreateRowChangedAlert(alertHeader, alertMessage, alertDefinition, gridDataChangedInfo);
+            this.api.alertApi.displayAlert(alert);
+        });
+    }
     handleReactiveAlertTriggered(reactiveAlertInfo) {
         var _a;
         // the row node data is most probably stale because the reactive queries buffer the changed data
@@ -122,13 +144,28 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     showAlertForDefinitions(dataChangedInfo, alertDefinitions = []) {
         alertDefinitions.forEach((alertDefinition) => {
-            const alert = ObjectFactory_1.default.CreateAlert(dataChangedInfo.column.friendlyName, this.api.alertApi.getAlertDescription(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
+            const alert = ObjectFactory_1.default.CreateCellChangedAlert(dataChangedInfo.column.friendlyName, this.api.alertApi.getAlertDescription(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
             this.api.alertApi.displayAlert(alert);
         });
     }
-    getAlertDefinitionsForDataChange(dataChangedEvent) {
+    getAlertDefinitionsForCellDataChange(dataChangedEvent) {
         return this.getBaseAlertDefinitionsForDataChange(dataChangedEvent, this.api.alertApi.getActiveNonReactiveAlertDefinitions());
     }
+    getAlertDefinitionsForGridDataChange(gridDataChangedInfo) {
+        return this.api.alertApi
+            .getActiveNonReactiveAlertDefinitions()
+            .filter((alertDefinition) => this.isAlertDefinitionForRowChangeEvent(alertDefinition))
+            .filter((alertDefinition) => {
+            var _a, _b, _c, _d;
+            if (gridDataChangedInfo.rowTrigger === 'Add') {
+                return ((_b = (_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicate) === null || _b === void 0 ? void 0 : _b.PredicateId) === 'AddedRow';
+            }
+            if (gridDataChangedInfo.rowTrigger === 'Delete') {
+                return ((_d = (_c = alertDefinition.Rule) === null || _c === void 0 ? void 0 : _c.Predicate) === null || _d === void 0 ? void 0 : _d.PredicateId) === 'RemovedRow';
+            }
+            return false;
+        });
+    }
     getBaseAlertDefinitionsForDataChange(dataChangedEvent, definitions, defaultNoPredicateReturn = false) {
         let relatedAlertDefinitions = definitions
             .filter((v) => this.api.scopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
@@ -151,8 +188,11 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         triggeredAlerts.push(alertDefinition);
                     }
                 }
-                else if (this.isAlertPredicateTriggered(alertDefinition, dataChangedEvent, defaultNoPredicateReturn)) {
-                    triggeredAlerts.push(alertDefinition);
+                else {
+                    if (!this.isAlertDefinitionForRowChangeEvent(alertDefinition) &&
+                        this.isAlertPredicateTriggered(alertDefinition, dataChangedEvent, defaultNoPredicateReturn)) {
+                        triggeredAlerts.push(alertDefinition);
+                    }
                 }
             });
         }
@@ -168,6 +208,10 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             column: dataChangedEvent.column,
         }, defaultNoPredicateReturn);
     }
+    isAlertDefinitionForRowChangeEvent(alertDefinition) {
+        return (this.api.internalApi.isAlertDefinitionForAddedRowChangeEvent(alertDefinition) ||
+            this.api.internalApi.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition));
+    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.alertApi.getAlertDefinitions(),

package/src/Strategy/BulkUpdateModule.js

@@ -43,6 +43,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return {
                 IsValid: false,
                 Alert: {
+                    alertType: 'generic',
                     header: 'Bulk Update Error',
                     message: 'Cannot edit while Grid is in Pivot Mode.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -53,6 +54,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return {
                 IsValid: false,
                 Alert: {
+                    alertType: 'generic',
                     header: 'Bulk Update Error',
                     message: 'No cells are selected.\nPlease select some cells.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -63,6 +65,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return {
                 IsValid: false,
                 Alert: {
+                    alertType: 'generic',
                     header: 'Bulk Update Error',
                     message: 'Bulk Update only supports single column edit.\nPlease adjust cell selection.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -74,6 +77,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return {
                 IsValid: false,
                 Alert: {
+                    alertType: 'generic',
                     header: 'Bulk Update Error',
                     message: 'Bulk Update is not permitted on readonly columns.\nPlease adjust the cell selection.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -85,6 +89,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return {
                 IsValid: false,
                 Alert: {
+                    alertType: 'generic',
                     header: 'Bulk Update Error',
                     message: 'Bulk Update is not permitted on readonly cells.\nPlease adjust the cell selection.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),

package/src/Strategy/ExportModule.js

@@ -185,6 +185,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     showEmptyExportWarning() {
         this.api.internalApi.dispatchReduxAction(PopupRedux.PopupShowAlert({
+            alertType: 'generic',
             header: 'Export',
             message: 'No Data To Export',
             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),

package/src/Strategy/SmartEditModule.js

@@ -49,6 +49,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.api.internalApi.isGridInPivotMode()) {
             return {
                 Alert: {
+                    alertType: 'generic',
                     header: 'Smart Edit Error',
                     message: 'Cannot edit while Grid is in Pivot Mode.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -58,6 +59,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (selectedCellInfo == null || ArrayExtensions_1.default.IsNullOrEmpty(selectedCellInfo.columns)) {
             return {
                 Alert: {
+                    alertType: 'generic',
                     header: 'Smart Edit Error',
                     message: 'No cells are selected.\nPlease select some cells.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -67,6 +69,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (ArrayExtensions_1.default.NotCorrectLength(selectedCellInfo.columns, 1)) {
             return {
                 Alert: {
+                    alertType: 'generic',
                     header: 'Smart Edit Error',
                     message: 'Smart Edit only supports single column edit.\nPlease adjust cell selection.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -78,6 +81,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (column.dataType != Enums_1.DataType.Number) {
                 return {
                     Alert: {
+                        alertType: 'generic',
                         header: 'Smart Edit Error',
                         message: 'Smart Edit only supports editing of numeric columns.\nPlease adjust the cell selection.',
                         alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -87,6 +91,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (column.readOnly) {
                 return {
                     Alert: {
+                        alertType: 'generic',
                         header: 'Smart Edit Error',
                         message: 'Smart Edit is not permitted on readonly columns.\nPlease adjust the cell selection.',
                         alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
@@ -98,6 +103,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             !this.api.gridApi.areCellsEditable(selectedCellInfo.gridCells)) {
             return {
                 Alert: {
+                    alertType: 'generic',
                     header: 'Smart Edit Error',
                     message: 'Smart Edit is not permitted on readonly cells.\nPlease adjust the cell selection.',
                     alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -126,6 +126,7 @@ exports.DefaultAdaptableOptions = {
     },
     layoutOptions: {
         includeExpandedRowGroups: false,
+        displayRowGroups: 'closed',
         autoSaveLayouts: true,
         autoSizeColumnsInLayout: false,
         autoSizeColumnsInPivotLayout: false,

package/src/Utilities/Defaults/DefaultSettingsPanel.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableSettingsPanel } from '../../PredefinedConfig/Common/Types';
 import { AdaptableModule } from '../../types';
-export declare const ACTION_POPUPS: AdaptableModule[];
+export declare const STANDALONE_MODULE_POPUPS: AdaptableModule[];
 /**
  * This constants determines the order and the items that appear in the navigation.
  */

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_NAVIGATION_ITEMS = exports.ACTION_POPUPS = void 0;
-exports.ACTION_POPUPS = ['BulkUpdate', 'SmartEdit', 'CellSummary'];
+exports.DEFAULT_NAVIGATION_ITEMS = exports.STANDALONE_MODULE_POPUPS = void 0;
+exports.STANDALONE_MODULE_POPUPS = [
+    'BulkUpdate',
+    'SmartEdit',
+    'CellSummary',
+];
 /**
  * This constants determines the order and the items that appear in the navigation.
  */

package/src/Utilities/Interface/MessagePopups.d.ts

@@ -58,3 +58,16 @@ export interface PromptPopup {
     DefaultValue?: string;
     ConfirmActionCreator?: (inputText: string) => Action;
 }
+export interface WindowPopup {
+    PopupList: {
+        /**
+         * Used to identify the window.
+         * - used to close the window
+         * - used to identify the 'Component' name, to know what to instantiate
+         */
+        Id: string;
+        Title: string;
+        PopupProps?: any;
+        Icon?: string;
+    }[];
+}

package/src/Utilities/ObjectFactory.d.ts

@@ -21,20 +21,21 @@ import { OpenFinSchedule, OpenFinReport } from '../PredefinedConfig/OpenFinState
 import { NamedQuery } from '../PredefinedConfig/QueryState';
 import { ColumnFilter } from '../PredefinedConfig/FilterState';
 import { ReminderSchedule } from '../PredefinedConfig/ScheduleState';
-import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
+import { AdaptableCellChangedAlert, AdaptableGenericAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
 import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { FlashingCellDefinition } from '../types';
+import { FlashingCellDefinition, GridDataChangedInfo } from '../types';
 import { ToastOptions } from 'react-toastify';
 export declare function CreateEmptyCustomSort(): CustomSort;
 export declare function CreateEmptyDataSource(): DataSource;
 export declare function CreateEmptyCalculatedColumn(isFilterable: boolean): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
 export declare function CreateEmptyPlusMinusNudge(): PlusMinusNudge;
-export declare function CreateEmptyAlert(): AdaptableAlert;
-export declare function CreateAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition, dataChangedInfo?: DataChangedInfo): AdaptableAlert;
+export declare function CreateGenericAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition): AdaptableGenericAlert;
+export declare function CreateCellChangedAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition, dataChangedInfo: DataChangedInfo): AdaptableCellChangedAlert;
+export declare function CreateRowChangedAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition, gridDataChange: GridDataChangedInfo): AdaptableRowChangedAlert;
 export declare function CreateEmptyAlertDefinition(): AlertDefinition;
 export declare function CreateEmptyFlashingCellDefinition(): FlashingCellDefinition;
 export declare function CreateInternalAlertDefinitionForMessages(messageType: AdaptableMessageType, alertProperties?: AlertProperties): AlertDefinition;
@@ -72,8 +73,9 @@ export declare const ObjectFactory: {
     CreateEmptyCalculatedColumn: typeof CreateEmptyCalculatedColumn;
     CreateEmptyNamedQuery: typeof CreateEmptyNamedQuery;
     CreateEmptyPlusMinusNudge: typeof CreateEmptyPlusMinusNudge;
-    CreateEmptyAlert: typeof CreateEmptyAlert;
-    CreateAlert: typeof CreateAlert;
+    CreateGenericAlert: typeof CreateGenericAlert;
+    CreateCellChangedAlert: typeof CreateCellChangedAlert;
+    CreateRowChangedAlert: typeof CreateRowChangedAlert;
     CreateEmptyAlertDefinition: typeof CreateEmptyAlertDefinition;
     CreateEmptyFlashingCellDefinition: typeof CreateEmptyFlashingCellDefinition;
     CreateInternalAlertDefinitionForMessages: typeof CreateInternalAlertDefinitionForMessages;

package/src/Utilities/ObjectFactory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateAlert = exports.CreateEmptyAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyDataSource = exports.CreateEmptyCustomSort = void 0;
+exports.ObjectFactory = exports.CreateToastOptions = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyDataSource = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -51,25 +51,38 @@ function CreateEmptyPlusMinusNudge() {
     };
 }
 exports.CreateEmptyPlusMinusNudge = CreateEmptyPlusMinusNudge;
-function CreateEmptyAlert() {
+function CreateGenericAlert(alertHeader, alertMessage, alertDefinition) {
     return {
+        alertType: 'generic',
         Uuid: Uuid_1.createUuid(),
-        header: GeneralConstants_1.EMPTY_STRING,
-        message: GeneralConstants_1.EMPTY_STRING,
-        alertDefinition: CreateInternalAlertDefinitionForMessages('Info'),
+        header: alertHeader,
+        message: alertMessage,
+        alertDefinition: alertDefinition,
     };
 }
-exports.CreateEmptyAlert = CreateEmptyAlert;
-function CreateAlert(alertHeader, alertMessage, alertDefinition, dataChangedInfo) {
+exports.CreateGenericAlert = CreateGenericAlert;
+function CreateCellChangedAlert(alertHeader, alertMessage, alertDefinition, dataChangedInfo) {
     return {
+        alertType: 'cellChanged',
         Uuid: Uuid_1.createUuid(),
         header: alertHeader,
         message: alertMessage,
-        alertDefinition: alertDefinition,
-        dataChangedInfo: dataChangedInfo,
+        alertDefinition,
+        dataChangedInfo,
+    };
+}
+exports.CreateCellChangedAlert = CreateCellChangedAlert;
+function CreateRowChangedAlert(alertHeader, alertMessage, alertDefinition, gridDataChange) {
+    return {
+        alertType: 'rowChanged',
+        Uuid: Uuid_1.createUuid(),
+        header: alertHeader,
+        message: alertMessage,
+        alertDefinition,
+        gridDataChangedInfo: gridDataChange,
     };
 }
-exports.CreateAlert = CreateAlert;
+exports.CreateRowChangedAlert = CreateRowChangedAlert;
 function CreateEmptyAlertDefinition() {
     return {
         Uuid: Uuid_1.createUuid(),
@@ -403,8 +416,9 @@ exports.ObjectFactory = {
     CreateEmptyCalculatedColumn,
     CreateEmptyNamedQuery,
     CreateEmptyPlusMinusNudge,
-    CreateEmptyAlert,
-    CreateAlert,
+    CreateGenericAlert,
+    CreateCellChangedAlert,
+    CreateRowChangedAlert,
     CreateEmptyAlertDefinition,
     CreateEmptyFlashingCellDefinition,
     CreateInternalAlertDefinitionForMessages,

package/src/Utilities/Services/LicenseService.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../Redux/ActionsReducers/SystemRedux"),t=require("../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../ObjectFactory")),o=require("../Helpers/LoggingHelper"),i=e.__importDefault(require("lodash/clamp")),n=require("../Constants/DocumentationLinkConstants"),r=require("../license/decode"),c="sales@adaptabletools.com",l=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p=exports.LicenseValidityType||(exports.LicenseValidityType={}));const E=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,I=/(https):\/\/\S+(\.csb\.app)/g,_=/(https):\/\/\S+(\.adaptabletools\.com)/g,O="undefined"!=typeof window?window.location.origin:"",h=()=>{const[e,a,t]=Array.from(E.exec(O)||[]);return"https"===a&&"sandpack.codesandbox.io"===t},u=()=>{const[e,a,t]=Array.from(I.exec(O)||[]);return"https"===a&&".csb.app"===t},L=()=>{const[e,a,t]=Array.from(_.exec(O)||[]);return"https"===a&&".adaptabletools.com"===t};class A{constructor(e,a,t){this.adaptable=e,this.adaptable=e;let s=null;if(a)try{s=r.decode(a)}catch(e){s=e}h()||u()||L()||this.handleLicenseValidation(s,this.getValidityType(s,t))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),o=s<new Date,i=e.trial;let n=null;return n=o?s>t?i?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:i?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:i?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var t;const s=new Date;s.setHours(0,0,0,0);let r=0;e instanceof Error||!(null==e?void 0:e.end)||(r=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-s.getTime())/864e5),r=i.default(r,0,1/0));const l=(e,a=n.LicenseDocsLink,t=c,s=r)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[DAYS]",`${s}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":o.ConsoleLogByMessageType(l("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":o.ConsoleLogByMessageType(l("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":o.ConsoleLogByMessageType(l("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":o.ConsoleLogByMessageType(l("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":r<=10&&o.ConsoleLogByMessageType(l("This AdapTable license expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)"),"Info");break;case"COMMERCIAL_EXPIRED_IN_SCOPE":o.ConsoleLogByMessageType(l("This AdapTable license has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)"),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":o.ConsoleLogByMessageType(l("This AdapTable license has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license."),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction(t.PopupShowAlert({header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction(a.SystemLicenseShowWatermark(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction(a.SystemLicenseDisablePersistence())}destroy(){}}exports.LicenseService=A;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../Redux/ActionsReducers/SystemRedux"),t=require("../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../ObjectFactory")),o=require("../Helpers/LoggingHelper"),i=e.__importDefault(require("lodash/clamp")),n=require("../Constants/DocumentationLinkConstants"),r=require("../license/decode"),c="sales@adaptabletools.com",l=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p=exports.LicenseValidityType||(exports.LicenseValidityType={}));const E=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,I=/(https):\/\/\S+(\.csb\.app)/g,_=/(https):\/\/\S+(\.adaptabletools\.com)/g,O="undefined"!=typeof window?window.location.origin:"",h=()=>{const[e,a,t]=Array.from(E.exec(O)||[]);return"https"===a&&"sandpack.codesandbox.io"===t},u=()=>{const[e,a,t]=Array.from(I.exec(O)||[]);return"https"===a&&".csb.app"===t},L=()=>{const[e,a,t]=Array.from(_.exec(O)||[]);return"https"===a&&".adaptabletools.com"===t};class A{constructor(e,a,t){this.adaptable=e,this.adaptable=e;let s=null;if(a)try{s=r.decode(a)}catch(e){s=e}h()||u()||L()||this.handleLicenseValidation(s,this.getValidityType(s,t))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),o=s<new Date,i=e.trial;let n=null;return n=o?s>t?i?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:i?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:i?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var t;const s=new Date;s.setHours(0,0,0,0);let r=0;e instanceof Error||!(null==e?void 0:e.end)||(r=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-s.getTime())/864e5),r=i.default(r,0,1/0));const l=(e,a=n.LicenseDocsLink,t=c,s=r)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[DAYS]",`${s}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":o.ConsoleLogByMessageType(l("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":o.ConsoleLogByMessageType(l("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":o.ConsoleLogByMessageType(l("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":o.ConsoleLogByMessageType(l("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":r<=10&&o.ConsoleLogByMessageType(l("This AdapTable license expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)"),"Info");break;case"COMMERCIAL_EXPIRED_IN_SCOPE":o.ConsoleLogByMessageType(l("This AdapTable license has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)"),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":o.ConsoleLogByMessageType(l("This AdapTable license has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license."),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction(t.PopupShowAlert({alertType:"generic",header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction(a.SystemLicenseShowWatermark(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction(a.SystemLicenseDisablePersistence())}destroy(){}}exports.LicenseService=A;

package/src/Utilities/Services/ModuleService.js

@@ -76,7 +76,7 @@ class ModuleService {
     }
     getModuleDocumentationPageByModule(adaptableModule) {
         let url = `${DocumentationLinkConstants_1.HOST_URL_DOCS}/`;
-        let learnUrl = url + 'learn/';
+        let learnUrl = url + 'guide/';
         switch (adaptableModule) {
             case 'Alert':
                 return learnUrl + 'handbook-alerting';

package/src/Utilities/Services/ValidationService.js

@@ -44,6 +44,7 @@ class ValidationService {
         const failedRules = this.getValidationRulesForDataChange(dataChangedInfo);
         if (failedRules.length > 0) {
             let alert = {
+                alertType: 'cellChanged',
                 header: 'Alert',
                 message: 'Perform Edit Alert Fired',
                 alertDefinition: failedRules[0],

package/src/View/AdaptableView.js

@@ -15,6 +15,7 @@ const License_1 = require("./License");
 const ExportCustomDestinationFormPopups_1 = require("./Export/ExportCustomDestinationFormPopups");
 const ProgressIndicator_1 = require("../components/ProgressIndicator/ProgressIndicator");
 const react_toastify_1 = require("react-toastify");
+const WindowPopups_1 = require("./Components/Popups/WindowPopups/WindowPopups");
 class AdaptableView extends React.Component {
     render() {
         var _a, _b, _c, _d;
@@ -29,6 +30,7 @@ class AdaptableView extends React.Component {
             React.createElement(react_toastify_1.ToastContainer, { limit: this.props.AdaptableApi.internalApi.getAdaptableOptions().notificationsOptions
                     .maxNotifications, closeButton: false, icon: false, theme: "colored" }),
             (watermark === null || watermark === void 0 ? void 0 : watermark.show) && React.createElement(License_1.LicenseWatermark, null, watermark === null || watermark === void 0 ? void 0 : watermark.text),
+            React.createElement(WindowPopups_1.WindowPopups, null),
             React.createElement(ProgressIndicator_1.ProgressIndicator, null)));
     }
 }

package/src/View/Alert/Wizard/AlertBehaviourWizardSection.js

@@ -17,6 +17,7 @@ exports.renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
         AlertProperties.HighlightCell ? { label: 'Highlight Cell', id: 'highlightCell' } : null,
         AlertProperties.HighlightRow ? { label: 'Highlight Row', id: 'highlightRow' } : null,
         AlertProperties.JumpToCell ? { label: 'Jump To Cell', id: 'jumptocell' } : null,
+        AlertProperties.JumpToRow ? { label: 'Jump To Row', id: 'jumptorow' } : null,
         AlertProperties.ShowInDiv
             ? {
                 label: (React.createElement(React.Fragment, null,
@@ -33,34 +34,40 @@ exports.renderAlertBehaviourSummary = (alert, api, allowWrap = false) => {
     return (React.createElement(ValueSelector_1.ValueOptionsTags, { allowWrap: allowWrap, options: values, value: values.map((v) => v.id), readOnly: true, toIdentifier: (x) => x.id, toLabel: (x) => React.createElement(React.Fragment, null, x.label) }));
 };
 exports.AlertBehaviourWizardSection = (props) => {
-    const { data } = OnePageAdaptableWizard_1.useOnePageWizardContext();
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageWizardContext();
     const { AlertProperties = {} } = data;
+    const rowAddedAlert = api.internalApi.isAlertDefinitionForAddedRowChangeEvent(data);
+    const rowRemovedAlert = api.internalApi.isAlertDefinitionForRemovedRowChangeEvent(data);
+    const cellChangedAlert = !rowAddedAlert && !rowRemovedAlert;
     const onChange = (AlertProperties) => {
         props.onChange(Object.assign(Object.assign({}, data), { AlertProperties: Object.assign(Object.assign({}, data.AlertProperties), AlertProperties) }));
     };
     return (React.createElement(Tabs_1.Tabs, null,
         React.createElement(Tabs_1.Tabs.Tab, null, "Behaviour"),
         React.createElement(Tabs_1.Tabs.Content, null,
-            React.createElement(CheckBox_1.CheckBox, { style: { alignItems: 'flex-start' }, checked: AlertProperties.PreventEdit, onChange: (PreventEdit) => {
+            cellChangedAlert && (React.createElement(CheckBox_1.CheckBox, { style: { alignItems: 'flex-start' }, checked: AlertProperties.PreventEdit, onChange: (PreventEdit) => {
                     onChange({
                         PreventEdit,
                     });
                 } },
                 "Prevent Cell Edit",
-                React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(automatically undo data change which triggered Alert)")),
-            React.createElement(CheckBox_1.CheckBox, { style: { alignItems: 'flex-start' }, checked: Boolean(AlertProperties.HighlightCell), onChange: (HighlightCell) => {
+                React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(automatically undo data change which triggered Alert)"))),
+            cellChangedAlert && (React.createElement(CheckBox_1.CheckBox, { style: { alignItems: 'flex-start' }, checked: Boolean(AlertProperties.HighlightCell), onChange: (HighlightCell) => {
                     onChange({ HighlightCell });
                 } },
                 "Highlight Cell",
-                React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(using the Alert message type)")),
-            React.createElement(CheckBox_1.CheckBox, { style: { alignItems: 'flex-start' }, checked: Boolean(AlertProperties.HighlightRow), onChange: (HighlightRow) => {
+                React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(using the Alert message type)"))),
+            rowAddedAlert && (React.createElement(CheckBox_1.CheckBox, { style: { alignItems: 'flex-start' }, checked: Boolean(AlertProperties.HighlightRow), onChange: (HighlightRow) => {
                     onChange({ HighlightRow });
                 } },
                 "Highlight Row",
-                React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(using the Alert message type)")),
-            React.createElement(CheckBox_1.CheckBox, { checked: AlertProperties.JumpToCell, onChange: (JumpToCell) => {
+                React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "(using the Alert message type)"))),
+            cellChangedAlert && (React.createElement(CheckBox_1.CheckBox, { checked: AlertProperties.JumpToCell, onChange: (JumpToCell) => {
                     onChange({ JumpToCell });
-                } }, "Jump To Cell"),
+                } }, "Jump To Cell")),
+            rowAddedAlert && (React.createElement(CheckBox_1.CheckBox, { checked: AlertProperties.JumpToRow, onChange: (JumpToRow) => {
+                    onChange({ JumpToRow });
+                } }, "Jump To Row")),
             React.createElement(CheckBox_1.CheckBox, { checked: AlertProperties.ShowInDiv, onChange: (ShowInDiv) => {
                     onChange({ ShowInDiv });
                 } },

package/src/View/Alert/Wizard/AlertButtonsEditor.js

@@ -12,12 +12,22 @@ const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayou
 const CheckBox_1 = require("../../../components/CheckBox");
 const Helper_1 = require("../../../Utilities/Helpers/Helper");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
-const BUTTON_ACTIONS = ['highlight-cell', 'jump-to-cell', 'undo', 'suspend'];
 exports.AlertButtonsEditor = (props) => {
+    const { api, adaptableAlert } = props;
     const onChange = (newButtons) => {
         props.onChange(newButtons);
     };
     const AlertButtons = Helper_1.cloneObject(props.AlertButtons || []) || [];
+    const rowAddedAlert = api.internalApi.isAlertDefinitionForAddedRowChangeEvent(adaptableAlert.alertDefinition);
+    const rowRemovedAlert = api.internalApi.isAlertDefinitionForRemovedRowChangeEvent(adaptableAlert.alertDefinition);
+    const buttonActions = [];
+    if (rowAddedAlert) {
+        buttonActions.push('highlight-row', 'jump-to-row');
+    }
+    if (!rowAddedAlert && !rowRemovedAlert) {
+        buttonActions.push('highlight-cell', 'jump-to-cell', 'undo');
+    }
+    buttonActions.push('suspend');
     return (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "center", justifyContent: "space-between" },
             React.createElement(rebass_1.Text, { fontSize: 2, mt: 3, mb: 2 }, "Add buttons to Alert, and Actions to perform when button is clicked"),
@@ -42,7 +52,7 @@ exports.AlertButtonsEditor = (props) => {
                     : button.Action
                 : [];
             // filter out the adaptable standard actions
-            const btnUserFunctions = btnActions.filter((action) => !BUTTON_ACTIONS.includes(action));
+            const btnUserFunctions = btnActions.filter((action) => !buttonActions.includes(action));
             const setVariant = (variant) => {
                 onChange(AlertButtons.map((btn, i) => {
                     if (i === index) {
@@ -115,7 +125,7 @@ exports.AlertButtonsEditor = (props) => {
                                     onChange(AlertButtons.filter((btn) => btn !== button));
                                 } }))),
                     React.createElement(FormLayout_1.FormRow, { label: React.createElement(rebass_1.Text, { fontSize: 2 }, "Actions") },
-                        BUTTON_ACTIONS.map((actionName) => {
+                        buttonActions.map((actionName) => {
                             return (React.createElement(CheckBox_1.CheckBox, { key: actionName, marginRight: 3, onChange: (checked) => {
                                     let actions = btnActions;
                                     if (!checked) {

package/src/View/Alert/Wizard/AlertDisplayWizardSection.js

@@ -45,6 +45,7 @@ exports.AlertPreview = (_a) => {
         const alertForm = alertDefinition.AlertForm || {};
         const Buttons = (((_a = alertForm === null || alertForm === void 0 ? void 0 : alertForm.Buttons) === null || _a === void 0 ? void 0 : _a.length) ? alertForm.Buttons : DEFAULT_BUTTONS).map(mapButtons);
         const result = {
+            alertType: 'generic',
             header: alertDefinition.MessageType,
             message: api.alertApi.getAlertDescription(alertDefinition),
             alertDefinition: Object.assign(Object.assign({}, alertDefinition), { AlertForm: Object.assign(Object.assign({}, alertForm), { Buttons }) }),
@@ -60,6 +61,7 @@ exports.AlertDisplayWizardSection = (props) => {
     const messageType = data.MessageType;
     const messageText = api.alertApi.getAlertDescription(data);
     const adaptableAlert = {
+        alertType: 'generic',
         header: data.MessageType,
         message: '',
         alertDefinition: data,