@adaptabletools/adaptable 16.0.9 → 16.1.0-canary.0

package/src/Utilities/Services/QueryLanguageService.js

@@ -93,8 +93,7 @@ class QueryLanguageService {
             }
             const force = (_a = config === null || config === void 0 ? void 0 : config.force) !== null && _a !== void 0 ? _a : false;
             // see if validation should be performed
-            if (!this.adaptableApi.optionsApi.getExpressionOptions()
-                .performExpressionValidation &&
+            if (!this.adaptableApi.optionsApi.getExpressionOptions().performExpressionValidation &&
                 !force) {
                 const result = { isValid: true, errorMessage: '' };
                 this.cacheBooleanValidation.set(cacheKey, result);
@@ -266,10 +265,6 @@ class QueryLanguageService {
     getNamedQueryNamesFromExpression(input = '') {
         return this.getNodesFromExpression(input, 'QUERY');
     }
-    isCumulativeAggregate(input) {
-        var _a;
-        return !!((_a = this.getNodesFromExpression(input, 'CUMUL')) === null || _a === void 0 ? void 0 : _a.length);
-    }
     getExpressionWithColumnFriendlyNames(expression = '') {
         let result = expression;
         const columnIds = this.getColumnsFromExpression(expression);

package/src/Utilities/Services/ValidationService.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const ArrayExtensions_1 = require("../Extensions/ArrayExtensions");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
-const ObjectFactory_1 = tslib_1.__importDefault(require("../ObjectFactory"));
 const GeneralConstants_1 = require("../Constants/GeneralConstants");
 class ValidationService {
     constructor(adaptableApi) {
@@ -53,10 +52,21 @@ class ValidationService {
                 cellDataChangedInfo: cellDataChangedInfo,
             };
             this.adaptableApi.alertApi.internalApi.publishAlertFiredEvent(alert);
-            failedRules.forEach((alertDefinition) => {
-                const alert = ObjectFactory_1.default.CreateCellChangedAlert(cellDataChangedInfo.column.friendlyName, this.adaptableApi.alertApi.internalApi.getAlertDescription(alertDefinition, cellDataChangedInfo), alertDefinition, cellDataChangedInfo);
-                this.adaptableApi.alertApi.showAdaptableAlert(alert);
-            });
+            // This is not needed because the change event is triggered regardless
+            // if the edit is succesful. This is because (I think) Adaptable uses a non-standard way ot detecting data changes.
+            // https://github.com/AdaptableTools/adaptable/issues/2197
+            // failedRules.forEach((alertDefinition) => {
+            //   const alert: AdaptableAlert = ObjectFactory.CreateCellChangedAlert(
+            //     cellDataChangedInfo.column.friendlyName,
+            //     this.adaptableApi.alertApi.internalApi.getAlertDescription(
+            //       alertDefinition,
+            //       cellDataChangedInfo
+            //     ),
+            //     alertDefinition,
+            //     cellDataChangedInfo
+            //   );
+            //   this.adaptableApi.alertApi.showAdaptableAlert(alert);
+            // });
             return false;
         }
         return true;

package/src/View/AdaptableView.js

@@ -7,7 +7,6 @@ const react_redux_1 = require("react-redux");
 const ProgressIndicator_1 = require("../components/ProgressIndicator/ProgressIndicator");
 const Toastify_1 = require("../components/Toastify");
 const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
-const CommentPopup_1 = require("./Comments/CommentPopup");
 const AdaptableLoadingScreen_1 = require("./Components/Popups/AdaptableLoadingScreen");
 const AdaptablePopup_1 = require("./Components/Popups/AdaptablePopup");
 const AdaptablePopupConfirmation_1 = require("./Components/Popups/AdaptablePopupConfirmation");
@@ -16,6 +15,7 @@ const FormPopups_1 = require("./Components/Popups/FormPopups/FormPopups");
 const WindowPopups_1 = require("./Components/Popups/WindowPopups/WindowPopups");
 const Dashboard_1 = require("./Dashboard/Dashboard");
 const License_1 = require("./License");
+const NotesPopup_1 = require("./Notes/NotesPopup");
 const FloatingQuickSearch_1 = require("./QuickSearch/FloatingQuickSearch/FloatingQuickSearch");
 const renderWithAdaptableContext_1 = require("./renderWithAdaptableContext");
 class AdaptableView extends React.Component {
@@ -24,7 +24,7 @@ class AdaptableView extends React.Component {
         const watermark = (_d = (_c = (_b = (_a = this.props.AdaptableApi) === null || _a === void 0 ? void 0 : _a.internalApi) === null || _b === void 0 ? void 0 : _b.getSystemState()) === null || _c === void 0 ? void 0 : _c.License) === null || _d === void 0 ? void 0 : _d.watermark;
         const adaptableOptions = this.props.AdaptableApi.optionsApi.getAdaptableOptions();
         return (React.createElement("div", null,
-            React.createElement(CommentPopup_1.CommentPopup, null),
+            React.createElement(NotesPopup_1.NotePopup, null),
             React.createElement(FloatingQuickSearch_1.QuickSearchDrawer, null),
             this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard_1.Dashboard, { api: this.props.AdaptableApi })),
             this.props.AdaptableApi.optionsApi.getUserInterfaceOptions().showLoadingScreen && (React.createElement(AdaptableLoadingScreen_1.AdaptableLoadingScreen, { onClose: this.props.onCloseLoadingPopup, showLoadingScreen: this.props.PopupState.LoadingPopup.ShowLoadingPopup })),

package/src/View/AdaptableViewFactory.js

@@ -6,7 +6,7 @@ const SmartEditPopup_1 = require("./SmartEdit/SmartEditPopup");
 const QuickSearchPopup_1 = require("./QuickSearch/QuickSearchPopup");
 const ThemePopup_1 = require("./Theme/ThemePopup");
 const ToolPanelPopup_1 = require("./Components/ToolPanel/ToolPanelPopup");
-const GridInfoPopup_1 = require("./GridInfo/GridInfoPopup");
+const GridInfoPopup_1 = require("./GridInfo/GridInfoPopup/GridInfoPopup");
 const DashboardPopup_1 = require("./Dashboard/DashboardPopup");
 const StateManagementPopup_1 = require("./StateManagement/StateManagementPopup");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
@@ -31,12 +31,15 @@ const DataChangeHistoryViewPanel_1 = require("./DataChangeHistory/DataChangeHist
 const StateManagementViewPanel_1 = require("./StateManagement/StateManagementViewPanel");
 const StatusBarPopup_1 = require("./StatusBar/StatusBarPopup");
 const ChartingViewPanel_1 = require("./Charting/ChartingViewPanel");
-const CommentListing_1 = require("./Comments/CommentListing");
+const ColumnInfoPopup_1 = require("./ColumnInfo/ColumnInfoPopup");
+const NotesListing_1 = require("./Notes/NotesListing");
+const DataImportPopup_1 = require("./DataImport/DataImportPopup");
 exports.AdaptableViewFactory = {
     BulkUpdatePopup: BulkUpdatePopup_1.BulkUpdatePopup,
     DashboardPopup: DashboardPopup_1.DashboardPopup,
     StateManagementPopup: StateManagementPopup_1.StateManagementPopup,
     GridInfoPopup: GridInfoPopup_1.GridInfoPopup,
+    ColumnInfoPopup: ColumnInfoPopup_1.ColumnInfoPopup,
     StatusBarPopup: StatusBarPopup_1.StatusBarPopup,
     QuickSearchPopup: QuickSearchPopup_1.QuickSearchPopup,
     CellSummaryPopup: CellSummaryPopup_1.CellSummaryPopup,
@@ -45,7 +48,8 @@ exports.AdaptableViewFactory = {
     ToolPanelPopup: ToolPanelPopup_1.ToolPanelPopup,
     SystemStatusPopup: SystemStatusPopup_1.SystemStatusPopup,
     DataChangeHistoryPopup: DataChangeHistoryPopup_1.DataChangeHistoryPopup,
-    CommentsPopup: CommentListing_1.CommentsListing,
+    NotesPopup: NotesListing_1.NotesListing,
+    DataImportPopup: DataImportPopup_1.DataImportPopup,
 };
 exports.AdaptableViewPanelFactory = new Map([
     [ModuleConstants.AlertModuleId, AlertViewPanel_1.AlertViewPanelControl],

package/src/View/Alert/Wizard/AlertButtonsEditor.js

@@ -12,6 +12,7 @@ const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayou
 const CheckBox_1 = require("../../../components/CheckBox");
 const Helper_1 = require("../../../Utilities/Helpers/Helper");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
+const AdaptableIconSelector_1 = require("../../Components/AdaptableIconSelector");
 const AlertButtonsEditor = (props) => {
     const { api, adaptableAlert } = props;
     const onChange = (newButtons) => {
@@ -67,7 +68,7 @@ const AlertButtonsEditor = (props) => {
                     ]);
                 } }, "Add")),
         AlertButtons.map((button, index) => {
-            var _a, _b;
+            var _a, _b, _c;
             let buttonStyle = button.ButtonStyle;
             let buttonLabel = button.Label;
             let btnActions = [];
@@ -120,6 +121,19 @@ const AlertButtonsEditor = (props) => {
                     return btn;
                 }));
             };
+            let iconSelector = null;
+            if (!button.icon || (button.icon && 'name' in button.icon)) {
+                iconSelector = (React.createElement(AdaptableIconSelector_1.AdaptableIconSelector, { value: button.icon && 'name' in button.icon ? (_a = button === null || button === void 0 ? void 0 : button.icon) === null || _a === void 0 ? void 0 : _a.name : '', onChange: (iconName) => {
+                        onChange(AlertButtons.map((btn) => {
+                            if (btn === button) {
+                                return Object.assign(Object.assign({}, btn), { icon: {
+                                        name: iconName,
+                                    } });
+                            }
+                            return btn;
+                        }));
+                    } }));
+            }
             return (React.createElement(rebass_1.Box, { key: index, marginLeft: 3, style: {
                     borderTop: index ? '1px dashed var(--ab-color-inputborder)' : '',
                 } },
@@ -144,7 +158,7 @@ const AlertButtonsEditor = (props) => {
                                 React.createElement(rebass_1.Text, { fontSize: 2 },
                                     "Variant:",
                                     ' ',
-                                    StringExtensions_1.default.CapitaliseFirstLetter((_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant) !== null && _a !== void 0 ? _a : 'raised'))),
+                                    StringExtensions_1.default.CapitaliseFirstLetter((_b = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant) !== null && _b !== void 0 ? _b : 'raised'))),
                             React.createElement(DropdownButton_1.default, { columns: ['label'], marginLeft: 2, style: { minWidth: 120 }, items: [
                                     {
                                         label: 'Use Alert Tone',
@@ -162,7 +176,7 @@ const AlertButtonsEditor = (props) => {
                                 React.createElement(rebass_1.Text, { fontSize: 2 },
                                     "Tone:",
                                     ' ',
-                                    StringExtensions_1.default.CapitaliseFirstLetter((_b = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _b !== void 0 ? _b : 'Use alert tone'))),
+                                    StringExtensions_1.default.CapitaliseFirstLetter((_c = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _c !== void 0 ? _c : 'Use alert tone'))),
                             React.createElement(SimpleButton_1.default, { icon: "close", tone: "error", disabled: AlertButtons.length <= 1, marginLeft: 1, variant: "text", tooltip: AlertButtons.length <= 1 ? 'Cannot remove last button' : 'Remove button', onClick: () => {
                                     onChange(AlertButtons.filter((btn) => btn !== button));
                                 } }))),
@@ -178,7 +192,9 @@ const AlertButtonsEditor = (props) => {
                                 btnUserFunctions.length > 1 ? 's' : '',
                                 ":",
                                 ' ',
-                                btnUserFunctions.join(', ')))) : null))));
+                                btnUserFunctions.join(', ')))) : null),
+                    iconSelector && (React.createElement(FormLayout_1.FormRow, { label: React.createElement(rebass_1.Text, { fontSize: 2 }, "Icon") },
+                        React.createElement(rebass_1.Box, null, iconSelector))))));
         })));
 };
 exports.AlertButtonsEditor = AlertButtonsEditor;

