@adaptabletools/adaptable-cjs 19.2.3 → 20.0.0-canary.0

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

@@ -175,5 +175,17 @@ export declare const LayoutAddColumn: (layoutName: string, columnId: string) =>
 export declare const LayoutRemoveColumn: (layoutName: string, columnId: string) => LayoutRemoveColumnAction;
 export declare const LayoutSelect: (layoutName: string) => LayoutSelectAction;
 export declare const LayoutReady: (layoutState: LayoutState) => LayoutReadyAction;
-export declare const getColumnFilterSelector: (state: AdaptableState) => ColumnFilter[];
+export declare const getColumnFiltersSelector: (state: AdaptableState) => ColumnFilter[];
+export declare const getCurrentLayoutSelector: (state: AdaptableState) => Layout;
+export declare const getColumnFilterSelector: (state: AdaptableState, columnId: string) => {
+    ColumnId: string;
+    Predicates: import("../../types").ColumnFilterPredicate[];
+    PredicatesLogic?: "AND" | "OR";
+    IsSuspended?: boolean;
+    Uuid?: string;
+    Source?: "Config" | "User";
+    AdaptableVersion?: `${string}.${string}.${string}`;
+    IsReadOnly?: boolean;
+    Tags?: string[];
+};
 export declare const LayoutReducer: Redux.Reducer<LayoutState>;

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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_COLUMN_REMOVE = exports.LAYOUT_COLUMN_ADD = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = exports.LAYOUT_READY = exports.LAYOUT_COLUMN_SET_CAPTION = void 0;
+exports.LayoutReducer = exports.getColumnFilterSelector = exports.getCurrentLayoutSelector = exports.getColumnFiltersSelector = 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_COLUMN_REMOVE = exports.LAYOUT_COLUMN_ADD = exports.LAYOUT_SAVE = exports.LAYOUT_SELECT = exports.LAYOUT_DELETE = exports.LAYOUT_EDIT = exports.LAYOUT_ADD = exports.LAYOUT_READY = exports.LAYOUT_COLUMN_SET_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"));
+const LayoutHelpers_1 = require("../../Api/Implementation/LayoutHelpers");
 /**
  * @ReduxAction A new caption / header has been set for a Column in the Layout
  */
