@adaptabletools/adaptable 12.1.6 → 12.1.8-canary.1

package/src/Utilities/Services/ReportService.js

@@ -21,8 +21,8 @@ class ReportService {
                 return {
                     Uuid: Uuid_1.createUuid(),
                     Name: GeneralConstants_1.VISUAL_DATA_REPORT,
-                    ReportColumnScope: Enums_1.ReportColumnScope.VisibleColumns,
-                    ReportRowScope: Enums_1.ReportRowScope.VisibleRows,
+                    ReportColumnScope: 'VisibleColumns',
+                    ReportRowScope: 'VisibleRows',
                     Query: undefined,
                     IsReadOnly: true,
                 };
@@ -30,8 +30,8 @@ class ReportService {
                 return {
                     Uuid: Uuid_1.createUuid(),
                     Name: GeneralConstants_1.ALL_DATA_REPORT,
-                    ReportColumnScope: Enums_1.ReportColumnScope.AllColumns,
-                    ReportRowScope: Enums_1.ReportRowScope.AllRows,
+                    ReportColumnScope: 'AllColumns',
+                    ReportRowScope: 'AllRows',
                     Query: undefined,
                     IsReadOnly: true,
                 };
@@ -39,8 +39,8 @@ class ReportService {
                 return {
                     Uuid: Uuid_1.createUuid(),
                     Name: GeneralConstants_1.CURRENT_DATA_REPORT,
-                    ReportColumnScope: Enums_1.ReportColumnScope.VisibleColumns,
-                    ReportRowScope: Enums_1.ReportRowScope.VisibleRows,
+                    ReportColumnScope: 'VisibleColumns',
+                    ReportRowScope: 'VisibleRows',
                     Query: undefined,
                     IsReadOnly: true,
                 };
@@ -48,8 +48,8 @@ class ReportService {
                 return {
                     Uuid: Uuid_1.createUuid(),
                     Name: GeneralConstants_1.SELECTED_CELLS_REPORT,
-                    ReportColumnScope: Enums_1.ReportColumnScope.SelectedColumns,
-                    ReportRowScope: Enums_1.ReportRowScope.SelectedCellRows,
+                    ReportColumnScope: 'SelectedColumns',
+                    ReportRowScope: 'SelectedCellRows',
                     Query: undefined,
                     IsReadOnly: true,
                 };
@@ -57,8 +57,8 @@ class ReportService {
                 return {
                     Uuid: Uuid_1.createUuid(),
                     Name: GeneralConstants_1.SELECTED_ROWS_REPORT,
-                    ReportColumnScope: Enums_1.ReportColumnScope.VisibleColumns,
-                    ReportRowScope: Enums_1.ReportRowScope.SelectedRows,
+                    ReportColumnScope: 'VisibleColumns',
+                    ReportRowScope: 'SelectedRows',
                     Query: undefined,
                     IsReadOnly: true,
                 };
@@ -91,38 +91,43 @@ class ReportService {
     }
     GetReportColumnScopeShortDescription(report) {
         var _a, _b;
+        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+            return ['[Custom Columns]'];
+        }
         switch (report.ReportColumnScope) {
-            case Enums_1.ReportColumnScope.AllColumns:
+            case 'AllColumns':
                 return ['[All Columns]'];
-            case Enums_1.ReportColumnScope.VisibleColumns:
+            case 'VisibleColumns':
                 return ['[Visible Columns]'];
-            case Enums_1.ReportColumnScope.SelectedColumns:
+            case 'SelectedColumns':
                 return ['[Selected Columns]'];
-            case Enums_1.ReportColumnScope.ScopeColumns:
+            case 'ScopeColumns':
                 if ('ColumnIds' in (report === null || report === void 0 ? void 0 : report.Scope)) {
                     return (_b = (_a = report.Scope.ColumnIds).map) === null || _b === void 0 ? void 0 : _b.call(_a, (columnId) => { var _a; return (_a = this.adaptableApi.columnApi.getFriendlyNameFromColumnId(columnId)) !== null && _a !== void 0 ? _a : columnId; });
                 }
                 return ['[Bespoke Columns]'];
-            case Enums_1.ReportColumnScope.CustomColumns:
-                return ['[Custom Columns]'];
         }
     }
     GetReportColumnScopeLongDescription(report) {
+        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+            return '[Custom Columns]';
+        }
         switch (report.ReportColumnScope) {
-            case Enums_1.ReportColumnScope.AllColumns:
+            case 'AllColumns':
                 return '[All Columns]';
-            case Enums_1.ReportColumnScope.VisibleColumns:
+            case 'VisibleColumns':
                 return '[Visible Columns]';
-            case Enums_1.ReportColumnScope.SelectedColumns:
+            case 'SelectedColumns':
                 return '[Selected Columns]';
-            case Enums_1.ReportColumnScope.ScopeColumns:
+            case 'ScopeColumns':
                 return this.adaptableApi.scopeApi.getScopeDescription(report.Scope);
-            case Enums_1.ReportColumnScope.CustomColumns:
-                return '[Custom Columns]';
         }
     }
     GetReportExpressionDescription(report, cols) {
         var _a;
+        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+            return '[Custom Data]';
+        }
         if (this.IsSystemReport(report.Name)) {
             if (report.Name == GeneralConstants_1.ALL_DATA_REPORT) {
                 return '[All Data]';
@@ -142,38 +147,39 @@ class ReportService {
         }
         else {
             switch (report.ReportRowScope) {
-                case Enums_1.ReportRowScope.AllRows:
+                case 'AllRows':
                     return '[All Rows]';
-                case Enums_1.ReportRowScope.VisibleRows:
+                case 'VisibleRows':
                     return '[Visible Rows]';
-                case Enums_1.ReportRowScope.SelectedRows:
+                case 'SelectedRows':
                     return '[Selected Rows]';
-                case Enums_1.ReportRowScope.ExpressionRows:
+                case 'ExpressionRows':
                     return (_a = report.Query) === null || _a === void 0 ? void 0 : _a.BooleanExpression;
-                case Enums_1.ReportRowScope.CustomRows:
-                    return '[Custom Rows]';
             }
         }
     }
     GetReportColumnsForReport(report, includePrimaryKey = false) {
         let reportColumns = [];
         let gridColumns = this.adaptableApi.columnApi.getColumns();
+        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+            return reportColumns;
+        }
         // first get the cols depending on the Column Scope
         switch (report.ReportColumnScope) {
-            case Enums_1.ReportColumnScope.AllColumns:
+            case 'AllColumns':
                 reportColumns = gridColumns;
                 break;
-            case Enums_1.ReportColumnScope.VisibleColumns:
+            case 'VisibleColumns':
                 reportColumns = gridColumns.filter((c) => c.visible);
                 break;
-            case Enums_1.ReportColumnScope.SelectedColumns:
+            case 'SelectedColumns':
                 // we extract the selected columns from the grid columns to preserve the grid column order
                 const selectedColumnIds = this.adaptableApi.gridApi
                     .getSelectedCellInfo()
                     .columns.map((column) => column.columnId);
                 reportColumns = gridColumns.filter((gridColumn) => selectedColumnIds.includes(gridColumn.columnId));
                 break;
-            case Enums_1.ReportColumnScope.ScopeColumns:
+            case 'ScopeColumns':
                 if ('ColumnIds' in report.Scope) {
                     reportColumns = report.Scope.ColumnIds.map((columnId) => this.adaptableApi.columnApi.getColumnFromId(columnId)).filter((c) => c);
                 }
@@ -181,9 +187,6 @@ class ReportService {
                     reportColumns = this.adaptableApi.scopeApi.getColumnsForScope(report.Scope);
                 }
                 break;
-            case Enums_1.ReportColumnScope.CustomColumns:
-                // nothing required if custom coluns
-                break;
         }
         if (includePrimaryKey) {
             const pkColumn = reportColumns.find((column) => column.columnId === this.adaptableApi.internalApi.getAdaptableOptions().primaryKey);
@@ -202,14 +205,16 @@ class ReportService {
             friendlyName: column.friendlyName,
             dataType: column.dataType,
         }));
-        if (ArrayExtensions_1.default.IsNullOrEmpty(columns) &&
-            report.ReportRowScope !== Enums_1.ReportRowScope.CustomRows) {
+        if (this.adaptableApi.exportApi.isCustomReport(report)) {
+            return this.adaptableApi.exportApi.runCustomReport(report.Name);
+        }
+        if (ArrayExtensions_1.default.IsNullOrEmpty(columns)) {
             return { columns: [], rows: [] };
         }
         const data = { columns, rows: [] };
         const columnIds = columns.map((column) => column.columnId);
         switch (report.ReportRowScope) {
-            case Enums_1.ReportRowScope.AllRows:
+            case 'AllRows':
                 this.adaptableApi.internalApi.forAllRowNodesDo((rowNode) => {
                     // skip row groups
                     if (!rowNode.group) {
@@ -217,7 +222,7 @@ class ReportService {
                     }
                 });
                 break;
-            case Enums_1.ReportRowScope.VisibleRows:
+            case 'VisibleRows':
                 this.adaptableApi.internalApi.forAllVisibleRowNodesDo((rowNode) => {
                     // skip row groups
                     if (!rowNode.group) {
@@ -225,7 +230,7 @@ class ReportService {
                     }
                 });
                 break;
-            case Enums_1.ReportRowScope.ExpressionRows:
+            case 'ExpressionRows':
                 this.adaptableApi.internalApi.forAllRowNodesDo((rowNode) => {
                     var _a;
                     if (this.adaptableApi.internalApi
@@ -235,7 +240,7 @@ class ReportService {
                     }
                 });
                 break;
-            case Enums_1.ReportRowScope.SelectedCellRows:
+            case 'SelectedCellRows':
                 const selectedCellInfo = this.adaptableApi.gridApi.getSelectedCellInfo();
                 const { gridCells: GridCells } = selectedCellInfo;
                 let selectedCellsByPrimaryKey = groupBy_1.default(GridCells, 'primaryKeyValue');
@@ -255,7 +260,7 @@ class ReportService {
                     }
                 });
                 break;
-            case Enums_1.ReportRowScope.SelectedRows:
+            case 'SelectedRows':
                 const selectedRowInfo = this.adaptableApi.gridApi.getSelectedRowInfo();
                 const selectedGridRowPrimaryKeys = (_b = (_a = selectedRowInfo === null || selectedRowInfo === void 0 ? void 0 : selectedRowInfo.gridRows) === null || _a === void 0 ? void 0 : _a.filter((gr) => gr.rowInfo.isGroup == false).map((gridRow) => gridRow.primaryKeyValue)) !== null && _b !== void 0 ? _b : [];
                 if (selectedGridRowPrimaryKeys.length) {
@@ -267,10 +272,6 @@ class ReportService {
                     });
                 }
                 break;
-            case Enums_1.ReportRowScope.CustomRows:
-                const reportData = this.adaptableApi.exportApi.runCustomReport(report.Name);
-                return reportData;
-            //  break;
         }
         return data;
     }

package/src/View/AdaptableView.js

@@ -25,7 +25,7 @@ class AdaptableView extends React.Component {
             this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard_1.Dashboard, { api: this.props.AdaptableApi })),
             React.createElement(AdaptableLoadingScreen_1.AdaptableLoadingScreen, { onClose: this.props.onCloseLoadingPopup, showLoadingScreen: this.props.PopupState.LoadingPopup.ShowLoadingPopup }),
             this.props.PopupState.PromptPopup.ShowPromptPopup && (React.createElement(AdaptablePopupPrompt_1.AdaptablePopupPrompt, { message: this.props.PopupState.PromptPopup.Message, header: this.props.PopupState.PromptPopup.Header, onClose: this.props.onClosePromptPopup, onConfirm: this.props.onConfirmPromptPopup, onConfirmActionCreator: this.props.PopupState.PromptPopup.ConfirmActionCreator, defaultValue: this.props.PopupState.PromptPopup.DefaultValue })),
-            React.createElement(AdaptablePopupConfirmation_1.AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi }),
+            Boolean(this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup) && (React.createElement(AdaptablePopupConfirmation_1.AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi })),
             Boolean(this.props.PopupState.ScreenPopup.ShowScreenPopup) && (React.createElement(AdaptablePopup_1.AdaptablePopup, { componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps })),
             React.createElement(Toastify_1.ToastContainer
             // we NEEEEED!!!! this containerId, otherwise, toastify will have memory leaks when the adaptable
@@ -50,7 +50,6 @@ function mapStateToProps(state, ownProps) {
 function mapDispatchToProps(dispatch) {
     return {
         onCloseScreenPopup: () => dispatch(PopupRedux.PopupHideScreen()),
-        onCloseAlertPopup: () => dispatch(PopupRedux.PopupHideAlert()),
         onClosePromptPopup: () => dispatch(PopupRedux.PopupHidePrompt()),
         onConfirmPromptPopup: (inputText) => dispatch(PopupRedux.PopupConfirmPrompt(inputText)),
         onConfirmConfirmationPopup: (comment) => dispatch(PopupRedux.PopupConfirmConfirmation(comment)),

package/src/View/CalculatedColumn/Utilities/getCalculatedColumnSettingsTags.d.ts

@@ -0,0 +1,2 @@
+import { CalculatedColumnSettings } from '../../../types';
+export declare const getCalculatedColumnSettingsTags: (settings: CalculatedColumnSettings) => string[];

package/src/View/CalculatedColumn/Utilities/{getCalculatedColumnSettingTags.js → getCalculatedColumnSettingsTags.js}

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCalculatedColumnSettingTags = void 0;
-const getCalculatedColumnSettingTags = (settings) => {
+exports.getCalculatedColumnSettingsTags = void 0;
+const getCalculatedColumnSettingsTags = (settings) => {
     const { DataType, Width, Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable } = settings !== null && settings !== void 0 ? settings : {};
+    const colTypes = (settings === null || settings === void 0 ? void 0 : settings.ColumnTypes) ? settings.ColumnTypes.join(', ') : '';
     return [
         DataType ? `DataType: ${DataType}` : null,
         Width ? `Width: ${Width}px` : null,
@@ -12,6 +13,7 @@ const getCalculatedColumnSettingTags = (settings) => {
         Groupable ? 'Groupable' : null,
         Sortable ? 'Sortable' : null,
         Aggregatable ? 'Aggregatable' : null,
+        colTypes ? `Column Types: ${colTypes}` : null,
     ].filter(Boolean);
 };
-exports.getCalculatedColumnSettingTags = getCalculatedColumnSettingTags;
+exports.getCalculatedColumnSettingsTags = getCalculatedColumnSettingsTags;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnDefinitionWizardSection.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import { AdaptableApi } from '../../../Api/AdaptableApi';
+import { CalculatedColumn } from '../../../PredefinedConfig/CalculatedColumnState';
+export declare type CalculatedColumnDefinitionWizardSectionProps = {
+    onChange: (data: CalculatedColumn) => void;
+    isEdit: boolean;
+};
+export declare const renderCalculatedColumnDefinitionSummary: (data: CalculatedColumn) => JSX.Element;
+export declare const isValidCalculatedColumnDefinition: (data: CalculatedColumn, api: AdaptableApi) => true | string;
+export declare const CalculatedColumnDefinitionWizardSection: (props: CalculatedColumnDefinitionWizardSectionProps) => JSX.Element;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnDefinitionWizardSection.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CalculatedColumnDefinitionWizardSection = exports.isValidCalculatedColumnDefinition = exports.renderCalculatedColumnDefinitionSummary = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const react_1 = require("react");
+const rebass_1 = require("rebass");
+const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
+const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
+const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
+const CheckBox_1 = require("../../../components/CheckBox");
+const ErrorBox_1 = tslib_1.__importDefault(require("../../../components/ErrorBox"));
+const Tabs_1 = require("../../../components/Tabs");
+const Tag_1 = require("../../../components/Tag");
+const renderCalculatedColumnDefinitionSummary = (data) => {
+    var _a;
+    return (React.createElement(rebass_1.Box, { fontSize: 2 },
+        React.createElement(rebass_1.Box, null,
+            "Column Identifier: ",
+            React.createElement(Tag_1.Tag, null, data.ColumnId)),
+        data.FriendlyName ? (React.createElement(rebass_1.Box, { mt: 3 },
+            "Column Name: ",
+            React.createElement(Tag_1.Tag, null, (_a = data.FriendlyName) !== null && _a !== void 0 ? _a : data.ColumnId))) : null));
+};
+exports.renderCalculatedColumnDefinitionSummary = renderCalculatedColumnDefinitionSummary;
+const isValidCalculatedColumnDefinition = (data, api) => {
+    const columns = api.columnApi.getColumns();
+    if (!data.ColumnId) {
+        return 'Column Id cannot be empty';
+    }
+    const columnsWithSameIdCount = columns.filter((c) => c.columnId === data.ColumnId).length;
+    const hasAlreadyExistingId = data.Uuid ? columnsWithSameIdCount > 1 : columnsWithSameIdCount > 0;
+    return hasAlreadyExistingId ? 'A Column already exists with that id' : true;
+};
+exports.isValidCalculatedColumnDefinition = isValidCalculatedColumnDefinition;
+const CalculatedColumnDefinitionWizardSection = (props) => {
+    var _a;
+    const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
+    const handleColumnIdChange = (event) => {
+        let e = event.target;
+        props.onChange(Object.assign(Object.assign({}, data), { ColumnId: e.value }));
+    };
+    const handleColumnNameChange = (event) => {
+        let e = event.target;
+        props.onChange(Object.assign(Object.assign({}, data), { FriendlyName: e.value }));
+    };
+    const inEdit = props.isEdit;
+    const validCheck = exports.isValidCalculatedColumnDefinition(data, api);
+    const ErrorMessage = validCheck === true ? null : validCheck;
+    const [ColumnNameFocused, setColumnNameFocused] = react_1.useState(false);
+    const ColumnName = data.FriendlyName;
+    const ColumnId = data.ColumnId;
+    const { ShowToolTip, HeaderToolTip } = (_a = data.CalculatedColumnSettings) !== null && _a !== void 0 ? _a : {};
+    const handleSpecialColumnSettingsChange = (settings) => {
+        props.onChange(Object.assign(Object.assign({}, data), { CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), settings) }));
+    };
+    return (React.createElement(rebass_1.Box, { "data-name": 'calculated-column-definition' },
+        React.createElement(Tabs_1.Tabs, { autoFocus: false },
+            React.createElement(Tabs_1.Tabs.Tab, null, "Column Details"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(rebass_1.Flex, { flexDirection: "row" },
+                    React.createElement(FormLayout_1.default, null,
+                        React.createElement(FormLayout_1.FormRow, { label: "Column Id" },
+                            React.createElement(Input_1.default, { "data-name": "column-id", value: data.ColumnId || '', width: 300, autoFocus: !inEdit, disabled: inEdit, type: "text", placeholder: "Enter an Id for the column", onChange: handleColumnIdChange })),
+                        React.createElement(FormLayout_1.FormRow, { label: "Name" },
+                            React.createElement(Input_1.default, { "data-name": "column-name", autoFocus: inEdit, onFocus: () => {
+                                    setColumnNameFocused(true);
+                                }, onBlur: () => {
+                                    setColumnNameFocused(false);
+                                }, value: ColumnNameFocused ? ColumnName || '' : ColumnName || ColumnId || '', width: 300, type: "text", placeholder: "Enter column name", onChange: handleColumnNameChange })),
+                        React.createElement(FormLayout_1.FormRow, { label: "Header Tooltip" },
+                            React.createElement(Input_1.default, { "data-name": "header-tooltip", type: "text", width: 300, value: HeaderToolTip, onChange: (e) => handleSpecialColumnSettingsChange({
+                                    HeaderToolTip: e.target.value,
+                                }) })),
+                        ' ',
+                        React.createElement(FormLayout_1.FormRow, { label: "" },
+                            React.createElement(CheckBox_1.CheckBox, { "data-name": "column-show-tooltip", onChange: (checked) => handleSpecialColumnSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Cell Tooltip")))))),
+        ErrorMessage ? React.createElement(ErrorBox_1.default, { marginTop: 2 }, ErrorMessage) : null));
+};
+exports.CalculatedColumnDefinitionWizardSection = CalculatedColumnDefinitionWizardSection;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnExpressionWizardSection.js

@@ -46,18 +46,24 @@ QueryTab.defaultProps = {
 const CalculatedColumnExpressionWizardSection = (props) => {
     const { api, data, moduleInfo } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const initialData = react_1.useMemo(() => api.internalApi.getQueryPreviewData(), []);
-    const type = data.Query.AggregatedScalarExpression != undefined
-        ? 'AggregatedScalarExpression'
-        : 'ScalarExpression';
-    const [selectedTab, setSelectedTab] = React.useState(type);
-    const setType = (type) => {
-        setSelectedTab(type);
-        if (type === 'ScalarExpression') {
+    const [selectedTab, setSelectedTab] = React.useState(() => {
+        return data.Query.AggregatedScalarExpression == undefined
+            ? 'ScalarExpression'
+            : api.internalApi
+                .getQueryLanguageService()
+                .isCumulativeAggregate(data.Query.AggregatedScalarExpression)
+                ? 'CumulativeAggregateExpression'
+                : 'AggregatedScalarExpression';
+    });
+    const updateExpressionType = (expressionType) => {
+        setSelectedTab(expressionType);
+        if (expressionType === 'ScalarExpression') {
             props.onChange(Object.assign(Object.assign({}, data), { Query: {
                     ScalarExpression: '',
                 } }));
         }
         else {
+            // CumulativeAggregateExpression & AggregatedScalarExpression use the same property
             props.onChange(Object.assign(Object.assign({}, data), { Query: {
                     AggregatedScalarExpression: '',
                 } }));
@@ -66,17 +72,17 @@ const CalculatedColumnExpressionWizardSection = (props) => {
     const setCalculatedColumnExpression = (calculatedColumnQuery) => {
         const calculatedColumnExpressionService = api.internalApi.getCalculatedColumnExpressionService();
         const dataType = calculatedColumnExpressionService.getCalculatedColumnDataType(calculatedColumnQuery);
-        const Pivotable = dataType == 'String';
-        const Aggregatable = dataType == 'Number';
-        props.onChange(Object.assign(Object.assign({}, data), { Query: calculatedColumnQuery, CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), { DataType: dataType, Pivotable,
-                Aggregatable }) }));
+        props.onChange(Object.assign(Object.assign({}, data), { Query: calculatedColumnQuery, CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), { DataType: dataType }) }));
     };
-    return (React.createElement(Tabs_1.Tabs, { onValueChange: setType, value: selectedTab, p: 2, style: { height: '100%', flex: 1, overflow: 'auto' } },
-        React.createElement(QueryTab, { value: "ScalarExpression", type: type, label: "Scalar" }),
+    return (React.createElement(Tabs_1.Tabs, { onValueChange: updateExpressionType, value: selectedTab, p: 2, style: { height: '100%', flex: 1, overflow: 'auto' } },
+        React.createElement(QueryTab, { value: "ScalarExpression", type: selectedTab, label: "Scalar" }),
         React.createElement(Tabs_1.Tabs.Content, { value: 'ScalarExpression' },
             React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'scalar', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.ScalarExpression, onChange: (ScalarExpression) => setCalculatedColumnExpression({ ScalarExpression }), initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), isFullExpression: true, api: api })),
-        React.createElement(QueryTab, { value: "AggregatedScalarExpression", type: type, label: "AggregatedScalar" }),
+        React.createElement(QueryTab, { value: "AggregatedScalarExpression", type: selectedTab, label: "AggregatedScalar" }),
         React.createElement(Tabs_1.Tabs.Content, { value: 'AggregatedScalarExpression' },
-            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'aggregatedScalar', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.AggregatedScalarExpression, onChange: (AggregatedScalarExpression) => setCalculatedColumnExpression({ AggregatedScalarExpression }), initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), isFullExpression: true, api: api }))));
+            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'aggregatedScalar', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.AggregatedScalarExpression, onChange: (AggregatedScalarExpression) => setCalculatedColumnExpression({ AggregatedScalarExpression }), initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), isFullExpression: true, api: api })),
+        React.createElement(QueryTab, { value: "CumulativeAggregateExpression", type: selectedTab, label: "CumulativeAggregatedScalar" }),
+        React.createElement(Tabs_1.Tabs.Content, { value: 'CumulativeAggregateExpression' },
+            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'cumulativeAggregatedScalar', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.AggregatedScalarExpression, onChange: (AggregatedScalarExpression) => setCalculatedColumnExpression({ AggregatedScalarExpression }), initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), isFullExpression: true, api: api }))));
 };
 exports.CalculatedColumnExpressionWizardSection = CalculatedColumnExpressionWizardSection;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnSettingsWizardSection.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="react" />