package/src/View/Alert/Wizard/AlertWizard.js

@@ -30,17 +30,24 @@ const AlertWizard = (props) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const behaviourSpelling = api.internalApi.getCorrectEnglishVariant('Behaviour');
     const [alertDefinition, setAlertDefinition] = (0, react_1.useState)(() => {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g;
         const alertDefinition = props.data
             ? (0, Helper_1.cloneObject)(props.data)
             : ObjectFactory_1.default.CreateEmptyAlertDefinition();
-        if (!alertDefinition.Rule.BooleanExpression &&
-            !alertDefinition.Rule.ObservableExpression &&
-            !alertDefinition.Rule.AggregatedBooleanExpression &&
-            !alertDefinition.Rule.Predicates) {
-            alertDefinition.Rule.BooleanExpression = '';
+        if (!((_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.BooleanExpression) &&
+            !((_b = alertDefinition.Rule) === null || _b === void 0 ? void 0 : _b.ObservableExpression) &&
+            !((_c = alertDefinition.Rule) === null || _c === void 0 ? void 0 : _c.AggregatedBooleanExpression) &&
+            !((_d = alertDefinition.Rule) === null || _d === void 0 ? void 0 : _d.Predicates)) {
+            alertDefinition.Rule = {
+                BooleanExpression: '',
+            };
+        }
+        if (((_e = props.popupParams) === null || _e === void 0 ? void 0 : _e.column) && ((_f = props.popupParams) === null || _f === void 0 ? void 0 : _f.action) === 'New') {
+            alertDefinition.Scope = {
+                ColumnIds: [props.popupParams.column.columnId],
+            };
         }
-        alertDefinition.MessageType = (_a = alertDefinition.MessageType) !== null && _a !== void 0 ? _a : GeneralConstants_1.ALERT_DEFAULT_MESSAGE_TYPE;
+        alertDefinition.MessageType = (_g = alertDefinition.MessageType) !== null && _g !== void 0 ? _g : GeneralConstants_1.ALERT_DEFAULT_MESSAGE_TYPE;
         return alertDefinition;
     });
     // Alert type is based initialy on data, but can be changed by the user

package/src/View/CalculatedColumn/CalculatedColumnSummary.d.ts

@@ -15,4 +15,4 @@ export declare class CalculatedColumnSummaryComponent extends React.Component<Ca
     onCloseWizard(): void;
     onFinishWizard: (calculatedColumn: CalculatedColumn) => void;
 }
-export declare let CalculatedColumnSummary: import("react-redux").ConnectedComponent<typeof CalculatedColumnSummaryComponent, import("react-redux").Omit<React.ClassAttributes<CalculatedColumnSummaryComponent> & CalculatedColumnSummaryProps, "key" | "ref" | "onSuspend" | "api" | "accessLevel" | "modalContainer" | "CalculatedColumns" | "moduleInfo" | "popupParams" | "onClearPopupParams" | "teamSharingActivated" | "onClosePopup" | "onUnSuspend" | "onShare" | "onEdit" | "summarisedColumn" | "onDeleteConfirm">>;
+export declare let CalculatedColumnSummary: import("react-redux").ConnectedComponent<typeof CalculatedColumnSummaryComponent, import("react-redux").Omit<React.ClassAttributes<CalculatedColumnSummaryComponent> & CalculatedColumnSummaryProps, "key" | "ref" | "onSuspend" | "api" | "accessLevel" | "modalContainer" | "CalculatedColumns" | "moduleInfo" | "popupParams" | "onClearPopupParams" | "teamSharingActivated" | "onClosePopup" | "onUnSuspend" | "onShare" | "onDeleteConfirm" | "onEdit" | "summarisedColumn">>;

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

@@ -1,8 +1,10 @@
 /// <reference types="react" />
 import { CalculatedColumn } from '../../../types';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
+import { ExpressionType } from './CalculatedColumnWizard';
 export declare type CalculatedColumnExpressionWizardSectionProps = {
     onChange: (data: CalculatedColumn) => void;
+    expressionType: ExpressionType;
 };
 export declare const renderCalculatedColumnExpressionSummary: (data: CalculatedColumn) => JSX.Element;
 export declare const isValidCalculatedColumnExpression: (data: CalculatedColumn, api: AdaptableApi) => true | string;

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

@@ -9,7 +9,7 @@ const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const ExpressionEditor_1 = require("../../../components/ExpressionEditor");
 const Tabs_1 = require("../../../components/Tabs");
 const CodeBlock_1 = require("../../../components/CodeBlock");
-const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
+const StringExtensions_1 = require("../../../Utilities/Extensions/StringExtensions");
 const renderCalculatedColumnExpressionSummary = (data) => {
     const { api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     return (React.createElement(rebass_1.Box, { fontSize: 2 },
@@ -32,58 +32,37 @@ const isValidCalculatedColumnExpression = (data, api) => {
     return true;
 };
 exports.isValidCalculatedColumnExpression = isValidCalculatedColumnExpression;
-const QueryTab = (props) => {
-    const { type, label, disabled = false } = props, tabProps = tslib_1.__rest(props, ["type", "label", "disabled"]);
-    const text = (React.createElement(rebass_1.Flex, { flexDirection: "column" },
-        label,
-        " ",
-        React.createElement(rebass_1.Text, { fontSize: 2 }, "query")));
-    return (React.createElement(Tabs_1.Tabs.Tab, Object.assign({ style: { flex: 1 } }, tabProps), !disabled ? (React.createElement(Radio_1.default, { tabIndex: -1, margin: 0, checked: type === props.value, style: { alignItems: 'baseline' } }, text)) : (text)));
-};
-// needed here to be considered a child Tab component, inside the Tabs component
-QueryTab.defaultProps = {
-    isTabsTab: true,
-};
 const CalculatedColumnExpressionWizardSection = (props) => {
     const { api, data, moduleInfo } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const initialData = (0, react_1.useMemo)(() => api.internalApi.getQueryPreviewData(), []);
-    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: '',
-                } }));
-        }
-    };
     const setCalculatedColumnExpression = (calculatedColumnQuery) => {
         const calculatedColumnExpressionService = api.internalApi.getCalculatedColumnExpressionService();
         const dataType = calculatedColumnExpressionService.getCalculatedColumnDataType(calculatedColumnQuery);
         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: 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.getNamedQueries(), isFullExpression: true, api: api })),
