@adaptabletools/adaptable 16.1.1-canary.2 → 16.2.0-canary.1

package/src/Api/Internal/DataImportInternalApi.js

@@ -17,27 +17,27 @@ class DataImportInternalApi extends ApiBase_1.ApiBase {
         }
         const gridApi = this.getGridApi();
         const primaryKey = this.getOptions().primaryKey;
-        let newRows = 0;
-        let updatedRows = 0;
+        let newRowCount = 0;
+        let updatedRowCount = 0;
         const preparedDataRows = importData.map((dataRow) => {
             const node = gridApi.getRowNodeForPrimaryKey(dataRow[primaryKey]);
             if (!node) {
-                newRows += 1;
+                newRowCount += 1;
                 return dataRow;
             }
-            updatedRows += 1;
+            updatedRowCount += 1;
             return Object.assign(Object.assign({}, node === null || node === void 0 ? void 0 : node.data), dataRow);
         });
         await gridApi.addOrUpdateGridData(preparedDataRows);
         let message = '';
-        if (newRows && updatedRows) {
-            message = `Added: ${newRows} new Row${newRows > 1 ? 's' : ''}; Updated: ${updatedRows} existing Row${updatedRows > 1 ? 's' : ''}`;
+        if (newRowCount && updatedRowCount) {
+            message = `Added: ${newRowCount} new Row${newRowCount > 1 ? 's' : ''}; Updated: ${updatedRowCount} existing Row${updatedRowCount > 1 ? 's' : ''}`;
         }
-        else if (newRows && !updatedRows) {
-            message = `Added: ${newRows} new Row${newRows > 1 ? 's' : ''}`;
+        else if (newRowCount && !updatedRowCount) {
+            message = `Added: ${newRowCount} new Row${newRowCount > 1 ? 's' : ''}`;
         }
-        else if (!newRows && updatedRows) {
-            message = `Updated: ${updatedRows} existing Row${updatedRows > 1 ? 's' : ''}`;
+        else if (!newRowCount && updatedRowCount) {
+            message = `Updated: ${updatedRowCount} existing Row${updatedRowCount > 1 ? 's' : ''}`;
         }
         const alert = {
             alertType: 'generic',
@@ -48,6 +48,24 @@ class DataImportInternalApi extends ApiBase_1.ApiBase {
                 } }),
         };
         this.getAlertApi().showAdaptableAlert(alert);
+        this.publishDataImportedEvent(preparedDataRows, importData, newRowCount, updatedRowCount);
+    }
+    /**
+     * Publishes an event when Data has been imported
+     * @param gridDataRows Rows that were imported
+     */
+    publishDataImportedEvent(gridDataRows, importData, newRowCount, updatedRowCount) {
+        const adaptableApi = this.getAdaptableApi();
+        const dataImportedInfo = {
+            adaptableApi: adaptableApi,
+            gridDataRows,
+            importData,
+            newRowCount,
+            updatedRowCount,
+            userName: adaptableApi.optionsApi.getUserName(),
+            adaptableId: adaptableApi.optionsApi.getAdaptableId(),
+        };
+        this.getEventApi().emit('DataImported', dataImportedInfo);
     }
 }
 exports.DataImportInternalApi = DataImportInternalApi;

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

