@adaptabletools/adaptable 11.1.6 → 11.1.9

package/index.css

@@ -2297,6 +2297,12 @@ template {
 :root {
   --ab-cmp-dashboard-module-selector-background: var(--ab-color-defaultbackground); }
 
+:root {
+  --ab-cmp-adaptable-statusbar-sub-panel__padding: var(--ab-space-1) var(--ab-space-2);
+  --ab-cmp-adaptable-statusbar-sub-panel-icon__background-color-hover: var(--ab-color-primary);
+  --ab-cmp-adaptable-statusbar__color: var(--ab-color-text-on-primary);
+  --ab-cmp-adaptable-statusbar__font-weight: 400; }
+
 .ab-Radio-input:focus + svg rect {
   stroke: var(--ab-color-accent);
   stroke-width: 2; }
@@ -3685,6 +3691,20 @@ html.ab--theme-dark .ab-ListBoxFilterForm--aggrid-style {
 .ab-Adaptable-Object-List__Item__label:hover .ab-Adaptable-Object-List__Item__edit-property {
         visibility: visible; }
 
+.ab-StatusBar__SubPanel {
+  padding: var(--ab-cmp-adaptable-statusbar-sub-panel__padding);
+  border: 0;
+  background: none;
+  font-weight: 400; }
+
+.ab-StatusBar__SubPanel,
+  .ab-StatusBar__SubPanel .ab-SimpleButton {
+    color: var(--ab-cmp-adaptable-statusbar__color); }
+
+button.ab-StatusBar__SubPanel:hover {
+  background-color: var(--ab-cmp-adaptable-statusbar-sub-panel-icon__background-color-hover);
+  cursor: pointer; }
+
 .ab-alert--error {
   background: var(--ab-color-error); }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "11.1.6",
+  "version": "11.1.9",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1650312974062;
+declare const _default: 1651046276381;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1650312974062;
+exports.default = 1651046276381;

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -1,4 +1,4 @@
-import { Column, RowNode } from '@ag-grid-community/all-modules';
+import { Column, GridOptions, RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../PredefinedConfig/Common/ColumnSort';
@@ -160,6 +160,7 @@ export interface IAdaptable {
     getRowNodesForPrimaryKeys(primaryKeyValues: any[]): RowNode[];
     getRowNodeForPrimaryKey(primaryKeyValue: any): RowNode;
     getRowNodeByIndex(index: number): RowNode;
+    getAgGridStatusPanels(): GridOptions['statusBar']['statusPanels'];
     forPlugins(callback: (plugin: AdaptablePlugin) => any): void;
     lookupPlugins(propertyName: string, ...args: any): any;
     getPluginProperty(pluginId: string, propertyName: string, ...args: any): any;

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -178,7 +178,7 @@ export interface AdaptableOptions {
      */
     settingsPanelOptions?: SettingsPanelOptions;
     /**
-     * Options related to state hydration / dehydration - allows users to intercept state persistence and state loading and change default behavior of saving to local storage
+     * Options related to state hydration / dehydration - allows users to intercept state persistence and state loading and change default behaviour of saving to local storage
      */
     stateOptions?: StateOptions;
     /**

package/src/AdaptableOptions/AlertOptions.d.ts

@@ -15,12 +15,19 @@ export interface AlertOptions {
      */
     maxAlertsInStore?: number;
     /**
-     * How long (in ms) a cell will be highlighted
+     * How long (in ms) a Cell will be highlighted when an Alert fires
      *
-     * @defaultValue 3000
+     * @defaultValue 2000
      * @gridInfoItem
      */
     cellHighlightDuration?: number;
+    /**
+     * How long (in ms) a Row will be highlighted when an Alert Fires
+     *
+     * @defaultValue 4000
+     * @gridInfoItem
+     */
+    rowHighlightDuration?: number;
     /**
      * onClick Handlers for Alert Buttons (defined in Alert State)
      */

package/src/AdaptableOptions/FinancePluginOptions.d.ts

@@ -1,11 +1,10 @@
-import { RowNode } from '@ag-grid-community/all-modules';
-import { GridCell } from '../../types';
+import { ContextMenuContext } from '../../types';
 /**
  * Options required for when using the Finance plugin
  */
 export interface FinancePluginOptions {
     /**
-     * Columns to be defined as FDC3
+     * Columns to be defined as FDC3-related
      */
     fdc3Columns?: {
         /**
@@ -47,6 +46,9 @@ export interface WeightedAverageColumn {
      */
     weightedColumnId: string;
 }
+/**
+ * An FDC3 Column - will raise FDC3 intents and broadcast FDC3 messages
+ */
 export interface FDC3Column {
     /**
      * Id of Column defined as FDC3
@@ -55,7 +57,7 @@ export interface FDC3Column {
     /**
      * If provided, will supply `name` property in FDC3 message
      */
-    name?: string;
+    nameColumnId?: string;
     /**
      * Should Column display a 'Broadcast' context menu item
      */
@@ -63,7 +65,7 @@ export interface FDC3Column {
     /**
      * Label to display in Broadcast Context Menu Item
      */
-    broadcastContextMenuLabel?: string | ((gridCell: GridCell, node: RowNode) => string);
+    broadcastContextMenuLabel?: string | ((broadcastFDC3MessageContext: ContextMenuContext) => string);
     /**
      * FDC3 intents which the Column can raise
      */
@@ -71,7 +73,7 @@ export interface FDC3Column {
     /**
      * Label to display in Intent Context Menu Item
      */
-    intentContextMenuLabel?: string | ((intent: FDC3Intent, gridCell: GridCell, node: RowNode) => string);
+    intentContextMenuLabel?: string | ((raiseFDC3IntentContext: RaiseFDC3IntentContext) => string);
 }
 /**
  * A Column which will be defined as an FDC3 Instrument
@@ -110,11 +112,17 @@ export interface InstrumentColumn extends FDC3Column {
      */
     figiColumnId?: string;
     /**
-     * FDC3 Intents available to the Column
+     * FDC3 Intents invoked by Column; can be: `ViewChart` `ViewQuote` `ViewNews` `ViewAnalysis` `ViewInstrument`
      */
     intents?: InstrumentIntents;
 }
+/**
+ * All available Instrument Intents
+ */
 export declare type InstrumentIntents = InstrumentIntent[];
+/**
+ * FDC3 Intents available to an Instrument Column
+ */
 export declare type InstrumentIntent = 'ViewChart' | 'ViewQuote' | 'ViewNews' | 'ViewAnalysis' | 'ViewInstrument';
 /**
  *  A (Numeric) Column which will be defined as an FDC3 Position
@@ -125,11 +133,17 @@ export interface PositionColumn extends FDC3Column {
      */
     instrumentColumnId: string;
     /**
-     * FDC3 Intents available to the Column
+     * FDC3 Intents invoked by Column; can be: `ViewChart` `ViewNews` `ViewAnalysis`
      */
     intents?: PositionIntents;
 }
+/**
+ * All available Position Intents
+ */
 export declare type PositionIntents = PositionIntent[];
+/**
+ * FDC3 Intents available to a Position Column
+ */
 export declare type PositionIntent = 'ViewChart' | 'ViewNews' | 'ViewAnalysis';
 /**
  *  A (String) Column which will be defined as an FDC3 Contact
@@ -143,13 +157,19 @@ export interface ContactColumn extends FDC3Column {
     /**
      * Column which holds an FDS_ID value a Contact
      */
-    fds_IdColumnId?: string;
+    fds_idColumnId?: string;
     /**
-     * FDC3 Intents available to the Column
+     * FDC3 Intents invoked by Column; can be: `StartCall` `StartChat` `ViewContact`
      */
     intents?: ContactIntents;
 }
+/**
+ * All available Contact Intents
+ */
 export declare type ContactIntents = ContactIntent[];
+/**
+ * FDC3 Intents available to a Contact Column
+ */
 export declare type ContactIntent = 'StartCall' | 'StartChat' | 'ViewContact';
 /**
  *  A (String) Column which will be defined as an FDC3 Organization
@@ -162,17 +182,20 @@ export interface OrganizationColumn extends FDC3Column {
     /**
      * Column which contains a PermId
      */
-    permIdColumnId?: string;
+    permidColumnId?: string;
     /**
      * Column which contains an FDS_ID
      */
-    fds_IdColumnId?: string;
+    fds_idColumnId?: string;
     /**
-     * FDC3 Intents available to the Column
+     * FDC3 Intents invoked by Column; can be: `ViewNews` `ViewAnalysis`
      */
     intents?: OrganizationIntents;
 }
 export declare type OrganizationIntents = OrganizationIntent[];
+/**
+ * FDC3 Intents available to an Organization Column
+ */
 export declare type OrganizationIntent = 'ViewNews' | 'ViewAnalysis';
 /**
  *  A (String) Column which will be defined as an FDC3 Country
@@ -181,16 +204,34 @@ export interface CountryColumn extends FDC3Column {
     /**
      * Column which contains the ISOALPHA2 Standard
      */
-    isoAlpha2ColumnId?: string;
+    isoalpha2ColumnId?: string;
     /**
      * Column which contains the ISOALPHA3 Standard
      */
-    isoAlpha3ColumnId?: string;
+    isoalpha3ColumnId?: string;
     /**
-     * FDC3 Intents available to the Column
+     * FDC3 Intents invoked by Column; can be: `ViewChart`
      */
     intents?: CountryIntents;
 }
+/**
+ * All available Country Intents
+ */
 export declare type CountryIntents = CountryIntent[];
+/**
+ * FDC3 Intents available to a Country Column
+ */
 export declare type CountryIntent = 'ViewChart';
-export declare type FDC3Intent = 'ViewChart' | 'ViewQuote' | 'ViewNews' | 'ViewAnalysis' | 'ViewInstrument' | 'StartCall' | 'StartChat' | 'ViewContact';
+/**
+ * Full list of FDC3 Intents available - each FDC3 Column can use a subset
+ */
+export declare type FDC3Intent = 'StartCall' | 'StartChat' | 'ViewAnalysis' | 'ViewChart' | 'ViewContact' | 'ViewInstrument' | 'ViewNews' | 'ViewQuote';
+/**
+ * Context passed into Raise FDC3 Intent functions (e.g. get label)
+ */
+export interface RaiseFDC3IntentContext extends ContextMenuContext {
+    /**
+     * FDC3 Intent that was raised
+     */
+    intent: FDC3Intent;
+}

package/src/AdaptableOptions/GeneralOptions.d.ts

@@ -62,6 +62,13 @@ export interface GeneralOptions {
      * @gridInfoItem
      */
     currentCalendar?: string;
+    /**
+     * English variant to use in UI labels
+     *
+     * @defaultValue 'GB'
+     * @gridInfoItem
+     */
+    englishVariant?: 'GB' | 'US';
     /**
      * Custom Cell Summary Operations to add to shipped set
      */

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -88,6 +88,13 @@ export interface UserInterfaceOptions {
      * @defaultValue ['GridSummary', 'AdaptableOptions', 'ColumnInfo']
      */
     gridInfoSections?: GridInfoSections;
+    /**
+     * Displays the AdapTable version in Grid Info section of Settings Panel
+     *
+     * @defaultValue true
+     * @gridInfoItem
+     */
+    showAdapTableVersion?: boolean;
 }
 export interface BasePermittedValues {
     /**

package/src/Api/AdaptableApi.d.ts

@@ -36,6 +36,7 @@ import { DataChangeHistoryApi } from './DataChangeHistoryApi';
 import { FlashingCellApi } from './FlashingCellApi';
 import { ChartingApi } from './ChartingApi';
 import { SettingsPanelApi } from './SettingsPanelApi';
+import { StatusBarApi } from './StatusBarApi';
 /**
  *
  * The `AdaptableApi` provides developers with run-time access to AdapTable.
@@ -191,6 +192,10 @@ export interface AdaptableApi {
      * Provides run-time access to Charting Module and state
      */
     chartingApi: ChartingApi;
+    /**
+     * Provides run-time access to the AdapTable Status Bar
+     */
+    statusBarApi: StatusBarApi;
     /**
      * Api methods used *internally* within AdapTable.
      * @internal

package/src/Api/CellSummaryApi.d.ts

@@ -19,4 +19,12 @@ export interface CellSummaryApi {
      * Opens Settings Panel with Cell Summary section selected and visible
      */
     showCellSummaryPopup(): void;
+    /**
+     * Retrieves the value of the current selected operation
+     */
+    getCurrentCellSummaryOperationValue(): number;
+    /**
+     * Retrieves the value of the current selected operation
+     */
+    getCellSummaryOperationValue(operation: CellSummaryOperation | string): any;
 }

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

@@ -37,6 +37,7 @@ import { PredicateApi } from '../PredicateApi';
 import { DataChangeHistoryApi } from '../DataChangeHistoryApi';
 import { FlashingCellApi } from '../FlashingCellApi';
 import { ChartingApi } from '../ChartingApi';
+import { StatusBarApi } from '../StatusBarApi';
 export declare class AdaptableApiImpl implements AdaptableApi {
     protected adaptable: IAdaptable;
     applicationApi: ApplicationApi;
@@ -77,6 +78,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     scopeApi: ScopeApi;
     dataChangeHistoryApi: DataChangeHistoryApi;
     chartingApi: ChartingApi;
+    statusBarApi: StatusBarApi;
     constructor(adaptable: IAdaptable);
     destroy(config?: {
         unmount: boolean;

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableApiImpl = void 0;
 const AlertApiImpl_1 = require("./AlertApiImpl");
+const StatusBarApiImpl_1 = require("./StatusBarApiImpl");
 const PredicateApiImpl_1 = require("./PredicateApiImpl");
 const PluginsApiImpl_1 = require("./PluginsApiImpl");
 const BulkUpdateApiImpl_1 = require("./BulkUpdateApiImpl");
@@ -80,6 +81,7 @@ class AdaptableApiImpl {
         this.scopeApi = new ScopeApiImpl_1.ScopeApiImpl(adaptable);
         this.dataChangeHistoryApi = new DataChangeHistoryApiImpl_1.DataChangeHistoryApiImpl(adaptable);
         this.chartingApi = new ChartingApiImpl_1.ChartingApiImpl(adaptable);
+        this.statusBarApi = new StatusBarApiImpl_1.StatusBarApiImpl(adaptable);
         this.internalApi = new InternalApiImpl_1.InternalApiImpl(adaptable);
     }
     destroy(config) {

package/src/Api/Implementation/AlertApiImpl.js

@@ -105,18 +105,27 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                 timeout: this.getAlertOptions().cellHighlightDuration,
             });
         }
+        if (actionName === 'highlight-row' && cellDataChangedInfo) {
+            const rowsHighlightInfo = {
+                primaryKeyValues: [cellDataChangedInfo.primaryKeyValue],
+                highlightStyle: {
+                    BackColor: getBackgroundColor(alertDefinition),
+                },
+                timeout: this.getAlertOptions().rowHighlightDuration,
+            };
+            this.adaptable.api.gridApi.highlightRows(rowsHighlightInfo);
+        }
         if (actionName === 'highlight-row' &&
             gridDataChangedInfo &&
             // no sense to highlight a deleted(non-existing) row
             (gridDataChangedInfo === null || gridDataChangedInfo === void 0 ? void 0 : gridDataChangedInfo.rowTrigger) !== 'Delete') {
-            const backgroundColor = getBackgroundColor(alertDefinition);
             const primaryKeyValues = this.adaptable.api.gridApi.getPrimaryKeyValuesForRowNodes(gridDataChangedInfo.rowNodes);
             const rowsHighlightInfo = {
                 primaryKeyValues,
                 highlightStyle: {
-                    BackColor: backgroundColor,
+                    BackColor: getBackgroundColor(alertDefinition),
                 },
-                timeout: this.getAlertOptions().cellHighlightDuration,
+                timeout: this.getAlertOptions().rowHighlightDuration,
             };
             this.adaptable.api.gridApi.highlightRows(rowsHighlightInfo);
         }
@@ -200,30 +209,38 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                     this.adaptable.jumpToRow(firstRowNode);
                 }
             }
-            // 6.HighlightCell and 7.HighlightRow are exclusive, based on alertType!
-            // 6: Highlight the cell - we just refresh the cells to trigger a re-evaluation of the Adaptable.setupColumn[Style/Class]
-            if (alertProperties.HighlightCell &&
-                AdaptableAlert_1.isAdaptableCellChangedAlert(alertToShow) &&
-                alertToShow.cellDataChangedInfo) {
+            // 6: For CellChanged Alerts either Highlight the cell or row
+            // for former - we just refresh the cells to trigger a re-evaluation of the Adaptable.setupColumn[Style/Class]
+            if (AdaptableAlert_1.isAdaptableCellChangedAlert(alertToShow) &&
+                alertToShow.cellDataChangedInfo &&
+                (alertProperties.HighlightCell || alertProperties.HighlightRow)) {
                 let alertNode = alertToShow.cellDataChangedInfo.rowNode;
                 if (!alertNode) {
                     alertNode = this.adaptable.getRowNodeForPrimaryKey(alertToShow.cellDataChangedInfo.primaryKeyValue);
                 }
                 if (alertNode) {
-                    this.adaptable.api.gridApi.refreshCells([alertNode], [alertToShow.cellDataChangedInfo.column.columnId]);
-                    setTimeout(() => {
-                        this.dispatchAction(SystemRedux.SystemAlertRemoveHighlight(alertToShow));
-                    }, this.adaptable.adaptableOptions.alertOptions.cellHighlightDuration);
+                    if (alertProperties.HighlightRow) {
+                        this.adaptable.api.gridApi.refreshRowNodes([alertNode]);
+                        setTimeout(() => {
+                            this.dispatchAction(SystemRedux.SystemAlertRemoveRowHighlight(alertToShow));
+                        }, this.adaptable.adaptableOptions.alertOptions.rowHighlightDuration);
+                    }
+                    if (alertProperties.HighlightCell) {
+                        this.adaptable.api.gridApi.refreshCells([alertNode], [alertToShow.cellDataChangedInfo.column.columnId]);
+                        setTimeout(() => {
+                            this.dispatchAction(SystemRedux.SystemAlertRemoveCellHighlight(alertToShow));
+                        }, this.adaptable.adaptableOptions.alertOptions.cellHighlightDuration);
+                    }
                 }
             }
-            // 7. Highlight the row - we just refresh the rows to trigger a re-evaluation of the Adaptable.setupColumn[Style/Class]
+            // 7. For RowChange Alerts only Highlight the row - we just refresh the rows to trigger a re-evaluation of the Adaptable.setupColumn[Style/Class]
             else if (alertProperties.HighlightRow &&
                 AdaptableAlert_1.isAdaptableRowChangedAlert(alertToShow) &&
                 ((_b = alertToShow.gridDataChangedInfo) === null || _b === void 0 ? void 0 : _b.rowTrigger) === 'Add') {
                 this.adaptable.api.gridApi.refreshRowNodes(alertToShow.gridDataChangedInfo.rowNodes);
                 setTimeout(() => {
-                    this.dispatchAction(SystemRedux.SystemAlertRemoveHighlight(alertToShow));
-                }, this.adaptable.adaptableOptions.alertOptions.cellHighlightDuration);
+                    this.dispatchAction(SystemRedux.SystemAlertRemoveRowHighlight(alertToShow));
+                }, this.adaptable.adaptableOptions.alertOptions.rowHighlightDuration);
             }
         }
     }

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

