@adaptabletools/adaptable-cjs 18.0.0-canary.11 → 18.0.0-canary.13

package/src/PredefinedConfig/CommentState.d.ts

@@ -1,19 +1,33 @@
-import { AdaptableObject } from '../types';
-import { ConfigState } from './ConfigState';
+import { CellAddress } from '../types';
+import { InternalState } from './InternalState';
+import { TypeUuid } from './Uuid';
 /**
- * Note that can be applied to a Cell in AdapTable
+ * Internal State used for Comments Module
  */
-export interface AdaptableComment extends AdaptableObject {
+export interface CommentState extends InternalState {
     /**
-     * When Note was made
+     * Collection of AdapTable Comments
+     */
+    CommentThreads?: CommentThread[];
+}
+/**
+ * Comment that can be applied to a Cell in AdapTable
+ */
+export interface AdaptableComment {
+    /**
+     * Unique identifier for the Comment
+     */
+    Uuid?: TypeUuid;
+    /**
+     * When Comment was made
      */
     Timestamp: number;
     /**
-     * Value of the Note
+     * Content of the Comment
      */
     Value: string;
     /**
-     * Author of the Note
+     * Author of the Comment
      */
     Author?: {
         UserName: string;
@@ -23,26 +37,16 @@ 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
      */
     Comments: AdaptableComment[];
 }
-/**
- * Predefined Configuration for Notes Module
- */
-export interface CommentState extends ConfigState {
-    /**
-     * Collection of AdapTable Notes
-     */
-    CommentThreads?: CommentThread[];
-}

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

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

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

@@ -0,0 +1,6 @@
+export interface TransposeConfig {
+    transposedColumnId?: string;
+    hideTransposedColumn?: boolean;
+    visibleColumns?: boolean;
+    visibleRows?: boolean;
+}

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

@@ -30,6 +30,7 @@ exports.ALL_STATUS_SUB_PANELS = [
     'BulkUpdate',
     'CalculatedColumn',
     'CellSummary',
+    'Comment',
     'CustomSort',
     'Charting',
     'Dashboard',
@@ -44,6 +45,7 @@ exports.ALL_STATUS_SUB_PANELS = [
     'FreeTextColumn',
     'GridInfo',
     'Layout',
+    'Note',
     'PlusMinus',
     'QuickSearch',
     'Schedule',
@@ -81,7 +83,8 @@ exports.ALL_MODULES = [
     ModuleConstants.BulkUpdateModuleId,
     ModuleConstants.CalculatedColumnModuleId,
     ModuleConstants.CellSummaryModuleId,
-    ModuleConstants.NotesModuleId,
+    ModuleConstants.NoteModuleId,
+    ModuleConstants.CommentModuleId,
     ModuleConstants.ChartingModuleId,
     ModuleConstants.CustomSortModuleId,
     ModuleConstants.DashboardModuleId,

package/src/PredefinedConfig/{NotesState.d.ts → NoteState.d.ts}

@@ -1,9 +1,9 @@
 import { AdaptableObject } from '../types';
 import { ConfigState } from './ConfigState';
 /**
- * Predefined Configuration for Notes Module
+ * Predefined Configuration for Note Module
  */
-export interface NotesState extends ConfigState {
+export interface NoteState extends ConfigState {
     /**
      * Collection of AdapTable Notes
      */
@@ -18,7 +18,7 @@ export interface AdaptableNote extends AdaptableObject {
      */
     Timestamp: number;
     /**
-     * Value of the Note
+     * Content of the Note
      */
     Text: string;
     /**

package/src/PredefinedConfig/{CellAddress.js → NoteState.js}

@@ -1,5 +1,2 @@
 "use strict";
-/**
- * Cell that contains a Note
- */
 Object.defineProperty(exports, "__esModule", { value: true });

package/src/PredefinedConfig/PredefinedConfig.d.ts

@@ -17,7 +17,7 @@ import { ToolPanelState } from './ToolPanelState';
 import { StatusBarState } from './StatusBarState';
 import { ChartingState } from './ChartingState';
 import { StyledColumnState } from './StyledColumnState';
-import { NotesState } from './NotesState';
+import { NoteState } from './NoteState';
 import { NamedQueryState } from '../types';
 /**
  * This is the main Predefined Config interface which developers will populate at design-time
@@ -46,7 +46,7 @@ export interface PredefinedConfig {
     /**
      * Collection of personal Notes that are edited at Cell level
      */
-    Notes?: NotesState;
+    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/PredefinedConfig/Selection/GridCell.d.ts

@@ -1,5 +1,18 @@
 import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableColumn } from '../Common/AdaptableColumn';
+/**
+ * Very lightweight object to define an AdapTable Cell
+ */
+export type CellAddress = {
+    /**
+     * Value in Primary Key Column
+     */
+    PrimaryKeyValue: string | number;
+    /**
+     * Id of Column containing the Note
+     */
+    ColumnId: string;
+};
 /**
  * Defines a Cell in Adaptable - every cell is an intersection of a Column Id and a Primary Key Value
  */

package/src/PredefinedConfig/SystemState.d.ts

@@ -1,7 +1,7 @@
 import { PreviewInfo } from '../Utilities/Interface/Preview';
 import { InternalState } from './InternalState';
 import { BulkUpdateValidationResult } from '../Strategy/Interface/IBulkUpdateModule';
-import { CellDataChangedInfo, GridCell, SmartEditOperation } from '../types';
+import { CellAddress, CellDataChangedInfo, GridCell, SmartEditOperation } from '../types';
 import type { IPushPullState, IPushPullReport, IPushPullDomain } from './IPushPullState';
 import { OpenFinState, OpenFinReport } from './OpenFinState';
 import { AdaptableAlert } from './Common/AdaptableAlert';
@@ -12,7 +12,6 @@ import { AdaptableFlashingCell } from './Common/AdaptableFlashingCell';
 import { TypeUuid } from './Uuid';
 import { SummaryOperation } from './Common/Enums';
 import { ChartModel } from '@ag-grid-community/core';
-import { CellAddress } from './CellAddress';
 import { ExternalChartDefinition } from './ChartingState';
 import { CachedQuery } from './NamedQueryState';
 export type { IPushPullReport, IPushPullDomain };
@@ -97,7 +96,7 @@ export interface SystemState extends InternalState, IPushPullState, OpenFinState
      */
     DisableDeleteConfirmation: boolean;
     Export: {
-        inProgressVisualData: boolean;
+        visualDataExportInProgress: boolean;
     };
     QuickSearch?: {
         floatingVisible?: boolean;

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,45 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotesReducer = exports.GetNotesSelector = exports.GetAllNotesSelector = exports.NotesReady = exports.NotesDelete = exports.NotesEdit = exports.NotesAdd = exports.NOTES_READY = exports.NOTES_DELETE = exports.NOTES_EDIT = exports.NOTES_ADD = void 0;
+exports.NoteReducer = exports.GetNotesSelector = exports.GetAllNotesSelector = exports.NoteReady = exports.NoteDelete = exports.NoteEdit = exports.NoteAdd = exports.NOTE_READY = exports.NOTE_DELETE = exports.NOTE_EDIT = exports.NOTE_ADD = void 0;
 const tslib_1 = require("tslib");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 /**
- * @ReduxAction A Notes has been added
+ * @ReduxAction A Note has been added
  */
-exports.NOTES_ADD = 'NOTES_ADD';
+exports.NOTE_ADD = 'NOTE_ADD';
 /**
- * @ReduxAction A Notes has been edited
+ * @ReduxAction A Note has been edited
  */
-exports.NOTES_EDIT = 'NOTES_EDIT';
+exports.NOTE_EDIT = 'NOTE_EDIT';
 /**
- * @ReduxAction A Notes has been deleted
+ * @ReduxAction A Note has been deleted
  */
-exports.NOTES_DELETE = 'NOTES_DELETE';
+exports.NOTE_DELETE = 'NOTE_DELETE';
 /**
- * @ReduxAction Notes Module is ready
+ * @ReduxAction Note Module is ready
  */
-exports.NOTES_READY = 'NOTES_READY';
-const NotesAdd = (note) => ({
-    type: exports.NOTES_ADD,
+exports.NOTE_READY = 'NOTE_READY';
+const NoteAdd = (note) => ({
+    type: exports.NOTE_ADD,
     adaptableNote: note,
 });
-exports.NotesAdd = NotesAdd;
-const NotesEdit = (note) => ({
-    type: exports.NOTES_EDIT,
+exports.NoteAdd = NoteAdd;
+const NoteEdit = (note) => ({
+    type: exports.NOTE_EDIT,
     adaptableNote: note,
 });
-exports.NotesEdit = NotesEdit;
-const NotesDelete = (note) => ({
-    type: exports.NOTES_DELETE,
+exports.NoteEdit = NoteEdit;
+const NoteDelete = (note) => ({
+    type: exports.NOTE_DELETE,
     adaptableNote: note,
 });
-exports.NotesDelete = NotesDelete;
-const NotesReady = (note) => ({
-    type: exports.NOTES_READY,
-    notesState: note,
+exports.NoteDelete = NoteDelete;
+const NoteReady = (note) => ({
+    type: exports.NOTE_READY,
+    noteState: note,
 });
-exports.NotesReady = NotesReady;
+exports.NoteReady = NoteReady;
 const GetAllNotesSelector = (state) => state.Notes;
 exports.GetAllNotesSelector = GetAllNotesSelector;
 const GetNotesSelector = (state, address) => {
@@ -65,20 +65,20 @@ exports.GetNotesSelector = GetNotesSelector;
 const initialState = {
     Notes: GeneralConstants_1.EMPTY_ARRAY,
 };
-const NotesReducer = (state = initialState, action) => {
+const NoteReducer = (state = initialState, action) => {
     let adaptableNotes;
     switch (action.type) {
-        case exports.NOTES_ADD: {
+        case exports.NOTE_ADD: {
             const note = action.adaptableNote;
             AdaptableHelper_1.default.addUuidAndSource(note);
             adaptableNotes = [...state.Notes, note];
             return Object.assign(Object.assign({}, state), { Notes: adaptableNotes });
         }
-        case exports.NOTES_EDIT: {
+        case exports.NOTE_EDIT: {
             const note = action.adaptableNote;
             return Object.assign(Object.assign({}, state), { Notes: state.Notes.map((abObject) => (abObject.Uuid === note.Uuid ? note : abObject)) });
         }
-        case exports.NOTES_DELETE: {
+        case exports.NOTE_DELETE: {
             const note = action.adaptableNote;
             return Object.assign(Object.assign({}, state), { Notes: state.Notes.filter((abObject) => abObject.Uuid !== note.Uuid) });
         }
@@ -86,4 +86,4 @@ const NotesReducer = (state = initialState, action) => {
             return state;
     }
 };
-exports.NotesReducer = NotesReducer;
+exports.NoteReducer = NoteReducer;

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/ActionsReducers/SystemRedux.js

@@ -468,7 +468,7 @@ const initialState = {
     },
     DisableDeleteConfirmation: false,
     Export: {
-        inProgressVisualData: false,
+        visualDataExportInProgress: false,
     },
 };
 const SystemReducer = (state = initialState, action) => {
@@ -801,12 +801,12 @@ const SystemReducer = (state = initialState, action) => {
         }
         case exports.SYSTEM_VISUAL_EXPORT_BEGIN: {
             return Object.assign(Object.assign({}, state), { Export: {
-                    inProgressVisualData: true,
+                    visualDataExportInProgress: true,
                 } });
         }
         case exports.SYSTEM_VISUAL_EXPORT_END: {
             return Object.assign(Object.assign({}, state), { Export: {
-                    inProgressVisualData: false,
+                    visualDataExportInProgress: false,
                 } });
         }
         case exports.SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY: {

package/src/Redux/Store/AdaptableStore.js

@@ -33,7 +33,7 @@ const FreeTextColumnRedux = tslib_1.__importStar(require("../ActionsReducers/Fre
 const GridRedux = tslib_1.__importStar(require("../ActionsReducers/GridRedux"));
 const LayoutRedux = tslib_1.__importStar(require("../ActionsReducers/LayoutRedux"));
 const NamedQueryRedux = tslib_1.__importStar(require("../ActionsReducers/NamedQueryRedux"));
-const NotesRedux = tslib_1.__importStar(require("../ActionsReducers/NotesRedux"));
+const NoteRedux = tslib_1.__importStar(require("../ActionsReducers/NoteRedux"));
 const PlusMinusRedux = tslib_1.__importStar(require("../ActionsReducers/PlusMinusRedux"));
 const QueryRedux = tslib_1.__importStar(require("../ActionsReducers/QueryRedux"));
 const QuickSearchRedux = tslib_1.__importStar(require("../ActionsReducers/QuickSearchRedux"));
@@ -127,6 +127,7 @@ class AdaptableStore {
             Popup: PopupRedux.PopupReducer,
             System: SystemRedux.SystemReducer,
             Plugins: PluginsRedux.PluginsReducer,
+            Comment: CommentsRedux.CommentsReducer,
             // Reducers for Persisted State
             Alert: AlertRedux.AlertReducer,
             FlashingCell: FlashingCellRedux.FlashingCellReducer,
@@ -148,8 +149,7 @@ 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,
         };
@@ -868,12 +868,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);
@@ -907,9 +907,9 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         requestAnimationFrame(() => {
                             var _a, _b;
                             const commentThreads = adaptable.api.commentApi.getCommentThreads();
-                            adaptable.api.eventApi.emit('CommentsChanged', adaptable.api.commentApi.getCommentThreads());
+                            adaptable.api.eventApi.emit('CommentChanged', adaptable.api.commentApi.getCommentThreads());
                             (_b = (_a = adaptable.api.optionsApi
-                                .getCommentsOptions()) === null || _a === void 0 ? void 0 : _a.persistCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, commentThreads);
+                                .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.persistCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, commentThreads);
                         });
                     }
                     return returnAction;
@@ -934,7 +934,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             }
                         }
                         // This cannot be called because it would trigger an infinite loop
-                        // adaptable.api.eventApi.emit('CommentsChanged', commentThreads);
+                        // adaptable.api.eventApi.emit('CommentChanged', commentThreads);
                         // refresh all comments cells to show or hide the triangle
                         [...addedCommentThreads, ...deletedCommentThreads].forEach((commentThread) => {
                             const node = adaptable.api.gridApi.getRowNodeForPrimaryKey(commentThread.PrimaryKeyValue);
@@ -1273,12 +1273,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     }
                     return next(action);
                 }
-                case SystemRedux_1.SYSTEM_VISUAL_EXPORT_BEGIN:
-                case SystemRedux_1.SYSTEM_VISUAL_EXPORT_END: {
-                    let returnAction = next(action);
-                    adaptable.ReportService.resetExcelStyleMemoization();
-                    return returnAction;
-                }
                 /*******************
                  * CHARTING ACTIONS
                  *******************/

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,33 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommentsModule = void 0;
+exports.CommentModule = void 0;
 const tslib_1 = require("tslib");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ObjectFactory_1 = require("../Utilities/ObjectFactory");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
-/**
- * In the first iteration a cell can have only one note, the
- * notes is a list to allow further development.
- */
-class CommentsModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+class CommentModule extends AdaptableModuleBase_1.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() {
         this.loadComments();
     }
     isModuleAvailable() {
-        const options = this.adaptable.api.optionsApi.getCommentsOptions();
+        const options = this.adaptable.api.optionsApi.getCommentOptions();
         if (!options || !options.persistCommentThreads || !options.loadCommentThreads) {
             return false;
         }
+        if (this.api.optionsApi.getAutogeneratePrimaryKey()) {
+            return false;
+        }
         return super.isModuleAvailable();
     }
     async loadComments() {
         var _a, _b;
         const commentThreads = await ((_b = (_a = this.api.optionsApi
-            .getCommentsOptions()) === null || _a === void 0 ? void 0 : _a.loadCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+            .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.loadCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
         this.api.commentApi.loadCommentThreads(commentThreads);
     }
     addContextMenuItems(menuContext) {
@@ -36,11 +35,11 @@ class CommentsModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return undefined;
         }
         const items = [];
-        const isCellCommentable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentsOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
+        const isCellCommentable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
         if (!isCellCommentable ||
             isCellCommentable({
                 adaptableApi: this.adaptable.api,
-                address: {
+                cellAddress: {
                     PrimaryKeyValue: menuContext.primaryKeyValue,
                     ColumnId: menuContext.adaptableColumn.columnId,
                 },
@@ -83,4 +82,4 @@ class CommentsModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return items;
     }
 }
-exports.CommentsModule = CommentsModule;
+exports.CommentModule = CommentModule;

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

@@ -39,6 +39,10 @@ class LayoutModule extends AdaptableModuleBase_1.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();
@@ -53,9 +57,21 @@ class LayoutModule extends AdaptableModuleBase_1.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;
 }