@adaptabletools/adaptable 18.1.14 → 18.1.15-canary.0

package/src/Api/Internal/NamedQueryInternalApi.js

@@ -1,5 +1,4 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import * as QueryRedux from '../../Redux/ActionsReducers/QueryRedux';
 export class NamedQueryInternalApi extends ApiBase {
     /**
      * Returns the name of all the referenced Named Queries as an array of strings
@@ -33,7 +32,4 @@ export class NamedQueryInternalApi extends ApiBase {
         });
         return references;
     }
-    cleanupQueryRedux() {
-        this.dispatchAction(QueryRedux.QueryCleanup());
-    }
 }

package/src/PredefinedConfig/AdaptableState.d.ts

@@ -18,7 +18,6 @@ import { ThemeState } from './ThemeState';
 import { ConfigState } from './ConfigState';
 import { ApplicationState } from './ApplicationState';
 import { ToolPanelState } from './ToolPanelState';
-import { QueryState } from './QueryState';
 import { FlashingCellState } from './FlashingCellState';
 import { StatusBarState } from './StatusBarState';
 import { ChartingState } from './ChartingState';
@@ -58,10 +57,6 @@ export interface AdaptablePersistentState {
     ToolPanel: ToolPanelState;
     Charting: ChartingState;
     Note: NoteState;
-    /**
-     * @deprecated
-     */
-    Query: QueryState;
 }
 /**
  * The state which is available in the internal Redux store but never persisted

package/src/PredefinedConfig/Common/FilterActionOnDataChange.d.ts

@@ -5,9 +5,10 @@ export interface FilterActionOnDataChange {
     /**
      * When to re-apply Filters: 'Always', 'Never' or 'Throttle'
      */
-    applyFilter: 'Always' | 'Never' | 'Throttle';
+    applyFilter: ApplyFilterAction;
     /**
      * Delay in ms (when `applyFilter` is set to 'Throttle')
      */
     throttleDelay?: number;
 }
