@adaptabletools/adaptable 10.0.4-canary.2 → 11.0.0-canary.0

package/src/Api/Implementation/GridApiImpl.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
+const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 class GridApiImpl extends ApiBase_1.ApiBase {
     getGridState() {
         return this.getAdaptableState().Grid;
@@ -21,13 +22,13 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     loadGridData(dataSource) {
         this.adaptable.loadDataSource(dataSource);
     }
-    updateGridData(dataRows, dataUpdateConfig) {
-        this.adaptable.updateRows(dataRows, dataUpdateConfig);
-        this.fireGridDataChangedEvent(dataRows, 'Edit');
+    async updateGridData(dataRows, dataUpdateConfig) {
+        const rowNodes = await this.adaptable.updateRows(dataRows, dataUpdateConfig);
+        this.fireGridDataChangedEvent(dataRows, rowNodes, 'Edit');
     }
-    addGridData(dataRows, dataUpdateConfig) {
-        this.adaptable.addRows(dataRows, dataUpdateConfig);
-        this.fireGridDataChangedEvent(dataRows, 'Add');
+    async addGridData(dataRows, dataUpdateConfig) {
+        const rowNodes = await this.adaptable.addRows(dataRows, dataUpdateConfig);
+        this.fireGridDataChangedEvent(dataRows, rowNodes, 'Add');
     }
     undoCellEdit(dataChangedInfo) {
         // for the reason of this hacky solution see the comments in DataService
@@ -35,10 +36,10 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.setCellValue(dataChangedInfo.column.columnId, dataChangedInfo.oldValue, dataChangedInfo.primaryKeyValue);
         return true;
     }
-    deleteGridData(dataRows, dataUpdateConfig) {
+    async deleteGridData(dataRows, dataUpdateConfig) {
         if (this.checkArrayExists(dataRows)) {
-            this.adaptable.deleteRows(dataRows, dataUpdateConfig);
-            this.fireGridDataChangedEvent(dataRows, 'Delete');
+            const rowNodes = await this.adaptable.deleteRows(dataRows, dataUpdateConfig);
+            this.fireGridDataChangedEvent(dataRows, rowNodes, 'Delete');
         }
     }
     setCellValue(columnId, newValue, primaryKeyValue) {
@@ -88,7 +89,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.api.filterApi.clearAllColumnFilter();
     }
     getAgGridInstance() {
-        return this.adaptable.adaptableOptions.vendorGrid;
+        return this.adaptable.adaptableOptions.gridOptions;
     }
     getColumnSorts() {
         return this.getAdaptableState().Grid.ColumnSorts;
@@ -247,12 +248,13 @@ class GridApiImpl extends ApiBase_1.ApiBase {
             this.adaptable.api.eventApi.emit('CellChanged', cellChangedInfo);
         }
     }
-    fireGridDataChangedEvent(dataRows, rowTigger) {
+    fireGridDataChangedEvent(dataRows, rowNodes, rowTrigger) {
         if (this.adaptable.isInitialised) {
             const gridDataChangedInfo = {
                 adaptableApi: this.adaptable.api,
-                rowTigger: rowTigger,
+                rowTrigger: rowTrigger,
                 dataRows: dataRows,
+                rowNodes,
             };
             this.adaptable.api.eventApi.emit('GridDataChanged', gridDataChangedInfo);
         }
@@ -272,21 +274,38 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(SystemRedux_1.SystemHighlightCellAdd(cellHighlightInfo));
         if (cellHighlightInfo.timeout) {
             setTimeout(() => {
-                this.unhighlightCell(cellHighlightInfo);
+                this.unHighlightCell(cellHighlightInfo.primaryKeyValue, cellHighlightInfo.columnId);
             }, cellHighlightInfo.timeout);
         }
     }
-    unhighlightCell(cellHighlightInfo) {
-        this.dispatchAction(SystemRedux_1.SystemHighlightCellDelete(cellHighlightInfo));
+    unHighlightCell(primaryKeyValue, columnId) {
+        this.dispatchAction(SystemRedux_1.SystemHighlightCellDelete(primaryKeyValue, columnId));
     }
-    unhighlightAllCells() {
+    unHighlightAllCells() {
         this.dispatchAction(SystemRedux_1.SystemHighlightCellDeleteAll());
     }
+    highlightRow(rowHighlightInfo) {
+        this.dispatchAction(SystemRedux_1.SystemHighlightRowAdd(rowHighlightInfo));
+        if (rowHighlightInfo.timeout) {
+            setTimeout(() => {
+                this.unHighlightRow(rowHighlightInfo.primaryKeyValue);
+            }, rowHighlightInfo.timeout);
+        }
+    }
+    unHighlightRow(primaryKeyValue) {
+        this.dispatchAction(SystemRedux_1.SystemHighlightRowDelete(primaryKeyValue));
+    }
+    unHighlightAllRows() {
+        this.dispatchAction(SystemRedux_1.SystemHighlightRowDeleteAll());
+    }
     refreshCells(rowNodes, columnIds) {
         this.adaptable.refreshCells(rowNodes, columnIds, true);
     }
-    refreshRow(primaryKey) {
+    refreshRowByPrimaryKey(primaryKey) {
         const rowNode = this.getRowNodeForPrimaryKey(primaryKey);
+        this.refreshRowNode(rowNode);
+    }
+    refreshRowNode(rowNode) {
         this.adaptable.redrawRow(rowNode);
     }
     areCellsEditable(gridCells) {
@@ -335,5 +354,8 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     getGridContainerElement() {
         return this.adaptable.getAgGridContainerElement();
     }
+    showGridInfoPopup() {
+        this.showModulePopup(ModuleConstants.GridInfoModuleId);
+    }
 }
 exports.GridApiImpl = GridApiImpl;

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

@@ -2,8 +2,6 @@ import { ApiBase } from './ApiBase';
 import { InternalApi } from '../InternalApi';
 import { UIConfirmation } from '../../Utilities/Interface/MessagePopups';
 import { SystemState } from '../../PredefinedConfig/SystemState';
-import { ChartData } from '../../PredefinedConfig/ChartState';
-import { ChartVisibility } from '../../PredefinedConfig/Common/ChartEnums';
 import { Action } from 'redux';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
@@ -25,7 +23,7 @@ import { IDataService } from '../../Utilities/Services/Interface/IDataService';
 import { IEntitlementService } from '../../Utilities/Services/Interface/IEntitlementService';
 import { IQueryLanguageService } from '../../Utilities/Services/Interface/IQueryLanguageService';
 import { IAlertService } from '../../Utilities/Services/Interface/IAlertService';
-import { AdaptableFlashingAlert } from '../../PredefinedConfig/Common/AdaptableFlashingAlert';
+import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
 import { ITeamSharingService } from '../../Utilities/Services/Interface/ITeamSharingService';
 import { ColumnValuesComparer } from '../../AdaptableOptions/GeneralOptions';
 import { ButtonStyle } from '../../PredefinedConfig/Common/ButtonStyle';
@@ -37,15 +35,13 @@ import { AdaptableFrameworkComponent } from '../../AdaptableOptions/AdaptableFra
 import { IMetamodelService } from '../../Utilities/Services/Interface/IMetamodelService';
 export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getSystemState(): SystemState;
-    setChartData(chartData: ChartData): void;
     getAdaptableFormFromAlertForm(alertForm: string | AlertButtonForm, context: any, defaultMessageType?: AdaptableMessageType): (Omit<AdaptableForm<AlertButtonContext>, 'buttons'> & {
         buttons?: (Omit<AdaptableButton<AlertButtonContext>, 'buttonStyle'> & {
             buttonStyle?: ButtonStyle;
         })[];
     }) | undefined;
-    setChartVisibility(chartVisbility: ChartVisibility): void;
     getAdaptableAlerts(): AdaptableAlert[];
-    getAdaptableFlashingAlertFor(primaryKey: string, columnId?: string): AdaptableFlashingAlert | null;
+    getAdaptableFlashingCellFor(primaryKey: string, columnId?: string): AdaptableFlashingCell | null;
     addSystemStatusMessageInfo(systemStatusMessageInfo: SystemStatusMessageInfo): void;
     getSystemStatusMessageInfos(): SystemStatusMessageInfo[];
     showPopupConfirmation(confirmation: UIConfirmation): void;

package/src/Api/Implementation/InternalApiImpl.js

@@ -8,6 +8,7 @@ const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
 const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/LayoutRedux"));
 const DashboardRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/DashboardRedux"));
+const AlertRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/AlertRedux"));
 const DeadRedux = tslib_1.__importStar(require("../../Redux/DeadRedux"));
 const ApiBase_1 = require("./ApiBase");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
@@ -19,9 +20,6 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     getSystemState() {
         return this.getAdaptableState().System;
     }
-    setChartData(chartData) {
-        this.dispatchAction(SystemRedux.ChartSetChartData(chartData));
-    }
     getAdaptableFormFromAlertForm(alertForm, context, defaultMessageType) {
         var _a, _b;
         const api = this.adaptable.api;
@@ -62,15 +60,12 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         }
         return adaptableAlertForm;
     }
-    setChartVisibility(chartVisbility) {
-        this.dispatchAction(SystemRedux.ChartSetChartVisibility(chartVisbility));
-    }
     getAdaptableAlerts() {
         return this.getSystemState().AdaptableAlerts;
     }
-    getAdaptableFlashingAlertFor(primaryKey, columnId) {
+    getAdaptableFlashingCellFor(primaryKey, columnId) {
         var _a;
-        const { AdaptableFlashingAlerts, AdaptableFlashingAlertsMap } = this.getSystemState();
+        const { AdaptableFlashingCells: AdaptableFlashingAlerts, AdaptableFlashingCellsMap: AdaptableFlashingAlertsMap, } = this.getSystemState();
         const forPrimaryKey = (_a = AdaptableFlashingAlerts[primaryKey]) !== null && _a !== void 0 ? _a : {};
         const toFlashingAlert = (uuid) => { var _a; return uuid ? (_a = AdaptableFlashingAlertsMap[uuid]) !== null && _a !== void 0 ? _a : null : null; };
         if (!columnId) {
@@ -206,7 +201,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         return this.adaptable;
     }
     getAgGridInstance() {
-        return this.adaptable.adaptableOptions.vendorGrid;
+        return this.adaptable.adaptableOptions.gridOptions;
     }
     getPredefinedConfig() {
         return this.adaptable.adaptableOptions.predefinedConfig;
@@ -259,7 +254,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         return this.adaptable.buildStandaloneColumnHeader(column);
     }
     clearFlashingCellState() {
-        this.dispatchAction(DeadRedux.FlashingCellClear());
+        this.dispatchAction(AlertRedux.AlertClearFlashingCells());
     }
     clearUpdatedRowState() {
         this.dispatchAction(DeadRedux.UpdatedRowClear());

package/src/Api/Implementation/LayoutApiImpl.js

@@ -211,6 +211,18 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
                 let defaultLayout = ObjectFactory_1.default.CreateEmptyLayout({
                     Name: GeneralConstants_1.DEFAULT_LAYOUT,
                     Columns: defaultLayoutColumns.map((c) => c.columnId),
+                    AggregationColumns: defaultLayoutColumns.reduce((acc, col) => {
+                        if (col.aggregationFunction) {
+                            acc[col.columnId] = col.aggregationFunction;
+                        }
+                        return acc;
+                    }, {}),
+                    PinnedColumnsMap: defaultLayoutColumns.reduce((acc, col) => {
+                        if (col.pinned) {
+                            acc[col.columnId] = col.pinned;
+                        }
+                        return acc;
+                    }, {}),
                 }, gridState.Columns);
                 this.saveLayout(defaultLayout);
                 return defaultLayout;

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

@@ -4,7 +4,6 @@ import { PluginsState } from '../../Redux/ActionsReducers/PluginsRedux';
 import { IPushPullApi } from '../IPushPullApi';
 import { Glue42Api } from '../Glue42Api';
 import { OpenFinApi } from '../OpenFinApi';
-import { ChartApi } from '../ChartApi';
 import { FinanceApi } from '../FinanceApi';
 export declare class PluginsApiImpl extends ApiBase implements PluginsApi {
     getPluginsState(): PluginsState;
@@ -15,6 +14,5 @@ export declare class PluginsApiImpl extends ApiBase implements PluginsApi {
     getipushpullPluginApi(): IPushPullApi;
     getGlue42PluginApi(): Glue42Api;
     getOpenFinPluginApi(): OpenFinApi;
-    getChartsPluginApi(): ChartApi;
     getFinancePluginApi(): FinanceApi;
 }

package/src/Api/Implementation/PluginsApiImpl.js

@@ -32,9 +32,6 @@ class PluginsApiImpl extends ApiBase_1.ApiBase {
             if (pluginId === 'openfin') {
                 return api;
             }
-            if (pluginId === 'charts') {
-                return api;
-            }
             return api;
         }
         catch (ex) {
@@ -50,9 +47,6 @@ class PluginsApiImpl extends ApiBase_1.ApiBase {
     getOpenFinPluginApi() {
         return this.getPluginApi('openfin');
     }
-    getChartsPluginApi() {
-        return this.getPluginApi('charts');
-    }
     getFinancePluginApi() {
         return this.getPluginApi('finance');
     }

package/src/Api/Implementation/PlusMinusApiImpl.js

@@ -27,7 +27,7 @@ class PlusMinusApiImpl extends ApiBase_1.ApiBase {
         return this.getAllPlusMinus().filter((plusMinusNudge) => plusMinusNudge.IsSuspended);
     }
     runPlusMinusNudge(plusMinusNudge, cellsToUpdate, direction) {
-        let plusMinusModule = (this.adaptable.modules.get(ModuleConstants.PlusMinusModuleId));
+        let plusMinusModule = (this.adaptable.adaptableModules.get(ModuleConstants.PlusMinusModuleId));
         plusMinusModule.applyPlusMinus([plusMinusNudge], cellsToUpdate, direction);
     }
     applyPlusMinus(gridCells) {

package/src/Api/Implementation/QueryApiImpl.js

@@ -64,7 +64,7 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
     }
     getNamedQueryModuleReferences(namedQueryName) {
         const references = [];
-        this.adaptable.modules.forEach((module) => {
+        this.adaptable.adaptableModules.forEach((module) => {
             if (module
                 .getModuleNamedQueryReferences()
                 .some((moduleReference) => moduleReference === namedQueryName)) {

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -165,14 +165,14 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
     applySchedule(schedule, scheduleType) {
         if (scheduleType == 'Reminder') {
             const reminderSchedule = schedule;
-            const reminder = reminderSchedule.Reminder;
+            //   const reminder: Reminder = reminderSchedule.Reminder;
             const alert = {
-                header: reminder.Header,
-                message: reminder.Message,
+                header: reminderSchedule.Header,
+                message: reminderSchedule.Message,
                 alertDefinition: {
-                    MessageType: reminder.MessageType,
+                    MessageType: reminderSchedule.MessageType,
                     AlertProperties: {
-                        DisplayNotification: reminder.DisplayNotification,
+                        DisplayNotification: reminderSchedule.DisplayNotification,
                     },
                     Rule: undefined,
                     Scope: undefined,

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

@@ -2,7 +2,7 @@ import { ApiBase } from './ApiBase';
 import { SmartEditApi } from '../SmartEditApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 export declare class SmartEditApiImpl extends ApiBase implements SmartEditApi {
-    setSmartEditOperation(mathOperation: 'Add' | 'Subtract' | 'Multiply' | 'Divide' | 'Replace'): void;
+    setSmartEditOperation(mathOperation: 'Add' | 'Subtract' | 'Multiply' | 'Divide'): void;
     getSmartEditOperation(): string;
     setSmartEditValue(smartEditValue: number): void;
     getSmartEditValue(): number;

package/src/Api/Implementation/SystemStatusApiImpl.js

@@ -18,7 +18,7 @@ class SystemStatusApiImpl extends ApiBase_1.ApiBase {
         this.adaptable.api.internalApi.addSystemStatusMessageInfo(systemStatusMessageInfo);
         // publish the event
         this.fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo);
-        if (this.getNotificationsOptions().showSystemStatusMessageAsAlert) {
+        if (this.getNotificationsOptions().showSystemStatusMessageNotifications) {
             let fullMessage = statusMessage;
             if (StringExtensions_1.default.IsNotNullOrEmpty(statusFurtherInformation)) {
                 fullMessage += '\n' + statusFurtherInformation;

package/src/Api/Implementation/ToolPanelApiImpl.js

@@ -13,13 +13,13 @@ class ToolPanelApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.ToolPanelModuleId, popupParams);
     }
     openAdapTableToolPanel() {
-        let gridOptions = this.getOptions().vendorGrid;
+        let gridOptions = this.getOptions().gridOptions;
         if (gridOptions) {
             gridOptions.api.openToolPanel('adaptable');
         }
     }
     closeAdapTableToolPanel() {
-        let gridOptions = this.getOptions().vendorGrid;
+        let gridOptions = this.getOptions().gridOptions;
         if (gridOptions) {
             gridOptions.api.closeToolPanel();
         }

package/src/Api/InternalApi.d.ts

@@ -1,7 +1,5 @@
 import { UIConfirmation } from '../Utilities/Interface/MessagePopups';
 import { SystemState } from '../PredefinedConfig/SystemState';
-import { ChartData } from '../PredefinedConfig/ChartState';
-import { ChartVisibility } from '../PredefinedConfig/Common/ChartEnums';
 import { Action } from 'redux';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
@@ -22,7 +20,7 @@ import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
 import { AdaptableMessageType, DataChangedInfo, SystemStatusMessageInfo } from '../types';
 import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
-import { AdaptableFlashingAlert } from '../PredefinedConfig/Common/AdaptableFlashingAlert';
+import { AdaptableFlashingCell } from '../PredefinedConfig/Common/AdaptableFlashingCell';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
 import { IAlertService } from '../Utilities/Services/Interface/IAlertService';
 import { AdaptableState } from '../PredefinedConfig/AdaptableState';
@@ -46,11 +44,9 @@ export interface InternalApi {
             buttonStyle?: ButtonStyle;
         })[];
     };
-    setChartData(chartData: ChartData): void;
-    setChartVisibility(chartVisbility: ChartVisibility): void;
     getAdaptableAlerts(): AdaptableAlert[];
     showPopupConfirmation(confirmation: UIConfirmation): void;
-    getAdaptableFlashingAlertFor(primaryKey: string, columnId?: string): AdaptableFlashingAlert | null;
+    getAdaptableFlashingCellFor(primaryKey: string, columnId?: string): AdaptableFlashingCell | null;
     addSystemStatusMessageInfo(systemStatusMessageInfo: SystemStatusMessageInfo): void;
     getSystemStatusMessageInfos(): SystemStatusMessageInfo[];
     showLoadingScreen(): void;
@@ -112,8 +108,8 @@ export interface InternalApi {
     dispatchReduxAction(action: Action): void;
     waitForTeamSharingImportEnd(): Promise<boolean>;
     getUserDefinedHeaderName(columnId: string): string;
-    createFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
-    destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar'): void;
+    createFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar' | string): void;
+    destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar' | string): void;
     initializeDataChangeHistory(): void;
     isTextComparisonCaseSensitive(): boolean;
     executeWithProgressIndicator(label: string, executeFn: () => unknown): void;

package/src/Api/PluginsApi.d.ts

@@ -2,7 +2,6 @@ import { PluginsState } from '../Redux/ActionsReducers/PluginsRedux';
 import { IPushPullApi } from './IPushPullApi';
 import { Glue42Api } from './Glue42Api';
 import { OpenFinApi } from './OpenFinApi';
-import { ChartApi } from './ChartApi';
 import { FinanceApi } from './FinanceApi';
 /**
  * API methods dealing with AdapTable plugins
@@ -15,6 +14,5 @@ export interface PluginsApi {
     getipushpullPluginApi(): IPushPullApi;
     getGlue42PluginApi(): Glue42Api;
     getOpenFinPluginApi(): OpenFinApi;
-    getChartsPluginApi(): ChartApi;
     getFinancePluginApi(): FinanceApi;
 }

package/src/Api/SmartEditApi.d.ts

@@ -4,16 +4,16 @@ import { GridCell } from '../PredefinedConfig/Selection/GridCell';
  **/
 export interface SmartEditApi {
     /**
-     * Sets operation to use in Smart Edit
+     * Sets Smart Edit operation: ('Add','Subtract','Multiply','Divide'
      * @param operation operation to run
      */
-    setSmartEditOperation(operation: 'Add' | 'Subtract' | 'Multiply' | 'Divide' | 'Replace'): void;
+    setSmartEditOperation(operation: 'Add' | 'Subtract' | 'Multiply' | 'Divide'): void;
     /**
-     * Gets current Smart Edit Operation ('Add','Subtract','Multiply','Divide' or 'Replace')
+     * Gets current Smart Edit Operation
      */
     getSmartEditOperation(): string;
     /**
-     * Sets Smart Edit Value (e.g. to multiply by 10 then smartEditValue is 10)
+     * Sets Smart Edit Value
      * @param smartEditValue the value to use in Smart Edit Operation
      */
     setSmartEditValue(smartEditValue: number): void;

package/src/PredefinedConfig/AdaptableState.d.ts

@@ -3,7 +3,6 @@ import { GridState } from './GridState';
 import { SystemState } from './SystemState';
 import { AlertState } from './AlertState';
 import { CalculatedColumnState } from './CalculatedColumnState';
-import { ChartState } from './ChartState';
 import { ConditionalStyleState } from './ConditionalStyleState';
 import { CustomSortState } from './CustomSortState';
 import { DashboardState } from './DashboardState';
@@ -20,10 +19,10 @@ import { TeamSharingState } from './TeamSharingState';
 import { ThemeState } from './ThemeState';
 import { ConfigState } from './ConfigState';
 import { FilterState } from './FilterState';
-import { SparklineColumnState } from './SparklineColumnState';
 import { ApplicationState } from './ApplicationState';
 import { ToolPanelState } from './ToolPanelState';
 import { QueryState } from './QueryState';
+import { FlashingCellState } from './FlashingCellState';
 /**
  * The main state object that Adaptable persists
  */
@@ -36,10 +35,9 @@ export interface AdaptableState {
         [key: string]: any;
     };
     Application: ApplicationState;
-    SparklineColumn: SparklineColumnState;
     Alert: AlertState;
+    FlashingCell: FlashingCellState;
     CalculatedColumn: CalculatedColumnState;
-    Chart: ChartState;
     ConditionalStyle: ConditionalStyleState;
     CustomSort: CustomSortState;
     Dashboard: DashboardState;

package/src/PredefinedConfig/AlertState.d.ts

@@ -20,16 +20,12 @@ export interface AlertState extends ConfigState {
      * @defaultValue  null
      */
     AlertDefinitions?: AlertDefinition[];
-    /**
-     * Flashing Alert Definitions - will colour cells/rows when rule is met
-     * @defaultValue  null
-     */
-    FlashingAlertDefinitions?: FlashingAlertDefinition[];
+    FlashingAlertDefinitions?: any[];
 }
 /**
- * Base object used in all Alert Definitions - contains `Scope` and a `Rule`
+ * The Alert Definition object used in the Alert function
  */
-export interface BaseAlertDefinition extends SuspendableObject {
+export interface AlertDefinition extends SuspendableObject {
     /**
      * Where Alert can be triggered: one, some or all columns or DataTypes
      */
@@ -38,46 +34,6 @@ export interface BaseAlertDefinition extends SuspendableObject {
      * When Alert should be triggered
      */
     Rule: AlertRule;
-}
-/**
- * Properties to use in Flashing Alerts
- */
-export interface FlashingAlertProperties {
-    /**
-     * Should a cell or whole row flash
-     * @defaultValue  'cell'
-     */
-    FlashTarget?: 'row' | 'cell';
-    /**
-     * Style for 'Down' value changes
-     *  @defaultValue  Red BackColour
-     */
-    DownChangeStyle?: AdaptableStyle;
-    /**
-     * Style for 'Up' value changes
-     * @defaultValue  Green BackColour
-     */
-    UpChangeStyle?: AdaptableStyle;
-    /**
-     * Style for 'Neutral' value changes
-     * @defaultValue  Gray BackColour
-     */
-    NeutralChangeStyle?: AdaptableStyle;
-    /**
-     * Duration of Flash - can be number (in ms) or 'always'
-     * @defaultValue 500ms
-     */
-    FlashDuration?: number | 'always';
-}
-/**
- * The Flashing Alert Definition object used in the Alert function
- */
-export interface FlashingAlertDefinition extends BaseAlertDefinition, FlashingAlertProperties {
-}
-/**
- * The Alert Definition object used in the Alert function
- */
-export interface AlertDefinition extends BaseAlertDefinition {
     /**
      * Type of Alert: 'Info', 'Success', 'Warning', 'Error'; influences Alert colour, icon and logging
      */
@@ -98,6 +54,9 @@ export interface AlertDefinition extends BaseAlertDefinition {
 export declare type AlertButtonForm = Omit<AdaptableForm<AlertButtonContext>, 'title' | 'buttons' | 'fields' | 'description'> & {
     Buttons?: AlertButton<AlertButtonContext>[];
 };
+export interface AlertDefinitionPredicate extends AdaptablePredicate {
+    PredicateId: TypeHint<string, SystemAlertPredicateId>;
+}
 /**
  * The Alert Rule defined by either an AdaptablePredicate or an AdaptableQuery
  */
@@ -126,9 +85,6 @@ export interface AlertButton<AlertButtonContext> extends Omit<AdaptableButton<Bu
      */
     Tooltip?: string;
 }
-export interface AlertDefinitionPredicate extends AdaptablePredicate {
-    PredicateId: TypeHint<string, SystemAlertPredicateId>;
-}
 /**
  *
  * Additional properties that specify how a particular Alert will ALWAYS behave
@@ -141,13 +97,17 @@ export interface AlertProperties {
     /**
      * Colours updated cell using `MessageType` property of triggering Alert Definition
      */
-    HighlightCell?: boolean;
+    HighlightCell?: boolean | AdaptableStyle;
+    /**
+     * Colours updated cell using `MessageType` property of triggering Alert Definition
+     */
+    HighlightRow?: boolean | AdaptableStyle;
     /**
      * Grid will 'jump' to the cell which triggered the Alert
      */
     JumpToCell?: boolean;
     /**
-     * Shows Alert text in the div specificed in `AlertDisplayDiv` property of Alert State.
+     * Shows Alert text in the div specificed in `alertContainer` property of Container Options
      */
     ShowInDiv?: boolean;
     /**
@@ -160,5 +120,4 @@ export interface AlertProperties {
      */
     PreventEdit?: boolean;
 }
-declare type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'PercentChange' | 'PrimaryKeyDuplicate' | 'ExistingValuesOnly' | 'NoDuplicateValues' | 'IsNumeric' | 'Any';
-export {};
+export declare type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'PercentChange' | 'PrimaryKeyDuplicate' | 'ExistingValuesOnly' | 'NoDuplicateValues' | 'IsNumeric' | 'Any';

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

@@ -101,6 +101,10 @@ export interface AdaptableColumn extends AdaptableColumnBase {
      * Is Column pinned or locked into position
      */
     isFixed: boolean;
+    /**
+     * The pinned position of the column
+     */
+    pinned: 'left' | 'right' | false;
     /**
      * Is it a Sparkline Column
      */

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

@@ -14,9 +14,9 @@ valueB: any,
 /**
  * First Row Node to compare
  */
-nodeA: RowNode, 
+nodeA?: RowNode, 
 /**
  * Second Row Node to compare
  */
-nodeB: RowNode) => number;
+nodeB?: RowNode) => number;
 export declare type AdaptableNodeComparerFunction = (nodeA: RowNode, nodeB: RowNode) => number;

package/src/PredefinedConfig/Common/{AdaptableFlashingAlert.d.ts → AdaptableFlashingCell.d.ts}

@@ -1,16 +1,16 @@
 import { AdaptableObject } from './AdaptableObject';
 import { DataChangedInfo } from '../../types';
-import { FlashingAlertDefinition } from '../AlertState';
+import { FlashingCellDefinition } from '../../../types';
 /**
  * Defines an Alert fired by AdapTable
  */
-export interface AdaptableFlashingAlert extends AdaptableObject {
+export interface AdaptableFlashingCell extends AdaptableObject {
     /**
-     * Rule that caused the FlashingAlert to fire
+     * Rule that caused the FlashingCell to fire
      */
-    flashingAlertDefinition: FlashingAlertDefinition;
+    flashingCellDefinition: FlashingCellDefinition;
     /**
-     *  Data change which triggered the FlashingAlert
+     *  Data change which triggered the FlashingCell
      */
     dataChangedInfo?: DataChangedInfo;
     /**
@@ -20,7 +20,7 @@ export interface AdaptableFlashingAlert extends AdaptableObject {
     /**
      * What will flash (e.g. Cell, Row)
      */
-    flashTarget: FlashingAlertDefinition['FlashTarget'];
+    flashTarget: FlashingCellDefinition['FlashTarget'];
     /**
      * Column Ids that are flashing
      */