@adaptabletools/adaptable 13.1.1 → 14.0.0-canary.1

package/src/View/Components/Popups/AdaptablePopupAlert.js

@@ -47,7 +47,7 @@ const AdaptablePopupAlert = (props) => {
         if (api.isDestroyed()) {
             return null;
         }
-        return api.internalApi.getAdaptableFormFromAlertForm(props.adaptableAlert.alertDefinition.AlertForm || defaultForm, context, messageType);
+        return api.alertApi.internalApi.getAdaptableFormFromAlertForm(props.adaptableAlert.alertDefinition.AlertForm || defaultForm, context, messageType);
     }, [props.adaptableAlert.alertDefinition.AlertForm, defaultForm, messageType, context]);
     const renderApplicationIcon = (icon) => {
         if (!icon) {

package/src/View/Components/Popups/AdaptablePopupConfirmation.d.ts

@@ -4,7 +4,7 @@ import { AdaptableApi } from '../../../Api/AdaptableApi';
 /**
  * Used when giving the user 2 choices with the option of adding text also
  */
-export interface AdaptablePopupConfirmationProps extends React.ClassAttributes<AdaptablePopupConfirmation> {
+export interface AdaptablePopupConfirmationProps {
     showPopup: boolean;
     onConfirm: (comment: string) => void;
     onCancel: () => void;
@@ -16,14 +16,4 @@ export interface AdaptablePopupConfirmationProps extends React.ClassAttributes<A
     messageType: AdaptableMessageType;
     api: AdaptableApi;
 }
-export interface AdaptablePopupConfirmationState {
-    PromptText: string;
-}
-export declare class AdaptablePopupConfirmation extends React.Component<AdaptablePopupConfirmationProps, AdaptablePopupConfirmationState> {
-    constructor(props: AdaptablePopupConfirmationProps);
-    render(): JSX.Element;
-    onCancelForm(): void;
-    onConfirmmForm(): void;
-    changeContent: (e: any) => void;
-    canConfirm(): boolean;
-}
+export declare const AdaptablePopupConfirmation: React.FunctionComponent<AdaptablePopupConfirmationProps>;

package/src/View/Components/Popups/AdaptablePopupConfirmation.js

@@ -10,49 +10,56 @@ const rebass_1 = require("rebass");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const Dialog_1 = tslib_1.__importDefault(require("../../../components/Dialog"));
-class AdaptablePopupConfirmation extends React.Component {
-    constructor(props) {
-        super(props);
-        this.changeContent = (e) => {
-            this.setState({
-                PromptText: e.target.value,
-            });
-        };
-        this.state = { PromptText: '' };
+const CheckBox_1 = require("../../../components/CheckBox");
+const SystemRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/SystemRedux"));
+const react_redux_1 = require("react-redux");
+const AdaptablePopupConfirmation = (props) => {
+    const dispatch = (0, react_redux_1.useDispatch)();
+    const [disableDeleteConfirmation, setDisableDeleteConfirmation] = React.useState(false);
+    const [promptText, setPromptText] = React.useState('');
+    const header = props.header;
+    const glyph = UIHelper_1.UIHelper.getGlyphByMessageType(props.messageType);
+    function onCancelForm() {
+        setPromptText('');
+        props.onCancel();
     }
-    render() {
-        let header = this.props.header;
-        let glyph = UIHelper_1.UIHelper.getGlyphByMessageType(this.props.messageType);
-        return (this.props.showPopup && (React.createElement(Dialog_1.default, { modal: true, "data-name": `confirmation-popup confirmation-popup--${this.props.messageType.toLowerCase()}`, isOpen: this.props.showPopup, onDismiss: this.props.onCancel, showCloseButton: false, style: { minHeight: 'auto', maxWidth: '50%' } },
-            React.createElement(PanelWithImage_1.PanelWithImage, { header: header, icon: glyph, variant: "primary" },
-                React.createElement("div", null,
-                    React.createElement("div", { style: { display: 'flex', alignItems: 'center' } }, this.props.messsage.split('\n').map(function (item, index) {
-                        return (React.createElement(rebass_1.Text, { key: index, margin: 2 },
-                            item,
-                            React.createElement("br", null)));
-                    })),
-                    this.props.showInputBox && (React.createElement(rebass_1.Box, { padding: 2, "data-name": "body" },
-                        React.createElement("p", null, "Please enter a comment to confirm"),
-                        React.createElement(Input_1.default, { marginTop: 2, width: '100%', value: this.state.PromptText, type: "string", placeholder: "Enter text", onChange: (e) => this.changeContent(e) }))),
-                    React.createElement(rebass_1.Flex, { marginTop: 3, padding: 2, "data-name": "footer" },
-                        React.createElement(SimpleButton_1.default, { tone: "error", "data-name": "delete", variant: "raised", disabled: !this.canConfirm(), onClick: () => this.onConfirmmForm() }, this.props.confirmButtonText),
-                        React.createElement("div", { style: { flex: 1 } }),
-                        React.createElement(SimpleButton_1.default, { "data-name": "cancel", tone: "neutral", variant: "raised", onClick: () => this.onCancelForm() }, this.props.cancelButtonText)))))));
-    }
-    onCancelForm() {
-        this.setState({ PromptText: '' });
-        this.props.onCancel();
+    function onConfirmmForm() {
+        props.onConfirm(promptText);
+        setPromptText('');
+        if (disableDeleteConfirmation) {
+            dispatch(SystemRedux.SystemDisableDeleteConfirmation());
+        }
     }
-    onConfirmmForm() {
-        let promptText = this.state.PromptText;
-        this.setState({ PromptText: '' });
-        this.props.onConfirm(promptText);
+    function changeContent(e) {
+        setPromptText(e.target.value);
     }
-    canConfirm() {
-        if (this.props.showInputBox) {
-            return StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.state.PromptText);
+    function canConfirm() {
+        if (props.showInputBox) {
+            return StringExtensions_1.StringExtensions.IsNotNullOrEmpty(promptText);
         }
         return true;
     }
-}
+    if (!props.showPopup) {
+        return React.createElement(React.Fragment, null);
+    }
+    return (React.createElement(Dialog_1.default, { modal: true, "data-name": `confirmation-popup confirmation-popup--${props.messageType.toLowerCase()}`, isOpen: props.showPopup, onDismiss: props.onCancel, showCloseButton: false, style: { minHeight: 'auto', maxWidth: '50%' } },
+        React.createElement(PanelWithImage_1.PanelWithImage, { header: header, icon: glyph, variant: "primary" },
+            React.createElement("div", null,
+                React.createElement("div", { style: { display: 'flex', alignItems: 'center' } }, props.messsage.split('\n').map(function (item, index) {
+                    return (React.createElement(rebass_1.Text, { key: index, margin: 2 },
+                        item,
+                        React.createElement("br", null)));
+                })),
+                React.createElement(rebass_1.Box, { pl: 2 },
+                    React.createElement(CheckBox_1.CheckBox, { checked: disableDeleteConfirmation, onChange: () => {
+                            setDisableDeleteConfirmation(!disableDeleteConfirmation);
+                        } }, "Do not show this again.")),
+                props.showInputBox && (React.createElement(rebass_1.Box, { padding: 2, "data-name": "body" },
+                    React.createElement("p", null, "Please enter a comment to confirm"),
+                    React.createElement(Input_1.default, { marginTop: 2, width: '100%', value: promptText, type: "string", placeholder: "Enter text", onChange: (e) => changeContent(e) }))),
+                React.createElement(rebass_1.Flex, { marginTop: 3, padding: 2, "data-name": "footer" },
+                    React.createElement(SimpleButton_1.default, { tone: "error", "data-name": "delete", variant: "raised", disabled: !canConfirm(), onClick: () => onConfirmmForm() }, props.confirmButtonText),
+                    React.createElement("div", { style: { flex: 1 } }),
+                    React.createElement(SimpleButton_1.default, { "data-name": "cancel", tone: "neutral", variant: "raised", onClick: () => onCancelForm() }, props.cancelButtonText))))));
+};
 exports.AdaptablePopupConfirmation = AdaptablePopupConfirmation;

package/src/View/Components/PredicateEditor/PredicateEditor.js

@@ -23,18 +23,18 @@ const PredicateEditor = (props) => {
             });
         },
     })), [props.predicateDefs, props.onChange]);
-    const handlePredicateInputChange = React.useCallback((e, index) => {
+    const handlePredicateInputChange = (e, index) => {
         const { value } = e.target;
         const newInputs = [...props.predicate.Inputs];
         newInputs[index] = value;
         props.onChange(Object.assign(Object.assign({}, props.predicate), { Inputs: newInputs }));
-    }, [props.predicate]);
-    const handlePredicateValuesChange = React.useCallback((inputs) => {
+    };
+    const handlePredicateValuesChange = (inputs) => {
         props.onChange(Object.assign(Object.assign({}, props.predicate), { Inputs: inputs }));
-    }, [props.predicate]);
+    };
     const currentPredicateDef = props.predicateDefs.find((item) => { var _a; return item.id === ((_a = props.predicate) === null || _a === void 0 ? void 0 : _a.PredicateId); });
     return (React.createElement(rebass_1.Box, { className: baseClassName },
-        React.createElement(DropdownButton_1.default, { "data-name": "select-predicate", mb: 2, width: "100%", className: `${baseClassName}__predicate-dropdown`, placeholder: "Select Rule", showClearButton: !!props.predicate, onClear: props.onClear, items: predicateDefsOptions, columns: ['label'] }, currentPredicateDef ? currentPredicateDef.label : 'Select Rule'),
+        React.createElement(DropdownButton_1.default, { listStyle: { minWidth: 150 }, "data-name": "select-predicate", mb: 2, width: "100%", className: `${baseClassName}__predicate-dropdown`, placeholder: "Select Rule", showClearButton: !!props.predicate, onClear: props.onClear, items: predicateDefsOptions, columns: ['label'] }, currentPredicateDef ? currentPredicateDef.label : 'Select Rule'),
         React.createElement(rebass_1.Flex, null, (_a = currentPredicateDef === null || currentPredicateDef === void 0 ? void 0 : currentPredicateDef.inputs) === null || _a === void 0 ? void 0 : _a.map((predicateDefInput, index) => (React.createElement(React.Fragment, null,
             index > 0 && React.createElement(HelpBlock_1.default, { margin: 2 }, "AND"),
             React.createElement(rebass_1.Flex, { key: index, flex: 1, flexDirection: "column" },

package/src/View/Components/ScopeComponent.js

@@ -15,14 +15,14 @@ class ScopeComponent extends React.Component {
         this.state = {
             ScopeChoice: this.setScopeChoice(this.props.scope),
             componentScope: this.props.scope,
-            selectedColumnValues: this.props.api.columnApi.getFriendlyNamesFromColumnIds(this.props.api.scopeApi.getColumnIdsInScope(this.props.scope)),
+            selectedColumnValues: this.props.api.columnApi.getFriendlyNamesForColumnIds(this.props.api.scopeApi.getColumnIdsInScope(this.props.scope)),
             availableDataTypes: this.props.availableDataTypes
                 ? this.props.availableDataTypes
                 : ['Date', 'Number', 'String', 'Boolean'],
         };
     }
     render() {
-        let availableValues = this.props.api.columnApi.getAllColumnFriendlyNames();
+        let availableValues = this.props.api.columnApi.internalApi.getAllColumnFriendlyNames();
         let displayMessage = this.props.displayMessage
             ? this.props.displayMessage
             : 'Apply Scope for: Row, or one or more Columns, or one or more Data Types';
@@ -106,7 +106,7 @@ class ScopeComponent extends React.Component {
         this.props.updateScope(newScope);
     }
     onColumnsSelectedChanged(columnFriendlyNames) {
-        let cols = this.props.api.columnApi.getColumnIdsFromFriendlyNames(columnFriendlyNames);
+        let cols = this.props.api.columnApi.getColumnIdsForFriendlyNames(columnFriendlyNames);
         let newScope = {
             ColumnIds: cols,
         };

package/src/View/Components/Selectors/ColumnValueSelector.js

@@ -27,7 +27,7 @@ class ColumnValueSelector extends React.Component {
             }
             // JW "fixed" this by replacing display values with raw values but really we should do it nicer in some way
             // so that you we show the display value but we work on the raw value
-            const columnDisplayValuePairs = await (0, runIfNotResolvedIn_1.runIfNotResolvedIn)(this.props.api.columnApi.getDistinctBulkUpdateDisplayValuesForColumn(this.props.selectedColumn.columnId, this.props.selectedGridCells), () => this.setState({ isDistinctColumnValuesLoading: true }));
+            const columnDisplayValuePairs = await (0, runIfNotResolvedIn_1.runIfNotResolvedIn)(this.props.api.gridApi.internalApi.getDistinctBulkUpdateDisplayValuesForColumn(this.props.selectedColumn.columnId, this.props.selectedGridCells), () => this.setState({ isDistinctColumnValuesLoading: true }));
             this.setState({ isDistinctColumnValuesLoading: false });
             const newSortedColumnValues = ArrayExtensions_1.ArrayExtensions.sortArray(columnDisplayValuePairs, Enums_1.SortOrder.Asc).map((v) => ({
                 label: v,

package/src/View/Components/StyleComponent.js

@@ -98,12 +98,12 @@ class StyleComponent extends React.Component {
     }
     onShowClassNameChanged(checked) {
         // clear everything
-        this.state.componentStyle.BackColor = null;
-        this.state.componentStyle.ForeColor = null;
-        this.state.componentStyle.BorderColor = null;
-        this.state.componentStyle.FontSize = null;
-        this.state.componentStyle.FontStyle = null;
-        this.state.componentStyle.FontWeight = null;
+        delete this.state.componentStyle.BackColor;
+        delete this.state.componentStyle.ForeColor;
+        delete this.state.componentStyle.BorderColor;
+        delete this.state.componentStyle.FontSize;
+        delete this.state.componentStyle.FontStyle;
+        delete this.state.componentStyle.FontWeight;
         this.state.componentStyle.ClassName = '';
         this.setState({ ShowClassName: checked });
     }
@@ -112,19 +112,39 @@ class StyleComponent extends React.Component {
         this.props.UpdateStyle(this.state.componentStyle);
     }
     onUseBackColorCheckChange(checked) {
-        this.state.componentStyle.BackColor = checked ? '#ffffff' : null;
+        if (checked) {
+            this.state.componentStyle.BackColor = '#ffffff';
+        }
+        else {
+            delete this.state.componentStyle.BackColor;
+        }
         this.props.UpdateStyle(this.state.componentStyle);
     }
     onUseForeColorCheckChange(checked) {
-        this.state.componentStyle.ForeColor = checked ? '#000000' : null;
+        if (checked) {
+            this.state.componentStyle.ForeColor = '#000000';
+        }
+        else {
+            delete this.state.componentStyle.ForeColor;
+        }
         this.props.UpdateStyle(this.state.componentStyle);
     }
     onUseBorderColorCheckChange(checked) {
-        this.state.componentStyle.BorderColor = checked ? '#000000' : null;
+        if (checked) {
+            this.state.componentStyle.BorderColor = '#000000';
+        }
+        else {
+            delete this.state.componentStyle.BorderColor;
+        }
         this.props.UpdateStyle(this.state.componentStyle);
     }
     onUseFontSizeCheckChange(checked) {
-        this.state.componentStyle.FontSize = checked ? Enums_1.FontSize.Medium : null;
+        if (checked) {
+            this.state.componentStyle.FontSize = Enums_1.FontSize.Medium;
+        }
+        else {
+            delete this.state.componentStyle.FontSize;
+        }
         this.props.UpdateStyle(this.state.componentStyle);
     }
     onBackColorSelectChange(color) {
@@ -140,13 +160,21 @@ class StyleComponent extends React.Component {
         this.props.UpdateStyle(this.state.componentStyle);
     }
     onFontWeightChange(checked) {
-        let fontWeight = checked ? Enums_1.FontWeight.Bold : undefined;
-        this.state.componentStyle.FontWeight = fontWeight;
+        if (checked) {
+            this.state.componentStyle.FontWeight = Enums_1.FontWeight.Bold;
+        }
+        else {
+            delete this.state.componentStyle.FontWeight;
+        }
         this.props.UpdateStyle(this.state.componentStyle);
     }
     onFontStyleChange(checked) {
-        let fontStyle = checked ? Enums_1.FontStyle.Italic : undefined;
-        this.state.componentStyle.FontStyle = fontStyle;
+        if (checked) {
+            this.state.componentStyle.FontStyle = Enums_1.FontStyle.Italic;
+        }
+        else {
+            delete this.state.componentStyle.FontStyle;
+        }
         this.props.UpdateStyle(this.state.componentStyle);
     }
     onFontSizeChange(value) {

package/src/View/Components/ToolPanel/AdaptableToolPanel.js

@@ -166,7 +166,7 @@ const AdaptableToolPanelComponent = (props) => {
         });
     };
     const onSetColumnVisibility = (name) => {
-        let changedColumn = props.api.columnApi.getColumnFromId(name);
+        let changedColumn = props.api.columnApi.getColumnWithColumnId(name);
         let columns = [].concat(props.Columns);
         changedColumn = Object.assign({}, changedColumn, {
             Visible: !changedColumn.visible,

package/src/View/CustomSort/CustomSortSummary.js

@@ -37,7 +37,7 @@ class CustomSortSummaryComponent extends React.Component {
     }
     render() {
         const customSort = this.props.CustomSorts.find((c) => c.ColumnId == this.props.summarisedColumn.columnId);
-        const columnSortComparer = this.props.api.internalApi.getCustomSortComparer(this.props.summarisedColumn);
+        const columnSortComparer = this.props.api.customSortApi.internalApi.getCustomSortComparer(this.props.summarisedColumn);
         let noCustomSort = customSort == null && columnSortComparer == null;
         let customSortRow;
         if (!this.props.summarisedColumn.sortable) {

package/src/View/CustomSort/Wizard/CustomSortColumnWizardSection.js

@@ -12,7 +12,7 @@ const renderCustomSortColumn = (data) => {
     const { api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     return (React.createElement(rebass_1.Text, { pr: 2, py: 2, fontSize: 2 },
         "Custom sort column: ",
-        React.createElement(Tag_1.Tag, null, api.columnApi.getFriendlyNameFromColumnId(data.ColumnId))));
+        React.createElement(Tag_1.Tag, null, api.columnApi.getFriendlyNameForColumnId(data.ColumnId))));
 };
 exports.renderCustomSortColumn = renderCustomSortColumn;
 const isValidCustomSortColumn = (data) => {
@@ -27,7 +27,7 @@ const CustomSortColumnWizardSection = (props) => {
     const sortableCols = React.useMemo(() => {
         var _a, _b;
         const sortableColumns = api.columnApi.getSortableColumns();
-        const customSorts = api.customSortApi.getAllCustomSort();
+        const customSorts = api.customSortApi.getCustomSorts();
         const columnSortComparers = ((_b = (_a = api.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.customSortComparers) || [];
         const usedColumnIds = [
             ...customSorts.map((customSort) => customSort.ColumnId),

package/src/View/CustomSort/Wizard/CustomSortSummaryWizard.js

@@ -12,7 +12,7 @@ class CustomSortSummaryWizard extends React.Component {
         let keyValuePairs = [
             {
                 Key: 'Column',
-                Value: this.props.api.columnApi.getFriendlyNameFromColumnId(this.props.data.ColumnId),
+                Value: this.props.api.columnApi.getFriendlyNameForColumnId(this.props.data.ColumnId),
             },
             { Key: 'Values', Value: this.props.data.SortedValues.join(', ') },
         ];

package/src/View/CustomSort/Wizard/CustomSortValuesWizardSection.js

@@ -33,7 +33,7 @@ const CustomSortValuesWizardSection = (props) => {
         (async () => {
             // for sync and very fast resolving promises does not make sense to show a loader
             setDistinctValues([]);
-            const newValues = await (0, runIfNotResolvedIn_1.runIfNotResolvedIn)(api.columnApi.getDistinctCustomSortDisplayValuesForColumn(data.ColumnId), () => isMounted && setIsDistinctValuesLoading(true));
+            const newValues = await (0, runIfNotResolvedIn_1.runIfNotResolvedIn)(api.gridApi.internalApi.getDistinctCustomSortDisplayValuesForColumn(data.ColumnId), () => isMounted && setIsDistinctValuesLoading(true));
             if (!isMounted) {
                 return;
             }

package/src/View/Dashboard/Dashboard.js

@@ -102,7 +102,7 @@ const DashboardComponent = (props) => {
         return (React.createElement(rebass_1.Box, { ml: 2 },
             React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { type: "text", placeholder: props.api.internalApi.getAdaptableOptions().searchOptions.quickSearchPlaceholder, className: "ab-DashboardToolbar__QuickSearch__text", value: searchText, OnTextChange: search, style: { width: 'auto' }, inputStyle: { width: '7rem' } })));
     };
-    let instanceName = props.api.internalApi.setToolbarTitle();
+    let instanceName = props.api.internalApi.getToolbarTitle();
     let dashboardOptions = props.api.internalApi.getAdaptableOptions().dashboardOptions;
     const shouldRenderQuickSearchHeader = dashboardOptions.showQuickSearchInHeader &&
         props.api.internalApi.getModuleService().getModuleById(ModuleConstants_1.QuickSearchModuleId).isModuleAvailable();

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -281,7 +281,7 @@ const headerMap = new Map();
 const getColumnHeaderLabel = (columnId, mainAdaptableInstance) => {
     var _a, _b;
     if (!headerMap.has(columnId)) {
-        headerMap.set(columnId, (_b = (_a = mainAdaptableInstance.api.columnApi.getColumnFromId(columnId)) === null || _a === void 0 ? void 0 : _a.friendlyName) !== null && _b !== void 0 ? _b : columnId);
+        headerMap.set(columnId, (_b = (_a = mainAdaptableInstance.api.columnApi.getColumnWithColumnId(columnId)) === null || _a === void 0 ? void 0 : _a.friendlyName) !== null && _b !== void 0 ? _b : columnId);
     }
     return headerMap.get(columnId);
 };

package/src/View/DataChangeHistory/DataChangeHistoryViewPanel.js

@@ -12,6 +12,8 @@ const ButtonStop_1 = require("../Components/Buttons/ButtonStop");
 const FormatHelper_1 = require("../../Utilities/Helpers/FormatHelper");
 const Tooltip_1 = tslib_1.__importDefault(require("../../components/Tooltip"));
 const AdaptableContext_1 = require("../AdaptableContext");
+const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const icons_1 = require("../../components/icons");
 const DataChangeHistoryViewPanelControl = (props) => {
     var _a, _b;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -20,6 +22,9 @@ const DataChangeHistoryViewPanelControl = (props) => {
     const onChangeHistoryDisable = React.useCallback(() => dispatch((0, SystemRedux_1.SystemDataChangeHistoryDisable)()), []);
     const onChangeHistorySuspend = React.useCallback(() => dispatch((0, SystemRedux_1.SystemDataChangeHistorySuspend)()), []);
     const onChangeHistoryResume = React.useCallback(() => dispatch((0, SystemRedux_1.SystemDataChangeHistoryResume)()), []);
+    const handleOpenPopup = React.useCallback(() => {
+        adaptable.api.settingsPanelApi.openSettingsPanel('DataChangeHistory');
+    }, []);
     const { changeHistoryMode, activationTime, suspensionTime } = (0, react_redux_1.useSelector)((state) => ({
         changeHistoryMode: state.System.DataChangeHistory.currentMode,
         activationTime: state.System.DataChangeHistory.enableTime,
@@ -44,6 +49,10 @@ const DataChangeHistoryViewPanelControl = (props) => {
         disabled && (React.createElement(rebass_1.Text, { className: "ab-DataChangeHistoryPanel--status-disabled", fontSize: 2 }, "Activate data tracking"))));
     return (React.createElement(rebass_1.Flex, { flexDirection: 'row' },
         buttonPanel,
-        statusPanel));
+        statusPanel,
+        React.createElement(rebass_1.Flex, { ml: 2, alignItems: "center" },
+            React.createElement(SimpleButton_1.default, { onClick: handleOpenPopup, variant: "text" },
+                React.createElement(icons_1.Icon, { name: "open-in-new" }),
+                React.createElement(rebass_1.Box, { ml: 1 }, "Show")))));
 };
 exports.DataChangeHistoryViewPanelControl = DataChangeHistoryViewPanelControl;

package/src/View/DataSet/DataSetSelector.js

@@ -7,7 +7,7 @@ const Radio_1 = tslib_1.__importDefault(require("../../components/Radio"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const DataSetSelector = ({ data }) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const dataSets = adaptable.api.dataSetApi.getAllDataSets();
+    const dataSets = adaptable.api.dataSetApi.getDataSets();
     const selectedDataSet = adaptable.api.dataSetApi.getCurrentDataSet();
     const isDisabled = (dataSets === null || dataSets === void 0 ? void 0 : dataSets.length) === 1;
     const isSelected = (selectedDataSet === null || selectedDataSet === void 0 ? void 0 : selectedDataSet.name) === (data === null || data === void 0 ? void 0 : data.name);

package/src/View/DataSet/DataSetStatusPanelPopover.js

@@ -7,7 +7,7 @@ const SelectList_1 = require("../../components/SelectList");
 const AdaptableContext_1 = require("../AdaptableContext");
 const DataSetStatusPanelPopover = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const dataSets = adaptable.api.dataSetApi.getAllDataSets();
+    const dataSets = adaptable.api.dataSetApi.getDataSets();
     const handleDataSetChange = React.useCallback((option) => {
         adaptable.api.dataSetApi.setDataSet(option.label);
     }, []);

package/src/View/DataSet/DataSetViewPanel.js

@@ -15,7 +15,7 @@ class DataSetViewPanelComponent extends React.Component {
             : this.getDataSets().find((ds) => ds.name == this.props.CurrentDataSetName);
     }
     getDataSets() {
-        return this.props.api.dataSetApi.getAllDataSets();
+        return this.props.api.dataSetApi.getDataSets();
     }
     render() {
         var _a, _b;

package/src/View/Export/ExportSelector.js

@@ -21,7 +21,7 @@ const ExportSelector = () => {
     const handleReportChange = (report) => {
         adaptable.api.exportApi.selectReport(report);
     };
-    const allReports = adaptable.api.exportApi.getAllReports();
+    const allReports = adaptable.api.exportApi.getReports();
     const allReportNames = allReports.map((report) => report.Name);
     const reportItems = allReportNames.map((report) => {
         return {
@@ -43,7 +43,7 @@ const ExportSelector = () => {
             label: destination,
             onClick: () => handleDestinationChange(destination),
         })),
-        ...adaptable.api.exportApi.getAllCustomDestination().map((destination) => ({
+        ...adaptable.api.exportApi.getCustomDestinations().map((destination) => ({
             label: destination.name,
             onClick: () => handleDestinationChange(destination.name),
         })),

package/src/View/Export/ExportViewPanel.js

@@ -51,7 +51,7 @@ class ExportViewPanelComponent extends React.Component {
                 label: destination,
                 onClick: () => this.onSelectedDestinationChanged(destination),
             })),
-            ...this.props.api.exportApi.getAllCustomDestination().map((destination) => ({
+            ...this.props.api.exportApi.getCustomDestinations().map((destination) => ({
                 label: destination.name,
                 onClick: () => this.onSelectedDestinationChanged(destination.name),
             })),
@@ -102,7 +102,7 @@ class ExportViewPanelComponent extends React.Component {
             ...this.props.api.exportApi.getAvailableSystemReports(),
             ...this.props.UserReports.map((r) => r.Name),
         ];
-        const serverReports = this.props.api.exportApi.getAllServerReports();
+        const serverReports = this.props.api.exportApi.getServerReports();
         if (ArrayExtensions_1.default.IsNotNullOrEmpty(serverReports)) {
             reportNames.push(...serverReports.map((r) => r.name));
         }

package/src/View/Export/ReportExportDropdown.js

@@ -22,7 +22,7 @@ const ReportExportDropdown = (props) => {
             label: destination,
             onClick: () => handleExport(destination),
         })),
-        ...adaptable.api.exportApi.getAllCustomDestination().map((destination) => ({
+        ...adaptable.api.exportApi.getCustomDestinations().map((destination) => ({
             label: destination.name,
             onClick: () => {
                 handleExport(destination.name);

package/src/View/Export/Wizard/ReportNameWizardSection.js

@@ -21,7 +21,7 @@ const isValidReportName = (report, api) => {
         return 'Report name cannot be empty';
     }
     const reportsWithSameNameCount = api.exportApi
-        .getAllReports()
+        .getReports()
         .filter((r) => report.Name === r.Name).length;
     const hasAlreadyExistingName = report.Uuid
         ? reportsWithSameNameCount > 1

package/src/View/Export/Wizard/ReportRowsWizardSection.js

@@ -70,6 +70,6 @@ const ReportRowsWizardSection = (props) => {
                         props.onChange(Object.assign(Object.assign({}, data), { Query: {
                                 BooleanExpression,
                             } }));
-                    }, initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), api: api })))));
+                    }, initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getNamedQueries(), api: api })))));
 };
 exports.ReportRowsWizardSection = ReportRowsWizardSection;

package/src/View/Filter/FilterSummary.js

@@ -34,7 +34,7 @@ class FilterSummaryComponent extends React.Component {
         if (columnFilter == null) {
             return 'No Column Filter Active';
         }
-        return this.props.api.filterApi.columnFilterToString(columnFilter);
+        return this.props.api.filterApi.internalApi.columnFilterToString(columnFilter);
     }
 }
 exports.FilterSummaryComponent = FilterSummaryComponent;

package/src/View/Filter/FilterViewPanel.js

@@ -47,7 +47,7 @@ class FilterViewPanelComponent extends React.Component {
         this.props.api.filterApi.clearColumnFilters();
     }
     onClearColumnFilter(columnFilter) {
-        this.props.api.filterApi.clearColumnFilterByColumn(columnFilter.ColumnId);
+        this.props.api.filterApi.clearColumnFilterForColumn(columnFilter.ColumnId);
     }
 }
 function mapStateToProps(state) {

package/src/View/FlashingCell/Wizard/FlashingCellScopeWizardSection.js

@@ -14,11 +14,11 @@ const FlashingAlertScopeWizardSection = (props) => {
                 columnScope: 'Changes in selected columns will trigger an Flashing Cell',
             }, scope: data.Scope, updateScope: (Scope) => {
                 const newData = Object.assign(Object.assign({}, data), { Scope });
-                if (newData.Rule.Predicate) {
+                if (newData.Rule.Predicates) {
                     // when scope is changed, reset the rule to predicate of any
                     // if it was set to a predicate before
                     newData.Rule = {
-                        Predicate: { PredicateId: 'Any' },
+                        Predicates: [{ PredicateId: 'Any' }],
                     };
                 }
                 props.onChange(newData);

package/src/View/FlashingCell/Wizard/FlashingCellWizard.js

@@ -22,11 +22,13 @@ const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection"
 const FlashingCellWizard = (props) => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
     const [flashingCell, setFlashingCell] = (0, react_1.useState)(() => {
+        var _a, _b;
         let flashingCell = props.data
             ? (0, Helper_1.cloneObject)(props.data)
             : ObjectFactory_1.default.CreateEmptyFlashingCellDefinition();
-        flashingCell = api.flashingCellApi.mergeFlashingCellDefinitionWithDefaults(flashingCell);
-        if (!flashingCell.Rule.BooleanExpression && !flashingCell.Rule.Predicate) {
+        flashingCell =
+            api.flashingCellApi.internalApi.mergeFlashingCellDefinitionWithDefaults(flashingCell);
+        if (!flashingCell.Rule.BooleanExpression && !((_b = (_a = flashingCell.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length)) {
             flashingCell.Rule.BooleanExpression = '';
         }
         return flashingCell;

package/src/View/FlashingCell/Wizard/isValidFlashingCellRules.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidFlashingCellRules = void 0;
 const ModuleConstants_1 = require("../../../Utilities/Constants/ModuleConstants");
 const isValidFlashingCellRules = (flashingCell, api, context) => {
+    var _a, _b, _c, _d, _e;
     let valid = true;
-    if (!flashingCell.Rule.Predicate && !flashingCell.Rule.BooleanExpression) {
+    if (!((_b = (_a = flashingCell.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length) && !flashingCell.Rule.BooleanExpression) {
         return 'No Rule defined for Flashing Cell';
     }
-    if (valid && flashingCell.Rule.Predicate) {
-        valid = api.predicateApi.isValidPredicate(flashingCell.Rule.Predicate);
+    if (valid && ((_d = (_c = flashingCell.Rule) === null || _c === void 0 ? void 0 : _c.Predicates) === null || _d === void 0 ? void 0 : _d.length)) {
+        valid = api.predicateApi.isEveryPredicateValid((_e = flashingCell.Rule) === null || _e === void 0 ? void 0 : _e.Predicates);
         if (!valid) {
             return 'Predicate is not valid';
         }

package/src/View/FormatColumn/MoveFormatColumn.js

@@ -10,7 +10,7 @@ const AdaptableContext_1 = require("../AdaptableContext");
 const MoveFormatColumn = (props) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const formatColumn = adaptable.api.formatColumnApi.getAllFormatColumn();
+    const formatColumn = adaptable.api.formatColumnApi.getFormatColumns();
     const handleMoveUp = React.useCallback(() => {
         dispatch(FormatColumnRedux.FormatColumnMoveUp(props.data));
     }, []);