@adaptabletools/adaptable 17.0.3 → 17.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "17.0.3",
+  "version": "17.0.5",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1706194555500;
+declare const _default: 1707035112774;
 export default _default;

package/publishTimestamp.js

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

package/src/Api/EventApi.d.ts

@@ -1,4 +1,5 @@
 import { CellSelectionChangedInfo, RowSelectionChangedInfo, LiveDataChangedInfo, DashboardChangedInfo, ThemeChangedInfo, AlertFiredInfo, LayoutChangedInfo, AdaptableReadyInfo, CustomToolbarConfiguredInfo, CellChangedInfo, SystemStatusMessageDisplayedInfo, AdaptableStateChangedInfo, FlashingCellDisplayedInfo, GridDataChangedInfo, TeamSharingEntityChangedInfo, ActionRowSubmittedInfo, DataSetSelectedInfo, AdaptableStateReloadedInfo, GridSortedInfo, ScheduleTriggeredInfo, ChartChangedInfo, ThemeEditedInfo, Fdc3MessageInfo, DataImportedInfo, ColumnFilterAppliedInfo, GridFilterAppliedInfo } from '../types';
+import { CalculatedColumnChangedInfo } from './Events/CalculatedColumnChanged';
 /**
  * Responsible for publishing the many Events that AdapTable fires
  */
@@ -182,14 +183,25 @@ export interface EventApi {
      * @param callback LayoutChanged which includes just the name of the currently selected Layout.
      * @returns the unsubscribe function
      */
-    on(eventName: 'LayoutChanged', callback: (LayoutChangedInfo: LayoutChangedInfo) => void): VoidFunction;
+    on(eventName: 'LayoutChanged', callback: (layoutChangedInfo: LayoutChangedInfo) => void): VoidFunction;
     /**
      * Unsubscribe from LayoutChanged
      */
-    off(eventName: 'LayoutChanged', callback: (LayoutChangedInfo: LayoutChangedInfo) => void): void;
+    off(eventName: 'LayoutChanged', callback: (layoutChangedInfo: LayoutChangedInfo) => void): void;
+    /**
+     * Event fired whenever a Calculated Columns is created / updated / deleted in AdapTable
+     * @param eventName CalculatedColumnChanged
+     * @param callback CalculatedColumnChanged which includes the action and details of the Calculated Column
+     * @returns the unsubscribe function
+     */
+    on(eventName: 'CalculatedColumnChanged', callback: (calculatedColumnChangedInfo: CalculatedColumnChangedInfo) => void): VoidFunction;
+    /**
+     * Unsubscribe from CalculatedColumnChanged
+     */
+    off(eventName: 'CalculatedColumnChanged', callback: (calculatedColumnChangedInfo: CalculatedColumnChangedInfo) => void): void;
     /**
      * Event fired whenever **Configure Button is clicked in a Custom Toolbar**
-     * @param eventName DashboardChanged
+     * @param eventName CustomToolbarConfigured
      * @param callback CustomToolbarConfiguredInfo which contains the Custom Toolbar
      * @returns the unsubscribe function
      */
@@ -327,6 +339,6 @@ export interface EventApi {
     emitSync(eventName: 'DashboardChanged', data?: any): any[];
     emitSync(eventName: 'FlashingCellDisplayed', data?: any): any[];
     emitSync(eventName: 'AdaptableDestroy'): any[];
-    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataImported' | 'DataSetSelected' | 'ColumnFilterApplied' | 'Fdc3Message' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'LiveDataChanged' | 'ScheduleTriggered' | 'SearchChanged' | 'CellSelectionChanged' | 'RowSelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'ThemeEdited' | 'GridFilterApplied', data?: any): Promise<any>;
+    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataImported' | 'DataSetSelected' | 'ColumnFilterApplied' | 'Fdc3Message' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'CalculatedColumnChanged' | 'LiveDataChanged' | 'ScheduleTriggered' | 'SearchChanged' | 'CellSelectionChanged' | 'RowSelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'ThemeEdited' | 'GridFilterApplied', data?: any): Promise<any>;
     destroy(): void;
 }

