@adaptabletools/adaptable 16.0.9 → 16.1.0-canary.0

package/src/View/{Comments/CommentListing.js → Notes/NotesListing.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommentsListing = void 0;
+exports.NotesListing = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
 const InfiniteTable_1 = require("../../components/InfiniteTable");
-const CommentsRedux_1 = require("../../Redux/ActionsReducers/CommentsRedux");
+const NotesRedux_1 = require("../../Redux/ActionsReducers/NotesRedux");
 const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
 const tableDOMProps = {
@@ -16,11 +16,10 @@ const tableDOMProps = {
         minHeight: 600,
     },
 };
-const CommentsListing = () => {
+const NotesListing = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const primaryKeyHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
-    const columnHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
-    const allComments = (0, react_redux_1.useSelector)((state) => (0, CommentsRedux_1.GetCommentsSelector)(state.Comments));
+    const allNotes = (0, react_redux_1.useSelector)((state) => (0, NotesRedux_1.GetNotesSelector)(state.Notes));
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -33,9 +32,9 @@ const CommentsListing = () => {
                     return adaptable.api.columnApi.getFriendlyNameForColumnId(params.data.ColumnId);
                 },
             },
-            comment: {
+            note: {
                 field: 'Value',
-                header: 'Comment',
+                header: 'Note',
                 defaultEditable: true,
                 defaultFlex: 3,
             },
@@ -53,8 +52,8 @@ const CommentsListing = () => {
                 defaultWidth: 50,
                 render: (params) => {
                     return (React.createElement(AdaptableButton_1.AdaptableButtonComponent, { variant: "text", icon: "delete", onClick: () => {
-                            const comment = adaptable.api.commentsApi.getCommentByUuid(params.data.Uuid);
-                            adaptable.api.commentsApi.deleteComment(comment);
+                            const note = adaptable.api.notesApi.getNoteByUuid(params.data.Uuid);
+                            adaptable.api.notesApi.deleteNote(note);
                         } }));
                 },
             },
@@ -62,15 +61,15 @@ const CommentsListing = () => {
         return columns;
     }, []);
     return (React.createElement(rebass_1.Box, { p: 2, style: { height: '100%', width: '100%' } },
-        React.createElement(InfiniteTable_1.DataSource, { data: allComments, primaryKey: "Uuid", onDataMutations: (params) => {
+        React.createElement(InfiniteTable_1.DataSource, { data: allNotes, primaryKey: "Uuid", onDataMutations: (params) => {
                 for (const mutation of params.mutations) {
                     const [uuid, changes] = mutation;
                     for (const change of changes) {
                         if (change.type === 'update') {
                             const data = change.data;
-                            const prevComment = allComments.find((x) => x.Uuid === uuid);
-                            if (prevComment.Value !== data.Value) {
-                                adaptable.api.commentsApi.updateCommentText(data.Value, prevComment);
+                            const prevNote = allNotes.find((x) => x.Uuid === uuid);
+                            if (prevNote.Value !== data.Value) {
+                                adaptable.api.notesApi.updateNoteText(data.Value, prevNote);
                             }
                         }
                     }
@@ -86,4 +85,4 @@ const CommentsListing = () => {
                     alwaysReserveSpaceForSortIcon: false,
                 }, rowHeight: 40, columnHeaderHeight: 65, domProps: tableDOMProps, columns: columnsMap }))));
 };
-exports.CommentsListing = CommentsListing;
+exports.NotesListing = NotesListing;

package/src/View/Notes/NotesPopup.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const NotePopup: () => JSX.Element;

package/src/View/{Comments/CommentPopup.js → Notes/NotesPopup.js}

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommentPopup = void 0;
+exports.NotePopup = void 0;
 const tslib_1 = require("tslib");
 const lodash_1 = require("lodash");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
 const Textarea_1 = tslib_1.__importDefault(require("../../components/Textarea"));
-const CommentsRedux_1 = require("../../Redux/ActionsReducers/CommentsRedux");
+const NotesRedux_1 = require("../../Redux/ActionsReducers/NotesRedux");
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const AdaptableContext_1 = require("../AdaptableContext");
 const CellPopup_1 = require("../Components/CellPopup");
-const CommentEditor = ({ comment, onCommentChange, onClose, editMode, isReadonly }) => {
+const NoteEditor = ({ note, onNoteChange, onClose, editMode, isReadonly }) => {
     const textAreaRef = React.useRef(null);
-    const [liveValue, setLiveValue] = React.useState(comment || '');
+    const [liveValue, setLiveValue] = React.useState(note || '');
     const throttledOnChange = React.useMemo(() => {
-        const throttled = (0, lodash_1.throttle)((value) => onCommentChange(value), 300);
+        const throttled = (0, lodash_1.throttle)((value) => onNoteChange(value), 300);
         return (value) => {
             setLiveValue(value);
             throttled(value);
@@ -33,33 +33,33 @@ const CommentEditor = ({ comment, onCommentChange, onClose, editMode, isReadonly
             }
         }, onChange: (event) => throttledOnChange(event.target.value) }));
 };
-const CommentPopup = () => {
+const NotePopup = () => {
     var _a;
     const { api } = (0, AdaptableContext_1.useAdaptable)();
     const cellPopupRef = React.useRef(null);
-    const editMode = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsEditModeSelector)(state.System));
-    const commentGridCell = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsSelector)(state.System));
+    const editMode = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemNotesEditModeSelector)(state.System));
+    const noteGridCell = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemNotesSelector)(state.System));
     const [
-    // Only handle first comment for now
-    // Later we can handle multiple comments
-    comment,] = (0, react_redux_1.useSelector)((state) => {
-        return commentGridCell ? (0, CommentsRedux_1.GetCommentsSelector)(state.Comments, commentGridCell) : [];
+    // Only handle first note for now
+    // Later we can handle multiple notes
+    note,] = (0, react_redux_1.useSelector)((state) => {
+        return noteGridCell ? (0, NotesRedux_1.GetNotesSelector)(state.Notes, noteGridCell) : [];
     });
-    const handleCommentChange = (value) => {
-        api.commentsApi.updateCommentText(value, comment);
+    const handleNoteChange = (value) => {
+        api.notesApi.updateNoteText(value, note);
     };
-    const isReadonly = api.entitlementApi.isModuleReadOnlyEntitlement('Comments');
+    const isReadonly = api.entitlementApi.isModuleReadOnlyEntitlement('Notes');
     const enableEditMode = () => {
         if (!editMode) {
-            api.commentsApi.showComment(commentGridCell, true);
+            api.notesApi.showNotes(noteGridCell, true);
             cellPopupRef === null || cellPopupRef === void 0 ? void 0 : cellPopupRef.current.refreshContent();
         }
     };
-    if (!commentGridCell) {
+    if (!noteGridCell) {
         return React.createElement(React.Fragment, null);
     }
-    return (React.createElement(CellPopup_1.CellPopup, { ref: cellPopupRef, key: `${commentGridCell.PrimaryKeyValue}-${commentGridCell.ColumnId}`, isOpen: true, primaryKeyValue: commentGridCell.PrimaryKeyValue, columnId: commentGridCell.ColumnId },
-        React.createElement(rebass_1.Flex, { onClick: () => enableEditMode(), flexDirection: "column", className: "ab-CommentPopup" },
-            React.createElement(CommentEditor, { isReadonly: isReadonly, editMode: editMode, key: comment === null || comment === void 0 ? void 0 : comment.Uuid, onClose: () => api.commentsApi.hideComment(), comment: (_a = comment === null || comment === void 0 ? void 0 : comment.Value) !== null && _a !== void 0 ? _a : '', onCommentChange: (value) => handleCommentChange(value) }))));
+    return (React.createElement(CellPopup_1.CellPopup, { ref: cellPopupRef, key: `${noteGridCell.PrimaryKeyValue}-${noteGridCell.ColumnId}`, isOpen: true, primaryKeyValue: noteGridCell.PrimaryKeyValue, columnId: noteGridCell.ColumnId },
+        React.createElement(rebass_1.Flex, { onClick: () => enableEditMode(), flexDirection: "column", className: "ab-NotesPopup" },
+            React.createElement(NoteEditor, { isReadonly: isReadonly, editMode: editMode, key: note === null || note === void 0 ? void 0 : note.Uuid, onClose: () => api.notesApi.hideNote(), note: (_a = note === null || note === void 0 ? void 0 : note.Value) !== null && _a !== void 0 ? _a : '', onNoteChange: (value) => handleNoteChange(value) }))));
 };
-exports.CommentPopup = CommentPopup;
+exports.NotePopup = NotePopup;

package/src/View/Shortcut/Wizard/ShortcutWizard.js

@@ -17,9 +17,14 @@ const AdaptableContext_1 = require("../../AdaptableContext");
 const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 const ShortcutWizard = (props) => {
     const [shortcut, setShortcut] = React.useState(() => {
-        var _a;
+        var _a, _b, _c;
         const shortcut = props.data ? (0, Helper_1.cloneObject)(props.data) : ObjectFactory_1.default.CreateEmptyShortcut();
         shortcut.Scope = (_a = shortcut.Scope) !== null && _a !== void 0 ? _a : { All: true };
+        if (((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.column) && ((_c = props.popupParams) === null || _c === void 0 ? void 0 : _c.action) === 'New') {
+            shortcut.Scope = {
+                ColumnIds: [props.popupParams.column.columnId],
+            };
+        }
         return shortcut;
     });
     const adaptable = (0, AdaptableContext_1.useAdaptable)();

package/src/View/StyledColumn/Wizard/StyledColumnWizard.js

@@ -23,11 +23,25 @@ const StyledColumnWizard = (props) => {
     const popupDefaultCurrentSectionName = (_e = (_d = (_c = props === null || props === void 0 ? void 0 : props.popupParams) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.defaultCurrentSectionName) !== null && _e !== void 0 ? _e : undefined;
     const defaultCurrentSectionName = (_f = props.defaultCurrentSectionName) !== null && _f !== void 0 ? _f : popupDefaultCurrentSectionName;
     const [styledColumn, setStyledColumn] = (0, react_1.useState)(() => {
+        var _a, _b;
         if (data) {
             return (0, Helper_1.cloneObject)(data);
         }
         const newData = ObjectFactory_1.default.CreateEmptyStyledColumn();
         newData.GradientStyle = {};
+        if (((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.column) && ((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.action) === 'New') {
+            newData.ColumnId = props.popupParams.column.columnId;
+            if (props.popupParams.column.dataType === 'String') {
+                newData.BadgeStyle = {
+                    Badges: [ObjectFactory_1.default.CreateDefaultStyledColumnBadge()],
+                };
+                delete newData.GradientStyle;
+            }
+            else if (props.popupParams.column.dataType.includes('Array')) {
+                newData.SparkLineStyle = {};
+                delete newData.GradientStyle;
+            }
+        }
         return newData;
     });
     const dispatch = (0, react_redux_1.useDispatch)();

package/src/View/Wizard/OnePageAdaptableWizard.d.ts

@@ -39,6 +39,7 @@ export interface OnePageAdaptableWizardProps<ENTITY> {
     titleContainerStyle?: CSSProperties;
     closeText?: React.ReactNode;
     closeTooltip?: string;
+    finishText?: React.ReactNode;
 }
 export declare const OnePageAdaptableWizard: <ENTITY extends unknown>(props: OnePageAdaptableWizardProps<ENTITY>) => JSX.Element;
 export declare const OnePageWizardSummary: <ENTITY extends unknown>() => JSX.Element;

package/src/View/Wizard/OnePageWizards.d.ts

@@ -34,5 +34,6 @@ export interface OnePageWizardProps<ENTITY> {
     titleContainerStyle?: CSSProperties;
     closeText?: React.ReactNode;
     closeTooltip?: string;
+    finishText?: React.ReactNode;
 }
 export declare const OnePageWizard: <ENTITY extends unknown>(props: OnePageWizardProps<ENTITY>) => JSX.Element;

package/src/View/Wizard/OnePageWizards.js

@@ -30,7 +30,7 @@ function useOnePageWizardContext() {
 }
 exports.useOnePageWizardContext = useOnePageWizardContext;
 const OnePageWizard = (props) => {
-    var _a, _b;
+    var _a, _b, _c;
     let defaultCurrentIndex = 0;
     if (props.defaultCurrentSectionName) {
         const candidate = props.sections.findIndex((section) => section !== '-' && (section === null || section === void 0 ? void 0 : section.title) === props.defaultCurrentSectionName);
@@ -188,6 +188,6 @@ const OnePageWizard = (props) => {
                                 color: 'var(--ab-color-error)',
                                 textAlign: 'end',
                             } }, firstErrorMessage),
-                        React.createElement(SimpleButton_1.default, { tone: "accent", "data-name": "finish", variant: "raised", disabled: canFinish !== true, onClick: () => handleClickFinish(), icon: 'check', accessLevel: 'Full' }, "Finish")))))));
+                        React.createElement(SimpleButton_1.default, { tone: "accent", "data-name": "finish", variant: "raised", disabled: canFinish !== true, onClick: () => handleClickFinish(), icon: 'check', accessLevel: 'Full' }, (_c = props.finishText) !== null && _c !== void 0 ? _c : 'Finish')))))));
 };
 exports.OnePageWizard = OnePageWizard;