-import { AdaptableApi } from '../../../Api/AdaptableApi';
 import { CalculatedColumn } from '../../../PredefinedConfig/CalculatedColumnState';
 export declare type CalculatedColumnSettingsWizardSectionProps = {
     onChange: (data: CalculatedColumn) => void;
     isEdit: boolean;
 };
 export declare const renderCalculatedColumnSettingsSummary: (data: CalculatedColumn) => JSX.Element;
-export declare const isValidCalculatedColumnSettings: (data: CalculatedColumn, api: AdaptableApi) => true | string;
+export declare const isValidCalculatedColumnSettings: (data: CalculatedColumn) => true | string;
 export declare const CalculatedColumnSettingsWizardSection: (props: CalculatedColumnSettingsWizardSectionProps) => JSX.Element;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnSettingsWizardSection.js

@@ -3,66 +3,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CalculatedColumnSettingsWizardSection = exports.isValidCalculatedColumnSettings = exports.renderCalculatedColumnSettingsSummary = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
+const react_1 = require("react");
 const rebass_1 = require("rebass");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
-const react_1 = require("react");
 const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
-const CheckBox_1 = require("../../../components/CheckBox");
 const ErrorBox_1 = tslib_1.__importDefault(require("../../../components/ErrorBox"));
 const Tabs_1 = require("../../../components/Tabs");
 const ValueSelector_1 = require("../../Components/ValueSelector");
