@adaptabletools/adaptable 13.1.1 → 14.0.0-canary.1

package/src/Utilities/Services/RowEditService.js

@@ -1,172 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RowEditService = void 0;
+// @ts-ignore
 class RowEditService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
-        this.adaptableInstance = this.adaptableApi.internalApi.getAdaptableInstance();
-        this.rowEditFormOptions =
-            this.adaptableApi.internalApi.getAdaptableInstance().adaptableOptions.actionOptions.actionRowButtonOptions.actionRowFormOptions;
-        if (this.adaptableInstance.adaptableOptions.actionOptions.actionRowButtonOptions.autoHandle) {
-            this.adaptableInstance.api.eventApi.on('ActionRowSubmitted', (eventInfo) => this.autoHandleActionRowButtons(eventInfo));
+        const adaptableInstance = this.adaptableApi.internalApi.getAdaptableInstance();
+        if (adaptableInstance.adaptableOptions.actionOptions.actionRowButtonOptions.autoHandle) {
+            adaptableInstance.api.eventApi.on('ActionRowSubmitted', (eventInfo) => this.autoHandleActionRowButtons(eventInfo));
         }
     }
-    buildRowEditForm(rowNode) {
-        return this.buildActionRow('rowEdited', rowNode);
-    }
-    buildRowCreateForm(clonedRowNode) {
-        return this.buildActionRow('rowCreated', clonedRowNode);
-    }
-    buildActionRow(type, rowNode) {
-        const formFields = this.buildActionRowFields(type, rowNode);
-        const formButtons = this.buidActionRowButtons(type, rowNode);
-        const formTitle = this.getFormTitle(type, rowNode);
-        const formDescription = this.getFormDescription(type, rowNode);
-        const actionRowForm = {
-            title: formTitle,
-            description: formDescription,
-            fields: formFields,
-            buttons: formButtons,
-        };
-        return actionRowForm;
-    }
-    getFormTitle(type, rowNode) {
-        if (this.rowEditFormOptions.formTitle == undefined) {
-            return type === 'rowCreated' ? 'Create New Row' : 'Edit Row';
-        }
-        return typeof this.rowEditFormOptions.formTitle === 'function'
-            ? this.rowEditFormOptions.formTitle(this.buildFormParamContext(type, rowNode))
-            : this.rowEditFormOptions.formTitle;
-    }
-    getFormDescription(type, rowNode) {
-        return typeof this.rowEditFormOptions.formDescription === 'function'
-            ? this.rowEditFormOptions.formDescription(this.buildFormParamContext(type, rowNode))
-            : this.rowEditFormOptions.formDescription;
-    }
-    buildFormParamContext(type, rowNode) {
-        return {
-            rowNode,
-            adaptableApi: this.adaptableApi,
-            type: type,
-        };
-    }
-    buildActionRowFields(type, rowNode) {
-        const relevantColumns = this.adaptableApi.columnApi
-            .getColumns()
-            .filter((column) => {
-            // if there is NO rowNode, do NOT display the non-editable fields as they will be empty
-            return !!rowNode || this.isColumnEditable(column, rowNode);
-        })
-            .filter((column) => !this.adaptableApi.columnApi.isActionRowButtonColumn(column.columnId));
-        return relevantColumns.map((column) => this.buildFormField(type, column, rowNode));
-    }
-    buidActionRowButtons(type, rowNode) {
-        // 1. check if there are custom user provided buttons
-        if (Array.isArray(this.rowEditFormOptions.formButtons)) {
-            return this.rowEditFormOptions.formButtons;
-        }
-        // 2. else return the standard ones
-        const cancelButton = {
-            label: 'Cancel',
-            buttonStyle: {
-                variant: 'raised',
-                tone: 'neutral',
-            },
-        };
-        const saveButton = {
-            label: 'Save',
-            buttonStyle: {
-                variant: 'raised',
-                tone: 'success',
-            },
-            onClick: (button, context) => {
-                var _a, _b;
-                const eventInfo = type === 'rowCreated'
-                    ? {
-                        type: 'rowCreated',
-                        formData: context.formData,
-                        adaptableApi: context.adaptableApi,
-                        clonedRowNode: rowNode,
-                    }
-                    : {
-                        type: 'rowEdited',
-                        formData: context.formData,
-                        rowNode: rowNode,
-                        adaptableApi: context.adaptableApi,
-                    };
-                this.adaptableApi.eventApi.emit('ActionRowSubmitted', eventInfo);
-                (_b = (_a = this.adaptableInstance.adaptableOptions.actionOptions.actionRowButtonOptions.actionRowFormOptions).onFormSubmit) === null || _b === void 0 ? void 0 : _b.call(_a, eventInfo);
-            },
-        };
-        return [cancelButton, saveButton];
-    }
-    isColumnEditable(column, rowNode) {
-        return rowNode
-            ? this.adaptableInstance.isCellEditable(rowNode, this.adaptableInstance.getAgGridColumnForColumnId(column.columnId))
-            : !column.readOnly;
-    }
-    buildFormField(type, column, rowNode) {
-        const isColumnEditable = this.isColumnEditable(column, rowNode);
-        const fieldValueOptions = this.getFieldValueOptions(column, rowNode);
-        const fieldType = isColumnEditable
-            ? !!(fieldValueOptions === null || fieldValueOptions === void 0 ? void 0 : fieldValueOptions.length)
-                ? 'select'
-                : this.getFieldTypeFromColumnType(column)
-            : 'textOutput';
-        const defaultValue = rowNode
-            ? isColumnEditable
-                ? this.adaptableInstance.getRawValueFromRowNode(rowNode, column.columnId)
-                : this.adaptableInstance.getDisplayValueFromRowNode(rowNode, column.columnId)
-            : null;
-        return {
-            label: this.getFormFieldLabel(type, column, rowNode),
-            name: column.columnId,
-            defaultValue,
-            fieldType,
-            options: fieldValueOptions,
-        };
-    }
-    getFormFieldLabel(type, column, rowNode) {
-        const customFieldLabel = typeof this.rowEditFormOptions.formFieldLabel === 'function'
-            ? this.rowEditFormOptions.formFieldLabel(this.buildFormFieldLabelContext(type, column, rowNode))
-            : undefined;
-        return customFieldLabel !== null && customFieldLabel !== void 0 ? customFieldLabel : column.friendlyName;
-    }
-    buildFormFieldLabelContext(type, column, rowNode) {
-        return {
-            rowNode,
-            column,
-            adaptableApi: this.adaptableApi,
-            type: type,
-        };
-    }
-    getFieldTypeFromColumnType(column) {
-        switch (column.dataType) {
-            case 'Boolean':
-                return 'checkbox';
-            case 'Date':
-                return 'date';
-            case 'Number':
-                return 'number';
-            default:
-                // everything else is a plain text input
-                return 'text';
-        }
-    }
-    getFieldValueOptions(column, rowNode) {
-        const editLookUpItem = this.adaptableApi.userInterfaceApi.getEditLookUpItemForColumn(column);
-        if (!editLookUpItem) {
-            return;
-        }
-        const gridCell = rowNode
-            ? this.adaptableInstance.getGridCellFromRowNode(rowNode, column.columnId)
-            : undefined;
-        const editLookUpValues = this.adaptableApi.internalApi.getEditLookUpValuesForColumn(editLookUpItem, column, gridCell);
-        return editLookUpValues === null || editLookUpValues === void 0 ? void 0 : editLookUpValues.map((value) => ({
-            value,
-            label: value,
-        }));
-    }
     autoHandleActionRowButtons(actionRowSubmittedInfo) {
         const { adaptableApi } = actionRowSubmittedInfo;
         if (actionRowSubmittedInfo.type === 'rowEdited') {

package/src/Utilities/Services/TeamSharingService.js

@@ -74,7 +74,7 @@ class TeamSharingService {
                 return importInfo === null || importInfo === void 0 ? void 0 : importInfo.AddAction(Entity);
             }
         };
-        const existingSharedEntities = this.adaptableApi.internalApi.getLocalTeamSharingEntities();
+        const existingSharedEntities = this.adaptableApi.teamSharingApi.internalApi.getLocalTeamSharingEntities();
         const sharedEntityDependencyTree = this.getSharedEntityDependencyTree(importedSharedEntity, existingSharedEntities);
         const importSteps = sharedEntityDependencyTree.map((sharedEntity) => ({
             sharedEntity,
@@ -89,7 +89,7 @@ class TeamSharingService {
         return [localRevision, remoteRevision];
     }
     getStaleActiveSharedEntities() {
-        const sharedEntities = this.adaptableApi.internalApi.getLocalTeamSharingEntities();
+        const sharedEntities = this.adaptableApi.teamSharingApi.internalApi.getLocalTeamSharingEntities();
         const activeEntities = this.adaptableApi.internalApi.getState().TeamSharing.ActiveSharedEntityMap;
         const result = {};
         sharedEntities
@@ -122,7 +122,7 @@ class TeamSharingService {
             if (updateNotification === 'SystemStatus') {
                 this.adaptableApi.systemStatusApi.setInfoSystemStatus(`TeamSharing: ${notificationMessage}`);
             }
-            this.adaptableApi.teamSharingApi.fireTeamSharingEntityChangedEvent(sharedEntityActiveInfo.sharedEntity);
+            this.adaptableApi.teamSharingApi.internalApi.fireTeamSharingEntityChangedEvent(sharedEntityActiveInfo.sharedEntity);
         });
     }
     destroy() {

package/src/Utilities/Services/ValidationService.js

@@ -17,7 +17,7 @@ class ValidationService {
         if (cellDataChangedInfo.oldValue == cellDataChangedInfo.newValue) {
             return [];
         }
-        let editingRules = this.adaptableApi.alertApi
+        let editingRules = this.adaptableApi.alertApi.internalApi
             .getAlertDefinitionsWithPreventEdit()
             .filter((v) => this.adaptableApi.scopeApi.isColumnInScope(cellDataChangedInfo.column, v.Scope));
         let failedValidations = [];
@@ -51,17 +51,18 @@ class ValidationService {
                 alertDefinition: failedRules[0],
                 cellDataChangedInfo: cellDataChangedInfo,
             };
-            this.adaptableApi.alertApi.publishAlertFiredEvent(alert);
+            this.adaptableApi.alertApi.internalApi.publishAlertFiredEvent(alert);
             failedRules.forEach((alertDefinition) => {
-                const alert = ObjectFactory_1.default.CreateCellChangedAlert(cellDataChangedInfo.column.friendlyName, this.adaptableApi.alertApi.getAlertDescription(alertDefinition, cellDataChangedInfo), alertDefinition, cellDataChangedInfo);
-                this.adaptableApi.alertApi.displayAlert(alert);
+                const alert = ObjectFactory_1.default.CreateCellChangedAlert(cellDataChangedInfo.column.friendlyName, this.adaptableApi.alertApi.internalApi.getAlertDescription(alertDefinition, cellDataChangedInfo), alertDefinition, cellDataChangedInfo);
+                this.adaptableApi.alertApi.showAdaptableAlert(alert);
             });
             return false;
         }
         return true;
     }
     IsAlertDefinitionTriggered(alertDefinition, dataChangedEvent) {
-        return this.adaptableApi.predicateApi.handlePredicate(alertDefinition.Rule.Predicate, {
+        var _a;
+        return this.adaptableApi.predicateApi.handlePredicates((_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, {
             value: dataChangedEvent.newValue,
             oldValue: dataChangedEvent.oldValue,
             displayValue: this.adaptableApi.gridApi.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.column.columnId),
@@ -88,7 +89,7 @@ class ValidationService {
                     if (!row) {
                         return;
                     }
-                    row[(_b = this.adaptableApi.columnApi.getAgGridColumnFieldForAdaptableColumn(cellDataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : cellDataChangedInfo.column.columnId] = validationResult.NewValue;
+                    row[(_b = this.adaptableApi.columnApi.internalApi.getAgGridColumnFieldForAdaptableColumn(cellDataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : cellDataChangedInfo.column.columnId] = validationResult.NewValue;
                     this.adaptableApi.gridApi.updateGridData([row]);
                     if (StringExtensions_1.default.IsNotNullOrEmpty(validationResult.ValidationMessage) &&
                         this.adaptableApi.internalApi.getAdaptableOptions().editOptions
@@ -102,9 +103,10 @@ class ValidationService {
         };
     }
     createValidationDescription(alertDefinition) {
+        var _a, _b;
         return (this.adaptableApi.scopeApi.getScopeDescription(alertDefinition.Scope) +
             ' ' +
-            this.adaptableApi.predicateApi.predicateToString(alertDefinition.Rule.Predicate));
+            ((_b = (_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.map((predicate) => this.adaptableApi.predicateApi.predicateToString(predicate)).join(' AND ')));
     }
     createValidationMessage(alertDefinition) {
         let returnMessage = this.createValidationDescription(alertDefinition);

package/src/Utilities/logDeprecation.d.ts

@@ -0,0 +1,3 @@
+export declare const logDeprecation: <T>(typeName: string, oldProp: keyof T, newProp: keyof T, message?: string) => void;
+export declare const logDeprecationExternal: <OLD_TYPE, NEW_TYPE>(oldTypeName: string, oldProp: keyof OLD_TYPE, newTypeName: string, newProp: keyof NEW_TYPE, message?: string) => void;
+export declare const logDeprecationInternal: <T>(typeName: string, oldProp: keyof T) => void;

package/src/Utilities/logDeprecation.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logDeprecationInternal = exports.logDeprecationExternal = exports.logDeprecation = void 0;
+const LoggingHelper_1 = require("./Helpers/LoggingHelper");
+const doOnceFlags = {};
+/**
+ * If the key was passed before, then do NOT execute the func
+ */
+const doOnce = (func, key) => {
+    if (doOnceFlags[key]) {
+        return;
+    }
+    func();
+    doOnceFlags[key] = true;
+};
+const logDeprecation = (typeName, oldProp, newProp, message) => {
+    const newPropMsg = newProp ? `Please use '${typeName}.${newProp}()' instead. ` : '';
+    doOnce(() => (0, LoggingHelper_1.ConsoleLogWarning)(`Adaptable: '${typeName}.${oldProp}()' is deprecated. ${newPropMsg}${message !== null && message !== void 0 ? message : ''}`), `Deprecated_${oldProp}`);
+};
+exports.logDeprecation = logDeprecation;
+const logDeprecationExternal = (oldTypeName, oldProp, newTypeName, newProp, message) => {
+    const newPropMsg = newProp ? `Please use '${newTypeName}.${newProp}()' instead. ` : '';
+    doOnce(() => (0, LoggingHelper_1.ConsoleLogWarning)(`Adaptable: '${oldTypeName}.${oldProp}()' is deprecated. ${newPropMsg}${message !== null && message !== void 0 ? message : ''}`), `Deprecated_${oldProp}`);
+};
+exports.logDeprecationExternal = logDeprecationExternal;
+const logDeprecationInternal = (typeName, oldProp) => {
+    doOnce(() => (0, LoggingHelper_1.ConsoleLogWarning)(`Adaptable: '${typeName}.${oldProp}()' is deprecated. The method will be removed in the next major release.
+        Please contact support if you need the missing functionality.`), `Deprecated_${oldProp}`);
+};
+exports.logDeprecationInternal = logDeprecationInternal;

package/src/View/AdaptablePopover/index.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
+import { OverlayShowParams } from '../../components/InfiniteTable';
 export interface AdaptablePopoverProps extends React.ClassAttributes<React.PropsWithChildren<AdaptablePopover>> {
     headerText?: string;
     showEvent?: string;
@@ -14,6 +15,7 @@ export interface AdaptablePopoverProps extends React.ClassAttributes<React.Props
     popoverMinWidth?: number;
     popoverMaxWidth?: number;
     popupPadding?: number;
+    alignPosition?: OverlayShowParams['alignPosition'];
 }
 export declare class AdaptablePopover extends React.Component<React.PropsWithChildren<AdaptablePopoverProps>, {}> {
     render(): JSX.Element;

package/src/View/AdaptablePopover/index.js

@@ -34,9 +34,13 @@ class AdaptablePopover extends React.Component {
             fill: 'currentColor',
         };
         return (React.createElement(rebass_1.Flex, { alignItems: "center", className: this.props.className },
-            React.createElement(OverlayTrigger_1.default, { showTriangle: true, render: () => popoverClickRootClose, showEvent: (this.props.showEvent || 'mouseenter'), hideEvent: (this.props.hideEvent || 'mouseleave'), style: {
+            React.createElement(OverlayTrigger_1.default
+            // showTriangle
+            , { 
+                // showTriangle
+                render: () => popoverClickRootClose, showEvent: (this.props.showEvent || 'mouseenter'), hideEvent: (this.props.hideEvent || 'mouseleave'), style: {
                     overflow: 'visible',
-                }, defaultZIndex: 100000 }, useButton ? (React.createElement(ButtonInfo_1.ButtonInfo, { style: iconStyle, variant: "text", onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText }, this.props.children)) : (React.createElement("div", { title: this.props.tooltipText, tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' } },
+                }, defaultZIndex: 100000, alignPosition: this.props.alignPosition }, useButton ? (React.createElement(ButtonInfo_1.ButtonInfo, { style: iconStyle, variant: "text", onClick: () => null, icon: showIcon && icon, tooltip: this.props.tooltipText }, this.props.children)) : (React.createElement("div", { title: this.props.tooltipText, tabIndex: 0, style: { cursor: 'pointer', display: 'inline-block' } },
                 this.props.children,
                 showIcon && React.createElement(icons_1.Icon, { name: icon }))))));
     }

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

@@ -7,14 +7,16 @@ const rebass_1 = require("rebass");
 const CheckBox_1 = require("../../../../components/CheckBox");
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../../components/HelpBlock"));
 const UIOptionsActionColumnsForm = (props) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const options = [
         { value: 'clone', label: 'Clone' },
         { value: 'create', label: 'Create' },
         { value: 'edit', label: 'Edit' },
         { value: 'delete', label: 'Delete' },
     ];
-    const actionRowButtons = (_c = (_b = (_a = props.abOptions) === null || _a === void 0 ? void 0 : _a.actionOptions) === null || _b === void 0 ? void 0 : _b.actionRowButtons) !== null && _c !== void 0 ? _c : [];
+    const actionRowButtons = Array.isArray((_b = (_a = props.abOptions) === null || _a === void 0 ? void 0 : _a.actionOptions) === null || _b === void 0 ? void 0 : _b.actionRowButtons)
+        ? (_d = (_c = props.abOptions) === null || _c === void 0 ? void 0 : _c.actionOptions) === null || _d === void 0 ? void 0 : _d.actionRowButtons
+        : (_e = []) !== null && _e !== void 0 ? _e : [];
     const handleCheckChange = (type, checked) => {
         var _a;
         let newActionRowButtons = actionRowButtons;

package/src/View/Alert/AlertEntityRow.js

@@ -14,7 +14,7 @@ class AlertEntityRow extends React.Component {
         let messageTypes = ['Info', 'Success', 'Warning', 'Error'];
         let colItems = (0, Helper_1.cloneObject)(this.props.colItems);
         colItems[0].Content = (React.createElement(EntityRowItem_1.EntityRowItem, { Content: this.props.api.scopeApi.getScopeToString(alertDefinition.Scope) }));
-        colItems[1].Content = (React.createElement(EntityRowItem_1.EntityRowItem, { Content: this.props.api.alertApi.getAlertRuleDescription(alertDefinition) }));
+        colItems[1].Content = (React.createElement(EntityRowItem_1.EntityRowItem, { Content: this.props.api.alertApi.internalApi.getAlertRuleDescription(alertDefinition) }));
         colItems[2].Content = (React.createElement("div", null,
             React.createElement(DropdownButton_1.default, { showClearButton: false, items: messageTypes.map((item) => ({
                     value: item,

package/src/View/Alert/AlertStatusSubPanel.js

@@ -20,7 +20,7 @@ const AlertStatusPanel = () => {
      */
     const alerts = (0, react_redux_1.useSelector)((state) => state.System.AdaptableAlerts);
     const text = alerts.length == 0 ? '0 Alerts' : alerts.length == 1 ? '1 Alert' : alerts.length + ' Alerts';
-    const handleAction = React.useCallback(() => adaptable.api.alertApi.showAlertPopup(), []);
+    const handleAction = React.useCallback(() => adaptable.api.alertApi.openAlertSettingsPanel(), []);
     // blinking logic
     const previousAlerts = React.useRef(alerts);
     const timeoutId = React.useRef();

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

@@ -89,8 +89,8 @@ exports.renderAlertBehaviourSummary = renderAlertBehaviourSummary;
 const AlertBehaviourWizardSection = (props) => {
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const { AlertProperties = {} } = data;
-    const rowAddedAlert = api.internalApi.isAlertDefinitionForAddedRowChangeEvent(data);
-    const rowRemovedAlert = api.internalApi.isAlertDefinitionForRemovedRowChangeEvent(data);
+    const rowAddedAlert = api.alertApi.internalApi.isAlertDefinitionForAddedRowChangeEvent(data);
+    const rowRemovedAlert = api.alertApi.internalApi.isAlertDefinitionForRemovedRowChangeEvent(data);
     const cellChangedAlert = !rowAddedAlert && !rowRemovedAlert;
     const hasPreventCellEdit = cellChangedAlert;
     const hasHighlightCell = cellChangedAlert;

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

@@ -18,8 +18,8 @@ const AlertButtonsEditor = (props) => {
         props.onChange(newButtons);
     };
     const alertDefinition = adaptableAlert.alertDefinition;
-    const rowAddedAlert = api.internalApi.isAlertDefinitionForAddedRowChangeEvent(alertDefinition);
-    const rowRemovedAlert = api.internalApi.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition);
+    const rowAddedAlert = api.alertApi.internalApi.isAlertDefinitionForAddedRowChangeEvent(alertDefinition);
+    const rowRemovedAlert = api.alertApi.internalApi.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition);
     const cellChangedAlert = !rowAddedAlert && !rowRemovedAlert;
     const hasHighlightCell = cellChangedAlert;
     const hasHighlightRow = cellChangedAlert || rowAddedAlert;

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

@@ -49,8 +49,8 @@ const AlertPreview = (_a) => {
         const Buttons = (((_a = alertForm === null || alertForm === void 0 ? void 0 : alertForm.Buttons) === null || _a === void 0 ? void 0 : _a.length) ? alertForm.Buttons : DEFAULT_BUTTONS).map(mapButtons);
         const result = {
             alertType: 'generic',
-            header: api.alertApi.getAlertMessageTitle(alertDefinition),
-            message: api.alertApi.getAlertDescription(alertDefinition),
+            header: api.alertApi.internalApi.getAlertMessageTitle(alertDefinition),
+            message: api.alertApi.internalApi.getAlertDescription(alertDefinition),
             alertDefinition: Object.assign(Object.assign({}, alertDefinition), { AlertForm: Object.assign(Object.assign({}, alertForm), { Buttons }) }),
         };
         return result;
@@ -63,7 +63,7 @@ const AlertDisplayWizardSection = (props) => {
     var _a, _b, _c, _d, _e;
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const messageType = data.MessageType;
-    const messageText = api.alertApi.getAlertDescription(data);
+    const messageText = api.alertApi.internalApi.getAlertDescription(data);
     const messageHeader = (_a = data.MessageHeader) !== null && _a !== void 0 ? _a : '';
     const adaptableAlert = {
         alertType: 'generic',

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

@@ -29,7 +29,7 @@ const AlertWizard = (props) => {
         if (!alertDefinition.Rule.BooleanExpression &&
             !alertDefinition.Rule.ObservableExpression &&
             !alertDefinition.Rule.AggregatedBooleanExpression &&
-            !alertDefinition.Rule.Predicate) {
+            !alertDefinition.Rule.Predicates) {
             alertDefinition.Rule.BooleanExpression = '';
         }
         alertDefinition.MessageType = (_a = alertDefinition.MessageType) !== null && _a !== void 0 ? _a : GeneralConstants_1.ALERT_DEFAULT_MESSAGE_TYPE;
@@ -39,8 +39,8 @@ const AlertWizard = (props) => {
     const updateAlertDefinition = (alertDefinition) => {
         var _a;
         // we need to adjust the alert actions&behaviours based on the predicate type(row/cell based)
-        const isAddedRowChangeAlert = api.internalApi.isAlertDefinitionForAddedRowChangeEvent(alertDefinition);
-        const isRemovedRowChangeAlert = api.internalApi.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition);
+        const isAddedRowChangeAlert = api.alertApi.internalApi.isAlertDefinitionForAddedRowChangeEvent(alertDefinition);
+        const isRemovedRowChangeAlert = api.alertApi.internalApi.isAlertDefinitionForRemovedRowChangeEvent(alertDefinition);
         const isCellChangeAlert = !isAddedRowChangeAlert && !isRemovedRowChangeAlert;
         // map FormButton Actions
         const mapValidButtonActions = (alertAction) => {

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

@@ -8,9 +8,11 @@ const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
 const BaseAlertRulesWizardSection = (props) => {
     const { data, api, moduleInfo } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const wholeRowScope = props.wholeRowScope != null ? props.wholeRowScope : api.scopeApi.scopeIsAll(data.Scope);
-    const predicateDefs = api.alertApi.getAlertPredicateDefsForScope(data.Scope);
+    let predicateDefs = api.alertApi.internalApi.getAlertPredicateDefsForScope(data.Scope);
+    // move Any to the beginning of the list, so it is alwasy the default
+    predicateDefs = [...predicateDefs].sort((a, b) => (a.id === 'Any' ? -1 : b.id === 'Any' ? 1 : 0));
     return (React.createElement(EntityRulesEditor_1.EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: "Any", data: data, predicateDefs: predicateDefs, onChange: props.onChange, showAggregation: !wholeRowScope ? false : true, showObservable: !wholeRowScope ? false : true, showBoolean: true, showPredicate: true, descriptions: {
-            selectPredicate: 'Select an Alert Rule - to be applied when data changes',
+            selectPredicate: 'Create an Alert Rule - to be applied when data changes',
             useBooleanQuery: (React.createElement(React.Fragment, null,
                 "Use an BooleanQuery if ",
                 React.createElement("i", null, "Scope"),

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

@@ -15,11 +15,11 @@ const BaseAlertScopeWizardSection = (props) => {
                 columnScope: 'Changes in selected Columns will trigger an Alert',
             }, 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' }],
                     };
                 }
                 if (newData.Rule.ObservableExpression !== undefined && !api.scopeApi.scopeIsAll(Scope)) {

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

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isValidAlertRules = void 0;
 const ModuleConstants_1 = require("../../../Utilities/Constants/ModuleConstants");
 const isValidAlertRules = (alert, api, context) => {
+    var _a;
     let valid = true;
-    if (!alert.Rule.Predicate &&
+    if (!alert.Rule.Predicates &&
         !alert.Rule.BooleanExpression &&
         !alert.Rule.ObservableExpression &&
         !alert.Rule.AggregatedBooleanExpression) {
         return 'No condition defined for alert';
     }
-    if (valid && alert.Rule.Predicate) {
-        valid = api.predicateApi.isValidPredicate(alert.Rule.Predicate);
+    if (valid && alert.Rule.Predicates) {
+        valid = api.predicateApi.isEveryPredicateValid((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates);
         if (!valid) {
             return 'Predicate is not valid';
         }

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

@@ -78,12 +78,12 @@ const CalculatedColumnExpressionWizardSection = (props) => {
     return (React.createElement(Tabs_1.Tabs, { onValueChange: updateExpressionType, value: selectedTab, p: 2, style: { height: '100%', flex: 1, overflow: 'auto' } },
         React.createElement(QueryTab, { value: "ScalarExpression", type: selectedTab, label: "Scalar" }),
         React.createElement(Tabs_1.Tabs.Content, { value: 'ScalarExpression' },
-            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'scalar', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.ScalarExpression, onChange: (ScalarExpression) => setCalculatedColumnExpression({ ScalarExpression }), initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), isFullExpression: true, api: api })),
+            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'scalar', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.ScalarExpression, onChange: (ScalarExpression) => setCalculatedColumnExpression({ ScalarExpression }), initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getNamedQueries(), isFullExpression: true, api: api })),
         React.createElement(QueryTab, { value: "AggregatedScalarExpression", type: selectedTab, label: "Aggregated Scalar" }),
         React.createElement(Tabs_1.Tabs.Content, { value: 'AggregatedScalarExpression' },
-            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'aggregatedScalar', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.AggregatedScalarExpression, onChange: (AggregatedScalarExpression) => setCalculatedColumnExpression({ AggregatedScalarExpression }), initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), isFullExpression: true, api: api })),
+            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'aggregatedScalar', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.AggregatedScalarExpression, onChange: (AggregatedScalarExpression) => setCalculatedColumnExpression({ AggregatedScalarExpression }), initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getNamedQueries(), isFullExpression: true, api: api })),
         React.createElement(QueryTab, { value: "CumulativeAggregateExpression", type: selectedTab, label: "Cumulative" }),
         React.createElement(Tabs_1.Tabs.Content, { value: 'CumulativeAggregateExpression' },
-            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'cumulativeAggregatedScalar', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.AggregatedScalarExpression, onChange: (AggregatedScalarExpression) => setCalculatedColumnExpression({ AggregatedScalarExpression }), initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), isFullExpression: true, api: api }))));
+            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'cumulativeAggregatedScalar', module: moduleInfo.ModuleName, style: { paddingLeft: 0 }, value: data.Query.AggregatedScalarExpression, onChange: (AggregatedScalarExpression) => setCalculatedColumnExpression({ AggregatedScalarExpression }), initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getNamedQueries(), isFullExpression: true, api: api }))));
 };
 exports.CalculatedColumnExpressionWizardSection = CalculatedColumnExpressionWizardSection;

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.d.ts

@@ -24,6 +24,7 @@ export declare const AdaptableObjectListItemView: React.FunctionComponent<{
     style?: React.CSSProperties;
     suspendedEnabled?: boolean;
     teamSharingActivated?: boolean;
+    disableDeleteConfirmation?: boolean;
 }>;
 interface AdaptableObjectListItemProps {
     data: AdaptableObjectView;

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
+const SystemRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/SystemRedux"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../../components/SimpleButton"));
 const join_1 = tslib_1.__importDefault(require("../../../components/utils/join"));
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../../Utilities/Helpers/AdaptableHelper"));
@@ -20,6 +21,23 @@ const ITEM_BASE_CLASS_NAME = `${LIST_BASE_CLASS_NAME}__Item`;
 const AdaptableObjectListItemView = (props) => {
     var _a, _b, _c;
     const baseClassName = ITEM_BASE_CLASS_NAME;
+    const dispatch = (0, react_redux_1.useDispatch)();
+    const deleteActionProps = {
+        disabled: props.deleteDisabled,
+        tooltip: props.deleteTooltip,
+        iconSize: ICON_SIZE,
+        ConfirmationMsg: `Are you sure you want to delete this ${props.entityType}?`,
+        ConfirmationTitle: `Delete ${props.entityType}`,
+        ConfirmAction: props.deleteAction,
+        accessLevel: props.accessLevel,
+    };
+    if (props.disableDeleteConfirmation) {
+        deleteActionProps.ConfirmAction = null;
+        deleteActionProps.onClickAction = () => {
+            dispatch(props.deleteAction);
+        };
+    }
+    const deleteActionButton = React.createElement(ButtonDelete_1.ButtonDelete, Object.assign({}, deleteActionProps));
     return (React.createElement(rebass_1.Flex, { "data-name": "adaptable-object-list-item", "data-value": props.abObject.Uuid, as: "li", mb: 3, className: (0, join_1.default)(props.className, baseClassName), style: props.style },
         React.createElement(rebass_1.Box, { flex: 1, className: `${baseClassName}__rows` }, (_c = (_b = (_a = props.items).filter) === null || _b === void 0 ? void 0 : _b.call(_a, Boolean)) === null || _c === void 0 ? void 0 : _c.map((tag, index) => {
             var _a;
@@ -47,7 +65,7 @@ const AdaptableObjectListItemView = (props) => {
                 props.actions,
                 props.teamSharingActivated && (React.createElement(ButtonShare_1.ButtonShare, { iconSize: ICON_SIZE, Header: `TeamSharing ${props.entityType}`, accessLevel: props.accessLevel, onShare: props.onShare })),
                 props.onDelete && (React.createElement(SimpleButton_1.default, { "data-name": "delete", disabled: props.deleteDisabled, iconSize: ICON_SIZE, tooltip: props.deleteTooltip, icon: "trash", onClick: props.onDelete, variant: "text" })),
-                props.deleteAction && (React.createElement(ButtonDelete_1.ButtonDelete, { disabled: props.deleteDisabled, tooltip: props.deleteTooltip, iconSize: ICON_SIZE, ConfirmationMsg: `Are you sure you want to delete this ${props.entityType}?`, ConfirmationTitle: `Delete ${props.entityType}`, ConfirmAction: props.deleteAction, accessLevel: props.accessLevel })),
+                props.deleteAction && deleteActionButton,
                 props.showEditButton && (React.createElement(ButtonEdit_1.ButtonEdit, { iconSize: ICON_SIZE, disabled: props.editDisabled, accessLevel: props.accessLevel, onClick: () => props.handleOnEdit() }))),
             React.createElement(rebass_1.Box, { flex: 1 }),
             props.suspendedEnabled && (React.createElement(rebass_1.Flex, { justifyContent: "end" },
@@ -55,7 +73,7 @@ const AdaptableObjectListItemView = (props) => {
 };
 exports.AdaptableObjectListItemView = AdaptableObjectListItemView;
 const AdaptableObjectListItem = (props) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const dispatch = (0, react_redux_1.useDispatch)();
     const [isEditWizardVisible, setIsEditWizardVisible] = React.useState(false);
@@ -65,7 +83,7 @@ const AdaptableObjectListItem = (props) => {
     const deleteAction = (_e = viewOptions === null || viewOptions === void 0 ? void 0 : viewOptions.getDeleteAction) === null || _e === void 0 ? void 0 : _e.call(viewOptions, props.data.abObject);
     const isObjectShareable = props.module.isModuleObjectsShareable();
     const teamSharingActivated = isObjectShareable &&
-        adaptable.api.teamSharingApi.isTeamSharingActivated() &&
+        adaptable.api.teamSharingApi.isTeamSharingAvailable() &&
         adaptable.api.teamSharingApi.hasTeamSharingFullRights();
     const entityType = props.module.moduleInfo.FriendlyName;
     const moduleAccessLevel = adaptable.api.internalApi
@@ -99,8 +117,11 @@ const AdaptableObjectListItem = (props) => {
     const isEditDisabled = !Boolean(EditWizard || viewOptions.onOpenEditPopup);
     const showActions = !props.hideControls;
     const showEditButton = Boolean(EditWizard);
+    const adaptableOpttions = adaptable.api.internalApi.getAdaptableOptions();
+    const disableDeleteConfirmationState = (0, react_redux_1.useSelector)((adaptableState) => SystemRedux.SystemDisableDeleteConfirmationSelector(adaptableState.System));
+    const disableDeleteConfirmation = disableDeleteConfirmationState || ((_h = adaptableOpttions === null || adaptableOpttions === void 0 ? void 0 : adaptableOpttions.generalOptions) === null || _h === void 0 ? void 0 : _h.disableDeleteConfirmation);
     return (React.createElement(React.Fragment, null,
-        React.createElement(exports.AdaptableObjectListItemView, { abObject: props.data.abObject, accessLevel: accessLevel, actions: actions, className: itemClassName, handleOnEdit: handleOnEdit, items: props.data.items, showActions: showActions, showEditButton: showEditButton, style: props.data.style, teamSharingActivated: teamSharingActivated, onShare: (config) => adaptable.api.teamSharingApi.shareEntity(props.data.abObject, props.module.moduleInfo.ModuleName, config), entityType: entityType, deleteAction: deleteAction, deleteDisabled: props.deleteDisabled, deleteTooltip: props.deleteTooltip, editDisabled: isEditDisabled, suspendedEnabled: hasSuspend, onSuspend: () => dispatch(viewOptions.getSuspendAction(props.data.abObject)), onUnSuspend: () => dispatch(viewOptions.getUnSuspendAction(props.data.abObject)) }),
+        React.createElement(exports.AdaptableObjectListItemView, { disableDeleteConfirmation: disableDeleteConfirmation, abObject: props.data.abObject, accessLevel: accessLevel, actions: actions, className: itemClassName, handleOnEdit: handleOnEdit, items: props.data.items, showActions: showActions, showEditButton: showEditButton, style: props.data.style, teamSharingActivated: teamSharingActivated, onShare: (config) => adaptable.api.teamSharingApi.shareEntity(props.data.abObject, props.module.moduleInfo.ModuleName, config), entityType: entityType, deleteAction: deleteAction, deleteDisabled: props.deleteDisabled, deleteTooltip: props.deleteTooltip, editDisabled: isEditDisabled, suspendedEnabled: hasSuspend, onSuspend: () => dispatch(viewOptions.getSuspendAction(props.data.abObject)), onUnSuspend: () => dispatch(viewOptions.getUnSuspendAction(props.data.abObject)) }),
         isEditWizardVisible && EditWizard && (React.createElement(EditWizard, { defaultCurrentSectionName: wizardStepName, moduleInfo: props.module.moduleInfo, data: props.data.abObject, configEntities: null, onCloseWizard: handleCloseWizard, onFinishWizard: handleCloseWizard }))));
 };
 exports.AdaptableObjectListItem = AdaptableObjectListItem;

package/src/View/Components/Buttons/ButtonDelete.d.ts

@@ -5,7 +5,7 @@ import { UIConfirmation } from '../../../Utilities/Interface/MessagePopups';
 import { SimpleButtonProps } from '../../../components/SimpleButton';
 export interface DeleteButtonProps extends SimpleButtonProps {
     onConfirmWarning?: (confirmation: UIConfirmation) => PopupRedux.PopupShowConfirmationAction;
-    ConfirmAction: Redux.Action;
+    ConfirmAction?: Redux.Action;
     ConfirmationMsg: string;
     ConfirmationTitle: string;
     onClickAction?: () => void;

package/src/View/Components/Charting/ChartingViewPanel.d.ts

@@ -1,3 +1,3 @@
 import * as React from 'react';
-import { LayoutViewPanelComponentProps } from '../../Layout/LayoutViewPanel';
-export declare const ChartingViewPanel: React.FunctionComponent<LayoutViewPanelComponentProps>;
+import { ViewPanelProps } from '../SharedProps/ViewPanelProps';
+export declare const ChartingViewPanel: React.FunctionComponent<ViewPanelProps>;