@@ -7,4 +7,6 @@ export declare class CellSummaryApiImpl extends ApiBase implements CellSummaryAp
     getCellSummaryOperationDefinitions(): CellSummaryOperation[];
     showCellSummaryPopup(): void;
     setCurrentCellSummaryOperation(operation: SummaryOperation | string): void;
+    getCellSummaryOperationValue(operation: SummaryOperation | string): any;
+    getCurrentCellSummaryOperationValue(): any;
 }

package/src/Api/Implementation/CellSummaryApiImpl.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 class CellSummaryApiImpl extends ApiBase_1.ApiBase {
     getCurrentCellSummaryOperation() {
         return this.getAdaptableState().System.CellSummaryOperation;
@@ -18,5 +19,38 @@ class CellSummaryApiImpl extends ApiBase_1.ApiBase {
     setCurrentCellSummaryOperation(operation) {
         this.dispatchAction(SystemRedux.SystemCellSummaryChangeOperation(operation));
     }
+    getCellSummaryOperationValue(operation) {
+        const cellSummary = this.getAdaptableState().Grid.CellSummary;
+        if (!cellSummary) {
+            return 'N/A';
+        }
+        switch (operation) {
+            case Enums_1.SummaryOperation.Sum:
+                return cellSummary.Sum;
+            case Enums_1.SummaryOperation.Average:
+                return cellSummary.Average;
+            case Enums_1.SummaryOperation.Median:
+                return cellSummary.Median;
+            case Enums_1.SummaryOperation.Mode:
+                return cellSummary.Mode;
+            case Enums_1.SummaryOperation.Max:
+                return cellSummary.Max;
+            case Enums_1.SummaryOperation.Min:
+                return cellSummary.Min;
+            case Enums_1.SummaryOperation.Distinct:
+                return cellSummary.Distinct;
+            case Enums_1.SummaryOperation.Count:
+                return cellSummary.Count;
+            default:
+                return cellSummary[operation];
+        }
+    }
+    getCurrentCellSummaryOperationValue() {
+        const cellSummaryOperation = this.getCurrentCellSummaryOperation();
+        const summaryOperation = typeof cellSummaryOperation === 'string'
+            ? cellSummaryOperation
+            : cellSummaryOperation.operationName;
+        return this.getCellSummaryOperationValue(summaryOperation);
+    }
 }
 exports.CellSummaryApiImpl = CellSummaryApiImpl;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -374,6 +374,9 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
             case 'ToolPanel':
                 this.dispatchAction(ToolPanelRedux.ToolPanelReady(this.getToolPanelState()));
                 break;
+            case 'StatusBar':
+                this.dispatchAction(ToolPanelRedux.ToolPanelReady(this.getToolPanelState()));
+                break;
         }
     }
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -58,10 +58,6 @@ class GridApiImpl extends ApiBase_1.ApiBase {
             LoggingHelper_1.LogAdaptableWarning(`setCellValue() - rowNode not found for primaryKeyValue: ${primaryKeyValue}`);
             return;
         }
