@adaptabletools/adaptable 18.0.0-canary.2 → 18.0.0-canary.20

package/src/Strategy/NoteModule.js

@@ -0,0 +1,57 @@
+import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
+import { createBaseContext } from '../Utilities/ObjectFactory';
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+export class NoteModule extends AdaptableModuleBase {
+    constructor(api) {
+        super(ModuleConstants.NoteModuleId, ModuleConstants.NoteFriendlyName, 'note', 'NotePopup', 'Notes', api);
+        this.adaptable = api.internalApi.getAdaptableInstance();
+    }
+    isModuleAvailable() {
+        // Note module doesn't support autogenerated primary keys
+        return super.isModuleAvailable() && !this.api.optionsApi.getAutogeneratePrimaryKey();
+    }
+    addContextMenuItems(menuContext) {
+        var _a, _b;
+        if (!this.isModuleAvailable()) {
+            return undefined;
+        }
+        const isReadOnly = this.adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName) === 'ReadOnly';
+        if (isReadOnly) {
+            return undefined;
+        }
+        const items = [];
+        const isCellNotable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable;
+        if (!isCellNotable ||
+            isCellNotable(Object.assign({ gridCell: menuContext.gridCell }, createBaseContext(this.api))))
+            items.push(...this.getAddRemoveNoteMenuItems(menuContext));
+        return items;
+    }
+    getAddRemoveNoteMenuItems(menuContext) {
+        var _a;
+        const items = [];
+        if (!this.api.noteApi.internalApi.areNotesAvailable()) {
+            return items;
+        }
+        // does not have note
+        const [note] = (_a = this.adaptable.api.noteApi.getNotesForCell({
+            PrimaryKeyValue: menuContext.primaryKeyValue,
+            ColumnId: menuContext.adaptableColumn.columnId,
+        })) !== null && _a !== void 0 ? _a : [];
+        if (note) {
+            items.push(this.createMenuItemClickFunction('note-remove', 'Remove Note', this.moduleInfo.Glyph, () => {
+                this.api.noteApi.deleteNote(note);
+            }));
+        }
+        else {
+            items.push(this.createMenuItemClickFunction('note-add', 'Add Note', this.moduleInfo.Glyph, () => {
+                // add an empty one
+                this.api.noteApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
+                this.api.internalApi.getCellPopupService().showPopup({
+                    PrimaryKeyValue: menuContext.primaryKeyValue,
+                    ColumnId: menuContext.adaptableColumn.columnId,
+                }, true);
+            }));
+        }
+        return items;
+    }
+}

package/src/Strategy/PlusMinusModule.d.ts

@@ -17,7 +17,7 @@ export declare class PlusMinusModule extends AdaptableModuleBase implements IPlu
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(plusMinusNudge: PlusMinusNudge): string[];
     getReferencedNamedQueryNames(plusMinusNudge: PlusMinusNudge): string[];
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     checkListenToKeyDown(): void;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     private handleKeyDown;

package/src/Strategy/PlusMinusModule.js