package/src/agGrid/Adaptable.d.ts

@@ -183,7 +183,7 @@ export declare class Adaptable implements IAdaptable {
     private getAlertRowClass;
     private getAlertRowStyle;
     private getFlashingCellStyle;
-    private getCommentCellClassName;
+    private getNoteCellClassName;
     private getFlashingCellClass;
     private getCellHighlightStyle;
     private getRowHighlightStyle;

package/src/agGrid/Adaptable.js

@@ -509,9 +509,9 @@ class Adaptable {
                 this.logger.error('Failed to Init Modules : ', e);
                 // for now we initialize the grid even if initialising Modules has failed (perhaps revisit this?)
                 this.initInternalGridLogic();
-                this.api.internalApi.hideLoadingScreen(); // doesnt really help but at least clears the screen
+                this.api.userInterfaceApi.hideLoadingScreen(); // doesnt really help but at least clears the screen
             }).then(async () => {
-                this.api.internalApi.hideLoadingScreen();
+                this.api.userInterfaceApi.hideLoadingScreen();
                 this.isInitialised = true;
                 this._adaptableReady = true;
             });
@@ -1154,19 +1154,19 @@ class Adaptable {
                 ? flashingCell.flashingCellDefinition.DownChangeStyle
                 : flashingCell.flashingCellDefinition.NeutralChangeStyle)) !== null && _a !== void 0 ? _a : {});
     }