+export type ApplyFilterAction = 'Always' | 'Never' | 'Throttle';

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -74,7 +74,7 @@ export interface NumericStyledColumn {
      */
     ColumnComparison?: ColumnComparison;
     /**
-     * If using Ranges, they can provide 'Number' (any number or Col-Min/Col-Max) or 'Percentage' (values 0-100)
+     * Used with Ranges; can be Number (any number or Col-Min/Col-Max) or 'Percentage' (values 0-100)
      * @defaultValue Number
      */
     RangeValueType?: RangeValueType;

package/src/Redux/ActionsReducers/GridRedux.d.ts

@@ -59,11 +59,11 @@ export declare const GRID_REFRESH_CELLS = "GRID_REFRESH_CELLS";
 /**
  * @ReduxAction Module Dropdown menu items have been set
  */
-export declare const GRID_SET_MODULE_DROPDOWN_MENUITEMS = "GRID_SET_MODULE_DROPDOWN_MENUITEMS";
+export declare const GRID_SET_SETTINGS_PANEL_ITEMS = "GRID_SET_SETTINGS_PANEL_ITEMS";
 /**
  * @ReduxAction Module Button menu items have been set
  */
-export declare const GRID_SET_MODULE_BUTTON_MENUITEMS = "GRID_SET_MODULE_BUTTON_MENUITEMS";
+export declare const GRID_SET_MENU_MODULE_ITEMS = "GRID_SET_MENU_MODULE_ITEMS";
 /**
  * @ReduxAction Grid is put in pivot mode
  */
@@ -144,10 +144,10 @@ export interface GridRefreshCellsAction extends Redux.Action {
     rowNodes: IRowNode[];
     columnIds: string[];
 }
-export interface SetSettingPanelModuleMenuItemsAction extends Redux.Action {
+export interface SetSettingsPanelItemsAction extends Redux.Action {
     menuItems: AdaptableMenuItem[];
 }
-export interface SetModuleButtonMenuItemsAction extends Redux.Action {
+export interface SetMenuModuleItemsAction extends Redux.Action {
     menuItems: AdaptableMenuItem[];
 }
 export interface SetLiveReportRunningOnAction extends Redux.Action {
@@ -208,8 +208,8 @@ export declare const SetPivotModeOn: () => SetPivotModeOnAction;
 export declare const SetPivotModeOff: () => SetPivotModeOffAction;
 export declare const SetTreeModeOn: () => SetTreeModeOnAction;
 export declare const SetTreeModeOff: () => SetTreeModeOffAction;
-export declare const SetSettingPanelModuleMenuItems: (MenuItems: AdaptableMenuItem[]) => SetSettingPanelModuleMenuItemsAction;
-export declare const SetModuleButtonMenuItems: (MenuItems: AdaptableMenuItem[]) => SetModuleButtonMenuItemsAction;
+export declare const setSettingsPanelItems: (MenuItems: AdaptableMenuItem[]) => SetSettingsPanelItemsAction;
+export declare const SetMenuModuleItems: (MenuItems: AdaptableMenuItem[]) => SetMenuModuleItemsAction;
 export declare const LayoutUpdateCurrentDraft: (layout: Layout) => LayoutUpdateCurrentDraftAction;
 export declare const LayoutDraftColumnFilterAdd: (columnFilter: ColumnFilter) => LayoutDraftColumnFilterAddAction;
 export declare const LayoutDraftColumnFilterEdit: (columnFilter: ColumnFilter) => LayoutDraftColumnFilterEditAction;

package/src/Redux/ActionsReducers/GridRedux.js

@@ -52,11 +52,11 @@ export const GRID_REFRESH_CELLS = 'GRID_REFRESH_CELLS';
 /**
  * @ReduxAction Module Dropdown menu items have been set
  */
-export const GRID_SET_MODULE_DROPDOWN_MENUITEMS = 'GRID_SET_MODULE_DROPDOWN_MENUITEMS';
+export const GRID_SET_SETTINGS_PANEL_ITEMS = 'GRID_SET_SETTINGS_PANEL_ITEMS';
 /**
  * @ReduxAction Module Button menu items have been set
  */
-export const GRID_SET_MODULE_BUTTON_MENUITEMS = 'GRID_SET_MODULE_BUTTON_MENUITEMS';
+export const GRID_SET_MENU_MODULE_ITEMS = 'GRID_SET_MENU_MODULE_ITEMS';
 /**
  * @ReduxAction Grid is put in pivot mode
  */
@@ -143,12 +143,12 @@ export const SetTreeModeOn = () => ({
 export const SetTreeModeOff = () => ({
     type: GRID_SET_TREE_MODE_OFF,
 });
-export const SetSettingPanelModuleMenuItems = (MenuItems) => ({
-    type: GRID_SET_MODULE_DROPDOWN_MENUITEMS,
+export const setSettingsPanelItems = (MenuItems) => ({
+    type: GRID_SET_SETTINGS_PANEL_ITEMS,
     menuItems: MenuItems,
 });
-export const SetModuleButtonMenuItems = (MenuItems) => ({
-    type: GRID_SET_MODULE_BUTTON_MENUITEMS,
+export const SetMenuModuleItems = (MenuItems) => ({
+    type: GRID_SET_MENU_MODULE_ITEMS,
     menuItems: MenuItems,
 });
 export const LayoutUpdateCurrentDraft = (layout) => ({
@@ -245,12 +245,12 @@ export const GridReducer = (state = initialState, action) => {
             return Object.assign({}, state, {
                 CellSummary: action.cellSummary,
             });
-        case GRID_SET_MODULE_DROPDOWN_MENUITEMS: {
+        case GRID_SET_SETTINGS_PANEL_ITEMS: {
             const actionTyped = action;
             const menuItems = actionTyped.menuItems.sort((a, b) => a.label < b.label ? -1 : a.label > b.label ? 1 : 0);
             return Object.assign({}, state, { SettingPanelModuleMenuItems: menuItems });
         }
-        case GRID_SET_MODULE_BUTTON_MENUITEMS: {
+        case GRID_SET_MENU_MODULE_ITEMS: {
             const actionTyped = action;
             const menuItems = actionTyped.menuItems.sort((a, b) => a.label < b.label ? -1 : a.label > b.label ? 1 : 0);
             return Object.assign({}, state, { ModuleButtonMenuItems: menuItems });

package/src/Redux/ActionsReducers/LayoutRedux.d.ts

@@ -5,7 +5,7 @@ import { ColumnFilter } from '../../types';
 /**
  * @ReduxAction A new caption / header has been set for a Column in the Layout
  */
-export declare const LAYOUT_SET_COLUMN_CAPTION = "LAYOUT_SET_COLUMN_CAPTION";
+export declare const LAYOUT_COLUMN_SET_CAPTION = "LAYOUT_COLUMN_SET_CAPTION";
 /**
  * @ReduxAction Layout Module is ready
  */
@@ -33,11 +33,11 @@ export declare const LAYOUT_SAVE = "LAYOUT_SAVE";
 /**
  * @ReduxAction A Column has been added
  */
-export declare const LAYOUT_ADD_COLUMN = "LAYOUT_ADD_COLUMN";
+export declare const LAYOUT_COLUMN_ADD = "LAYOUT_COLUMN_ADD";
 /**
  * @ReduxAction A Column has been removed
  */
-export declare const LAYOUT_REMOVE_COLUMN = "LAYOUT_REMOVE_COLUMN";
+export declare const LAYOUT_COLUMN_REMOVE = "LAYOUT_COLUMN_REMOVE";
 /**
  * @ReduxAction A Column Filter has been added
  */

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -3,7 +3,7 @@ import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 /**
  * @ReduxAction A new caption / header has been set for a Column in the Layout
  */
-export const LAYOUT_SET_COLUMN_CAPTION = 'LAYOUT_SET_COLUMN_CAPTION';
+export const LAYOUT_COLUMN_SET_CAPTION = 'LAYOUT_COLUMN_SET_CAPTION';
 /**
  * @ReduxAction Layout Module is ready
  */
@@ -31,11 +31,11 @@ export const LAYOUT_SAVE = 'LAYOUT_SAVE';
 /**
  * @ReduxAction A Column has been added
  */
-export const LAYOUT_ADD_COLUMN = 'LAYOUT_ADD_COLUMN';
+export const LAYOUT_COLUMN_ADD = 'LAYOUT_COLUMN_ADD';
 /**
  * @ReduxAction A Column has been removed
  */
-export const LAYOUT_REMOVE_COLUMN = 'LAYOUT_REMOVE_COLUMN';
+export const LAYOUT_COLUMN_REMOVE = 'LAYOUT_COLUMN_REMOVE';
 /**
  * @ReduxAction A Column Filter has been added
  */
@@ -148,18 +148,18 @@ export const LayoutSave = (layout) => ({
     layout,
 });
 export const LayoutSetColumnCaption = (layoutName, columnId, caption) => ({
-    type: LAYOUT_SET_COLUMN_CAPTION,
+    type: LAYOUT_COLUMN_SET_CAPTION,
     layoutName,
     columnId,
     caption,
 });
 export const LayoutAddColumn = (layoutName, columnId) => ({
-    type: LAYOUT_ADD_COLUMN,
+    type: LAYOUT_COLUMN_ADD,
     layoutName,
     columnId,
 });
 export const LayoutRemoveColumn = (layoutName, columnId) => ({
-    type: LAYOUT_REMOVE_COLUMN,
+    type: LAYOUT_COLUMN_REMOVE,
     layoutName,
     columnId,
 });
@@ -211,7 +211,7 @@ export const LayoutReducer = (state = initialState, action) => {
             const newLayouts = state.Layouts.filter((abObject) => abObject.Uuid !== actionLayout.Uuid);
             return Object.assign(Object.assign({}, state), { CurrentLayout: state.CurrentLayout === actionLayout.Name ? newLayouts[0].Name : state.CurrentLayout, Layouts: newLayouts });
         }
-        case LAYOUT_SET_COLUMN_CAPTION: {
+        case LAYOUT_COLUMN_SET_CAPTION: {
             const setColumnCaptionAction = action;
             const currentLayoutName = setColumnCaptionAction.layoutName;
             let currentLayout = state.Layouts.find((l) => l.Name === currentLayoutName);
@@ -227,7 +227,7 @@ export const LayoutReducer = (state = initialState, action) => {
             }
             return state;
         }
-        case LAYOUT_ADD_COLUMN: {
+        case LAYOUT_COLUMN_ADD: {
             const addColumnAction = action;
             const layoutname = addColumnAction.layoutName;
             const colToAdd = addColumnAction.columnId;
@@ -238,7 +238,7 @@ export const LayoutReducer = (state = initialState, action) => {
             }
             return state;
         }
-        case LAYOUT_REMOVE_COLUMN: {
+        case LAYOUT_COLUMN_REMOVE: {
             const removeColumnAction = action;
             const layoutname = removeColumnAction.layoutName;
             const colToRemove = removeColumnAction.columnId;

package/src/Redux/ActionsReducers/NamedQueryRedux.d.ts

@@ -9,7 +9,7 @@ export declare const NAMED_QUERY_READY = "NAMED_QUERY_READY";
  */
 export declare const NAMED_QUERY_ADD = "NAMED_QUERY_ADD";
 /**
- * @ReduxAction Multiple Named Query has been added
+ * @ReduxAction Multiple Named Queries have been added
  */
 export declare const NAMED_QUERIES_ADD = "NAMED_QUERY_ADD_MULTIPLE";
 /**

package/src/Redux/ActionsReducers/NamedQueryRedux.js

@@ -9,7 +9,7 @@ export const NAMED_QUERY_READY = 'NAMED_QUERY_READY';
  */
 export const NAMED_QUERY_ADD = 'NAMED_QUERY_ADD';
 /**
- * @ReduxAction Multiple Named Query has been added
+ * @ReduxAction Multiple Named Queries have been added
  */
 export const NAMED_QUERIES_ADD = 'NAMED_QUERY_ADD_MULTIPLE';
 /**

package/src/Redux/ActionsReducers/PluginsRedux.d.ts

@@ -88,9 +88,9 @@ export declare const IPUSHPULL_SET_CURRENT_FOLDER = "IPUSHPULL_SET_CURRENT_FOLDE
  */
 export declare const IPUSHPULL_SET_CURRENT_PAGE = "IPUSHPULL_SET_CURRENT_PAGE";
 /**
- * @ReduxAction ipushpull set current available page (depending on current folder)
+ * @ReduxAction ipushpull set available pages (depending on current folder)
  */
-export declare const IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES = "IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES";
+export declare const IPUSHPULL_SET_AVAILABLE_PAGES = "IPUSHPULL_SET_AVAILABLE_PAGES";
 /**
  * @ReduxAction Live data has been sent to OpenFin
  */

package/src/Redux/ActionsReducers/PluginsRedux.js

@@ -87,9 +87,9 @@ export const IPUSHPULL_SET_CURRENT_FOLDER = 'IPUSHPULL_SET_CURRENT_FOLDER';
  */
 export const IPUSHPULL_SET_CURRENT_PAGE = 'IPUSHPULL_SET_CURRENT_PAGE';
 /**
- * @ReduxAction ipushpull set current available page (depending on current folder)
+ * @ReduxAction ipushpull set available pages (depending on current folder)
  */
-export const IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES = 'IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES';
+export const IPUSHPULL_SET_AVAILABLE_PAGES = 'IPUSHPULL_SET_AVAILABLE_PAGES';
 /**
  * @ReduxAction Live data has been sent to OpenFin
  */

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -3,8 +3,8 @@ import merge from 'lodash/merge';
 import isArray from 'lodash/isArray';
 import extend from 'lodash/extend';
 import isObject from 'lodash/isObject';
-import { isAdaptableObject } from '../../Utilities/isAdaptableObject';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
+import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 function customizer(objValue, srcValue) {
     if (isArray(objValue)) {
         if (!Array.isArray(srcValue)) {
@@ -31,7 +31,7 @@ export function AddStateSource(stateObject = {}, source) {
     const traverseStateObject = (object) => {
         Object.values(object).forEach((value) => {
             // add a Source only to AdaptableObjects which do NOT already have a source defined
-            if (isAdaptableObject(value) && value.Source == null) {
+            if (AdaptableHelper.isAdaptableObject(value) && value.Source == null) {
                 value.Source = source;
             }
             if (value !== null && typeof value === 'object') {
@@ -48,7 +48,7 @@ export function ProcessKeepUserDefinedRevision(configState, currentUserState) {
             const stateValue = stateObject[key];
             if (Array.isArray(configValue) && Array.isArray(stateValue)) {
                 const userDefinedItems = stateValue.filter((item) => {
-                    return isAdaptableObject(item) && item.Source !== 'Config';
+                    return AdaptableHelper.isAdaptableObject(item) && item.Source !== 'Config';
                 });
                 configObject[key] = configValue.concat(userDefinedItems);
                 // we probably don't need to call traverseStateObject on the array as well,

package/src/Redux/Store/AdaptableStore.js

@@ -31,7 +31,6 @@ import * as LayoutRedux from '../ActionsReducers/LayoutRedux';
 import * as NamedQueryRedux from '../ActionsReducers/NamedQueryRedux';
 import * as NoteRedux from '../ActionsReducers/NoteRedux';
 import * as PlusMinusRedux from '../ActionsReducers/PlusMinusRedux';
-import * as QueryRedux from '../ActionsReducers/QueryRedux';
 import * as QuickSearchRedux from '../ActionsReducers/QuickSearchRedux';
 import * as ScheduleRedux from '../ActionsReducers/ScheduleRedux';
 import * as ShortcutRedux from '../ActionsReducers/ShortcutRedux';
@@ -144,7 +143,6 @@ export class AdaptableStore {
             Charting: ChartingRedux.ChartingReducer,
             StyledColumn: StyledColumnRedux.StyledColumnReducer,
             Note: NoteRedux.NoteReducer,
-            Query: QueryRedux.QueryReducer,
             NamedQuery: NamedQueryRedux.NamedQueryReducer,
         };
         // allow plugins to participate in the root reducer
@@ -1010,7 +1008,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case LayoutRedux.LAYOUT_EDIT:
                 case LayoutRedux.LAYOUT_SAVE:
                 case LayoutRedux.LAYOUT_DELETE:
-                case LayoutRedux.LAYOUT_SET_COLUMN_CAPTION:
+                case LayoutRedux.LAYOUT_COLUMN_SET_CAPTION:
                 case LayoutRedux.LAYOUT_SELECT: {
                     const oldLayoutState = middlewareAPI.getState().Layout;
                     // this must be called before 'next(action)'
@@ -1032,7 +1030,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     }
                     if (returnAction.type == LayoutRedux.LAYOUT_SELECT ||
                         returnAction.type == LayoutRedux.LAYOUT_DELETE ||
-                        returnAction.type == LayoutRedux.LAYOUT_SET_COLUMN_CAPTION) {
+                        returnAction.type == LayoutRedux.LAYOUT_COLUMN_SET_CAPTION) {
                         let gridState = middlewareAPI.getState().Grid;
                         let currentLayout = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout);
                         if (gridState.CurrentLayout) {

package/src/Strategy/AdaptableModuleBase.js

@@ -67,8 +67,7 @@ export class AdaptableModuleBase {
         // override where necessary in base classes
     }
     setModuleEntitlement() {
-        this.AccessLevel = this.api.internalApi
-            .getEntitlementService()
+        this.AccessLevel = this.api.entitlementApi
             .getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
     }
     createModuleMenuItem(source) {

package/src/Strategy/ColumnFilterModule.js

@@ -13,8 +13,7 @@ export class ColumnFilterModule extends AdaptableModuleBase {
             this.AccessLevel = 'Hidden';
         }
         else {
-            this.AccessLevel = this.api.internalApi
-                .getEntitlementService()
+            this.AccessLevel = this.api.entitlementApi
                 .getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
         }
     }

package/src/Strategy/ExportModule.js

@@ -145,12 +145,12 @@ export class ExportModule extends AdaptableModuleBase {
             }
             else if (preProcessedExport === true) {
                 this.api.logInfo(`Export ${report.Name} (${exportDestination}) using data from the grid`);
-                reportData = this.api.internalApi.getReportService().getReportData(report);
+                reportData = this.api.exportApi.internalApi.getReportData(report);
             }
             else if ((preProcessedExport === null || preProcessedExport === void 0 ? void 0 : preProcessedExport.rows) == undefined ||
                 (preProcessedExport === null || preProcessedExport === void 0 ? void 0 : preProcessedExport.columns) == undefined) {
                 this.api.logWarn(`Export ${report.Name} (${exportDestination}) : preProcessExport() returned an invalid ReportData object, fallback to data from the grid`);
-                reportData = this.api.internalApi.getReportService().getReportData(report);
+                reportData = this.api.exportApi.internalApi.getReportData(report);
             }
             else {
                 this.api.logInfo(`Export ${report.Name} (${exportDestination}) using data from preProcessExport()`);
@@ -158,7 +158,7 @@ export class ExportModule extends AdaptableModuleBase {
                 if (!reportData.columns.length) {
                     // an empty column array means that all columns have been exported
                     // we have to update the report to reflect this
-                    reportData.columns = this.api.internalApi.getReportService().getReportDataColumns(report);
+                    reportData.columns = this.api.exportApi.internalApi.getReportDataColumns(report);
                 }
             }
             if (this.isCustomDestination(exportDestination)) {
@@ -184,13 +184,7 @@ export class ExportModule extends AdaptableModuleBase {
                     }));
                 }
                 else if (customDestination) {
-                    const reportContext = {
-                        report: report,
-                        reportData,
-                        adaptableApi: this.api,
-                        userName: this.api.optionsApi.getUserName(),
-                        adaptableId: this.api.optionsApi.getAdaptableId(),
-                    };
+                    const reportContext = Object.assign({ report: report, reportData }, this.api.internalApi.buildBaseContext());
                     customDestination.onExport(reportContext);
                 }
             }
@@ -224,22 +218,11 @@ export class ExportModule extends AdaptableModuleBase {
         const preProcessExportFn = this.api.optionsApi.getAdaptableOptions().exportOptions.preProcessExport;
         if (preProcessExportFn) {
             this.api.logInfo(`Export ${report.Name} : preProcessExport()`);
-            return preProcessExportFn({
-                report,
-                adaptableApi: this.api,
-                userName: this.api.optionsApi.getUserName(),
-                adaptableId: this.api.optionsApi.getAdaptableId(),
-                getReportColumns: (includePrimaryKey) => {
-                    return this.api.internalApi
-                        .getReportService()
-                        .getReportDataColumns(report, includePrimaryKey);
-                },
-                getReportRowData: (reportColumns, includePrimaryKey) => {
-                    return this.api.internalApi
-                        .getReportService()
-                        .getReportDataRows(report, reportColumns, includePrimaryKey);
-                },
-            });
+            return preProcessExportFn(Object.assign(Object.assign({ report }, this.api.internalApi.buildBaseContext()), { getReportColumns: (includePrimaryKey) => {
+                    return this.api.exportApi.internalApi.getReportDataColumns(report, includePrimaryKey);
+                }, getReportRowData: (reportColumns, includePrimaryKey) => {
+                    return this.api.exportApi.internalApi.getReportDataRows(report, reportColumns, includePrimaryKey);
+                } }));
         }
         return true;
     }
@@ -255,7 +238,7 @@ export class ExportModule extends AdaptableModuleBase {
             return;
         }
         const jsonContent = JSON.stringify(reportData);
-        const jsonFileName = this.api.internalApi.getReportService().getReportFileName(report.Name, 'JSON') + '.json';
+        const jsonFileName = this.api.exportApi.internalApi.getReportFileName(report.Name, 'JSON') + '.json';
         Helper.createDownloadedFile(jsonContent, jsonFileName, 'application/json');
     }
     openReportInTablePopup(report, reportData) {
@@ -271,17 +254,13 @@ export class ExportModule extends AdaptableModuleBase {
             title = `${title} [${report.Name}]`;
         }
         if (report.Scope) {
-            const scopeText = this.api.internalApi
-                .getReportService()
-                .GetReportColumnScopeShortDescription(report);
+            const scopeText = this.api.exportApi.internalApi.getReportColumnScopeShortDescription(report);
             if (scopeText === null || scopeText === void 0 ? void 0 : scopeText.length) {
                 title = `${title} ${scopeText.join(',')}`;
             }
         }
         if (report.Query) {
-            const queryText = this.api.internalApi
-                .getReportService()
-                .GetReportExpressionDescription(report, this.api.columnApi.getColumns());
+            const queryText = this.api.exportApi.internalApi.getReportExpressionDescription(report, this.api.columnApi.getColumns());
             if (queryText === null || queryText === void 0 ? void 0 : queryText.length) {
                 title = `${title} ${queryText}`;
             }
@@ -301,7 +280,7 @@ export class ExportModule extends AdaptableModuleBase {
             this.showEmptyExportWarning();
             return;
         }
-        const csvFileName = this.api.internalApi.getReportService().getReportFileName(report.Name, 'CSV') + '.csv';
+        const csvFileName = this.api.exportApi.internalApi.getReportFileName(report.Name, 'CSV') + '.csv';
         Helper.createDownloadedFile(csvContent, csvFileName, 'text/csv;encoding:utf-8');
     }
     convertReportToExcel(report, reportData) {
@@ -309,7 +288,7 @@ export class ExportModule extends AdaptableModuleBase {
             this.showEmptyExportWarning();
             return;
         }
-        this.api.exportApi.exportDataToExcel(reportData, this.api.internalApi.getReportService().getReportFileName(report.Name, 'Excel'));
+        this.api.exportApi.exportDataToExcel(reportData, this.api.exportApi.internalApi.getReportFileName(report.Name, 'Excel'));
     }
     copyToClipboard(reportData) {
         const csvContent = this.createTabularContent(reportData);
@@ -320,15 +299,11 @@ export class ExportModule extends AdaptableModuleBase {
         Helper.copyToClipboard(csvContent);
     }
     createCSVContent(reportData) {
-        const reportDataAsArray = this.api.internalApi
-            .getReportService()
-            .convertReportDataToArray(reportData);
+        const reportDataAsArray = this.api.exportApi.internalApi.convertReportDataToArray(reportData);
         return Helper.convertArrayToCsv(reportDataAsArray, ',');
     }
     createTabularContent(reportData) {
-        const reportDataAsArray = this.api.internalApi
-            .getReportService()
-            .convertReportDataToArray(reportData);
+        const reportDataAsArray = this.api.exportApi.internalApi.convertReportDataToArray(reportData);
         return Helper.convertArrayToCsv(reportDataAsArray, '\t');
     }
     getTeamSharingAction() {
@@ -351,9 +326,7 @@ export class ExportModule extends AdaptableModuleBase {
         }));
     }
     toView(report) {
-        const isSystemReport = this.api.internalApi
-            .getReportService()
-            .IsSystemReport(report.Name);
+        const isSystemReport = this.api.exportApi.internalApi.isSystemReport(report.Name);
         if (isSystemReport) {
             return {
                 items: [

package/src/Strategy/FlashingCellModule.js

@@ -199,17 +199,9 @@ export class FlashingCellModule extends AdaptableModuleBase {
     }
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
         var _a;
-        const predicateDefHandlerContext = {
-            value: dataChangedEvent.newValue,
-            oldValue: dataChangedEvent.oldValue,
+        const predicateDefHandlerContext = Object.assign({ value: dataChangedEvent.newValue, oldValue: dataChangedEvent.oldValue, 
             // TODO send real display value
-            displayValue: null,
-            node: dataChangedEvent.rowNode,
-            column: dataChangedEvent.column,
-            adaptableApi: this.api,
-            userName: this.api.optionsApi.getUserName(),
-            adaptableId: this.api.optionsApi.getAdaptableId(),
-        };
+            displayValue: null, node: dataChangedEvent.rowNode, column: dataChangedEvent.column }, this.api.internalApi.buildBaseContext());
         return this.api.predicateApi.handleColumnPredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, defaultNoPredicateReturn);
     }
     getTeamSharingAction() {

package/src/Strategy/ScheduleModule.js

@@ -114,9 +114,8 @@ export class ScheduleModule extends AdaptableModuleBase {
         this.scheduleJobs = [];
     }
     getModuleAdaptableObjects(config) {
-        const entitlementService = this.api.internalApi.getEntitlementService();
-        const accessLevel = entitlementService.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
-        const exportAcessLevel = entitlementService.getEntitlementAccessLevelForModule(ModuleConstants.ExportModuleId);
+        const accessLevel = this.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
+        const exportAcessLevel = this.api.entitlementApi.getEntitlementAccessLevelForModule(ModuleConstants.ExportModuleId);
         let allSchedules = [];
         if (accessLevel !== 'Hidden') {
             allSchedules.push(...this.api.scheduleApi.getReminderSchedules(config));
@@ -150,9 +149,8 @@ export class ScheduleModule extends AdaptableModuleBase {
         }).map((schedule) => this.toView(schedule));
     }
     getViewProperties() {
-        const entitlementService = this.api.internalApi.getEntitlementService();
-        const accessLevel = entitlementService.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
-        const exportAcessLevel = entitlementService.getEntitlementAccessLevelForModule(ModuleConstants.ExportModuleId);
+        const accessLevel = this.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
+        const exportAcessLevel = this.api.entitlementApi.getEntitlementAccessLevelForModule(ModuleConstants.ExportModuleId);
         const abObjectTypes = [];
         const ippApi = this.api.pluginsApi.getipushpullPluginApi();
         const openFinApi = this.api.pluginsApi.getOpenFinPluginApi();

package/src/Strategy/SmartEditModule.js

@@ -120,13 +120,7 @@ export class SmartEditModule extends AdaptableModuleBase {
                     selectedCellInfo.gridCells.forEach((selectedCell) => {
                         let newValue;
                         if (typeof smartEditOperation === 'object') {
-                            const context = {
-                                smartEditValue: smartEditValue,
-                                currentCell: selectedCell,
-                                adaptableApi: this.api,
-                                userName: this.api.optionsApi.getUserName(),
-                                adaptableId: this.api.optionsApi.getAdaptableId(),
-                            };
+                            const context = Object.assign({ smartEditValue: smartEditValue, currentCell: selectedCell }, this.api.internalApi.buildBaseContext());
                             newValue = smartEditOperation.operation(context);
                         }
                         else {

package/src/Strategy/TeamSharingModule.js

@@ -1,6 +1,5 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-import { isAdaptableObject } from '../Utilities/isAdaptableObject';
 import { TEAMSHARING_GET, TEAMSHARING_IMPORT_ITEM, TEAMSHARING_LINK_ITEM, TEAMSHARING_PROCESS_IMPORT, TEAMSHARING_REMOVE_ITEM, TEAMSHARING_SET, TEAMSHARING_SHARE, TEAMSHARING_UPDATE_ITEM, TeamSharingUpdateItem, } from '../Redux/ActionsReducers/TeamSharingRedux';
 import * as TeamSharingRedux from '../Redux/ActionsReducers/TeamSharingRedux';
 import isEqual from 'lodash/isEqual';
@@ -10,6 +9,7 @@ import { TeamSharingApplyButton } from '../View/TeamSharing/TeamSharingApplyButt
 import { SharedEntityDependencies } from '../View/TeamSharing/SharedEntityDependencies';
 import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import flatten from 'lodash/flatten';
+import AdaptableHelper from '../Utilities/Helpers/AdaptableHelper';
 export class TeamSharingModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.TeamSharingModuleId, ModuleConstants.TeamSharingFriendlyName, 'folder-shared', 'TeamSharingPopup', 'Team Sharing allows users to share - at run-time - Adaptable Objects between colleagues.', api);
@@ -74,7 +74,7 @@ export class TeamSharingModule extends AdaptableModuleBase {
         if (!action) {
             return;
         }
-        return Object.values(action).find((actionProperty) => isAdaptableObject(actionProperty));
+        return Object.values(action).find((actionProperty) => AdaptableHelper.isAdaptableObject(actionProperty));
     }
     isAdaptableObjectPresentInLocalState(sharedEntity) {
         var _a;

package/src/Strategy/Utilities/Export/getExportColumnsViewItems.js

@@ -1,6 +1,6 @@
 export const getExportColumnsViewItems = (report, api) => {
     return {
         name: 'Columns',
-        values: [...api.internalApi.getReportService().GetReportColumnScopeShortDescription(report)],
+        values: [...api.exportApi.internalApi.getReportColumnScopeShortDescription(report)],
     };
 };

package/src/Strategy/Utilities/Export/getExportRowsViewItems.js

@@ -7,9 +7,7 @@ export const getExportRowsViewItems = (report, api) => {
         element = React.createElement(ExpressionPreview, { query: report.Query });
     }
     else {
-        element = api.internalApi
-            .getReportService()
-            .GetReportExpressionDescription(report, api.columnApi.getColumns());
+        element = api.exportApi.internalApi.getReportExpressionDescription(report, api.columnApi.getColumns());
     }
     return {
         name: 'Rows',

package/src/Utilities/Constants/FilterConstants.d.ts

@@ -0,0 +1,10 @@
+import { ApplyFilterAction } from '../../PredefinedConfig/Common/FilterActionOnDataChange';
+import { FilterTrigger } from '../../AdaptableOptions/ColumnFilterOptions';
+export declare const FILTER_ACTION_ALWAYS: ApplyFilterAction;
+export declare const FILTER_ACTION_NEVER: ApplyFilterAction;
+export declare const FILTER_ACTION_THROTTLE: ApplyFilterAction;
+export declare const PREDICATE_EQUALS = "Equals";
+export declare const PREDICATE_CONTAINS = "Contains";
+export declare const PREDICATE_ON = "On";
+export declare const FILTER_TRIGGER_MOUSE_ENTER: FilterTrigger;
+export declare const FILTER_TRIGGER_CLICK: FilterTrigger;

package/src/Utilities/Constants/FilterConstants.js

@@ -0,0 +1,8 @@
+export const FILTER_ACTION_ALWAYS = 'Always';
+export const FILTER_ACTION_NEVER = 'Never';
+export const FILTER_ACTION_THROTTLE = 'Throttle';
+export const PREDICATE_EQUALS = 'Equals';
+export const PREDICATE_CONTAINS = 'Contains';
+export const PREDICATE_ON = 'On';
+export const FILTER_TRIGGER_MOUSE_ENTER = 'mouseenter';
+export const FILTER_TRIGGER_CLICK = 'click';