@@ -33,7 +33,7 @@ export class PlusMinusModule extends AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames((_b = plusMinusNudge.Rule) === null || _b === void 0 ? void 0 : _b.BooleanExpression);
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         let plusMinusNudges = this.api.plusMinusApi.getAllPlusMinus();
         this.shouldHandleKeyDown = ArrayExtensions.IsNotNullOrEmpty(plusMinusNudges);
         if (this.shouldHandleKeyDown) {
@@ -60,7 +60,7 @@ export class PlusMinusModule extends AdaptableModuleBase {
                 source: 'ColumnMenu',
             };
             return [
-                this.createColumnMenuItemShowPopup('Create Plus/Minus Rule', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+                this.createMenuItemShowPopup('plus-minus-add', 'Create Plus/Minus Rule', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
             ];
         }
     }

package/src/Strategy/ScheduleModule.d.ts

@@ -6,7 +6,7 @@ import { IScheduleModule } from './Interface/IScheduleModule';
 export declare class ScheduleModule extends AdaptableModuleBase implements IScheduleModule {
     private scheduleJobs;
     constructor(api: AdaptableApi);
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     setUpScheduleJobs(): void;
     private addSchedule;
     private addMidnightRefreshSchedule;

package/src/Strategy/ScheduleModule.js

@@ -36,7 +36,7 @@ export class ScheduleModule extends AdaptableModuleBase {
         this.scheduleJobs = [];
         this.addMidnightRefreshSchedule();
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         this.setUpScheduleJobs();
     }
     setUpScheduleJobs() {

package/src/Strategy/SettingsPanelModule.js

@@ -9,17 +9,17 @@ export class SettingsPanelModule extends AdaptableModuleBase {
     addColumnMenuItems(column) {
         return [
             // To do : get the icon and name from settings in case they have changed?
-            this.createColumnMenuItemReduxAction('Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
+            this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
         ];
     }
     addContextMenuItems(menuContext) {
         return [
-            this.createColumnMenuItemReduxAction('Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
+            this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
         ];
     }
     addModuleMenuItem(source) {
         if (this.isModuleAvailable()) {
-            return this.createColumnMenuItemReduxAction('Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen());
+            return this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen());
         }
     }
 }

package/src/Strategy/ShortcutModule.d.ts

@@ -14,7 +14,7 @@ export declare class ShortcutModule extends AdaptableModuleBase implements IShor
     }): AdaptableObject[];
     hasNamedQueryReferences(): boolean;
     getTeamSharingAction(): TeamSharingImportInfo<Shortcut>;
-    handleAdaptableReady(): void;
+    onAdaptableReady(): void;
     checkListenToKeyDown(): void;
     private handleKeyDown;
     private calculateShortcut;

package/src/Strategy/ShortcutModule.js

@@ -27,7 +27,7 @@ export class ShortcutModule extends AdaptableModuleBase {
             EditAction: ShortcutRedux.ShortcutEdit,
         };
     }
-    handleAdaptableReady() {
+    onAdaptableReady() {
         this.checkListenToKeyDown();
         this.adaptable._on('CellEditorKeyDown', (cellEditorKeyDownEvent) => {
             this.handleKeyDown(cellEditorKeyDownEvent);

package/src/Strategy/SmartEditModule.js

@@ -27,7 +27,7 @@ export class SmartEditModule extends AdaptableModuleBase {
                 let popUpParams = {
                     source: 'ContextMenu',
                 };
-                menuItemShowPopup = this.createMainMenuItemShowPopup({
+                menuItemShowPopup = this.createMainMenuItemShowPopup({ Name: 'smart-edit-apply',
                     Label: 'Apply Smart Edit',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/StyledColumnModule.d.ts

@@ -9,7 +9,6 @@ import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 export declare class StyledColumnModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    updateOldConfig(): void;
     getModuleAdaptableObjects(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): AdaptableObject[];
@@ -23,4 +22,5 @@ export declare class StyledColumnModule extends AdaptableModuleBase implements I
     getViewProperties(): AdaptableModuleView;
     canBeAssociatedWithLayouts(): boolean;
     private getTypeLabel;
+    private getTypeName;
 }

package/src/Strategy/StyledColumnModule.js

@@ -11,27 +11,6 @@ export class StyledColumnModule extends AdaptableModuleBase {
         super(ModuleConstants.StyledColumnModuleId, ModuleConstants.StyledColumnFriendlyName, 'brush', 'StyledColumnPopup', // to change
         'Create a Special Column Style e.g Gradient or Percent Bar', api);
     }
-    updateOldConfig() {
-        const formatColumnsWithColumnStyles = this.api.formatColumnApi
-            .getFormatColumns()
-            .filter((formatColumn) => formatColumn.ColumnStyle);
-        if (!formatColumnsWithColumnStyles.length) {
-            return;
-        }
-        this.api.logInfo(`Converting ${formatColumnsWithColumnStyles.length} FormatColumns Styles to Styled Columns`, formatColumnsWithColumnStyles);
-        formatColumnsWithColumnStyles.forEach((formatColumn) => {
-            this.api.formatColumnApi.deleteFormatColumn(formatColumn);
-        });
-        const styledColumns = formatColumnsWithColumnStyles
-            .map((formatColumn) => {
-            if (!('ColumnIds' in formatColumn.Scope)) {
-                return null;
-            }
-            return Object.assign(Object.assign(Object.assign({}, ObjectFactory.CreateEmptyStyledColumn()), { ColumnId: formatColumn.Scope.ColumnIds[0] }), formatColumn.ColumnStyle);
-        })
-            .filter(Boolean);
-        styledColumns.forEach((styledColumn) => this.api.styledColumnApi.addStyledColumn(styledColumn));
-    }
     getModuleAdaptableObjects(config) {
         return this.api.styledColumnApi.getStyledColumns(config);
     }
@@ -66,6 +45,9 @@ export class StyledColumnModule extends AdaptableModuleBase {
                         styledColumn = Object.assign(Object.assign({}, ObjectFactory.CreateEmptyStyledColumn()), { ColumnId: column.columnId, SparkLineStyle: {} });
                     }
                     let label = hasSparklineStyle ? 'Edit ' : 'Create ';
+                    let name = hasSparklineStyle
+                        ? 'styled-column-sparkline-edit'
+                        : 'styled-column-sparkline-add';
                     let popupParam = {
                         action: sparklineColumnExists ? 'Edit' : 'New',
                         source: 'ColumnMenu',
@@ -74,7 +56,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                             defaultCurrentSectionName: 'Settings',
                         },
                     };
-                    returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Sparkline Column', this.moduleInfo.Popup, this.getGlyphForStyledColumn(styledColumn), popupParam));
+                    returnColumnMenuItems.push(this.createMenuItemShowPopup(name, label + 'Sparkline Column', this.moduleInfo.Popup, this.getGlyphForStyledColumn(styledColumn), popupParam));
                 }
             }
             // Next do non sparkline
@@ -99,7 +81,8 @@ export class StyledColumnModule extends AdaptableModuleBase {
                         };
                         const icon = this.getGlyphForStyledColumn(styledColumn);
                         const label = `Edit ${this.getTypeLabel(styledColumn)} Style`;
-                        returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label, this.moduleInfo.Popup, icon, popupParam));
+                        const name = this.getTypeName(styledColumn);
+                        returnColumnMenuItems.push(this.createMenuItemShowPopup(name, label, this.moduleInfo.Popup, icon, popupParam));
                     }
                 }
                 else {
@@ -111,7 +94,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                         config: {},
                     };
                     const badgeLabel = column.dataType === 'Number' ? 'Badge' : 'Create Badge Style';
-                    const newBadgeButton = this.createColumnMenuItemShowPopup(badgeLabel, this.moduleInfo.Popup, 'badge', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { BadgeStyle: {
+                    const newBadgeButton = this.createMenuItemShowPopup('styled-column-badge-add', badgeLabel, this.moduleInfo.Popup, 'badge', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { BadgeStyle: {
                                 Badges: [ObjectFactory.CreateDefaultStyledColumnBadge()],
                             } }), config: {
                             defaultCurrentSectionName: 'Badges',
@@ -123,17 +106,18 @@ export class StyledColumnModule extends AdaptableModuleBase {
                             const emptyRanges = this.api.scopeApi.createCellColorRangesForScope({
                                 ColumnIds: [column.columnId],
                             });
-                            const newGrandientButton = this.createColumnMenuItemShowPopup('Gradient', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
+                            const newGrandientButton = this.createMenuItemShowPopup('styled-column-gradient-add', 'Gradient', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
                                         CellRanges: emptyRanges,
                                     } }), config: {
                                     defaultCurrentSectionName: 'Style',
                                 } }));
-                            const newPrecentBarButton = this.createColumnMenuItemShowPopup('Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
+                            const newPrecentBarButton = this.createMenuItemShowPopup('styled-column-percent-bar-add', 'Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
                                         CellRanges: emptyRanges,
                                     } }), config: {
                                     defaultCurrentSectionName: 'Style',
                                 } }));
                             returnColumnMenuItems.push({
+                                name: 'parent',
                                 label: 'Create Styled Column',
                                 module: this.moduleInfo.ModuleName,
                                 isVisible: true,
@@ -251,4 +235,20 @@ export class StyledColumnModule extends AdaptableModuleBase {
         }
         return type;
     }
+    getTypeName(styledColumn) {
+        let type = null;
+        if (styledColumn.GradientStyle) {
+            type = 'styled-column-gradient-edit';
+        }
+        else if (styledColumn.PercentBarStyle) {
+            type = 'styled-column-percent-bar-edit';
+        }
+        else if (styledColumn.SparkLineStyle) {
+            type = 'styled-column-sparkline-edit';
+        }
+        else if (styledColumn.BadgeStyle) {
+            type = 'styled-column-badge-edit';
+        }
+        return type;
+    }
 }

