@adaptabletools/adaptable-cjs 18.1.13 → 18.1.15-canary.0

package/src/Api/Internal/NamedQueryInternalApi.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NamedQueryInternalApi = void 0;
-const tslib_1 = require("tslib");
 const ApiBase_1 = require("../Implementation/ApiBase");
-const QueryRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QueryRedux"));
 class NamedQueryInternalApi extends ApiBase_1.ApiBase {
     /**
      * Returns the name of all the referenced Named Queries as an array of strings
@@ -37,8 +35,5 @@ class NamedQueryInternalApi extends ApiBase_1.ApiBase {
         });
         return references;
     }
-    cleanupQueryRedux() {
-        this.dispatchAction(QueryRedux.QueryCleanup());
-    }
 }
 exports.NamedQueryInternalApi = NamedQueryInternalApi;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LayoutDraftColumnFilterEdit = exports.LayoutDraftColumnFilterAdd = exports.LayoutUpdateCurrentDraft = exports.SetModuleButtonMenuItems = exports.SetSettingPanelModuleMenuItems = exports.SetTreeModeOff = exports.SetTreeModeOn = exports.SetPivotModeOff = exports.SetPivotModeOn = exports.GridRefreshCells = exports.GridSetCellSummary = exports.GridCreateCellSummary = exports.GridSetSelectedRows = exports.GridSetSelectedCells = exports.GridClearSort = exports.GridSetSort = exports.GridEditColumn = exports.GridRemoveColumn = exports.GridAddColumns = exports.GridAddColumn = exports.GridSetColumns = exports.LAYOUT_DRAFT_GRID_FILTER_SET = exports.LAYOUT_DRAFT_COLUMN_FILTER_UNSUSPEND_ALL = exports.LAYOUT_DRAFT_COLUMN_FILTER_UNSUSPEND = exports.LAYOUT_DRAFT_COLUMN_FILTER_SUSPEND_ALL = exports.LAYOUT_DRAFT_COLUMN_FILTER_SUSPEND = exports.LAYOUT_DRAFT_COLUMN_FILTER_CLEAR = exports.LAYOUT_DRAFT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_DRAFT_COLUMN_FILTER_SET = exports.LAYOUT_DRAFT_COLUMN_FILTER_EDIT = exports.LAYOUT_DRAFT_COLUMN_FILTER_ADD = exports.LAYOUT_UPDATE_CURRENT_DRAFT = exports.GRID_SET_TREE_MODE_OFF = exports.GRID_SET_TREE_MODE_ON = exports.GRID_SET_PIVOT_MODE_OFF = exports.GRID_SET_PIVOT_MODE_ON = exports.GRID_SET_MODULE_BUTTON_MENUITEMS = exports.GRID_SET_MODULE_DROPDOWN_MENUITEMS = exports.GRID_REFRESH_CELLS = exports.GRID_SET_CELLS_SUMMARY = exports.GRID_CREATE_CELLS_SUMMARY = exports.GRID_SET_SELECTED_ROWS = exports.GRID_SET_SELECTED_CELLS = exports.GRID_CLEAR_SORT = exports.GRID_SET_SORT = exports.GRID_EDIT_COLUMN = exports.GRID_REMOVE_COLUMN = exports.GRID_ADD_COLUMNS = exports.GRID_ADD_COLUMN = exports.GRID_SET_COLUMNS = void 0;
+exports.LayoutDraftColumnFilterEdit = exports.LayoutDraftColumnFilterAdd = exports.LayoutUpdateCurrentDraft = exports.SetMenuModuleItems = exports.setSettingsPanelItems = exports.SetTreeModeOff = exports.SetTreeModeOn = exports.SetPivotModeOff = exports.SetPivotModeOn = exports.GridRefreshCells = exports.GridSetCellSummary = exports.GridCreateCellSummary = exports.GridSetSelectedRows = exports.GridSetSelectedCells = exports.GridClearSort = exports.GridSetSort = exports.GridEditColumn = exports.GridRemoveColumn = exports.GridAddColumns = exports.GridAddColumn = exports.GridSetColumns = exports.LAYOUT_DRAFT_GRID_FILTER_SET = exports.LAYOUT_DRAFT_COLUMN_FILTER_UNSUSPEND_ALL = exports.LAYOUT_DRAFT_COLUMN_FILTER_UNSUSPEND = exports.LAYOUT_DRAFT_COLUMN_FILTER_SUSPEND_ALL = exports.LAYOUT_DRAFT_COLUMN_FILTER_SUSPEND = exports.LAYOUT_DRAFT_COLUMN_FILTER_CLEAR = exports.LAYOUT_DRAFT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_DRAFT_COLUMN_FILTER_SET = exports.LAYOUT_DRAFT_COLUMN_FILTER_EDIT = exports.LAYOUT_DRAFT_COLUMN_FILTER_ADD = exports.LAYOUT_UPDATE_CURRENT_DRAFT = exports.GRID_SET_TREE_MODE_OFF = exports.GRID_SET_TREE_MODE_ON = exports.GRID_SET_PIVOT_MODE_OFF = exports.GRID_SET_PIVOT_MODE_ON = exports.GRID_SET_MENU_MODULE_ITEMS = exports.GRID_SET_SETTINGS_PANEL_ITEMS = exports.GRID_REFRESH_CELLS = exports.GRID_SET_CELLS_SUMMARY = exports.GRID_CREATE_CELLS_SUMMARY = exports.GRID_SET_SELECTED_ROWS = exports.GRID_SET_SELECTED_CELLS = exports.GRID_CLEAR_SORT = exports.GRID_SET_SORT = exports.GRID_EDIT_COLUMN = exports.GRID_REMOVE_COLUMN = exports.GRID_ADD_COLUMNS = exports.GRID_ADD_COLUMN = exports.GRID_SET_COLUMNS = void 0;
 exports.GridReducer = exports.LayoutDraftGridFilterSet = exports.LayoutDraftColumnFilterUnsuspendAll = exports.LayoutDraftColumnFilterUnsuspend = exports.LayoutDraftColumnFilterSuspendAll = exports.LayoutDraftColumnFilterSuspend = exports.LayoutDraftColumnFilterClearAll = exports.LayoutDraftColumnFilterClear = exports.LayoutDraftColumnFilterSet = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
@@ -57,11 +57,11 @@ exports.GRID_REFRESH_CELLS = 'GRID_REFRESH_CELLS';
 /**
  * @ReduxAction Module Dropdown menu items have been set
  */
-exports.GRID_SET_MODULE_DROPDOWN_MENUITEMS = 'GRID_SET_MODULE_DROPDOWN_MENUITEMS';
+exports.GRID_SET_SETTINGS_PANEL_ITEMS = 'GRID_SET_SETTINGS_PANEL_ITEMS';
 /**
  * @ReduxAction Module Button menu items have been set
  */
-exports.GRID_SET_MODULE_BUTTON_MENUITEMS = 'GRID_SET_MODULE_BUTTON_MENUITEMS';
+exports.GRID_SET_MENU_MODULE_ITEMS = 'GRID_SET_MENU_MODULE_ITEMS';
 /**
  * @ReduxAction Grid is put in pivot mode
  */
@@ -164,16 +164,16 @@ const SetTreeModeOff = () => ({
     type: exports.GRID_SET_TREE_MODE_OFF,
 });
 exports.SetTreeModeOff = SetTreeModeOff;
-const SetSettingPanelModuleMenuItems = (MenuItems) => ({
-    type: exports.GRID_SET_MODULE_DROPDOWN_MENUITEMS,
+const setSettingsPanelItems = (MenuItems) => ({
+    type: exports.GRID_SET_SETTINGS_PANEL_ITEMS,
     menuItems: MenuItems,
 });
-exports.SetSettingPanelModuleMenuItems = SetSettingPanelModuleMenuItems;
-const SetModuleButtonMenuItems = (MenuItems) => ({
-    type: exports.GRID_SET_MODULE_BUTTON_MENUITEMS,
+exports.setSettingsPanelItems = setSettingsPanelItems;
+const SetMenuModuleItems = (MenuItems) => ({
+    type: exports.GRID_SET_MENU_MODULE_ITEMS,
     menuItems: MenuItems,
 });
-exports.SetModuleButtonMenuItems = SetModuleButtonMenuItems;
+exports.SetMenuModuleItems = SetMenuModuleItems;
 const LayoutUpdateCurrentDraft = (layout) => ({
     type: exports.LAYOUT_UPDATE_CURRENT_DRAFT,
     layout,
@@ -279,12 +279,12 @@ const GridReducer = (state = initialState, action) => {
             return Object.assign({}, state, {
                 CellSummary: action.cellSummary,
             });
-        case exports.GRID_SET_MODULE_DROPDOWN_MENUITEMS: {
+        case exports.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 exports.GRID_SET_MODULE_BUTTON_MENUITEMS: {
+        case exports.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

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LayoutReducer = exports.getColumnFilterSelector = exports.LayoutReady = exports.LayoutSelect = exports.LayoutRemoveColumn = exports.LayoutAddColumn = exports.LayoutSetColumnCaption = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LayoutGridFilterClear = exports.LayoutGridFilterUnSuspend = exports.LayoutGridFilterSuspend = exports.LayoutGridFilterSet = exports.LayoutColumnFilterUnSuspendAll = exports.LayoutColumnFilterSuspendAll = exports.LayoutColumnFilterUnSuspend = exports.LayoutColumnFilterSuspend = exports.LayoutColumnFilterClear = exports.LayoutColumnFilterClearAll = exports.LayoutColumnFilterSet = exports.LayoutColumnFilterEdit = exports.LayoutColumnFilterAdd = exports.LAYOUT_GRID_FILTER_CLEAR = exports.LAYOUT_GRID_FILTER_SET = exports.LAYOUT_GRID_FILTER_UNSUSPEND = exports.LAYOUT_GRID_FILTER_SUSPEND = exports.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL = exports.LAYOUT_COLUMN_FILTER_SUSPEND_ALL = exports.LAYOUT_COLUMN_FILTER_UNSUSPEND = exports.LAYOUT_COLUMN_FILTER_SUSPEND = exports.LAYOUT_COLUMN_FILTER_CLEAR = exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_COLUMN_FILTER_SET = exports.LAYOUT_COLUMN_FILTER_EDIT = exports.LAYOUT_COLUMN_FILTER_ADD = exports.LAYOUT_REMOVE_COLUMN = exports.LAYOUT_ADD_COLUMN = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = exports.LAYOUT_READY = exports.LAYOUT_SET_COLUMN_CAPTION = void 0;
+exports.LayoutReducer = exports.getColumnFilterSelector = exports.LayoutReady = exports.LayoutSelect = exports.LayoutRemoveColumn = exports.LayoutAddColumn = exports.LayoutSetColumnCaption = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LayoutGridFilterClear = exports.LayoutGridFilterUnSuspend = exports.LayoutGridFilterSuspend = exports.LayoutGridFilterSet = exports.LayoutColumnFilterUnSuspendAll = exports.LayoutColumnFilterSuspendAll = exports.LayoutColumnFilterUnSuspend = exports.LayoutColumnFilterSuspend = exports.LayoutColumnFilterClear = exports.LayoutColumnFilterClearAll = exports.LayoutColumnFilterSet = exports.LayoutColumnFilterEdit = exports.LayoutColumnFilterAdd = exports.LAYOUT_GRID_FILTER_CLEAR = exports.LAYOUT_GRID_FILTER_SET = exports.LAYOUT_GRID_FILTER_UNSUSPEND = exports.LAYOUT_GRID_FILTER_SUSPEND = exports.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL = exports.LAYOUT_COLUMN_FILTER_SUSPEND_ALL = exports.LAYOUT_COLUMN_FILTER_UNSUSPEND = exports.LAYOUT_COLUMN_FILTER_SUSPEND = exports.LAYOUT_COLUMN_FILTER_CLEAR = exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_COLUMN_FILTER_SET = exports.LAYOUT_COLUMN_FILTER_EDIT = exports.LAYOUT_COLUMN_FILTER_ADD = exports.LAYOUT_COLUMN_REMOVE = exports.LAYOUT_COLUMN_ADD = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = exports.LAYOUT_READY = exports.LAYOUT_COLUMN_SET_CAPTION = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 /**
  * @ReduxAction A new caption / header has been set for a Column in the Layout
  */
-exports.LAYOUT_SET_COLUMN_CAPTION = 'LAYOUT_SET_COLUMN_CAPTION';
+exports.LAYOUT_COLUMN_SET_CAPTION = 'LAYOUT_COLUMN_SET_CAPTION';
 /**
  * @ReduxAction Layout Module is ready
  */
@@ -35,11 +35,11 @@ exports.LAYOUT_SAVE = 'LAYOUT_SAVE';
 /**
  * @ReduxAction A Column has been added
  */
-exports.LAYOUT_ADD_COLUMN = 'LAYOUT_ADD_COLUMN';
+exports.LAYOUT_COLUMN_ADD = 'LAYOUT_COLUMN_ADD';
 /**
  * @ReduxAction A Column has been removed
  */
-exports.LAYOUT_REMOVE_COLUMN = 'LAYOUT_REMOVE_COLUMN';
+exports.LAYOUT_COLUMN_REMOVE = 'LAYOUT_COLUMN_REMOVE';
 /**
  * @ReduxAction A Column Filter has been added
  */
@@ -168,20 +168,20 @@ const LayoutSave = (layout) => ({
 });
 exports.LayoutSave = LayoutSave;
 const LayoutSetColumnCaption = (layoutName, columnId, caption) => ({
-    type: exports.LAYOUT_SET_COLUMN_CAPTION,
+    type: exports.LAYOUT_COLUMN_SET_CAPTION,
     layoutName,
     columnId,
     caption,
 });
 exports.LayoutSetColumnCaption = LayoutSetColumnCaption;
 const LayoutAddColumn = (layoutName, columnId) => ({
-    type: exports.LAYOUT_ADD_COLUMN,
+    type: exports.LAYOUT_COLUMN_ADD,
     layoutName,
     columnId,
 });
 exports.LayoutAddColumn = LayoutAddColumn;
 const LayoutRemoveColumn = (layoutName, columnId) => ({
-    type: exports.LAYOUT_REMOVE_COLUMN,
+    type: exports.LAYOUT_COLUMN_REMOVE,
     layoutName,
     columnId,
 });
@@ -237,7 +237,7 @@ 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 exports.LAYOUT_SET_COLUMN_CAPTION: {
+        case exports.LAYOUT_COLUMN_SET_CAPTION: {
             const setColumnCaptionAction = action;
             const currentLayoutName = setColumnCaptionAction.layoutName;
             let currentLayout = state.Layouts.find((l) => l.Name === currentLayoutName);
@@ -253,7 +253,7 @@ const LayoutReducer = (state = initialState, action) => {
             }
             return state;
         }
-        case exports.LAYOUT_ADD_COLUMN: {
+        case exports.LAYOUT_COLUMN_ADD: {
             const addColumnAction = action;
             const layoutname = addColumnAction.layoutName;
             const colToAdd = addColumnAction.columnId;
@@ -264,7 +264,7 @@ const LayoutReducer = (state = initialState, action) => {
             }
             return state;
         }
-        case exports.LAYOUT_REMOVE_COLUMN: {
+        case exports.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

@@ -13,7 +13,7 @@ exports.NAMED_QUERY_READY = 'NAMED_QUERY_READY';
  */
 exports.NAMED_QUERY_ADD = 'NAMED_QUERY_ADD';
 /**
- * @ReduxAction Multiple Named Query has been added
+ * @ReduxAction Multiple Named Queries have been added
  */
 exports.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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PluginsReducer = exports.PluginsSetPluginState = exports.OPENFIN_SET_CURRENT_REPORTNAME = exports.OPENFIN_SET_RUNNING_OFF = exports.OPENFIN_SET_RUNNING_ON = exports.OPENFIN_SET_AVAILABLE_OFF = exports.OPENFIN_SET_AVAILABLE_ON = exports.OPENFIN_LIVE_REPORT_CLEAR = exports.OPENFIN_LIVE_REPORT_SET = exports.OPENFIN_STOP_LIVE_DATA = exports.OPENFIN_START_LIVE_DATA = exports.IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES = exports.IPUSHPULL_SET_CURRENT_PAGE = exports.IPUSHPULL_SET_CURRENT_FOLDER = exports.IPUSHPULL_SET_CURRENT_REPORTNAME = exports.IPUSHPULL_DOMAIN_PAGES_CLEAR = exports.IPUSHPULL_DOMAIN_PAGES_SET = exports.IPUSHPULL_LIVE_REPORT_CLEAR = exports.IPUSHPULL_LIVE_REPORT_SET = exports.IPUSHPULL_SET_RUNNING_OFF = exports.IPUSHPULL_SET_RUNNING_ON = exports.IPUSHPULL_SET_AVAILABLE_OFF = exports.IPUSHPULL_SET_AVAILABLE_ON = exports.IPUSHPULL_SET_LOGIN_DETAILS = exports.IPUSHPULL_SET_LOGIN_ERROR_MESSAGE = exports.IPUSHPULL_LOGOUT = exports.IPUSHPULL_LOGIN = exports.IPUSHPULL_ADD_PAGE = exports.IPUSHPULL_STOP_LIVE_DATA = exports.IPUSHPULL_START_LIVE_DATA = exports.IPUSHPULL_REPORT_SELECT = exports.IPUSHPULL_SEND_SNAPSHOT = exports.IPUSHPULL_SET_THROTTLE_TIME = exports.PLUGINS_SET_PLUGIN_STATE = void 0;
+exports.PluginsReducer = exports.PluginsSetPluginState = exports.OPENFIN_SET_CURRENT_REPORTNAME = exports.OPENFIN_SET_RUNNING_OFF = exports.OPENFIN_SET_RUNNING_ON = exports.OPENFIN_SET_AVAILABLE_OFF = exports.OPENFIN_SET_AVAILABLE_ON = exports.OPENFIN_LIVE_REPORT_CLEAR = exports.OPENFIN_LIVE_REPORT_SET = exports.OPENFIN_STOP_LIVE_DATA = exports.OPENFIN_START_LIVE_DATA = exports.IPUSHPULL_SET_AVAILABLE_PAGES = exports.IPUSHPULL_SET_CURRENT_PAGE = exports.IPUSHPULL_SET_CURRENT_FOLDER = exports.IPUSHPULL_SET_CURRENT_REPORTNAME = exports.IPUSHPULL_DOMAIN_PAGES_CLEAR = exports.IPUSHPULL_DOMAIN_PAGES_SET = exports.IPUSHPULL_LIVE_REPORT_CLEAR = exports.IPUSHPULL_LIVE_REPORT_SET = exports.IPUSHPULL_SET_RUNNING_OFF = exports.IPUSHPULL_SET_RUNNING_ON = exports.IPUSHPULL_SET_AVAILABLE_OFF = exports.IPUSHPULL_SET_AVAILABLE_ON = exports.IPUSHPULL_SET_LOGIN_DETAILS = exports.IPUSHPULL_SET_LOGIN_ERROR_MESSAGE = exports.IPUSHPULL_LOGOUT = exports.IPUSHPULL_LOGIN = exports.IPUSHPULL_ADD_PAGE = exports.IPUSHPULL_STOP_LIVE_DATA = exports.IPUSHPULL_START_LIVE_DATA = exports.IPUSHPULL_REPORT_SELECT = exports.IPUSHPULL_SEND_SNAPSHOT = exports.IPUSHPULL_SET_THROTTLE_TIME = exports.PLUGINS_SET_PLUGIN_STATE = void 0;
 /**
  * @ReduxAction Plugins have been instantiated
  */
@@ -90,9 +90,9 @@ exports.IPUSHPULL_SET_CURRENT_FOLDER = 'IPUSHPULL_SET_CURRENT_FOLDER';
  */
 exports.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)
  */
-exports.IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES = 'IPUSHPULL_SET_CURRENT_AVAILABLE_PAGES';
+exports.IPUSHPULL_SET_AVAILABLE_PAGES = 'IPUSHPULL_SET_AVAILABLE_PAGES';
 /**
  * @ReduxAction Live data has been sent to OpenFin
  */

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -7,8 +7,8 @@ const merge_1 = tslib_1.__importDefault(require("lodash/merge"));
 const isArray_1 = tslib_1.__importDefault(require("lodash/isArray"));
 const extend_1 = tslib_1.__importDefault(require("lodash/extend"));
 const isObject_1 = tslib_1.__importDefault(require("lodash/isObject"));
-const isAdaptableObject_1 = require("../../Utilities/isAdaptableObject");
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
+const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 function customizer(objValue, srcValue) {
     if ((0, isArray_1.default)(objValue)) {
         if (!Array.isArray(srcValue)) {
@@ -35,7 +35,7 @@ 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 ((0, isAdaptableObject_1.isAdaptableObject)(value) && value.Source == null) {
+            if (AdaptableHelper_1.default.isAdaptableObject(value) && value.Source == null) {
                 value.Source = source;
             }
             if (value !== null && typeof value === 'object') {
@@ -53,7 +53,7 @@ function ProcessKeepUserDefinedRevision(configState, currentUserState) {
             const stateValue = stateObject[key];
             if (Array.isArray(configValue) && Array.isArray(stateValue)) {
                 const userDefinedItems = stateValue.filter((item) => {
-                    return (0, isAdaptableObject_1.isAdaptableObject)(item) && item.Source !== 'Config';
+                    return AdaptableHelper_1.default.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

@@ -35,7 +35,6 @@ const LayoutRedux = tslib_1.__importStar(require("../ActionsReducers/LayoutRedux
 const NamedQueryRedux = tslib_1.__importStar(require("../ActionsReducers/NamedQueryRedux"));
 const NoteRedux = tslib_1.__importStar(require("../ActionsReducers/NoteRedux"));
 const PlusMinusRedux = tslib_1.__importStar(require("../ActionsReducers/PlusMinusRedux"));
-const QueryRedux = tslib_1.__importStar(require("../ActionsReducers/QueryRedux"));
 const QuickSearchRedux = tslib_1.__importStar(require("../ActionsReducers/QuickSearchRedux"));
 const ScheduleRedux = tslib_1.__importStar(require("../ActionsReducers/ScheduleRedux"));
 const ShortcutRedux = tslib_1.__importStar(require("../ActionsReducers/ShortcutRedux"));
@@ -150,7 +149,6 @@ 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
@@ -1017,7 +1015,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)'
@@ -1039,7 +1037,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

@@ -71,8 +71,7 @@ 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

@@ -17,8 +17,7 @@ class ColumnFilterModule extends AdaptableModuleBase_1.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

@@ -149,12 +149,12 @@ class ExportModule extends AdaptableModuleBase_1.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()`);
@@ -162,7 +162,7 @@ class ExportModule extends AdaptableModuleBase_1.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)) {
@@ -188,13 +188,7 @@ class ExportModule extends AdaptableModuleBase_1.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);
                 }
             }
@@ -228,22 +222,11 @@ class ExportModule extends AdaptableModuleBase_1.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;
     }
@@ -259,7 +242,7 @@ class ExportModule extends AdaptableModuleBase_1.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_1.Helper.createDownloadedFile(jsonContent, jsonFileName, 'application/json');
     }
     openReportInTablePopup(report, reportData) {
@@ -275,17 +258,13 @@ class ExportModule extends AdaptableModuleBase_1.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}`;
             }
@@ -305,7 +284,7 @@ class ExportModule extends AdaptableModuleBase_1.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_1.Helper.createDownloadedFile(csvContent, csvFileName, 'text/csv;encoding:utf-8');
     }
     convertReportToExcel(report, reportData) {
@@ -313,7 +292,7 @@ class ExportModule extends AdaptableModuleBase_1.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);
@@ -324,15 +303,11 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         Helper_1.Helper.copyToClipboard(csvContent);
     }
     createCSVContent(reportData) {
-        const reportDataAsArray = this.api.internalApi
-            .getReportService()
-            .convertReportDataToArray(reportData);
+        const reportDataAsArray = this.api.exportApi.internalApi.convertReportDataToArray(reportData);
         return Helper_1.Helper.convertArrayToCsv(reportDataAsArray, ',');
     }
     createTabularContent(reportData) {
-        const reportDataAsArray = this.api.internalApi
-            .getReportService()
-            .convertReportDataToArray(reportData);
+        const reportDataAsArray = this.api.exportApi.internalApi.convertReportDataToArray(reportData);
         return Helper_1.Helper.convertArrayToCsv(reportDataAsArray, '\t');
     }
     getTeamSharingAction() {
@@ -355,9 +330,7 @@ class ExportModule extends AdaptableModuleBase_1.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

@@ -203,17 +203,9 @@ class FlashingCellModule extends AdaptableModuleBase_1.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

@@ -118,9 +118,8 @@ class ScheduleModule extends AdaptableModuleBase_1.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));
@@ -154,9 +153,8 @@ class ScheduleModule extends AdaptableModuleBase_1.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

@@ -124,13 +124,7 @@ class SmartEditModule extends AdaptableModuleBase_1.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 {