@adaptabletools/adaptable-cjs 19.2.4 → 20.0.0-canary.0

package/src/View/Alert/Wizard/AlertRulesWizardSection.d.ts

@@ -1,12 +1,12 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { AlertDefinition } from '../../../PredefinedConfig/AlertState';
 import { AlertType } from '../Utilities/getAlertType';
-export declare const getRuleStepDescription: (alertType: AlertType) => "" | JSX.Element;
-export declare const renderAlertRulesSummary: (alertDefinition: AlertDefinition) => JSX.Element;
+export declare const getRuleStepDescription: (alertType: AlertType) => "" | React.JSX.Element;
+export declare const renderAlertRulesSummary: (alertDefinition: AlertDefinition) => React.JSX.Element;
 export interface AlertRulesWizardSectionProps {
     onChange: (data: AlertDefinition) => void;
     module: 'alert';
     wholeRowScope?: boolean;
     alertType: AlertType | null;
 }
-export declare const AlertRulesWizardSection: (props: AlertRulesWizardSectionProps) => JSX.Element;
+export declare const AlertRulesWizardSection: (props: AlertRulesWizardSectionProps) => React.JSX.Element;

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

@@ -10,6 +10,7 @@ const getAvailablePredicates_1 = require("../Utilities/getAvailablePredicates");
 const Tabs_1 = require("../../../components/Tabs");
 const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
 const rebass_1 = require("rebass");
