@adaptabletools/adaptable 18.0.0-canary.21 → 18.0.0-canary.23

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,13 +1,7 @@
-import { AdaptableColumn, BaseContext } from '../../types';
-import { KeyCreatorParams } from '@ag-grid-community/core';
 /**
  * Options for managing Row and Column Groups in AdapTable
  */
 export interface GroupingOptions<TData = any> {
-    /**
-    * Value to use for 'Balanced Groups' (string columns only)
-    */
-    balancedGroupsKey?: string | ((context: BalancedGroupsKeyContext<TData>) => string);
     /**
      * Places ungrouped columns at pre-grouping indexed position
      * @defaultValue false
@@ -23,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/NoteOptions.d.ts

@@ -7,13 +7,19 @@ export interface NoteOptions<TData = any> {
      * Whether a cell can contain Notes
      */
     isCellNotable?: (context: NotableCellContext) => boolean;
+    /**
+     * Format string for formatting in the Notes Popup
+     *
+     * @defaultValue 'dd-MM-yyyy HH:mm:ss'
+     */
+    dateFormat?: string;
 }
 /**
  * Context used when determining if a Note can be added to a Cell
  */
 export interface NotableCellContext extends BaseContext {
     /**
-      * Grid Cell in AdapTable which has been clicked
-      */
+     * Grid Cell in AdapTable which has been clicked
+     */
     gridCell: GridCell;
 }

package/src/Api/ColumnApi.d.ts

@@ -266,4 +266,9 @@ export interface ColumnApi {
      * Returns available columns types defined under columnOptions.columnTypes
      */
     getColumnTypes(): string[];
+    /**
+     * Returns all columns of a given columnType
+     * @param columnType the columnType to filter by
+     */
+    getColumnsByColumnType(columnType: string): 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/Implementation/ColumnApiImpl.d.ts

@@ -3,6 +3,8 @@ import { AdaptableColumn, AdaptableColumnDataType } from '../../PredefinedConfig
 import { ColumnApi } from '../ColumnApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ColumnInternalApi } from '../Internal/ColumnInternalApi';
+export declare function isAutoRowGroupColumn(columnId: string): boolean;
+export declare function isAutoPivotColumn(columnId: string): boolean;
 export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     internalApi: ColumnInternalApi;
     constructor(adaptable: IAdaptable);
@@ -64,4 +66,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     isSpecialColumn(columnId: string): boolean;
     openColumnInfoSettingsPanel(): void;
     getColumnTypes(): string[];
+    getColumnsByColumnType(columnType: string): AdaptableColumn[];
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -4,6 +4,16 @@ import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { ColumnInternalApi } from '../Internal/ColumnInternalApi';
 import { createBaseContext } from '../../Utilities/ObjectFactory';
+export function isAutoRowGroupColumn(columnId) {
+    // put this here as there might be other indicators we are not aware of
+    // perhaps with non auto groups ?
+    //https://www.ag-grid.com/javascript-grid-grouping/
+    return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants.AG_GRID_GROUPED_COLUMN);
+}
+export function isAutoPivotColumn(columnId) {
+    // put this here as there might be other indicators we are not aware of?
+    return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants.AG_GRID_PIVOT_COLUMN);
+}
 export class ColumnApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -52,14 +62,10 @@ export class ColumnApiImpl extends ApiBase {
         this.adaptable.showColumn(columnId);
     }
     isAutoRowGroupColumn(columnId) {
-        // put this here as there might be other indicators we are not aware of
-        // perhaps with non auto groups ?
-        //https://www.ag-grid.com/javascript-grid-grouping/
-        return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants.AG_GRID_GROUPED_COLUMN);
+        return isAutoRowGroupColumn(columnId);
     }
     isAutoPivotColumn(columnId) {
-        // put this here as there might be other indicators we are not aware of?
-        return columnId === null || columnId === void 0 ? void 0 : columnId.startsWith(GeneralConstants.AG_GRID_PIVOT_COLUMN);
+        return isAutoPivotColumn(columnId);
     }
     isCalculatedColumn(columnId) {
         return (this.adaptable.api.calculatedColumnApi
@@ -343,4 +349,11 @@ export class ColumnApiImpl extends ApiBase {
             return columnTypes;
         }
     }
+    getColumnsByColumnType(columnType) {
+        const abColumns = this.getColumns();
+        return abColumns.filter((c) => {
+            var _a;
+            return ((_a = c.columnTypes) !== null && _a !== void 0 ? _a : []).includes(columnType);
+        });
+    }
 }

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