-    getCommentCellClassName(col, params) {
-        if (!this.api.internalApi.getModuleService().isModuleAvailable('Comments')) {
+    getNoteCellClassName(col, params) {
+        if (!this.api.internalApi.getModuleService().isModuleAvailable('Notes')) {
             return;
         }
         const cellPosition = {
             PrimaryKeyValue: this.getPrimaryKeyValueFromRowNode(params.node),
             ColumnId: col.columnId,
         };
-        const cellComments = this.api.commentsApi.getCellComments(cellPosition);
-        if (!(cellComments === null || cellComments === void 0 ? void 0 : cellComments.length)) {
+        const cellNotes = this.api.notesApi.getCellNotes(cellPosition);
+        if (!(cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length)) {
             return undefined;
         }
-        return 'ab-Cell-Comment';
+        return 'ab-Cell-Note';
     }
     getFlashingCellClass(col, params) {
         var _a, _b, _c;
@@ -1271,22 +1271,32 @@ class Adaptable {
         return isCellReadonly ? readonlyCellStyle.ClassName : null;
     }
     isQuickSearchActive(abColumn, params) {
-        var _a;
+        const isPivotColumn = this.api.columnApi.isAutoPivotColumn(
+        // abColumn is the column that is based on, not the actual column
+        params.column.getColId());
         if (abColumn.isExcludedFromQuickSearch) {
             return false;
         }
         if (!params.node) {
             return false;
         }
-        if (!this.api.optionsApi.getQuickSearchOptions().runQuickSearchOnRowGroups &&
+        if (!isPivotColumn &&
+            !this.api.optionsApi.getQuickSearchOptions().runQuickSearchOnRowGroups &&
             params.node.group) {
             return false;
         }
+        if (!this.api.optionsApi.getQuickSearchOptions().runQuickSearchOnPivotColumns &&
+            isPivotColumn) {
+            return false;
+        }
         let quickSearchValue = this.api.quickSearchApi.getQuickSearchValue();
         if (StringExtensions_1.StringExtensions.IsNullOrEmpty(quickSearchValue)) {
             return false;
         }
-        const displayValue = (_a = this.api.gridApi.getDisplayValueFromRowNode(params.node, abColumn.columnId)) !== null && _a !== void 0 ? _a : '';
+        let displayValue = this.api.gridApi.getDisplayValueFromRowNode(params.node, abColumn.columnId);
+        if (this.api.optionsApi.getQuickSearchOptions().runQuickSearchOnPivotColumns && isPivotColumn) {
+            displayValue = params.value;
+        }
         const ignoreCase = !this.adaptableOptions.quickSearchOptions.runQuickSearchWithCaseSensitivity;
         const v = ignoreCase ? String(displayValue).toLocaleLowerCase() : String(displayValue);
         const i = ignoreCase ? String(quickSearchValue).toLocaleLowerCase() : String(quickSearchValue);
@@ -2707,9 +2717,10 @@ class Adaptable {
     getFirstRowNode() {
         let startIndex = 0;
         let firstRowNode = this.gridOptions.api.getDisplayedRowAtIndex(startIndex);
-        while (firstRowNode && firstRowNode.group) {
-            startIndex++;
-            firstRowNode = this.gridOptions.api.getDisplayedRowAtIndex(startIndex);
+        if (firstRowNode === null || firstRowNode === void 0 ? void 0 : firstRowNode.group) {
+            // all groups may be closed so it is safer to get first leaf node
+            // all groups must have at least one leafe node
+            firstRowNode = firstRowNode.allLeafChildren[0];
         }
         if (!firstRowNode) {
             firstRowNode = this.gridOptions.api.getDisplayedRowAtIndex(0);
@@ -3439,7 +3450,7 @@ class Adaptable {
                 const flashingClassName = this.getFlashingCellClass(abColumn, params);
                 const styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(colId);
                 const hasStyledColumn = !!styledColumn && !styledColumn.IsSuspended;
-                const commentClassName = this.getCommentCellClassName(abColumn, params);
+                const noteClassName = this.getNoteCellClassName(abColumn, params);
                 const returnValue = [
                     typeof userCellClass === 'function' ? userCellClass(params) : userCellClass,
                     !hasStyledColumn && formatColumns.length
@@ -3450,7 +3461,7 @@ class Adaptable {
                     readonlyClassName,
                     highlightAlertClassName,
                     flashingClassName,
-                    commentClassName,
+                    noteClassName,
                 ]
                     // we flatten the array because some rules ('userCellClass' etc)  might return a string[]
                     .flat()
@@ -3641,7 +3652,8 @@ class Adaptable {
                 resultHeaderName = layoutCustomHeader;
             }
             // required here for the initial layout rendering
-            abColumn.friendlyName = resultHeaderName;
+            // Removed by JW, 3 october 2023; i don't think we need it and it overrides stuff unnecessarily
+            //  abColumn.friendlyName = resultHeaderName;
             return resultHeaderName;
         });
         const newColumnHeader = (_b = col === null || col === void 0 ? void 0 : col.getColDef()) === null || _b === void 0 ? void 0 : _b.headerName;

package/src/agGrid/agGridHelper.d.ts

@@ -3,9 +3,9 @@ import { IAdaptable } from '../AdaptableInterfaces/IAdaptable';
 import { AdaptableColumn, AdaptableColumnDataType, AdaptableColumnGroup } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableNodeComparerFunction } from '../PredefinedConfig/Common/AdaptableComparerFunction';
 import { AdaptableColumnType, AdaptableModule } from '../PredefinedConfig/Common/Types';
+import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 import { IModule } from '../Strategy/Interface/IModule';
 import { IPPStyle } from '../Utilities/Interface/IPPStyle';
-import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 /**
  * Adaptable AG Grid implementation is getting really big and unwieldy
  * So lets put some of the more obvious 'Helper' functions here
@@ -34,7 +34,7 @@ export declare class agGridHelper {
     fireSelectionChangedEvent(): void;
     private isColumnReadonly;
     private isColumnSortable;
-    private isColumnGroupable;
+    private isColumnRowGroupable;
     private isColumnPivotable;
     private isColumnAggregetable;
     private getColumnAggregationFunctions;
@@ -45,7 +45,7 @@ export declare class agGridHelper {
     private isColumnFilterable;
     private getColumnPinnedPosition;
     private isColumnFixed;
-    private isColumnGrouped;
+    private isColumnRowGrouped;
     private isColumnSparkline;
     private getColumnDataType;
     private getAbColDefValue;

package/src/agGrid/agGridHelper.js

@@ -7,11 +7,17 @@ const AlertModule_1 = require("../Strategy/AlertModule");
 const BulkUpdateModule_1 = require("../Strategy/BulkUpdateModule");
 const CalculatedColumnModule_1 = require("../Strategy/CalculatedColumnModule");
 const CellSummaryModule_1 = require("../Strategy/CellSummaryModule");
+const ChartingModule_1 = require("../Strategy/ChartingModule");
+const ColumnInfoModule_1 = require("../Strategy/ColumnInfoModule");
+const NotesModule_1 = require("../Strategy/NotesModule");
 const CustomSortModule_1 = require("../Strategy/CustomSortModule");
 const DashboardModule_1 = require("../Strategy/DashboardModule");
+const DataChangeHistoryModule_1 = require("../Strategy/DataChangeHistoryModule");
 const DataSetModule_1 = require("../Strategy/DataSetModule");
 const ExportModule_1 = require("../Strategy/ExportModule");
+const Fdc3Module_1 = require("../Strategy/Fdc3Module");
 const FilterModule_1 = require("../Strategy/FilterModule");
+const FlashingCellModule_1 = require("../Strategy/FlashingCellModule");
 const FormatColumnModule_1 = require("../Strategy/FormatColumnModule");
 const FreeTextColumnModule_1 = require("../Strategy/FreeTextColumnModule");
 const GridInfoModule_1 = require("../Strategy/GridInfoModule");
@@ -20,31 +26,27 @@ const PlusMinusModule_1 = require("../Strategy/PlusMinusModule");
 const QueryModule_1 = require("../Strategy/QueryModule");
 const QuickSearchModule_1 = require("../Strategy/QuickSearchModule");
 const ScheduleModule_1 = require("../Strategy/ScheduleModule");
+const SettingsPanelModule_1 = require("../Strategy/SettingsPanelModule");
 const ShortcutModule_1 = require("../Strategy/ShortcutModule");
 const SmartEditModule_1 = require("../Strategy/SmartEditModule");
 const StateManagementModule_1 = require("../Strategy/StateManagementModule");
+const StatusBarModule_1 = require("../Strategy/StatusBarModule");
+const StyledColumnModule_1 = require("../Strategy/StyledColumnModule");
 const SystemStatusModule_1 = require("../Strategy/SystemStatusModule");
 const TeamSharingModule_1 = require("../Strategy/TeamSharingModule");
 const ThemeModule_1 = require("../Strategy/ThemeModule");
 const ToolPanelModule_1 = require("../Strategy/ToolPanelModule");
+const GeneralConstants = tslib_1.__importStar(require("../Utilities/Constants/GeneralConstants"));
+const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const StringExtensions_1 = require("../Utilities/Extensions/StringExtensions");
-const CheckboxRenderer_1 = require("./CheckboxRenderer");
-const DataChangeHistoryModule_1 = require("../Strategy/DataChangeHistoryModule");
-const FlashingCellModule_1 = require("../Strategy/FlashingCellModule");
-const SettingsPanelModule_1 = require("../Strategy/SettingsPanelModule");
-const ChartingModule_1 = require("../Strategy/ChartingModule");
-const CommentsModule_1 = require("../Strategy/CommentsModule");
-const PercentBarRenderer_1 = require("./PercentBarRenderer");
-const BadgeRenderer_1 = require("./BadgeRenderer");
 const Helper_1 = require("../Utilities/Helpers/Helper");
-const StatusBarModule_1 = require("../Strategy/StatusBarModule");
-const GeneralConstants = tslib_1.__importStar(require("../Utilities/Constants/GeneralConstants"));
-const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
-const StyledColumnModule_1 = require("../Strategy/StyledColumnModule");
-const Fdc3Module_1 = require("../Strategy/Fdc3Module");
+const BadgeRenderer_1 = require("./BadgeRenderer");
+const CheckboxRenderer_1 = require("./CheckboxRenderer");
+const PercentBarRenderer_1 = require("./PercentBarRenderer");
+const DataImportModule_1 = require("../Strategy/DataImportModule");
 const tinycolor = require('tinycolor2');
 /**
  * Adaptable AG Grid implementation is getting really big and unwieldy
@@ -84,6 +86,7 @@ class agGridHelper {
         modules.set(ModuleConstants.CellSummaryModuleId, new CellSummaryModule_1.CellSummaryModule(api));
         modules.set(ModuleConstants.CustomSortModuleId, new CustomSortModule_1.CustomSortModule(api));
         modules.set(ModuleConstants.DataChangeHistoryModuleId, new DataChangeHistoryModule_1.DataChangeHistoryModule(api));
+        modules.set(ModuleConstants.DataImportModuleId, new DataImportModule_1.DataImportModule(api));
         modules.set(ModuleConstants.DataSetModuleId, new DataSetModule_1.DataSetModule(api));
         modules.set(ModuleConstants.ExportModuleId, new ExportModule_1.ExportModule(api));
         modules.set(ModuleConstants.FilterModuleId, new FilterModule_1.FilterModule(api));
@@ -102,10 +105,11 @@ class agGridHelper {
         modules.set(ModuleConstants.SystemStatusModuleId, new SystemStatusModule_1.SystemStatusModule(api));
         modules.set(ModuleConstants.ThemeModuleId, new ThemeModule_1.ThemeModule(api));
         modules.set(ModuleConstants.GridInfoModuleId, new GridInfoModule_1.GridInfoModule(api));
+        modules.set(ModuleConstants.ColumnInfoModuleId, new ColumnInfoModule_1.ColumnInfoModule(api));
         modules.set(ModuleConstants.SettingsPanelModuleId, new SettingsPanelModule_1.SettingsPanelModule(api));
         modules.set(ModuleConstants.StatusBarModuleId, new StatusBarModule_1.StatusBarModule(api));
         modules.set(ModuleConstants.ChartingModuleId, new ChartingModule_1.ChartingModule(api));
-        modules.set(ModuleConstants.CommentsModuleId, new CommentsModule_1.CommentsModule(api));
+        modules.set(ModuleConstants.NotesModuleId, new NotesModule_1.NotesModule(api));
         modules.set(ModuleConstants.StyledColumnModuleId, new StyledColumnModule_1.StyledColumnModule(api));
         modules.set(ModuleConstants.Fdc3ModuleId, new Fdc3Module_1.Fdc3Module(api));
         return modules;
@@ -176,23 +180,47 @@ class agGridHelper {
     createAdaptableColumnFromAgGridColumn(agGridColumn, colsToGroups) {
         const colId = agGridColumn.getColId();
         const colDef = agGridColumn.getColDef();
+        const ColumnId = colId;
+        const pkColumn = this.adaptable.adaptableOptions.primaryKey;
+        const ColumnGroup = colsToGroups === null || colsToGroups === void 0 ? void 0 : colsToGroups[ColumnId];
+        const isRealColumnGroup = ColumnGroup
+            ? ColumnGroup.columnGroupId !== ColumnGroup.friendlyName
+            : false;
         const isActionRowButtonColumn = this.adaptable.api.columnApi.internalApi.isActionRowButtonColumn(colId);
         const isFdc3MainActionColumn = this.adaptable.api.fdc3Api.internalApi.isFdc3MainActionColumn(colId);
-        const columnFriendlyName = this.adaptable.adaptableOptions.columnOptions.columnFriendlyName;
-        const customFriendlyName = typeof columnFriendlyName === 'function'
-            ? columnFriendlyName({ colId: colId, agColumn: agGridColumn })
-            : null;
-        const friendlyName = customFriendlyName !== null && customFriendlyName !== void 0 ? customFriendlyName : (isActionRowButtonColumn
-            ? GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME
-            : isFdc3MainActionColumn
-                ? GeneralConstants_1.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME
-                : this.gridOptions.columnApi.getDisplayNameForColumn(agGridColumn, 'header'));
+        let friendlyName;
+        const colExists = this.adaptable.api.columnApi.doesColumnExist(ColumnId);
+        if (colExists) {
+            friendlyName = this.adaptable.api.columnApi.getFriendlyNameForColumnId(ColumnId);
+        }
+        else {
+            const displayName = this.gridOptions.columnApi.getDisplayNameForColumn(agGridColumn, 'header');
+            const columnFriendlyName = this.adaptable.adaptableOptions.columnOptions.columnFriendlyName;
+            const customFriendlyName = typeof columnFriendlyName === 'function'
+                ? columnFriendlyName({
+                    colId: colId,
+                    agColumn: agGridColumn,
+                    columnGroup: isRealColumnGroup ? ColumnGroup : undefined,
+                    displayName: displayName,
+                })
+                : null;
+            friendlyName =
+                customFriendlyName !== null && customFriendlyName !== void 0 ? customFriendlyName : (isActionRowButtonColumn
+                    ? GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME
+                    : isFdc3MainActionColumn
+                        ? GeneralConstants_1.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME
+                        : displayName);
+            // Add Column Group;s friendlyname to the Column Friendly Name if its in a legitimate Column Group
+            if (this.adaptable.adaptableOptions.columnOptions.addColumnGroupToColumnFriendlyName &&
+                colDef.columnGroupShow &&
+                ColumnGroup &&
+                ColumnGroup.columnGroupId !== ColumnGroup.friendlyName) {
+                friendlyName += ' [' + ColumnGroup.friendlyName + ']';
+            }
+        }
         if (!this.initialAgGridColDefs[colId]) {
             this.initialAgGridColDefs[colId] = Object.assign({}, agGridColumn.getUserProvidedColDef());
         }
-        const ColumnId = colId;
-        const pkColumn = this.adaptable.adaptableOptions.primaryKey;
-        let ColumnGroup = colsToGroups === null || colsToGroups === void 0 ? void 0 : colsToGroups[ColumnId];
         const dataType = this.getColumnDataType(agGridColumn, false);
         const abColumn = {
             Uuid: (0, Uuid_1.createUuid)(),
@@ -206,7 +234,7 @@ class agGridHelper {
             columnGroup: ColumnGroup,
             sortable: this.isColumnSortable(colDef),
             filterable: this.isColumnFilterable(colDef),
-            groupable: this.isColumnGroupable(colDef),
+            groupable: this.isColumnRowGroupable(colDef),
             pivotable: this.isColumnPivotable(colDef),
             aggregatable: this.isColumnAggregetable(colDef),
             availableAggregationFunctions: null,
@@ -215,7 +243,7 @@ class agGridHelper {
             hideable: this.isColumnHideable(colDef),
             queryable: this.isColumnQueryable(colDef, ColumnId, friendlyName, dataType),
             exportable: this.isColumnExportable(colDef, ColumnId, friendlyName, dataType),
-            isGrouped: this.isColumnGrouped(colDef),
+            isGrouped: this.isColumnRowGrouped(colDef),
             isFixed: this.isColumnFixed(colDef),
             pinned: this.getColumnPinnedPosition(colDef),
             isExcludedFromQuickSearch: false,
@@ -297,7 +325,7 @@ class agGridHelper {
         }
         return false;
     }
-    isColumnGroupable(colDef) {
+    isColumnRowGroupable(colDef) {
         if (colDef && colDef.enableRowGroup != null) {
             return colDef.enableRowGroup;
         }
@@ -391,7 +419,7 @@ class agGridHelper {
         }
         return false;
     }
-    isColumnGrouped(colDef) {
+    isColumnRowGrouped(colDef) {
         if (!colDef) {
             return false;
         }

package/src/agGrid/agGridMenuHelper.d.ts

@@ -1,4 +1,4 @@
-import { GridOptions, MenuItemDef, GetContextMenuItemsParams, GetMainMenuItems, GetMainMenuItemsParams, GetContextMenuItems, Column } from '@ag-grid-community/core';
+import { Column, GetContextMenuItems, GetContextMenuItemsParams, GetMainMenuItems, GetMainMenuItemsParams, GridOptions, MenuItemDef } from '@ag-grid-community/core';
 import { AdaptableMenuItem, ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../PredefinedConfig/Common/Menu';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { IAdaptable } from '../AdaptableInterfaces/IAdaptable';
@@ -7,22 +7,25 @@ export declare class agGridMenuHelper {
     private gridOptions;
     constructor(adaptable: IAdaptable, gridOptions: GridOptions);
     destroy(): void;
-    buildColumnMenu(params: GetMainMenuItemsParams, originalgetMainMenuItems: GetMainMenuItems): (string | MenuItemDef)[];
-    buildContextMenu(params: GetContextMenuItemsParams, originalgetContextMenuItems: GetContextMenuItems): (string | MenuItemDef)[];
-    createRemoveGroupsMenuItem(x: AdaptableMenuItem): MenuItemDef;
-    createAgGridMenuDefFromAdaptableMenu(adaptableMenuItem: AdaptableMenuItem): MenuItemDef;
+    buildColumnMenu(params: GetMainMenuItemsParams, originalGetMainMenuItems: GetMainMenuItems): (string | MenuItemDef)[];
+    buildContextMenu(params: GetContextMenuItemsParams, originalGetContextMenuItems: GetContextMenuItems): (string | MenuItemDef)[];
+    private createAdaptableColumnMenuItems;
+    private mapCustomMenuItemToAgGridMenuDefinition;
+    private mapAdaptableMenuItemToAgGridMenuDefinition;
+    private mapUserMenuItemToAgGridMenuDefinition;
+    private logMenuDeprecation;
+    private createAgGridMenuDefFromAdaptableMenu;
     createAgGridColumnMenuDefFromUserMenu(menuItem: UserMenuItem<ColumnMenuContext>, menuContext: ColumnMenuContext): MenuItemDef;
     createAgGridContextMenuDefFromUserMenu(menuItem: UserMenuItem<ContextMenuContext>, menuContext: ContextMenuContext): MenuItemDef;
     private mapAdaptableIconToAgGridIcon;
     createAdaptableColumnMenuItemFromUserMenu(menuItem: UserMenuItem<ColumnMenuContext>, menuContext: ColumnMenuContext): AdaptableMenuItem;
     createAgGridColumnMenuItems(originalgetMainMenuItems: GetMainMenuItems, params: GetMainMenuItemsParams): (string | MenuItemDef)[] | undefined;
-    createGroupedColumnMenuItem(): MenuItemDef | undefined;
-    createAdaptableColumnMenuItems(adaptableColumn: AdaptableColumn, menuContext: ColumnMenuContext): MenuItemDef[];
+    private createAdaptableColumnMenuItems_DEPRECATED;
     createUserColumnMenuItems(menuContext: ColumnMenuContext): MenuItemDef[];
     createColumnMenuContextObject(adaptableColumn: AdaptableColumn, agGridColumn: Column): ColumnMenuContext;
     createContextMenuContextObject(params: GetContextMenuItemsParams, adaptableColumn: AdaptableColumn): ContextMenuContext;
-    createAgGridContextMenuItems(originalgetContextMenuItems: GetContextMenuItems, params: GetContextMenuItemsParams): (string | MenuItemDef)[] | undefined;
-    createAdaptableContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[];
+    private createAgGridContextMenuItems;
+    private createAdaptableContextMenuItems;
     createAgGridAdaptableContextMenuItems(adaptableMenuItems: AdaptableMenuItem[], menuContext: ContextMenuContext): MenuItemDef[];
     createAgGridUserContextMenuItems(userContextMenuItems: UserMenuItem<ContextMenuContext>[], menuContext: ContextMenuContext): MenuItemDef[];
     private getAdaptableMenuItemsColumnHeader;
@@ -30,4 +33,12 @@ export declare class agGridMenuHelper {
     private getLabelFromUserContextMenuItem;
     private getUserMenuItemsColumnHeader;
     buildStandaloneColumnHeader(adaptableColumn: AdaptableColumn): AdaptableMenuItem[];
+    /**
+     *  !!! This should be deleted once MenuOptions loses all the deprecated options
+     */
+    private buildContextMenuDeprecated;
+    /**
+     *  !!! This should be deleted once MenuOptions loses all the deprecated options
+     */
+    private buildColumnMenuDeprecated;
 }