@adaptabletools/adaptable 18.0.0-canary.12 → 18.0.0-canary.14

package/src/PredefinedConfig/CommentState.d.ts

@@ -1,9 +1,10 @@
-import { AdaptableObject } from '../types';
-import { ConfigState } from './ConfigState';
+import { CellAddress } from '../types';
+import { InternalState } from './InternalState';
+import { TypeUuid } from './Uuid';
 /**
- * Predefined Configuration for Comments Module
+ * Internal State used for Comments Module
  */
-export interface CommentState extends ConfigState {
+export interface CommentState extends InternalState {
     /**
      * Collection of AdapTable Comments
      */
@@ -12,7 +13,11 @@ export interface CommentState extends ConfigState {
 /**
  * Comment that can be applied to a Cell in AdapTable
  */
-export interface AdaptableComment extends AdaptableObject {
+export interface AdaptableComment {
+    /**
+     * Unique identifier for the Comment
+     */
+    Uuid?: TypeUuid;
     /**
      * When Comment was made
      */
@@ -32,15 +37,14 @@ export interface AdaptableComment extends AdaptableObject {
      */
     AdaptableId?: string;
 }
-export interface CommentThread extends AdaptableObject {
-    /**
-     * Value in Primary Key Column
-     */
-    PrimaryKeyValue: string | number;
+/**
+ * Thread of Comments for an Adaptable Cell
+ */
+export interface CommentThread extends CellAddress {
     /**
-     * Id of Column containing the Note
+     * Unique identifier for Comment
      */
-    ColumnId: string;
+    Uuid?: TypeUuid;
     /**
      * Collection of Comments for this Cell
      */

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

@@ -1,4 +1,4 @@
-import { SummarySupportedExpression } from '../../Utilities/Services/SummaryService';
+import { SummarySupportedExpression } from "../../Utilities/Services/Interface/ISummaryService";
 export declare const ROW_SUMMARY_ROW_ID = "__ROW_SUMMARY_ROW_ID";
 /**
  * Position of Row Summary - 'Top' or 'Bottom'
@@ -8,6 +8,12 @@ export type RowSummaryPosition = 'Top' | 'Bottom';
  * Defines a Row Summary used in a Layout
  */
 export interface RowSummary {
+    /**
+     * Where Row Summary appears - 'Top' or 'Bottom'
+     */
     Position?: RowSummaryPosition;
+    /**
+     * Map of Columns with Summary Expressions
+     */
     ColumnsMap: Record<string, SummarySupportedExpression>;
 }

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

@@ -0,0 +1,25 @@
+/**
+ * Config used when transposing a Grid
+ */
+export interface TransposeConfig {
+    /**
+     * Column to use to do transposition
+     * @defaultValue Primary Key Column
+     */
+    transposedColumnId?: string;
+    /**
+     * Hide the Transposed Column
+     * @defaultValue true
+     */
+    hideTransposedColumn?: boolean;
+    /**
+     * Only show curerntly visible Columns
+     * @defaultValue false
+     */
+    visibleColumns?: boolean;
+    /**
+      * Only show curerntly visible Rows
+      * @defaultValue false
+      */
+    visibleRows?: boolean;
+}

package/src/PredefinedConfig/Common/TransposeConfig.js

@@ -0,0 +1 @@
+export {};

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

@@ -11,7 +11,7 @@ export declare const ALL_TOOLBARS: AdaptableDashboardToolbar[];
 /**
  * Modules which can appear in the AdapTable Status Bar
  */
-export type AdaptableStatusBarPanel = 'Alert' | 'CalculatedColumn' | 'BulkUpdate' | 'CellSummary' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataImport' | 'DataSet' | 'Export' | 'ColumnFilter' | 'GridFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'SmartEdit' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export type AdaptableStatusBarPanel = 'Alert' | 'CalculatedColumn' | 'BulkUpdate' | 'CellSummary' | 'Charting' | 'Comment' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataImport' | 'DataSet' | 'Export' | 'ColumnFilter' | 'GridFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'Note' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'SmartEdit' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare const ALL_STATUS_SUB_PANELS: AdaptableStatusBarPanel[];
 export type AdaptableToolPanels = AdaptableToolPanel[];
 /**
@@ -28,18 +28,18 @@ export type AdaptableModuleButtons = AdaptableModuleButton[];
 /**
  * List of all the Module buttons Adaptable provides - each Module has a popup for which this is a shortcut button
  */
-export type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataImport' | 'DataSet' | 'Export' | 'ColumnFilter' | 'GridFilter' | 'NamedQuery' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme';
+export type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Comment' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataImport' | 'DataSet' | 'Export' | 'ColumnFilter' | 'GridFilter' | 'NamedQuery' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'Note' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme';
 export type AdaptableStateKeys = AdaptableStateKey[];
 export type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFin' | 'IPushPull';
 /**
  * Modules provided by AdapTable, subject to Entitlements and usually have Predefined Config
  */
-export type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Fdc3' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Notes' | 'DataImport' | 'GridFilter' | 'NamedQuery' | 'Comments';
+export type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'Comment' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Fdc3' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Note' | 'DataImport' | 'GridFilter' | 'NamedQuery';
 export declare const ALL_MODULES: AdaptableModule[];
 /**
  * Modules which can appear in the Settings Panel
  */
-export type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'Layout' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'StyledColumn' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Notes' | 'DataImport' | 'GridFilter' | 'NamedQuery' | 'Comments';
+export type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'ColumnFilter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'Layout' | 'PlusMinus' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'StyledColumn' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Note' | 'DataImport' | 'GridFilter' | 'NamedQuery' | 'Comment';
 export type TypeHint<Base, Literals> = (Base & {
     __subType?: true;
 }) | Literals;

package/src/PredefinedConfig/Common/Types.js

@@ -26,6 +26,7 @@ export const ALL_STATUS_SUB_PANELS = [
     'BulkUpdate',
     'CalculatedColumn',
     'CellSummary',
+    'Comment',
     'CustomSort',
     'Charting',
     'Dashboard',
@@ -40,6 +41,7 @@ export const ALL_STATUS_SUB_PANELS = [
     'FreeTextColumn',
     'GridInfo',
     'Layout',
+    'Note',
     'PlusMinus',
     'QuickSearch',
     'Schedule',
@@ -77,7 +79,8 @@ export const ALL_MODULES = [
     ModuleConstants.BulkUpdateModuleId,
     ModuleConstants.CalculatedColumnModuleId,
     ModuleConstants.CellSummaryModuleId,
-    ModuleConstants.NotesModuleId,
+    ModuleConstants.NoteModuleId,
+    ModuleConstants.CommentModuleId,
     ModuleConstants.ChartingModuleId,
     ModuleConstants.CustomSortModuleId,
     ModuleConstants.DashboardModuleId,

package/src/PredefinedConfig/LayoutState.d.ts

@@ -84,7 +84,7 @@ export interface Layout extends AdaptableObject {
      */
     SuppressAggFuncInHeader?: boolean;
     /**
-     * Row summaries
+     * Row Summaries - Pinned Rows that display Aggregation Info for a whole column
      */
     RowSummaries?: RowSummary[];
 }

package/src/PredefinedConfig/NoteState.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableObject } from '../types';
 import { ConfigState } from './ConfigState';
 /**
- * Predefined Configuration for Notes Module
+ * Predefined Configuration for Note Module
  */
 export interface NoteState extends ConfigState {
     /**

package/src/PredefinedConfig/PredefinedConfig.d.ts

@@ -46,7 +46,7 @@ export interface PredefinedConfig {
     /**
      * Collection of personal Notes that are edited at Cell level
      */
-    Notes?: NoteState;
+    Note?: NoteState;
     /**
      * Large series of properties to give users full control over the look and feel of the *Dashboard* - the section above the grid with toolbars and buttons
      */

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

@@ -0,0 +1,38 @@
+import * as Redux from 'redux';
+import { AdaptableNote, NoteState } from '../../PredefinedConfig/NoteState';
+import { CellAddress } from '../../types';
+/**
+ * @ReduxAction A Note has been added
+ */
+export declare const NOTE_ADD = "NOTE_ADD";
+/**
+ * @ReduxAction A Note has been edited
+ */
+export declare const NOTE_EDIT = "NOTE_EDIT";
+/**
+ * @ReduxAction A Note has been deleted
+ */
+export declare const NOTE_DELETE = "NOTE_DELETE";
+/**
+ * @ReduxAction Note Module is ready
+ */
+export declare const NOTE_READY = "NOTE_READY";
+export interface AdaptableNoteAction extends Redux.Action {
+    adaptableNote: AdaptableNote;
+}
+export interface AdaptableNoteAddAction extends AdaptableNoteAction {
+}
+export interface AdaptableNoteEditAction extends AdaptableNoteAction {
+}
+export interface AdaptableNoteDeleteAction extends AdaptableNoteAction {
+}
+export interface NoteReadyAction extends Redux.Action {
+    noteState: NoteState;
+}
+export declare const NoteAdd: (note: AdaptableNote) => AdaptableNoteAddAction;
+export declare const NoteEdit: (note: AdaptableNote) => AdaptableNoteEditAction;
+export declare const NoteDelete: (note: AdaptableNote) => AdaptableNoteDeleteAction;
+export declare const NoteReady: (note: NoteState) => NoteReadyAction;
+export declare const GetAllNotesSelector: (state: NoteState) => AdaptableNote[];
+export declare const GetNotesSelector: (state: NoteState, address: CellAddress) => AdaptableNote[];
+export declare const NoteReducer: Redux.Reducer<NoteState>;

package/src/Redux/ActionsReducers/{NotesRedux.js → NoteRedux.js}

@@ -1,35 +1,35 @@
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 import { EMPTY_ARRAY } from '../../Utilities/Constants/GeneralConstants';
 /**
- * @ReduxAction A Notes has been added
+ * @ReduxAction A Note has been added
  */
-export const NOTES_ADD = 'NOTES_ADD';
+export const NOTE_ADD = 'NOTE_ADD';
 /**
- * @ReduxAction A Notes has been edited
+ * @ReduxAction A Note has been edited
  */
-export const NOTES_EDIT = 'NOTES_EDIT';
+export const NOTE_EDIT = 'NOTE_EDIT';
 /**
- * @ReduxAction A Notes has been deleted
+ * @ReduxAction A Note has been deleted
  */
-export const NOTES_DELETE = 'NOTES_DELETE';
+export const NOTE_DELETE = 'NOTE_DELETE';
 /**
- * @ReduxAction Notes Module is ready
+ * @ReduxAction Note Module is ready
  */
-export const NOTES_READY = 'NOTES_READY';
-export const NotesAdd = (note) => ({
-    type: NOTES_ADD,
+export const NOTE_READY = 'NOTE_READY';
+export const NoteAdd = (note) => ({
+    type: NOTE_ADD,
     adaptableNote: note,
 });
-export const NotesEdit = (note) => ({
-    type: NOTES_EDIT,
+export const NoteEdit = (note) => ({
+    type: NOTE_EDIT,
     adaptableNote: note,
 });
-export const NotesDelete = (note) => ({
-    type: NOTES_DELETE,
+export const NoteDelete = (note) => ({
+    type: NOTE_DELETE,
     adaptableNote: note,
 });
-export const NotesReady = (note) => ({
-    type: NOTES_READY,
+export const NoteReady = (note) => ({
+    type: NOTE_READY,
     noteState: note,
 });
 export const GetAllNotesSelector = (state) => state.Notes;
@@ -55,20 +55,20 @@ export const GetNotesSelector = (state, address) => {
 const initialState = {
     Notes: EMPTY_ARRAY,
 };
-export const NotesReducer = (state = initialState, action) => {
+export const NoteReducer = (state = initialState, action) => {
     let adaptableNotes;
     switch (action.type) {
-        case NOTES_ADD: {
+        case NOTE_ADD: {
             const note = action.adaptableNote;
             AdaptableHelper.addUuidAndSource(note);
             adaptableNotes = [...state.Notes, note];
             return Object.assign(Object.assign({}, state), { Notes: adaptableNotes });
         }
-        case NOTES_EDIT: {
+        case NOTE_EDIT: {
             const note = action.adaptableNote;
             return Object.assign(Object.assign({}, state), { Notes: state.Notes.map((abObject) => (abObject.Uuid === note.Uuid ? note : abObject)) });
         }
-        case NOTES_DELETE: {
+        case NOTE_DELETE: {
             const note = action.adaptableNote;
             return Object.assign(Object.assign({}, state), { Notes: state.Notes.filter((abObject) => abObject.Uuid !== note.Uuid) });
         }

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

@@ -339,6 +339,6 @@ export declare const SystemPreviousGroupedColumnsSelector: (state: SystemState)
 export declare const SystemQuickSearchFloatingVisibilitySelector: (state: SystemState) => boolean;
 export declare const SystemCommentsAndNotesSelector: (state: SystemState) => CellAddress;
 export declare const SystemCommentsAndNotesEditModeSelector: (state: SystemState) => boolean;
-export declare const SystemCommentsAndNotesFocusedEntitySelector: (state: SystemState) => "Note" | "Comment";
+export declare const SystemCommentsAndNotesFocusedEntitySelector: (state: SystemState) => "Comment" | "Note";
 export declare const DataImportCompleted: (dataImportedInfo: DataImportedInfo) => DataImportCompletedAction;
 export declare const SystemReducer: Redux.Reducer<SystemState>;

package/src/Redux/Store/AdaptableStore.js

@@ -29,7 +29,7 @@ import * as FreeTextColumnRedux from '../ActionsReducers/FreeTextColumnRedux';
 import * as GridRedux from '../ActionsReducers/GridRedux';
 import * as LayoutRedux from '../ActionsReducers/LayoutRedux';
 import * as NamedQueryRedux from '../ActionsReducers/NamedQueryRedux';
-import * as NotesRedux from '../ActionsReducers/NotesRedux';
+import * as NoteRedux from '../ActionsReducers/NoteRedux';
 import * as PlusMinusRedux from '../ActionsReducers/PlusMinusRedux';
 import * as QueryRedux from '../ActionsReducers/QueryRedux';
 import * as QuickSearchRedux from '../ActionsReducers/QuickSearchRedux';
@@ -121,6 +121,7 @@ export class AdaptableStore {
             Popup: PopupRedux.PopupReducer,
             System: SystemRedux.SystemReducer,
             Plugins: PluginsRedux.PluginsReducer,
+            Comment: CommentsRedux.CommentsReducer,
             // Reducers for Persisted State
             Alert: AlertRedux.AlertReducer,
             FlashingCell: FlashingCellRedux.FlashingCellReducer,
@@ -142,8 +143,7 @@ export class AdaptableStore {
             ToolPanel: ToolPanelRedux.ToolPanelReducer,
             Charting: ChartingRedux.ChartingReducer,
             StyledColumn: StyledColumnRedux.StyledColumnReducer,
-            Notes: NotesRedux.NotesReducer,
-            Comment: CommentsRedux.CommentsReducer,
+            Note: NoteRedux.NoteReducer,
             Query: QueryRedux.QueryReducer,
             NamedQuery: NamedQueryRedux.NamedQueryReducer,
         };
@@ -861,12 +861,12 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  * Note ACTIONS
                  *******************/
                 /**
-                 * Use Case: Notes has been edited/deleted/added
+                 * Use Case: Note has been edited/deleted/added
                  * Action: Triangle can be removed/added
                  */
-                case NotesRedux.NOTES_ADD:
-                case NotesRedux.NOTES_EDIT:
-                case NotesRedux.NOTES_DELETE: {
+                case NoteRedux.NOTE_ADD:
+                case NoteRedux.NOTE_EDIT:
+                case NoteRedux.NOTE_DELETE: {
                     let returnAction = next(action);
                     const node = adaptable.api.gridApi.getRowNodeForPrimaryKey(returnAction.adaptableNote.PrimaryKeyValue);
                     adaptable.refreshCells([node], [returnAction.adaptableNote.ColumnId], true);

package/src/Strategy/CellSummaryModule.js

@@ -91,7 +91,8 @@ export class CellSummaryModule extends AdaptableModuleBase {
             const handleExpression = (functionName) => {
                 const columnId = selectedCellInfo.columns[0].columnId;
                 const rowNodes = selectedCellInfo.gridCells.map((gc) => gc.rowNode);
-                return this.api.internalApi.getAdaptableInstance().SummaryService.evaluateExpressionValue({
+                return this.api.internalApi
+                    .getSummaryService().evaluateExpressionValue({
                     expression: {
                         function: functionName,
                     },

package/src/Strategy/{CommentsModule.d.ts → CommentModule.d.ts}

@@ -2,11 +2,7 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
-/**
- * In the first iteration a cell can have only one note, the
- * notes is a list to allow further development.
- */
-export declare class CommentsModule extends AdaptableModuleBase implements IModule {
+export declare class CommentModule extends AdaptableModuleBase implements IModule {
     private adaptable;
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;

package/src/Strategy/{CommentsModule.js → CommentModule.js}

@@ -1,13 +1,9 @@
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { createBaseContext } from '../Utilities/ObjectFactory';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-/**
- * In the first iteration a cell can have only one note, the
- * notes is a list to allow further development.
- */
-export class CommentsModule extends AdaptableModuleBase {
+export class CommentModule extends AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.CommentsModuleId, ModuleConstants.CommentsFriendlyName, 'comments', 'CommentsPopup', 'comments', api);
+        super(ModuleConstants.CommentModuleId, ModuleConstants.CommentFriendlyName, 'comments', 'CommentsPopup', 'comments', api);
         this.adaptable = api.internalApi.getAdaptableInstance();
     }
     onAdaptableReady() {
@@ -18,6 +14,9 @@ export class CommentsModule extends AdaptableModuleBase {
         if (!options || !options.persistCommentThreads || !options.loadCommentThreads) {
             return false;
         }
+        if (this.api.optionsApi.getAutogeneratePrimaryKey()) {
+            return false;
+        }
         return super.isModuleAvailable();
     }
     async loadComments() {

package/src/Strategy/LayoutModule.d.ts

@@ -13,6 +13,7 @@ export declare class LayoutModule extends AdaptableModuleBase implements IModule
     protected LayoutState: LayoutState;
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
+    rowSummariesSubscribtions(): void;
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(layout: Layout): string[];
     getTeamSharingReferences(adaptableObject: AdaptableObject): TeamSharingReferences;

package/src/Strategy/LayoutModule.js

@@ -35,6 +35,10 @@ export class LayoutModule extends AdaptableModuleBase {
         requestAnimationFrame(() => {
             this.api.layoutApi.internalApi.fireLayoutChangedEvent('ADAPTABLE_READY', null, this.api.layoutApi.getLayoutState());
         });
+        this.rowSummariesSubscribtions();
+    }
+    rowSummariesSubscribtions() {
+        // ROW SUMMARY
         this.evaluateRowSummary();
         this.api.eventApi.on('AdaptableStateReloaded', () => {
             this.evaluateRowSummary();
@@ -49,9 +53,21 @@ export class LayoutModule extends AdaptableModuleBase {
             });
         });
         this.api.eventApi.on('LayoutChanged', (event) => {
-            this.evaluateRowSummary();
+            // exclude filter events, those are handled in another event
+            if (event.actionName.includes('FILTER')) {
+                return;
+            }
+            setTimeout(() => {
+                // the timeout is added so the grid has time to repond to the layout changed
+                this.evaluateRowSummary();
+            }, 16);
         });
         const adaptable = this.api.internalApi.getAdaptableInstance();
+        adaptable._on('AdapTableFiltersApplied', () => {
+            // we need to use this instead of layout changed
+            // so the rows have time to update
+            this.evaluateRowSummary();
+        });
         adaptable._on('FirstDataRendered', () => {
             this.evaluateRowSummary();
         });

package/src/Strategy/{NotesModule.d.ts → NoteModule.d.ts}

@@ -2,9 +2,10 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
-export declare class NotesModule extends AdaptableModuleBase implements IModule {
+export declare class NoteModule extends AdaptableModuleBase implements IModule {
     private adaptable;
     constructor(api: AdaptableApi);
+    isModuleAvailable(): boolean;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private getAddRemoveNoteMenuItems;
 }

package/src/Strategy/{NotesModule.js → NoteModule.js}

@@ -1,10 +1,14 @@
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-export class NotesModule extends AdaptableModuleBase {
+export class NoteModule extends AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.NotesModuleId, ModuleConstants.NotesFriendlyName, 'note', 'NotesPopup', 'Notes', 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()) {
@@ -32,7 +36,7 @@ export class NotesModule extends AdaptableModuleBase {
             return items;
         }
         // does not have note
-        const [note] = (_a = this.adaptable.api.noteApi.getCellNotes({
+        const [note] = (_a = this.adaptable.api.noteApi.getNotesForCell({
             PrimaryKeyValue: menuContext.primaryKeyValue,
             ColumnId: menuContext.adaptableColumn.columnId,
         })) !== null && _a !== void 0 ? _a : [];

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/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

@@ -41,7 +41,7 @@ export const DEFAULT_SETTINGS_PANEL_NAVIGATION_ITEMS = [
     'Charting',
     'Schedule',
     'TeamSharing',
-    'Notes',
-    'Comments',
+    'Note',
+    'Comment',
     'StateManagement',
 ];