@@ -154,7 +155,7 @@ const LayoutGridFilterClear = () => ({
 exports.LayoutGridFilterClear = LayoutGridFilterClear;
 const LayoutAdd = (layout) => ({
     type: exports.LAYOUT_ADD,
-    layout,
+    layout: (0, LayoutHelpers_1.normalizeLayout)(layout),
 });
 exports.LayoutAdd = LayoutAdd;
 const LayoutDelete = (layout) => ({
@@ -164,7 +165,7 @@ const LayoutDelete = (layout) => ({
 exports.LayoutDelete = LayoutDelete;
 const LayoutSave = (layout) => ({
     type: exports.LAYOUT_SAVE,
-    layout,
+    layout: (0, LayoutHelpers_1.normalizeLayout)(layout),
 });
 exports.LayoutSave = LayoutSave;
 const LayoutSetColumnCaption = (layoutName, columnId, caption) => ({
@@ -196,23 +197,26 @@ const LayoutReady = (layoutState) => ({
     layoutState,
 });
 exports.LayoutReady = LayoutReady;
-const getColumnFilterSelector = (state) => {
-    var _a, _b, _c, _d;
-    // in case of non-saving Layouts, we load the current Layout(possibly draft) from GridState
-    const currentLayout = state.Grid.CurrentLayout
-        ? state.Grid.CurrentLayout
-        : (_c = (_b = (_a = state.Layout) === null || _a === void 0 ? void 0 : _a.Layouts) === null || _b === void 0 ? void 0 : _b.find) === null || _c === void 0 ? void 0 : _c.call(_b, (layout) => layout.Name === state.Layout.CurrentLayout);
-    return (_d = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.ColumnFilters) !== null && _d !== void 0 ? _d : [];
+const getColumnFiltersSelector = (state) => {
+    const currentLayout = (0, exports.getCurrentLayoutSelector)(state);
+    return currentLayout?.ColumnFilters ?? [];
+};
+exports.getColumnFiltersSelector = getColumnFiltersSelector;
+const getCurrentLayoutSelector = (state) => {
+    return state.Layout.Layouts?.find((layout) => layout.Name === state.Layout.CurrentLayout);
+};
+exports.getCurrentLayoutSelector = getCurrentLayoutSelector;
+const getColumnFilterSelector = (state, columnId) => {
+    return { ...(0, exports.getColumnFiltersSelector)(state).find((cf) => cf.ColumnId === columnId) };
 };
 exports.getColumnFilterSelector = getColumnFilterSelector;
 const initialState = {
     CurrentLayout: GeneralConstants_1.EMPTY_STRING,
-    Layouts: GeneralConstants_1.EMPTY_ARRAY,
+    Layouts: undefined,
 };
 const LayoutReducer = (state = initialState, action) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     let layouts;
-    const currentLayout = state.Layouts.find((layout) => layout.Name === state.CurrentLayout);
+    const currentLayout = state.Layouts?.find((layout) => layout.Name === state.CurrentLayout);
     switch (action.type) {
         case exports.LAYOUT_SELECT: {
             const newCurrentLayout = action.layoutName;
@@ -223,29 +227,36 @@ const LayoutReducer = (state = initialState, action) => {
         }
         case exports.LAYOUT_ADD: {
             const actionLayout = action.layout;
-            AdaptableHelper_1.default.addUuidAndSource(actionLayout);
-            layouts = [].concat(state.Layouts);
+            AdaptableHelper_1.default.addAdaptableObjectPrimitives(actionLayout);
+            layouts = [].concat(state.Layouts || []);
             layouts.push(actionLayout);
-            return Object.assign(Object.assign({}, state), { Layouts: layouts });
+            return { ...state, Layouts: layouts };
         }
         case exports.LAYOUT_SAVE: {
             const actionLayout = action.layout;
-            return Object.assign(Object.assign({}, state), { Layouts: state.Layouts.map((abObject) => abObject.Uuid === actionLayout.Uuid ? actionLayout : abObject) });
+            return {
+                ...state,
+                Layouts: state.Layouts.map((abObject) => abObject.Uuid === actionLayout.Uuid ? actionLayout : abObject),
+            };
         }
         case exports.LAYOUT_DELETE: {
             const actionLayout = action.layout;
             const newLayouts = state.Layouts.filter((abObject) => abObject.Uuid !== actionLayout.Uuid);
-            return Object.assign(Object.assign({}, state), { CurrentLayout: state.CurrentLayout === actionLayout.Name ? newLayouts[0].Name : state.CurrentLayout, Layouts: newLayouts });
+            return {
+                ...state,
+                CurrentLayout: state.CurrentLayout === actionLayout.Name ? newLayouts[0].Name : state.CurrentLayout,
+                Layouts: newLayouts,
+            };
         }
         case exports.LAYOUT_COLUMN_SET_CAPTION: {
             const setColumnCaptionAction = action;
             const currentLayoutName = setColumnCaptionAction.layoutName;
             let currentLayout = state.Layouts.find((l) => l.Name === currentLayoutName);
             if (currentLayout) {
-                if (!currentLayout.ColumnHeadersMap) {
-                    currentLayout.ColumnHeadersMap = {};
+                if (!currentLayout.ColumnHeaders) {
+                    currentLayout.ColumnHeaders = {};
                 }
-                currentLayout.ColumnHeadersMap[setColumnCaptionAction.columnId] =
+                currentLayout.ColumnHeaders[setColumnCaptionAction.columnId] =
                     setColumnCaptionAction.caption;
                 return Object.assign({}, state, {
                     Layouts: state.Layouts.map((abObject) => abObject.Uuid === currentLayout.Uuid ? currentLayout : abObject),
@@ -259,8 +270,11 @@ const LayoutReducer = (state = initialState, action) => {
             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) });
+                layoutToUpdate.TableColumns.push(colToAdd);
+                return {
+                    ...state,
+                    Layouts: state.Layouts.map((abObject) => abObject.Uuid === layoutToUpdate.Uuid ? layoutToUpdate : abObject),
+                };
             }
             return state;
         }
@@ -270,152 +284,212 @@ const LayoutReducer = (state = initialState, action) => {
             const colToRemove = removeColumnAction.columnId;
             let layoutToUpdate = state.Layouts.find((l) => l.Name === layoutname);
             if (layoutToUpdate) {
-                layoutToUpdate.Columns = layoutToUpdate.Columns.filter((col) => {
+                layoutToUpdate.TableColumns = layoutToUpdate.TableColumns.filter((col) => {
                     return col !== colToRemove;
                 });
-                return Object.assign(Object.assign({}, state), { Layouts: state.Layouts.map((abObject) => abObject.Uuid === layoutToUpdate.Uuid ? layoutToUpdate : abObject) });
+                return {
+                    ...state,
+                    Layouts: state.Layouts.map((abObject) => abObject.Uuid === layoutToUpdate.Uuid ? layoutToUpdate : abObject),
+                };
             }
             return state;
         }
         case exports.LAYOUT_COLUMN_FILTER_SET: {
-            let columnFilters = (_a = currentLayout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
+            let columnFilters = currentLayout.ColumnFilters ?? [];
             const columnFilterAction = action.columnFilter;
-            AdaptableHelper_1.default.addUuidAndSource(columnFilterAction);
+            AdaptableHelper_1.default.addAdaptableObjectPrimitives(columnFilterAction);
             columnFilters = columnFilters
                 .filter((colFilter) => {
                 return colFilter.ColumnId !== columnFilterAction.ColumnId;
             })
-                .concat(columnFilterAction);
+                .concat(columnFilterAction)
+                .map((cf) => ({ ...cf }));
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                    return {
+                        ...layout,
+                        ColumnFilters: columnFilters,
+                    };
                 }
                 return layout;
             });
-            return Object.assign(Object.assign({}, state), { Layouts });
+            return { ...state, Layouts };
         }
         case exports.LAYOUT_COLUMN_FILTER_ADD: {
             const columnFilterAction = action.columnFilter;
-            let columnFilters = ((_b = currentLayout.ColumnFilters) !== null && _b !== void 0 ? _b : []).filter(
+            let columnFilters = (currentLayout.ColumnFilters ?? []).filter(
             // make sure we are not adding a filter that already exists
             (cf) => cf.ColumnId !== columnFilterAction.ColumnId);
-            AdaptableHelper_1.default.addUuidAndSource(columnFilterAction);
+            AdaptableHelper_1.default.addAdaptableObjectPrimitives(columnFilterAction);
             columnFilters.push(columnFilterAction);
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                    return {
+                        ...layout,
+                        ColumnFilters: columnFilters,
+                    };
                 }
                 return layout;
             });
-            return Object.assign(Object.assign({}, state), { Layouts });
+            return { ...state, Layouts };
         }
         case exports.LAYOUT_COLUMN_FILTER_EDIT: {
             const columnFilterAction = action.columnFilter;
             // 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);
+            const cleanColumnFilters = (currentLayout.ColumnFilters ?? []).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: cleanColumnFilters });
+                    return {
+                        ...layout,
+                        ColumnFilters: cleanColumnFilters,
+                    };
                 }
                 return layout;
             });
-            return Object.assign(Object.assign({}, state), { Layouts });
+            return { ...state, Layouts };
         }
         case exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL: {
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { ColumnFilters: [] });
+                    return {
+                        ...layout,
+                        ColumnFilters: [],
+                    };
                 }
                 return layout;
             });
-            return Object.assign(Object.assign({}, state), { Layouts });
+            return { ...state, Layouts };
         }
         case exports.LAYOUT_COLUMN_FILTER_CLEAR: {
             const actionTypedDelete = action;
-            const columnFilters = ((_d = currentLayout.ColumnFilters) !== null && _d !== void 0 ? _d : []).filter((cf) => {
+            const columnFilters = (currentLayout.ColumnFilters ?? []).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 });
+                    return {
+                        ...layout,
+                        ColumnFilters: columnFilters,
+                    };
                 }
                 return layout;
             });