package/src/Api/Events/CalculatedColumnChanged.d.ts

@@ -0,0 +1,12 @@
+import { CalculatedColumn } from '../../PredefinedConfig/CalculatedColumnState';
+import { BaseEventInfo } from './BaseEventInfo';
+/**
+ * EventInfo returned by CalculatedColumnChanged event
+ */
+export interface CalculatedColumnChangedInfo extends BaseEventInfo {
+    /**
+     * What caused CalculatedColumn State to change
+     */
+    actionName: string;
+    calculatedColumn: CalculatedColumn;
+}

package/src/Api/Events/CalculatedColumnChanged.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -4,7 +4,7 @@ import { ExpressionApi } from '../ExpressionApi';
 import { AdaptableQuery } from '../../PredefinedConfig/Common/AdaptableQuery';
 import { AdaptableColumnBase } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { ExpressionInternalApi } from '../Internal/ExpressionnternalApi';
+import { ExpressionInternalApi } from '../Internal/ExpressionInternalApi';
 export declare class ExpressionApiImpl extends ApiBase implements ExpressionApi {
     internalApi: ExpressionInternalApi;
     constructor(adaptable: IAdaptable);

package/src/Api/Implementation/ExpressionApiImpl.js

@@ -4,11 +4,11 @@ exports.ExpressionApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const parser = tslib_1.__importStar(require("../../parser/src"));
-const ExpressionnternalApi_1 = require("../Internal/ExpressionnternalApi");
+const ExpressionInternalApi_1 = require("../Internal/ExpressionInternalApi");
 class ExpressionApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new ExpressionnternalApi_1.ExpressionInternalApi(adaptable);
+        this.internalApi = new ExpressionInternalApi_1.ExpressionInternalApi(adaptable);
     }
     isValidBooleanExpression(query, module, validationErrorMessage) {
         const { isValid, errorMessage } = this.adaptable.api.internalApi
@@ -93,8 +93,7 @@ class ExpressionApiImpl extends ApiBase_1.ApiBase {
             .getExpressionWithColumnFriendlyNames(this.getAdaptableQueryExpression(query));
     }
     useCaseSensitivity() {
-        return this.adaptable.adaptableOptions.expressionOptions
-            .caseSensitiveExpressions;
+        return this.adaptable.adaptableOptions.expressionOptions.caseSensitiveExpressions;
     }
 }
 exports.ExpressionApiImpl = ExpressionApiImpl;

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

@@ -25,4 +25,5 @@ export declare class CalculatedColumnInternalApi extends ApiBase {
     getCalculatedColumnsDependentOnColumn(column: AdaptableColumn): string[];
     isCumulativeAggregatedExpression(input: string): boolean;
     isQuantileAggregatedExpression(input: string): boolean;
+    fireCalculatedColumnChangedEvent(trigger: string, calculatedColumn: CalculatedColumn): void;
 }

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -74,5 +74,16 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
             .internalApi.getQueryLanguageService()
             .getNodesFromExpression(input, 'QUANT')) === null || _a === void 0 ? void 0 : _a.length);
     }
+    fireCalculatedColumnChangedEvent(trigger, calculatedColumn) {
+        const adaptableApi = this.getAdaptableApi();
+        const calculatedColumnChangedInfo = {
+            adaptableApi: adaptableApi,
+            actionName: trigger,
+            calculatedColumn: calculatedColumn,
+            userName: adaptableApi.optionsApi.getUserName(),
+            adaptableId: adaptableApi.optionsApi.getAdaptableId(),
+        };
+        this.adaptable.api.eventApi.emit('CalculatedColumnChanged', calculatedColumnChangedInfo);
+    }
 }
 exports.CalculatedColumnInternalApi = CalculatedColumnInternalApi;

package/src/Api/Internal/DataImportInternalApi.js

