@adaptabletools/adaptable 21.2.2-canary.0 → 22.0.0-canary.1

package/src/Api/Implementation/CustomSortApiImpl.d.ts

@@ -19,7 +19,8 @@ export declare class CustomSortApiImpl extends ApiBase implements CustomSortApi
     getCustomSortForColumn(columnId: string): CustomSort | undefined;
     addCustomSort(customSort: CustomSort): CustomSort;
     createCustomSort(columnId: string, values: string[]): CustomSort;
-    editCustomSort(columnId: string, values: string[]): CustomSort;
+    editCustomSortValues(columnId: string, values: string[]): CustomSort;
+    editCustomSort(customSort: CustomSort): CustomSort;
     deleteCustomSort(column: string): void;
     suspendCustomSort(customSort: CustomSort): CustomSort;
     unSuspendCustomSort(customSort: CustomSort): CustomSort;

package/src/Api/Implementation/CustomSortApiImpl.js

@@ -73,7 +73,7 @@ export class CustomSortApiImpl extends ApiBase {
         let customSort = { ColumnId: columnId, SortedValues: values };
         return this.addCustomSort(customSort);
     }
-    editCustomSort(columnId, values) {
+    editCustomSortValues(columnId, values) {
         const previousCustomSort = this.getCustomSortForColumn(columnId);
         if (!previousCustomSort) {
             this.logWarn(`No custom sort defined for ${columnId}`);
@@ -86,6 +86,10 @@ export class CustomSortApiImpl extends ApiBase {
         this.dispatchAction(CustomSortRedux.CustomSortEdit(newCustomSort));
         return this.getCustomSortByColumn(columnId);
     }
+    editCustomSort(customSort) {
+        this.dispatchAction(CustomSortRedux.CustomSortEdit(customSort));
+        return this.getCustomSortByColumn(customSort.Uuid);
+    }
     deleteCustomSort(column) {
         let customSort = this.getCustomSortForColumn(column);
         if (customSort) {

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -151,4 +151,13 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     updateAgGridColumnDefinitions(columnDefinitionsToBeUpdated: ColDefWithId[]): void;
     removeAgGridColumnDefinition(columnId: string): void;
     addAgGridColumnDefinition(newColumnDefinition: ColDefWithId): void;
+    applyGridDataTransaction(dataTransaction: {
+        add?: any[];
+        update?: any[];
+        remove?: any[];
+    }, config?: DataUpdateConfig): Promise<{
+        addedRows: IRowNode[];
+        updatedRows: IRowNode[];
+        removedRows: IRowNode[];
+    }>;
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -683,4 +683,20 @@ export class GridApiImpl extends ApiBase {
             .filter(Boolean);
         this.setAgGridColumnDefinitions([...sanitizedColDefs, newColumnDefinition]);
     }
+    async applyGridDataTransaction(dataTransaction, config) {
+        const transactionResult = await this._adaptable.applyGridDataTransaction(dataTransaction, config);
+        if (Array.isArray(transactionResult.removedRows) && transactionResult.removedRows.length) {
+            const rowDataChangedInfo = this.getAdaptableInternalApi().buildRowDataChangedInfo(dataTransaction.remove, transactionResult.removedRows, 'Delete');
+            this.getAdaptableInternalApi().getDataService().CreateRowDataChangedEvent(rowDataChangedInfo);
+        }
+        if (Array.isArray(transactionResult.updatedRows) && transactionResult.updatedRows.length) {
+            const rowDataChangedInfo = this.getAdaptableInternalApi().buildRowDataChangedInfo(dataTransaction.update, transactionResult.updatedRows, 'Update');
+            this.getAdaptableInternalApi().getDataService().CreateRowDataChangedEvent(rowDataChangedInfo);
+        }
+        if (Array.isArray(transactionResult.addedRows) && transactionResult.addedRows.length) {
+            const rowDataChangedInfo = this.getAdaptableInternalApi().buildRowDataChangedInfo(dataTransaction.add, transactionResult.addedRows, 'Add');
+            this.getAdaptableInternalApi().getDataService().CreateRowDataChangedEvent(rowDataChangedInfo);
+        }
+        return transactionResult;
+    }
 }

package/src/Api/Implementation/LayoutApiImpl.d.ts

@@ -26,6 +26,7 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     getLayoutByName(layoutName: string): Layout | null;
     createOrUpdateExtendedLayout(extendedLayoutInfo: ExtendedLayout): void;
     getExtendedLayoutByName(layoutName: string): ExtendedLayout | undefined;
+    cloneExtendedLayout(extendedLayoutToClone: ExtendedLayout, layoutName: string): ExtendedLayout | false;
     getLayouts(): Layout[];
     getLayoutById(id: Layout['Uuid']): Layout;
     saveCurrentLayout(): void;

package/src/Api/Implementation/LayoutApiImpl.js

@@ -38,7 +38,9 @@ export class LayoutApiImpl extends ApiBase {
         if (isPivotLayout(layout)) {
             return [];
         }
-        return layout.TableColumns.filter((colId) => !layout.ColumnVisibility || layout.ColumnVisibility?.[colId] !== false);
+        return this.getAgGridApi()
+            .getAllDisplayedColumns()
+            .map((col) => col.getColId());
     }
     getCurrentVisibleColumnIdsForPivotLayout() {
         const layout = this.getCurrentLayout();
@@ -242,6 +244,87 @@ export class LayoutApiImpl extends ApiBase {
             Extensions: extensions,
         };
     }
+    cloneExtendedLayout(extendedLayoutToClone, layoutName) {
+        // first clone the underlying Layout
+        const clonedLayout = this.cloneLayout(extendedLayoutToClone.Layout, layoutName);
+        if (clonedLayout == false) {
+            return false;
+        }
+        // Alerts
+        const alertExtensions = extendedLayoutToClone.Extensions.filter((e) => e.Module == 'Alert');
+        alertExtensions.forEach((le) => {
+            const alertDef = le.Object;
+            alertDef.Tags?.push(layoutName);
+            this.getAlertApi().editAlertDefinition(alertDef);
+        });
+        // Custom Sorts
+        const customSortExtensions = extendedLayoutToClone.Extensions.filter((e) => {
+            return e.Module == 'CustomSort';
+        });
+        customSortExtensions.forEach((le) => {
+            const customSort = le.Object;
+            customSort.Tags?.push(layoutName);
+            this.getCustomSortApi().editCustomSort(customSort);
+        });
+        // Flashing Cells
+        const flashingCellExtensions = extendedLayoutToClone.Extensions.filter((e) => {
+            return e.Module == 'FlashingCell';
+        });
+        flashingCellExtensions.forEach((le) => {
+            const flashingCellDef = le.Object;
+            flashingCellDef.Tags?.push(layoutName);
+            this.getFlashingCellApi().editFlashingCellDefinition(flashingCellDef);
+        });
+        // FormatColumns
+        const formatColumnExtensions = extendedLayoutToClone.Extensions.filter((e) => e.Module == 'FormatColumn');
+        formatColumnExtensions.forEach((le) => {
+            const formatCol = le.Object;
+            formatCol.Tags?.push(layoutName);
+            this.getFormatColumnApi().editFormatColumn(formatCol);
+        });
+        // Plus Minus
+        const plusMinusExtensions = extendedLayoutToClone.Extensions.filter((e) => {
+            return e.Module == 'PlusMinus';
+        });
+        plusMinusExtensions.forEach((le) => {
+            const plusMinusNudge = le.Object;
+            plusMinusNudge.Tags?.push(layoutName);
+            this.getPlusMinusApi().editPlusMinusNudge(plusMinusNudge);
+        });
+        // Schedule
+        const scheduleExtensions = extendedLayoutToClone.Extensions.filter((e) => {
+            return e.Module == 'Schedule';
+        });
+        scheduleExtensions.forEach((le) => {
+            const schedule = le.Object;
+            schedule.Tags?.push(layoutName);
+            this.getScheduleApi().editSchedule(schedule);
+        });
+        // Shortcut
+        const shortCutExtensions = extendedLayoutToClone.Extensions.filter((e) => {
+            return e.Module == 'Shortcut';
+        });
+        shortCutExtensions.forEach((le) => {
+            const shortcut = le.Object;
+            shortcut.Tags?.push(layoutName);
+            this.getShortcutApi().editShortcut(shortcut);
+        });
+        // StyledColumn
+        const styledColumnExtensions = extendedLayoutToClone.Extensions.filter((e) => {
+            return e.Module == 'StyledColumn';
+        });
+        styledColumnExtensions.forEach((le) => {
+            const styledColumn = le.Object;
+            styledColumn.Tags?.push(layoutName);
+            this.getStyledColumnApi().editStyledColumn(styledColumn);
+        });
+        // now create the new Extended Layout with the same extensions
+        const extendedLayout = {
+            Layout: clonedLayout,
+            Extensions: extendedLayoutToClone.Extensions,
+        };
+        return extendedLayout;
+    }
     getLayouts() {
         return this.getAdaptableState().Layout.Layouts ?? [];
     }
@@ -287,7 +370,7 @@ export class LayoutApiImpl extends ApiBase {
     }
     cloneLayout(layoutToClone, layoutName) {
         if (!this.doesLayoutExist(layoutToClone)) {
-            this.logError("Cannot clone layout with Name: '" + layoutName + "' as other Layout does not exist");
+            this.logError("Cannot clone Layout with Name: '" + layoutName + "' as other Layout does not exist");
             return false;
         }
         const newLayout = {

package/src/Api/Implementation/LayoutHelpers.d.ts

@@ -17,8 +17,8 @@ export declare const normalizeTableLayout: (tableLayout: TableLayout, options?:
 }) => TableLayout;
 export declare const normalizePivotLayout: (pivotLayout: PivotLayout) => PivotLayout;
 export declare const getLayoutRowGroupValuesExceptionGroupKeys: (layout: TableLayout | PivotLayout) => any[][];
-export declare const toRowGroupValuesForLayoutState: (rowGroupValuesModel: TableLayoutModel['RowGroupValues']) => TableLayout['RowGroupValues'];
-export declare const toRowGroupValuesForLayoutModel: (rowGroupValuesState: TableLayout['RowGroupValues']) => TableLayoutModel['RowGroupValues'];
+export declare const toRowGroupValuesForLayoutState: (rowGroupValuesModel: TableLayoutModel["RowGroupValues"]) => TableLayout["RowGroupValues"];
+export declare const toRowGroupValuesForLayoutModel: (rowGroupValuesState: TableLayout["RowGroupValues"]) => TableLayoutModel["RowGroupValues"];
 export declare const checkForDuplicateColumns: (layout: TableLayout) => void;
 export declare const tableLayoutToTableLayoutModel: (tableLayout: TableLayout) => TableLayoutModel;
 export declare const pivotLayoutToPivotLayoutModel: (pivotLayout: PivotLayout) => PivotLayoutModel;

package/src/Api/Implementation/ScheduleApiImpl.d.ts

@@ -23,6 +23,7 @@ export declare class ScheduleApiImpl extends ApiBase implements ScheduleApi {
     getReportSchedules(config?: LayoutExtendedConfig): ReportSchedule[];
     getActiveReportSchedules(): ReportSchedule[];
     getSuspendedReportSchedules(): ReportSchedule[];
+    editSchedule(schedule: BaseSchedule): BaseSchedule;
     addReportSchedule(schedule: ReportSchedule): ReportSchedule;
     editReportSchedule(schedule: ReportSchedule): ReportSchedule;
     deleteReportSchedule(schedule: ReportSchedule): void;

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -56,6 +56,18 @@ export class ScheduleApiImpl extends ApiBase {
     getSuspendedReportSchedules() {
         return this.getReportSchedules().filter((schedule) => schedule.IsSuspended);
     }
+    editSchedule(schedule) {
+        switch (schedule.ScheduleType) {
+            case 'ipushpull':
+                return this.editIPushPullSchedule(schedule);
+            case 'Reminder':
+                return this.editReminderSchedule(schedule);
+            case 'OpenFin':
+                return this.editOpenFinSchedule(schedule);
+            case 'Report':
+                return this.editReportSchedule(schedule);
+        }
+    }
     addReportSchedule(schedule) {
         this.dispatchAction(ScheduleRedux.ReportScheduleAdd(schedule));
         return this.getScheduleById(schedule.Uuid);

package/src/Api/Implementation/ShortcutApiImpl.d.ts

@@ -9,6 +9,7 @@ export declare class ShortcutApiImpl extends ApiBase implements ShortcutApi {
     getActiveShortcuts(config?: LayoutExtendedConfig): Shortcut[];
     getSuspendedShortcuts(config?: LayoutExtendedConfig): Shortcut[];
     addShortcut(shortcut: Shortcut): Shortcut;
+    editShortcut(shortcut: Shortcut): Shortcut;
     deleteShortcut(shortcut: Shortcut): void;
     deleteAllShortcuts(): void;
     suspendShortcut(shortcut: Shortcut): Shortcut;

package/src/Api/Implementation/ShortcutApiImpl.js

@@ -22,6 +22,10 @@ export class ShortcutApiImpl extends ApiBase {
         this.dispatchAction(ShortcutRedux.ShortcutAdd(shortcut));
         return this.getShortcutById(shortcut.Uuid);
     }
+    editShortcut(shortcut) {
+        this.dispatchAction(ShortcutRedux.ShortcutEdit(shortcut));
+        return this.getShortcutById(shortcut.Uuid);
+    }
     deleteShortcut(shortcut) {
         this.dispatchAction(ShortcutRedux.ShortcutDelete(shortcut));
     }

package/src/Api/Implementation/StyledColumnApiImpl.d.ts

@@ -16,6 +16,7 @@ export declare class StyledColumnApiImpl extends ApiBase implements StyledColumn
     deleteStyledColumn(styledColumn: StyledColumn): void;
     deleteAllStyledColumns(): void;
     addStyledColumn(styledColumn: StyledColumn): void;
+    editStyledColumn(styledColumn: StyledColumn): StyledColumn;
     isSparklineStyleStyledColumn(column: AdaptableColumn): boolean;
     getActiveStyledColumnForColumn(column: AdaptableColumn): StyledColumn | undefined;
     hasPercentBarStyle(columnId: string): boolean;

package/src/Api/Implementation/StyledColumnApiImpl.js

@@ -34,6 +34,10 @@ export class StyledColumnApiImpl extends ApiBase {
     addStyledColumn(styledColumn) {
         this.dispatchAction(StyledColumnRedux.StyledColumnAdd(styledColumn));
     }
+    editStyledColumn(styledColumn) {
+        this.dispatchAction(StyledColumnRedux.StyledColumnEdit(styledColumn));
+        return this.getStyledColumnById(styledColumn.Uuid);
+    }
     isSparklineStyleStyledColumn(column) {
         if (!column) {
             return false;

package/src/Api/Internal/AdaptableInternalApi.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ApiBase } from '../Implementation/ApiBase';
 import { UIConfirmation } from '../../Utilities/Interface/MessagePopups';
 import { InternalState } from '../../AdaptableState/InternalState';

package/src/Api/Internal/AdaptableInternalApi.js

@@ -175,9 +175,9 @@ export class AdaptableInternalApi extends ApiBase {
             return;
         }
         if (isAdaptableSystemIcon(buttonIcon) || isAdaptableCustomIcon(buttonIcon)) {
-            const defaultIconWidth = defaultWidthHeight?.width ?? 'var(--ab-cmp-simple-button__width)';
-            const defaultIconHeight = defaultWidthHeight?.height ?? 'var(--ab-cmp-simple-button__height)';
-            const buttonIconStyle = Object.assign({}, { width: defaultIconWidth, height: defaultIconHeight }, buttonIcon.style);
+            const defaultIconWidth = defaultWidthHeight?.width;
+            const defaultIconHeight = defaultWidthHeight?.height;
+            const buttonIconStyle = Object.assign({}, { width: defaultIconWidth ?? 20, height: defaultIconHeight ?? 20 }, buttonIcon.style);
             buttonIcon.style = buttonIconStyle;
         }
         return buttonIcon;

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -97,7 +97,7 @@ export class ColumnFilterInternalApi extends ApiBase {
             predicatesOperator: columnFilter.PredicatesOperator,
             ...this.getAdaptableInternalApi().buildBaseContext(),
         };
-        // #column_filter_predicates_evaluation
+        //  #column_filter_predicates_evaluation
         return this.getPredicateApi().handlePredicates(columnFilter.Predicates, predicateDefHandlerContext, true);
     }
     /**

package/src/Api/Internal/LayoutInternalApi.d.ts

@@ -35,4 +35,9 @@ export declare class LayoutInternalApi extends ApiBase {
     private getLayoutCreationDefaultProperties;
     cloneLayout(layoutToClone: Layout): Omit<Layout, 'Name'>;
     getCurrentLayout_perfOptimized(): Layout | null;
+    getCurrentLayoutRowGroupDisplayType(): LayoutBase['RowGroupDisplayType'];
+    areAllGroupedColumnsFilterable(): {
+        filter: boolean;
+        floatingFilter: boolean;
+    };
 }

package/src/Api/Internal/LayoutInternalApi.js

@@ -195,4 +195,29 @@ export class LayoutInternalApi extends ApiBase {
         }
         return layoutState.Layouts.find((layout) => layout.Name === currentLayoutName);
     }
+    getCurrentLayoutRowGroupDisplayType() {
+        return this.getLayoutApi().getCurrentLayout()?.RowGroupDisplayType ?? 'single';
+    }
+    areAllGroupedColumnsFilterable() {
+        const groupedAgColumns = this.getAgGridApi().getRowGroupColumns();
+        let allHaveFilter = true;
+        let allHaveFloatingFilter = true;
+        for (const column of groupedAgColumns) {
+            // Early exit: no need to continue if both are already false
+            if (!allHaveFilter && !allHaveFloatingFilter) {
+                break;
+            }
+            const colDef = column.getColDef();
+            if (allHaveFilter && !colDef.filter) {
+                allHaveFilter = false;
+            }
+            if (allHaveFloatingFilter && !colDef.floatingFilter) {
+                allHaveFloatingFilter = false;
+            }
+        }
+        return {
+            filter: allHaveFilter,
+            floatingFilter: allHaveFloatingFilter,
+        };
+    }
 }

package/src/Api/LayoutApi.d.ts

@@ -64,9 +64,15 @@ export interface LayoutApi {
     getExtendedLayoutByName(layoutName: string): ExtendedLayout | undefined;
     /**
      * Creates (or Updates) an Extended Layout
-     * @param extendedLayout extendedLayout to Create
+     * @param extendedLayout ExtendedLayout to Create
      */
     createOrUpdateExtendedLayout(extendedLayout: ExtendedLayout): void;
+    /**
+     * Clones an Extended Layout
+     * @param extendedLayoutToClone ExtendedLayout to Clone
+     * @param layoutName New name for Layout being cloned
+     */
+    cloneExtendedLayout(extendedLayoutToClone: ExtendedLayout, layoutName: string): ExtendedLayout | false;
     /**
      * Retrieves all Layouts in Adaptable State
      * @returns layouts

package/src/Api/ScheduleApi.d.ts

@@ -94,6 +94,11 @@ export interface ScheduleApi {
      * @returns report schedule
      */
     editReportSchedule(reportSchedule: ReportSchedule): ReportSchedule;
+    /**
+     * Edits a Schedule
+     * @param schedule Schedule to Edit
+     */
+    editSchedule(schedule: BaseSchedule): BaseSchedule;
     /**
      * Deletes Report / Export Schedule
      * @param ReportSchedule Report / export Schedule to delete

package/src/Api/ShortcutApi.d.ts

@@ -40,6 +40,11 @@ export interface ShortcutApi {
      * @param shortcut Shortcut to delete
      */
     deleteShortcut(shortcut: Shortcut): void;
+    /**
+     * Edits Shortcut in state
+     * @param shortcut Shortcut to edit
+     */
+    editShortcut(shortcut: Shortcut): Shortcut;
     /**
      * Suspends Shortcut definition
      * @param shortcut Shortcut to suspend

package/src/Api/StyledColumnApi.d.ts

@@ -41,6 +41,11 @@ export interface StyledColumnApi {
      * @param styledColumn
      */
     deleteStyledColumn(styledColumn: StyledColumn): void;
+    /**
+     * Edits a Styled Column
+     * @param styledColumn Styled Column to edit
+     */
+    editStyledColumn(styledColumn: StyledColumn): StyledColumn;
     /**
      * Delete all Styled Columns in State
      */

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

@@ -71,7 +71,7 @@ export declare const CommentEdit: ({ comment, cellAddress, }: {
     cellAddress: CellAddress;
 }) => AdaptableCommentEditAction;
 export declare const CommentsDelete: ({ commentUuid, cellAddress, }: {
-    commentUuid: AdaptableComment['Uuid'];
+    commentUuid: AdaptableComment["Uuid"];
     cellAddress: CellAddress;
 }) => AdaptableCommentDeleteAction;
 export declare const GetCellCommentSelector: (state: CommentState, address: CellAddress) => CommentThread | undefined;

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

@@ -113,7 +113,7 @@ export declare const DashboardSetTabs: (Tabs: DashboardTab[]) => DashboardSetTab
 export declare const DashboardCloseToolbar: (toolbar: AdaptableDashboardToolbar) => DashboardCloseToolbarAction;
 export declare const DashboardSetTitle: (title: string) => DashboardSetTitleAction;
 export declare const DashboardReady: (dashboardState: DashboardState) => DashboardReadyAction;
-export declare const DashboardSetPinnedToolbars: (pinnedToolbars: DashboardState['PinnedToolbars']) => {
+export declare const DashboardSetPinnedToolbars: (pinnedToolbars: DashboardState["PinnedToolbars"]) => {
     type: string;
     pinnedToolbars: string[] | import("../../AdaptableState/Common/Types").AdaptableDashboardToolbars;
 };

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

@@ -119,12 +119,12 @@ export interface SystemExportBeginAction extends Redux.Action {
 export interface SystemExportEndAction extends Redux.Action {
 }
 export declare const HighlightCellAdd: (cellHighlightInfo: CellHighlightInfo) => HighlightCellAddAction;
-export declare const HighlightCellDelete: (primaryKeyValue: CellHighlightInfo['primaryKeyValue'], columnId: CellHighlightInfo['columnId']) => HighlightCellDeleteAction;
+export declare const HighlightCellDelete: (primaryKeyValue: CellHighlightInfo["primaryKeyValue"], columnId: CellHighlightInfo["columnId"]) => HighlightCellDeleteAction;
 export declare const HighlightCellDeleteAll: () => HighlightCellDeleteAllAction;
 export declare const HighlightRowAdd: (rowHighlightInfo: RowHighlightInfo) => HighlightRowAddAction;
 export declare const HighlightRowsAdd: (rowsHighlightInfo: RowsHighlightInfo) => HighlightRowsAddAction;
-export declare const HighlightRowDelete: (primaryKeyValue: RowHighlightInfo['primaryKeyValue']) => HighlightRowDeleteAction;
-export declare const GridHighlightRowsDelete: (primaryKeyValues: RowsHighlightInfo['primaryKeyValues']) => HighlightRowsDeleteAction;
+export declare const HighlightRowDelete: (primaryKeyValue: RowHighlightInfo["primaryKeyValue"]) => HighlightRowDeleteAction;
+export declare const GridHighlightRowsDelete: (primaryKeyValues: RowsHighlightInfo["primaryKeyValues"]) => HighlightRowsDeleteAction;
 export declare const GridHighlightRowDeleteAll: () => HighlightRowDeleteAllAction;
 export interface SetSettingsPanelItemsAction extends Redux.Action {
     menuItems: AdaptableMenuItem[];
@@ -321,7 +321,7 @@ export declare const DataChangeHistoryEnable: () => DataChangeHistoryEnableActio
 export declare const DataChangeHistoryDisable: () => DataChangeHistoryDisableAction;
 export declare const DataChangeHistorySuspend: () => DataChangeHistorySuspendAction;
 export declare const DataChangeHistoryResume: () => DataChangeHistoryResumeAction;
-export declare const SettingsPanelSet: (name: string, settings: InternalState['SettingsPanel']['0']) => SettingsPanelSetAction;
+export declare const SettingsPanelSet: (name: string, settings: InternalState["SettingsPanel"]["0"]) => SettingsPanelSetAction;
 export declare const QuickFilterBarShow: () => QuickFilterBarShowAction;
 export declare const QuickFilterBarHide: () => QuickFilterBarHideAction;
 export declare const LayoutShowNonExtendedObjects: (showNonExtendedObjects: boolean) => LayoutShowNonExtendedObjectsAction;
@@ -334,8 +334,8 @@ export declare const SystemExportBegin: (reportName: ReportNameType, reportForma
 export declare const SystemExportEnd: () => SystemExportEndAction;
 export declare const QuickSearchFloatingVisibility: (visible: boolean) => QuickSearchFloatingVisibilityAction;
 export declare const CellPopupShow: (cellPosition: CellAddress, editMode?: boolean) => CellPopupShowAction;
-export declare const CellPopupEditFocusedEntity: (focusedEntity: 'Note' | 'Comment') => CellPopupEditFocusedEntityAction;
-export declare const RowSummarySet: (rowSummaries: InternalState['RowSummary']['rowSummaries']) => {
+export declare const CellPopupEditFocusedEntity: (focusedEntity: "Note" | "Comment") => CellPopupEditFocusedEntityAction;
+export declare const RowSummarySet: (rowSummaries: InternalState["RowSummary"]["rowSummaries"]) => {
     readonly type: "SUMMARY_ROW_SET";
     readonly rowSummaries: import("../../AdaptableState/InternalState").SystemRowSummary[];
 };

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

@@ -168,17 +168,11 @@ export declare const getColumnFilterSelector: (state: AdaptableState, columnId:
     Predicates: import("../../types").ColumnFilterPredicate[];
     PredicatesOperator?: import("../../types").PredicatesOperator;
     IsSuspended?: boolean;
-    Uuid?: string;
-    /**
-     * @ReduxAction Layout Module is ready
-     */
+    Uuid?: import("../../AdaptableState/Uuid").TypeUuid;
     Source?: "InitialState" | "User";
-    /**
-     * @ReduxAction A Layout has been edited
-     */
-    AdaptableVersion?: `${string}.${string}.${string}`;
+    AdaptableVersion?: import("../../types").AdaptableVersion;
     IsReadOnly?: boolean;
-    Tags?: string[];
+    Tags?: import("../../types").AdaptableObjectTag[];
     Metadata?: any;
 };
 export declare const LayoutReducer: Redux.Reducer<LayoutState>;

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

@@ -58,13 +58,13 @@ export interface StyledColumnUnSuspendAllAction extends Redux.Action {
 export interface StyledColumnReadyAction extends Redux.Action {
     StyledColumnState: StyledColumnState;
 }
-export declare const StyledColumnAdd: (formatColumn: StyledColumn) => StyledColumnAddAction;
-export declare const StyledColumnEdit: (formatColumn: StyledColumn) => StyledColumnEditAction;
-export declare const StyledColumnDelete: (formatColumn: StyledColumn) => StyledColumnDeleteAction;
+export declare const StyledColumnAdd: (styledColumn: StyledColumn) => StyledColumnAddAction;
+export declare const StyledColumnEdit: (styledColumn: StyledColumn) => StyledColumnEditAction;
+export declare const StyledColumnDelete: (styledColumn: StyledColumn) => StyledColumnDeleteAction;
 export declare const StyledColumnDeleteAll: () => StyledColumnDeleteAllAction;
-export declare const StyledColumnSuspend: (formatColumn: StyledColumn) => StyledColumnSuspendAction;
-export declare const StyledColumnUnSuspend: (formatColumn: StyledColumn) => StyledColumnSuspendAction;
+export declare const StyledColumnSuspend: (styledColumn: StyledColumn) => StyledColumnSuspendAction;
+export declare const StyledColumnUnSuspend: (styledColumn: StyledColumn) => StyledColumnSuspendAction;
 export declare const StyledColumnSuspendAll: () => StyledColumnSuspendAllAction;
 export declare const StyledColumnUnSuspendAll: () => StyledColumnUnSuspendAllAction;
-export declare const StyledColumnReady: (formatColumnState: StyledColumnState) => StyledColumnReadyAction;
+export declare const StyledColumnReady: (styledColumnState: StyledColumnState) => StyledColumnReadyAction;
 export declare const StyledColumnReducer: Redux.Reducer<StyledColumnState>;

package/src/Redux/ActionsReducers/StyledColumnRedux.js

@@ -37,28 +37,28 @@ export const STYLED_COLUMN_SUSPEND_ALL = 'STYLED_COLUMN_SUSPEND_ALL';
  * @ReduxAction All StyledColumn Modules are unsuspended, or activated
  */
 export const STYLED_COLUMN_UNSUSPEND_ALL = 'STYLED_COLUMN_UNSUSPEND_ALL';
-export const StyledColumnAdd = (formatColumn) => ({
+export const StyledColumnAdd = (styledColumn) => ({
     type: STYLED_COLUMN_ADD,
-    StyledColumn: formatColumn,
+    StyledColumn: styledColumn,
 });
-export const StyledColumnEdit = (formatColumn) => ({
+export const StyledColumnEdit = (styledColumn) => ({
     type: STYLED_COLUMN_EDIT,
-    StyledColumn: formatColumn,
+    StyledColumn: styledColumn,
 });
-export const StyledColumnDelete = (formatColumn) => ({
+export const StyledColumnDelete = (styledColumn) => ({
     type: STYLED_COLUMN_DELETE,
-    StyledColumn: formatColumn,
+    StyledColumn: styledColumn,
 });
 export const StyledColumnDeleteAll = () => ({
     type: STYLED_COLUMN_DELETE_ALL,
 });
-export const StyledColumnSuspend = (formatColumn) => ({
+export const StyledColumnSuspend = (styledColumn) => ({
     type: STYLED_COLUMN_SUSPEND,
-    StyledColumn: formatColumn,
+    StyledColumn: styledColumn,
 });
-export const StyledColumnUnSuspend = (formatColumn) => ({
+export const StyledColumnUnSuspend = (styledColumn) => ({
     type: STYLED_COLUMN_UNSUSPEND,
-    StyledColumn: formatColumn,
+    StyledColumn: styledColumn,
 });
 export const StyledColumnSuspendAll = () => ({
     type: STYLED_COLUMN_SUSPEND_ALL,
@@ -66,22 +66,22 @@ export const StyledColumnSuspendAll = () => ({
 export const StyledColumnUnSuspendAll = () => ({
     type: STYLED_COLUMN_UNSUSPEND_ALL,
 });
-export const StyledColumnReady = (formatColumnState) => ({
+export const StyledColumnReady = (styledColumnState) => ({
     type: STYLED_COLUMN_READY,
-    StyledColumnState: formatColumnState,
+    StyledColumnState: styledColumnState,
 });
 const initialState = {
     StyledColumns: EMPTY_ARRAY,
 };
 export const StyledColumnReducer = (state = initialState, action) => {
-    let formatColumns;
+    let styledColumns;
     switch (action.type) {
         case STYLED_COLUMN_ADD: {
             const actionStyledColumn = action.StyledColumn;
             AdaptableHelper.addAdaptableObjectPrimitives(actionStyledColumn);
-            formatColumns = [].concat(state.StyledColumns);
-            formatColumns.push(actionStyledColumn);
-            return { ...state, StyledColumns: formatColumns };
+            styledColumns = [].concat(state.StyledColumns);
+            styledColumns.push(actionStyledColumn);
+            return { ...state, StyledColumns: styledColumns };
         }
         case STYLED_COLUMN_EDIT:
             const actionStyledColumn = action.StyledColumn;

package/src/Redux/Store/AdaptableReduxLocalStorageEngine.js

@@ -54,6 +54,9 @@ class AdaptableReduxLocalStorageEngine {
         });
     }
     save(adaptableInstance, state, actionName) {
+        if (!adaptableInstance || adaptableInstance.isDestroyed) {
+            return Promise.resolve();
+        }
         return this.saveNow(adaptableInstance, state, actionName);
     }
     saveNow(adaptableInstance, state, actionName) {

package/src/Redux/Store/AdaptableStore.js

@@ -1000,6 +1000,14 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     const newLayout = (newLayoutState.Layouts || []).find((l) => l.Name == newLayoutState.CurrentLayout) ||
                         newLayoutState.Layouts[0] ||
                         ERROR_LAYOUT;
+                    if (returnAction.type == LayoutRedux.LAYOUT_SELECT ||
+                        returnAction.type == LayoutRedux.LAYOUT_DELETE) {
+                        // tell AdapTable the Layout has been selected
+                        if (newLayout) {
+                            adaptable.updateLayoutInManagerAfterStoreHasChanged(newLayout);
+                        }
+                    }
+                    // !!! filter refresh has to be AFTER the layout has been set in the store
                     let refreshColumnFilters = false;
                     if (adaptable.api.filterApi.columnFilterApi.internalApi.areColumnFiltersDifferent(oldLayout.ColumnFilters, newLayout.ColumnFilters)) {
                         refreshColumnFilters = true;
@@ -1011,13 +1019,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     if (refreshColumnFilters || refreshGridFilter) {
                         adaptable.applyFiltering({ updateColumnFilterModel: refreshColumnFilters });
                     }
-                    if (returnAction.type == LayoutRedux.LAYOUT_SELECT ||
-                        returnAction.type == LayoutRedux.LAYOUT_DELETE) {
-                        // tell AdapTable the Layout has been selected
-                        if (newLayout) {
-                            adaptable.updateLayoutInManagerAfterStoreHasChanged(newLayout);
-                        }
-                    }
                     // when changing current layout via the api, the layout should update
                     if (returnAction.type == LayoutRedux.LAYOUT_SAVE) {
                         const savingLayout = returnAction.layout;

package/src/Strategy/FormatColumnModule.js

@@ -5,12 +5,12 @@ import * as PopupRedux from '../Redux/ActionsReducers/PopupRedux';
 import { FormatColumnWizard } from '../View/FormatColumn/Wizard/FormatColumnWizard';
 import { getFormatColumnFormatSummaryValue } from '../View/FormatColumn/Wizard/FormatColumnFormatWizardSection';
 import { getFormatColumnSettingsViewItems } from './Utilities/FormatColumn/getFormatColumnSettingsViewItems';
-import { getFormatColumnStyleViewItems } from './Utilities/FormatColumn/getFormatColumnStyleViewItems';
 import { MoveFormatColumn } from '../View/FormatColumn/MoveFormatColumn';
 import { getObjectTagsViewItems } from '../Utilities/getObjectTagsViewItems';
 import { getRuleViewItems } from '../Utilities/getRuleViewItems';
 import { getScopeViewItems } from '../Utilities/getScopeViewItems';
 import { getFormatColumnSettingsTargetItems } from './Utilities/FormatColumn/getFormatColumnSettingsTargetItems';
+import { renderFormatColumnStyleSummary } from '../View/FormatColumn/Wizard/FormatColumnStyleWizardSection';
 export class FormatColumnModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'color-palette', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
@@ -87,7 +87,7 @@ export class FormatColumnModule extends AdaptableModuleBase {
                 formatColumn.Rule && getRuleViewItems(formatColumn.Rule, this.api),
                 {
                     name: 'Style',
-                    view: () => getFormatColumnStyleViewItems(formatColumn, this.api),
+                    view: () => renderFormatColumnStyleSummary(formatColumn, this.api),
                 },
                 {
                     name: 'Display Format',