-            return Object.assign(Object.assign({}, state), { Layouts });
+            return { ...state, Layouts };
         }
         case exports.LAYOUT_COLUMN_FILTER_SUSPEND: {
             const actionTypedSuspend = action;
-            const columnFilters = ((_e = currentLayout.ColumnFilters) !== null && _e !== void 0 ? _e : []).map((abObject) => abObject.Uuid === actionTypedSuspend.columnFilter.Uuid
-                ? Object.assign(Object.assign({}, abObject), { IsSuspended: true }) : abObject);
+            const columnFilters = (currentLayout.ColumnFilters ?? []).map((abObject) => abObject.Uuid === actionTypedSuspend.columnFilter.Uuid
+                ? { ...abObject, IsSuspended: true }
+                : abObject);
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                    return {
+                        ...layout,
+                        ColumnFilters: columnFilters,
+                    };
                 }
                 return layout;
             });
-            return Object.assign(Object.assign({}, state), { Layouts });
+            return { ...state, Layouts };
         }
         case exports.LAYOUT_COLUMN_FILTER_UNSUSPEND: {
             const actionTypedSuspend = action;
-            const columnFilters = ((_f = currentLayout.ColumnFilters) !== null && _f !== void 0 ? _f : []).map((abObject) => abObject.Uuid === actionTypedSuspend.columnFilter.Uuid
-                ? Object.assign(Object.assign({}, abObject), { IsSuspended: false }) : abObject);
+            const columnFilters = (currentLayout.ColumnFilters ?? []).map((abObject) => abObject.Uuid === actionTypedSuspend.columnFilter.Uuid
+                ? { ...abObject, IsSuspended: false }
+                : abObject);
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                    return {
+                        ...layout,
+                        ColumnFilters: columnFilters,
+                    };
                 }
                 return layout;
             });