-const Tag_1 = require("../../../components/Tag");
-const getCalculatedColumnSettingTags_1 = require("../Utilities/getCalculatedColumnSettingTags");
 const SpecialColumnSettingsWizardStep_1 = require("../../SpecialColumnSettingsWizardStep");
+const getCalculatedColumnSettingsTags_1 = require("../Utilities/getCalculatedColumnSettingsTags");
 const renderCalculatedColumnSettingsSummary = (data) => {
-    var _a;
-    const options = getCalculatedColumnSettingTags_1.getCalculatedColumnSettingTags(data.CalculatedColumnSettings);
+    const options = getCalculatedColumnSettingsTags_1.getCalculatedColumnSettingsTags(data.CalculatedColumnSettings);
     return (React.createElement(rebass_1.Box, { fontSize: 2 },
-        React.createElement(rebass_1.Box, null,
-            "Column Identifier: ",
-            React.createElement(Tag_1.Tag, null, data.ColumnId)),
-        data.FriendlyName ? (React.createElement(rebass_1.Box, { mt: 3 },
-            "Column Name: ",
-            React.createElement(Tag_1.Tag, null, (_a = data.FriendlyName) !== null && _a !== void 0 ? _a : data.ColumnId))) : null,
-        React.createElement(rebass_1.Box, { mb: 3 }),
         React.createElement(ValueSelector_1.ValueOptionsTags, { toLabel: (x) => x, toIdentifier: (c) => c, readOnly: true, options: options, value: options })));
 };
 exports.renderCalculatedColumnSettingsSummary = renderCalculatedColumnSettingsSummary;