-        React.createElement(QueryTab, { value: "AggregatedScalarExpression", type: selectedTab, label: "Aggregated Scalar" }),
-        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.getNamedQueries(), isFullExpression: true, api: api })),
-        React.createElement(QueryTab, { value: "CumulativeAggregateExpression", type: selectedTab, label: "Cumulative" }),
-        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.getNamedQueries(), isFullExpression: true, api: api }))));
+    const getEditorType = (expressionType) => {
+        switch (expressionType) {
+            case 'AggregatedScalarExpression':
+                return 'aggregatedScalar';
+            case 'CumulativeAggregatedExpression':
+                return 'cumulativeAggregatedScalar';
+            case 'QuantileAggregatedExpression':
+                return 'quantileAggregatedScalar';
+        }
+    };
+    return (React.createElement(Tabs_1.Tabs, { autoFocus: false },
+        React.createElement(Tabs_1.Tabs.Tab, null, (0, StringExtensions_1.Humanize)(props.expressionType)),
+        React.createElement(Tabs_1.Tabs.Content, null, (() => {
+            switch (props.expressionType) {
+                case 'ScalarExpression':
+                    return (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.getNamedQueries(), isFullExpression: true, api: api }));
+                case 'AggregatedScalarExpression':
+                case 'CumulativeAggregatedExpression':
+                case 'QuantileAggregatedExpression':
+                    return (React.createElement(ExpressionEditor_1.ExpressionEditor, { type: getEditorType(props.expressionType), module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.AggregatedScalarExpression, onChange: (AggregatedScalarExpression) => setCalculatedColumnExpression({ AggregatedScalarExpression }), initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getNamedQueries(), isFullExpression: true, api: api }));
+                default:
+                    return React.createElement(React.Fragment, null);
+            }
+        })())));
 };
 exports.CalculatedColumnExpressionWizardSection = CalculatedColumnExpressionWizardSection;

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { ExpressionType } from './CalculatedColumnWizard';
+declare type CalculatedColumnTypeWizardSectionProps = {
+    onTypeChange: (type: ExpressionType) => void;
+    type: ExpressionType;
+};
+export declare const CalculatedColumnTypeWizardSection: (props: CalculatedColumnTypeWizardSectionProps) => JSX.Element;
+export {};

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

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CalculatedColumnTypeWizardSection = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const rebass_1 = require("rebass");
+const Tabs_1 = require("../../../components/Tabs");
+const TypeRadio_1 = require("../../Wizard/TypeRadio");
+const CalculatedColumnTypeWizardSection = (props) => {
+    return (React.createElement(Tabs_1.Tabs, null,
+        React.createElement(Tabs_1.Tabs.Tab, null, "Calculated Column Type"),
+        React.createElement(Tabs_1.Tabs.Content, null,
+            React.createElement(rebass_1.Flex, { flexDirection: "column" },
+                React.createElement(TypeRadio_1.TypeRadio, { text: 'Scalar Expression', description: "The calculated value is derived from other cells in the row", checked: props.type === 'ScalarExpression', onClick: () => props.onTypeChange('ScalarExpression') }),
+                React.createElement(TypeRadio_1.TypeRadio, { text: 'Aggregated Scalar Expression', description: "The calculated value is derived from other rows", checked: props.type === 'AggregatedScalarExpression', onClick: () => props.onTypeChange('AggregatedScalarExpression') }),
+                React.createElement(TypeRadio_1.TypeRadio, { text: 'Cumulative Aggregated Expression', description: "The calculated value is derived cumulatively from other rows", checked: props.type === 'CumulativeAggregatedExpression', onClick: () => props.onTypeChange('CumulativeAggregatedExpression') }),
+                React.createElement(TypeRadio_1.TypeRadio, { text: 'Quantile Aggregated Expression', description: "The calculated value is derived from other rows using quantile aggregations", checked: props.type === 'QuantileAggregatedExpression', onClick: () => props.onTypeChange('QuantileAggregatedExpression') })))));
+};
+exports.CalculatedColumnTypeWizardSection = CalculatedColumnTypeWizardSection;

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

