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

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -28,6 +28,10 @@ export const LAYOUT_SELECT = 'LAYOUT_SELECT';
  * @ReduxAction A Layout has been (auto)saved
  */
 export const LAYOUT_SAVE = 'LAYOUT_SAVE';
+/**
+ * @ReduxAction A Column has been added
+ */
+export const LAYOUT_ADD_COLUMN = 'LAYOUT_ADD_COLUMN';
 /**
  * @ReduxAction A Column has been removed
  */
@@ -149,6 +153,11 @@ export const LayoutSetColumnCaption = (layoutName, columnId, caption) => ({
     columnId,
     caption,
 });
+export const LayoutAddColumn = (layoutName, columnId) => ({
+    type: LAYOUT_ADD_COLUMN,
+    layoutName,
+    columnId,
+});
 export const LayoutRemoveColumn = (layoutName, columnId) => ({
     type: LAYOUT_REMOVE_COLUMN,
     layoutName,
@@ -218,6 +227,17 @@ export const LayoutReducer = (state = initialState, action) => {
             }
             return state;
         }
+        case 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 LAYOUT_REMOVE_COLUMN: {
             const removeColumnAction = action;
             const layoutname = removeColumnAction.layoutName;
@@ -249,8 +269,10 @@ export const LayoutReducer = (state = initialState, action) => {
             return Object.assign(Object.assign({}, state), { Layouts });
         }
         case 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.addUuidAndSource(columnFilterAction);
             columnFilters.push(columnFilterAction);
             const Layouts = state.Layouts.map((layout) => {
@@ -263,10 +285,13 @@ export const LayoutReducer = (state = initialState, action) => {
         }
         case 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;
             });
@@ -282,14 +307,11 @@ export const LayoutReducer = (state = initialState, action) => {
             return Object.assign(Object.assign({}, state), { Layouts });
         }
         case 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 GetNotesSelector: (state: NoteState, address: CellAddress) => AdaptableNote[];
+export declare const NoteReducer: Redux.Reducer<NoteState>;

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

@@ -1,52 +1,53 @@
 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,
-    notesState: note,
+export const NoteReady = (note) => ({
+    type: NOTE_READY,
+    noteState: note,
 });
-export const GetNotesSelector = (state, config) => {
+export const GetAllNotesSelector = (state) => state.Notes;
+export const GetNotesSelector = (state, address) => {
     var _a;
-    if (!config) {
+    if (!address) {
         return [];
     }
     return ((_a = state === null || state === void 0 ? void 0 : state.Notes) !== null && _a !== void 0 ? _a : []).filter((note) => {
-        if (note.PrimaryKeyValue === config.PrimaryKeyValue && note.ColumnId === config.ColumnId) {
+        if (note.PrimaryKeyValue === address.PrimaryKeyValue && note.ColumnId === address.ColumnId) {
             // happy check
             return true;
         }
         // Primary keys retreived from the grid dom are always strings, so we must also consider them strings
-        if ((typeof config.PrimaryKeyValue === 'number' && typeof note.PrimaryKeyValue === 'string') ||
-            (typeof config.PrimaryKeyValue === 'string' && typeof note.PrimaryKeyValue === 'number')) {
-            return (note.PrimaryKeyValue.toString() === config.PrimaryKeyValue.toString() &&
-                note.ColumnId === config.ColumnId);
+        if ((typeof address.PrimaryKeyValue === 'number' && typeof note.PrimaryKeyValue === 'string') ||
+            (typeof address.PrimaryKeyValue === 'string' && typeof note.PrimaryKeyValue === 'number')) {
+            return (note.PrimaryKeyValue.toString() === address.PrimaryKeyValue.toString() &&
+                note.ColumnId === address.ColumnId);
         }
         return false;
     });
@@ -54,20 +55,20 @@ export const GetNotesSelector = (state, config) => {
 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

@@ -77,6 +77,7 @@ export declare const SYSTEM_VISUAL_EXPORT_END = "SYSTEM_VISUAL_EXPORT_END";
 export declare const SYSTEM_CELL_POPUP_SHOW = "SYSTEM_CELL_POPUP_SHOW";
 export declare const SYSTEM_CELL_POPUP_HIDE = "SYSTEM_CELL_POPUP_HIDE";
 export declare const SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY = "SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY";
+export declare const SYSTEM_SUMMARY_ROW_SET = "SYSTEM_SUMMARY_ROW_SET";
 export declare const DATA_IMPORT_COMPLETED = "DATA_IMPORT_COMPLETED";
 export interface DataImportCompletedAction extends Redux.Action {
     dataImportedInfo: DataImportedInfo;
@@ -328,12 +329,16 @@ export declare const SystemVisualExportEnd: () => SystemVisualExportEndAction;
 export declare const SystemQuickSearchFloatingVisibility: (visible: boolean) => SystemQuickSearchFloatingVisibilityAction;
 export declare const SystemCellPopupShow: (cellPosition: CellAddress, editMode?: boolean) => SystemCellPopupShowAction;
 export declare const SystemCellPopupEditFocusedEntity: (focusedEntity: 'Note' | 'Comment') => SystemCellPopupEditFocusedEntityAction;
+export declare const SystemRowSummarySet: (systemRowSummaries: SystemState['RowSummary']['rowSummaries']) => {
+    readonly type: "SYSTEM_SUMMARY_ROW_SET";
+    readonly rowSummaries: import("../../PredefinedConfig/SystemState").SystemRowSummary[];
+};
 export declare const SystemCellPopupHide: () => SystemCellPopupHideAction;
 export declare const SystemDisableDeleteConfirmationSelector: (state: SystemState) => boolean;
 export declare const SystemPreviousGroupedColumnsSelector: (state: SystemState) => Record<string, Record<string, number>>;
 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

@@ -87,10 +87,12 @@ export const SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY = 'SYSTEM_SET_QUICK_SEA
 // Data Export (Report)
 export const SYSTEM_VISUAL_EXPORT_BEGIN = 'SYSTEM_VISUAL_EXPORT_BEGIN';
 export const SYSTEM_VISUAL_EXPORT_END = 'SYSTEM_VISUAL_EXPORT_END';
-// Notes
+// Notes and Comments
 export const SYSTEM_CELL_POPUP_SHOW = 'SYSTEM_CELL_POPUP_SHOW';
 export const SYSTEM_CELL_POPUP_HIDE = 'SYSTEM_CELL_POPUP_HIDE';
 export const SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY = 'SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY';
+// Row Summaries
+export const SYSTEM_SUMMARY_ROW_SET = 'SYSTEM_SUMMARY_ROW_SET';
 // Data Import
 export const DATA_IMPORT_COMPLETED = 'DATA_IMPORT_COMPLETED';
 export const SystemHighlightCellAdd = (cellHighlightInfo) => ({
@@ -316,6 +318,10 @@ export const SystemCellPopupEditFocusedEntity = (focusedEntity) => ({
     type: SYSTEM_CELL_POPUP_EDIT_FOCUSED_ENTITY,
     focusedEntity,
 });
+export const SystemRowSummarySet = (systemRowSummaries) => ({
+    type: SYSTEM_SUMMARY_ROW_SET,
+    rowSummaries: systemRowSummaries,
+});
 export const SystemCellPopupHide = () => ({
     type: SYSTEM_CELL_POPUP_HIDE,
 });
@@ -389,7 +395,7 @@ const initialState = {
     },
     DisableDeleteConfirmation: false,
     Export: {
-        inProgressVisualData: false,
+        visualDataExportInProgress: false,
     },
 };
 export const SystemReducer = (state = initialState, action) => {
@@ -722,12 +728,12 @@ export const SystemReducer = (state = initialState, action) => {
         }
         case SYSTEM_VISUAL_EXPORT_BEGIN: {
             return Object.assign(Object.assign({}, state), { Export: {
-                    inProgressVisualData: true,
+                    visualDataExportInProgress: true,
                 } });
         }
         case SYSTEM_VISUAL_EXPORT_END: {
             return Object.assign(Object.assign({}, state), { Export: {
-                    inProgressVisualData: false,
+                    visualDataExportInProgress: false,
                 } });
         }
         case SYSTEM_SET_QUICK_SEARCH_FLOATING_VISIBILITY: {
@@ -758,6 +764,12 @@ export const SystemReducer = (state = initialState, action) => {
                     popupPosition: null,
                 } });
         }
+        case SYSTEM_SUMMARY_ROW_SET: {
+            const typedAction = action;
+            return Object.assign(Object.assign({}, state), { RowSummary: {
+                    rowSummaries: typedAction.rowSummaries,
+                } });
+        }
         default:
             return state;
     }

package/src/Redux/Store/AdaptableStore.d.ts

@@ -2,8 +2,7 @@ import * as Redux from 'redux';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
 import { ConfigState } from '../../PredefinedConfig/ConfigState';
-import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
-import { IAdaptableStore } from './Interface/IAdaptableStore';
+import { IAdaptableStore, LoadStoreConfig } from './Interface/IAdaptableStore';
 type EmitterCallback = (data?: any) => any;
 type EmitterAnyCallback = (eventName: string, data?: any) => any;
 export declare const INIT_STATE = "INIT_STATE";
@@ -22,7 +21,6 @@ export declare const LoadState: (State: {
     [s: string]: ConfigState;
 }) => LoadStateAction;
 export declare class AdaptableStore implements IAdaptableStore {
-    private isAgGridReady;
     TheStore: Redux.Store<AdaptableState>;
     Load: Promise<any>;
     private emitter;
@@ -36,12 +34,12 @@ export declare class AdaptableStore implements IAdaptableStore {
     /**
      *
      * @param adaptable The Adaptable instance
-     * @param isAgGridReady A promise which is resolved when AG Grid is ready for binding
+     * @param postLoadHook A function that hydrates the state after it has been loaded from storage
      */
-    constructor(adaptable: IAdaptable, isAgGridReady: Promise<any>);
+    constructor(adaptable: IAdaptable);
     destroy(): void;
     getCurrentStorageState(): AdaptableState;
     saveStateNow(adaptable: IAdaptable): Promise<any>;
-    loadStore: (adaptable: IAdaptable, adaptableStateKey: string, predefinedConfig?: PredefinedConfig) => Promise<any>;
+    loadStore: (config: LoadStoreConfig) => Promise<any>;
 }
 export {};