@adaptabletools/adaptable-cjs 19.2.4 → 20.0.0-canary.0

package/src/Api/Implementation/ColumnFilterApiImpl.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColumnFilterApiImpl = void 0;
 const tslib_1 = require("tslib");
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+const InternalRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/InternalRedux"));
 const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/LayoutRedux"));
 const ApiBase_1 = require("./ApiBase");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
@@ -25,22 +25,21 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
         return column ? this.getFilterPredicateDefsForColumn(column) : undefined;
     }
     showQuickFilterBar() {
-        this.dispatchAction(SystemRedux.SystemQuickFilterBarShow());
+        this.dispatchAction(InternalRedux.QuickFilterBarShow());
     }
     hideQuickFilterBar() {
-        this.dispatchAction(SystemRedux.SystemQuickFilterBarHide());
+        this.dispatchAction(InternalRedux.QuickFilterBarHide());
     }
     isQuickFilterAvailable() {
         return this._adaptable.isQuickFilterAvailable();
     }
     isQuickFilterVisible() {
         return (this.isQuickFilterAvailable() &&
-            this.getAdaptableInternalApi().getSystemState().IsQuickFilterVisible);
+            this.getAdaptableInternalApi().getInternalState().IsQuickFilterVisible);
     }
     getColumnFilters() {
-        var _a;
         const currentLayout = this.getLayoutApi().getCurrentLayout();
-        return (_a = currentLayout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
+        return currentLayout.ColumnFilters ?? [];
     }
     getActiveColumnFilters() {
         return this.getColumnFilters().filter((columnFilter) => !columnFilter.IsSuspended);
@@ -49,26 +48,25 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
         const filters = this.getColumnFilters();
         return filters.map((columnFilter) => {
             const column = this.getColumnApi().getColumnWithColumnId(columnFilter.ColumnId);
-            const predicate = this.getPredicateApi().getPredicateDefById(columnFilter.Predicate.PredicateId);
+            const predicates = columnFilter.Predicates.map((predicate) => this.getPredicateApi().getPredicateDefById(predicate.PredicateId));
             return {
-                predicate,
-                dataType: column === null || column === void 0 ? void 0 : column.dataType,
+                predicates,
+                dataType: column?.dataType,
                 columnFilter: columnFilter,
             };
         });
     }
     getColumnFiltersForLayout(layoutName) {
-        var _a;
         const layout = this.getLayoutApi().getLayoutByName(layoutName);
-        return (_a = layout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
+        return layout.ColumnFilters ?? [];
     }
     setColumnFilters(columnFilters) {
         columnFilters.forEach((columnFilter) => {
-            if (!columnFilter.Predicate) {
+            if (!columnFilter.Predicates || columnFilter.Predicates.length == 0) {
                 this.logWarn('Column Filter has no Predicate', columnFilter);
             }
             else {
-                const isValidPredicate = this.getPredicateApi().isValidPredicate(columnFilter.Predicate);
+                const isValidPredicate = this.getPredicateApi().isEveryPredicateValid(columnFilter.Predicates);
                 if (!isValidPredicate) {
                     this.logWarn('Column Filter Predicate is not valid', columnFilter);
                 }
@@ -83,7 +81,9 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
                 }
             }
         });
-        return columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.map((columnFilter) => this.getColumnFilterById(columnFilter.Uuid)).filter(Boolean);
+        return columnFilters
+            ?.map((columnFilter) => this.getColumnFilterById(columnFilter.Uuid))
+            .filter(Boolean);
     }
     clearColumnFilter(columnFilter) {
         this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(columnFilter));
@@ -93,6 +93,16 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
             this.clearColumnFilterForColumn(c);
         });
     }