@@ -1,6 +1,8 @@
 /// <reference types="react" />
 import { CalculatedColumn } from '../../../types';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
+export declare const calculatedColumnTypes: readonly ["ScalarExpression", "AggregatedScalarExpression", "CumulativeAggregatedExpression", "QuantileAggregatedExpression"];
+export declare type ExpressionType = typeof calculatedColumnTypes[number];
 export interface CalculatedColumnWizardProps extends AdaptableOnePageWizardProps<CalculatedColumn> {
 }
 export declare const CalculatedColumnWizard: (props: CalculatedColumnWizardProps) => JSX.Element;

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CalculatedColumnWizard = void 0;
+exports.CalculatedColumnWizard = exports.calculatedColumnTypes = 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 Helper_1 = require("../../../Utilities/Helpers/Helper");
-const react_1 = require("react");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const CalculatedColumnExpressionWizardSection_1 = require("./CalculatedColumnExpressionWizardSection");
 const CalculatedColumnDefinitionWizardSection_1 = require("./CalculatedColumnDefinitionWizardSection");
@@ -15,6 +15,16 @@ 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 utils_1 = require("../utils");
+const StringExtensions_1 = require("../../../Utilities/Extensions/StringExtensions");
+const Tag_1 = require("../../../components/Tag");
+const CalculatedColumnTypeSection_1 = require("./CalculatedColumnTypeSection");
+exports.calculatedColumnTypes = [
+    'ScalarExpression',
+    'AggregatedScalarExpression',
+    'CumulativeAggregatedExpression',
+    'QuantileAggregatedExpression',
+];
 const CalculatedColumnWizard = (props) => {
     var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -43,7 +53,37 @@ const CalculatedColumnWizard = (props) => {
         }
         props.onCloseWizard();
     };