@@ -10,7 +10,7 @@ export declare class FilterInternalApi extends ApiBase {
     /**
      * Returns Predicate Definition for given Column and Quick Filter shortcut
      * @param shortcut Quick Filter shortcut to lookup
-     * @param column Adaptable Column being Filtered
+     * @param column AdapTable Column being Filtered
      */
     findPredicateDefByShortcut(shortcut: string, column: AdaptableColumn): AdaptablePredicateDef;
     /**

package/src/Api/Internal/FilterInternalApi.js

@@ -10,7 +10,7 @@ class FilterInternalApi extends ApiBase_1.ApiBase {
     /**
      * Returns Predicate Definition for given Column and Quick Filter shortcut
      * @param shortcut Quick Filter shortcut to lookup
-     * @param column Adaptable Column being Filtered
+     * @param column AdapTable Column being Filtered
      */
     findPredicateDefByShortcut(shortcut, column) {
         return this.getFilterApi()

package/src/Api/Internal/GridInternalApi.js

@@ -53,6 +53,7 @@ class GridInternalApi extends ApiBase_1.ApiBase {
                 adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
             };
             this.adaptable.api.eventApi.emit('GridDataChanged', gridDataChangedInfo);
+            this.adaptable.DataService.CreateGridChangedEvent(gridDataChangedInfo);
         }
     }
     /**

package/src/PredefinedConfig/Common/AdaptableColumn.d.ts

@@ -1,10 +1,10 @@
 import { AdaptableObject } from './AdaptableObject';
 /**
- * Type of data stored in an Adaptable Column
+ * Type of data stored in an AdapTable Column
  */
 export declare type AdaptableColumnDataType = 'String' | 'Number' | 'Boolean' | 'Date' | 'Object' | 'StringArray' | 'NumberArray' | 'TupleNumberArray' | 'ObjectNumberArray' | 'Unknown';
 /**
- * Base class for Adaptable Column containing most important properties
+ * Base class for AdapTable Column containing most important properties
  */
 export interface AdaptableColumnBase extends AdaptableObject {
     /**
@@ -46,7 +46,7 @@ export interface AdaptableColumnGroup {
     groupCount: number;
 }
 /**
- * Defines an Adaptable Column - created at run-time based on AG Grid ColDef
+ * Defines an AdapTable Column - created at run-time based on AG Grid ColDef
  */
 export interface AdaptableColumn<TData = any> extends AdaptableColumnBase {
     /**

package/src/PredefinedConfig/Common/AdaptablePredicate.d.ts

@@ -97,7 +97,7 @@ export interface PredicateDefHandlerContext extends BaseContext {
      */
     node: IRowNode;
     /**
-     * Adaptable Column which contains the cell
+     * AdapTable Column which contains the cell
      */
     column: AdaptableColumn;
     /**

package/src/PredefinedConfig/Common/Fdc3Intent.d.ts

@@ -30,7 +30,7 @@ export declare const Fdc3IntentConfiguration: {
         readonly icon: "spark-line";
     };
     readonly ViewChart: {
-        readonly contexts: readonly ["fdc3.chart", "fdc3.instrument", "fdc3.organization", "fdc3.portfolio", "fdc3.position", "fdc3.nothing"];
+        readonly contexts: readonly ["fdc3.chart", "fdc3.instrument", "fdc3.instrumentList", "fdc3.portfolio", "fdc3.position", "fdc3.nothing"];
         readonly icon: "pie-chart";
     };
     readonly ViewContact: {
@@ -46,7 +46,7 @@ export declare const Fdc3IntentConfiguration: {
         readonly icon: "money";
     };
     readonly ViewInteractions: {
-        readonly contexts: readonly ["fdc3.contact", "fdc3.instrumentList", "fdc3.organization", "fdc3.nothing"];
+        readonly contexts: readonly ["fdc3.contact", "fdc3.instrument", "fdc3.organization", "fdc3.nothing"];
         readonly icon: "interactions";
     };
     readonly ViewNews: {
@@ -54,7 +54,7 @@ export declare const Fdc3IntentConfiguration: {
         readonly icon: "news";
     };
     readonly ViewOrders: {
-        readonly contexts: readonly ["fdc3.contact", "fdc3.instrumentList", "fdc3.organization", "fdc3.nothing"];
+        readonly contexts: readonly ["fdc3.contact", "fdc3.instrument", "fdc3.organization", "fdc3.nothing"];
         readonly icon: "order";
     };
     readonly ViewProfile: {
@@ -66,7 +66,7 @@ export declare const Fdc3IntentConfiguration: {
         readonly icon: "quote";
     };
     readonly ViewResearch: {
-        readonly contexts: readonly ["fdc3.contact", "fdc3.instrumentList", "fdc3.organization", "fdc3.nothing"];
+        readonly contexts: readonly ["fdc3.contact", "fdc3.instrument", "fdc3.organization", "fdc3.nothing"];
         readonly icon: "science";
     };
 };

package/src/PredefinedConfig/Common/Fdc3Intent.js

@@ -47,7 +47,7 @@ exports.Fdc3IntentConfiguration = {
         contexts: [
             Fdc3Context_1.ChartContextKey,
             Fdc3Context_1.InstrumentContextKey,
-            Fdc3Context_1.OrganizationContextKey,
+            Fdc3Context_1.InstrumentListContextKey,
             Fdc3Context_1.PortfolioContextKey,
             Fdc3Context_1.PositionContextKey,
             Fdc3Context_1.NothingContextKey,
@@ -72,12 +72,7 @@ exports.Fdc3IntentConfiguration = {
         icon: 'money',
     },
     [exports.ViewInteractionsIntent]: {
-        contexts: [
-            Fdc3Context_1.ContactContextKey,
-            Fdc3Context_1.InstrumentListContextKey,
-            Fdc3Context_1.OrganizationContextKey,
-            Fdc3Context_1.NothingContextKey,
-        ],
+        contexts: [Fdc3Context_1.ContactContextKey, Fdc3Context_1.InstrumentContextKey, Fdc3Context_1.OrganizationContextKey, Fdc3Context_1.NothingContextKey],
         icon: 'interactions',
     },
     [exports.ViewNewsIntent]: {
@@ -92,12 +87,7 @@ exports.Fdc3IntentConfiguration = {
         icon: 'news',
     },
     [exports.ViewOrdersIntent]: {
-        contexts: [
-            Fdc3Context_1.ContactContextKey,
-            Fdc3Context_1.InstrumentListContextKey,
-            Fdc3Context_1.OrganizationContextKey,
-            Fdc3Context_1.NothingContextKey,
-        ],
+        contexts: [Fdc3Context_1.ContactContextKey, Fdc3Context_1.InstrumentContextKey, Fdc3Context_1.OrganizationContextKey, Fdc3Context_1.NothingContextKey],
         icon: 'order',
     },
     [exports.ViewProfileIntent]: {
@@ -109,12 +99,7 @@ exports.Fdc3IntentConfiguration = {
         icon: 'quote',
     },
     [exports.ViewResearchIntent]: {
-        contexts: [
-            Fdc3Context_1.ContactContextKey,
-            Fdc3Context_1.InstrumentListContextKey,
-            Fdc3Context_1.OrganizationContextKey,
-            Fdc3Context_1.NothingContextKey,
-        ],
+        contexts: [Fdc3Context_1.ContactContextKey, Fdc3Context_1.InstrumentContextKey, Fdc3Context_1.OrganizationContextKey, Fdc3Context_1.NothingContextKey],
         icon: 'science',
     },
 };

package/src/PredefinedConfig/Common/Menu.d.ts

@@ -68,7 +68,7 @@ export interface UserMenuItem<CONTEXT_TYPE extends BaseContext> {
  */
 export interface ColumnMenuContext<TData = any> extends BaseContext {
     /**
-     * Current Adaptable Column
+     * Current AdapTable Column
      */
     adaptableColumn: AdaptableColumn<TData>;
     /**
@@ -89,7 +89,7 @@ export interface ContextMenuContext<TData = any> extends BaseContext {
      */
     gridCell: GridCell<TData>;
     /**
-     * Current Adaptable Column
+     * Current AdapTable Column
      */
     adaptableColumn: AdaptableColumn<TData>;
     /**

package/src/PredefinedConfig/DashboardState.d.ts

@@ -10,6 +10,10 @@ export interface DashboardState extends ConfigState {
      * @defaultValue Empty Array
      */
     Tabs?: DashboardTab[];
+    /**
+     * Toolbars displayed above Grid (and not in Tab)
+     */
+    PinnedToolbars?: AdaptableDashboardToolbars | string[];
     /**
      * Index of Active Tab (in Tabs collection)
      */

package/src/Redux/ActionsReducers/DashboardRedux.d.ts

@@ -35,6 +35,10 @@ export declare const DASHBOARD_SET_FLOATING_POSITION = "DASHBOARD_SET_FLOATING_P
  * @ReduxAction New Dashboard Tabs have been set
  */
 export declare const DASHBOARD_SET_TABS = "DASHBOARD_SET_TABS";
+/**
+ * @ReduxAction Set Pinned Toolbars Contents
+ */
+export declare const DASHBOARD_SET_PINNED_TOOLBARS = "DASHBOARD_SET_PINNED_TOOLBARS";
 /**
  * @ReduxAction A Toolbar has been closed
  */
@@ -84,6 +88,9 @@ export interface DashboardCloseToolbarAction extends Redux.Action {
 export interface DashboardSetTabsAction extends Redux.Action {
     Tabs: DashboardTab[];
 }
+export interface DashboardSetPinnedToolbarsAction extends Redux.Action {
+    pinnedToolbars: DashboardState['PinnedToolbars'];
+}
 export interface DashboardSetCustomToolbarButtonVisibilityAction extends Redux.Action {
     toolbarButton: AdaptableButton<DashboardButtonContext>;
     customToolbar: CustomToolbar;
@@ -106,4 +113,8 @@ export declare const DashboardSetTabs: (Tabs: DashboardTab[]) => DashboardSetTab
 export declare const DashboardCloseToolbar: (toolbar: AdaptableDashboardToolbar) => DashboardCloseToolbarAction;
 export declare const DashboardSetTitle: (title: string) => DashboardSetTitleAction;
 export declare const DashboardReady: (dashboardState: DashboardState) => DashboardReadyAction;
+export declare const DashboardSetPinnedToolbars: (pinnedToolbars: DashboardState['PinnedToolbars']) => {
+    type: string;
+    pinnedToolbars: string[] | import("../../PredefinedConfig/Common/Types").AdaptableDashboardToolbars;
+};
 export declare const DashboardReducer: Redux.Reducer<DashboardState>;

package/src/Redux/ActionsReducers/DashboardRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DashboardReducer = exports.DashboardReady = exports.DashboardSetTitle = exports.DashboardCloseToolbar = exports.DashboardSetTabs = exports.DashboardSetFloatingPosition = exports.DashboardSetIsInline = exports.DashboardSetIsHidden = exports.DashboardSetIsFloating = exports.DashboardSetIsCollapsed = exports.DashboardSetActiveTabIndex = exports.DashboardSetModuleButtons = exports.DASHBOARD_READY = exports.DASHBOARD_SET_TITLE = exports.DASHBOARD_CLOSE_TOOLBAR = exports.DASHBOARD_SET_TABS = exports.DASHBOARD_SET_FLOATING_POSITION = exports.DASHBOARD_SET_IS_HIDDEN = exports.DASHBOARD_SET_IS_INLINE = exports.DASHBOARD_SET_IS_FLOATING = exports.DASHBOARD_SET_IS_COLLAPSED = exports.DASHBOARD_ACTIVE_TAB_INDEX_CHANGE = exports.DASHBOARD_SET_MODULE_BUTTONS = void 0;
+exports.DashboardReducer = exports.DashboardSetPinnedToolbars = exports.DashboardReady = exports.DashboardSetTitle = exports.DashboardCloseToolbar = exports.DashboardSetTabs = exports.DashboardSetFloatingPosition = exports.DashboardSetIsInline = exports.DashboardSetIsHidden = exports.DashboardSetIsFloating = exports.DashboardSetIsCollapsed = exports.DashboardSetActiveTabIndex = exports.DashboardSetModuleButtons = exports.DASHBOARD_READY = exports.DASHBOARD_SET_TITLE = exports.DASHBOARD_CLOSE_TOOLBAR = exports.DASHBOARD_SET_PINNED_TOOLBARS = exports.DASHBOARD_SET_TABS = exports.DASHBOARD_SET_FLOATING_POSITION = exports.DASHBOARD_SET_IS_HIDDEN = exports.DASHBOARD_SET_IS_INLINE = exports.DASHBOARD_SET_IS_FLOATING = exports.DASHBOARD_SET_IS_COLLAPSED = exports.DASHBOARD_ACTIVE_TAB_INDEX_CHANGE = exports.DASHBOARD_SET_MODULE_BUTTONS = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 /**
  * @ReduxAction The Module Buttons have been set in the Dashboard
@@ -34,6 +34,10 @@ exports.DASHBOARD_SET_FLOATING_POSITION = 'DASHBOARD_SET_FLOATING_POSITION';
  * @ReduxAction New Dashboard Tabs have been set
  */
 exports.DASHBOARD_SET_TABS = 'DASHBOARD_SET_TABS';
+/**
+ * @ReduxAction Set Pinned Toolbars Contents
+ */
+exports.DASHBOARD_SET_PINNED_TOOLBARS = 'DASHBOARD_SET_PINNED_TOOLBARS';
 /**
  * @ReduxAction A Toolbar has been closed
  */
@@ -101,6 +105,11 @@ const DashboardReady = (dashboardState) => ({
     dashboardState,
 });
 exports.DashboardReady = DashboardReady;
+const DashboardSetPinnedToolbars = (pinnedToolbars) => ({
+    type: exports.DASHBOARD_SET_PINNED_TOOLBARS,
+    pinnedToolbars,
+});
+exports.DashboardSetPinnedToolbars = DashboardSetPinnedToolbars;
 const initialState = {
     Tabs: GeneralConstants_1.EMPTY_ARRAY,
     ActiveTabIndex: 0,
@@ -169,6 +178,10 @@ const DashboardReducer = (state = initialState, action) => {
             const actionTyped = action;
             return Object.assign({}, state, { DashboardTitle: actionTyped.title });
         }
+        case exports.DASHBOARD_SET_PINNED_TOOLBARS: {
+            const actionTyped = action;
+            return Object.assign({}, state, { PinnedToolbars: actionTyped.pinnedToolbars });
+        }
         default:
             return state;
     }

package/src/Strategy/AlertModule.js

@@ -7,7 +7,6 @@ const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/Syste
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
-const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFactory"));
 const AlertWizard_1 = require("../View/Alert/Wizard/AlertWizard");
 const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
@@ -154,41 +153,25 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
     }
     handleGridDataChanged(gridDataChangedInfo) {
-        const internalAlertApi = this.api.alertApi.internalApi;
         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 defaultMessage = numberOfChangedRows > 1
-            ? `${numberOfChangedRows} rows were ${actionName.toLowerCase()}`
-            : `${numberOfChangedRows} row was ${actionName.toLowerCase()}`;
-        alertDefinitions === null || alertDefinitions === void 0 ? void 0 : alertDefinitions.forEach((alertDefinition) => {
-            if (internalAlertApi.shouldFireAlertOnClient(alertDefinition)) {
-                const customMessage = internalAlertApi.getCustomAlertDescription(alertDefinition, {
-                    gridDataChangedInfo,
-                });
-                const customHeader = internalAlertApi.getCustomAlertMessageHeader(alertDefinition, {
-                    gridDataChangedInfo,
-                });
-                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);
-                this.api.alertApi.showAdaptableAlert(alert);
-            }
-        });
+        this.api.alertApi.internalApi.showAlertsForGridDataChanges(gridDataChangedInfo, alertDefinitions);
     }
     handleReactiveAlertTriggered(reactiveAlertInfo) {
         // TODO  - suppress Notification if alert is not relevant for layout
         var _a;
-        // the row node data is most probably stale because the reactive queries buffer the changed data
-        // so we have to refresh it
-        reactiveAlertInfo.dataChangeLogEntry.rowNode = this.api.gridApi.getRowNodeForPrimaryKey(reactiveAlertInfo.dataChangeLogEntry.primaryKeyValue);
-        reactiveAlertInfo.dataChangeLogEntry.rowData =
-            (_a = reactiveAlertInfo.dataChangeLogEntry.rowNode) === null || _a === void 0 ? void 0 : _a.data;
-        if (reactiveAlertInfo.type === 'alert') {
-            this.api.alertApi.internalApi.showAlertForDefinitions(reactiveAlertInfo.dataChangeLogEntry, [
+        if (reactiveAlertInfo.type === 'cellDataChangedAlert') {
+            // the row node data is most probably stale because the reactive queries buffer the changed data
+            // so we have to refresh it
+            reactiveAlertInfo.cellChangeLogEntry.rowNode = this.api.gridApi.getRowNodeForPrimaryKey(reactiveAlertInfo.cellChangeLogEntry.primaryKeyValue);
+            reactiveAlertInfo.cellChangeLogEntry.rowData =
+                (_a = reactiveAlertInfo.cellChangeLogEntry.rowNode) === null || _a === void 0 ? void 0 : _a.data;
+            this.api.alertApi.internalApi.showAlertForDefinitions(reactiveAlertInfo.cellChangeLogEntry, [
+                reactiveAlertInfo.alertDefinition,
+            ]);
+        }
+        else {
+            // reactiveAlertInfo.type === gridDataChangedAlert'
+            this.api.alertApi.internalApi.showAlertForDefinitions(reactiveAlertInfo.gridChangeLogEntry, [
                 reactiveAlertInfo.alertDefinition,
             ]);
         }

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -40,7 +40,9 @@ exports.DefaultAdaptableOptions = {
         showSystemStatusMessageNotifications: false,
         maxSystemMessagesInStore: 100,
     },
-    dataImportOptions: {},
+    dataImportOptions: {
+        fileHandlers: undefined,
+    },
     flashingCellOptions: {
         defaultFlashDuration: 500,
         defaultFlashTarget: 'cell',

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.d.ts

@@ -2,6 +2,7 @@ import { ExpressionContext } from '../../parser/src/types';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 import { Observable } from 'rxjs';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
+import { GridDataChangedInfo } from '../../types';
 export interface BaseParameter<T = string, N = string> {
     type: T;
     name: N;
@@ -13,6 +14,7 @@ export declare const getStringValues: (context: ExpressionContext, ...stringArgu
 export declare const getStringValue: (context: ExpressionContext, stringArgument: string) => string;
 export declare const isTextSearchCaseInsensitive: (context: ExpressionContext) => boolean;
 export declare const getDataChangeLog$: (context: ExpressionContext, columnNameFilter: string) => Observable<CellDataChangedInfo>;
+export declare const getGridChangeLog$: (context: ExpressionContext, gridChangeType: GridDataChangedInfo['rowTrigger']) => Observable<GridDataChangedInfo>;
 export declare const handleWhereFunction: (args: ExpressionNode[], context: ExpressionContext) => any;
 export declare type ExpressionNode = any;
 export declare const evaluateExpressionNode: (expressionNode: ExpressionNode, context: ExpressionContext, filterFn?: (item: any) => boolean) => any;

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateColumnType = exports.getNumericValue = exports.handleColumnFunction = exports.extractParameters = exports.extractParameter = exports.extractColumnParameters = exports.extractColumnParameter = exports.evaluateExpressionNode = exports.handleWhereFunction = exports.getDataChangeLog$ = exports.isTextSearchCaseInsensitive = exports.getStringValue = exports.getStringValues = void 0;
+exports.validateColumnType = exports.getNumericValue = exports.handleColumnFunction = exports.extractParameters = exports.extractParameter = exports.extractColumnParameters = exports.extractColumnParameter = exports.evaluateExpressionNode = exports.handleWhereFunction = exports.getGridChangeLog$ = exports.getDataChangeLog$ = exports.isTextSearchCaseInsensitive = exports.getStringValue = exports.getStringValues = void 0;
 const tslib_1 = require("tslib");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
@@ -29,11 +29,23 @@ const getDataChangeLog$ = (context, columnNameFilter) => {
     dataChangeLog$ = dataChangeLog$.pipe((0, operators_1.filter)((dataChangeLog) => dataChangeLog.column.columnId === columnNameFilter));
     // filter based on the WHERE clause
     if (context.filterFn) {
-        dataChangeLog$ = dataChangeLog$.pipe((0, operators_1.filter)((value) => context.filterFn(value.rowNode)));
+        dataChangeLog$ = dataChangeLog$.pipe((0, operators_1.filter)((value) => {
+            return context.filterFn(value.rowNode);
+        }));
     }
     return dataChangeLog$;
 };
 exports.getDataChangeLog$ = getDataChangeLog$;
+const getGridChangeLog$ = (context, gridChangeType) => {
+    const gridChangeLog$ = context.adaptableApi.internalApi.getDataService().gridChangeLog$;
+    let gridChangeStream$ = gridChangeLog$.pipe((0, operators_1.filter)((gridDataChangedInfo) => gridDataChangedInfo.rowTrigger === gridChangeType));
+    // filter based on the WHERE clause
+    if (context.filterFn) {
+        gridChangeStream$ = gridChangeStream$.pipe((0, operators_1.filter)((value) => value.rowNodes.some((node) => context.filterFn(node))));
+    }
+    return gridChangeStream$;
+};
+exports.getGridChangeLog$ = getGridChangeLog$;
 const handleWhereFunction = (args, context) => {
     const reactiveExpressionNode = args[0];
     const whereClauseExpressionNode = args[1];

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.d.ts

@@ -2,6 +2,6 @@ import { ExpressionFunction } from '../../parser/src/types';
 /**
  * List of all the Observable Functions available in AdaptableQL
  */
-export declare type ObservableFunctionName = 'WHERE' | 'COL' | 'TIMEFRAME' | 'ROW_CHANGE' | 'GRID_CHANGE' | 'MAX' | 'MIN' | 'NONE' | 'COUNT';
+export declare type ObservableFunctionName = 'WHERE' | 'COL' | 'TIMEFRAME' | 'ROW_CHANGE' | 'ROW_ADDED' | 'GRID_CHANGE' | 'ROW_REMOVED' | 'MAX' | 'MIN' | 'NONE' | 'COUNT';
 export declare const observableExpressionFunctions: Record<ObservableFunctionName, ExpressionFunction>;
 export declare const observableExpressionFunctionNames: ObservableFunctionName[];

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -91,7 +91,7 @@ exports.observableExpressionFunctions = {
                     (0, operators_1.debounceTime)(timeframeParameter.value), 
                     // completing the observable (ex. alert deletion) will also fire the NONE event
                     // takeUntil takes care of this, ignoring any emissions as soon as the source completes
-                    // (count() result is irrelevant here, the main thing is that it emits an source completion)
+                    // (count() result is irrelevant here, the main thing is that it emits a source completion)
                     (0, operators_1.takeUntil)(dataChangeLog$.pipe((0, operators_1.count)())));
                 }
             }
@@ -105,6 +105,48 @@ exports.observableExpressionFunctions = {
         ],
         category: 'observable',
     },
+    ROW_ADDED: {
+        handler(args, context) {
+            const gridChangeLog$ = (0, expressionFunctionUtils_1.getGridChangeLog$)(context, 'Add');
+            return handleGridRowAddedOrRemoved(args, gridChangeLog$, 'ROW_ADDED', context);
+        },
+        returnType: 'boolean',
+        description: 'Observes added rows in the grid',
+        signatures: [
+            'ROW_ADDED()',
+            'ROW_ADDED(rowCount: number)',
+            'ROW_ADDED(timeframe:TIMEFRAME)',
+            'ROW_ADDED(rowCount: number, timeframe:TIMEFRAME)',
+        ],
+        examples: [
+            'ROW_ADDED()',
+            'ROW_ADDED(2)',
+            "ROW_ADDED(TIMEFRAME('20s'))",
+            "ROW_ADDED(2, TIMEFRAME('20s'))",
+        ],
+        category: 'observable',
+    },
+    ROW_REMOVED: {
+        handler(args, context) {
+            const gridChangeLog$ = (0, expressionFunctionUtils_1.getGridChangeLog$)(context, 'Delete');
+            return handleGridRowAddedOrRemoved(args, gridChangeLog$, 'ROW_REMOVED', context);
+        },
+        returnType: 'boolean',
+        description: 'Observes removed rows in the grid',
+        signatures: [
+            'ROW_REMOVED()',
+            'ROW_REMOVED(rowCount: number)',
+            'ROW_REMOVED(timeframe:TIMEFRAME)',
+            'ROW_REMOVED(rowCount: number, timeframe:TIMEFRAME)',
+        ],
+        examples: [
+            'ROW_REMOVED()',
+            'ROW_REMOVED(2)',
+            "ROW_REMOVED(TIMEFRAME('20s'))",
+            "ROW_REMOVED(2, TIMEFRAME('20s'))",
+        ],
+        category: 'observable',
+    },
     COL: {
         handler(args, context) {
             return (0, expressionFunctionUtils_1.handleColumnFunction)(args, context);
@@ -320,6 +362,7 @@ const getTrailingGridCountChange$ = (source$, trailingPeriod, counterLimit) => {
             if (gridCounter === counterLimit) {
                 // reset counter
                 counter = 0;
+                console.log('reset counter');
             }
             return gridCounter;
         }));
@@ -434,3 +477,52 @@ const getMaxTimeframeSize = (expressionValue, context) => {
     }
     return expressionValue > maxTimeframeSize ? maxTimeframeSize : expressionValue;
 };
+const handleGridRowAddedOrRemoved = (args, gridChangeLog$, consumingFunction, context) => {
+    let countValue = args.find((arg) => typeof arg === 'number');
+    if (countValue < 0) {
+        throw new ExpressionEvaluationError_1.ExpressionEvaluationError(consumingFunction, 'supports only zero or a positive number as argument');
+    }
+    let timeframeParameter = (0, expressionFunctionUtils_1.extractParameter)(consumingFunction, 'config', ['TIMEFRAME'], args, { isOptional: true });
+    if (countValue === 0 && timeframeParameter == null) {
+        throw new ExpressionEvaluationError_1.ExpressionEvaluationError(consumingFunction, 'requires a TIMEFRAME parameter when observing for no changes');
+    }
+    if (countValue == null && timeframeParameter == null) {
+        // default - return all new rows
+        return gridChangeLog$;
+    }
+    if (countValue == null) {
+        // default count value of 1
+        countValue = 1;
+    }
+    if (timeframeParameter == null) {
+        // default time parameter of max
+        timeframeParameter = {
+            name: 'TIMEFRAME',
+            type: 'config',
+            value: SYSTEM_MAX_TIMEFRAME_SIZE,
+        };
+    }
+    if (countValue === 0) {
+        // handle special case when observing NO changes
+        const gridDataChangeInfoStub = {
+            rowTrigger: consumingFunction === 'ROW_ADDED' ? 'Add' : 'Delete',
+            rowNodes: [],
+            dataRows: [],
+            changedAt: Date.now(),
+            adaptableId: context.adaptableId,
+            adaptableApi: context.adaptableApi,
+            userName: context.userName,
+        };
+        return gridChangeLog$.pipe(
+        // add a synthetic first value to ensure the grid is observed even when there are no changes
+        (0, operators_1.startWith)(gridDataChangeInfoStub), 
+        // wait for the given time
+        (0, operators_1.debounceTime)(timeframeParameter.value), 
+        // completing the observable (ex. alert deletion) will also fire the NONE event
+        // takeUntil takes care of this, ignoring any emissions as soon as the source completes
+        // (count() result is irrelevant here, the main thing is that it emits a source completion)
+        (0, operators_1.takeUntil)(gridChangeLog$.pipe((0, operators_1.count)())));
+    }
+    const timeframeChange$ = getTrailingGridCountChange$(gridChangeLog$, timeframeParameter.value, countValue);
+    return getDataChangeCount$(gridChangeLog$, timeframeChange$, countValue);
+};

package/src/Utilities/Services/AlertService.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AlertService = void 0;
 const tslib_1 = require("tslib");
+const IAlertService_1 = require("./Interface/IAlertService");
 const Emitter_1 = tslib_1.__importDefault(require("../Emitter"));
 const rxjs_1 = require("rxjs");
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
@@ -36,12 +37,18 @@ class AlertService {
         const reactiveAlertSubscription = (0, rxjs_1.combineLatest)([
             (0, rxjs_1.of)(alertDefinition),
             reactiveExpressionObservable,
-        ]).subscribe(([alertDefinition, dataChangeLogEntry]) => {
-            const reactiveAlertInfo = {
-                alertDefinition: alertDefinition,
-                dataChangeLogEntry,
-                type: 'alert',
-            };
+        ]).subscribe(([alertDefinition, changeLogEntry]) => {
+            const reactiveAlertInfo = (0, IAlertService_1.isGridDataChangedInfo)(changeLogEntry)
+                ? {
+                    alertDefinition,
+                    type: 'gridDataChangedAlert',
+                    gridChangeLogEntry: changeLogEntry,
+                }
+                : {
+                    alertDefinition,
+                    type: 'cellDataChangedAlert',
+                    cellChangeLogEntry: changeLogEntry,
+                };
             this.emitter.emitSync('ReactiveAlertTriggered', reactiveAlertInfo);
         });
         this.reactiveAlertsMap.set(alertDefinition.Uuid, {

package/src/Utilities/Services/DataService.d.ts

@@ -3,11 +3,14 @@ import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { EmitterCallback } from '../../Utilities/Emitter';
 import { Observable } from 'rxjs';
+import { GridDataChangedInfo } from '../../types';
 export declare class DataService implements IDataService {
     private adaptable;
     private emitter;
     private dataChangeLogSubject$;
     dataChangeLog$: Observable<CellDataChangedInfo>;
+    private gridChangeLogSubject$;
+    gridChangeLog$: Observable<GridDataChangedInfo>;
     private undoChangeLog;
     private undoChangeTimers;
     constructor(adaptable: IAdaptable);
@@ -15,9 +18,9 @@ export declare class DataService implements IDataService {
     on: (eventName: string, callback: EmitterCallback) => (() => void);
     emit: (eventName: string, data?: any) => Promise<any>;
     CreateDataChangedEvent(cellDataChangedInfo: CellDataChangedInfo): void;
+    CreateGridChangedEvent(gridDataChangedInfo: GridDataChangedInfo): void;
     logUndoChange(change: CellDataChangedInfo): void;
     extractUndoChange(change: CellDataChangedInfo): CellDataChangedInfo | undefined;
     private getUndoChangeKey;
-    private logDataChange;
     private extractDataChangeLogEntry;
 }