@adaptabletools/adaptable 19.2.4 → 20.0.0-canary.0

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

@@ -4,7 +4,7 @@ import { useOnePageAdaptableWizardContext } from '../../Wizard/OnePageAdaptableW
 import { ValueOptionsTags } from '../../Components/ValueSelector';
 export const renderScopeSummary = (data) => {
     const { api: { columnScopeApi: scopeApi }, } = useOnePageAdaptableWizardContext();
-    const columnsInScope = scopeApi.getColumnsForScope(data.Scope);
+    const columnsInScope = scopeApi.getColumnsInScope(data.Scope);
     return (React.createElement(React.Fragment, null,
         React.createElement(Box, null,
             React.createElement(Text, { fontSize: 2 }, scopeApi.scopeIsAll(data.Scope)

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

@@ -1,7 +1,6 @@
 import { isAdaptableRuleValid } from '../../Components/EntityRulesEditor/Utilities';
 export const isValidAlertRules = (alert, api, context) => {
-    var _a;
-    if (!((_a = alert.Rule.Predicates) === null || _a === void 0 ? void 0 : _a.length) &&
+    if (!alert.Rule.Predicates?.length &&
         !alert.Rule.BooleanExpression &&
         !alert.Rule.ObservableExpression &&
         !alert.Rule.AggregatedBooleanExpression) {

package/src/View/BulkUpdate/BulkUpdatePopup.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import * as BulkUpdateRedux from '../../Redux/ActionsReducers/BulkUpdateRedux';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
 import { BulkUpdateValidationResult } from '../../Strategy/Interface/IBulkUpdateModule';
@@ -9,8 +9,8 @@ interface BulkUpdatePopupProps extends ModuleViewPopupProps<BulkUpdatePopupCompo
     BulkUpdateValue: string;
     BulkUpdateValidationResult: BulkUpdateValidationResult;
     PreviewInfo: PreviewInfo;
-    onBulkUpdateValueChange: (value: string) => SystemRedux.BulkUpdateChangeValueAction;
-    onBulkUpdateCheckSelectedCells: () => SystemRedux.BulkUpdateCheckCellSelectionAction;
+    onBulkUpdateValueChange: (value: string) => InternalRedux.BulkUpdateChangeValueAction;
+    onBulkUpdateCheckSelectedCells: () => InternalRedux.BulkUpdateCheckCellSelectionAction;
     onApplyBulkUpdate: () => BulkUpdateRedux.BulkUpdateApplyAction;
     SelectedGridCells: GridCell[];
 }
@@ -22,12 +22,14 @@ export interface BulkUpdatePopupState {
 declare class BulkUpdatePopupComponent extends React.Component<BulkUpdatePopupProps, BulkUpdatePopupState> {
     constructor(props: BulkUpdatePopupProps);
     componentDidMount(): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     private onColumnValueSelectedChanged;
     private onUseColumnValuesSelectorChanged;
     private onBulkUpdateValueChange;
     private onApplyClick;
     private onApplyBulkUpdate;
 }
-export declare let BulkUpdatePopup: import("react-redux").ConnectedComponent<typeof BulkUpdatePopupComponent, any>;
+export declare let BulkUpdatePopup: import("react-redux").ConnectedComponent<typeof BulkUpdatePopupComponent, {
+    [x: string]: any;
+}>;
 export {};

package/src/View/BulkUpdate/BulkUpdatePopup.js

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { connect } from 'react-redux';
 import * as BulkUpdateRedux from '../../Redux/ActionsReducers/BulkUpdateRedux';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { PanelWithImage } from '../Components/Panels/PanelWithImage';
 import { AdaptablePopover } from '../AdaptablePopover';
 import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';
 import { PreviewResultsPanel } from '../Components/PreviewResultsPanel';
 import { PreviewHelper } from '../../Utilities/Helpers/PreviewHelper';
-import { ColumnValueSelector } from '../Components/Selectors/ColumnValueSelector';
+import { BulkUpdateValueSelector } from '../Components/Selectors/BulkUpdateValueSelector';
 import { Flex } from 'rebass';
 import SimpleButton from '../../components/SimpleButton';
 import HelpBlock from '../../components/HelpBlock';
@@ -26,7 +26,7 @@ class BulkUpdatePopupComponent extends React.Component {
         let dataTypeErrorMessage = '';
         if (col && StringExtensions.IsNotNullOrEmpty(this.props.BulkUpdateValue)) {
             // check that the update value is a number for a numeric column.  not issue for dates as we dont allow free text
-            if (col.dataType == 'Number') {
+            if (col.dataType == 'number') {
                 if (isNaN(Number(this.props.BulkUpdateValue))) {
                     hasDataTypeError = true;
                     dataTypeErrorMessage = 'This column only accepts numbers';
@@ -42,11 +42,11 @@ class BulkUpdatePopupComponent extends React.Component {
             return null;
         }
         return (React.createElement(PanelWithImage, { bodyProps: { padding: 2 }, flex: 1, glyphicon: this.props.moduleInfo.Glyph, header: this.props.moduleInfo.FriendlyName, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), variant: "primary" },
-            col.dataType == 'Date' ? (React.createElement(React.Fragment, null,
+            col.dataType == 'date' ? (React.createElement(React.Fragment, null,
                 React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, "Enter a date value. Alternatively, tick the checkbox and select from an existing column value."),
                 React.createElement(Flex, { padding: 2, flexDirection: "row", alignItems: "center" },
                     React.createElement(Flex, { alignItems: "center", flexDirection: "row", flex: 1, marginRight: 2 },
-                        React.createElement(ColumnValueSelector, { selectedGridCells: this.props.SelectedGridCells, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: col, api: this.props.api, onColumnValueChange: (values) => this.onColumnValueSelectedChanged(values), allowNew: false, style: { width: '100%', maxWidth: 'inherit' } })),
+                        React.createElement(BulkUpdateValueSelector, { selectedGridCells: this.props.SelectedGridCells, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: col, api: this.props.api, onColumnValueChange: (values) => this.onColumnValueSelectedChanged(values), allowNew: false, style: { width: '100%', maxWidth: 'inherit' } })),
                     React.createElement(SimpleButton, { disabled: StringExtensions.IsNullOrEmpty(this.props.BulkUpdateValue) ||
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All', onClick: () => {
                             this.onApplyClick();
@@ -54,7 +54,7 @@ class BulkUpdatePopupComponent extends React.Component {
                 React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, "Select an existing Column value from the dropdown, or enter a new value"),
                 React.createElement(Flex, { marginTop: 2, flexDirection: "row", alignItems: "center" },
                     React.createElement(Flex, { alignItems: "center", flexDirection: "row", flex: 1, marginRight: 2 },
-                        React.createElement(ColumnValueSelector, { selectedGridCells: this.props.SelectedGridCells, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: col, api: this.props.api, onColumnValueChange: (columns) => this.onColumnValueSelectedChanged(columns), style: { width: '100%', maxWidth: 'inherit' } })),
+                        React.createElement(BulkUpdateValueSelector, { selectedGridCells: this.props.SelectedGridCells, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: col, api: this.props.api, onColumnValueChange: (columns) => this.onColumnValueSelectedChanged(columns), style: { width: '100%', maxWidth: 'inherit' } })),
                     React.createElement(SimpleButton, { disabled: StringExtensions.IsNullOrEmpty(this.props.BulkUpdateValue) ||
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All' ||
                             hasDataTypeError, variant: "raised", tone: "accent", marginRight: 2, onClick: () => {
@@ -85,18 +85,17 @@ class BulkUpdatePopupComponent extends React.Component {
     }
 }
 function mapStateToProps(state, ownProps) {
-    var _a;
     return {
-        BulkUpdateValue: state.System.BulkUpdateValue,
-        PreviewInfo: state.System.BulkUpdatePreviewInfo,
-        BulkUpdateValidationResult: state.System.BulkUpdateValidationResult,
-        SelectedGridCells: (_a = state.Grid.SelectedCellInfo) === null || _a === void 0 ? void 0 : _a.gridCells,
+        BulkUpdateValue: state.Internal.BulkUpdate.BulkUpdateValue,
+        PreviewInfo: state.Internal.BulkUpdate.BulkUpdatePreviewInfo,
+        BulkUpdateValidationResult: state.Internal.BulkUpdate.BulkUpdateValidationResult,
+        SelectedGridCells: state.Internal.SelectedCellInfo?.gridCells,
     };
 }
 function mapDispatchToProps(dispatch) {
     return {
-        onBulkUpdateValueChange: (value) => dispatch(SystemRedux.BulkUpdateChangeValue(value)),
-        onBulkUpdateCheckSelectedCells: () => dispatch(SystemRedux.BulkUpdateCheckCellSelection()),
+        onBulkUpdateValueChange: (value) => dispatch(InternalRedux.BulkUpdateChangeValue(value)),
+        onBulkUpdateCheckSelectedCells: () => dispatch(InternalRedux.BulkUpdateCheckCellSelection()),
         onApplyBulkUpdate: () => dispatch(BulkUpdateRedux.BulkUpdateApply(false)),
     };
 }

package/src/View/BulkUpdate/BulkUpdateViewPanel.d.ts

@@ -1,6 +1,6 @@
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
 import * as React from 'react';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import * as BulkUpdateRedux from '../../Redux/ActionsReducers/BulkUpdateRedux';
 import { BulkUpdateValidationResult } from '../../Strategy/Interface/IBulkUpdateModule';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
@@ -9,9 +9,8 @@ export interface BulkUpdateViewPanelComponentProps extends ViewPanelProps {
     BulkUpdateValue: string;
     BulkUpdateValidationResult: BulkUpdateValidationResult;
     PreviewInfo: PreviewInfo;
-    InPivotMode: Boolean;
-    onBulkUpdateValueChange: (value: string) => SystemRedux.BulkUpdateChangeValueAction;
-    onBulkUpdateCheckSelectedCells: () => SystemRedux.BulkUpdateCheckCellSelectionAction;
+    onBulkUpdateValueChange: (value: string) => InternalRedux.BulkUpdateChangeValueAction;
+    onBulkUpdateCheckSelectedCells: () => InternalRedux.BulkUpdateCheckCellSelectionAction;
     onApplyBulkUpdate: () => BulkUpdateRedux.BulkUpdateApplyAction;
     SelectedGridCells: GridCell[];
 }
@@ -20,11 +19,13 @@ declare class BulkUpdateViewPanelComponent extends React.Component<BulkUpdateVie
     constructor(props: BulkUpdateViewPanelComponentProps);
     componentDidMount(): void;
     componentWillUnmount(): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
     private onColumnValueSelectedChanged;
     private checkSelectedCells;
     private getStatusColour;
     private onApplyClick;
 }
-export declare let BulkUpdateViewPanelControl: import("react-redux").ConnectedComponent<typeof BulkUpdateViewPanelComponent, any>;
+export declare let BulkUpdateViewPanelControl: import("react-redux").ConnectedComponent<typeof BulkUpdateViewPanelComponent, {
+    [x: string]: any;
+}>;
 export {};

package/src/View/BulkUpdate/BulkUpdateViewPanel.js

@@ -4,12 +4,12 @@ import { PreviewResultsPanel } from '../Components/PreviewResultsPanel';
 import { Flex } from 'rebass';
 import join from '../../components/utils/join';
 import * as GeneralConstants from '../../Utilities/Constants/GeneralConstants';
-import { ColumnValueSelector } from '../Components/Selectors/ColumnValueSelector';
+import { BulkUpdateValueSelector } from '../Components/Selectors/BulkUpdateValueSelector';
 import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';
 import { ButtonApply } from '../Components/Buttons/ButtonApply';
 import { AdaptablePopover } from '../AdaptablePopover';
 import { UIHelper } from '../UIHelper';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import * as BulkUpdateRedux from '../../Redux/ActionsReducers/BulkUpdateRedux';
 import { connect } from 'react-redux';
 class BulkUpdateViewPanelComponent extends React.Component {
@@ -31,8 +31,7 @@ class BulkUpdateViewPanelComponent extends React.Component {
         this.checkSelectedCells();
     }
     componentWillUnmount() {
-        var _a;
-        (_a = this.cleanupEvent) === null || _a === void 0 ? void 0 : _a.call(this);
+        this.cleanupEvent?.();
     }
     render() {
         let statusColour = this.getStatusColour();
@@ -40,7 +39,7 @@ class BulkUpdateViewPanelComponent extends React.Component {
         let previewPanel = (React.createElement(PreviewResultsPanel, { previewInfo: this.props.PreviewInfo, api: this.props.api, selectedColumn: selectedColumn, showPanel: true, showHeader: false }));
         let shouldDisable = this.props.accessLevel == 'ReadOnly' ||
             !this.props.BulkUpdateValidationResult.IsValid ||
-            this.props.InPivotMode == true;
+            this.props.api.layoutApi.isCurrentLayoutPivot() == true;
         const applyStyle = {
             color: statusColour,
             fill: 'currentColor',
@@ -48,7 +47,7 @@ class BulkUpdateViewPanelComponent extends React.Component {
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
         return (React.createElement(Flex, { minWidth: 150, flexDirection: "row", className: join(shouldDisable ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__BulkUpdate__wrap`), flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
             React.createElement(Flex, null,
-                React.createElement(ColumnValueSelector, { selectedGridCells: this.props.SelectedGridCells, newLabel: "New", existingLabel: "Existing", dropdownButtonProps: {
+                React.createElement(BulkUpdateValueSelector, { selectedGridCells: this.props.SelectedGridCells, newLabel: "New", existingLabel: "Existing", dropdownButtonProps: {
                         listMinWidth: 160,
                     }, className: `ab-${elementType}__BulkUpdate__select`, disabled: shouldDisable, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: selectedColumn, api: this.props.api, onColumnValueChange: (columns) => this.onColumnValueSelectedChanged(columns) })),
             React.createElement(Flex, null,
@@ -83,19 +82,17 @@ class BulkUpdateViewPanelComponent extends React.Component {
     }
 }
 function mapStateToProps(state, ownProps) {
-    var _a;
     return {
-        SelectedGridCells: (_a = state.Grid.SelectedCellInfo) === null || _a === void 0 ? void 0 : _a.gridCells,
-        BulkUpdateValue: state.System.BulkUpdateValue,
-        BulkUpdateValidationResult: state.System.BulkUpdateValidationResult,
-        PreviewInfo: state.System.BulkUpdatePreviewInfo,
-        InPivotMode: state.Grid.IsGridInPivotMode,
+        SelectedGridCells: state.Internal.SelectedCellInfo?.gridCells,
+        BulkUpdateValue: state.Internal.BulkUpdate.BulkUpdateValue,
+        BulkUpdateValidationResult: state.Internal.BulkUpdate.BulkUpdateValidationResult,
+        PreviewInfo: state.Internal.BulkUpdate.BulkUpdatePreviewInfo,
     };
 }
 function mapDispatchToProps(dispatch) {
     return {
-        onBulkUpdateValueChange: (value) => dispatch(SystemRedux.BulkUpdateChangeValue(value)),
-        onBulkUpdateCheckSelectedCells: () => dispatch(SystemRedux.BulkUpdateCheckCellSelection()),
+        onBulkUpdateValueChange: (value) => dispatch(InternalRedux.BulkUpdateChangeValue(value)),
+        onBulkUpdateCheckSelectedCells: () => dispatch(InternalRedux.BulkUpdateCheckCellSelection()),
         onApplyBulkUpdate: () => dispatch(BulkUpdateRedux.BulkUpdateApply(false)),
     };
 }

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

@@ -1,12 +1,12 @@
 import * as React from 'react';
-import * as Redux from 'redux';
 import { ModuleSummaryProps } from '../Components/SharedProps/ModuleSummaryProps';
 import { EditableConfigEntityState } from '../Components/SharedProps/EditableConfigEntityState';
 import { CalculatedColumn } from '../../PredefinedConfig/CalculatedColumnState';
+import type { Action } from 'redux';
 export interface CalculatedColumnSummaryProps extends ModuleSummaryProps<CalculatedColumnSummaryComponent> {
     CalculatedColumns: CalculatedColumn[];
     onEdit: (calculatedColumn: CalculatedColumn) => void;
-    onDeleteConfirm: Redux.Action;
+    onDeleteConfirm: Action;
 }
 export declare class CalculatedColumnSummaryComponent extends React.Component<CalculatedColumnSummaryProps, EditableConfigEntityState> {
     constructor(props: CalculatedColumnSummaryProps);
@@ -15,4 +15,7 @@ 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<JSX.LibraryManagedAttributes<C, import("react-redux").GetProps<C>>, keyof CalculatedColumnSummaryProps>>;
+export declare let CalculatedColumnSummary: import("react-redux").ConnectedComponent<typeof CalculatedColumnSummaryComponent, {
+    context?: React.Context<import("react-redux").ReactReduxContextValue<any, import("redux").UnknownAction>>;
+    store?: import("redux").Store<any, import("redux").UnknownAction, unknown>;
+}>;

package/src/View/CalculatedColumn/Utilities/getCalculatedColumnSettingsTags.js

@@ -1,6 +1,6 @@
 export 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(', ') : '';
+    const { DataType, Width, Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable } = settings ?? {};
+    const colTypes = settings?.ColumnTypes ? settings.ColumnTypes.join(', ') : '';
     return [
         DataType ? `DataType: ${DataType}` : null,
         Width ? `Width: ${Width}px` : null,

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

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

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

@@ -9,14 +9,13 @@ import ErrorBox from '../../../components/ErrorBox';
 import { Tabs } from '../../../components/Tabs';
 import { Tag } from '../../../components/Tag';
 export const renderCalculatedColumnDefinitionSummary = (data) => {
-    var _a;
     return (React.createElement(Box, { fontSize: 2 },
         React.createElement(Box, null,
             "Column Identifier: ",
             React.createElement(Tag, null, data.ColumnId)),
         data.FriendlyName ? (React.createElement(Box, { mt: 3 },
             "Column Name: ",
-            React.createElement(Tag, null, (_a = data.FriendlyName) !== null && _a !== void 0 ? _a : data.ColumnId))) : null));
+            React.createElement(Tag, null, data.FriendlyName ?? data.ColumnId))) : null));
 };
 export const isValidCalculatedColumnDefinition = (data, api) => {
     const columns = api.columnApi.getColumns();
@@ -28,15 +27,20 @@ export const isValidCalculatedColumnDefinition = (data, api) => {
     return hasAlreadyExistingId ? 'A Column already exists with that id' : true;
 };
 export const CalculatedColumnDefinitionWizardSection = (props) => {
-    var _a;
     const { data, api } = useOnePageAdaptableWizardContext();
     const handleColumnIdChange = (event) => {
         let e = event.target;
-        props.onChange(Object.assign(Object.assign({}, data), { ColumnId: e.value }));
+        props.onChange({
+            ...data,
+            ColumnId: e.value,
+        });
     };
     const handleColumnNameChange = (event) => {
         let e = event.target;
-        props.onChange(Object.assign(Object.assign({}, data), { FriendlyName: e.value }));
+        props.onChange({
+            ...data,
+            FriendlyName: e.value,
+        });
     };
     const inEdit = props.isEdit;
     const validCheck = isValidCalculatedColumnDefinition(data, api);
@@ -44,9 +48,15 @@ export const CalculatedColumnDefinitionWizardSection = (props) => {
     const [ColumnNameFocused, setColumnNameFocused] = useState(false);
     const ColumnName = data.FriendlyName;
     const ColumnId = data.ColumnId;
-    const { ShowToolTip, HeaderToolTip } = (_a = data.CalculatedColumnSettings) !== null && _a !== void 0 ? _a : {};
+    const { ShowToolTip, HeaderToolTip } = data.CalculatedColumnSettings ?? {};
     const handleSpecialColumnSettingsChange = (settings) => {
-        props.onChange(Object.assign(Object.assign({}, data), { CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), settings) }));
+        props.onChange({
+            ...data,
+            CalculatedColumnSettings: {
+                ...data.CalculatedColumnSettings,
+                ...settings,
+            },
+        });
     };
     return (React.createElement(Box, { "data-name": 'calculated-column-definition' },
         React.createElement(Tabs, { autoFocus: false },

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

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

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

@@ -14,9 +14,8 @@ export const renderCalculatedColumnExpressionSummary = (data) => {
         React.createElement(CodeBlock, null, api.internalApi.getAdaptableQueryExpressionText(data.Query))));
 };
 export const isValidCalculatedColumnExpression = (data, api) => {
-    var _a;
     const calculatedColumnExpressionService = api.internalApi.getCalculatedColumnExpressionService();
-    const expression = (_a = api.expressionApi.getAdaptableQueryExpression(data.Query)) === null || _a === void 0 ? void 0 : _a.trim();
+    const expression = api.expressionApi.getAdaptableQueryExpression(data.Query)?.trim();
     if (!expression) {
         return 'Calculated column expression cannot be empty';
     }
@@ -32,7 +31,16 @@ export const CalculatedColumnExpressionWizardSection = (props) => {
     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 }) }));
+        props.onChange({
+            ...data,
+            Query: calculatedColumnQuery,
+            CalculatedColumnSettings: {
+                ...data.CalculatedColumnSettings,
+                DataType: dataType,
+                //  Pivotable,
+                //  Aggregatable,
+            },
+        });
     };
     const getEditorType = (expressionType) => {
         switch (expressionType) {
@@ -44,16 +52,19 @@ export const CalculatedColumnExpressionWizardSection = (props) => {
                 return 'quantileAggregatedScalar';
         }
     };
+    const columns = api.columnApi
+        .getQueryableColumns()
+        .filter((c) => !c.isGeneratedPivotResultColumn);
     return (React.createElement(Tabs, { autoFocus: false, height: "100%" },
         React.createElement(Tabs.Tab, null, Humanize(props.expressionType)),
         React.createElement(Tabs.Content, null, (() => {
             switch (props.expressionType) {
                 case 'ScalarExpression':
-                    return (React.createElement(ExpressionEditor, { type: 'scalar', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.ScalarExpression, onChange: (ScalarExpression) => setCalculatedColumnExpression({ ScalarExpression }), initialData: initialData, columns: api.columnApi.getQueryableColumns(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), isFullExpression: true, api: api }));
+                    return (React.createElement(ExpressionEditor, { type: 'scalar', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.ScalarExpression, onChange: (ScalarExpression) => setCalculatedColumnExpression({ ScalarExpression }), initialData: initialData, columns: columns, fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), isFullExpression: true, api: api }));
                 case 'AggregatedScalarExpression':
                 case 'CumulativeAggregatedExpression':
                 case 'QuantileAggregatedExpression':
-                    return (React.createElement(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.namedQueryApi.getNamedQueries(), isFullExpression: true, api: api }));
+                    return (React.createElement(ExpressionEditor, { type: getEditorType(props.expressionType), module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.AggregatedScalarExpression, onChange: (AggregatedScalarExpression) => setCalculatedColumnExpression({ AggregatedScalarExpression }), initialData: initialData, columns: columns, namedQueries: api.namedQueryApi.getNamedQueries(), isFullExpression: true, api: api }));
                 default:
                     return React.createElement(React.Fragment, null);
             }

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

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

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

@@ -16,39 +16,53 @@ export const renderCalculatedColumnSettingsSummary = (data) => {
         React.createElement(ValueOptionsTags, { toLabel: (x) => x, toIdentifier: (c) => c, readOnly: true, options: options, value: options })));
 };
 export const isValidCalculatedColumnSettings = (data) => {
-    var _a;
-    if (!((_a = data.CalculatedColumnSettings) === null || _a === void 0 ? void 0 : _a.DataType)) {
+    if (!data.CalculatedColumnSettings?.DataType) {
         return 'No data type is specified and it could not be inferred from the defined expression';
     }
     return true;
 };
 export const CalculatedColumnSettingsWizardSection = (props) => {
-    var _a, _b;
     const { data, api } = useOnePageAdaptableWizardContext();
     const calculatedColumnExpressionService = useMemo(() => api.internalApi.getCalculatedColumnExpressionService(), []);
     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 aggregatable = dataType == 'number' ? data.CalculatedColumnSettings?.Aggregatable : false;
+        props.onChange({
+            ...data,
+            CalculatedColumnSettings: {
+                ...data.CalculatedColumnSettings,
+                DataType: dataType,
+                Aggregatable: aggregatable,
+            },
+        });
     };
     const validCheck = isValidCalculatedColumnSettings(data);
     const ErrorMessage = validCheck === true ? null : validCheck;
-    const { DataType: dataType } = (_a = data.CalculatedColumnSettings) !== null && _a !== void 0 ? _a : {};
-    const { Width } = (_b = data.CalculatedColumnSettings) !== null && _b !== void 0 ? _b : {};
+    const { DataType: dataType } = data.CalculatedColumnSettings ?? {};
+    const { Width } = data.CalculatedColumnSettings ?? {};
     const handleSpecialColumnSettingsChange = (settings) => {
-        props.onChange(Object.assign(Object.assign({}, data), { CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), settings) }));
+        props.onChange({
+            ...data,
+            CalculatedColumnSettings: {
+                ...data.CalculatedColumnSettings,
+                ...settings,
+            },
+        });
     };
     React.useEffect(() => {
         if (!dataType) {
             const computedDataType = calculatedColumnExpressionService.getCalculatedColumnDataType(data.Query);
-            handleSpecialColumnSettingsChange(Object.assign(Object.assign({}, data === null || data === void 0 ? void 0 : data.CalculatedColumnSettings), { DataType: computedDataType }));
+            handleSpecialColumnSettingsChange({
+                ...data?.CalculatedColumnSettings,
+                DataType: computedDataType,
+            });
         }
     }, []);
     const options = [
-        { value: 'Number', label: 'Number' },
-        { value: 'String', label: 'String' },
-        { value: 'Date', label: 'Date' },
-        { value: 'Boolean', label: 'Boolean' },
+        { value: 'number', label: 'Number' },
+        { value: 'text', label: 'Text' },
+        { value: 'date', label: 'Date' },
+        { value: 'boolean', label: 'Boolean' },
+        { value: 'numberArray', label: 'NumberArray' },
     ];
     return (React.createElement(Box, { "data-name": 'calculated-column-settings' },
         React.createElement(Tabs, { autoFocus: false },

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

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

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

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

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

@@ -22,15 +22,13 @@ export const calculatedColumnTypes = [
     'QuantileAggregatedExpression',
 ];
 export const CalculatedColumnWizard = (props) => {
-    var _a;
     const adaptable = useAdaptable();
     const allCalculatedColumns = useSelector((state) => state.CalculatedColumn.CalculatedColumns);
     const [calculatedColumn, setCalculatedColumn] = useState(() => {
-        var _a;
         if (props.data) {
             return cloneObject(props.data);
         }
-        if ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.column) {
+        if (props.popupParams?.column) {
             const calculatedColumn = allCalculatedColumns.find((calculatedColumn) => calculatedColumn.ColumnId === props.popupParams.column.columnId);
             if (calculatedColumn) {
                 return cloneObject(calculatedColumn);
@@ -39,7 +37,7 @@ export const CalculatedColumnWizard = (props) => {
         return ObjectFactory.CreateEmptyCalculatedColumn(adaptable.api.gridApi.internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef());
     });
     const dispatch = useDispatch();
-    const isEdit = Boolean(props.data) || ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit';
+    const isEdit = Boolean(props.data) || props.popupParams?.action === 'Edit';
     const handleFinish = () => {
         if (isEdit) {
             dispatch(CalculatedColumnRedux.CalculatedColumnEdit(calculatedColumn));
@@ -50,21 +48,26 @@ export const CalculatedColumnWizard = (props) => {
         props.onCloseWizard();
     };
     const [expressionType, setExpressionType] = useState(() => {
-        var _a;
-        return (_a = getExpressionType(calculatedColumn, adaptable.api)) !== null && _a !== void 0 ? _a : 'ScalarExpression';
+        return getExpressionType(calculatedColumn, adaptable.api) ?? 'ScalarExpression';
     });
     const handleExpressionTypeChange = (type) => {
         setExpressionType(type);
         if (expressionType === 'ScalarExpression') {
-            setCalculatedColumn(Object.assign(Object.assign({}, calculatedColumn), { Query: {
+            setCalculatedColumn({
+                ...calculatedColumn,
+                Query: {
                     ScalarExpression: '',
-                } }));
+                },
+            });
         }
         else {
             // Aggregated, Cumulative & Quantile are all AggregatedScalarExpression
-            setCalculatedColumn(Object.assign(Object.assign({}, calculatedColumn), { Query: {
+            setCalculatedColumn({
+                ...calculatedColumn,
+                Query: {
                     AggregatedScalarExpression: '',
-                } }));
+                },
+            });
         }
     };
     return (React.createElement(OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: calculatedColumn, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [

package/src/View/CalculatedColumn/utils.js

@@ -1,6 +1,5 @@
 export 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
+    return calculatedColumn?.Query?.AggregatedScalarExpression == undefined
         ? 'ScalarExpression'
         : api.calculatedColumnApi.internalApi.isCumulativeAggregatedExpression(calculatedColumn.Query.AggregatedScalarExpression)
             ? 'CumulativeAggregatedExpression'

package/src/View/CellSummary/CellSummaryDetails.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { CellSummmary } from '../../PredefinedConfig/Common/CellSummary';
+import { CellSummmaryInfo } from '../../PredefinedConfig/Common/CellSummary';
 interface CellSummaryDetailsProps extends React.ClassAttributes<CellSummaryDetails> {
-    CellSummary: CellSummmary;
+    CellSummary: CellSummmaryInfo;
 }
 export declare class CellSummaryDetails extends React.Component<CellSummaryDetailsProps, {}> {
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export {};