+    const [expressionType, setExpressionType] = (0, react_1.useState)(() => {
+        var _a;
+        return (_a = (0, utils_1.getExpressionType)(props.data, adaptable.api)) !== null && _a !== void 0 ? _a : 'ScalarExpression';
+    });
+    const handleExpressionTypeChange = (type) => {
+        setExpressionType(type);
+        if (expressionType === 'ScalarExpression') {
+            setCalculatedColumn(Object.assign(Object.assign({}, calculatedColumn), { Query: {
+                    ScalarExpression: '',
+                } }));
+        }
+        else {
+            // Aggregated, Cumulative & Quantile are all AggregatedScalarExpression
+            setCalculatedColumn(Object.assign(Object.assign({}, calculatedColumn), { Query: {
+                    AggregatedScalarExpression: '',
+                } }));
+        }
+    };
     return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: calculatedColumn, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+            {
+                title: 'Type',
+                renderSummary: () => {
+                    return (React.createElement(rebass_1.Box, null,
+                        "Expression Type: ",
+                        React.createElement(Tag_1.Tag, null, (0, StringExtensions_1.Humanize)(expressionType))));
+                },
+                render: () => {
+                    return (React.createElement(rebass_1.Box, { p: 2 },
+                        React.createElement(CalculatedColumnTypeSection_1.CalculatedColumnTypeWizardSection, { type: expressionType, onTypeChange: handleExpressionTypeChange })));
+                },
+            },
             {
                 title: 'Definition',
                 details: 'Specify Column details',
@@ -60,7 +100,8 @@ const CalculatedColumnWizard = (props) => {
                 isValid: CalculatedColumnExpressionWizardSection_1.isValidCalculatedColumnExpression,
                 renderSummary: CalculatedColumnExpressionWizardSection_1.renderCalculatedColumnExpressionSummary,
                 render: () => {
-                    return React.createElement(CalculatedColumnExpressionWizardSection_1.CalculatedColumnExpressionWizardSection, { onChange: setCalculatedColumn });
+                    return (React.createElement(rebass_1.Box, { p: 2 },
+                        React.createElement(CalculatedColumnExpressionWizardSection_1.CalculatedColumnExpressionWizardSection, { expressionType: expressionType, onChange: setCalculatedColumn })));
                 },
             },
             {

package/src/View/CalculatedColumn/utils.d.ts

@@ -0,0 +1,2 @@
+import { AdaptableApi, CalculatedColumn } from '../../types';
+export declare const getExpressionType: (calculatedColumn: CalculatedColumn, api: AdaptableApi) => "ScalarExpression" | "AggregatedScalarExpression" | "CumulativeAggregatedExpression" | "QuantileAggregatedExpression";

package/src/View/CalculatedColumn/utils.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getExpressionType = void 0;
+const getExpressionType = (calculatedColumn, api) => {
+    var _a;
+    return ((_a = calculatedColumn === null || calculatedColumn === void 0 ? void 0 : calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.AggregatedScalarExpression) == undefined
+        ? 'ScalarExpression'
+        : api.calculatedColumnApi.internalApi.isCumulativeAggregatedExpression(calculatedColumn.Query.AggregatedScalarExpression)
+            ? 'CumulativeAggregatedExpression'
+            : api.calculatedColumnApi.internalApi.isQuantileAggregatedExpression(calculatedColumn.Query.AggregatedScalarExpression)
+                ? 'QuantileAggregatedExpression'
+                : 'AggregatedScalarExpression';
+};
+exports.getExpressionType = getExpressionType;

package/src/View/Charting/ChartingWizard/AgChargingWizard/AgChargingWizard.d.ts

@@ -0,0 +1,6 @@
+import * as React from 'react';
+import { ChartDefinition } from '../../../../types';
+import { AdaptableOnePageWizardProps } from '../../../Wizard/Interface/IAdaptableWizard';
+export interface AgChargingWizardProps extends AdaptableOnePageWizardProps<ChartDefinition> {
+}
+export declare const AgChargingWizard: React.FunctionComponent<AgChargingWizardProps>;

package/src/View/Charting/ChartingWizard/AgChargingWizard/AgChargingWizard.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AgChargingWizard = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const rebass_1 = require("rebass");
+const AdaptableContext_1 = require("../../../AdaptableContext");
+const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
+const PreviewChartSection_1 = require("./PreviewChartSection");
+const SettingsSection_1 = require("./SettingsSection");
+const ObjectTagsWizardSection_1 = require("../../../Wizard/ObjectTagsWizardSection");
+const AgChargingWizard = (props) => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const [chartDefinition, setChartDefinition] = React.useState(() => {
+        var _a, _b;
+        return (_a = props.data) !== null && _a !== void 0 ? _a : (_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.value;
+    });
+    const handleFinish = React.useCallback(() => {
+        adaptable.api.chartingApi.editChartDefinition(chartDefinition);
+        props.onFinishWizard(chartDefinition);
+    }, [chartDefinition]);
+    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: chartDefinition, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+            {
+                title: 'Settings',
+                details: 'Chart Settings',
+                isValid: SettingsSection_1.isSettingsValid,
+                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
+                    React.createElement(SettingsSection_1.SettingsSection, { chartDefinition: chartDefinition, onChange: setChartDefinition }))),
+            },
+            {
+                details: 'Select Chart Tags',
+                title: 'Tags',
+                isVisible: () => adaptable.api.internalApi.shouldDisplayTagSections(),
+                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
+                    React.createElement(ObjectTagsWizardSection_1.ObjectTagsWizardSection, { onChange: setChartDefinition }))),
+                renderSummary: ObjectTagsWizardSection_1.renderObjectTagsSummary,
+            },
+            '-',
+            {
+                title: 'Preview Chart',
+                details: 'Chart Preview',
+                render: () => (React.createElement(rebass_1.Box, { p: 2 },
+                    React.createElement(PreviewChartSection_1.PreviewChartSection, { chartDefinition: chartDefinition, onChange: setChartDefinition }))),
+            },
+        ] }));
+};
+exports.AgChargingWizard = AgChargingWizard;