@@ -4,6 +4,7 @@ exports.DataImportInternalApi = void 0;
 const tslib_1 = require("tslib");
 const ObjectFactory_1 = tslib_1.__importStar(require("../../Utilities/ObjectFactory"));
 const ApiBase_1 = require("../Implementation/ApiBase");
+const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 class DataImportInternalApi extends ApiBase_1.ApiBase {
     async importData(partialRows) {
         const dataImportOptions = this.getOptions().dataImportOptions;
@@ -64,6 +65,7 @@ class DataImportInternalApi extends ApiBase_1.ApiBase {
             userName: adaptableApi.optionsApi.getUserName(),
             adaptableId: adaptableApi.optionsApi.getAdaptableId(),
         };
+        this.adaptable.api.internalApi.dispatchReduxAction(SystemRedux.DataImportCompleted(dataImportedInfo));
         this.getEventApi().emit('DataImported', dataImportedInfo);
     }
 }

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

@@ -13,7 +13,7 @@ import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
 import { SmartEditOperation } from '../../AdaptableOptions/EditOptions';
-import { DataSet, NoteGridCell } from '../../types';
+import { DataImportedInfo, DataSet, NoteGridCell } from '../../types';
 import { ChartModel } from '@ag-grid-community/core';
 import { CachedQuery } from '../../PredefinedConfig/NamedQueryState';
 export declare const FLASHING_CELL_ROW_KEY = "__ROW";
@@ -76,6 +76,10 @@ export declare const SYSTEM_VISUAL_EXPORT_BEGIN = "SYSTEM_VISUAL_EXPORT_BEGIN";
 export declare const SYSTEM_VISUAL_EXPORT_END = "SYSTEM_VISUAL_EXPORT_END";
 export declare const SYSTEM_NOTESS_SHOW = "SYSTEM_NOTES_SHOW";
 export declare const SYSTEM_NOTS_HIDE = "SYSTEM_NOTES_HIDE";
+export declare const DATA_IMPORT_COMPLETED = "DATA_IMPORT_COMPLETED";
+export interface DataImportCompletedAction extends Redux.Action {
+    dataImportedInfo: DataImportedInfo;
+}
 export interface SystemHighlightCellAddAction extends Redux.Action {
     cellHighlightInfo: CellHighlightInfo;
 }
@@ -325,4 +329,5 @@ export declare const SystemPreviousGroupedColumnsSelector: (state: SystemState)
 export declare const SystemQuickSearchFloatingVisibilitySelector: (state: SystemState) => boolean;
 export declare const SystemNotesSelector: (state: SystemState) => NoteGridCell;
 export declare const SystemNotesEditModeSelector: (state: SystemState) => boolean;
+export declare const DataImportCompleted: (dataImportedInfo: DataImportedInfo) => DataImportCompletedAction;
 export declare const SystemReducer: Redux.Reducer<SystemState>;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SYSTEM_DISABLE_DELETE_CONFIRMATION = exports.SYSTEM_FILTER_FORM_HIDE = exports.SYSTEM_QUICK_FILTER_BAR_HIDE = exports.SYSTEM_QUICK_FILTER_BAR_SHOW = exports.SYSTEM_SETTINGS_PANEL_SET = exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_CLEAR_ROW = exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO = exports.SYSTEM_DATA_CHANGE_HISTORY_ADD = exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = exports.SYSTEM_LICENSE_SHOW_WATERMARK = exports.SYSTEM_PROGRESS_INDICATOR_HIDE = exports.SYSTEM_PROGRESS_INDICATOR_SHOW = exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = exports.SYSTEM_CACHED_QUERY_ADD = exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_ROWS_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROWS_ADD = exports.SYSTEM_HIGHLIGHT_ROW_ADD = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = exports.SYSTEM_BULK_UPDATE_CHANGE_VALUE = exports.SYSTEM_BULK_UPDATE_SET_PREVIEW = exports.SYSTEM_BULK_UPDATE_SET_VALID_SELECTION = exports.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION = exports.SYSTEM_SMART_EDIT_CHANGE_OPERATION = exports.SYSTEM_SMART_EDIT_CHANGE_VALUE = exports.SYSTEM_SMARTEDIT_SET_PREVIEW = exports.SYSTEM_SMARTEDIT_SET_VALID_SELECTION = exports.SYSTEM_SMARTEDIT_FETCH_PREVIEW = exports.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.SYSTEM_FLASHING_CELL_DELETE_ALL = exports.SYSTEM_FLASHING_CELL_DELETE = exports.SYSTEM_FLASHING_CELL_ADD = exports.SYSTEM_ALERT_REMOVE_ROW_HIGHLIGHT = exports.SYSTEM_ALERT_REMOVE_CELL_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_CELL_ROW_KEY = void 0;
-exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryClearRow = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveRowHighlight = exports.SystemAlertRemoveCellHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_NOTS_HIDE = exports.SYSTEM_NOTESS_SHOW = exports.SYSTEM_VISUAL_EXPORT_END = exports.SYSTEM_VISUAL_EXPORT_BEGIN = exports.SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY = exports.SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX = exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = exports.SYSTEM_DATA_SET_SELECT = exports.DASHBOARD_REFRESH = exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = void 0;
-exports.SystemReducer = exports.SystemNotesEditModeSelector = exports.SystemNotesSelector = exports.SystemQuickSearchFloatingVisibilitySelector = exports.SystemPreviousGroupedColumnsSelector = exports.SystemDisableDeleteConfirmationSelector = exports.SystemNoteHide = exports.SystemNotesShow = exports.SystemQuickSearchFloatingVisibility = exports.SystemVisualExportEnd = exports.SystemVisualExportBegin = exports.SystemDisableDeleteConfirmation = exports.SystemSetPreviousGroupedColumnsIndex = exports.SystemChartingCurrentChartModelsSelector = exports.SystemChartingSetCurrentChartModels = exports.SystemDataSetSelect = exports.SystemDashboardRefresh = exports.SystemLayoutShowNotAssociatedObjects = exports.SystemFilterFormHide = exports.SystemQuickFilterBarHide = exports.SystemQuickFilterBarShow = exports.SystemSettingsPanelSet = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = void 0;
+exports.SystemDataChangeHistoryClearRow = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveRowHighlight = exports.SystemAlertRemoveCellHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowsDelete = exports.SystemHighlightRowDelete = exports.SystemHighlightRowsAdd = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.DATA_IMPORT_COMPLETED = exports.SYSTEM_NOTS_HIDE = exports.SYSTEM_NOTESS_SHOW = exports.SYSTEM_VISUAL_EXPORT_END = exports.SYSTEM_VISUAL_EXPORT_BEGIN = exports.SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY = exports.SYSTEM_SET_PREVIOUS_GROUPED_COLUMN_INDEX = exports.SYSTEM_CHARTING_SET_CURRENT_CHART_MODELS = exports.SYSTEM_DATA_SET_SELECT = exports.DASHBOARD_REFRESH = exports.SYSTEM_LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = void 0;
+exports.SystemReducer = exports.DataImportCompleted = exports.SystemNotesEditModeSelector = exports.SystemNotesSelector = exports.SystemQuickSearchFloatingVisibilitySelector = exports.SystemPreviousGroupedColumnsSelector = exports.SystemDisableDeleteConfirmationSelector = exports.SystemNoteHide = exports.SystemNotesShow = exports.SystemQuickSearchFloatingVisibility = exports.SystemVisualExportEnd = exports.SystemVisualExportBegin = exports.SystemDisableDeleteConfirmation = exports.SystemSetPreviousGroupedColumnsIndex = exports.SystemChartingCurrentChartModelsSelector = exports.SystemChartingSetCurrentChartModels = exports.SystemDataSetSelect = exports.SystemDashboardRefresh = exports.SystemLayoutShowNotAssociatedObjects = exports.SystemFilterFormHide = exports.SystemQuickFilterBarHide = exports.SystemQuickFilterBarShow = exports.SystemSettingsPanelSet = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
@@ -94,6 +94,8 @@ exports.SYSTEM_VISUAL_EXPORT_END = 'SYSTEM_VISUAL_EXPORT_END';
 // Notes
 exports.SYSTEM_NOTESS_SHOW = 'SYSTEM_NOTES_SHOW';
 exports.SYSTEM_NOTS_HIDE = 'SYSTEM_NOTES_HIDE';