-            return Object.assign(Object.assign({}, state), { Layouts });
+            return { ...state, Layouts };
         }
         case exports.LAYOUT_COLUMN_FILTER_SUSPEND_ALL: {
-            const columnFilters = ((_g = currentLayout.ColumnFilters) !== null && _g !== void 0 ? _g : []).map((abObject) => (Object.assign(Object.assign({}, abObject), { IsSuspended: true })));
+            const columnFilters = (currentLayout.ColumnFilters ?? []).map((abObject) => ({
+                ...abObject,
+                IsSuspended: true,
+            }));
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                    return {
+                        ...layout,
+                        ColumnFilters: columnFilters,
+                    };
                 }
                 return layout;
             });
-            return Object.assign(Object.assign({}, state), { Layouts });
+            return { ...state, Layouts };
         }
         case exports.LAYOUT_COLUMN_FILTER_UNSUSPEND_ALL: {
-            const columnFilters = ((_h = currentLayout.ColumnFilters) !== null && _h !== void 0 ? _h : []).map((abObject) => (Object.assign(Object.assign({}, abObject), { IsSuspended: false })));
+            const columnFilters = (currentLayout.ColumnFilters ?? []).map((abObject) => ({
+                ...abObject,
+                IsSuspended: false,
+            }));
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                    return {
+                        ...layout,
+                        ColumnFilters: columnFilters,
+                    };
                 }
                 return layout;
             });
-            return Object.assign(Object.assign({}, state), { Layouts });
+            return { ...state, Layouts };
         }
         case exports.LAYOUT_GRID_FILTER_SET: {
             const actionTyped = action;
-            return Object.assign(Object.assign({}, state), { Layouts: state.Layouts.map((layout) => {
+            return {
+                ...state,
+                Layouts: state.Layouts.map((layout) => {
                     if (layout.Name === currentLayout.Name) {
-                        return Object.assign(Object.assign({}, layout), { GridFilter: Object.assign(Object.assign({}, layout.GridFilter), { Expression: actionTyped.gridFilter }) });
+                        return {
+                            ...layout,
+                            GridFilter: {
+                                ...layout.GridFilter,
+                                Expression: actionTyped.gridFilter,
+                            },
+                        };
                     }
                     return layout;
-                }) });
+                }),
+            };
         }
         case exports.LAYOUT_GRID_FILTER_SUSPEND: {
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { GridFilter: Object.assign(Object.assign({}, layout.GridFilter), { IsSuspended: true }) });
+                    return {
+                        ...layout,
+                        GridFilter: {
+                            ...layout.GridFilter,
+                            IsSuspended: true,
+                        },
+                    };
                 }
                 return layout;
             });