+const GeneralConstants_1 = require("./../../../Utilities/Constants/GeneralConstants");
 const getRuleStepDescription = (alertType) => {
     switch (alertType) {
         case 'DataChange':
@@ -42,19 +43,29 @@ const renderAlertRulesSummary = (alertDefinition) => {
 };
 exports.renderAlertRulesSummary = renderAlertRulesSummary;
 const RowChangeEditor = (props) => {
-    var _a, _b, _c;
-    const predicate = (_c = (_b = (_a = props.alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : { PredicateId: null };
-    const handleChange = (predicateId) => {
-        props.onChange(Object.assign(Object.assign({}, props.alert), { Rule: {
-                Predicates: [{ PredicateId: predicateId }],
-            } }));
+    const expression = props.alert.Rule?.ObservableExpression;
+    const handleRowAddedChange = () => {
+        props.onChange({
+            ...props.alert,
+            Rule: {
+                ObservableExpression: 'ROW_ADDED()',
+            },
+        });
+    };
+    const handleRowRemovedChange = () => {
+        props.onChange({
+            ...props.alert,
+            Rule: {
+                ObservableExpression: 'ROW_REMOVED()',
+            },
+        });
     };
     return (React.createElement(rebass_1.Box, { p: 2 },
         React.createElement(Tabs_1.Tabs, null,
             React.createElement(Tabs_1.Tabs.Tab, null, "Row Change"),
             React.createElement(Tabs_1.Tabs.Content, null,
-                React.createElement(Radio_1.default, { onClick: () => handleChange('AddedRow'), checked: predicate.PredicateId === 'AddedRow' }, "Row Added"),
-                React.createElement(Radio_1.default, { onClick: () => handleChange('RemovedRow'), checked: predicate.PredicateId === 'RemovedRow' }, "Row Removed")))));
+                React.createElement(Radio_1.default, { onClick: () => handleRowAddedChange(), checked: expression?.includes(GeneralConstants_1.OBSERVABLE_EXPRESSION_ROW_ADDED) }, "Row Added"),
+                React.createElement(Radio_1.default, { onClick: () => handleRowRemovedChange(), checked: expression?.includes(GeneralConstants_1.OBSERVABLE_EXPRESSION_ROW_REMOVED) }, "Row Removed")))));
 };
 const AlertRulesWizardSection = (props) => {
     const { data, api, moduleInfo } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
@@ -62,9 +73,7 @@ const AlertRulesWizardSection = (props) => {
     const showObservable = props.alertType === 'Observable';
     const showAggregation = props.alertType === 'Aggregation';
     const showBoolean = props.alertType === 'DataChange' || props.alertType == 'Validation';
-    const showPredicate = props.alertType === 'DataChange' ||
-        props.alertType == 'Validation' ||
-        props.alertType === 'RowChange';
+    const showPredicate = props.alertType === 'DataChange' || props.alertType == 'Validation';
     const enablePredicateColumnId = props.alertType === 'DataChange' || props.alertType == 'Validation';
     if (props.alertType === 'RowChange') {
         return React.createElement(RowChangeEditor, { alert: data, onChange: props.onChange });

package/src/View/Alert/Wizard/AlertScopeWizardSection.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { AlertDefinition } from '../../../PredefinedConfig/AlertState';
 import { AlertType } from '../Utilities/getAlertType';
 type AlertScopeWizardSectionProps = {
     onChange: (data: AlertDefinition) => void;
     alertType: AlertType;
 };
-export declare const AlertScopeWizardSection: (props: AlertScopeWizardSectionProps) => JSX.Element;
+export declare const AlertScopeWizardSection: (props: AlertScopeWizardSectionProps) => React.JSX.Element;
 export {};

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

@@ -20,7 +20,7 @@ const AlertScopeWizardSection = (props) => {
                 columnScope: 'Changes in selected Columns will trigger an Alert',
                 dataTypeScope: 'Changes in any Column which is of the selected Data Type(s) will trigger an Alert',
             }, scope: data.Scope, updateScope: (Scope) => {
-                const newData = Object.assign(Object.assign({}, data), { Scope });
+                const newData = { ...data, Scope };
                 if (newData.Rule.Predicates) {
                     // when scope is changed, reset the rule to predicate of any
                     // if it was set to a predicate before

package/src/View/Alert/Wizard/AlertTypeWizardSection.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { AlertType } from '../Utilities/getAlertType';
-export declare const renderAlertTypeSummary: (alertType: AlertType) => JSX.Element;
+export declare const renderAlertTypeSummary: (alertType: AlertType) => React.JSX.Element;
 type AlertBehaviourWizardSectionProps = {
     onAlertTypeChange: (alertType: AlertType) => void;
     alertType: AlertType | null;
 };
-export declare const AlertTypeWizardSection: (props: AlertBehaviourWizardSectionProps) => JSX.Element;
+export declare const AlertTypeWizardSection: (props: AlertBehaviourWizardSectionProps) => React.JSX.Element;
 export {};

package/src/View/Alert/Wizard/AlertWizard.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
 import { AlertDefinition } from '../../../types';
 export interface AlertWizardProps extends AdaptableOnePageWizardProps<AlertDefinition> {
 }
-export declare const AlertWizard: (props: AlertWizardProps) => JSX.Element;
+export declare const AlertWizard: (props: AlertWizardProps) => React.JSX.Element;

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

@@ -11,7 +11,7 @@ const AlertScopeWizardSection_1 = require("./AlertScopeWizardSection");
 const AlertRulesWizardSection_1 = require("./AlertRulesWizardSection");
 const isValidAlertRules_1 = require("./isValidAlertRules");
 const AlertBehaviourWizardSection_1 = require("./AlertBehaviourWizardSection");
-const GeneralConstants_1 = require("../../../Utilities/Constants/GeneralConstants");
+const ObjectDefaultConstants_1 = require("../../../Utilities/Constants/ObjectDefaultConstants");
 const AlertMessageWizardSection_1 = require("./AlertMessageWizardSection");
 const BaseAlertScopeWizardSection_1 = require("./BaseAlertScopeWizardSection");
 const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
@@ -30,31 +30,29 @@ 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, _b, _c, _d, _e, _f, _g;
         const alertDefinition = props.data
             ? (0, Helper_1.cloneObject)(props.data)
             : ObjectFactory_1.default.CreateEmptyAlertDefinition();
-        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)) {
+        if (!alertDefinition.Rule?.BooleanExpression &&
+            !alertDefinition.Rule?.ObservableExpression &&
+            !alertDefinition.Rule?.AggregatedBooleanExpression &&
+            !alertDefinition.Rule?.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') {
+        if (props.popupParams?.column && props.popupParams?.action === 'New') {
             alertDefinition.Scope = {
                 ColumnIds: [props.popupParams.column.columnId],
             };
         }
-        alertDefinition.MessageType = (_g = alertDefinition.MessageType) !== null && _g !== void 0 ? _g : GeneralConstants_1.ALERT_DEFAULT_MESSAGE_TYPE;
+        alertDefinition.MessageType = alertDefinition.MessageType ?? ObjectDefaultConstants_1.ALERT_DEFAULT_MESSAGE_TYPE;
         return alertDefinition;
     });
     // Alert type is based initialy on data, but can be changed by the user
     // the default objects do not neccesary have enough information to determine the type
     const [alertType, setAlertType] = (0, react_1.useState)(() => {
-        var _a;
-        return (_a = (0, getAlertType_1.getAlertType)(alertDefinition)) !== null && _a !== void 0 ? _a : getAlertType_1.AlertType.DataChange;
+        return (0, getAlertType_1.getAlertType)(alertDefinition) ?? getAlertType_1.AlertType.DataChange;
     });
     const handleFinish = () => {
         if (props.data) {

package/src/View/Alert/Wizard/BaseAlertScopeWizardSection.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { AlertDefinition } from '../../../PredefinedConfig/AlertState';
 import { FlashingCellDefinition } from '../../../../types';
-export declare const renderScopeSummary: (data: AlertDefinition | FlashingCellDefinition) => JSX.Element;
+export declare const renderScopeSummary: (data: AlertDefinition | FlashingCellDefinition) => React.JSX.Element;

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

@@ -8,7 +8,7 @@ const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const ValueSelector_1 = require("../../Components/ValueSelector");
 const renderScopeSummary = (data) => {
     const { api: { columnScopeApi: scopeApi }, } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const columnsInScope = scopeApi.getColumnsForScope(data.Scope);
+    const columnsInScope = scopeApi.getColumnsInScope(data.Scope);
     return (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Box, null,
             React.createElement(rebass_1.Text, { fontSize: 2 }, scopeApi.scopeIsAll(data.Scope)

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

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidAlertRules = void 0;
 const Utilities_1 = require("../../Components/EntityRulesEditor/Utilities");
 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

@@ -5,13 +5,13 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const BulkUpdateRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/BulkUpdateRedux"));
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const PanelWithImage_1 = require("../Components/Panels/PanelWithImage");
 const AdaptablePopover_1 = require("../AdaptablePopover");
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const PreviewResultsPanel_1 = require("../Components/PreviewResultsPanel");
 const PreviewHelper_1 = require("../../Utilities/Helpers/PreviewHelper");
-const ColumnValueSelector_1 = require("../Components/Selectors/ColumnValueSelector");
+const BulkUpdateValueSelector_1 = require("../Components/Selectors/BulkUpdateValueSelector");
 const rebass_1 = require("rebass");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const HelpBlock_1 = tslib_1.__importDefault(require("../../components/HelpBlock"));
@@ -30,7 +30,7 @@ class BulkUpdatePopupComponent extends React.Component {
         let dataTypeErrorMessage = '';
         if (col && StringExtensions_1.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';
@@ -46,11 +46,11 @@ class BulkUpdatePopupComponent extends React.Component {
             return null;
         }
         return (React.createElement(PanelWithImage_1.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_1.default, { marginTop: 2, marginBottom: 2 }, "Enter a date value. Alternatively, tick the checkbox and select from an existing column value."),
                 React.createElement(rebass_1.Flex, { padding: 2, flexDirection: "row", alignItems: "center" },
                     React.createElement(rebass_1.Flex, { alignItems: "center", flexDirection: "row", flex: 1, marginRight: 2 },
-                        React.createElement(ColumnValueSelector_1.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_1.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_1.default, { disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(this.props.BulkUpdateValue) ||
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All', onClick: () => {
                             this.onApplyClick();
@@ -58,7 +58,7 @@ class BulkUpdatePopupComponent extends React.Component {
                 React.createElement(HelpBlock_1.default, { marginTop: 2, marginBottom: 2 }, "Select an existing Column value from the dropdown, or enter a new value"),
                 React.createElement(rebass_1.Flex, { marginTop: 2, flexDirection: "row", alignItems: "center" },
                     React.createElement(rebass_1.Flex, { alignItems: "center", flexDirection: "row", flex: 1, marginRight: 2 },
-                        React.createElement(ColumnValueSelector_1.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_1.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_1.default, { disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(this.props.BulkUpdateValue) ||
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All' ||
                             hasDataTypeError, variant: "raised", tone: "accent", marginRight: 2, onClick: () => {
@@ -89,18 +89,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

@@ -8,12 +8,12 @@ const PreviewResultsPanel_1 = require("../Components/PreviewResultsPanel");
 const rebass_1 = require("rebass");
 const join_1 = tslib_1.__importDefault(require("../../components/utils/join"));
 const GeneralConstants = tslib_1.__importStar(require("../../Utilities/Constants/GeneralConstants"));
-const ColumnValueSelector_1 = require("../Components/Selectors/ColumnValueSelector");
+const BulkUpdateValueSelector_1 = require("../Components/Selectors/BulkUpdateValueSelector");
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const ButtonApply_1 = require("../Components/Buttons/ButtonApply");
 const AdaptablePopover_1 = require("../AdaptablePopover");
 const UIHelper_1 = require("../UIHelper");
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const BulkUpdateRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/BulkUpdateRedux"));
 const react_redux_1 = require("react-redux");
 class BulkUpdateViewPanelComponent extends React.Component {
@@ -35,8 +35,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();
@@ -44,7 +43,7 @@ class BulkUpdateViewPanelComponent extends React.Component {
         let previewPanel = (React.createElement(PreviewResultsPanel_1.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',
@@ -52,7 +51,7 @@ class BulkUpdateViewPanelComponent extends React.Component {
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
         return (React.createElement(rebass_1.Flex, { minWidth: 150, flexDirection: "row", className: (0, join_1.default)(shouldDisable ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__BulkUpdate__wrap`), flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
             React.createElement(rebass_1.Flex, null,
-                React.createElement(ColumnValueSelector_1.ColumnValueSelector, { selectedGridCells: this.props.SelectedGridCells, newLabel: "New", existingLabel: "Existing", dropdownButtonProps: {
+                React.createElement(BulkUpdateValueSelector_1.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(rebass_1.Flex, null,
@@ -87,19 +86,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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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(', ') : '';
+    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

@@ -13,14 +13,13 @@ 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));
+            React.createElement(Tag_1.Tag, null, data.FriendlyName ?? data.ColumnId))) : null));
 };
 exports.renderCalculatedColumnDefinitionSummary = renderCalculatedColumnDefinitionSummary;
 const isValidCalculatedColumnDefinition = (data, api) => {
@@ -34,15 +33,20 @@ const isValidCalculatedColumnDefinition = (data, api) => {
 };
 exports.isValidCalculatedColumnDefinition = isValidCalculatedColumnDefinition;
 const CalculatedColumnDefinitionWizardSection = (props) => {
-    var _a;
     const { data, api } = (0, OnePageAdaptableWizard_1.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 = (0, exports.isValidCalculatedColumnDefinition)(data, api);
@@ -50,9 +54,15 @@ const CalculatedColumnDefinitionWizardSection = (props) => {
     const [ColumnNameFocused, setColumnNameFocused] = (0, react_1.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(rebass_1.Box, { "data-name": 'calculated-column-definition' },
         React.createElement(Tabs_1.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

@@ -19,9 +19,8 @@ const renderCalculatedColumnExpressionSummary = (data) => {
 };
 exports.renderCalculatedColumnExpressionSummary = renderCalculatedColumnExpressionSummary;
 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';
     }
@@ -38,7 +37,16 @@ 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) {
@@ -50,16 +58,19 @@ const CalculatedColumnExpressionWizardSection = (props) => {
                 return 'quantileAggregatedScalar';
         }
     };
+    const columns = api.columnApi
+        .getQueryableColumns()
+        .filter((c) => !c.isGeneratedPivotResultColumn);
     return (React.createElement(Tabs_1.Tabs, { autoFocus: false, height: "100%" },
         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(), fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.getNamedQueries(), isFullExpression: true, api: api }));
+                    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: columns, fields: api.expressionApi.internalApi.getAvailableFields(), namedQueries: api.namedQueryApi.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.namedQueryApi.getNamedQueries(), isFullExpression: true, api: api }));
+                    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: 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;