@adaptabletools/adaptable-cjs 18.0.0-canary.22 → 18.0.0-canary.24

package/src/AdaptableOptions/CommentOptions.d.ts

@@ -8,14 +8,14 @@ export interface CommentOptions<TData = any> {
      */
     isCellCommentable?: (commentableCellContext: CommentableCellContext) => boolean;
     /**
-     * Loads Comments
+     * Loads the Comment Threads
      */
     loadCommentThreads?(commentLoadContext: CommentLoadContext): Promise<CommentThread[]>;
     /**
-     * Saves changed Comments
+     * Persists the current Comment Threads
      * @param commentThreads
      */
-    persistCommentThreads?(commentThreads: CommentThread[]): void;
+    persistCommentThreads?(commentThreads: CommentThread[]): Promise<void>;
     /**
      * Format string for formatting in the Comments Popup
      *

package/src/AdaptableOptions/DataImportOptions.d.ts

@@ -5,7 +5,7 @@ import { IRowNode } from '@ag-grid-community/core';
  */
 export interface DataImportOptions<T = Record<string, any>> {
     /**
-     * File extensions that the Data Import function accepts
+     * Custom File Handlers to use for Data Import
      */
     fileHandlers?: DataImportFileHandler<T>[];
     /**
@@ -60,7 +60,7 @@ export interface DataImportFileHandler<T = Record<string, any>> {
      */
     fileExtension?: string;
     /**
-     * Function which handles the File
+     * Async function which handles the import returning a Data Record
      */
     handleFile: (file: File) => Promise<T[]>;
 }

package/src/AdaptableOptions/GroupingOptions.d.ts

@@ -1,5 +1,3 @@
-import { AdaptableColumn, BaseContext } from '../../types';
-import { KeyCreatorParams } from '@ag-grid-community/core';
 /**
  * Options for managing Row and Column Groups in AdapTable
  */
@@ -19,16 +17,3 @@ export interface GroupingOptions<TData = any> {
      */
     autoOrderGroupedColumns?: boolean;
 }
-/**
- * Context used when setting a value for Balanced Row Groups
- */
-export interface BalancedGroupsKeyContext<TData = any> extends BaseContext {
-    /**
-     * AdapTable Column being grouped
-     */
-    adaptableColumn: AdaptableColumn<TData>;
-    /**
-     * AG Grid's Key Creator Params
-     */
-    params: KeyCreatorParams<TData>;
-}

package/src/AdaptableOptions/StateOptions.d.ts

@@ -34,7 +34,7 @@ export interface StateOptions {
      */
     debounceStateDelay?: number;
     /**
-     * Automatically migrate the state from the previous version of Adaptable to the current version.
+     * Automatically migrate State from previous AdapTable version to current one
      *
      * @defaultValue true
      */

package/src/Api/ColumnApi.d.ts

@@ -271,4 +271,8 @@ export interface ColumnApi {
      * @param columnType the columnType to filter by
      */
     getColumnsByColumnType(columnType: string): AdaptableColumn[];
+    /**
+     * Returns all columns currently Row Grouped
+     */
+    getRowGroupedColumns(): AdaptableColumn[];
 }

package/src/Api/CommentApi.d.ts

@@ -24,34 +24,33 @@ export interface CommentApi {
      */
     deleteComment(comment: AdaptableComment, cellAddress: CellAddress): void;
     /**
-     * Get Comments for a particular cell
-     * @param CellAddress
+     * Create a new Comment Thread
+     *
+     * @param commentThread
      */
-    getComments(cellAddress: CellAddress): AdaptableComment[];
+    addCommentThread(commentThread: CommentThread): void;
     /**
      *  Delete all Comments for a particular cell
      * @param cellAddress
      */
     deleteCommentThread(cellAddress: CellAddress): void;
     /**
-     * Return all Comments for a particular cell
+     * Return the Comment Thread for a particular cell
      * @param cellAddress
      */
     getCommentThread(cellAddress: CellAddress): CommentThread | undefined;
     /**
-     * Return all Comment Threads
+     * Return all Comment Threads in the grid
      */
-    getCommentThreads(): CommentThread[];
+    getGridComments(): CommentThread[];
     /**
-     * Create a new Comment Thread
+     * Sets the Comment Threads in the grid
      *
-     * @param commentThread
+     * @param commentThreads new cell comments
      */
-    addCommentThread(commentThread: CommentThread): void;
+    setGridComments(commentThreads: CommentThread[]): void;
     /**
-     * Load all Comment Threads
-     *
-     * @param commentThreads new cell comments
+     * Clear all Comment Threads in the grid
      */
-    loadCommentThreads(commentThreads: CommentThread[]): void;
+    clearGridComments(): void;
 }

package/src/Api/GridApi.d.ts

@@ -366,6 +366,10 @@ export interface GridApi {
      * Whether Grid is currently showing Row Groups
      */
     isGridRowGrouped(): boolean;
+    /**
+     * Whether Grid is currently in Pivot Mode
+     */
+    isGridInPivotMode(): boolean;
     /**
      * Whether given Row Node is a Row Group
      * @param rowNode Node to check

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

@@ -67,4 +67,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     openColumnInfoSettingsPanel(): void;
     getColumnTypes(): string[];
     getColumnsByColumnType(columnType: string): AdaptableColumn[];
+    getRowGroupedColumns(): AdaptableColumn[];
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -362,5 +362,12 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
             return ((_a = c.columnTypes) !== null && _a !== void 0 ? _a : []).includes(columnType);
         });
     }
+    getRowGroupedColumns() {
+        var _a;
+        return (_a = this.getLayoutApi()
+            .getCurrentRowGroupsColumnIds()) === null || _a === void 0 ? void 0 : _a.map((n) => {
+            return this.getColumnWithColumnId(n);
+        });
+    }
 }
 exports.ColumnApiImpl = ColumnApiImpl;

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

@@ -6,13 +6,13 @@ import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 export declare class CommentsApiImpl extends ApiBase implements CommentApi {
     internalApi: CommentsInternalApi;
     constructor(adaptable: IAdaptable);
-    getComments(address: CellAddress): AdaptableComment[];
     getCommentThread(address: CellAddress): CommentThread | undefined;
-    getCommentThreads(): CommentThread[];
+    getGridComments(): 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;
-    loadCommentThreads(cellComments: CommentThread[]): void;
+    setGridComments(cellComments: CommentThread[]): void;
+    clearGridComments(): void;
 }

package/src/Api/Implementation/CommentsApiImpl.js

@@ -12,13 +12,10 @@ class CommentsApiImpl extends ApiBase_1.ApiBase {
         super(adaptable);
         this.internalApi = new CommentsInternalApi_1.CommentsInternalApi(adaptable);
     }
-    getComments(address) {
-        return CommentRedux.GetCommentsSelector(this.getAdaptableState().Comment, address);
-    }
     getCommentThread(address) {
         return CommentRedux.GetCellCommentSelector(this.getAdaptableState().Comment, address);
     }
-    getCommentThreads() {
+    getGridComments() {
         var _a;
         return (_a = this.getAdaptableState().Comment.CommentThreads) !== null && _a !== void 0 ? _a : [];
     }
@@ -45,8 +42,11 @@ class CommentsApiImpl extends ApiBase_1.ApiBase {
     deleteCommentThread(cellAddress) {
         this.dispatchAction(CommentRedux.CommentsCellDelete({ cellAddress }));
     }
-    loadCommentThreads(cellComments) {
+    setGridComments(cellComments) {
         this.dispatchAction(CommentRedux.CommentsSet({ commentThread: cellComments }));
     }
+    clearGridComments() {
+        this.setGridComments([]);
+    }
 }
 exports.CommentsApiImpl = CommentsApiImpl;

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

@@ -95,6 +95,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     isGridGroupable(): boolean;
     isGridSelectable(): boolean;
     isGridRowGrouped(): boolean;
+    isGridInPivotMode(): boolean;
     isGroupRowNode(rowNode: IRowNode): boolean;
     isQuickFilterAvailable(): boolean;
     redrawGrid(): void;

package/src/Api/Implementation/GridApiImpl.js

@@ -360,6 +360,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     isGridRowGrouped() {
         return this.adaptable.isGridGroupingActive();
     }
+    isGridInPivotMode() {
+        return this.getLayoutApi().isCurrentLayoutPivot();
+    }
     isGroupRowNode(rowNode) {
         return this.adaptable.isGroupRowNode(rowNode);
     }

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

@@ -16,6 +16,7 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
         [key: string]: boolean;
     };
     getCurrentVisibleColumnIds(): string[];
+    getCurrentRowGroupsColumnIds(): string[];
     setLayout(layoutName: string): void;
     getCurrentLayout(): Layout;
     getCurrentLayoutColumnSort(columnId: string): ColumnSort['SortOrder'] | null;

package/src/Api/Implementation/LayoutApiImpl.js

@@ -38,6 +38,9 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
     getCurrentVisibleColumnIds() {
         return this.getCurrentLayout().Columns;
     }
+    getCurrentRowGroupsColumnIds() {
+        return this.getCurrentLayout().RowGroupedColumns;
+    }
     setLayout(layoutName) {
         if (StringExtensions_1.default.IsNotNullOrEmpty(layoutName) &&
             layoutName !== this.getCurrentLayoutName()) {

package/src/Api/LayoutApi.d.ts

@@ -42,6 +42,10 @@ export interface LayoutApi {
      * Retrieves array of visible ColumnIds in current Layout
      */
     getCurrentVisibleColumnIds(): string[];
+    /**
+     * Retrieves array of visible ColumnIds in current Layout
+     */
+    getCurrentRowGroupsColumnIds(): string[];
     /**
      * Retrieves name of current Layout
      */

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

@@ -10,11 +10,11 @@ export type AdaptableContextMenuItemName = (typeof ADAPTABLE_CONTEXT_MENU_ITEMS)
 /**
  * List of Shipped Adaptable Column Menu Items
  */
-export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["calculated-column-edit", "cell-summary-show", "column-filter-bar-hide", "column-filter-bar-show", "column-filter-clear", "column-filter-on-cell-value", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "custom-sort-add", "custom-sort-edit", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "flashing-cell-add", "flashing-cell-delete", "format-column-add", "format-column-edit", "free-text-column-edit", "grid-info-show", "layout-column-caption-change", "layout-column-hide", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-edit", "layout-grid-parent", "layout-select-parent", "layout-select-all", "plus-minus-add", "settings-panel-open", "styled-column-badge-add", "styled-column-badge-edit", "styled-column-gradient-add", "styled-column-gradient-edit", "styled-column-percent-bar-add", "styled-column-percent-bar-edit", "styled-column-sparkline-add", "styled-column-sparkline-edit", "system-status-show", "internal", "parent"];
+export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["calculated-column-edit", "cell-summary-show", "column-filter-parent", "column-filter-bar-hide", "column-filter-bar-show", "column-filter-clear", "column-filter-on-cell-value", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "custom-sort-add", "custom-sort-edit", "dashboard-parent", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "flashing-cell-add", "flashing-cell-delete", "format-column-parent", "format-column-add", "format-column-edit", "free-text-column-edit", "grid-info-show", "layout-column-caption-change", "layout-column-hide", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-edit", "layout-grid-parent", "layout-select-parent", "layout-select-all", "plus-minus-add", "settings-panel-open", "styled-column-parent", "styled-column-badge-add", "styled-column-badge-edit", "styled-column-gradient-add", "styled-column-gradient-edit", "styled-column-percent-bar-add", "styled-column-percent-bar-edit", "styled-column-sparkline-add", "styled-column-sparkline-edit", "system-status-show", "internal"];
 /**
  * List of Shipped Adaptable Context Menu Items
  */
-export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-filter-on-cell-value", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "export-clipboard", "export-csv", "export-excel", "export-json", "export-table", "export-custom-destination", "fdc3-broadcast", "fdc3-raise-intent", "flashing-cell-clear", "flashing-row-clear", "grid-info-show", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-edit", "layout-select-all", "note-add", "note-remove", "settings-panel-open", "smart-edit-apply", "system-status-show"];
+export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-filter-parent", "column-filter-on-cell-value", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "dashboard-parent", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "export-parent", "export-clipboard", "export-csv", "export-excel", "export-json", "export-table", "export-custom-destination", "fdc3-parent", "fdc3-broadcast", "fdc3-raise-intent", "flashing-cell-clear", "flashing-row-clear", "grid-info-show", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-edit", "layout-select-all", "note-add", "note-remove", "settings-panel-open", "smart-edit-apply", "system-status-show"];
 /**
  * Menu item used by Adaptable in both Column and Context Menus
  */

package/src/PredefinedConfig/Common/Menu.js

@@ -7,6 +7,7 @@ exports.ADAPTABLE_CONTEXT_MENU_ITEMS = exports.ADAPTABLE_COLUMN_MENU_ITEMS = voi
 exports.ADAPTABLE_COLUMN_MENU_ITEMS = [
     'calculated-column-edit',
     'cell-summary-show',
+    'column-filter-parent',
     'column-filter-bar-hide',
     'column-filter-bar-show',
     'column-filter-clear',
@@ -16,6 +17,7 @@ exports.ADAPTABLE_COLUMN_MENU_ITEMS = [
     'column-info-show',
     'custom-sort-add',
     'custom-sort-edit',
+    'dashboard-parent',
     'dashboard-collapse',
     'dashboard-configure',
     'dashboard-dock',
@@ -26,6 +28,7 @@ exports.ADAPTABLE_COLUMN_MENU_ITEMS = [
     'data-import',
     'flashing-cell-add',
     'flashing-cell-delete',
+    'format-column-parent',
     'format-column-add',
     'format-column-edit',
     'free-text-column-edit',
@@ -41,6 +44,7 @@ exports.ADAPTABLE_COLUMN_MENU_ITEMS = [
     'layout-select-all',
     'plus-minus-add',
     'settings-panel-open',
+    'styled-column-parent',
     'styled-column-badge-add',
     'styled-column-badge-edit',
     'styled-column-gradient-add',
@@ -50,8 +54,7 @@ exports.ADAPTABLE_COLUMN_MENU_ITEMS = [
     'styled-column-sparkline-add',
     'styled-column-sparkline-edit',
     'system-status-show',
-    'internal',
-    'parent',
+    'internal', // used by AdapTable in Settings Panel
 ];
 /**
  * List of Shipped Adaptable Context Menu Items
@@ -61,6 +64,7 @@ exports.ADAPTABLE_CONTEXT_MENU_ITEMS = [
     'bulk-update-apply',
     'calculated-column-edit',
     'cell-summary-show',
+    'column-filter-parent',
     'column-filter-on-cell-value',
     'column-filter-clear',
     'column-filter-suspend',
@@ -68,6 +72,7 @@ exports.ADAPTABLE_CONTEXT_MENU_ITEMS = [
     'column-info-show',
     'comment-add',
     'comment-remove',
+    'dashboard-parent',
     'dashboard-collapse',
     'dashboard-configure',
     'dashboard-dock',
@@ -76,12 +81,14 @@ exports.ADAPTABLE_CONTEXT_MENU_ITEMS = [
     'dashboard-hide',
     'dashboard-show',
     'data-import',
+    'export-parent',
     'export-clipboard',
     'export-csv',
     'export-excel',
     'export-json',
     'export-table',
     'export-custom-destination',
+    'fdc3-parent',
     'fdc3-broadcast',
     'fdc3-raise-intent',
     'flashing-cell-clear',

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

@@ -71,9 +71,5 @@ export declare const CommentsDelete: ({ commentUuid, cellAddress, }: {
     commentUuid: AdaptableComment['Uuid'];
     cellAddress: CellAddress;
 }) => AdaptableCommentsDeleteAction;
-export declare const CommentsReady: (commentstate: CommentState) => NoteReadyAction;
-export declare const GetGridCellCommentsSelector: (state: CommentState, address: CellAddress) => CommentThread;
-export declare const GetCommentsSelector: (state: CommentState, address: CellAddress) => AdaptableComment[] | undefined;
-export declare const GetGetCommentsByUuidSelector: (state: CommentState, uuid: string) => AdaptableComment | undefined;
 export declare const GetCellCommentSelector: (state: CommentState, address: CellAddress) => CommentThread | undefined;
 export declare const CommentsReducer: Redux.Reducer<CommentState>;

package/src/Redux/ActionsReducers/CommentsRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommentsReducer = exports.GetCellCommentSelector = exports.GetGetCommentsByUuidSelector = exports.GetCommentsSelector = exports.GetGridCellCommentsSelector = exports.CommentsReady = exports.CommentsDelete = exports.CommentsEdit = exports.CommentsCellDelete = exports.CommentsCellAdd = exports.CommentsAdd = exports.CommentsSet = exports.COMMENTS_LOAD = exports.COMMENTS_READY = exports.COMMENTS_DELETE = exports.COMMENTS_EDIT = exports.COMMENTS_CELL_DELETE = exports.COMMENTS_CELL_ADD = exports.COMMENTS_ADD = void 0;
+exports.CommentsReducer = exports.GetCellCommentSelector = exports.CommentsDelete = exports.CommentsEdit = exports.CommentsCellDelete = exports.CommentsCellAdd = exports.CommentsAdd = exports.CommentsSet = exports.COMMENTS_LOAD = exports.COMMENTS_READY = exports.COMMENTS_DELETE = exports.COMMENTS_EDIT = exports.COMMENTS_CELL_DELETE = exports.COMMENTS_CELL_ADD = exports.COMMENTS_ADD = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
@@ -63,44 +63,6 @@ const CommentsDelete = ({ commentUuid, cellAddress, }) => ({
     commentUuid,
 });
 exports.CommentsDelete = CommentsDelete;
-const CommentsReady = (commentstate) => ({
-    type: exports.COMMENTS_READY,
-    commentState: commentstate,
-});
-exports.CommentsReady = CommentsReady;
-const GetGridCellCommentsSelector = (state, address) => {
-    var _a;
-    if (!address) {
-        return null;
-    }
-    return ((_a = state === null || state === void 0 ? void 0 : state.CommentThreads) !== null && _a !== void 0 ? _a : []).find((cellComments) => {
-        return CellPopupService_1.CellPopupService.isSameAddress(cellComments, address);
-    });
-};
-exports.GetGridCellCommentsSelector = GetGridCellCommentsSelector;
-const GetCommentsSelector = (state, address) => {
-    var _a, _b;
-    if (!address) {
-        return [];
-    }
-    const comments = (_b = ((_a = state === null || state === void 0 ? void 0 : state.CommentThreads) !== null && _a !== void 0 ? _a : []).find((cellComments) => {
-        return CellPopupService_1.CellPopupService.isSameAddress(cellComments, address);
-    })) === null || _b === void 0 ? void 0 : _b.Comments;
-    return comments;
-};
-exports.GetCommentsSelector = GetCommentsSelector;
-const GetGetCommentsByUuidSelector = (state, uuid) => {
-    var _a;
-    for (const commentThread of (_a = state.CommentThreads) !== null && _a !== void 0 ? _a : []) {
-        for (const comment of commentThread.Comments) {
-            if (comment.Uuid === uuid) {
-                return comment;
-            }
-        }
-    }
-    return undefined;
-};
-exports.GetGetCommentsByUuidSelector = GetGetCommentsByUuidSelector;
 const GetCellCommentSelector = (state, address) => {
     var _a;
     if (!address) {

package/src/Redux/Store/AdaptableStore.js

@@ -913,8 +913,8 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         adaptable.refreshCells([node], [columnId], true);
                         requestAnimationFrame(() => {
                             var _a, _b;
-                            const commentThreads = adaptable.api.commentApi.getCommentThreads();
-                            adaptable.api.eventApi.emit('CommentChanged', adaptable.api.commentApi.getCommentThreads());
+                            const commentThreads = adaptable.api.commentApi.getGridComments();
+                            adaptable.api.eventApi.emit('CommentChanged', adaptable.api.commentApi.getGridComments());
                             (_b = (_a = adaptable.api.optionsApi
                                 .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.persistCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, commentThreads);
                         });
@@ -922,9 +922,9 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     return returnAction;
                 }
                 case CommentsRedux.COMMENTS_LOAD: {
-                    const previousCommentThreads = adaptable.api.commentApi.getCommentThreads();
+                    const previousCommentThreads = adaptable.api.commentApi.getGridComments();
                     let returnAction = next(action);
-                    const newCommentThreads = (_j = adaptable.api.commentApi.getCommentThreads()) !== null && _j !== void 0 ? _j : [];
+                    const newCommentThreads = (_j = adaptable.api.commentApi.getGridComments()) !== null && _j !== void 0 ? _j : [];
                     requestAnimationFrame(() => {
                         let addedCommentThreads = [];
                         let deletedCommentThreads = [];

package/src/Strategy/ColumnFilterModule.js

@@ -67,7 +67,7 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (ArrayExtensions_1.default.IsNotNullOrEmpty(filterSubMenuItems)) {
                 return [
                     {
-                        name: 'parent',
+                        name: 'column-filter-parent',
                         label: this.moduleInfo.FriendlyName,
                         isVisible: true,
                         module: this.moduleInfo.ModuleName,
@@ -115,7 +115,7 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         }));
                     return [
                         {
-                            name: 'parent',
+                            name: 'column-filter-parent',
                             label: this.moduleInfo.FriendlyName,
                             isVisible: true,
                             module: this.moduleInfo.ModuleName,

package/src/Strategy/CommentModule.d.ts

@@ -3,7 +3,6 @@ import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Commo
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 export declare class CommentModule extends AdaptableModuleBase implements IModule {
-    private adaptable;
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
     isModuleAvailable(): boolean;

package/src/Strategy/CommentModule.js

@@ -26,7 +26,7 @@ class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         var _a, _b;
         const commentThreads = await ((_b = (_a = this.api.optionsApi
             .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.loadCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, (0, ObjectFactory_1.createBaseContext)(this.api)));
-        this.api.commentApi.loadCommentThreads(commentThreads);
+        this.api.commentApi.setGridComments(commentThreads);
     }
     addContextMenuItems(menuContext) {
         var _a, _b;
@@ -42,17 +42,17 @@ class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return items;
     }
     getAddRemoveCommentsMenuItems(menuContext) {
+        var _a;
         const items = [];
-        // does not have note
+        if (!this.api.commentApi.internalApi.areCommentsAvailable()) {
+            return items;
+        }
         const cellAddress = {
             PrimaryKeyValue: menuContext.primaryKeyValue,
             ColumnId: menuContext.adaptableColumn.columnId,
         };
-        const comments = this.api.commentApi.getComments(cellAddress);
-        if (!this.api.commentApi.internalApi.areCommentsAvailable()) {
-            return items;
-        }
-        if (comments) {
+        const cellComments = (_a = this.api.commentApi.getCommentThread(cellAddress)) === null || _a === void 0 ? void 0 : _a.Comments;
+        if (cellComments) {
             items.push(this.createMenuItemClickFunction('comment-remove', 'Remove Comment', this.moduleInfo.Glyph, () => {
                 this.api.commentApi.deleteCommentThread(cellAddress);
             }));

package/src/Strategy/DashboardModule.js

@@ -53,7 +53,7 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             return [
                 {
-                    name: 'parent',
+                    name: 'dashboard-parent',
                     label: this.moduleInfo.FriendlyName,
                     isVisible: true,
                     module: this.moduleInfo.ModuleName,

package/src/Strategy/ExportModule.js

@@ -99,7 +99,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     buildExportMenuItem(label, subItems) {
         return {
-            name: 'parent',
+            name: 'export-parent',
             label: label,
             module: this.moduleInfo.ModuleName,
             isVisible: true,

package/src/Strategy/Fdc3Module.js

@@ -31,7 +31,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
             contextMenuItems.sort((a, b) => a.label.localeCompare(b.label));
             if (contextMenuItems.length > 1) {
                 const groupMenuItem = {
-                    name: 'parent',
+                    name: 'fdc3-parent',
                     module: this.moduleInfo.ModuleName,
                     label: 'FDC3',
                     icon: {

package/src/Strategy/FormatColumnModule.js

@@ -66,7 +66,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 };
                 const editFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
                 returnColumnMenuItems.push({
-                    name: 'parent',
+                    name: 'format-column-parent',
                     label: 'Format Column',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,
@@ -83,7 +83,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     .getModuleInfoByModule('FormatColumn');
                 const editFormatColumnMenuItem = this.createMenuItemReduxAction('format-column-edit', 'Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
                 returnColumnMenuItems.push({
-                    name: 'parent',
+                    name: 'format-column-parent',
                     label: 'Format Column',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,

package/src/Strategy/StyledColumnModule.js

@@ -121,7 +121,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                                     defaultCurrentSectionName: 'Style',
                                 } }));
                             returnColumnMenuItems.push({
-                                name: 'parent',
+                                name: 'styled-column-parent',
                                 label: 'Create Styled Column',
                                 module: this.moduleInfo.ModuleName,
                                 isVisible: true,

package/src/View/Comments/CommentsEditor.js

@@ -66,13 +66,11 @@ const CommentsEditor = (props) => {
                 const isOwnComment = ((_a = comment === null || comment === void 0 ? void 0 : comment.Author) === null || _a === void 0 ? void 0 : _a.UserName)
                     ? ((_b = comment === null || comment === void 0 ? void 0 : comment.Author) === null || _b === void 0 ? void 0 : _b.UserName) === userId
                     : true; // no owner means it's the current user
-                return (React.createElement(rebass_1.Box, { p: 2, key: (_c = comment.Uuid) !== null && _c !== void 0 ? _c : index, style: {
-                        borderBottom: '1px solid var(--ab-color-primarydark)',
-                    } },
+                return (React.createElement(rebass_1.Box, { p: 2, key: (_c = comment.Uuid) !== null && _c !== void 0 ? _c : index, className: "ab-Comment" },
                     React.createElement(rebass_1.Flex, { mb: 2, alignItems: "center" },
                         React.createElement(rebass_1.Box, null,
-                            React.createElement(rebass_1.Box, { fontSize: 3, fontWeight: "bold" }, (_d = comment === null || comment === void 0 ? void 0 : comment.Author) === null || _d === void 0 ? void 0 : _d.UserName),
-                            comment.Timestamp && (React.createElement(rebass_1.Box, { fontSize: 2 }, (0, dateUtils_1.formatDate)(comment.Timestamp, 'MM.DD.YYYY HH:mm')))),
+                            React.createElement(rebass_1.Box, { "data-name": "comment-username", fontSize: 3, fontWeight: "bold" }, (_d = comment === null || comment === void 0 ? void 0 : comment.Author) === null || _d === void 0 ? void 0 : _d.UserName),
+                            comment.Timestamp && (React.createElement(rebass_1.Box, { "data-name": "comment-timestamp", fontSize: 2 }, (0, dateUtils_1.formatDate)(comment.Timestamp, 'MM.DD.YYYY HH:mm')))),
                         React.createElement(rebass_1.Box, { flex: 1 }),
                         React.createElement(SimpleButton_1.default, { variant: "text", icon: "edit", disabled: !isOwnComment || isReadOnlyModule, onClick: () => setActiveEditingComment(comment.Uuid) }),
                         React.createElement(SimpleButton_1.default, { variant: "text", icon: "delete", disabled: !isOwnComment || isReadOnlyModule, onClick: () => {
@@ -87,7 +85,7 @@ const CommentsEditor = (props) => {
                             }
                         }, onChange: (event) => {
                             adaptable.api.commentApi.editComment(Object.assign(Object.assign({}, comment), { Value: event.target.value }), cellAddress);
-                        } })) : (React.createElement(rebass_1.Text, null, comment.Value)))));
+                        } })) : (React.createElement(rebass_1.Text, { "data-name": "comment-text" }, comment.Value)))));
             })),
         React.createElement(AdaptableInput_1.default, { autoFocus: !comments || comments.length === 0, value: newCommentText, disabled: isReadOnlyModule, onChange: (event) => {
                 setNewCommentText(event.target.value);

package/src/View/Components/Popups/AdaptablePopup/useMenuItems.js

@@ -24,7 +24,7 @@ const useMenuItems = () => {
             item.module !== 'CustomSettingsPanel' &&
             !DefaultSettingsPanel_1.STANDALONE_MODULE_POPUPS.includes(item.module) &&
             item.isVisible);
-        return navigationItems
+        let navItems = navigationItems
             .map((moduleName) => {
             var _a, _b;
             if (moduleName === '-') {
@@ -44,6 +44,14 @@ const useMenuItems = () => {
             return customPanelMenuItem || visibleItems.find((item) => item.module === moduleName);
         })
             .filter(Boolean);
+        // remove sequential '-' items
+        navItems = navItems.filter((item, index) => {
+            if (item === '-' && navItems[index - 1] === '-') {
+                return false;
+            }
+            return true;
+        });
+        return navItems;
     }, [allMenuItems]);
 };
 exports.useMenuItems = useMenuItems;

package/src/View/Layout/Wizard/sections/FilterSection.js

@@ -58,7 +58,7 @@ const FilterSection = (props) => {
         React.createElement(Tabs_1.Tabs.Content, null,
             React.createElement(FormLayout_1.default, { mb: 2 },
                 React.createElement(FormLayout_1.FormRow, { label: "Add Column Filter" },
-                    React.createElement(ColumnSelector_1.ColumnSelector, { filterColumn: (column) => column.filterable && !layoutFilters.some((f) => f.ColumnId === column.columnId), placeholder: "Select column to create filter", onChange: (option) => {
+                    React.createElement(ColumnSelector_1.ColumnSelector, { filterColumn: (column) => column.filterable && !layoutFilters.some((f) => f.ColumnId === column.columnId), placeholder: "Select Column to create Filter", onChange: (option) => {
                             props.onChange(Object.assign(Object.assign({}, layout), { ColumnFilters: [
                                     ...layoutFilters,
                                     {