@adaptabletools/adaptable 19.2.4 → 20.0.0-canary.1

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsSidebarForm.js

@@ -23,25 +23,22 @@ const prepareSidebarDef = (sideBar) => {
             toolPanels: sideBar,
         };
     }
-    return sideBar !== null && sideBar !== void 0 ? sideBar : { toolPanels: [] };
+    return sideBar ?? { toolPanels: [] };
 };
 const isSidebarChecked = (sideBar, panelName) => {
-    var _a;
-    return ((_a = sideBar === null || sideBar === void 0 ? void 0 : sideBar.toolPanels) !== null && _a !== void 0 ? _a : []).some((panel) => {
+    return (sideBar?.toolPanels ?? []).some((panel) => {
         const panelId = typeof panel === 'string' ? panel : panel.id;
         return panelId === panelName;
     });
 };
 export const UIOptionsSidebarForm = (props) => {
-    var _a;
     const { gridOptions, onChange } = props;
     const sideBar = prepareSidebarDef(gridOptions.sideBar);
     const renderSidebarCheckbox = (sidebarName) => {
         return (React.createElement(CheckBox, { mr: 3, key: sidebarName, checked: isSidebarChecked(sideBar, sidebarName), onChange: (check) => handleToolpanelsChange(sidebarName, check) }, StringExtensions.Humanize(sidebarName)));
     };
     const handleToolpanelsChange = (panelName, check) => {
-        var _a, _b;
-        let newPanels = (_a = sideBar === null || sideBar === void 0 ? void 0 : sideBar.toolPanels) !== null && _a !== void 0 ? _a : [];
+        let newPanels = sideBar?.toolPanels ?? [];
         if (check) {
             newPanels = [...newPanels, panelName];
         }
@@ -51,16 +48,29 @@ export const UIOptionsSidebarForm = (props) => {
                 return panelId !== panelName;
             });
         }
-        let hiddenByDefault = (_b = sideBar.hiddenByDefault) !== null && _b !== void 0 ? _b : false;
+        let hiddenByDefault = sideBar.hiddenByDefault ?? false;
         if (newPanels.length === 0) {
             hiddenByDefault = true;
         }
-        const newGridOptions = Object.assign(Object.assign({}, gridOptions), { sideBar: Object.assign(Object.assign({}, sideBar), { toolPanels: newPanels, hiddenByDefault }) });
+        const newGridOptions = {
+            ...gridOptions,
+            sideBar: {
+                ...sideBar,
+                toolPanels: newPanels,
+                hiddenByDefault,
+            },
+        };
         props.onChange(newGridOptions);
     };
-    let sidebarPosition = (_a = sideBar === null || sideBar === void 0 ? void 0 : sideBar.position) !== null && _a !== void 0 ? _a : 'right';
+    let sidebarPosition = sideBar?.position ?? 'right';
     const handleSidebarPositionChange = (position) => {
-        const newGridOptions = Object.assign(Object.assign({}, gridOptions), { sideBar: Object.assign(Object.assign({}, sideBar), { position }) });
+        const newGridOptions = {
+            ...gridOptions,
+            sideBar: {
+                ...sideBar,
+                position,
+            },
+        };
         props.onChange(newGridOptions);
     };
     return (React.createElement(Box, null,

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsStatusbarForm.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { GridOptions } from '@ag-grid-community/core';
+import { GridOptions } from 'ag-grid-enterprise';
 export declare const UIOptionsStatusbarForm: React.FunctionComponent<{
     gridOptions: GridOptions;
     onChange: (gridOptions: GridOptions) => void;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsStatusbarForm.js

@@ -8,12 +8,14 @@ import SimpleButton from '../../../../components/SimpleButton';
 import DropdownButton from '../../../../components/DropdownButton';
 import { NocodeWizardFormBox } from '../Components/FormBox';
 export const UIOptionsStatusbarForm = (props) => {
-    var _a, _b, _c, _d;
-    const allPanels = (_c = (_b = (_a = props.gridOptions) === null || _a === void 0 ? void 0 : _a.statusBar) === null || _b === void 0 ? void 0 : _b.statusPanels) !== null && _c !== void 0 ? _c : [];
+    const allPanels = props.gridOptions?.statusBar?.statusPanels ?? [];
     const panelIdtoPanel = (panelsIds, align) => panelsIds.map((panelId) => {
         const previousItem = allPanels.find((panel) => panel.key === panelId || panel.statusPanel === panelId);
         if (previousItem) {
-            return Object.assign(Object.assign({}, previousItem), { align });
+            return {
+                ...previousItem,
+                align,
+            };
         }
         else {
             const newPanel = {
@@ -23,7 +25,7 @@ export const UIOptionsStatusbarForm = (props) => {
             return newPanel;
         }
     });
-    const leftPanels = allPanels.filter((panel) => !(panel === null || panel === void 0 ? void 0 : panel.align) || panel.align === 'left');
+    const leftPanels = allPanels.filter((panel) => !panel?.align || panel.align === 'left');
     const centerPanels = allPanels.filter((panel) => panel.align === 'center');
     const rightPanels = allPanels.filter((panel) => panel.align === 'right');
     const handleTabChange = (tabs) => {
@@ -31,10 +33,16 @@ export const UIOptionsStatusbarForm = (props) => {
         const centerPanels = panelIdtoPanel(tabs[1].Items, 'center');
         const rightPanels = panelIdtoPanel(tabs[2].Items, 'right');
         const newStatusbarPanels = [...leftPanels, ...centerPanels, ...rightPanels];
-        props.onChange(Object.assign(Object.assign({}, props.gridOptions), { statusBar: Object.assign(Object.assign({}, props.gridOptions.statusBar), { statusPanels: newStatusbarPanels }) }));
+        props.onChange({
+            ...props.gridOptions,
+            statusBar: {
+                ...props.gridOptions.statusBar,
+                statusPanels: newStatusbarPanels,
+            },
+        });
     };
     const disabled = false;
-    const panelToTabItemId = (panel) => { var _a; return (_a = panel.key) !== null && _a !== void 0 ? _a : panel.statusPanel; };
+    const panelToTabItemId = (panel) => panel.key ?? panel.statusPanel;
     const tabs = [
         {
             Name: 'Left',
@@ -74,7 +82,13 @@ export const UIOptionsStatusbarForm = (props) => {
         const newStatusbarPanels = [...allPanels, newAdaptablePanel];
         setAdaptablePanelTitle('');
         setAdaptablePanelAlign('left');
-        props.onChange(Object.assign(Object.assign({}, props.gridOptions), { statusBar: Object.assign(Object.assign({}, props.gridOptions.statusBar), { statusPanels: newStatusbarPanels }) }));
+        props.onChange({
+            ...props.gridOptions,
+            statusBar: {
+                ...props.gridOptions.statusBar,
+                statusPanels: newStatusbarPanels,
+            },
+        });
     };
     return (React.createElement(Box, null,
         React.createElement(HelpBlock, null, "Status Bar"),
@@ -85,7 +99,7 @@ export const UIOptionsStatusbarForm = (props) => {
                     React.createElement(FormRow, { label: "Panel Name" },
                         React.createElement(Input, { value: adaptablePanelTitle, placeholder: 'Adaptable Panel Name', onChange: (event) => setAdaptablePanelTitle(event.target.value) })),
                     React.createElement(FormRow, { label: "Align" },
-                        React.createElement(DropdownButton, { columns: ['label'], items: alignOptions }, (_d = alignOptions.find((option) => option.value === adaptablePanelAlign)) === null || _d === void 0 ? void 0 : _d.label)),
+                        React.createElement(DropdownButton, { columns: ['label'], items: alignOptions }, alignOptions.find((option) => option.value === adaptablePanelAlign)?.label)),
                     React.createElement(FormRow, { label: "" },
                         React.createElement(SimpleButton, { disabled: !isAdaptablePanelTitleAvailable, onClick: handleNewAdaptablePanel, icon: "plus", variant: "raised" }, "Add"),
                         !isAdaptablePanelTitleAvailable && (React.createElement(Box, { mt: 2, color: "var(--ab-color-error)" }, "Adaptable panel name must be unique."))))),

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UiOptionsForm.d.ts

@@ -1,4 +1,4 @@
-import { GridOptions } from '@ag-grid-community/core';
+import { GridOptions } from 'ag-grid-enterprise';
 import * as React from 'react';
 import { AdaptableOptions } from '../../../../types';
 interface UIElementsOptionsProps {

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UiOptionsForm.js

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { Box } from 'rebass';
 import { Tabs } from '../../../../components/Tabs';
-import { UIOptionsActionColumnsForm } from './UIOptionsActionColumnsForm';
 import { UIOptionsSidebarForm } from './UIOptionsSidebarForm';
 import { UIOptionsStatusbarForm } from './UIOptionsStatusbarForm';
 export const UIElementsForm = (props) => {
@@ -9,12 +8,9 @@ export const UIElementsForm = (props) => {
         React.createElement(Tabs, null,
             React.createElement(Tabs.Tab, null, "Tool Panel"),
             React.createElement(Tabs.Tab, null, "Status Bar"),
-            React.createElement(Tabs.Tab, null, "Action Rows"),
             React.createElement(Tabs.Content, null,
                 React.createElement(UIOptionsSidebarForm, { gridOptions: props.gridOptions, onChange: props.onChangedGridOptions })),
             React.createElement(Tabs.Content, null,
                 React.createElement(UIOptionsStatusbarForm, { gridOptions: props.gridOptions, onChange: props.onChangedGridOptions })),
-            ' ',
-            React.createElement(Tabs.Content, null,
-                React.createElement(UIOptionsActionColumnsForm, { abOptions: props.adaptableOptions, onChange: props.onChangedAdaptableOptions })))));
+            ' ')));
 };

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/useSelection.js

@@ -20,13 +20,16 @@ const useSelection = (columns, defaultValue, fieldName, changeListeners) => {
         isNoneSelected: () => Object.keys(selected).length === 0,
         selectColumn: (field) => {
             if (!selected[field]) {
-                setSelected(Object.assign(Object.assign({}, selected), { [field]: true }));
+                setSelected({
+                    ...selected,
+                    [field]: true,
+                });
                 onChange(getColumn(field), true);
             }
         },
         deselectColumn: (field) => {
             if (selected[field]) {
-                const newSelected = Object.assign({}, selected);
+                const newSelected = { ...selected };
                 delete newSelected[field];
                 setSelected(newSelected);
                 onChange(getColumn(field), false);

package/src/View/AdaptableWizardView/Wizard.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Reducer, ReactNode } from 'react';
-import { GridOptions } from '@ag-grid-community/core';
+import { GridOptions } from 'ag-grid-enterprise';
 import { AdaptableOptions } from '../../types';
 import { ConfigurationWizardProps } from './AdaptableConfigurationDialog/ConfigurationWizard';
 export interface AdaptableWizardViewProps {
@@ -53,5 +53,5 @@ interface WizardState {
  * 2. Based on configuration:
  * Provide a schema, on how the data looks like.
  */
-export declare const Wizard: (props: AdaptableWizardViewProps) => JSX.Element;
+export declare const Wizard: (props: AdaptableWizardViewProps) => React.JSX.Element;
 export {};

package/src/View/AdaptableWizardView/Wizard.js

@@ -10,13 +10,27 @@ export const initialState = {
 };
 export const reducer = (state, action) => {
     if (action.type === 'DROPPED') {
-        return Object.assign(Object.assign({}, state), { adaptableOptions: action.payload.adaptableOptions, gridOptions: action.payload.gridOptions, dropped: true, error: null });
+        return {
+            ...state,
+            adaptableOptions: action.payload.adaptableOptions,
+            gridOptions: action.payload.gridOptions,
+            dropped: true,
+            error: null,
+        };
     }
     if (action.type === 'ERROR') {
-        return Object.assign(Object.assign({}, state), { dropped: false, error: action.payload });
+        return {
+            ...state,
+            dropped: false,
+            error: action.payload,
+        };
     }
     if (action.type === 'CANCEL') {
-        return Object.assign(Object.assign({}, state), { error: null, dropped: false });
+        return {
+            ...state,
+            error: null,
+            dropped: false,
+        };
     }
     return state;
 };
@@ -31,8 +45,11 @@ export const reducer = (state, action) => {
  * Provide a schema, on how the data looks like.
  */
 export const Wizard = (props) => {
-    var _a;
-    const [state, dispatch] = useReducer(reducer, Object.assign(Object.assign({}, initialState), { adaptableOptions: props.adaptableOptions, gridOptions: props.gridOptions }));
+    const [state, dispatch] = useReducer(reducer, {
+        ...initialState,
+        adaptableOptions: props.adaptableOptions,
+        gridOptions: props.gridOptions,
+    });
     const [droppableKey, setDroppableKey] = useState(Date.now());
     const [isDataLoading, setIsDataLoading] = useState(false);
     const handleDataSource = (array, file) => {
@@ -47,7 +64,7 @@ export const Wizard = (props) => {
             });
         }
         const gridOptions = prepareGridOptions(dataSourceInfo, props.gridOptions);
-        const adaptableOptions = Object.assign({}, props.adaptableOptions);
+        const adaptableOptions = { ...props.adaptableOptions };
         adaptableOptions.adaptableId = adaptableOptions.adaptableId || (file ? file.name : '');
         if (dataSourceInfo.primaryKey) {
             adaptableOptions.primaryKey = dataSourceInfo.primaryKey;
@@ -88,7 +105,7 @@ export const Wizard = (props) => {
             });
         }
     }, []);
-    const ddEnabled = (_a = props.ddEnabled) !== null && _a !== void 0 ? _a : !props.fetchData;
+    const ddEnabled = props.ddEnabled ?? !props.fetchData;
     return (React.createElement(React.Fragment, null,
         ddEnabled && (React.createElement(FileDroppable, { key: droppableKey, className: 'ab-NocodeWizard', toJSON: props.fileContentsToJSON, readFile: props.readFile, fileAccept: props.fileAccept, helpText: props.helpText, message: state.error, defaultText: props.defaultActionMessage, dragOverText: props.dragOverActionMessage, loadingText: props.loadingMessage, onDropSuccess: handleDataSource })),
         isDataLoading && (React.createElement(Flex, { className: 'ab-NocodeWizard', alignItems: "center", justifyContent: "center", flexDirection: "column" }, props.loadingMessage || 'Loading ...')),

package/src/View/AdaptableWizardView/helper.d.ts

@@ -1,4 +1,4 @@
-import { GridOptions } from '@ag-grid-community/core';
+import { GridOptions } from 'ag-grid-enterprise';
 export interface WizardDataSourceInfo {
     columns: string[];
     data: any[];

package/src/View/AdaptableWizardView/helper.js

@@ -43,22 +43,21 @@ export const prepareDataSource = (json, _file) => {
     };
 };
 const typeToColType = {
-    string: 'abColDefString',
-    number: 'abColDefNumber',
-    boolean: 'abColDefBoolean',
-    date: 'abColDefDate',
+    string: 'text',
+    number: 'number',
+    boolean: 'boolean',
+    date: 'date',
 };
-const abColDefCustom = 'abColDefCustom';
 export const getColTypeFromValue = (value) => {
     const dataType = typeof value;
-    let columnType = typeToColType[dataType] || typeToColType.string;
+    let columnDataType = typeToColType[dataType] || typeToColType.string;
     if (value instanceof Date) {
-        columnType = typeToColType.date;
+        columnDataType = typeToColType.date;
     }
     if (Array.isArray(value) && value.length && typeof value[0] === 'number') {
-        columnType = abColDefCustom;
+        columnDataType = 'numberArray';
     }
-    return columnType;
+    return columnDataType;
 };
 export const prepareGridOptions = (dataSourceInfo, defaultGridOptions) => {
     const firstItem = dataSourceInfo.data[0];
@@ -76,8 +75,18 @@ export const prepareGridOptions = (dataSourceInfo, defaultGridOptions) => {
             editable: true,
         };
     });
-    const gridOptions = Object.assign(Object.assign({}, defaultGridOptions), { defaultColDef: {
+    const gridOptions = {
+        ...defaultGridOptions,
+        defaultColDef: {
             floatingFilter: true,
-        }, rowData: dataSourceInfo.data, columnDefs, cellSelection: true, rowSelection: 'multiple', rowHeight: 30 });
+        },
+        rowData: dataSourceInfo.data,
+        columnDefs,
+        cellSelection: true,
+        rowSelection: {
+            mode: 'multiRow',
+        },
+        rowHeight: 30,
+    };
     return gridOptions;
 };

package/src/View/AdaptableWizardView/index.js

@@ -3,5 +3,5 @@ import { ThemeProvider } from 'styled-components';
 import theme from '../../theme';
 import { Wizard } from './Wizard';
 const AdaptableWizardView = (props) => (React.createElement(ThemeProvider, { theme: theme },
-    React.createElement(Wizard, Object.assign({}, props))));
+    React.createElement(Wizard, { ...props })));
 export default AdaptableWizardView;

package/src/View/Alert/ActiveAlertsPanel.js

@@ -6,6 +6,6 @@ import { useSelector } from 'react-redux';
 export const ActiveAlertsPanel = () => {
     const adaptable = useAdaptable();
     const filterModule = adaptable.ModuleService.getModuleById(ModuleConstants.AlertModuleId);
-    const alerts = useSelector((state) => state.System.AdaptableAlerts);
+    const alerts = useSelector((state) => state.Internal.AdaptableAlerts);
     return React.createElement(AdaptableObjectCompactList, { abObjects: alerts, module: filterModule });
 };

package/src/View/Alert/ActiveAlertsPanelItemLabel.js

@@ -12,6 +12,6 @@ export const ActiveAlertsPanelItemLabel = (props) => {
     const IconCmp = allIcons[iconName];
     const icon = IconCmp ? React.createElement(IconCmp, null) : null;
     return (React.createElement(Box, null,
-        React.createElement(Text, { style: Object.assign({ float: 'left' }, iconStyle) }, icon),
+        React.createElement(Text, { style: { float: 'left', ...iconStyle } }, icon),
         props.data.header));
 };

package/src/View/Alert/AlertEmptyView.js

@@ -6,6 +6,6 @@ export const AlertEmptyView = (props) => {
         .getEntitlementAccessLevelForModule(props.module.moduleInfo.ModuleName);
     const text = accessLevel == 'ReadOnly'
         ? 'You have no Alert Definitions.'
-        : "Click 'New' to create a new Alert Definition. The Definition will include the Rule which triggers the Alert, and the behaviour of the Alert.";
+        : "Click 'New' to create a new Alert Definition - this will include the Rule which triggers the Alert, and the behaviour of the Alert.";
     return React.createElement(React.Fragment, null, text);
 };

package/src/View/Alert/AlertStatusSubPanel.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare const AlertStatusPanel: () => JSX.Element;
+import * as React from 'react';
+export declare const AlertStatusPanel: () => React.JSX.Element;

package/src/View/Alert/AlertStatusSubPanel.js

@@ -9,17 +9,19 @@ const initialStyle = { color: '', background: '' };
 export const AlertStatusPanel = () => {
     const adaptableApi = useAdaptable().api;
     const [style, setStyle] = React.useState(initialStyle);
-    const module = adaptableApi.internalApi.getModuleService().getModuleById(ModuleConstants.AlertModuleId);
+    const module = adaptableApi.internalApi
+        .getModuleService()
+        .getModuleById(ModuleConstants.AlertModuleId);
     const statusbarHighlightDuration = adaptableApi.optionsApi.getAlertOptions().statusbarHighlightDuration;
     /**
      * Using a selector to so the component updates each time an alert is triggered.
      */
-    const alerts = useSelector((state) => state.System.AdaptableAlerts);
+    const alerts = useSelector((state) => state.Internal.AdaptableAlerts);
     const text = alerts.length == 0 ? '0 Alerts' : alerts.length == 1 ? '1 Alert' : alerts.length + ' Alerts';
     const handleAction = React.useCallback(() => adaptableApi.alertApi.openAlertSettingsPanel(), []);
     // blinking logic
     const previousAlerts = React.useRef(alerts);
-    const timeoutId = React.useRef();
+    const timeoutId = React.useRef(null);
     React.useEffect(() => {
         const noNewAlerts = previousAlerts.current.length === alerts.length;
         previousAlerts.current = alerts;

package/src/View/Alert/AlertViewPanel.d.ts

@@ -1,13 +1,13 @@
 import * as React from 'react';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { AlertDefinition } from '../../PredefinedConfig/AlertState';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
 interface AlertViewPanelComponentProps extends ViewPanelProps {
     AlertDefinitions: AlertDefinition[];
     AdaptableAlerts: AdaptableAlert[];
-    onDeleteAlert: (alert: AdaptableAlert) => SystemRedux.SystemAlertDeleteAction;
-    onDeleteAllAlert: (alerts: AdaptableAlert[]) => SystemRedux.SystemAlertDeleteAllAction;
+    onDeleteAlert: (alert: AdaptableAlert) => InternalRedux.AdaptableAlertDeleteAction;
+    onDeleteAllAlert: (alerts: AdaptableAlert[]) => InternalRedux.AdaptableAlertDeleteAllAction;
 }
 interface AlertViewState {
     ShowMessage: boolean;
@@ -16,7 +16,9 @@ interface AlertViewState {
 declare class AlertViewPanelComponent extends React.Component<AlertViewPanelComponentProps, AlertViewState> {
     constructor(props: AlertViewPanelComponentProps);
     componentDidUpdate(): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
-export declare const AlertViewPanelControl: import("react-redux").ConnectedComponent<typeof AlertViewPanelComponent, any>;
+export declare const AlertViewPanelControl: import("react-redux").ConnectedComponent<typeof AlertViewPanelComponent, {
+    [x: string]: any;
+}>;
 export {};

package/src/View/Alert/AlertViewPanel.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { connect } from 'react-redux';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { AdaptablePopover } from '../AdaptablePopover';
 import { Flex } from 'rebass';
 import UIHelper from '../UIHelper';
@@ -40,13 +40,13 @@ class AlertViewPanelComponent extends React.Component {
 function mapStateToProps(state, ownProps) {
     return {
         AlertDefinitions: state.Alert.AlertDefinitions,
-        AdaptableAlerts: state.System.AdaptableAlerts,
+        AdaptableAlerts: state.Internal.AdaptableAlerts,
     };
 }
 function mapDispatchToProps(dispatch) {
     return {
-        onDeleteAlert: (alert) => dispatch(SystemRedux.SystemAlertDelete(alert)),
-        onDeleteAllAlert: (alerts) => dispatch(SystemRedux.SystemAlertDeleteAll(alerts)),
+        onDeleteAlert: (alert) => dispatch(InternalRedux.AdaptableAlertDelete(alert)),
+        onDeleteAllAlert: (alerts) => dispatch(InternalRedux.AdaptableAlertDeleteAll(alerts)),
     };
 }
 export const AlertViewPanelControl = connect(mapStateToProps, mapDispatchToProps)(AlertViewPanelComponent);

package/src/View/Alert/AlertsPanel.js

@@ -10,8 +10,7 @@ import ListGroup from '../../components/List/ListGroup';
 import SimpleButton from '../../components/SimpleButton';
 export class AlertsPanel extends React.Component {
     componentWillUnmount() {
-        var _a, _b;
-        (_b = (_a = this.props).onRender) === null || _b === void 0 ? void 0 : _b.call(_a);
+        this.props.onRender?.();
     }
     render() {
         let alerts = this.props.Alerts.map((alert, index) => {

package/src/View/Alert/Utilities/getAlertType.js

@@ -1,3 +1,4 @@
+import { OBSERVABLE_EXPRESSION_ROW_ADDED, OBSERVABLE_EXPRESSION_ROW_REMOVED, } from './../../../Utilities/Constants/GeneralConstants';
 export var AlertType;
 (function (AlertType) {
     AlertType["DataChange"] = "DataChange";
@@ -13,27 +14,25 @@ export var AlertType;
  * @param alert
  */
 export const getAlertType = (alert) => {
-    var _a, _b;
     if (alert.Rule.ObservableExpression) {
+        if (alert.Rule.ObservableExpression.includes(OBSERVABLE_EXPRESSION_ROW_ADDED) ||
+            alert.Rule.ObservableExpression.includes(OBSERVABLE_EXPRESSION_ROW_REMOVED)) {
+            return AlertType.RowChange;
+        }
         return AlertType.Observable;
     }
     if (alert.Rule.AggregatedBooleanExpression) {
         return AlertType.Aggregation;
     }
     if (alert.Rule.BooleanExpression) {
-        if ((_a = alert.AlertProperties) === null || _a === void 0 ? void 0 : _a.PreventEdit) {
+        if (alert.AlertProperties?.PreventEdit) {
             return AlertType.Validation;
         }
         return AlertType.DataChange;
     }
     const predicates = alert.Rule.Predicates;
     if (predicates) {
-        if (predicates.some((predicate) => ['AddedRow', 'RemovedRow'].includes(predicate.PredicateId))) {
-            return AlertType.RowChange;
-        }
-        else {
-            return ((_b = alert.AlertProperties) === null || _b === void 0 ? void 0 : _b.PreventEdit) ? AlertType.Validation : AlertType.DataChange;
-        }
+        return alert.AlertProperties?.PreventEdit ? AlertType.Validation : AlertType.DataChange;
     }
     // the object is not a valid alert
     return null;

package/src/View/Alert/Utilities/getAvailablePredicates.js

@@ -1,15 +1,8 @@
 export const getAvailablePredicateDefinitions = (api, scope, alertType) => {
     let predicateDefs = [];
     if (alertType === 'DataChange' || alertType === 'Validation') {
-        predicateDefs = api.alertApi.internalApi
-            .getAlertPredicateDefsForScope(scope)
-            .filter((predicateDef) => !['AddedRow', 'RemovedRow'].includes(predicateDef.id));
+        predicateDefs = api.alertApi.internalApi.getAlertPredicateDefsForScope(scope);
         predicateDefs = [...predicateDefs].sort((a, b) => a.id === 'AnyChange' ? -1 : b.id === 'AnyChange' ? 1 : 0);
     }
-    else if (alertType === 'RowChange') {
-        predicateDefs = api.alertApi.internalApi
-            .getAlertPredicateDefsForScope(scope)
-            .filter((predicateDef) => ['AddedRow', 'RemovedRow'].includes(predicateDef.id));
-    }
     return predicateDefs;
 };

package/src/View/Alert/Utilities/getDefaultAlertDefinition.d.ts

@@ -6,7 +6,7 @@ import { AlertType } from './getAlertType';
  */
 export declare const getDefaultAlertDefinition: (alertDefinition: AlertDefinition, type: AlertType) => {
     Uuid: string;
-    Scope: import("../../../types").ColumnScope<import("../../../PredefinedConfig/Common/ColumnScope").ScopeDataType>;
+    Scope: import("../../../types").ColumnScope;
     Rule: ({
         Predicates?: never;
     } & (({
@@ -32,6 +32,7 @@ export declare const getDefaultAlertDefinition: (alertDefinition: AlertDefinitio
     AlertForm?: string | import("../../../types").AlertButtonForm;
     IsSuspended?: boolean;
     Source?: "Config" | "User";
+    AdaptableVersion?: `${string}.${string}.${string}`;
     IsReadOnly?: boolean;
     Tags?: string[];
 };

package/src/View/Alert/Utilities/getDefaultAlertDefinition.js

@@ -5,7 +5,10 @@ import { AlertType } from './getAlertType';
  * @param type AlertType
  */
 export const getDefaultAlertDefinition = (alertDefinition, type) => {
-    const newAlert = Object.assign(Object.assign({}, ObjectFactory.CreateEmptyAlertDefinition()), { Uuid: alertDefinition.Uuid });
+    const newAlert = {
+        ...ObjectFactory.CreateEmptyAlertDefinition(),
+        Uuid: alertDefinition.Uuid,
+    };
     // can only be all
     if (type === AlertType.Observable ||
         type === AlertType.Aggregation ||
@@ -16,11 +19,7 @@ export const getDefaultAlertDefinition = (alertDefinition, type) => {
     }
     if (type === AlertType.RowChange) {
         newAlert.Rule = {
-            Predicates: [
-                {
-                    PredicateId: 'AddedRow',
-                },
-            ],
+            ObservableExpression: 'ROW_ADDED()',
         };
     }
     if (type === AlertType.Validation) {

package/src/View/Alert/Utilities/mapAlertDefinition.js

@@ -1,27 +1,26 @@
 export const mapAlertDefinition = (api, alertDefinition) => {
-    var _a;
     const isRemovedRowChangeAlert = api.alertApi.internalApi.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition);
-    const mapValidButtonActions = (alertAction) => {
+    const mapValidButtonActions = (alertCommand) => {
         if (isRemovedRowChangeAlert) {
-            if (alertAction === 'highlight-row' || alertAction === 'jump-to-row') {
+            if (alertCommand === 'highlight-row' || alertCommand === 'jump-to-row') {
                 return null;
             }
-            return alertAction;
+            return alertCommand;
         }
     };
     // the only case needed is when changing from AddedRow to RemovedRow
     // map FormButton Actions
     if (alertDefinition.AlertForm && typeof alertDefinition.AlertForm !== 'string') {
-        const alertButtons = (_a = alertDefinition.AlertForm) === null || _a === void 0 ? void 0 : _a.Buttons;
-        alertButtons === null || alertButtons === void 0 ? void 0 : alertButtons.forEach((alertButton) => {
-            const alertAction = alertButton.Action;
-            if (Array.isArray(alertAction)) {
-                alertButton.Action = alertAction
+        const alertButtons = alertDefinition.AlertForm?.Buttons;
+        alertButtons?.forEach((alertButton) => {
+            const alertCommand = alertButton.Command;
+            if (Array.isArray(alertCommand)) {
+                alertButton.Command = alertCommand
                     .map(mapValidButtonActions)
                     .filter(Boolean);
             }
             else {
-                alertButton.Action = mapValidButtonActions(alertAction);
+                alertButton.Command = mapValidButtonActions(alertCommand);
             }
         });
     }

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

@@ -1,12 +1,12 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { AlertDefinition } from '../../../PredefinedConfig/AlertState';
 import { AdaptableApi } from '../../../types';
 import { AlertType } from '../Utilities/getAlertType';
-export declare const renderAlertBehaviourWizardSummary: (alertDefinition: AlertDefinition) => JSX.Element;
-export declare const renderAlertBehaviourSummary: (alert: AlertDefinition, api: AdaptableApi, allowWrap?: boolean) => JSX.Element;
+export declare const renderAlertBehaviourWizardSummary: (alertDefinition: AlertDefinition) => React.JSX.Element;
+export declare const renderAlertBehaviourSummary: (alert: AlertDefinition, api: AdaptableApi, allowWrap?: boolean) => React.JSX.Element;
 type AlertBehaviourWizardSectionProps = {
     onChange: (data: AlertDefinition) => void;
     alertType: AlertType;
 };
-export declare const AlertBehaviourWizardSection: (props: AlertBehaviourWizardSectionProps) => JSX.Element;
+export declare const AlertBehaviourWizardSection: (props: AlertBehaviourWizardSectionProps) => React.JSX.Element;
 export {};

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

@@ -115,7 +115,13 @@ export const AlertBehaviourWizardSection = (props) => {
     // except row removed
     const hasJumpToRow = !rowRemovedAlert;
     const onChange = (AlertProperties) => {
-        props.onChange(Object.assign(Object.assign({}, data), { AlertProperties: Object.assign(Object.assign({}, data.AlertProperties), AlertProperties) }));
+        props.onChange({
+            ...data,
+            AlertProperties: {
+                ...data.AlertProperties,
+                ...AlertProperties,
+            },
+        });
     };
     return (React.createElement(Tabs, null,
         React.createElement(Tabs.Tab, null, api.internalApi.getCorrectEnglishVariant('Behaviour')),