@adaptabletools/adaptable 19.2.4 → 20.0.0-canary.1

package/src/Api/Implementation/OptionsApiImpl.js

@@ -6,7 +6,7 @@ export class OptionsApiImpl extends ApiBase {
     getAdaptableStateKey() {
         return this.getAdaptableOptions().adaptableStateKey;
     }
-    getAutogeneratePrimaryKey() {
+    isAutogeneratePrimaryKey() {
         return this.getAdaptableOptions().autogeneratePrimaryKey;
     }
     getLicenseKey() {
@@ -18,14 +18,20 @@ export class OptionsApiImpl extends ApiBase {
     getUserName() {
         return this.getAdaptableOptions().userName;
     }
+    getAdaptableContext() {
+        if (this.getAdaptableOptions().adaptableContext == undefined) {
+            this.getAdaptableOptions().adaptableContext = {};
+        }
+        return this.getAdaptableOptions().adaptableContext;
+    }
     getAdaptableOptions() {
         return this.getOptions();
     }
     getActionColumnOptions() {
         return this.getOptions().actionColumnOptions;
     }
-    getActionRowOptions() {
-        return this.getOptions().actionRowOptions;
+    getRowFormOptions() {
+        return this.getOptions().rowFormOptions;
     }
     getCellSummaryOptions() {
         return this.getOptions().cellSummaryOptions;
@@ -39,6 +45,9 @@ export class OptionsApiImpl extends ApiBase {
     getNoteOptions() {
         return this.getOptions().noteOptions;
     }
+    getPredicateOptions() {
+        return this.getOptions().predicateOptions;
+    }
     getCommentOptions() {
         return this.getOptions().commentOptions;
     }
@@ -66,9 +75,6 @@ export class OptionsApiImpl extends ApiBase {
     getExportOptions() {
         return this.getOptions().exportOptions;
     }
-    getGroupingOptions() {
-        return this.getOptions().groupingOptions;
-    }
     getLayoutOptions() {
         return this.getOptions().layoutOptions;
     }
@@ -78,11 +84,8 @@ export class OptionsApiImpl extends ApiBase {
     getContextMenuOptions() {
         return this.getOptions().contextMenuOptions;
     }
-    getColumnFilterOptions() {
-        return this.getOptions().columnFilterOptions;
-    }
-    getGridFilterOptions() {
-        return this.getOptions().gridFilterOptions;
+    getFilterOptions() {
+        return this.getOptions().filterOptions;
     }
     getExpressionOptions() {
         return this.getOptions().expressionOptions;
@@ -126,4 +129,15 @@ export class OptionsApiImpl extends ApiBase {
     getDataImportOptions() {
         return this.getOptions().dataImportOptions;
     }
+    addToAdaptableContext(key, value) {
+        const adaptableContext = this.getAdaptableContext();
+        adaptableContext[key] = value;
+    }
+    removeFromAdaptableContext(key) {
+        const adaptableContext = this.getAdaptableContext();
+        delete adaptableContext[key];
+    }
+    clearAdaptableContext() {
+        this.getAdaptableOptions().adaptableContext = {};
+    }
 }

package/src/Api/Implementation/PlusMinusApiImpl.js

@@ -6,12 +6,11 @@ export class PlusMinusApiImpl extends ApiBase {
         return this.getAdaptableState().PlusMinus;
     }
     getAllPlusMinus(config) {
-        var _a;
-        const layoutSpecificPlusMinusNudges = (_a = this.handleLayoutAssociatedObjects(this.getPlusMinusState().PlusMinusNudges, 'PlusMinus', config)) !== null && _a !== void 0 ? _a : [];
+        const layoutSpecificPlusMinusNudges = this.handleLayoutAssociatedObjects(this.getPlusMinusState().PlusMinusNudges, 'PlusMinus', config) ?? [];
         return layoutSpecificPlusMinusNudges.filter((plusMinusNudge) => plusMinusNudge.Rule == undefined || plusMinusNudge.Rule.BooleanExpression != undefined);
     }
     getPlusMinusById(id) {
-        return this.getAllPlusMinus().find((plusMinus) => (plusMinus === null || plusMinus === void 0 ? void 0 : plusMinus.Uuid) === id);
+        return this.getAllPlusMinus().find((plusMinus) => plusMinus?.Uuid === id);
     }
     getAllActivePlusMinus() {
         return this.getAllPlusMinus().filter((plusMinusNudge) => !plusMinusNudge.IsSuspended);

package/src/Api/Implementation/PredicateApiImpl.d.ts

@@ -15,6 +15,7 @@ export declare class PredicateApiImpl extends ApiBase implements PredicateApi {
     getSystemPredicateDefById(predicateId: string): AdaptablePredicateDef;
     getCustomPredicateDefById(predicateId: string): AdaptablePredicateDef;
     predicateToString(predicate: AdaptableColumnPredicate): string | undefined;
+    predicatesToString(predicates: AdaptableColumnPredicate[], logicalOperator?: string): string;
     isValidPredicate(predicate: AdaptableColumnPredicate | undefined): boolean;
     isEveryPredicateValid(predicates: AdaptablePredicate[]): boolean;
     handleColumnPredicate(predicate: AdaptableColumnPredicate | undefined, context: Omit<PredicateDefHandlerContext, 'adaptableApi' | 'inputs'>, defaultReturn: boolean): boolean;

package/src/Api/Implementation/PredicateApiImpl.js

@@ -46,6 +46,11 @@ export class PredicateApiImpl extends ApiBase {
         }
         return strPredicate;
     }
+    predicatesToString(predicates, logicalOperator = 'AND') {
+        return predicates
+            .map((predicate) => this.predicateToString(predicate))
+            .join(` ${logicalOperator} `);
+    }
     isValidPredicate(predicate) {
         if (!predicate) {
             return false;
@@ -61,7 +66,7 @@ export class PredicateApiImpl extends ApiBase {
                 return false;
             }
         }
-        return !(['Values', 'ExcludeValues'].includes(predicate.PredicateId) &&
+        return !(['In', 'NotIn'].includes(predicate.PredicateId) &&
             ArrayExtensions.IsNullOrEmpty(predicate.Inputs));
     }
     isEveryPredicateValid(predicates) {
@@ -71,9 +76,12 @@ export class PredicateApiImpl extends ApiBase {
         if (!predicate.ColumnId) {
             return this.handlePredicate(predicate, context, defaultReturn);
         }
-        const paramsForColumn = Object.assign(Object.assign({}, context), { column: this.getColumnApi().getColumnWithColumnId(predicate.ColumnId), 
+        const paramsForColumn = {
+            ...context,
+            column: this.getColumnApi().getColumnWithColumnId(predicate.ColumnId),
             // value: params?.node?.data?.[predicate.ColumnId],
-            value: this.getGridApi().getRawValueFromRowNode(context.node, predicate.ColumnId) });
+            value: this.getGridApi().getRawValueFromRowNode(context.node, predicate.ColumnId),
+        };
         if ('oldValue' in paramsForColumn) {
             delete paramsForColumn.oldValue;
         }
@@ -83,7 +91,6 @@ export class PredicateApiImpl extends ApiBase {
         return predicates.every((predicate) => this.handleColumnPredicate(predicate, context, defaultReturn));
     }
     handlePredicate(predicate, context, defaultReturn) {
-        var _a;
         if (!predicate) {
             return defaultReturn;
         }
@@ -91,11 +98,15 @@ export class PredicateApiImpl extends ApiBase {
         if (predicateDef === undefined) {
             return defaultReturn;
         }
-        if ((_a = predicateDef.inputs) === null || _a === void 0 ? void 0 : _a.some((_, i) => { var _a, _b; return ((_a = predicate.Inputs) === null || _a === void 0 ? void 0 : _a[i]) === undefined || ((_b = predicate.Inputs) === null || _b === void 0 ? void 0 : _b[i]) === ''; })) {
+        if (predicateDef.inputs?.some((_, i) => predicate.Inputs?.[i] === undefined || predicate.Inputs?.[i] === '')) {
             return defaultReturn;
         }
         try {
-            return predicateDef.handler(Object.assign({ adaptableApi: this.getAdaptableApi(), inputs: predicate.Inputs }, context));
+            return predicateDef.handler({
+                adaptableApi: this.getAdaptableApi(),
+                inputs: predicate.Inputs,
+                ...context,
+            });
         }
         catch (error) {
             console.error(`Error in predicate ${predicateDef.label}`, error);
@@ -103,10 +114,13 @@ export class PredicateApiImpl extends ApiBase {
         }
     }
     handlePredicates(predicates, params, defaultReturn) {
-        if (predicates === undefined || predicates === null || (predicates === null || predicates === void 0 ? void 0 : predicates.length) === 0) {
+        if (predicates === undefined || predicates === null || predicates?.length === 0) {
             return this.handlePredicate(undefined, params, defaultReturn);
         }
-        return predicates === null || predicates === void 0 ? void 0 : predicates.every((p) => this.handlePredicate(p, params, defaultReturn));
+        if (params.predicatesLogic && params.predicatesLogic === 'OR') {
+            return predicates?.some((p) => this.handlePredicate(p, params, defaultReturn));
+        }
+        return predicates?.every((p) => this.handlePredicate(p, params, defaultReturn));
     }
     useCaseSensitivity() {
         return this.getPredicateOptions().caseSensitivePredicates;

package/src/Api/Implementation/QuickSearchApiImpl.js

@@ -1,5 +1,5 @@
 import * as QuickSearchRedux from '../../Redux/ActionsReducers/QuickSearchRedux';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { ApiBase } from './ApiBase';
 export class QuickSearchApiImpl extends ApiBase {
@@ -25,9 +25,9 @@ export class QuickSearchApiImpl extends ApiBase {
         this.showModulePopup(ModuleConstants.QuickSearchModuleId);
     }
     showFloatingQuickSearch() {
-        this.dispatchAction(SystemRedux.SystemQuickSearchFloatingVisibility(true));
+        this.dispatchAction(InternalRedux.QuickSearchFloatingVisibility(true));
     }
     hideFloatingQuickSearch() {
-        this.dispatchAction(SystemRedux.SystemQuickSearchFloatingVisibility(false));
+        this.dispatchAction(InternalRedux.QuickSearchFloatingVisibility(false));
     }
 }

package/src/Api/Implementation/RowFormApiImpl.d.ts

@@ -0,0 +1,11 @@
+import { ApiBase } from './ApiBase';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { RowFormApi } from '../RowFormApi';
+import { RowFormInternalApi } from '../Internal/RowFormInternalApi';
+export declare class RowFormApiImpl extends ApiBase implements RowFormApi {
+    internalApi: RowFormInternalApi;
+    constructor(_adaptable: IAdaptable);
+    displayEditRowForm(primaryKey: any): void;
+    displayCreateRowForm(): void;
+    displayCloneRowForm(primaryKey?: any): void;
+}

package/src/Api/Implementation/{ActionRowApiImpl.js → RowFormApiImpl.js}

@@ -1,23 +1,15 @@
-import { PopupShowForm } from '../../Redux/ActionsReducers/PopupRedux';
 import { ApiBase } from './ApiBase';
-import { ActionRowInternalApi } from '../Internal/ActionRowInternalApi';
-export class ActionRowApiImpl extends ApiBase {
+import { RowFormInternalApi } from '../Internal/RowFormInternalApi';
+import { PopupShowForm } from '../../Redux/ActionsReducers/PopupRedux';
+export class RowFormApiImpl extends ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
-        this.internalApi = new ActionRowInternalApi(_adaptable);
-    }
-    getActionRowButtons() {
-        var actionRowButtons = this.getActionRowOptions().actionRowButtons;
-        if (typeof actionRowButtons === 'function') {
-            const context = this.getAdaptableInternalApi().buildBaseContext();
-            actionRowButtons = actionRowButtons(context);
-        }
-        return actionRowButtons !== null && actionRowButtons !== void 0 ? actionRowButtons : [];
+        this.internalApi = new RowFormInternalApi(_adaptable);
     }
-    displayEditActionRow(primaryKey) {
+    displayEditRowForm(primaryKey) {
         const rowNode = this.getGridApi().getRowNodeForPrimaryKey(primaryKey);
         if (!rowNode) {
-            this.logWarn(`Can NOT edit row: rowNode not found for primaryKey ${primaryKey}`);
+            this.logWarn(`Cannot edit row: rowNode not found for primaryKey ${primaryKey}`);
         }
         const editForm = this.internalApi.buildRowEditForm(rowNode);
         this.dispatchAction(PopupShowForm({
@@ -29,14 +21,14 @@ export class ActionRowApiImpl extends ApiBase {
             },
         }));
     }
-    displayCreateActionRow() {
+    displayCreateRowForm() {
         const createForm = this.internalApi.buildRowCreateForm();
         this.dispatchAction(PopupShowForm({
             Id: 'create_row_form',
             Form: createForm,
         }));
     }
-    displayCloneActionRow(primaryKey) {
+    displayCloneRowForm(primaryKey) {
         const rowNode = this.getGridApi().getRowNodeForPrimaryKey(primaryKey);
         if (!rowNode) {
             this.logWarn(`Can NOT clone row: rowNode not found for primaryKey ${primaryKey}`);

package/src/Api/Implementation/ScheduleApiImpl.d.ts

@@ -6,9 +6,7 @@ import { IPushPullSchedule } from '../../PredefinedConfig/IPushPullState';
 import { OpenFinSchedule } from '../../PredefinedConfig/OpenFinState';
 import { ReminderSchedule, ScheduleState } from '../../PredefinedConfig/ScheduleState';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { ScheduleInternalApi } from '../Internal/ScheduleInternalApi';
 export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
-    internalApi: ScheduleInternalApi;
     constructor(_adaptable: IAdaptable);
     getScheduleState(): ScheduleState;
     getSchedules(): BaseSchedule[];

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -1,11 +1,9 @@
 import { ApiBase } from './ApiBase';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import * as ScheduleRedux from '../../Redux/ActionsReducers/ScheduleRedux';
-import { ScheduleInternalApi } from '../Internal/ScheduleInternalApi';
 export class ScheduleApiImpl extends ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
-        this.internalApi = new ScheduleInternalApi(_adaptable);
     }
     getScheduleState() {
         return this.getAdaptableState().Schedule;
@@ -19,11 +17,11 @@ export class ScheduleApiImpl extends ApiBase {
         return allSchedules;
     }
     getReminderSchedules(config) {
-        var _a;
-        return ((_a = this.handleLayoutAssociatedObjects(this.getScheduleState().Reminders, 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
+        return (this.handleLayoutAssociatedObjects(this.getScheduleState().Reminders, 'Schedule', config) ??
+            []);
     }
     getScheduleById(id) {
-        return this.getSchedules().find((schedule) => (schedule === null || schedule === void 0 ? void 0 : schedule.Uuid) === id);
+        return this.getSchedules().find((schedule) => schedule?.Uuid === id);
     }
     getActiveReminderSchedules() {
         return this.getReminderSchedules().filter((schedule) => !schedule.IsSuspended);
@@ -51,8 +49,7 @@ export class ScheduleApiImpl extends ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getReportSchedules(config) {
-        var _a;
-        return ((_a = this.handleLayoutAssociatedObjects(this.getExportApi().getReportSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
+        return (this.handleLayoutAssociatedObjects(this.getAdaptableState().Schedule.ReportSchedules, 'Schedule', config) ?? []);
     }
     getActiveReportSchedules() {
         return this.getReportSchedules().filter((schedule) => !schedule.IsSuspended);
@@ -80,9 +77,8 @@ export class ScheduleApiImpl extends ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getIPushPullSchedules(config) {
-        var _a;
         const ippApi = this.getAdaptableApi().pluginsApi.getipushpullPluginApi();
-        return ((_a = this.handleLayoutAssociatedObjects(ippApi === null || ippApi === void 0 ? void 0 : ippApi.getIPushPullSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
+        return (this.handleLayoutAssociatedObjects(ippApi?.getIPushPullSchedules(), 'Schedule', config) ?? []);
     }
     getActiveIPushPullSchedules() {
         return this.getIPushPullSchedules().filter((schedule) => !schedule.IsSuspended);
@@ -110,9 +106,9 @@ export class ScheduleApiImpl extends ApiBase {
         return this.getScheduleById(schedule.Uuid);
     }
     getOpenFinSchedules(config) {
-        var _a;
         const openFinApi = this.getAdaptableApi().pluginsApi.getOpenFinPluginApi();
-        return ((_a = this.handleLayoutAssociatedObjects(openFinApi === null || openFinApi === void 0 ? void 0 : openFinApi.getOpenFinSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
+        return (this.handleLayoutAssociatedObjects(openFinApi?.getOpenFinSchedules(), 'Schedule', config) ??
+            []);
     }
     getActiveOpenFinSchedules() {
         return this.getOpenFinSchedules().filter((schedule) => !schedule.IsSuspended);
@@ -156,14 +152,14 @@ export class ScheduleApiImpl extends ApiBase {
                     Scope: undefined,
                 },
             };
-            this.getAdaptableApi().alertApi.showAdaptableAlert(alert);
+            this.getAlertApi().displayAdaptableAlert(alert);
             if (reminderSchedule.DisplaySystemStatusMessage) {
-                this.getAdaptableApi().systemStatusApi.setSystemStatus(reminderSchedule.Header, reminderSchedule.MessageType, reminderSchedule.Message);
+                this.getSystemStatusApi().setSystemStatus(reminderSchedule.Header, reminderSchedule.MessageType, reminderSchedule.Message);
             }
         }
         else if (scheduleType == 'Report') {
             const reportSchedule = schedule;
-            this.getExportApi().runReport(reportSchedule.ReportName, reportSchedule.ExportDestination);
+            this.getExportApi().exportReport(reportSchedule.ReportName, reportSchedule.ReportFormat, 'Download');
         }
         else if (scheduleType == 'ipushpull') {
             const ippApi = this.getAdaptableApi().pluginsApi.getipushpullPluginApi();

package/src/Api/Implementation/ShortcutApiImpl.js

@@ -6,11 +6,11 @@ export class ShortcutApiImpl extends ApiBase {
         return this.getAdaptableState().Shortcut;
     }
     getShortcuts(config) {
-        var _a;
-        return ((_a = this.handleLayoutAssociatedObjects(this.getShortcutState().Shortcuts, 'Shortcut', config)) !== null && _a !== void 0 ? _a : []);
+        return (this.handleLayoutAssociatedObjects(this.getShortcutState().Shortcuts, 'Shortcut', config) ??
+            []);
     }
     getShortcutById(id) {
-        return this.getShortcuts().find((shortcut) => (shortcut === null || shortcut === void 0 ? void 0 : shortcut.Uuid) === id);
+        return this.getShortcuts().find((shortcut) => shortcut?.Uuid === id);
     }
     getActiveShortcuts() {
         return this.getShortcuts().filter((shortcut) => !shortcut.IsSuspended);

package/src/Api/Implementation/SmartEditApiImpl.js

@@ -1,30 +1,29 @@
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { ApiBase } from './ApiBase';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 export class SmartEditApiImpl extends ApiBase {
     setSmartEditOperation(mathOperation) {
-        this.dispatchAction(SystemRedux.SmartEditChangeOperation(mathOperation));
+        this.dispatchAction(InternalRedux.SmartEditChangeOperation(mathOperation));
     }
     getSmartEditOperation() {
-        return this.getAdaptableState().System.SmartEditOperation;
+        return this.getAdaptableState().Internal.SmartEdit.SmartEditOperation;
     }
     setSmartEditValue(smartEditValue) {
-        this.dispatchAction(SystemRedux.SmartEditChangeValue(smartEditValue));
+        this.dispatchAction(InternalRedux.SmartEditChangeValue(smartEditValue));
     }
     getSmartEditValue() {
-        return this.getAdaptableState().System.SmartEditValue;
+        return this.getAdaptableState().Internal.SmartEdit.SmartEditValue;
     }
     openSmartEditSettingsPanel() {
         this.showModulePopup(ModuleConstants.SmartEditModuleId);
     }
     getSmartEditCustomOperations() {
-        var _a;
-        return (_a = this.getEditOptions().smartEditCustomOperations) !== null && _a !== void 0 ? _a : [];
+        return this.getEditOptions().smartEditCustomOperations ?? [];
     }
     setCustomSmartEditOperation(customOperationName) {
         const customOperation = this.getSmartEditCustomOperations().find((so) => so.name == customOperationName);
         if (customOperation) {
-            this.dispatchAction(SystemRedux.SmartEditChangeOperation(customOperation));
+            this.dispatchAction(InternalRedux.SmartEditChangeOperation(customOperation));
         }
     }
 }

package/src/Api/Implementation/StatusBarApiImpl.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableStatusBar } from '../../PredefinedConfig/StatusBarState';
 import { StatusBarApi } from '../StatusBarApi';
 import { ApiBase } from './ApiBase';
-import { StatusPanelDef } from '@ag-grid-community/core';
+import { StatusPanelDef } from 'ag-grid-enterprise';
 export declare class StatusBarApiImpl extends ApiBase implements StatusBarApi {
     getAdaptableStatusBars(): AdaptableStatusBar[];
     getAgGridStatusPanels(): StatusPanelDef[];

package/src/Api/Implementation/StyledColumnApiImpl.js

@@ -11,8 +11,7 @@ export class StyledColumnApiImpl extends ApiBase {
         return this.getAdaptableState().StyledColumn;
     }
     getStyledColumns(config) {
-        var _a;
-        return ((_a = this.handleLayoutAssociatedObjects(this.getStyledColumnState().StyledColumns, 'StyledColumn', config)) !== null && _a !== void 0 ? _a : []);
+        return (this.handleLayoutAssociatedObjects(this.getStyledColumnState().StyledColumns, 'StyledColumn', config) ?? []);
     }
     getStyledColumnById(id) {
         return this.getStyledColumns().find((styledcolumn) => styledcolumn.Uuid === id);

package/src/Api/Implementation/SystemStatusApiImpl.js

@@ -1,5 +1,5 @@
 import * as SystemStatusRedux from '../../Redux/ActionsReducers/SystemStatusRedux';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
+import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import { ApiBase } from './ApiBase';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import ObjectFactory from '../../Utilities/ObjectFactory';
@@ -16,24 +16,25 @@ export class SystemStatusApiImpl extends ApiBase {
         let systemStatusMessageInfo = ObjectFactory.CreateSystemStatusMessageInfo(statusMessage, messageType, statusFurtherInformation ? statusFurtherInformation : '');
         this.internalApi.addSystemStatusMessageInfo(systemStatusMessageInfo);
         // publish the event
-        this.internalApi.fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo);
+        this.getEventApi().internalApi.fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo);
         if (this.getNotificationsOptions().showSystemStatusMessageNotifications) {
+            const alertApi = this.getAlertApi();
             let fullMessage = statusMessage;
             if (StringExtensions.IsNotNullOrEmpty(statusFurtherInformation)) {
                 fullMessage += '\n' + statusFurtherInformation;
             }
             switch (messageType) {
                 case 'Success':
-                    this.getAdaptableApi().alertApi.showAlertSuccess('System Status Success', fullMessage);
+                    alertApi.showAlertSuccess('System Status Success', fullMessage);
                     return;
                 case 'Info':
-                    this.getAdaptableApi().alertApi.showAlertInfo('System Status Info', fullMessage);
+                    alertApi.showAlertInfo('System Status Info', fullMessage);
                     return;
                 case 'Warning':
-                    this.getAdaptableApi().alertApi.showAlertWarning('System Status Warning', fullMessage);
+                    alertApi.showAlertWarning('System Status Warning', fullMessage);
                     return;
                 case 'Error':
-                    this.getAdaptableApi().alertApi.showAlertError('System Status Error', fullMessage);
+                    alertApi.showAlertError('System Status Error', fullMessage);
                     return;
             }
         }
@@ -80,7 +81,7 @@ export class SystemStatusApiImpl extends ApiBase {
         return orderedArray[0];
     }
     deleteAllSystemStatusMessages() {
-        this.dispatchAction(SystemRedux.SystemStatusMessageInfoDeleteAll());
+        this.dispatchAction(InternalRedux.SystemStatusMessageInfoDeleteAll());
     }
     destroy() {
         this.systemStatusDiv = null;

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -42,14 +42,13 @@ export class TeamSharingApiImpl extends ApiBase {
         return true;
     }
     isTeamSharingAvailable() {
-        var _a, _b, _c;
-        return (!this.getAdaptableApi().entitlementApi.isModuleHiddenEntitlement(ModuleConstants.TeamSharingModuleId) &&
-            ((_a = this.getTeamSharingOptions()) === null || _a === void 0 ? void 0 : _a.enableTeamSharing) &&
-            !!((_b = this.getTeamSharingOptions()) === null || _b === void 0 ? void 0 : _b.loadSharedEntities) &&
-            !!((_c = this.getTeamSharingOptions()) === null || _c === void 0 ? void 0 : _c.persistSharedEntities));
+        return (!this.getEntitlementApi().isModuleHiddenEntitlement(ModuleConstants.TeamSharingModuleId) &&
+            this.getTeamSharingOptions()?.enableTeamSharing &&
+            !!this.getTeamSharingOptions()?.loadSharedEntities &&
+            !!this.getTeamSharingOptions()?.persistSharedEntities);
     }
     hasTeamSharingFullRights() {
-        return this.getAdaptableApi().entitlementApi.isModuleFullEntitlement(ModuleConstants.TeamSharingModuleId);
+        return this.getEntitlementApi().isModuleFullEntitlement(ModuleConstants.TeamSharingModuleId);
     }
     checkForUpdates() {
         this.dispatchAction(TeamSharingCheckForUpdates());

package/src/Api/Implementation/ThemeApiImpl.js

@@ -35,12 +35,10 @@ export class ThemeApiImpl extends ApiBase {
         this.dispatchAction(ThemeRedux.ThemeSetUserThemes(userThemes));
     }
     getSystemThemes() {
-        var _a;
-        const themes = (_a = this.getAdaptableState().Theme.SystemThemes) !== null && _a !== void 0 ? _a : [];
+        const themes = this.getAdaptableState().Theme.SystemThemes ?? [];
         return themes.map((theme) => {
-            var _a, _b;
             if (typeof theme === 'string') {
-                const description = (_b = (_a = StaticThemes.find((staticTheme) => staticTheme.Name === theme)) === null || _a === void 0 ? void 0 : _a.Description) !== null && _b !== void 0 ? _b : theme;
+                const description = StaticThemes.find((staticTheme) => staticTheme.Name === theme)?.Description ?? theme;
                 return {
                     Name: theme,
                     Description: description,
@@ -57,12 +55,10 @@ export class ThemeApiImpl extends ApiBase {
             return;
         }
         this._adaptable.applyAdaptableTheme(currentTheme);
-        let themeChangedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { trigger: 'ThemeSelected', theme: currentTheme });
-        this.getEventApi().emit('ThemeChanged', themeChangedInfo);
+        this.getEventApi().internalApi.fireThemeChangedEvent(currentTheme, 'ThemeSelected');
     }
     getUserThemes() {
-        var _a;
-        return (_a = this.getAdaptableState().Theme.UserThemes) !== null && _a !== void 0 ? _a : [];
+        return this.getAdaptableState().Theme.UserThemes ?? [];
     }
     getThemes() {
         return [...this.getSystemThemes(), ...this.getUserThemes()];
@@ -78,15 +74,14 @@ export class ThemeApiImpl extends ApiBase {
     }
     editTheme(theme) {
         this.dispatchAction(ThemeRedux.ThemeEdit(theme));
-        let themeChangedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { trigger: 'ThemeEdited', theme: theme });
-        this.getEventApi().emit('ThemeChanged', themeChangedInfo);
+        this.getEventApi().internalApi.fireThemeChangedEvent(theme, 'ThemeEdited');
         const currentTheme = this.getCurrentTheme();
         if (currentTheme === theme.Name) {
             this._adaptable.applyAdaptableTheme(theme);
         }
     }
     addUserTheme(theme) {
-        AdaptableHelper.addUuidAndSource(theme);
+        AdaptableHelper.addAdaptableObjectPrimitives(theme);
         this.dispatchAction(ThemeRedux.ThemeAdd(theme));
     }
     deleteUserTheme(theme) {

package/src/Api/Implementation/ToolPanelApiImpl.js

@@ -22,12 +22,10 @@ export class ToolPanelApiImpl extends ApiBase {
         }
     }
     getCustomToolPanels() {
-        var _a;
-        return (_a = this.getToolPanelOptions().customToolPanels) !== null && _a !== void 0 ? _a : [];
+        return this.getToolPanelOptions().customToolPanels ?? [];
     }
     getCustomToolPanelButtons() {
-        var _a;
-        return (_a = this.getToolPanelOptions().customButtons) !== null && _a !== void 0 ? _a : [];
+        return this.getToolPanelOptions().customButtons ?? [];
     }
     getCustomToolPanelByName(name) {
         return this.getCustomToolPanels().find((customToolPanel) => customToolPanel.name === name);
@@ -52,8 +50,7 @@ export class ToolPanelApiImpl extends ApiBase {
         this.dispatchAction(ToolPanelSetModuleButtons(moduleButtons));
     }
     getModuleButtons() {
-        var _a, _b;
-        return (_b = (_a = this.getToolPanelState()) === null || _a === void 0 ? void 0 : _a.ModuleButtons) !== null && _b !== void 0 ? _b : [];
+        return this.getToolPanelState()?.ModuleButtons ?? [];
     }
     setExpandedToolPanelVisibility(toolPanelName) {
         this.dispatchAction(ToolPanelRedux.ToolPanelExpandToolPanel(toolPanelName));

package/src/Api/Implementation/UserInterfaceApiImpl.d.ts

@@ -1,8 +1,6 @@
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
-import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
-import { AdaptableObjectTag, CustomWindowConfig, GridCell } from '../../types';
+import { AdaptableModule, AdaptableObject, AdaptableObjectTag, CustomWindowConfig } from '../../types';
 import { UserInterfaceInternalApi } from '../Internal/UserInterfaceInternalApi';
 import { UserInterfaceApi } from '../UserInterfaceApi';
 import { ProgressIndicatorConfig } from '../../PredefinedConfig/Common/ProgressIndicatorConfig';
@@ -13,22 +11,11 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     constructor(_adaptable: IAdaptable);
     getColorPalette(): string[];
     getStyleClassNames(): string[] | undefined;
-    getPermittedValuesItems(): PermittedValues[];
-    private getPermittedValuesForScope;
-    getPermittedValuesForColumn(column: AdaptableColumn): any[] | undefined;
-    getAllFilterPermittedValuesItems(): FilterPermittedValues[];
-    getFilterPermittedValuesForColumn(column: AdaptableColumn): FilterPermittedValues | undefined;
-    getAllCustomSortPermittedValuesItems(): CustomSortPermittedValues[];
-    getCustomSortPermittedValuesForColumn(column: AdaptableColumn): CustomSortPermittedValues | undefined;
-    getAllBulkUpdatePermittedValuesItems(): BulkUpdatePermittedValues[];
-    getBulkUpdatePermittedValuesForColumn(column: AdaptableColumn): BulkUpdatePermittedValues | undefined;
-    getEditLookUpItems(): EditLookUpPermittedValues[];
-    getEditLookUpItemForColumn(column: AdaptableColumn): EditLookUpPermittedValues | undefined;
-    getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
     getEditableCellStyle(): AdaptableStyle | undefined;
     getEditedCellStyle(): AdaptableStyle | undefined;
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
+    getAdaptableObjectsWithTag(tag: AdaptableObjectTag, adaptableModule?: AdaptableModule): AdaptableObject[] | undefined;
     getCustomIconDefinition(iconName: string): import("../../types").AdaptableIcon | import("../../types").CustomIcon;
     showProgressIndicator(config: ProgressIndicatorConfig): void;
     hideProgressIndicator(): void;