package/src/Strategy/SystemStatusModule.js

@@ -8,7 +8,7 @@ export class SystemStatusModule extends AdaptableModuleBase {
     addColumnMenuItems(column) {
         if (this.isModuleAvailable()) {
             return [
-                this.createColumnMenuItemShowPopup('Show System Status', this.moduleInfo.Popup, this.moduleInfo.Glyph),
+                this.createMenuItemShowPopup('system-status-show', 'Show System Status', this.moduleInfo.Popup, this.moduleInfo.Glyph),
             ];
         }
     }
@@ -18,7 +18,7 @@ export class SystemStatusModule extends AdaptableModuleBase {
                 source: 'ContextMenu',
             };
             return [
-                this.createMainMenuItemShowPopup({
+                this.createMainMenuItemShowPopup({ Name: 'system-status-show',
                     Label: 'Show System Status',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/TeamSharingModule.d.ts

@@ -5,6 +5,7 @@ import { AdaptableSharedEntity } from '../PredefinedConfig/TeamSharingState';
 export declare class TeamSharingModule extends AdaptableModuleBase implements IModule {
     private SKIP_TEAMSHARING_UPDATE_ACTIONS;
     constructor(api: AdaptableApi);
+    onAdaptableReady(): void;
     isModuleAvailable(): boolean;
     isModuleObjectsShareable(): boolean;
     getPopupMaxWidth(): number | undefined;

package/src/Strategy/TeamSharingModule.js

@@ -23,14 +23,14 @@ export class TeamSharingModule extends AdaptableModuleBase {
             TEAMSHARING_LINK_ITEM,
             TEAMSHARING_UPDATE_ITEM,
         ];
-        this.api.eventApi.on('AdaptableStateChanged', (adaptableStateChangedInfo) => this.handleStateChanged(adaptableStateChangedInfo));
-        this.api.eventApi.on('AdaptableReady', () => {
-            // make sure there is no zombie import process remaining (in case a previous import crashed)
-            this.api.internalApi.dispatchReduxAction(TeamSharingRedux.TeamSharingCommitImport());
-        });
+    }
+    onAdaptableReady() {
+        // make sure there is no zombie import process remaining (in case a previous import crashed)
+        this.api.internalApi.dispatchReduxAction(TeamSharingRedux.TeamSharingCommitImport());
         if (this.api.teamSharingApi.isTeamSharingAvailable()) {
             this.api.teamSharingApi.refreshTeamSharing();
         }
+        this.api.eventApi.on('AdaptableStateChanged', (adaptableStateChangedInfo) => this.handleStateChanged(adaptableStateChangedInfo));
     }
     isModuleAvailable() {
         return super.isModuleAvailable() && this.api.teamSharingApi.isTeamSharingAvailable();

package/src/Strategy/ToolPanelModule.d.ts

@@ -4,5 +4,4 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class ToolPanelModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;
-    updateOldConfig(): void;
 }

package/src/Strategy/ToolPanelModule.js

@@ -1,7 +1,5 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-import { ALL_TOOL_PANELS } from '../PredefinedConfig/Common/Types';
-import { ToolPanelSetToolPanels } from '../Redux/ActionsReducers/ToolPanelRedux';
 export class ToolPanelModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ToolPanelModuleId, ModuleConstants.ToolPanelFriendlyName, 'clipboard', 'ToolPanelPopup', 'An alternative to using the Dashboard is the AdapTable Tool Panel, the Tool Panel is the collapsible area to the right of the Grid.', api);
@@ -12,25 +10,4 @@ export class ToolPanelModule extends AdaptableModuleBase {
         }
         return this.api.internalApi.getAdaptableInstance().hasAdaptableToolPanel;
     }
-    updateOldConfig() {
-        const deprecatedToolPanelConfigs = this.api.toolPanelApi.getToolPanelState().VisibleToolPanels;
-        if (deprecatedToolPanelConfigs === null || deprecatedToolPanelConfigs === void 0 ? void 0 : deprecatedToolPanelConfigs.length) {
-            this.api.logWarn(`Updating Obsolete VisibleToolPanels Config for ToolPanelState: [${deprecatedToolPanelConfigs}]`);
-            const migratedToolPanelConfigs = deprecatedToolPanelConfigs.map((toolPanel) => ({
-                Name: toolPanel,
-                State: 'collapsed',
-            }));
-            this.api.internalApi.dispatchReduxAction(ToolPanelSetToolPanels(migratedToolPanelConfigs));
-        }
-        else if (!this.api.toolPanelApi.getToolPanelState().ToolPanels) {
-            // no predefined config provided, we will display all the panels collapsed (custom & module)
-            this.api.logInfo(`No predefined ToolPanels provided, displaying all available ones (custom&system)`);
-            const defaultConfig = [];
-            this.api.toolPanelApi
-                .getCustomToolPanels()
-                .forEach((customToolPanel) => defaultConfig.push({ Name: customToolPanel.name }));
-            ALL_TOOL_PANELS.forEach((moduleToolPanel) => defaultConfig.push({ Name: moduleToolPanel }));
-            this.api.internalApi.dispatchReduxAction(ToolPanelSetToolPanels(defaultConfig));
-        }
-    }
 }

package/src/Strategy/Utilities/getScopeViewItems.js

@@ -10,6 +10,9 @@ export const getScopeViewItems = (scope, api) => {
     if ('All' in scope) {
         values = ['All Columns'];
     }
+    if ('ColumnTypes' in scope) {
+        values = scope.ColumnTypes;
+    }
     return {
         label: 'Target',
         name: 'Target',

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -12,4 +12,4 @@ export const PredicateDocsLink = `${HOST_URL_DOCS}/guide/adaptable-predicate`;
 export const PrimaryKeyDocsLink = `${HOST_URL_DOCS}/guide/getting-started-primary-key`;
 export const LicenseDocsLink = `${HOST_URL_DOCS}/guide/licensing`;
 export const AdaptableOptionsDocsLink = `${HOST_URL_DOCS}/guide/reference-options-overview`;
-export const AgGridModulesDocsLink = `${HOST_URL_DOCS}/TODO_TODO_TODO`;
+export const AgGridModulesDocsLink = `${HOST_URL_DOCS}/guide/dev-guide-aggrid-modules-overview`;

package/src/Utilities/Constants/GeneralConstants.d.ts

@@ -27,6 +27,7 @@ export declare const AB_SPECIAL_COLUMN: AdaptableColumnType;
 export declare const AB_ROW_ACTIONS_COLUMN: AdaptableColumnType;
 export declare const AB_FDC3_COLUMN: AdaptableColumnType;
 export declare const HALF_SECOND: number;
+export declare const GROUP_PATH_SEPARATOR: string;
 export declare const AG_GRID_GROUPED_COLUMN: string;
 export declare const AG_GRID_PIVOT_COLUMN: string;
 export declare const AG_GRID_CHART_WINDOW = "AG Grid Window";

package/src/Utilities/Constants/GeneralConstants.js

@@ -26,6 +26,7 @@ export const AB_SPECIAL_COLUMN = 'abSpecialColumn';
 export const AB_ROW_ACTIONS_COLUMN = 'abRowActionsColumn';
 export const AB_FDC3_COLUMN = 'abFdc3Column';
 export const HALF_SECOND = 500;
+export const GROUP_PATH_SEPARATOR = '/';
 export const AG_GRID_GROUPED_COLUMN = 'ag-Grid-AutoColumn';
 export const AG_GRID_PIVOT_COLUMN = 'pivot_';
 export const AG_GRID_CHART_WINDOW = 'AG Grid Window';

package/src/Utilities/Constants/ModuleConstants.d.ts

@@ -37,10 +37,10 @@ export declare const GridInfoModuleId: ModuleConstants;
 export declare const GridInfoFriendlyName = "Grid Info";
 export declare const ColumnInfoModuleId: ModuleConstants;
 export declare const ColumnInfoFriendlyName = "Column Info";
-export declare const NotesModuleId: ModuleConstants;
-export declare const NotesFriendlyName = "Notes";
-export declare const CommentsModuleId: ModuleConstants;
-export declare const CommentsFriendlyName = "Comments";
+export declare const NoteModuleId: ModuleConstants;
+export declare const NoteFriendlyName = "Note";
+export declare const CommentModuleId: ModuleConstants;
+export declare const CommentFriendlyName = "Comment";
 export declare const IPushPullModuleId: ModuleConstants;
 export declare const IPushPullFriendlyName = "IPushPull";
 export declare const LayoutModuleId: ModuleConstants;
@@ -108,12 +108,12 @@ export declare const ADAPTABLE_MODULE_MAP: {
     ToolPanel: string;
     SettingsPanel: string;
     StatusBar: string;
-    Notes: string;
+    Note: string;
     ColumnInfo: string;
     DataImport: string;
     NamedQuery: string;
     GridFilter: string;
-    Comments: string;
+    Comment: string;
     Query: string;
     Filter: string;
 };

package/src/Utilities/Constants/ModuleConstants.js

@@ -36,10 +36,10 @@ export const GridInfoModuleId = 'GridInfo';
 export const GridInfoFriendlyName = 'Grid Info';
 export const ColumnInfoModuleId = 'ColumnInfo';
 export const ColumnInfoFriendlyName = 'Column Info';
-export const NotesModuleId = 'Notes';
-export const NotesFriendlyName = 'Notes';
-export const CommentsModuleId = 'Comments';
-export const CommentsFriendlyName = 'Comments';
+export const NoteModuleId = 'Note';
+export const NoteFriendlyName = 'Note';
+export const CommentModuleId = 'Comment';
+export const CommentFriendlyName = 'Comment';
 export const IPushPullModuleId = 'IPushPull';
 export const IPushPullFriendlyName = 'IPushPull';
 export const LayoutModuleId = 'Layout';
@@ -107,12 +107,12 @@ export const ADAPTABLE_MODULE_MAP = {
     [ToolPanelModuleId]: ToolPanelFriendlyName,
     [SettingsPanelModuleId]: SettingsPanelFriendlyName,
     [StatusBarModuleId]: StatusBarFriendlyName,
-    [NotesModuleId]: NotesFriendlyName,
+    [NoteModuleId]: NoteFriendlyName,
     [ColumnInfoModuleId]: ColumnInfoFriendlyName,
     [DataImportModuleId]: DataImportFriendyName,
     [NamedQueryModuleId]: NamedQueryFriendlyName,
     [GridFilterModuleId]: GridFilterFriendlyName,
-    [CommentsModuleId]: CommentsFriendlyName,
+    [CommentModuleId]: CommentFriendlyName,
     // Remove next version
     ['Query']: 'Query',
     ['Filter']: 'Filter',

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -14,13 +14,15 @@ export const DEFAULT_SETTINGS_PANEL_NAVIGATION_ITEMS = [
     'StatusBar',
     '-',
     'Layout',
-    'Export',
     'CalculatedColumn',
     'FreeTextColumn',
     'CustomSort',
     'Alert',
     'SystemStatus',
     '-',
+    'Export',
+    'DataImport',
+    '-',
     'FormatColumn',
     'StyledColumn',
     'FlashingCell',
@@ -30,17 +32,16 @@ export const DEFAULT_SETTINGS_PANEL_NAVIGATION_ITEMS = [
     'GridFilter',
     'ColumnFilter',
     'DataSet',
+    'NamedQuery',
     '-',
     'PlusMinus',
     'Shortcut',
     'DataChangeHistory',
     '-',
     'Charting',
-    'DataImport',
     'Schedule',
-    'NamedQuery',
-    'StateManagement',
     'TeamSharing',
-    'Notes',
-    'Comments',
+    'Note',
+    'Comment',
+    'StateManagement',
 ];

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.d.ts

@@ -1,12 +1,12 @@
+import { IRowNode } from '@ag-grid-community/core';
 import { ExpressionFunction } from '../../parser/src/types';
 import { BaseParameter } from './expressionFunctionUtils';
-import { IRowNode } from '@ag-grid-community/core';
 import { AggregateParams } from './scalarAggregationHelper';
 /**
  * List of all the AggregatedScalar Functions available in AdaptableQL
  */
 export type AggregatedScalarFunctionName = ScalarAggregationFunction | OperandFunction;
-export type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'QUARTILE' | 'PERCENTILE' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'CUMUL';
+export type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'QUARTILE' | 'PERCENTILE' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'CUMUL' | 'MEDIAN' | 'MODE' | 'DISTINCT' | 'ONLY' | 'STD_DEVIATION' | 'OLDEST' | 'YOUNGEST';
 type OperandFunction = 'COL' | 'OVER' | 'GROUP_BY' | 'WEIGHT';
 export interface ScalarAggregationParameter extends BaseParameter<'aggregationScalar', ScalarAggregationFunction> {
     value: AggregatedScalarExpressionEvaluation;
@@ -28,6 +28,7 @@ export interface AggregatedScalarExpressionEvaluation {
     };
     sortByColumn?: string;
     rowFilterFn?: (rowNode: IRowNode) => boolean;
+    getRowNodes?: () => IRowNode[];
 }
 export interface CumulatedAggregationValue {
     currentValue: number;