+// Data Import
+exports.DATA_IMPORT_COMPLETED = 'DATA_IMPORT_COMPLETED';
 const SystemHighlightCellAdd = (cellHighlightInfo) => ({
     type: exports.SYSTEM_HIGHLIGHT_CELL_ADD,
     cellHighlightInfo: cellHighlightInfo,
@@ -398,6 +400,11 @@ const SystemNotesEditModeSelector = (state) => {
     return (_a = state === null || state === void 0 ? void 0 : state.Notes) === null || _a === void 0 ? void 0 : _a.editMode;
 };
 exports.SystemNotesEditModeSelector = SystemNotesEditModeSelector;
+const DataImportCompleted = (dataImportedInfo) => ({
+    type: exports.DATA_IMPORT_COMPLETED,
+    dataImportedInfo: dataImportedInfo,
+});
+exports.DataImportCompleted = DataImportCompleted;
 const initialState = {
     AdaptableAlerts: GeneralConstants_1.EMPTY_ARRAY,
     AdaptableFlashingCells: {},

package/src/Redux/Store/AdaptableStore.js

@@ -598,6 +598,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         adaptable.api.internalApi
                             .getCalculatedColumnExpressionService()
                             .createAggregatedScalarLiveValue(returnAction.calculatedColumn);
+                        adaptable.api.calculatedColumnApi.internalApi.fireCalculatedColumnChangedEvent(action.type, actionTyped.calculatedColumn);
                     }
                     adaptable.updateColDefsForSpecialColumns();
                     return returnAction;
@@ -623,6 +624,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     adaptable.api.internalApi
                         .getCalculatedColumnExpressionService()
                         .destroyAggregatedScalarLiveValue(returnAction.calculatedColumn);
+                    adaptable.api.calculatedColumnApi.internalApi.fireCalculatedColumnChangedEvent(action.type, actionTyped.calculatedColumn);
                     adaptable.updateColDefsForSpecialColumns();
                     return returnAction;
                 }

package/src/Strategy/LayoutModule.js

@@ -243,11 +243,13 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return returnColumnMenuItems;
     }
     createViewPivotItemsMenuItem(menuContext) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // current group => menuContext.rowNode.field;
-        if (((_b = (_a = menuContext.selectedCellInfo) === null || _a === void 0 ? void 0 : _a.gridCells) === null || _b === void 0 ? void 0 : _b.length) !== 1) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        const selectedCellInfo = (_a = menuContext.selectedCellInfo) !== null && _a !== void 0 ? _a : this.api.gridApi.getSelectedCellInfo();
+        if (((_b = selectedCellInfo === null || selectedCellInfo === void 0 ? void 0 : selectedCellInfo.gridCells) === null || _b === void 0 ? void 0 : _b.length) !== 1) {
             return;
         }