+    getColumnFilterForColumn(columnId) {
+        return this.getColumnFilters().find((columnFilter) => columnFilter.ColumnId == columnId);
+    }
+    clearColumnFilterForColumn(columnId) {
+        let columnFilterForColumn = this.getColumnFilterForColumn(columnId);
+        if (columnFilterForColumn) {
+            this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(columnFilterForColumn));
+            this._adaptable.clearColumnFilteringForColumns([columnId]);
+        }
+    }
     clearColumnFilters() {
         this.dispatchAction(LayoutRedux.LayoutColumnFilterClearAll());
         this._adaptable.clearColumnFiltering();
@@ -102,14 +112,20 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
         this.setColumnFilters(columnFilters);
     }
     columnFilterToString(columnFilter) {
-        return this.internalApi.columnFilterToString(columnFilter);
+        if (columnFilter == null) {
+            return 'No Column Filter';
+        }
+        const friendlyName = this.getColumnApi().getFriendlyNameForColumnId(columnFilter.ColumnId);
+        return ('[' +
+            friendlyName +
+            '] ' +
+            this.getPredicateApi().predicatesToString(columnFilter.Predicates, columnFilter.PredicatesLogic));
     }
     columnFiltersToString(columnFilters) {
-        return this.internalApi.columnFiltersToString(columnFilters);
+        return columnFilters.map((cf) => this.columnFilterToString(cf)).join(', ');
     }
     getColumnFilterById(id) {
-        var _a;
-        return (_a = this.getColumnFilters()) === null || _a === void 0 ? void 0 : _a.find((columnFilter) => columnFilter.Uuid === id);
+        return this.getColumnFilters()?.find((columnFilter) => columnFilter.Uuid === id);
     }
     /**
      * Checks if a filter is applied. It is applied when:
@@ -119,35 +135,31 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
      * @param filter
      */
     isColumnFilterActive(filter) {
-        if (!filter || !filter.Predicate || !filter.Predicate.PredicateId) {
-            return false;
-        }
-        const predicateDef = this.getPredicateApi().getPredicateDefById(filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId);
-        if (ArrayExtensions_1.default.IsNull(predicateDef.inputs) &&
-            // values predicates have no inputs in the definition
-            !this.getPredicateApi().internalApi.hasPredicateValues(filter.Predicate)) {
-            return true;
-        }
-        const inputs = filter.Predicate.Inputs;
-        if (ArrayExtensions_1.default.IsEmpty(inputs)) {
+        if (!filter || !filter.Predicates?.length) {
             return false;
         }
-        // all values in the array need to be non-empty (e.g. between has two values, [min, max])
-        const allInputsHaveValues = inputs.every((value) => {
-            return value !== undefined && value !== null && value !== '';
+        return filter.Predicates.some((predicate) => {
+            const predicateDef = this.getPredicateApi().getPredicateDefById(predicate.PredicateId);
+            if (ArrayExtensions_1.default.IsNull(predicateDef.inputs) &&
+                // values predicates have no inputs in the definition
+                !this.getPredicateApi().internalApi.hasPredicateValues(predicate)) {
+                return true;
+            }
+            const inputs = predicate.Inputs;
+            if (ArrayExtensions_1.default.IsEmpty(inputs)) {
+                return false;
+            }
+            // all values in the array need to be non-empty (e.g. between has two values, [min, max])
+            const allInputsHaveValues = inputs.every((value) => {
+                return value !== undefined && value !== null && value !== '';
+            });
+            return allInputsHaveValues;
         });
-        return allInputsHaveValues;
     }
-    setColumnFilterForColumn(columnId, columnFilterConfig) {
-        const columnFilterPredicate = {
-            PredicateId: columnFilterConfig.PredicateId,
-        };
-        if (columnFilterConfig.PredicateInputs) {
-            columnFilterPredicate.Inputs = columnFilterConfig.PredicateInputs;
-        }
+    setColumnFilterForColumn(columnId, columnFilterPredicate) {
         const columnFilter = {
             ColumnId: columnId,
-            Predicate: columnFilterPredicate,
+            Predicates: [columnFilterPredicate],
         };
         this.setColumnFilters([columnFilter]);
     }
@@ -163,15 +175,5 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
     unSuspendAllColumnFilters() {
         this.dispatchAction(LayoutRedux.LayoutColumnFilterUnSuspendAll());
     }
-    getColumnFilterForColumn(columnId) {
-        return this.getColumnFilters().find((columnFilter) => columnFilter.ColumnId == columnId);
-    }
-    clearColumnFilterForColumn(columnId) {
-        let columnFilterForColumn = this.getColumnFilterForColumn(columnId);
-        if (columnFilterForColumn) {
-            this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(columnFilterForColumn));
-            this._adaptable.clearColumnFilteringForColumns([columnId]);
-        }
-    }
 }
 exports.ColumnFilterApiImpl = ColumnFilterApiImpl;

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

@@ -1,6 +1,19 @@
 import { ColumnMenuApi } from '../ColumnMenuApi';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ApiBase } from './ApiBase';
+import { AdaptableColumnMenuItemName, AdaptableIcon, AdaptableSystemColumnMenuItem, CustomColumnMenuContext, CustomColumnMenuItem, CustomGroupColumnMenuItem, MenuCategory } from '../../types';
 export declare class ColumnMenuApiImpl extends ApiBase implements ColumnMenuApi {
+    constructor(adaptable: IAdaptable);
     showColumnMenu(columnKey: string): void;
     hideColumnMenu(): void;
+    getColumnMenuItemsByCategory(category: MenuCategory, context: CustomColumnMenuContext): AdaptableSystemColumnMenuItem<AdaptableColumnMenuItemName>[];
+    getColumnMenuItemsByCategories(categories: MenuCategory[], context: CustomColumnMenuContext): AdaptableSystemColumnMenuItem<AdaptableColumnMenuItemName>[];
+    createDefaultMenuStructure(context: CustomColumnMenuContext): any;
+    getColumnMenuItemByName(menuItemName: AdaptableColumnMenuItemName, context: CustomColumnMenuContext): AdaptableSystemColumnMenuItem<AdaptableColumnMenuItemName>;
+    getColumnMenuItemsByNames(menuItemNames: AdaptableColumnMenuItemName[], context: CustomColumnMenuContext): AdaptableSystemColumnMenuItem<AdaptableColumnMenuItemName>[];
+    getColumnMenuItemByLabel(label: string, context: CustomColumnMenuContext): AdaptableSystemColumnMenuItem<AdaptableColumnMenuItemName>;
+    getColumnMenuItemsByLabels(labels: string[], context: CustomColumnMenuContext): AdaptableSystemColumnMenuItem<AdaptableColumnMenuItemName>[];
+    removeAdaptableColumnMenuItemByName(menuItemName: AdaptableColumnMenuItemName, context: CustomColumnMenuContext): any;
+    removeAdaptableColumnMenuItemsByNames(menuItemNames: AdaptableColumnMenuItemName[], context: CustomColumnMenuContext): any;
+    createGroupMenu(label: string, subMenuItems: CustomColumnMenuItem[], disabled?: boolean, icon?: AdaptableIcon): CustomGroupColumnMenuItem;
 }

package/src/Api/Implementation/ColumnMenuApiImpl.js

@@ -2,12 +2,63 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColumnMenuApiImpl = void 0;
 const ApiBase_1 = require("./ApiBase");
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 class ColumnMenuApiImpl extends ApiBase_1.ApiBase {
+    constructor(adaptable) {
+        super(adaptable);
+    }
     showColumnMenu(columnKey) {
         this.getAgGridApi().showColumnMenu(columnKey);
     }
     hideColumnMenu() {
         this.getAgGridApi().hidePopupMenu();
     }
+    getColumnMenuItemsByCategory(category, context) {
+        return context.defaultAdaptableMenuItems.filter((item) => item.category === category);
+    }
+    getColumnMenuItemsByCategories(categories, context) {
+        return context.defaultAdaptableMenuItems.filter((item) => categories.includes(item.category));
+    }
+    createDefaultMenuStructure(context) {
+        const test = [
+            ...context.defaultAgGridMenuStructure,
+            GeneralConstants_1.MENU_SEPARATOR,
+            ...context.defaultAdaptableMenuStructure,
+        ];
+        return test;
+    }
+    getColumnMenuItemByName(menuItemName, context) {
+        const openSettingsPanelMenuItem = context.defaultAdaptableMenuItems.find((item) => item.name === menuItemName);
+        return openSettingsPanelMenuItem;
+    }
+    getColumnMenuItemsByNames(menuItemNames, context) {
+        const menuItems = context.defaultAdaptableMenuItems.filter((item) => menuItemNames.includes(item.name));
+        return menuItems;
+    }
+    getColumnMenuItemByLabel(label, context) {
+        const menuItem = context.defaultAdaptableMenuItems.find((item) => item.label === label);
+        return menuItem;
+    }
+    getColumnMenuItemsByLabels(labels, context) {
+        const menuItems = context.defaultAdaptableMenuItems.filter((item) => labels.includes(item.label));
+        return menuItems;
+    }
+    removeAdaptableColumnMenuItemByName(menuItemName, context) {
+        const filteredMenuItems = context.defaultAdaptableMenuStructure.filter((item) => item !== '-' && item.name !== menuItemName);
+        return filteredMenuItems;
+    }
+    removeAdaptableColumnMenuItemsByNames(menuItemNames, context) {
+        const filteredMenuItems = context.defaultAdaptableMenuStructure.filter((item) => item !== '-' && !menuItemNames.includes(item.name));
+        return filteredMenuItems;
+    }
+    createGroupMenu(label, subMenuItems, disabled, icon) {
+        return {
+            menuType: 'Group',
+            label: label,
+            subMenuItems: subMenuItems,
+            disabled: disabled,
+            icon: icon,
+        };
+    }
 }
 exports.ColumnMenuApiImpl = ColumnMenuApiImpl;

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

@@ -5,7 +5,7 @@ import { ColumnScopeApi } from '../ColumnScopeApi';
 import { CellColorRange } from '../../PredefinedConfig/StyledColumnState';
 export declare class ColumnScopeApiImpl extends ApiBase implements ColumnScopeApi {
     isColumnInScope(column: AdaptableColumn | undefined, scope: ColumnScope | undefined): boolean;
-    getColumnsForScope(scope: ColumnScope): AdaptableColumn[];
+    getColumnsInScope(scope: ColumnScope): AdaptableColumn[];
     getScopeDescription(scope: ColumnScope): string;
     scopeIsEmpty(scope: ColumnScope): boolean;
     scopeIsAll(scope: ColumnScope): boolean;

package/src/Api/Implementation/ColumnScopeApiImpl.js

@@ -18,7 +18,7 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
             return true;
         }
         if ('ColumnTypes' in scope &&
-            scope.ColumnTypes.some((columnType) => { var _a; return (_a = column.columnTypes) === null || _a === void 0 ? void 0 : _a.includes(columnType); })) {
+            scope.ColumnTypes.some((columnType) => column.columnTypes?.includes(columnType))) {
             return true;
         }
         if ('ColumnIds' in scope && scope.ColumnIds.includes(column.columnId)) {
@@ -26,11 +26,11 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
         }
         return false;
     }