-const isValidCalculatedColumnSettings = (data, api) => {
+const isValidCalculatedColumnSettings = (data) => {
     var _a;
-    const columns = api.columnApi.getColumns();
-    if (!data.ColumnId) {
-        return 'Column Id cannot be empty';
-    }
     if (!((_a = data.CalculatedColumnSettings) === null || _a === void 0 ? void 0 : _a.DataType)) {
-        return 'No data type specified for column';
+        return 'No data type is specified and it could not be inferred from the defined expression';
     }
-    const columnsWithSameIdCount = columns.filter((c) => c.columnId === data.ColumnId).length;
-    const hasAlreadyExistingId = data.Uuid ? columnsWithSameIdCount > 1 : columnsWithSameIdCount > 0;
-    return hasAlreadyExistingId ? 'A Column already exists with that id' : true;
+    return true;
 };
 exports.isValidCalculatedColumnSettings = isValidCalculatedColumnSettings;
 const CalculatedColumnSettingsWizardSection = (props) => {
     var _a, _b;
     const { data, api } = OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext();
     const calculatedColumnExpressionService = react_1.useMemo(() => api.internalApi.getCalculatedColumnExpressionService(), []);
-    const handleColumnIdChange = (event) => {
-        let e = event.target;
-        props.onChange(Object.assign(Object.assign({}, data), { ColumnId: e.value }));
-    };
-    const handleColumnNameChange = (event) => {
-        let e = event.target;
-        props.onChange(Object.assign(Object.assign({}, data), { FriendlyName: e.value }));
-    };
     const handleDataTypeChange = (dataType) => {
         var _a;
         const aggregatable = dataType == 'Number' ? (_a = data.CalculatedColumnSettings) === null || _a === void 0 ? void 0 : _a.Aggregatable : false;
         props.onChange(Object.assign(Object.assign({}, data), { CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), { DataType: dataType, Aggregatable: aggregatable }) }));
     };