-        if (!this.adaptable.isCellEditable(rowNode, this.adaptable.getAgGridColumnForColumnId(columnId))) {
-            LoggingHelper_1.LogAdaptableInfo(`setCellValue() - cell is not editable (primaryKeyValue: ${primaryKeyValue},columnId: ${columnId},value: ${newValue})`);
-            return;
-        }
         this.adaptable.setDataValue(newValue, abColumn, primaryKeyValue, rowNode);
     }
     setCellsValue(gridCells) {

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

@@ -60,7 +60,7 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     hidePopupScreen(): void;
     hidePopupAlert(): void;
     setColumns(columns: AdaptableColumn[]): void;
-    setModuleDropdownMenuItems(menuItems: AdaptableMenuItem[]): void;
+    setSettingPanelModuleMenuItems(menuItems: AdaptableMenuItem[]): void;
     setModuleButtonMenuItems(menuItems: AdaptableMenuItem[]): void;
     setSelectedCells(selectedCellInfo: SelectedCellInfo): void;
     setSelectedRows(selectedRowInfo: SelectedRowInfo): void;
@@ -120,5 +120,6 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     isTextComparisonCaseSensitive(): boolean;
     executeWithProgressIndicator(label: string, executeFn: () => void): void;
     hideProgressIndicator(): void;
+    getCorrectEnglishVariant(wordToSpell: string): string;
     dispatchReduxAction(action: Action): void;
 }