@@ -8,13 +8,10 @@ export class CommentsApiImpl extends ApiBase {
         super(adaptable);
         this.internalApi = new 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 : [];
     }
@@ -41,7 +38,10 @@ export class CommentsApiImpl extends ApiBase {
     deleteCommentThread(cellAddress) {
         this.dispatchAction(CommentRedux.CommentsCellDelete({ cellAddress }));
     }
-    loadCommentThreads(cellComments) {
+    setGridComments(cellComments) {
         this.dispatchAction(CommentRedux.CommentsSet({ commentThread: cellComments }));
     }
+    clearGridComments() {
+        this.setGridComments([]);
+    }
 }

package/src/Api/Implementation/ScopeApiImpl.js

@@ -43,7 +43,9 @@ export class ScopeApiImpl extends ApiBase {
             return 'Columns: All';
         }
         if ('ColumnTypes' in scope) {
-            return ((scope.ColumnTypes.length > 0 ? 'ColumnTypes' : 'ColumnType') + ': ' + scope.ColumnTypes.join(', '));
+            return ((scope.ColumnTypes.length > 0 ? 'ColumnTypes' : 'ColumnType') +
+                ': ' +
+                scope.ColumnTypes.join(', '));
         }
         if ('DataTypes' in scope) {
             return ((scope.DataTypes.length > 0 ? 'DataTypes' : 'DataType') + ': ' + scope.DataTypes.join(', '));
@@ -160,6 +162,7 @@ export class ScopeApiImpl extends 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') {
             return false;
@@ -176,9 +179,14 @@ export class ScopeApiImpl extends ApiBase {
         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); }))) {
+            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') {
             return false;
@@ -195,9 +203,14 @@ export class ScopeApiImpl extends ApiBase {
         if ('DataTypes' in scope && scope.DataTypes.includes('String')) {
             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); }))) {
+            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') {
             return false;
@@ -214,6 +227,10 @@ export class ScopeApiImpl extends ApiBase {
         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); }))) {
+            return true;
+        }
         return false;
     }
     isScopeInScope(a, b) {
@@ -240,6 +257,22 @@ export class ScopeApiImpl extends ApiBase {
             })) {
             return true;
         }