-    const inEdit = props.isEdit;
-    const validCheck = exports.isValidCalculatedColumnSettings(data, api);
+    const validCheck = exports.isValidCalculatedColumnSettings(data);
     const ErrorMessage = validCheck === true ? null : validCheck;
     let options = [
         { value: 'Number', label: 'Number' },
@@ -70,11 +45,8 @@ const CalculatedColumnSettingsWizardSection = (props) => {
         { value: 'Date', label: 'Date' },
         { value: 'Boolean', label: 'Boolean' },
     ];
-    const [ColumnNameFocused, setColumnNameFocused] = react_1.useState(false);
-    const ColumnName = data.FriendlyName;
-    const ColumnId = data.ColumnId;
     let { DataType: dataType } = (_a = data.CalculatedColumnSettings) !== null && _a !== void 0 ? _a : {};
-    const { Width, ShowToolTip, HeaderToolTip } = (_b = data.CalculatedColumnSettings) !== null && _b !== void 0 ? _b : {};
+    const { Width } = (_b = data.CalculatedColumnSettings) !== null && _b !== void 0 ? _b : {};
     const handleSpecialColumnSettingsChange = (settings) => {
         props.onChange(Object.assign(Object.assign({}, data), { CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), settings) }));
     };
@@ -86,18 +58,10 @@ const CalculatedColumnSettingsWizardSection = (props) => {
     }, []);
     return (React.createElement(rebass_1.Box, { "data-name": 'calculated-column-settings' },
         React.createElement(Tabs_1.Tabs, { autoFocus: false },
-            React.createElement(Tabs_1.Tabs.Tab, null, "Column Details"),
+            React.createElement(Tabs_1.Tabs.Tab, null, "Column Settings"),
             React.createElement(Tabs_1.Tabs.Content, null,
                 React.createElement(rebass_1.Flex, { flexDirection: "row" },
                     React.createElement(FormLayout_1.default, null,
-                        React.createElement(FormLayout_1.FormRow, { label: "Column Id" },
-                            React.createElement(Input_1.default, { "data-name": "column-id", value: data.ColumnId || '', width: 300, autoFocus: !inEdit, disabled: inEdit, type: "text", placeholder: "Enter an Id for the column", onChange: handleColumnIdChange })),
-                        React.createElement(FormLayout_1.FormRow, { label: "Name" },
-                            React.createElement(Input_1.default, { "data-name": "column-name", autoFocus: inEdit, onFocus: () => {
-                                    setColumnNameFocused(true);
-                                }, onBlur: () => {
-                                    setColumnNameFocused(false);
-                                }, value: ColumnNameFocused ? ColumnName || '' : ColumnName || ColumnId || '', width: 300, type: "text", placeholder: "Enter column name", onChange: handleColumnNameChange })),
                         React.createElement(FormLayout_1.FormRow, { label: "Data Type" },
                             React.createElement(DropdownButton_1.default, { "data-name": "column-type", style: {
                                     width: '300px',
@@ -112,14 +76,7 @@ const CalculatedColumnSettingsWizardSection = (props) => {
                         React.createElement(FormLayout_1.FormRow, { label: "Width" },
                             React.createElement(Input_1.default, { "data-name": "column-width", type: "number", width: 300, value: Width || '', onChange: (e) => handleSpecialColumnSettingsChange({
                                     Width: Number(e.target.value),
-                                }) })),
-                        React.createElement(FormLayout_1.FormRow, { label: "Header Tooltip" },
-                            React.createElement(Input_1.default, { "data-name": "header-tooltip", type: "text", width: 300, value: HeaderToolTip, onChange: (e) => handleSpecialColumnSettingsChange({
-                                    HeaderToolTip: e.target.value,
-                                }) })),
-                        ' ',
-                        React.createElement(FormLayout_1.FormRow, { label: "" },
-                            React.createElement(CheckBox_1.CheckBox, { "data-name": "column-show-tooltip", onChange: (checked) => handleSpecialColumnSettingsChange({ ShowToolTip: checked }), checked: ShowToolTip }, "Show Expression as Cell Tooltip")))))),
+                                }) })))))),
         ErrorMessage ? React.createElement(ErrorBox_1.default, { marginTop: 2 }, ErrorMessage) : null,
         React.createElement(SpecialColumnSettingsWizardStep_1.SpecialColumnSettingsWizardStep, { isEditable: false, settings: data.CalculatedColumnSettings, onChange: handleSpecialColumnSettingsChange })));
 };