package/src/View/Charting/ChartingWizard/{PreviewChartSection.d.ts → AgChargingWizard/PreviewChartSection.d.ts}

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ChartDefinition } from '../../../types';
+import { ChartDefinition } from '../../../../types';
 export declare const PreviewChartSection: React.FunctionComponent<{
     chartDefinition: ChartDefinition;
     onChange: (chartDefinition: ChartDefinition) => void;

package/src/View/Charting/ChartingWizard/{PreviewChartSection.js → AgChargingWizard/PreviewChartSection.js}

@@ -5,8 +5,8 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
-const SystemRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/SystemRedux"));
-const AdaptableContext_1 = require("../../AdaptableContext");
+const SystemRedux = tslib_1.__importStar(require("../../../../Redux/ActionsReducers/SystemRedux"));
+const AdaptableContext_1 = require("../../../AdaptableContext");
 const PreviewChartSection = (props) => {
     const currentChartModels = (0, react_redux_1.useSelector)((state) => SystemRedux.SystemChartingCurrentChartModelsSelector(state.System));
     const [localChartId, setLocalChartId] = React.useState(null);

package/src/View/Charting/ChartingWizard/{SettingsSection.d.ts → AgChargingWizard/SettingsSection.d.ts}

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableApi, ChartDefinition } from '../../../types';
+import { AdaptableApi, ChartDefinition } from '../../../../types';
 export declare const isSettingsValid: (chartDefinition: ChartDefinition, api: AdaptableApi) => true | string;
 export interface SettingsSectionProps {
     chartDefinition: ChartDefinition;

package/src/View/Charting/ChartingWizard/{SettingsSection.js → AgChargingWizard/SettingsSection.js}

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SettingsSection = exports.isSettingsValid = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const CheckBox_1 = require("../../../components/CheckBox");
-const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
-const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
-const AdaptableInput_1 = tslib_1.__importDefault(require("../../Components/AdaptableInput"));
+const CheckBox_1 = require("../../../../components/CheckBox");
+const DropdownButton_1 = tslib_1.__importDefault(require("../../../../components/DropdownButton"));
+const FormLayout_1 = tslib_1.__importStar(require("../../../../components/FormLayout"));
+const AdaptableInput_1 = tslib_1.__importDefault(require("../../../Components/AdaptableInput"));
 const isSettingsValid = (chartDefinition, api) => {
     if (!chartDefinition.Name) {
         return 'Name is mandatory';

package/src/View/Charting/ChartingWizard/AgChargingWizard/index.d.ts

@@ -0,0 +1 @@
+export * from './AgChargingWizard';

package/src/View/Charting/ChartingWizard/AgChargingWizard/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./AgChargingWizard"), exports);

package/src/View/Charting/ChartingWizard/ChartingWizard.d.ts

@@ -1,6 +1,7 @@
-import * as React from 'react';
+import { FunctionComponent } from 'react';
+import { ExternalChartDefinition } from '../../../PredefinedConfig/ChartingState';
 import { ChartDefinition } from '../../../types';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
-export interface ChartingWizardProps extends AdaptableOnePageWizardProps<ChartDefinition> {
+export interface AgChargingWizardProps extends AdaptableOnePageWizardProps<ChartDefinition | ExternalChartDefinition> {
 }
-export declare const ChartingWizard: React.FunctionComponent<ChartingWizardProps>;
+export declare const ChartingWizard: FunctionComponent<AgChargingWizardProps>;