-            return Object.assign(Object.assign({}, state), { Layouts });
+            return { ...state, Layouts };
         }
         case exports.LAYOUT_GRID_FILTER_UNSUSPEND: {
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { GridFilter: Object.assign(Object.assign({}, layout.GridFilter), { IsSuspended: false }) });
+                    return {
+                        ...layout,
+                        GridFilter: {
+                            ...layout.GridFilter,
+                            IsSuspended: false,
+                        },
+                    };
                 }
                 return layout;
             });
-            return Object.assign(Object.assign({}, state), { Layouts });
+            return { ...state, Layouts };
         }
         case exports.LAYOUT_GRID_FILTER_CLEAR: {
             const Layouts = state.Layouts.map((layout) => {
@@ -425,11 +499,14 @@ const LayoutReducer = (state = initialState, action) => {
                     gridFilter.Expression = '';
                 }
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { gridFilter });
+                    return {
+                        ...layout,
+                        gridFilter,
+                    };
                 }
                 return layout;
             });
-            return Object.assign(Object.assign({}, state), { Layouts });
+            return { ...state, Layouts };
         }
         default:
             return state;

package/src/Redux/ActionsReducers/NamedQueryRedux.js

@@ -57,25 +57,31 @@ const NamedQueryReducer = (state = initialState, action) => {
     switch (action.type) {
         case exports.NAMED_QUERY_ADD: {
             const actionnamedQuery = action.namedQuery;
-            AdaptableHelper_1.default.addUuidAndSource(actionnamedQuery);
+            AdaptableHelper_1.default.addAdaptableObjectPrimitives(actionnamedQuery);
             namedQuerys = [].concat(state.NamedQueries);
             namedQuerys.push(actionnamedQuery);
-            return Object.assign(Object.assign({}, state), { NamedQueries: namedQuerys });
+            return { ...state, NamedQueries: namedQuerys };
         }
         case exports.NAMED_QUERIES_ADD: {
             const actionnamedQueries = action.namedQueries;
             actionnamedQueries.forEach((namedQuery) => {
-                AdaptableHelper_1.default.addUuidAndSource(namedQuery);
+                AdaptableHelper_1.default.addAdaptableObjectPrimitives(namedQuery);
             });
-            return Object.assign(Object.assign({}, state), { NamedQueries: [...state.NamedQueries, ...actionnamedQueries] });
+            return { ...state, NamedQueries: [...state.NamedQueries, ...actionnamedQueries] };
         }
         case exports.NAMED_QUERY_EDIT: {
             const actionnamedQuery = action.namedQuery;
-            return Object.assign(Object.assign({}, state), { NamedQueries: state.NamedQueries.map((abObject) => abObject.Uuid === actionnamedQuery.Uuid ? actionnamedQuery : abObject) });
+            return {
+                ...state,
+                NamedQueries: state.NamedQueries.map((abObject) => abObject.Uuid === actionnamedQuery.Uuid ? actionnamedQuery : abObject),
+            };
         }
         case exports.NAMED_QUERY_DELETE: {
             const actionnamedQuery = action.namedQuery;
-            return Object.assign(Object.assign({}, state), { NamedQueries: state.NamedQueries.filter((abObject) => abObject.Uuid !== actionnamedQuery.Uuid) });
+            return {
+                ...state,
+                NamedQueries: state.NamedQueries.filter((abObject) => abObject.Uuid !== actionnamedQuery.Uuid),
+            };
         }
         default:
             return state;

package/src/Redux/ActionsReducers/NoteRedux.js

@@ -43,11 +43,10 @@ exports.NoteReady = NoteReady;
 const GetAllNotesSelector = (state) => state.Notes;
 exports.GetAllNotesSelector = GetAllNotesSelector;
 const GetNoteSelector = (state, address) => {
-    var _a;
     if (!address) {
         return null;
     }
-    return ((_a = state === null || state === void 0 ? void 0 : state.Notes) !== null && _a !== void 0 ? _a : []).find((note) => {
+    return (state?.Notes ?? []).find((note) => {
         if (note.PrimaryKeyValue === address.PrimaryKeyValue && note.ColumnId === address.ColumnId) {
             // happy check
             return true;
@@ -70,17 +69,23 @@ const NoteReducer = (state = initialState, action) => {
     switch (action.type) {
         case exports.NOTE_ADD: {
             const note = action.adaptableNote;
-            AdaptableHelper_1.default.addUuidAndSource(note);
+            AdaptableHelper_1.default.addAdaptableObjectPrimitives(note);
             adaptableNotes = [...state.Notes, note];
-            return Object.assign(Object.assign({}, state), { Notes: adaptableNotes });
+            return { ...state, Notes: adaptableNotes };
         }
         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)) });
+            return {
+                ...state,
+                Notes: state.Notes.map((abObject) => (abObject.Uuid === note.Uuid ? note : abObject)),
+            };
         }
         case exports.NOTE_DELETE: {
             const note = action.adaptableNote;
-            return Object.assign(Object.assign({}, state), { Notes: state.Notes.filter((abObject) => abObject.Uuid !== note.Uuid) });
+            return {
+                ...state,
+                Notes: state.Notes.filter((abObject) => abObject.Uuid !== note.Uuid),
+            };
         }
         default:
             return state;

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

@@ -137,4 +137,4 @@ export interface PluginsState {
     [key: string]: any;
 }
 export declare const PluginsSetPluginState: (pluginId: string, pluginState: any) => PluginsSetPluginStateAction;
-export declare const PluginsReducer: Redux.Reducer<PluginsState>;
+export declare const PluginsReducer: (state: PluginsState, action: PluginsAction) => PluginsState;

package/src/Redux/ActionsReducers/PluginsRedux.js

@@ -139,7 +139,7 @@ const initialState = {};
 const PluginsReducer = (state = initialState, action) => {
     switch (action.type) {
         case exports.PLUGINS_SET_PLUGIN_STATE: {
-            return Object.assign(Object.assign({}, state), { [action.pluginId]: action.pluginState });
+            return { ...state, [action.pluginId]: action.pluginState };
         }
         default:
             return state;

package/src/Redux/ActionsReducers/PlusMinusRedux.js

@@ -106,7 +106,6 @@ const initialState = {
     PlusMinusNudges: GeneralConstants_1.EMPTY_ARRAY,
 };
 const PlusMinusReducer = (state = initialState, action) => {
-    var _a, _b;
     let plusMinusNudges;
     switch (action.type) {
         case exports.PLUS_MINUS_APPLY:
@@ -114,34 +113,52 @@ const PlusMinusReducer = (state = initialState, action) => {
             return Object.assign({}, state);
         case exports.PLUS_MINUS_RULE_ADD: {
             const actionPlusMinusNudge = action.plusMinusNudge;
-            AdaptableHelper_1.default.addUuidAndSource(actionPlusMinusNudge);
+            AdaptableHelper_1.default.addAdaptableObjectPrimitives(actionPlusMinusNudge);
             plusMinusNudges = [].concat(state.PlusMinusNudges);
             plusMinusNudges.push(actionPlusMinusNudge);
-            return Object.assign(Object.assign({}, state), { PlusMinusNudges: plusMinusNudges });
+            return { ...state, PlusMinusNudges: plusMinusNudges };
         }
         case exports.PLUS_MINUS_RULE_EDIT: {
             const actionPlusMinusNudge = action.plusMinusNudge;
-            return Object.assign(Object.assign({}, state), { PlusMinusNudges: state.PlusMinusNudges.map((abObject) => abObject.Uuid === actionPlusMinusNudge.Uuid ? actionPlusMinusNudge : abObject) });
+            return {
+                ...state,
+                PlusMinusNudges: state.PlusMinusNudges.map((abObject) => abObject.Uuid === actionPlusMinusNudge.Uuid ? actionPlusMinusNudge : abObject),
+            };
         }
         case exports.PLUS_MINUS_RULE_DELETE: {
             const actionPlusMinusNudge = action.plusMinusNudge;
-            return Object.assign(Object.assign({}, state), { PlusMinusNudges: state.PlusMinusNudges.filter((abObject) => abObject.Uuid !== actionPlusMinusNudge.Uuid) });
+            return {
+                ...state,
+                PlusMinusNudges: state.PlusMinusNudges.filter((abObject) => abObject.Uuid !== actionPlusMinusNudge.Uuid),
+            };
         }
         case exports.PLUS_MINUS_RULE_SUSPEND_ALL: {
-            return Object.assign(Object.assign({}, state), { PlusMinusNudges: (0, utils_1.suspendAllInList)(state.PlusMinusNudges) });
+            return {
+                ...state,
+                PlusMinusNudges: (0, utils_1.suspendAllInList)(state.PlusMinusNudges),
+            };
         }
         case exports.PLUS_MINUS_RULE_UNSUSPEND_ALL: {
-            return Object.assign(Object.assign({}, state), { PlusMinusNudges: (0, utils_1.unsuspendAllInList)(state.PlusMinusNudges) });
+            return {
+                ...state,
+                PlusMinusNudges: (0, utils_1.unsuspendAllInList)(state.PlusMinusNudges),
+            };
         }
         case exports.PLUS_MINUS_RULE_SUSPEND: {
-            return Object.assign(Object.assign({}, state), { PlusMinusNudges: (0, utils_1.changeIsSuspendInList)(action.plusMinusNudge, state.PlusMinusNudges, true) });
+            return {
+                ...state,
+                PlusMinusNudges: (0, utils_1.changeIsSuspendInList)(action.plusMinusNudge, state.PlusMinusNudges, true),
+            };
         }
         case exports.PLUS_MINUS_RULE_UNSUSPEND: {
-            return Object.assign(Object.assign({}, state), { PlusMinusNudges: (0, utils_1.changeIsSuspendInList)(action.plusMinusNudge, state.PlusMinusNudges, false) });
+            return {
+                ...state,
+                PlusMinusNudges: (0, utils_1.changeIsSuspendInList)(action.plusMinusNudge, state.PlusMinusNudges, false),
+            };
         }
         case exports.PLUS_MINUS_RULE_MOVE_UP: {
             const actionPlusMinusNudge = action.plusMinusNudge;
-            const plusMinusNudges = [...((_a = state.PlusMinusNudges) !== null && _a !== void 0 ? _a : [])];
+            const plusMinusNudges = [...(state.PlusMinusNudges ?? [])];
             const index = plusMinusNudges.findIndex((plusMinus) => plusMinus.Uuid === actionPlusMinusNudge.Uuid);
             let swapIndex = index - 1;
             if (swapIndex < 0) {
@@ -150,12 +167,15 @@ const PlusMinusReducer = (state = initialState, action) => {
             const temp = plusMinusNudges[index];
             plusMinusNudges[index] = plusMinusNudges[swapIndex];
             plusMinusNudges[swapIndex] = temp;
-            return Object.assign(Object.assign({}, state), { PlusMinusNudges: plusMinusNudges });
+            return {
+                ...state,
+                PlusMinusNudges: plusMinusNudges,
+            };
         }
         case exports.PLUS_MINUS_RULE_MOVE_DOWN: {
             const actionPlusMinusNudge = action
                 .plusMinusNudge;
-            const plusMinusNudges = [...((_b = state.PlusMinusNudges) !== null && _b !== void 0 ? _b : [])];
+            const plusMinusNudges = [...(state.PlusMinusNudges ?? [])];
             const index = plusMinusNudges.findIndex((plusMinus) => plusMinus.Uuid === actionPlusMinusNudge.Uuid);
             let swapIndex = index + 1;
             if (swapIndex >= plusMinusNudges.length) {
@@ -164,7 +184,10 @@ const PlusMinusReducer = (state = initialState, action) => {
             const temp = plusMinusNudges[index];
             plusMinusNudges[index] = plusMinusNudges[swapIndex];
             plusMinusNudges[swapIndex] = temp;
-            return Object.assign(Object.assign({}, state), { PlusMinusNudges: plusMinusNudges });
+            return {
+                ...state,
+                PlusMinusNudges: plusMinusNudges,
+            };
         }
         default:
             return state;