package/src/View/CalculatedColumn/Wizard/CalculatedColumnWizard.js

@@ -8,12 +8,13 @@ const Helper_1 = require("../../../Utilities/Helpers/Helper");
 const react_1 = require("react");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const CalculatedColumnExpressionWizardSection_1 = require("./CalculatedColumnExpressionWizardSection");
-const CalculatedColumnSettingsWizardSection_1 = require("./CalculatedColumnSettingsWizardSection");
+const CalculatedColumnDefinitionWizardSection_1 = require("./CalculatedColumnDefinitionWizardSection");
 const AdaptableContext_1 = require("../../AdaptableContext");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const react_redux_1 = require("react-redux");
 const CalculatedColumnRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/CalculatedColumnRedux"));
 const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
+const CalculatedColumnSettingsWizardSection_1 = require("./CalculatedColumnSettingsWizardSection");
 const CalculatedColumnWizard = (props) => {
     var _a;
     const adaptable = AdaptableContext_1.useAdaptable();
@@ -29,7 +30,7 @@ const CalculatedColumnWizard = (props) => {
                 return calculatedColumn;
             }
         }
-        return ObjectFactory_1.default.CreateEmptyCalculatedColumn(adaptable.api.internalApi.getAdaptableOptions().filterOptions.enableFilterOnSpecialColumns);
+        return ObjectFactory_1.default.CreateEmptyCalculatedColumn();
     });
     const dispatch = react_redux_1.useDispatch();
     const isEdit = Boolean(props.data) || ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit';
