@adaptabletools/adaptable-cjs 18.0.0-canary.8 → 18.0.0

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
      */
@@ -16,9 +16,9 @@ export interface AdaptableNote extends AdaptableObject {
     /**
      * When Note was made
      */
-    Timestamp: number;
+    Timestamp?: number;
     /**
-     * Value of the Note
+     * Content of the Note
      */
     Text: string;
     /**

package/src/PredefinedConfig/NoteState.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/PredefinedConfig/PlusMinusState.d.ts

@@ -1,5 +1,5 @@
 import { ConfigState } from './ConfigState';
-import { AdaptableScope } from './Common/AdaptableScope';
+import { ColumnScope } from './Common/ColumnScope';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
 import { SuspendableObject } from './Common/SuspendableObject';
 /**
@@ -18,7 +18,7 @@ export interface PlusMinusNudge extends SuspendableObject {
     /**
      * Where Rule is applied
      */
-    Scope: AdaptableScope;
+    Scope: ColumnScope;
     /**
      * Amount by which to update cell when Rule is applied
      */

package/src/PredefinedConfig/PopupState.d.ts

@@ -1,4 +1,4 @@
-import { ScreenPopup, ConfirmationPopup, PromptPopup, LoadingPopup, WindowPopup, FormPopup } from '../Utilities/Interface/MessagePopups';
+import { ScreenPopup, ConfirmationPopup, PromptPopup, WindowPopup, FormPopup } from '../Utilities/Interface/MessagePopups';
 import { InternalState } from './InternalState';
 /**
  * Internal state to manage open popups - NOT persisted by Redux
@@ -9,5 +9,4 @@ export interface PopupState extends InternalState {
     FormPopup: FormPopup;
     ConfirmationPopup: ConfirmationPopup;
     PromptPopup: PromptPopup;
-    LoadingPopup: LoadingPopup;
 }

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/ShortcutState.d.ts

@@ -1,5 +1,5 @@
 import { ConfigState } from './ConfigState';
-import { AdaptableScope } from './Common/AdaptableScope';
+import { ColumnScope } from './Common/ColumnScope';
 import { SuspendableObject } from './Common/SuspendableObject';
 /**
  * Predefined Configuration for Shortcut Module
@@ -21,7 +21,7 @@ export interface Shortcut extends SuspendableObject {
     /**
      * Numeric Columns where Shortcut is applied
      */
-    Scope: AdaptableScope<ShortcutScopeDataType>;
+    Scope: ColumnScope<ShortcutScopeDataType>;
     /**
      * Key which triggers the Shortcut when pressed
      */

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -3,6 +3,7 @@ import { SuspendableObject } from './Common/SuspendableObject';
 import { SparklineOptions } from '@ag-grid-community/core';
 import { AdaptableCustomIcon, AdaptableSystemIcon, AdaptablePredicate, AdaptableStyle } from '../types';
 import { TypeHint } from './Common/Types';
+import { RowScope } from "./Common/RowScope";
 /**
  * Predefined Configuration for Styled Column Module
  */
@@ -36,11 +37,6 @@ export interface StyledColumn extends SuspendableObject {
      * Displays cell values in Column as a Badge
      */
     BadgeStyle?: BadgeStyle;
-    /**
-     * Includes Styled Column in Grouped Rows
-     * @defaultValue false
-     */
-    IncludeGroupedRows?: boolean;
 }
 /**
  * Style used to display Percent Bars in Special Column Style
@@ -190,4 +186,8 @@ export interface BadgeStyle {
      * Collection of Badge Style Definitions
      */
     Badges?: BadgeStyleDefinition[];
+    /**
+     * Which types of Rows should contain a Badge (data, grouped, summary)
+     */
+    RowScope?: RowScope;
 }

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 { AdaptableFrameworkComponent, CellAddress, CellDataChangedInfo, CustomRenderFunction, 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 };
@@ -20,6 +19,10 @@ export type { OpenFinReport };
 type ROW_PRIMARY_KEY = string;
 type COLUMN_ID_OR_WHOLE_ROW_LABEL = string;
 export type DataChangeHistoryMode = 'ACTIVE' | 'INACTIVE' | 'SUSPENDED';