-    getColumnsForScope(scope) {
+    getColumnsInScope(scope) {
         if (scope == undefined) {
             return [];
         }
-        const columns = this.getColumnApi().getColumns();
+        const columns = this.getColumnApi().getUIAvailableColumns();
         if ('All' in scope) {
             return columns;
         }
@@ -57,8 +57,8 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
         if ('ColumnIds' in scope) {
             return ((scope.ColumnIds.length > 1 ? 'Columns' : 'Column') +
                 ': ' +
-                this.getAdaptableApi()
-                    .columnApi.getFriendlyNamesForColumnIds(scope.ColumnIds)
+                this.getColumnApi()
+                    .getFriendlyNamesForColumnIds(scope.ColumnIds)
                     .map((c) => {
                     return '"' + c + '"';
                 })
@@ -78,8 +78,7 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
         return scope !== undefined && 'ColumnTypes' in scope;
     }
     scopeHasOnlyBooleanDataType(scope) {
-        var _a;
-        return 'DataTypes' in scope && ((_a = scope.DataTypes) === null || _a === void 0 ? void 0 : _a.length) == 1 && scope.DataTypes[0] == 'Boolean';
+        return 'DataTypes' in scope && scope.DataTypes?.length == 1 && scope.DataTypes[0] == 'boolean';
     }
     scopeHasColumns(scope) {
         return scope !== undefined && 'ColumnIds' in scope;
@@ -166,9 +165,8 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
         return undefined;
     }
     isColumnInNumericScope(column, scope) {
-        var _a, _b;
         // if column is not even numeric then return false
-        if (column == null || column == undefined || column.dataType !== 'Number') {
+        if (column == null || column == undefined || column.dataType !== 'number') {
             return false;
         }
         // if no scope then return false
@@ -180,19 +178,18 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
             return true;
         }
         // check if the scope has ColumnIds and whether this column is contained
-        if ('DataTypes' in scope && scope.DataTypes.includes('Number')) {
+        if ('DataTypes' in scope && scope.DataTypes.includes('number')) {
             return true;
         }
         if ('ColumnTypes' in scope &&
-            ((_b = (_a = scope.ColumnTypes) === null || _a === void 0 ? void 0 : _a.some) === null || _b === void 0 ? void 0 : _b.call(_a, (scopeColumnType) => { var _a, _b; return (_b = (_a = column.columnTypes) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, scopeColumnType); }))) {
+            scope.ColumnTypes?.some?.((scopeColumnType) => column.columnTypes?.includes?.(scopeColumnType))) {
             return true;
         }
         return false;
     }
     isColumnInStringsScope(column, scope) {
-        var _a, _b;
         // if column is not even string then return false
-        if (column == null || column == undefined || column.dataType !== 'String') {
+        if (column == null || column == undefined || column.dataType !== 'text') {
             return false;
         }
         // if no scope then return false
@@ -204,19 +201,18 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
             return true;
         }
         // check if the scope has ColumnIds and whether this column is contained
-        if ('DataTypes' in scope && scope.DataTypes.includes('String')) {
+        if ('DataTypes' in scope && scope.DataTypes.includes('text')) {
             return true;
         }
         if ('ColumnTypes' in scope &&
-            ((_b = (_a = scope.ColumnTypes) === null || _a === void 0 ? void 0 : _a.some) === null || _b === void 0 ? void 0 : _b.call(_a, (scopeColumnType) => { var _a, _b; return (_b = (_a = column.columnTypes) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, scopeColumnType); }))) {
+            scope.ColumnTypes?.some?.((scopeColumnType) => column.columnTypes?.includes?.(scopeColumnType))) {
             return true;
         }
         return false;
     }
     isColumnInDateScope(column, scope) {
-        var _a, _b;
         // if column is not even numeric then return false
-        if (column == null || column == undefined || column.dataType !== 'Date') {
+        if (column == null || column == undefined || column.dataType !== 'date') {
             return false;
         }
         // if no scope then return false
@@ -228,11 +224,11 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
             return true;
         }
         // check if the scope has ColumnIds and whether this column is contained
-        if ('DataTypes' in scope && scope.DataTypes.includes('Date')) {
+        if ('DataTypes' in scope && scope.DataTypes.includes('date')) {
             return true;
         }
         if ('ColumnTypes' in scope &&
-            ((_b = (_a = scope.ColumnTypes) === null || _a === void 0 ? void 0 : _a.some) === null || _b === void 0 ? void 0 : _b.call(_a, (scopeColumnType) => { var _a, _b; return (_b = (_a = column.columnTypes) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, scopeColumnType); }))) {
+            scope.ColumnTypes?.some?.((scopeColumnType) => column.columnTypes?.includes?.(scopeColumnType))) {
             return true;
         }
         return false;
@@ -256,8 +252,7 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
         if ('ColumnIds' in a &&
             'DataTypes' in b &&
             a.ColumnIds.every((columnId) => {
-                var _a;
-                return b.DataTypes.includes((_a = this.getColumnApi().getColumnWithColumnId(columnId)) === null || _a === void 0 ? void 0 : _a.dataType);
+                return b.DataTypes.includes(this.getColumnApi().getColumnWithColumnId(columnId)?.dataType);
             })) {
             return true;
         }

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

@@ -6,14 +6,14 @@ import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 export declare class CommentsApiImpl extends ApiBase implements CommentApi {
     internalApi: CommentsInternalApi;
     constructor(_adaptable: IAdaptable);
-    getCommentThread(address: CellAddress): CommentThread | undefined;
-    getGridComments(): CommentThread[];
+    getCommentThreadForCell(address: CellAddress): CommentThread | undefined;
+    getAllComments(): CommentThread[];
     editComment(comment: AdaptableComment, address: CellAddress): void;
     deleteComment(comment: AdaptableComment, address: CellAddress): void;
     addComment(commentText: AdaptableComment['Value'], address: CellAddress): void;
     addCommentThread(commentThread: CommentThread): void;
     deleteCommentThread(cellAddress: CellAddress): void;
-    setGridComments(cellComments: CommentThread[]): void;
-    clearGridComments(): void;
+    setComments(cellComments: CommentThread[]): void;
+    clearComments(): void;
     hideCommentsPopup(): void;
 }

package/src/Api/Implementation/CommentsApiImpl.js

@@ -7,19 +7,16 @@ const ApiBase_1 = require("./ApiBase");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 const CommentsInternalApi_1 = require("../Internal/CommentsInternalApi");
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
 class CommentsApiImpl extends ApiBase_1.ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
         this.internalApi = new CommentsInternalApi_1.CommentsInternalApi(_adaptable);
     }
-    getCommentThread(address) {
+    getCommentThreadForCell(address) {
         return CommentRedux.GetCellCommentSelector(this.getAdaptableState().Comment, address);
     }
-    getGridComments() {
-        var _a;
-        return (_a = this.getAdaptableState().Comment.CommentThreads) !== null && _a !== void 0 ? _a : [];
-        lodash_1.default;
+    getAllComments() {
+        return this.getAdaptableState().Comment.CommentThreads ?? [];
     }
     editComment(comment, address) {
         this.dispatchAction(CommentRedux.CommentsEdit({ comment, cellAddress: address }));
@@ -37,21 +34,21 @@ class CommentsApiImpl extends ApiBase_1.ApiBase {
     }
     addCommentThread(commentThread) {
         if (!commentThread.Uuid) {
-            AdaptableHelper_1.default.addUuidAndSource(commentThread);
+            AdaptableHelper_1.default.addAdaptableObjectPrimitives(commentThread);
         }
         this.dispatchAction(CommentRedux.CommentsCellAdd({ commentThread: commentThread }));
     }
     deleteCommentThread(cellAddress) {
         this.dispatchAction(CommentRedux.CommentsCellDelete({ cellAddress }));
     }
-    setGridComments(cellComments) {
+    setComments(cellComments) {
         this.dispatchAction(CommentRedux.CommentsSet({ commentThread: cellComments }));
     }
-    clearGridComments() {
-        this.setGridComments([]);
+    clearComments() {
+        this.setComments([]);
     }
     hideCommentsPopup() {
-        this.getAdaptableInternalApi().getCellPopupService().hidePopup();
+        this.getAdaptableInternalApi().getAnnotationsService().hidePopup();
     }
 }
 exports.CommentsApiImpl = CommentsApiImpl;

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

@@ -30,9 +30,7 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     getAllState(): AdaptableState;
     getPersistedState(): AdaptablePersistentState;
     getAllUserState(): ConfigState[];
-    loadUserState(state: {
-        [s: string]: ConfigState;
-    }): void;
+    loadUserState(state: PredefinedConfig): void;
     getAdaptableSearchState(): AdaptableSearchState;
     getAdaptableSortState(): AdaptableSortState;
     getAdaptableOptions(): Readonly<AdaptableOptions>;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -46,18 +46,19 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
         return this.getPredefinedConfig;
     }
     reloadPredefinedConfig(newPredefinedConfig) {
-        var _a;
         const adaptableOptions = this.getOptions();
         const oldState = this.getPersistedState();
         // clearing filters so that AG Grid doesnt display the filter icon in a column header after grid reloads
         // but this is a hack so would be nicer if there was a better way to do this
-        this.getGridApi().clearGridFiltering();
-        const clearStateFn = ((_a = adaptableOptions.stateOptions) === null || _a === void 0 ? void 0 : _a.clearState) ||
+        this.getGridApi().clearFiltering();
+        const clearStateFn = adaptableOptions.stateOptions?.clearState ||
             (() => {
                 localStorage.removeItem(adaptableOptions.adaptableStateKey);
                 return Promise.resolve(true);
             });
-        this.getAdaptableSore().saveStateNow(this._adaptable).then(() => {
+        this.getAdaptableStore()
+            .saveStateNow(this._adaptable)
+            .then(() => {
             const promise = clearStateFn({
                 adaptableId: adaptableOptions.adaptableId,
                 adaptableStateKey: adaptableOptions.adaptableStateKey,
@@ -69,9 +70,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                     flushCurrentState: false,
                 }).then(() => {
                     const newState = this.getPersistedState();
-                    const stateReloadedInfo = Object.assign({ oldState,
-                        newState, adaptableStateKey: adaptableOptions.adaptableStateKey }, this.getAdaptableInternalApi().buildBaseContext());
-                    this.getEventApi().emit('AdaptableStateReloaded', stateReloadedInfo);
+                    this.getEventApi().internalApi.fireAdaptableStateReloadedEvent(oldState, newState);
                 });
             });
         });
@@ -81,7 +80,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     }
     getPersistedState() {
         // no assertion should be required here as soon as we make order in our state typings
-        return this.getAdaptableSore().getCurrentStorageState();
+        return this.getAdaptableStore().getCurrentStorageState();
     }
     getAllUserState() {
         return Object.values(this.getPersistedState());
@@ -93,21 +92,19 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
         });
     }
     getAdaptableSearchState() {
-        const gridFilter = this.getAdaptableApi().gridFilterApi.getCurrentGridFilterExpression();
+        const gridFilter = this.getGridFilterApi().getCurrentGridFilterExpression();
         const adaptableSearchState = {
-            dataSet: this.getAdaptableApi().dataSetApi.getCurrentDataSet(),
+            dataSet: this.getDataSetApi().getCurrentDataSet(),
             gridFilter: gridFilter,
-            gridFilterAST: gridFilter
-                ? this.getAdaptableApi().expressionApi.getASTForExpression(gridFilter)
-                : null,
-            columnFilters: this.getAdaptableApi().columnFilterApi.getColumnFilters(),
+            gridFilterAST: gridFilter ? this.getExpressionApi().getASTForExpression(gridFilter) : null,
+            columnFilters: this.getColumnFilterApi().getColumnFilters(),
         };
         return adaptableSearchState;
     }
     getAdaptableSortState() {
         const adaptableSortState = {
             columnSorts: this.getGridApi().getColumnSorts(),
-            customSorts: this.getAdaptableApi().customSortApi.getCustomSorts(),
+            customSorts: this.getCustomSortApi().getCustomSorts(),
         };
         return adaptableSortState;
     }
@@ -116,21 +113,20 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     }
     setAdaptableStateKey(adaptableStateKey, config) {
         return new Promise((resolve, reject) => {
-            var _a;
-            this.getAdaptableInternalApi().executeWithProgressIndicator((_a = config === null || config === void 0 ? void 0 : config.progressIndicatorLabel) !== null && _a !== void 0 ? _a : `Initialising...`, () => {
+            this.getAdaptableInternalApi().executeWithProgressIndicator(config?.progressIndicatorLabel ?? `Initialising...`, () => {
                 const flushCurrentState = !config || config.flushCurrentState !== false;
                 // make sure we persist any "pending" changes to state - since stateOptions.debounceStateDelay can cause
                 // the state to be persisted with a delay, which we dont want in this case
                 const flushStatePromise = flushCurrentState
-                    ? this.getAdaptableSore().saveStateNow(this._adaptable)
+                    ? this.getAdaptableStore().saveStateNow(this._adaptable)
                     : Promise.resolve(true);
                 flushStatePromise.then(() => {
                     this.getOptions().adaptableStateKey = adaptableStateKey;
-                    let predefinedConfig = config === null || config === void 0 ? void 0 : config.predefinedConfig;
+                    let predefinedConfig = config?.predefinedConfig;
                     if (predefinedConfig) {
                         predefinedConfig = (0, AdaptableHelper_1.initPredefinedConfigWithUuids)(predefinedConfig);
                     }
-                    const promise = this.getAdaptableSore().loadStore({
+                    const promise = this.getAdaptableStore().loadStore({
                         adaptable: this._adaptable,
                         adaptableStateKey,
                         predefinedConfig,
@@ -146,11 +142,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                     });
                     promise
                         .then(() => {
-                        this._adaptable.updateColumnModelAndRefreshGrid({
-                            preemptiveColumnStateRefresh: true,
-                        });
-                        this._adaptable.setLayout();
-                        this._adaptable.applyColumnFiltering();
+                        this._adaptable.refreshLayout();
                     })
                         .then(() => {
                         // resolve main(result) promise

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

@@ -1,5 +1,18 @@
 import { ApiBase } from './ApiBase';
 import { ContextMenuApi } from '../ContextMenuApi';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { CustomContextMenuContext, AdaptableSystemContextMenuItem, AdaptableContextMenuItemName, MenuCategory, CustomGroupContextMenuItem, AdaptableIcon, CustomContextMenuItem } from '../../types';
 export declare class ContextMenuApiImpl extends ApiBase implements ContextMenuApi {
+    constructor(adaptable: IAdaptable);
     hideContextMenu(): void;
+    getContextMenuItemsByCategory(category: MenuCategory, context: CustomContextMenuContext): AdaptableSystemContextMenuItem<AdaptableContextMenuItemName>[];
+    getContextMenuItemsByCategories(categories: MenuCategory[], context: CustomContextMenuContext): AdaptableSystemContextMenuItem<AdaptableContextMenuItemName>[];
+    createDefaultMenuStructure(context: CustomContextMenuContext): any;
+    getContextMenuItemByName(menuItemName: AdaptableContextMenuItemName, context: CustomContextMenuContext): AdaptableSystemContextMenuItem<AdaptableContextMenuItemName>;
+    getContextMenuItemsByNames(menuItemNames: AdaptableContextMenuItemName[], context: CustomContextMenuContext): AdaptableSystemContextMenuItem<AdaptableContextMenuItemName>[];
+    getContextMenuItemByLabel(label: string, context: CustomContextMenuContext): AdaptableSystemContextMenuItem<AdaptableContextMenuItemName>;
+    getContextMenuItemsByLabels(labels: string[], context: CustomContextMenuContext): AdaptableSystemContextMenuItem<AdaptableContextMenuItemName>[];
+    removeAdaptableContextMenuItemByName(menuItemName: AdaptableContextMenuItemName, context: CustomContextMenuContext): any;
+    removeAdaptableContextMenuItemsByNames(menuItemNames: AdaptableContextMenuItemName[], context: CustomContextMenuContext): any;
+    createGroupMenu(label: string, subMenuItems: CustomContextMenuItem[], disabled?: boolean, icon?: AdaptableIcon): CustomGroupContextMenuItem;
 }