+        if ('ColumnTypes' in a &&
+            'ColumnTypes' in b &&
+            a.ColumnTypes.every((columnType) => b.ColumnTypes.includes(columnType))) {
+            return true;
+        }
+        // check if each colum in a has column types in b
+        if ('ColumnIds' in a && 'ColumnTypes' in b) {
+            const inScope = a.ColumnIds.every((columnId) => {
+                const column = this.adaptable.api.columnApi.getColumnWithColumnId(columnId);
+                // check if at least one column-type is in scope
+                return column.columnTypes.some((columnColumnType) => b.ColumnTypes.includes(columnColumnType));
+            });
+            if (inScope) {
+                return true;
+            }
+        }
         return false;
     }
     createCellColorRangesForScope(scope) {

package/src/Api/Internal/ColumnInternalApi.d.ts

@@ -2,6 +2,7 @@ import { ApiBase } from '../Implementation/ApiBase';
 import { Column, IRowNode } from '@ag-grid-community/core';
 import { CustomSort } from '../../PredefinedConfig/CustomSortState';
 import { ColumnValuesComparer } from '../../AdaptableOptions/CustomSortOptions';
+export declare function getAutoRowGroupColumnIdFor(columnId: string): string;
 export declare class ColumnInternalApi extends ApiBase {
     /**
      * Retrieves 'ColumnType' property for a given Column
@@ -15,6 +16,7 @@ export declare class ColumnInternalApi extends ApiBase {
      * Retrieves a list providing the Friendly Name / Caption for all columns
      */
     getAllColumnFriendlyNames(): string[];
+    getAutoRowGroupColumnIdFor(columnId: string): string;
     /**
      * Retrieves AG Grid's field property for the column
      * @param columnId columnId to look up

package/src/Api/Internal/ColumnInternalApi.js

@@ -1,5 +1,8 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { ADAPTABLE_ROW_ACTION_BUTTONS } from '../../Utilities/Constants/GeneralConstants';
+import { ADAPTABLE_ROW_ACTION_BUTTONS, AG_GRID_GROUPED_COLUMN, } from '../../Utilities/Constants/GeneralConstants';
+export function getAutoRowGroupColumnIdFor(columnId) {
+    return `${AG_GRID_GROUPED_COLUMN}-${columnId}`;
+}
 export class ColumnInternalApi extends ApiBase {
     /**
      * Retrieves 'ColumnType' property for a given Column
@@ -21,6 +24,9 @@ export class ColumnInternalApi extends ApiBase {
             return c.friendlyName;
         });
     }
+    getAutoRowGroupColumnIdFor(columnId) {
+        return getAutoRowGroupColumnIdFor(columnId);
+    }
     /**
      * Retrieves AG Grid's field property for the column
      * @param columnId columnId to look up

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

@@ -53,40 +53,6 @@ export const CommentsDelete = ({ commentUuid, cellAddress, }) => ({
     cellAddress,
     commentUuid,
 });
-export const CommentsReady = (commentstate) => ({
-    type: COMMENTS_READY,
-    commentState: commentstate,
-});
-export 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.isSameAddress(cellComments, address);
-    });
-};
-export 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.isSameAddress(cellComments, address);
-    })) === null || _b === void 0 ? void 0 : _b.Comments;
-    return comments;
-};
-export 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;
-};
 export const GetCellCommentSelector = (state, address) => {
     var _a;
     if (!address) {

package/src/Redux/Store/AdaptableStore.js

@@ -906,8 +906,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);
                         });
@@ -915,9 +915,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/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

@@ -22,7 +22,7 @@ export class CommentModule extends 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, createBaseContext(this.api)));
-        this.api.commentApi.loadCommentThreads(commentThreads);
+        this.api.commentApi.setGridComments(commentThreads);
     }
     addContextMenuItems(menuContext) {
         var _a, _b;
@@ -38,17 +38,17 @@ export class CommentModule extends 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/Utilities/Constants/GeneralConstants.d.ts

@@ -35,6 +35,7 @@ export declare const ADAPTABLE_ROW_ACTION_BUTTONS = "adaptableRowActionButtons";
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = "(ActionRowButtons)";
 export declare const ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = "(FDC3ActionColumn)";
 export declare const DEFAULT_DATE_FORMAT_PATTERN = "dd-MM-yyyy";
+export declare const DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME = "dd-MM-yyyy HH:mm:ss";
 export declare const BLANK_DISTINCT_COLUMN_VALUE = "[BLANKS]";
 export declare const DEFAULT_STRING_DISPLAY_VALUE = "Hello World";
 export declare const DEFAULT_INTEGER_DISPLAY_VALUE = 12345;

package/src/Utilities/Constants/GeneralConstants.js

@@ -34,6 +34,7 @@ export const ADAPTABLE_ROW_ACTION_BUTTONS = 'adaptableRowActionButtons';
 export const ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = '(ActionRowButtons)';
 export const ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = '(FDC3ActionColumn)';
 export const DEFAULT_DATE_FORMAT_PATTERN = 'dd-MM-yyyy';
+export const DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME = 'dd-MM-yyyy HH:mm:ss';
 export const BLANK_DISTINCT_COLUMN_VALUE = '[BLANKS]';
 export const DEFAULT_STRING_DISPLAY_VALUE = 'Hello World';
 export const DEFAULT_INTEGER_DISPLAY_VALUE = 12345;

package/src/View/Comments/CommentsEditor.js

@@ -62,13 +62,11 @@ export 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(Box, { p: 2, key: (_c = comment.Uuid) !== null && _c !== void 0 ? _c : index, style: {
-                        borderBottom: '1px solid var(--ab-color-primarydark)',
-                    } },
+                return (React.createElement(Box, { p: 2, key: (_c = comment.Uuid) !== null && _c !== void 0 ? _c : index, className: "ab-Comment" },
                     React.createElement(Flex, { mb: 2, alignItems: "center" },
                         React.createElement(Box, null,
-                            React.createElement(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(Box, { fontSize: 2 }, formatDate(comment.Timestamp, 'MM.DD.YYYY HH:mm')))),
+                            React.createElement(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(Box, { "data-name": "comment-timestamp", fontSize: 2 }, formatDate(comment.Timestamp, 'MM.DD.YYYY HH:mm')))),
                         React.createElement(Box, { flex: 1 }),
                         React.createElement(SimpleButton, { variant: "text", icon: "edit", disabled: !isOwnComment || isReadOnlyModule, onClick: () => setActiveEditingComment(comment.Uuid) }),
                         React.createElement(SimpleButton, { variant: "text", icon: "delete", disabled: !isOwnComment || isReadOnlyModule, onClick: () => {
@@ -83,7 +81,7 @@ export const CommentsEditor = (props) => {
                             }
                         }, onChange: (event) => {
                             adaptable.api.commentApi.editComment(Object.assign(Object.assign({}, comment), { Value: event.target.value }), cellAddress);
-                        } })) : (React.createElement(Text, null, comment.Value)))));
+                        } })) : (React.createElement(Text, { "data-name": "comment-text" }, comment.Value)))));
             })),
         React.createElement(AdaptableInput, { autoFocus: !comments || comments.length === 0, value: newCommentText, disabled: isReadOnlyModule, onChange: (event) => {
                 setNewCommentText(event.target.value);

package/src/View/Comments/CommentsPopup.js

@@ -3,10 +3,11 @@ import { useSelector } from 'react-redux';
 import { DataSource, InfiniteTable } from '../../components/InfiniteTable';
 import Panel from '../../components/Panel';
 import { Box, Flex } from 'rebass';
-import { formatDate } from '../../Utilities/ExpressionFunctions/dateUtils';
+import dateFnsFormat from 'date-fns/format';
 import { useAdaptable } from '../AdaptableContext';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
 import { AdaptableButtonComponent } from '../Components/AdaptableButton';
+import { DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME } from '../../Utilities/Constants/GeneralConstants';
 const tableDOMProps = {
     style: {
         minHeight: 160,
@@ -14,7 +15,9 @@ const tableDOMProps = {
     },
 };
 const CellComments = (props) => {
+    var _a;
     const adaptable = useAdaptable();
+    const dateFormat = (_a = adaptable.api.optionsApi.getCommentOptions().dateFormat) !== null && _a !== void 0 ? _a : DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME;
     const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Comment') === 'ReadOnly';
     const columnsMap = React.useMemo(() => {
         const columns = {
@@ -27,7 +30,7 @@ const CellComments = (props) => {
                 field: 'Timestamp',
                 maxWidth: 150,
                 valueGetter: (params) => {
-                    return formatDate(params.data.Timestamp, 'MM.DD.YYYY HH:mm');
+                    return dateFnsFormat(params.data.Timestamp, dateFormat);
                 },
             },
             text: {

package/src/View/Components/CellPopup/index.js

@@ -13,7 +13,7 @@ const ensurePortalElement = (className) => {
     }
     portalElement = document.createElement('div');
     portalElement.style.position = 'absolute';
-    portalElement.style.zIndex = '999';
+    portalElement.style.zIndex = '4'; // under the context menu
     portalElement.style.top = '0px';
     portalElement.style.left = '0px';
     if (className) {

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

@@ -20,7 +20,7 @@ export const useMenuItems = () => {
             item.module !== 'CustomSettingsPanel' &&
             !STANDALONE_MODULE_POPUPS.includes(item.module) &&
             item.isVisible);
-        return navigationItems
+        let navItems = navigationItems
             .map((moduleName) => {
             var _a, _b;
             if (moduleName === '-') {
@@ -40,5 +40,13 @@ export 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]);
 };

package/src/View/DataImport/DataImportWizard/DataImportWizard.js

@@ -132,7 +132,7 @@ export const DataImportWizard = (props) => {
         return [...userDefinedHandlers, ...systemFileHandlers];
     }, []);
     const supportedFileFormats = React.useMemo(() => {
-        return fileHandlers.map((h) => h.fileExtension).join(', ');
+        return [...new Set(fileHandlers.map((h) => h.fileExtension)).values()].join(', ');
     }, [fileHandlers]);
     const readFile = React.useCallback(async (file) => {
         var _a, _b;