+export type SystemRowSummary = {
+    Position: 'Top' | 'Bottom';
+    RowData: Record<string, any>;
+};
 /**
  * Internal state, used by Adaptable during a session; none of it is provided through Predefined Config, nor is it persisted
  */
@@ -93,7 +96,7 @@ export interface SystemState extends InternalState, IPushPullState, OpenFinState
      */
     DisableDeleteConfirmation: boolean;
     Export: {
-        inProgressVisualData: boolean;
+        visualDataExportInProgress: boolean;
     };
     QuickSearch?: {
         floatingVisible?: boolean;
@@ -103,8 +106,13 @@ export interface SystemState extends InternalState, IPushPullState, OpenFinState
         focusedEntity?: 'Note' | 'Comment';
         popupPosition?: CellAddress | null;
     };
+    RowSummary?: {
+        rowSummaries?: SystemRowSummary[];
+    };
 }
 export interface ProgressIndicator {
     active: boolean;
-    label: string;
+    text?: string;
+    render?: CustomRenderFunction;
+    frameworkComponent?: AdaptableFrameworkComponent;
 }

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

@@ -71,9 +71,5 @@ export declare const CommentsDelete: ({ commentUuid, cellAddress, }: {
     commentUuid: AdaptableComment['Uuid'];
     cellAddress: CellAddress;
 }) => AdaptableCommentsDeleteAction;
-export declare const CommentsReady: (commentstate: CommentState) => NoteReadyAction;
-export declare const GetGridCellCommentsSelector: (state: CommentState, address: CellAddress) => CommentThread;
-export declare const GetCommentsSelector: (state: CommentState, address: CellAddress) => AdaptableComment[] | undefined;
-export declare const GetGetCommentsByUuidSelector: (state: CommentState, uuid: string) => AdaptableComment | undefined;
 export declare const GetCellCommentSelector: (state: CommentState, address: CellAddress) => CommentThread | undefined;
 export declare const CommentsReducer: Redux.Reducer<CommentState>;

package/src/Redux/ActionsReducers/CommentsRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommentsReducer = exports.GetCellCommentSelector = exports.GetGetCommentsByUuidSelector = exports.GetCommentsSelector = exports.GetGridCellCommentsSelector = exports.CommentsReady = exports.CommentsDelete = exports.CommentsEdit = exports.CommentsCellDelete = exports.CommentsCellAdd = exports.CommentsAdd = exports.CommentsSet = exports.COMMENTS_LOAD = exports.COMMENTS_READY = exports.COMMENTS_DELETE = exports.COMMENTS_EDIT = exports.COMMENTS_CELL_DELETE = exports.COMMENTS_CELL_ADD = exports.COMMENTS_ADD = void 0;
+exports.CommentsReducer = exports.GetCellCommentSelector = exports.CommentsDelete = exports.CommentsEdit = exports.CommentsCellDelete = exports.CommentsCellAdd = exports.CommentsAdd = exports.CommentsSet = exports.COMMENTS_LOAD = exports.COMMENTS_READY = exports.COMMENTS_DELETE = exports.COMMENTS_EDIT = exports.COMMENTS_CELL_DELETE = exports.COMMENTS_CELL_ADD = exports.COMMENTS_ADD = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
@@ -63,44 +63,6 @@ const CommentsDelete = ({ commentUuid, cellAddress, }) => ({
     commentUuid,
 });
 exports.CommentsDelete = CommentsDelete;