@@ -43,6 +44,16 @@ const CalculatedColumnWizard = (props) => {
         props.onCloseWizard();
     };
     return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: calculatedColumn, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+            {
+                title: 'Definition',
+                details: 'Specify Column details',
+                isValid: CalculatedColumnDefinitionWizardSection_1.isValidCalculatedColumnDefinition,
+                renderSummary: CalculatedColumnDefinitionWizardSection_1.renderCalculatedColumnDefinitionSummary,
+                render: () => {
+                    return (React.createElement(rebass_1.Box, { padding: 2 },
+                        React.createElement(CalculatedColumnDefinitionWizardSection_1.CalculatedColumnDefinitionWizardSection, { isEdit: isEdit, onChange: setCalculatedColumn })));
+                },
+            },
             {
                 title: 'Expression',
                 details: 'Specify the Calculated Column Expression',
@@ -54,7 +65,7 @@ const CalculatedColumnWizard = (props) => {
             },
             {
                 title: 'Settings',
-                details: 'Specify Column details and properties',
+                details: 'Specify Column properties',
                 isValid: CalculatedColumnSettingsWizardSection_1.isValidCalculatedColumnSettings,
                 renderSummary: CalculatedColumnSettingsWizardSection_1.renderCalculatedColumnSettingsSummary,
                 render: () => {

package/src/View/Components/AdaptableDateInput/index.js

@@ -21,7 +21,7 @@ const AdaptableDateInput = React.forwardRef((props, ref) => {
             });
         },
     });
-    const dateValue = DateHelper_1.parseFilterInputDate(value);
+    const dateValue = value ? DateHelper_1.parseDateValue(value) : null;
     const datepickerProps = Object.assign({ 
         // this is OK as long as we do not support range datepicker
         value: dateValue, onChange: (dateValue) => { var _a;