+        const gridCell = (_c = menuContext.gridCell) !== null && _c !== void 0 ? _c : selectedCellInfo.gridCells[0];
         const currentLayout = this.api.layoutApi.getCurrentLayout();
         if (!currentLayout.EnablePivot) {
             return;
@@ -266,11 +268,11 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
          */
         // pivot_status_Booked_price
         // price
-        const aggColumn = (_f = (_e = (_d = (_c = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _c === void 0 ? void 0 : _c.call(agGridColumn).pivotValueColumn) === null || _d === void 0 ? void 0 : _d.getColDef) === null || _e === void 0 ? void 0 : _e.call(_d)) === null || _f === void 0 ? void 0 : _f.field;
+        const aggColumn = (_g = (_f = (_e = (_d = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _d === void 0 ? void 0 : _d.call(agGridColumn).pivotValueColumn) === null || _e === void 0 ? void 0 : _e.getColDef) === null || _f === void 0 ? void 0 : _f.call(_e)) === null || _g === void 0 ? void 0 : _g.field;
         // Booked
-        const pivotValue = (_j = (_h = (_g = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _g === void 0 ? void 0 : _g.call(agGridColumn)) === null || _h === void 0 ? void 0 : _h.pivotKeys) === null || _j === void 0 ? void 0 : _j[0];
+        const pivotValue = (_k = (_j = (_h = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _h === void 0 ? void 0 : _h.call(agGridColumn)) === null || _j === void 0 ? void 0 : _j.pivotKeys) === null || _k === void 0 ? void 0 : _k[0];
         // status - the preview works only with one column
-        const pivotColumnId = (_k = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.PivotColumns) === null || _k === void 0 ? void 0 : _k[0];
+        const pivotColumnId = (_l = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.PivotColumns) === null || _l === void 0 ? void 0 : _l[0];
         function getData(rows) {
             return [
                 ...rows.map((row) => {
@@ -283,9 +285,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         const data = (0, flattenDeep_1.default)(getData(menuContext.rowNode.childrenAfterFilter));
         const rowGroups = currentLayout.RowGroupedColumns;
-        const cellValue = isPivotColumn
-            ? menuContext.rowNode.aggData[columnId]
-            : menuContext.gridCell.displayValue;
+        const cellValue = isPivotColumn ? menuContext.rowNode.aggData[columnId] : gridCell.displayValue;
         const popupProps = {
             hasPivotValue: isPivotColumn,
             columnId,

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

@@ -2,6 +2,6 @@ import { ExpressionFunction } from '../../parser/src/types';
 /**
  * List of all the Scalar Functions available in AdaptableQL
  */
-export type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'ABS' | 'CEILING' | 'FLOOR' | 'ROUND' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'TODAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'NULL' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'CASE' | 'COL' | 'VAR' | 'TO_ARRAY' | 'QUERY' | 'IS_BLANK' | 'IS_NOT_BLANK';
+export type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'ABS' | 'CEILING' | 'FLOOR' | 'ROUND' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'CURRENT_DAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'NULL' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'CASE' | 'COL' | 'VAR' | 'TO_ARRAY' | 'QUERY' | 'IS_BLANK' | 'IS_NOT_BLANK';
 export declare const scalarExpressionFunctions: Record<ScalarFunctionName, ExpressionFunction>;
 export declare const scalarExpressionFunctionNames: ScalarFunctionName[];

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -387,13 +387,13 @@ exports.scalarExpressionFunctions = {
         category: 'dates',
         returnType: 'date',
     },
-    TODAY: {
+    CURRENT_DAY: {
         handler() {
             return (0, startOfDay_1.default)(new Date());
         },
         description: 'Returns the current day',
-        signatures: ['TODAY()'],
-        examples: ['[col1] > TODAY()'],
+        signatures: ['CURRENT_DAY()'],
+        examples: ['[col1] > CURRENT_DAY()'],
         category: 'dates',
         returnType: 'date',
     },
@@ -443,7 +443,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns a date based on input data and days to add',
         signatures: ['ADD_DAYS(input: date, days: number)'],
-        examples: ['ADD_DAYS(TODAY(), 5)', 'ADD_DAYS([col1], 5)'],
+        examples: ['ADD_DAYS(CURRENT_DAY(), 5)', 'ADD_DAYS([col1], 5)'],
         category: 'dates',
         returnType: 'date',
     },
@@ -453,7 +453,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns a date based on input data and weeks to add',
         signatures: ['ADD_WEEKS(input: date, weeks: number)'],
-        examples: ['ADD_WEEKS(TODAY(), 5)', 'ADD_WEEKS([col1], 5)'],
+        examples: ['ADD_WEEKS(CURRENT_DAY(), 5)', 'ADD_WEEKS([col1], 5)'],
         category: 'dates',
         returnType: 'date',
     },
@@ -463,7 +463,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns a date based on input data and months to add',
         signatures: ['ADD_MONTHS(input: date, months: number)'],
-        examples: ['ADD_MONTHS(TODAY(), 5)', 'ADD_MONTHS([col1], 5)'],
+        examples: ['ADD_MONTHS(CURRENT_DAY(), 5)', 'ADD_MONTHS([col1], 5)'],
         category: 'dates',
         returnType: 'date',
     },
@@ -473,7 +473,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns a date based on input data and years to add',
         signatures: ['ADD_YEARS(input: date, years: number)'],
-        examples: ['ADD_YEARS(TODAY(), 5)', 'ADD_YEARS([col1], 5)'],
+        examples: ['ADD_YEARS(CURRENT_DAY(), 5)', 'ADD_YEARS([col1], 5)'],
         category: 'dates',
         returnType: 'date',
     },
@@ -485,7 +485,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns the difference in days between 2 dates',
         signatures: ['DIFF_DAYS(a: date, b: date)'],
-        examples: ['DIFF_DAYS([col1], TODAY())'],
+        examples: ['DIFF_DAYS([col1], CURRENT_DAY())'],
         category: 'dates',
         returnType: 'number',
     },
@@ -497,7 +497,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns the difference in weeks between 2 dates',
         signatures: ['DIFF_WEEKS(a: date, b: date)'],
-        examples: ['DIFF_WEEKS([col1], TODAY())'],
+        examples: ['DIFF_WEEKS([col1], CURRENT_DAY())'],
         category: 'dates',
         returnType: 'number',
     },
@@ -509,7 +509,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns the difference in months between 2 dates',
         signatures: ['DIFF_MONTHS(a: date, b: date)'],
-        examples: ['DIFF_MONTHS([col1], TODAY())'],
+        examples: ['DIFF_MONTHS([col1], CURRENT_DAY())'],
         category: 'dates',
         returnType: 'number',
     },
@@ -521,7 +521,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns the difference in years between 2 dates',
         signatures: ['DIFF_YEARS(a: date, b: date)'],
-        examples: ['DIFF_YEARS([col1], TODAY())'],
+        examples: ['DIFF_YEARS([col1], CURRENT_DAY())'],
         category: 'dates',
         returnType: 'number',
     },

package/src/View/Charting/useChartingElements.js

@@ -71,7 +71,7 @@ const useChartingElements = ({ elementType, accessLevel, size = 'normal', }) =>
     if ((0, ChartingState_1.isAgChartDefinition)(selectedChart)) {
         containerOptions.unshift({
             label: chartingOptions.agGridContainerName,
-            value: null,
+            value: chartingOptions.agGridContainerName,
         });
     }
     const style = {};
@@ -82,8 +82,13 @@ const useChartingElements = ({ elementType, accessLevel, size = 'normal', }) =>
         iconSize = 15;
     }
     const chartSelector = (React.createElement(Select_1.Select, { className: `ab-${elementType}__Chart__select`, size: size, value: selectedChartId, options: options, placeholder: 'Select Chart', disabled: !hasCharts, onChange: (chartUuid) => setSelectedChartId(chartUuid) }));
-    const containerSelector = Boolean(chartContainers === null || chartContainers === void 0 ? void 0 : chartContainers.length) && (React.createElement(Select_1.Select, { value: selectedContainer === null || selectedContainer === void 0 ? void 0 : selectedContainer.name, size: size, onChange: (containerName) => {
-            setSelectedContainer(chartContainers.find((containerOption) => containerOption.name === containerName));
+    const containerSelector = Boolean(chartContainers === null || chartContainers === void 0 ? void 0 : chartContainers.length) && (React.createElement(Select_1.Select, { value: selectedContainer === null ? chartingOptions.agGridContainerName : selectedContainer === null || selectedContainer === void 0 ? void 0 : selectedContainer.name, size: size, onChange: (containerName) => {
+            if (containerName === chartingOptions.agGridContainerName) {
+                setSelectedContainer(null);
+            }
+            else {
+                setSelectedContainer(chartContainers.find((containerOption) => containerOption.name === containerName));
+            }
         }, options: containerOptions, placeholder: "Select Container" }));
     const chartButton = (React.createElement(SimpleButton_1.default, { style: style, mr: 1, onClick: () => (isOpen ? hideChart() : showChart(selectedContainer)), disabled: !Boolean(selectedChart), variant: 'text', tone: 'neutral', icon: isOpen ? 'visibility-off' : 'visibility-on', tooltip: isOpen ? 'Hide Chart' : 'Show Chart' }));
     const deleteButton = (React.createElement(DeleteChartButton_1.DeleteChartButton, { iconSize: iconSize, chart: selectedChart, accessLevel: chartAccessLevel }));

package/src/agGrid/Adaptable.js

@@ -2660,6 +2660,18 @@ class Adaptable {
                 columnTypes.push(...calculatedColumnSettings.ColumnTypes);
             }
             const isExternalEvaluation = !this.api.expressionApi.internalApi.evaluateExpressionInAdaptableQL('CalculatedColumn', calculatedColumn, this.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query));
+            const valueGetter = (params) => {
+                var _a, _b;
+                if (isExternalEvaluation) {
+                    return (_a = params.data) === null || _a === void 0 ? void 0 : _a[calculatedColumn.ColumnId];
+                }
+                // if the grid data is NOT client side, we can aggregate only simple scalar expression (which depend on row data, not on other rows)
+                if (this.api.gridApi.getAgGridRowModelType() !== 'clientSide' &&
+                    StringExtensions_1.StringExtensions.IsNotNullOrEmpty(calculatedColumn.Query.AggregatedScalarExpression)) {
+                    return (_b = params.data) === null || _b === void 0 ? void 0 : _b[calculatedColumn.ColumnId];
+                }
+                return this.CalculatedColumnExpressionService.evaluateCalculatedColumnQuery(calculatedColumn, params.node);
+            };
             const newColDef = {
                 headerName: calculatedColumn.FriendlyName
                     ? calculatedColumn.FriendlyName
@@ -2678,13 +2690,7 @@ class Adaptable {
                 suppressMenu: calculatedColumnSettings.SuppressMenu,
                 suppressMovable: calculatedColumnSettings.SuppressMovable,
                 type: columnTypes,
-                valueGetter: (params) => {
-                    var _a;
-                    if (isExternalEvaluation) {
-                        return (_a = params.data) === null || _a === void 0 ? void 0 : _a[calculatedColumn.ColumnId];
-                    }
-                    return this.CalculatedColumnExpressionService.evaluateCalculatedColumnQuery(calculatedColumn, params.node);
-                },
+                valueGetter,
             };
             if (calculatedColumnSettings.ShowToolTip != null &&
                 calculatedColumnSettings.ShowToolTip == true) {

package/src/types.d.ts

@@ -118,6 +118,7 @@ export type { CellChangedInfo } from './Api/Events/CellChanged';
 export type { TeamSharingEntityChangedInfo } from './Api/Events/TeamSharingEntityChanged';
 export type { GridDataChangedInfo } from './Api/Events/GridDataChanged';
 export type { LayoutChangedInfo } from './Api/Events/LayoutChanged';
+export type { CalculatedColumnChangedInfo } from './Api/Events/CalculatedColumnChanged';
 export type { CustomToolbarConfiguredInfo } from './Api/Events/CustomToolbarConfigured';
 export type { LiveDataChangedInfo, LiveReport } from './Api/Events/LiveDataChanged';
 export type { ChartChangedInfo, ChartingOpenState, ChartDisplayedInfo, } from './Api/Events/ChartChanged';

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "17.0.3";
+declare const _default: "17.0.5";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '17.0.3'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '17.0.5'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version