-const CommentsReady = (commentstate) => ({
-    type: exports.COMMENTS_READY,
-    commentState: commentstate,
-});
-exports.CommentsReady = CommentsReady;
-const GetGridCellCommentsSelector = (state, address) => {
-    var _a;
-    if (!address) {
-        return null;
-    }
-    return ((_a = state === null || state === void 0 ? void 0 : state.CommentThreads) !== null && _a !== void 0 ? _a : []).find((cellComments) => {
-        return CellPopupService_1.CellPopupService.isSameAddress(cellComments, address);
-    });
-};
-exports.GetGridCellCommentsSelector = GetGridCellCommentsSelector;
-const GetCommentsSelector = (state, address) => {
-    var _a, _b;
-    if (!address) {
-        return [];
-    }
-    const comments = (_b = ((_a = state === null || state === void 0 ? void 0 : state.CommentThreads) !== null && _a !== void 0 ? _a : []).find((cellComments) => {
-        return CellPopupService_1.CellPopupService.isSameAddress(cellComments, address);
-    })) === null || _b === void 0 ? void 0 : _b.Comments;
-    return comments;
-};
-exports.GetCommentsSelector = GetCommentsSelector;
-const GetGetCommentsByUuidSelector = (state, uuid) => {
-    var _a;
-    for (const commentThread of (_a = state.CommentThreads) !== null && _a !== void 0 ? _a : []) {
-        for (const comment of commentThread.Comments) {
-            if (comment.Uuid === uuid) {
-                return comment;
-            }
-        }
-    }
-    return undefined;
-};
-exports.GetGetCommentsByUuidSelector = GetGetCommentsByUuidSelector;
 const GetCellCommentSelector = (state, address) => {
     var _a;
     if (!address) {

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

@@ -30,6 +30,10 @@ export declare const LAYOUT_SELECT = "LAYOUT_SELECT";
  * @ReduxAction A Layout has been (auto)saved
  */
 export declare const LAYOUT_SAVE = "LAYOUT_SAVE";
+/**
+ * @ReduxAction A Column has been added
+ */
+export declare const LAYOUT_ADD_COLUMN = "LAYOUT_ADD_COLUMN";
 /**
  * @ReduxAction A Column has been removed
  */
@@ -145,6 +149,10 @@ export interface LayoutSetColumnCaptionAction extends Redux.Action {
     columnId: string;
     caption: string;
 }
+export interface LayoutAddColumnAction extends Redux.Action {
+    layoutName: string;
+    columnId: string;
+}
 export interface LayoutRemoveColumnAction extends Redux.Action {
     layoutName: string;
     columnId: string;
@@ -163,6 +171,7 @@ export declare const LayoutAdd: (layout: Layout) => LayoutAddAction;
 export declare const LayoutDelete: (layout: Layout) => LayoutDeleteAction;
 export declare const LayoutSave: (layout: Layout) => LayoutSaveAction;
 export declare const LayoutSetColumnCaption: (layoutName: string, columnId: string, caption: string) => LayoutSetColumnCaptionAction;
+export declare const LayoutAddColumn: (layoutName: string, columnId: string) => LayoutAddColumnAction;
 export declare const LayoutRemoveColumn: (layoutName: string, columnId: string) => LayoutRemoveColumnAction;
 export declare const LayoutSelect: (layoutName: string) => LayoutSelectAction;
 export declare const LayoutReady: (layoutState: LayoutState) => LayoutReadyAction;

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LayoutReducer = exports.getColumnFilterSelector = exports.LayoutReady = exports.LayoutSelect = exports.LayoutRemoveColumn = exports.LayoutSetColumnCaption = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LayoutGridFilterClear = exports.LayoutGridFilterUnSuspend = exports.LayoutGridFilterSuspend = exports.LayoutGridFilterSet = exports.LayoutColumnFilterUnSuspendAll = exports.LayoutColumnFilterSuspendAll = exports.LayoutColumnFilterUnSuspend = exports.LayoutColumnFilterSuspend = exports.LayoutColumnFilterClear = exports.LayoutColumnFilterClearAll = exports.LayoutColumnFilterSet = exports.LayoutColumnFilterEdit = exports.LayoutColumnFilterAdd = exports.LAYOUT_GRID_FILTER_CLEAR = exports.LAYOUT_GRID_FILTER_SET = exports.LAYOUT_GRID_FILTER_UNSUSPEND = exports.LAYOUT_GRID_FILTER_SUSPEND = exports.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL = exports.LAYOUT_COLUMN_FILTER_SUSPEND_ALL = exports.LAYOUT_COLUMN_FILTER_UNSUSPEND = exports.LAYOUT_COLUMN_FILTER_SUSPEND = exports.LAYOUT_COLUMN_FILTER_CLEAR = exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_COLUMN_FILTER_SET = exports.LAYOUT_COLUMN_FILTER_EDIT = exports.LAYOUT_COLUMN_FILTER_ADD = exports.LAYOUT_REMOVE_COLUMN = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = exports.LAYOUT_READY = exports.LAYOUT_SET_COLUMN_CAPTION = void 0;
+exports.LayoutReducer = exports.getColumnFilterSelector = exports.LayoutReady = exports.LayoutSelect = exports.LayoutRemoveColumn = exports.LayoutAddColumn = exports.LayoutSetColumnCaption = exports.LayoutSave = exports.LayoutDelete = exports.LayoutAdd = exports.LayoutGridFilterClear = exports.LayoutGridFilterUnSuspend = exports.LayoutGridFilterSuspend = exports.LayoutGridFilterSet = exports.LayoutColumnFilterUnSuspendAll = exports.LayoutColumnFilterSuspendAll = exports.LayoutColumnFilterUnSuspend = exports.LayoutColumnFilterSuspend = exports.LayoutColumnFilterClear = exports.LayoutColumnFilterClearAll = exports.LayoutColumnFilterSet = exports.LayoutColumnFilterEdit = exports.LayoutColumnFilterAdd = exports.LAYOUT_GRID_FILTER_CLEAR = exports.LAYOUT_GRID_FILTER_SET = exports.LAYOUT_GRID_FILTER_UNSUSPEND = exports.LAYOUT_GRID_FILTER_SUSPEND = exports.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL = exports.LAYOUT_COLUMN_FILTER_SUSPEND_ALL = exports.LAYOUT_COLUMN_FILTER_UNSUSPEND = exports.LAYOUT_COLUMN_FILTER_SUSPEND = exports.LAYOUT_COLUMN_FILTER_CLEAR = exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL = exports.LAYOUT_COLUMN_FILTER_SET = exports.LAYOUT_COLUMN_FILTER_EDIT = exports.LAYOUT_COLUMN_FILTER_ADD = exports.LAYOUT_REMOVE_COLUMN = exports.LAYOUT_ADD_COLUMN = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = exports.LAYOUT_READY = exports.LAYOUT_SET_COLUMN_CAPTION = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
@@ -32,6 +32,10 @@ exports.LAYOUT_SELECT = 'LAYOUT_SELECT';
  * @ReduxAction A Layout has been (auto)saved
  */
 exports.LAYOUT_SAVE = 'LAYOUT_SAVE';
+/**
+ * @ReduxAction A Column has been added
+ */
+exports.LAYOUT_ADD_COLUMN = 'LAYOUT_ADD_COLUMN';
 /**
  * @ReduxAction A Column has been removed
  */
@@ -170,6 +174,12 @@ const LayoutSetColumnCaption = (layoutName, columnId, caption) => ({
     caption,
 });
 exports.LayoutSetColumnCaption = LayoutSetColumnCaption;
+const LayoutAddColumn = (layoutName, columnId) => ({
+    type: exports.LAYOUT_ADD_COLUMN,
+    layoutName,
+    columnId,
+});
+exports.LayoutAddColumn = LayoutAddColumn;
 const LayoutRemoveColumn = (layoutName, columnId) => ({
     type: exports.LAYOUT_REMOVE_COLUMN,
     layoutName,
@@ -243,6 +253,17 @@ const LayoutReducer = (state = initialState, action) => {
             }
             return state;
         }
+        case exports.LAYOUT_ADD_COLUMN: {
+            const addColumnAction = action;
+            const layoutname = addColumnAction.layoutName;
+            const colToAdd = addColumnAction.columnId;
+            let layoutToUpdate = state.Layouts.find((l) => l.Name === layoutname);
+            if (layoutToUpdate) {
+                layoutToUpdate.Columns.push(colToAdd);
+                return Object.assign(Object.assign({}, state), { Layouts: state.Layouts.map((abObject) => abObject.Uuid === layoutToUpdate.Uuid ? layoutToUpdate : abObject) });
+            }
+            return state;
+        }
         case exports.LAYOUT_REMOVE_COLUMN: {
             const removeColumnAction = action;
             const layoutname = removeColumnAction.layoutName;
@@ -274,8 +295,10 @@ const LayoutReducer = (state = initialState, action) => {
             return Object.assign(Object.assign({}, state), { Layouts });
         }
         case exports.LAYOUT_COLUMN_FILTER_ADD: {
-            let columnFilters = [...((_b = currentLayout.ColumnFilters) !== null && _b !== void 0 ? _b : [])];
             const columnFilterAction = action.columnFilter;
+            let columnFilters = ((_b = currentLayout.ColumnFilters) !== null && _b !== void 0 ? _b : []).filter(
+            // make sure we are not adding a filter that already exists
+            (cf) => cf.ColumnId !== columnFilterAction.ColumnId);
             AdaptableHelper_1.default.addUuidAndSource(columnFilterAction);
             columnFilters.push(columnFilterAction);
             const Layouts = state.Layouts.map((layout) => {
@@ -288,10 +311,13 @@ const LayoutReducer = (state = initialState, action) => {
         }
         case exports.LAYOUT_COLUMN_FILTER_EDIT: {
             const columnFilterAction = action.columnFilter;
-            let columnFilters = ((_c = currentLayout.ColumnFilters) !== null && _c !== void 0 ? _c : []).map((abObject) => abObject.Uuid === columnFilterAction.Uuid ? columnFilterAction : abObject);
+            // it is safer to change the col id, we cannot have multiple filter on the same id
+            // first we filter out other filters with the same colId, to ensure we have only one
+            const cleanColumnFilters = ((_c = currentLayout.ColumnFilters) !== null && _c !== void 0 ? _c : []).filter((cf) => cf.ColumnId !== columnFilterAction.ColumnId);
+            cleanColumnFilters.push(columnFilterAction);
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                    return Object.assign(Object.assign({}, layout), { ColumnFilters: cleanColumnFilters });
                 }
                 return layout;
             });
@@ -307,14 +333,11 @@ const LayoutReducer = (state = initialState, action) => {
             return Object.assign(Object.assign({}, state), { Layouts });
         }
         case exports.LAYOUT_COLUMN_FILTER_CLEAR: {
-            let columnFilters = [...((_d = currentLayout.ColumnFilters) !== null && _d !== void 0 ? _d : [])];
             const actionTypedDelete = action;
-            const index = actionTypedDelete.columnFilter
-                ? columnFilters.findIndex((i) => i.Uuid == actionTypedDelete.columnFilter.Uuid)
-                : -1;
-            if (index != -1) {
-                columnFilters.splice(index, 1);
-            }
+            const columnFilters = ((_d = currentLayout.ColumnFilters) !== null && _d !== void 0 ? _d : []).filter((cf) => {
+                // make sure we are deleting all filters on the same column
+                return cf.ColumnId !== actionTypedDelete.columnFilter.ColumnId;
+            });
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
                     return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });

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 GetNoteSelector: (state: NoteState, address: CellAddress) => AdaptableNote;
+export declare const NoteReducer: Redux.Reducer<NoteState>;

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

@@ -1,53 +1,53 @@
 "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.GetNoteSelector = 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) => {
+const GetNoteSelector = (state, address) => {
     var _a;
     if (!address) {
-        return [];
+        return null;
     }
-    return ((_a = state === null || state === void 0 ? void 0 : state.Notes) !== null && _a !== void 0 ? _a : []).filter((note) => {
+    return ((_a = state === null || state === void 0 ? void 0 : state.Notes) !== null && _a !== void 0 ? _a : []).find((note) => {
         if (note.PrimaryKeyValue === address.PrimaryKeyValue && note.ColumnId === address.ColumnId) {
             // happy check
             return true;
@@ -61,24 +61,24 @@ const GetNotesSelector = (state, address) => {
         return false;
     });
 };
-exports.GetNotesSelector = GetNotesSelector;
+exports.GetNoteSelector = GetNoteSelector;
 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/PopupRedux.d.ts

@@ -1,15 +1,13 @@
 import * as Redux from 'redux';
-import { PopupState } from '../../PredefinedConfig/PopupState';
-import { InputAction, UIPrompt, UIConfirmation } from '../../Utilities/Interface/MessagePopups';
-import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableForm, BaseContext } from '../../types';
 import { FormContext } from '../../PredefinedConfig/Common/FormContext';
+import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
+import { PopupState } from '../../PredefinedConfig/PopupState';
+import { AdaptableForm, BaseContext } from '../../types';
+import { InputAction, UIConfirmation, UIPrompt } from '../../Utilities/Interface/MessagePopups';
+import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 export declare const POPUP_SHOW_SCREEN = "POPUP_SHOW_SCREEN";
 export declare const POPUP_HIDE_SCREEN = "POPUP_HIDE_SCREEN";
-export declare const POPUP_SHOW_LOADING = "POPUP_SHOW_LOADING";
-export declare const POPUP_HIDE_LOADING = "POPUP_HIDE_LOADING";
 export declare const POPUP_SHOW_ALERT = "POPUP_SHOW_ALERT";
 export declare const POPUP_SHOW_PROMPT = "POPUP_SHOW_PROMPT";
 export declare const POPUP_HIDE_PROMPT = "POPUP_HIDE_PROMPT";
@@ -51,10 +49,6 @@ export interface PopupShowFormAction extends Redux.Action {
 export interface PopupHideFormAction extends Redux.Action {
     Id: string;
 }
-export interface PopupShowLoadingAction extends Redux.Action {
-}
-export interface PopupHideLoadingAction extends Redux.Action {
-}
 export interface PopupShowAlertAction extends Redux.Action {
     alert: AdaptableAlert;
 }
@@ -97,8 +91,6 @@ export declare const PopupShowForm: (config: {
 }) => PopupShowFormAction;
 export declare const PopupHideForm: (id: string) => PopupHideFormAction;
 export declare const PopupShowAlert: (alert: AdaptableAlert) => PopupShowAlertAction;
-export declare const PopupShowLoading: () => PopupShowLoadingAction;
-export declare const PopupHideLoading: () => PopupHideLoadingAction;
 export declare const PopupShowPrompt: (prompt: UIPrompt) => PopupShowPromptAction;
 export declare const PopupHidePrompt: () => PopupHidePromptAction;
 export declare const PopupConfirmPrompt: (inputText: string) => PopupConfirmPromptAction;

package/src/Redux/ActionsReducers/PopupRedux.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PopupReducer = exports.PopupClearParam = exports.PopupCancelConfirmation = exports.PopupConfirmConfirmation = exports.PopupShowConfirmation = exports.PopupConfirmPrompt = exports.PopupHidePrompt = exports.PopupShowPrompt = exports.PopupHideLoading = exports.PopupShowLoading = exports.PopupShowAlert = exports.PopupHideForm = exports.PopupShowForm = exports.PopupHideWindow = exports.PopupShowWindow = exports.PopupHideScreen = exports.PopupShowScreen = exports.POPUP_HIDE_FORM = exports.POPUP_SHOW_FORM = exports.POPUP_HIDE_WINDOW = exports.POPUP_SHOW_WINDOW = exports.POPUP_CLEAR_PARAM = exports.POPUP_CANCEL_CONFIRMATION = exports.POPUP_CONFIRM_CONFIRMATION = exports.POPUP_SHOW_CONFIRMATION = exports.POPUP_CONFIRM_PROMPT = exports.POPUP_HIDE_PROMPT = exports.POPUP_SHOW_PROMPT = exports.POPUP_SHOW_ALERT = exports.POPUP_HIDE_LOADING = exports.POPUP_SHOW_LOADING = exports.POPUP_HIDE_SCREEN = exports.POPUP_SHOW_SCREEN = void 0;
+exports.PopupReducer = exports.PopupClearParam = exports.PopupCancelConfirmation = exports.PopupConfirmConfirmation = exports.PopupShowConfirmation = exports.PopupConfirmPrompt = exports.PopupHidePrompt = exports.PopupShowPrompt = exports.PopupShowAlert = exports.PopupHideForm = exports.PopupShowForm = exports.PopupHideWindow = exports.PopupShowWindow = exports.PopupHideScreen = exports.PopupShowScreen = exports.POPUP_HIDE_FORM = exports.POPUP_SHOW_FORM = exports.POPUP_HIDE_WINDOW = exports.POPUP_SHOW_WINDOW = exports.POPUP_CLEAR_PARAM = exports.POPUP_CANCEL_CONFIRMATION = exports.POPUP_CONFIRM_CONFIRMATION = exports.POPUP_SHOW_CONFIRMATION = exports.POPUP_CONFIRM_PROMPT = exports.POPUP_HIDE_PROMPT = exports.POPUP_SHOW_PROMPT = exports.POPUP_SHOW_ALERT = exports.POPUP_HIDE_SCREEN = exports.POPUP_SHOW_SCREEN = void 0;
 exports.POPUP_SHOW_SCREEN = 'POPUP_SHOW_SCREEN';
 exports.POPUP_HIDE_SCREEN = 'POPUP_HIDE_SCREEN';
-exports.POPUP_SHOW_LOADING = 'POPUP_SHOW_LOADING';
-exports.POPUP_HIDE_LOADING = 'POPUP_HIDE_LOADING';
 exports.POPUP_SHOW_ALERT = 'POPUP_SHOW_ALERT';
 exports.POPUP_SHOW_PROMPT = 'POPUP_SHOW_PROMPT';
 exports.POPUP_HIDE_PROMPT = 'POPUP_HIDE_PROMPT';
@@ -63,14 +61,6 @@ const PopupShowAlert = (alert) => {
     };
 };
 exports.PopupShowAlert = PopupShowAlert;
-const PopupShowLoading = () => ({
-    type: exports.POPUP_SHOW_LOADING,
-});
-exports.PopupShowLoading = PopupShowLoading;
-const PopupHideLoading = () => ({
-    type: exports.POPUP_HIDE_LOADING,
-});
-exports.PopupHideLoading = PopupHideLoading;
 const PopupShowPrompt = (prompt) => ({
     type: exports.POPUP_SHOW_PROMPT,
     prompt: prompt,
@@ -110,9 +100,6 @@ const initialState = {
         ComponentName: '',
         Params: null,
     },
-    LoadingPopup: {
-        ShowLoadingPopup: true,
-    },
     ConfirmationPopup: {
         ShowConfirmationPopup: false,
         Msg: '',
@@ -248,14 +235,6 @@ const PopupReducer = (state = initialState, action) => {
                 ConfirmationPopup: newConfirmationPopup,
             });
         }
-        case exports.POPUP_SHOW_LOADING: {
-            let newLoadingPopup = { ShowLoadingPopup: true };
-            return Object.assign({}, state, { LoadingPopup: newLoadingPopup });
-        }
-        case exports.POPUP_HIDE_LOADING: {
-            let newLoadingPopup = { ShowLoadingPopup: false };
-            return Object.assign({}, state, { LoadingPopup: newLoadingPopup });
-        }
         case exports.POPUP_CLEAR_PARAM: {
             let newScreenPopup = {
                 ShowScreenPopup: state.ScreenPopup.ShowScreenPopup,