package/src/Api/Implementation/InternalApiImpl.js

@@ -80,13 +80,27 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         });
     }
     getAdaptableAlertWithHighlightRow(rowNode) {
-        // only alerts triggered by row changes are relevant for HighlightRow actions
-        return this.getAdaptableRowChangedAlerts().find((alert) => {
-            var _a;
-            if (((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightRow) && alert.gridDataChangedInfo) {
-                return alert.gridDataChangedInfo.rowNodes.map((rowNode) => rowNode.id).includes(rowNode.id);
+        let alertWithRowHighlight;
+        alertWithRowHighlight = this.getAdaptableRowChangedAlerts().find((alert) => {
+            var _a, _b;
+            if ((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightRow) {
+                if ((_b = alert.gridDataChangedInfo) === null || _b === void 0 ? void 0 : _b.rowNodes.map((rowNode) => rowNode.id).includes(rowNode.id)) {
+                    return alert;
+                }
             }
         });
+        if (alertWithRowHighlight) {
+            return alertWithRowHighlight;
+        }
+        alertWithRowHighlight = this.getAdaptableCellChangedAlerts().find((alert) => {
+            var _a, _b;
+            if ((_a = alert.alertDefinition.AlertProperties) === null || _a === void 0 ? void 0 : _a.HighlightRow) {
+                if (((_b = alert.cellDataChangedInfo) === null || _b === void 0 ? void 0 : _b.rowNode.id) == rowNode.id) {
+                    return alert;
+                }
+            }
+        });
+        return alertWithRowHighlight;
     }
     isAlertDefinitionForAddedRowChangeEvent(alertDefinition) {
         var _a, _b;
@@ -137,8 +151,8 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     setColumns(columns) {
         this.dispatchAction(GridRedux.GridSetColumns(columns));
     }
-    setModuleDropdownMenuItems(menuItems) {
-        this.dispatchAction(GridRedux.SetModuleDropdownMenuItems(menuItems));
+    setSettingPanelModuleMenuItems(menuItems) {
+        this.dispatchAction(GridRedux.SetSettingPanelModuleMenuItems(menuItems));
     }
     setModuleButtonMenuItems(menuItems) {
         this.dispatchAction(GridRedux.SetModuleButtonMenuItems(menuItems));
@@ -443,6 +457,14 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     hideProgressIndicator() {
         this.dispatchReduxAction(SystemRedux_1.SystemProgressIndicatorHide());
     }
+    getCorrectEnglishVariant(wordToSpell) {
+        if (wordToSpell.includes('our')) {
+            return this.getGeneralOptions().englishVariant == 'GB'
+                ? wordToSpell
+                : wordToSpell.replace('our', 'or');
+        }
+        return wordToSpell;
+    }
     // General way to get to store from inside Adaptable...
     dispatchReduxAction(action) {
         this.dispatchAction(action);

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

@@ -16,4 +16,5 @@ export declare class QueryApiImpl extends ApiBase implements QueryApi {
     getCurrentQuery(): string | undefined;
     getReferencedNamedQueryNames(expression?: string): string[];
     getNamedQueryModuleReferences(namedQueryName: string): string[];
+    expandCurrentQuery(query?: string): void;
 }

package/src/Api/Implementation/QueryApiImpl.js

@@ -8,6 +8,7 @@ const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions"
 const QueryRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QueryRedux"));
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
+const windowFactory_1 = require("../../View/Components/Popups/WindowPopups/windowFactory");
 class QueryApiImpl extends ApiBase_1.ApiBase {
     getQueryState() {
         return this.getAdaptableState().Query;
@@ -76,5 +77,16 @@ class QueryApiImpl extends ApiBase_1.ApiBase {
         });
         return references;
     }
+    expandCurrentQuery(query) {
+        const preparedQuery = query !== null && query !== void 0 ? query : this.getCurrentQuery();
+        this.adaptable.api.internalApi.dispatchReduxAction(PopupRedux.PopupShowWindow({
+            Id: windowFactory_1.WINDOW_QUERY_EDITOR,
+            Title: 'Current Query',
+            Icon: 'query',
+            PopupProps: {
+                value: preparedQuery,
+            },
+        }));
+    }
 }
 exports.QueryApiImpl = QueryApiImpl;

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

@@ -0,0 +1,8 @@
+import { AdaptableStatusBar } from '../../PredefinedConfig/StatusBarState';
+import { StatusBarApi } from '../StatusBarApi';
+import { ApiBase } from './ApiBase';
+export declare class StatusBarApiImpl extends ApiBase implements StatusBarApi {
+    getStatusPanels(): AdaptableStatusBar[];
+    getAgGridStatusPanels(): import("@ag-grid-community/core").StatusPanelDef[];
+    setStatusPanels(statusPanels: AdaptableStatusBar[]): void;
+}