@adaptabletools/adaptable 12.0.9 → 12.1.0-canary.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.0.9",
+  "version": "12.1.0-canary.2",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",
@@ -31,7 +31,7 @@
   "main": "agGrid.js",
   "typings": "types.d.ts",
   "dependencies": {
-    "@infinite-table/infinite-react": "0.3.12",
+    "@infinite-table/infinite-react": "0.3.21",
     "date-fns": "2.22.1",
     "debug": "^4.3.1",
     "isomorphic-fetch": "^2.2.1",
@@ -45,7 +45,7 @@
     "react-dom": "^16.8.0 || ^17.0.0",
     "react-redux": "7.2.4",
     "react-remove-scroll": "2.4.2",
-    "react-toastify": "8.1.0",
+    "react-toastify": "9.0.7",
     "rebass": "^3.2.2",
     "redux": "4.0.5",
     "rxjs": "6.6.7",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1657803750403;
+declare const _default: 1658522436956;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1657803750403;
+exports.default = 1658522436956;

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -219,6 +219,7 @@ export interface IAdaptable {
     showQuickFilter(): void;
     hideQuickFilter(): void;
     isQuickFilterAvailable(): boolean;
+    setAgQuickSearch(query: string): void;
     getAgGridLightThemeName(): string;
     getAgGridCurrentThemeName(): string;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;

package/src/AdaptableOptions/SettingsPanelOptions.d.ts

@@ -10,8 +10,7 @@ export interface SettingsPanelOptions {
      */
     title?: string;
     /**
-     * Icon for Settings Panel  Can be `ConfigurationIcon`, `ApplicationIcon` or a custom Icon
-     *
+     * Settings Panel Icon: `ConfigurationIcon`, `ApplicationIcon` or custom Icon
      * @defaultValue `ConfigurationIcon`
      */
     icon?: 'ConfigurationIcon' | 'ApplicationIcon' | AdaptableIcon;

package/src/Api/ColumnApi.d.ts

@@ -38,6 +38,10 @@ export interface ColumnApi {
      * Returns all Sortable Columns
      */
     getSortableColumns(): AdaptableColumn[];
+    /**
+     * Returns all Sortable Columns
+     */
+    getFiltrableColumns(): AdaptableColumn[];
     /**
      * Returns all Groupable Columns
      */
@@ -299,4 +303,5 @@ export interface ColumnApi {
      * @param columnId Column to Check
      */
     isActionRowButtonColumn(columnId: string): boolean;
+    getDefaultAggFunc(columnId: string): string;
 }

package/src/Api/FilterApi.d.ts

@@ -1,6 +1,8 @@
 import { AdaptableColumn, ColumnFilter, GridCell, SystemFilterPredicateIds } from '../types';
-import { AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
+import * as Redux from 'redux';
+import { ColumnFilterDef, AdaptablePredicateDef } from '../PredefinedConfig/Common/AdaptablePredicate';
 import { RowNode } from '@ag-grid-community/all-modules';
+import { LayoutColumnFilterAction } from '../Redux/ActionsReducers/LayoutRedux';
 /**
  * Provides run-time access to Filter section of Adaptable State.
  */
@@ -46,6 +48,11 @@ export interface FilterApi {
      * @returns column filters
      */
     getColumnFilters(): ColumnFilter[];
+    /**
+     * Retrieves the Column Filter for the specified Column.
+     * @param columnId Column ID to lookup
+     */
+    getColumnFilter(columnId: string): ColumnFilter | undefined;
     /**
      * Retrieves all Column Filters in a given Layout
      * @param layoutName Layout to retrieve Column Filters for
@@ -120,4 +127,11 @@ export interface FilterApi {
      * - filter predicate has inputs with values
      */
     isFilterActive(columnFilter: ColumnFilter): boolean;
+    getColumnFilterDefs(): ColumnFilterDef[];
+    /**
+     * Checks if the filter action should trigger grid filtering.
+     *
+     * @param action Filtering Action
+     */
+    shouldNewColumnFilterTriggerGridFiltering(action: LayoutColumnFilterAction | Redux.Action): boolean;
 }

package/src/Api/Implementation/CalculatedColumnApiImpl.js

@@ -10,11 +10,10 @@ class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().CalculatedColumn;
     }
     getAllCalculatedColumn() {
-        return this.getCalculatedColumnState().CalculatedColumns;
+        return this.getCalculatedColumnState().CalculatedColumns || [];
     }
     getCalculatedColumnById(id) {
-        var _a;
-        return (_a = this.getAllCalculatedColumn()) === null || _a === void 0 ? void 0 : _a.find((column) => (column === null || column === void 0 ? void 0 : column.Uuid) === id);
+        return this.getAllCalculatedColumn().find((column) => (column === null || column === void 0 ? void 0 : column.Uuid) === id);
     }
     addCalculatedColumn(calculatedColumn) {
         this.addUidToAdaptableObject(calculatedColumn);

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

@@ -46,6 +46,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getDateColumns(): AdaptableColumn[];
     getBooleanColumns(): AdaptableColumn[];
     getSortableColumns(): AdaptableColumn[];
+    getFiltrableColumns(): AdaptableColumn[];
     getGroupableColumns(): AdaptableColumn[];
     getPivotableColumns(): AdaptableColumn[];
     getAggregetableColumns(): AdaptableColumn[];
@@ -68,4 +69,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     usesAdaptableQuickFilter(columnId: string): boolean;
     isColumnReferencedInExpression(columnId: string, expression: string): boolean;
     isActionRowButtonColumn(columnId: string): boolean;
+    getDefaultAggFunc(columnId: string): string;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -251,6 +251,9 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     getSortableColumns() {
         return this.getColumns().filter((c) => c.sortable);
     }
+    getFiltrableColumns() {
+        return this.getColumns().filter((c) => c.filterable);
+    }
     getGroupableColumns() {
         return this.getColumns().filter((c) => c.groupable);
     }
@@ -410,5 +413,12 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     isActionRowButtonColumn(columnId) {
         return columnId === GeneralConstants_1.ADAPTABLE_ROW_ACTION_BUTTONS;
     }
+    getDefaultAggFunc(columnId) {
+        var _a, _b, _c;
+        const abColumn = this.getColumnFromId(columnId);
+        const availableAggregationFunctions = abColumn.availableAggregationFunctions;
+        const agColumn = (_b = (_a = this.getAgGridColumnForAdaptableColumn(columnId)) === null || _a === void 0 ? void 0 : _a.getColDef) === null || _b === void 0 ? void 0 : _b.call(_a);
+        return (_c = agColumn === null || agColumn === void 0 ? void 0 : agColumn.defaultAggFunc) !== null && _c !== void 0 ? _c : availableAggregationFunctions[0];
+    }
 }
 exports.ColumnApiImpl = ColumnApiImpl;

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

@@ -1,6 +1,8 @@
+import * as Redux from 'redux';
+import * as LayoutRedux from '../../Redux/ActionsReducers/LayoutRedux';
 import { ApiBase } from './ApiBase';
 import { FilterApi } from '../FilterApi';
-import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
+import { AdaptablePredicateDef, ColumnFilterDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnFilter, GridCell, SystemFilterPredicateIds } from '../../types';
 import { RowNode } from '@ag-grid-community/all-modules';
@@ -15,6 +17,8 @@ export declare class FilterApiImpl extends ApiBase implements FilterApi {
     isQuickFilterAvailable(): boolean;
     isQuickFilterVisible(): boolean;
     getColumnFilters(): ColumnFilter[];
+    getColumnFilter(columnId: string): ColumnFilter | undefined;
+    getColumnFilterDefs(): ColumnFilterDef[];
     getColumnFiltersForLayout(layoutName: string): ColumnFilter[];
     setColumnFilter(columnFilters: ColumnFilter[]): ColumnFilter[] | null;
     clearColumnFilter(columnFilter: ColumnFilter): void;
@@ -37,4 +41,5 @@ export declare class FilterApiImpl extends ApiBase implements FilterApi {
      * @param filter
      */
     isFilterActive(filter: ColumnFilter): boolean;
+    shouldNewColumnFilterTriggerGridFiltering(action: LayoutRedux.LayoutColumnFilterAction | Redux.Action): boolean;
 }

package/src/Api/Implementation/FilterApiImpl.js

@@ -47,6 +47,21 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         const currentLayout = this.adaptable.api.layoutApi.getCurrentLayout();
         return (_a = currentLayout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
     }
+    getColumnFilter(columnId) {
+        return this.getColumnFilters().find((columnFilter) => columnFilter.ColumnId == columnId);
+    }
+    getColumnFilterDefs() {
+        const filters = this.getColumnFilters();
+        return filters.map((columnFilter) => {
+            const column = this.getAdaptableApi().columnApi.getColumnFromId(columnFilter.ColumnId);
+            const predicate = this.getAdaptableApi().predicateApi.getPredicateDefById(columnFilter.Predicate.PredicateId);
+            return {
+                predicate,
+                dataType: column === null || column === void 0 ? void 0 : column.dataType,
+                columnFilter: columnFilter,
+            };
+        });
+    }
     getColumnFiltersForLayout(layoutName) {
         var _a;
         const layout = this.adaptable.api.layoutApi.getLayoutByName(layoutName);
@@ -209,5 +224,48 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         });
         return allInputsHaveValues;
     }
+    shouldNewColumnFilterTriggerGridFiltering(action) {
+        var _a, _b;
+        // trigger filter change only:
+        // - new -> new filter is active
+        // - clear -> previous filters was active
+        // - clearAll -> a filter was active
+        // - edit -> same => input change
+        // - edit -> different & new is active
+        // - edit -> different & old was active
+        // - set -> new filter is active
+        const isNewAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_ADD &&
+            this.adaptable.api.filterApi.isFilterActive(action.columnFilter);
+        const isClearAndPreviousWasActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR &&
+            this.adaptable.api.filterApi.isFilterActive(action.columnFilter);
+        const isClearAllAtLeastOneActiveFilter = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL &&
+            this.adaptable.api.filterApi
+                .getColumnFilters()
+                .some((columnFilter) => this.adaptable.api.filterApi.isFilterActive(columnFilter));
+        let isEditTrigger = false;
+        if (action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT) {
+            const newFilter = action.columnFilter;
+            const previous = this.adaptable.api.filterApi.getColumnFilter(newFilter.ColumnId);
+            // same filter edit, so always trigger
+            if (((_a = previous === null || previous === void 0 ? void 0 : previous.Predicate) === null || _a === void 0 ? void 0 : _a.PredicateId) === ((_b = newFilter === null || newFilter === void 0 ? void 0 : newFilter.Predicate) === null || _b === void 0 ? void 0 : _b.PredicateId)) {
+                isEditTrigger = true;
+                // new filter is active
+            }
+            else if (this.adaptable.api.filterApi.isFilterActive(newFilter)) {
+                isEditTrigger = true;
+            }
+            else if (this.adaptable.api.filterApi.isFilterActive(previous)) {
+                // previous filter was active
+                isEditTrigger = true;
+            }
+        }
+        const isSetAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_SET &&
+            this.adaptable.api.filterApi.isFilterActive(action.columnFilter);
+        return (isNewAndActive ||
+            isClearAndPreviousWasActive ||
+            isClearAllAtLeastOneActiveFilter ||
+            isEditTrigger ||
+            isSetAndActive);
+    }
 }
 exports.FilterApiImpl = FilterApiImpl;

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

@@ -3,6 +3,7 @@ import { LayoutApi } from '../LayoutApi';
 import { LayoutState, Layout } from '../../PredefinedConfig/LayoutState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
+import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     getLayoutState(): LayoutState;
     shouldAutoSaveLayout: (layout?: Layout) => boolean;
@@ -34,7 +35,7 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     createDefaultLayoutIfNeeded(): Layout | null;
     showChangeColumnCaption(column: AdaptableColumn): void;
     showLayoutPopup(): void;
-    showLayoutEditor(layoutName?: string, action?: string): void;
+    showLayoutEditor(layoutName?: string, action?: ModuleParams['action']): void;
     isCurrentLayoutReadOnly(): boolean;
     deleteLayout(layout: Layout): void;
     deleteLayoutByName(layoutName: string): void;

package/src/Api/Implementation/LayoutApiImpl.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/LayoutRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ApiBase_1 = require("./ApiBase");
-const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
@@ -17,7 +16,6 @@ const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
 const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
 const LayoutRedux_1 = require("../../Redux/ActionsReducers/LayoutRedux");
-const windowFactory_1 = require("../../View/Components/Popups/WindowPopups/windowFactory");
 class LayoutApiImpl extends ApiBase_1.ApiBase {
     constructor() {
         super(...arguments);
@@ -263,26 +261,20 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.LayoutModuleId);
     }
     showLayoutEditor(layoutName, action = 'Edit') {
-        const layout = layoutName ? this.getLayoutByName(layoutName) : this.getCurrentLayout();
-        const moduleInfo = this.adaptable.ModuleService.getModuleInfoByModule(ModuleConstants.LayoutModuleId);
         let preparedAction = action;
         if (!['Edit', 'New', 'Clone'].includes(action)) {
             preparedAction = 'Edit';
             LoggingHelper_1.LogAdaptableError(`When opening the layout editor the action must be one of: New, Clone, Edit; given: ${action}`);
         }
-        let title = 'Layout Editor';
-        if (action === 'Edit') {
-            title = `Edit Layout${(layout === null || layout === void 0 ? void 0 : layout.Name) ? `: ${layout.Name}` : ''}`;
+        let layout = layoutName ? this.getLayoutByName(layoutName) : this.getCurrentLayout();
+        if (preparedAction === 'New') {
+            layout = null;
         }
-        this.dispatchAction(PopupRedux.PopupShowWindow({
-            Id: windowFactory_1.WINDOW_LAYOUT_EDITOR,
-            Title: title,
-            Icon: moduleInfo.Glyph,
-            PopupProps: {
-                action: preparedAction,
-                layout,
-            },
-        }));
+        this.showModulePopup(ModuleConstants.LayoutModuleId, {
+            source: 'Toolbar',
+            action: preparedAction,
+            value: layout,
+        });
     }
     isCurrentLayoutReadOnly() {
         const currentLayout = this.getCurrentLayout();

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -186,7 +186,10 @@ class ScheduleApiImpl extends ApiBase_1.ApiBase {
                     Scope: undefined,
                 },
             };
-            this.adaptable.api.alertApi.displayAlert(alert);
+            this.getAdaptableApi().alertApi.displayAlert(alert);
+            if (reminderSchedule.DisplaySystemStatusMessage) {
+                this.getAdaptableApi().systemStatusApi.setSystemStatus(reminderSchedule.Header, reminderSchedule.MessageType, reminderSchedule.Message);
+            }
         }
         else if (scheduleType == 'Report') {
             const reportSchedule = schedule;

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

@@ -51,4 +51,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable internal icon names
  */
-export declare type AdaptableInternalIconName = 'add' | 'add-row' | 'alert' | 'align-justify' | 'analysis' | 'application' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrowexpand' | 'attach-file' | 'blanks' | 'boolean-list' | 'broadcast' | 'build' | 'bulk-update' | 'calculated-column' | 'calendar' | 'call' | 'campaign' | 'cell-summary' | 'cell-validation' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clear' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'column-chooser' | 'column-filter' | 'comment' | 'conditional-style' | 'contains' | 'custom-sort' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'drag' | 'edit' | 'ends-with' | 'equal' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'flashing-cell' | 'folder' | 'folder-open' | 'folder-shared' | 'format-column' | 'freetext-column' | 'function' | 'gradient-column' | 'greater-than' | 'greater-than-or-equal' | 'hide-column' | 'history' | 'home' | 'import-export' | 'info' | 'instrument' | 'invalid' | 'ipushpull' | 'justify' | 'layout' | 'less-than' | 'less-than-or-equal' | 'list' | 'login' | 'logout' | 'menu' | 'minus' | 'multiplication' | 'newpage' | 'news' | 'non-blanks' | 'not-contains' | 'not-equal' | 'ok' | 'pause' | 'percent' | 'percent-bar' | 'person' | 'pie-chart' | 'play' | 'plus' | 'plus-minus' | 'query' | 'quick-search' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'settings' | 'shortcut' | 'show-column' | 'smart-edit' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'starts-with' | 'state-management' | 'statusbar' | 'stop' | 'system-status' | 'tab-unselected' | 'team-share' | 'theme' | 'tool-panel' | 'track-changes' | 'trash' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'updated-row' | 'upload' | 'warning';
+export declare type AdaptableInternalIconName = 'add' | 'add-row' | 'alert' | 'align-justify' | 'analysis' | 'application' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrowexpand' | 'attach-file' | 'blanks' | 'boolean-list' | 'broadcast' | 'build' | 'bulk-update' | 'calculated-column' | 'calendar' | 'call' | 'campaign' | 'cell-summary' | 'cell-validation' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clear' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'column-chooser' | 'column-filter' | 'comment' | 'conditional-style' | 'contains' | 'custom-sort' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'drag' | 'edit' | 'ends-with' | 'equal' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'flashing-cell' | 'folder' | 'folder-open' | 'folder-shared' | 'format-column' | 'freetext-column' | 'function' | 'gradient-column' | 'greater-than' | 'greater-than-or-equal' | 'hide-column' | 'history' | 'home' | 'import-export' | 'info' | 'instrument' | 'invalid' | 'ipushpull' | 'justify' | 'layout' | 'less-than' | 'less-than-or-equal' | 'list' | 'login' | 'logout' | 'menu' | 'minus' | 'multiplication' | 'newpage' | 'news' | 'non-blanks' | 'not-contains' | 'not-equal' | 'ok' | 'pause' | 'percent' | 'percent-bar' | 'person' | 'pie-chart' | 'play' | 'plus' | 'plus-minus' | 'query' | 'quick-search' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'settings' | 'shortcut' | 'show-column' | 'smart-edit' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'starts-with' | 'state-management' | 'statusbar' | 'stop' | 'system-status' | 'tab-unselected' | 'team-share' | 'theme' | 'tool-panel' | 'track-changes' | 'trash' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'updated-row' | 'upload' | 'warning';

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

@@ -1,6 +1,6 @@
 import { AdaptableScope } from './AdaptableScope';
-import { AdaptableColumn } from './AdaptableColumn';
-import { AdaptableApi, AdaptableIcon } from '../../types';
+import { AdaptableColumn, AdaptableColumnDataType } from './AdaptableColumn';
+import { AdaptableApi, AdaptableIcon, ColumnFilter } from '../../types';
 import { RowNode } from '@ag-grid-community/all-modules';
 /**
  * Predicate object used by AdapTableQL - essentially a boolean function
@@ -109,3 +109,8 @@ export declare type ModuleScope = 'filter' | 'alert' | 'conditionalstyle' | 'fla
  */
 export declare const SystemPredicateDefs: AdaptablePredicateDef[];
 export declare const SystemFilterPredicateIds: string[];
+export interface ColumnFilterDef {
+    dataType: AdaptableColumnDataType;
+    predicate: AdaptablePredicateDef;
+    columnFilter: ColumnFilter;
+}

package/src/PredefinedConfig/LayoutState.d.ts

@@ -69,6 +69,8 @@ export interface Layout extends AdaptableObject {
     };
     /**
      * Whether Layout should automatically save or not - overrides `autoSaveLayouts` property in LayoutOptions
+     *
+     * @deprecated - use `autoSaveLayouts` property in LayoutOptions instead, will be removed in next major version
      */
     AutoSave?: boolean;
     /**

package/src/PredefinedConfig/ScheduleState.d.ts

@@ -50,4 +50,8 @@ export interface ReminderSchedule extends BaseSchedule {
      * Displays Reminder as a Toast Notification
      */
     DisplayNotification: boolean;
+    /**
+     * Shows Reminder as System Status Message
+     */
+    DisplaySystemStatusMessage?: boolean;
 }

package/src/Redux/Store/AdaptableStore.js

@@ -685,15 +685,15 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         //  const gridOptions = adaptable.api.gridApi.getAgGridInstance();
                         if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(searchText)) {
                             // Currently using this but any searchable would allow us to limit the cols checked
-                            const queryText = 'ANY_CONTAINS("' + searchText + '") ';
+                            // const queryText = 'ANY_CONTAINS("' + searchText + '") ';
                             // const queryText = 'ANY_SEARCHABLE_CONTAINS("' + searchText + '") ';
-                            adaptable.api.queryApi.setCurrentQuery(queryText);
+                            // adaptable.api.queryApi.setCurrentQuery(queryText);
                             // Better still would be to use ag grid if that is possible?
                             //    gridOptions.api.setQuickFilter(searchText);
+                            adaptable.setAgQuickSearch(searchText);
                         }
                         else {
-                            adaptable.api.queryApi.clearCurrentQuery();
-                            //  gridOptions.api.setQuickFilter('');
+                            adaptable.setAgQuickSearch('');
                         }
                     }
                     return returnAction;
@@ -723,6 +723,8 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR:
                 case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL: {
                     let returnAction;
+                    // needs to be called before 'next' so previous and next column filters are known
+                    const shouldTriggerGridFiltering = adaptable.api.filterApi.shouldNewColumnFilterTriggerGridFiltering(action);
                     if ((_g = adaptable.adaptableOptions.layoutOptions) === null || _g === void 0 ? void 0 : _g.autoSaveLayouts) {
                         returnAction = next(action);
                     }
@@ -752,7 +754,11 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                         }
                         returnAction = next(draftLayoutAction);
                     }
-                    setTimeout(() => adaptable.applyGridFiltering(), 5);
+                    setTimeout(() => {
+                        if (shouldTriggerGridFiltering) {
+                            adaptable.applyGridFiltering();
+                        }
+                    }, 5);
                     adaptable.api.gridApi.fireSearchChangedEvent('Filter');
                     return returnAction;
                 }

package/src/Strategy/AlertModule.js

@@ -12,8 +12,8 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFact
 const AlertWizard_1 = require("../View/Alert/Wizard/AlertWizard");
 const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
-const getAlertPreviewViewItems_1 = require("./Utilities/getAlertPreviewViewItems");
-const getAlertBehaviourViewItems_1 = require("./Utilities/getAlertBehaviourViewItems");
+const getAlertPreviewViewItems_1 = require("./Utilities/Alert/getAlertPreviewViewItems");
+const getAlertBehaviourViewItems_1 = require("./Utilities/Alert/getAlertBehaviourViewItems");
 const AlertEmptyView_1 = require("../View/Alert/AlertEmptyView");
 const AlertStatusSubPanel_1 = require("../View/Alert/AlertStatusSubPanel");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");

package/src/Strategy/CustomSortModule.js

@@ -6,8 +6,8 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const CustomSortRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/CustomSortRedux"));
 const CustomSortWizard_1 = require("../View/CustomSort/Wizard/CustomSortWizard");
-const getCustomSortColumnViewItems_1 = require("./Utilities/getCustomSortColumnViewItems");
-const getCustomSortSortOrderViewItems_1 = require("./Utilities/getCustomSortSortOrderViewItems");
+const getCustomSortColumnViewItems_1 = require("./Utilities/CustomSort/getCustomSortColumnViewItems");
+const getCustomSortSortOrderViewItems_1 = require("./Utilities/CustomSort/getCustomSortSortOrderViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {

package/src/Strategy/ExportModule.js

@@ -14,8 +14,8 @@ const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensi
 const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
 const ObjectFactory_1 = require("../Utilities/ObjectFactory");
 const NewReportWizard_1 = require("../View/Export/Wizard/NewReportWizard");
-const getExportColumnsViewItems_1 = require("./Utilities/getExportColumnsViewItems");
-const getExportRowsViewItems_1 = require("./Utilities/getExportRowsViewItems");
+const getExportColumnsViewItems_1 = require("./Utilities/Export/getExportColumnsViewItems");
+const getExportRowsViewItems_1 = require("./Utilities/Export/getExportRowsViewItems");
 const ReportExportDropdown_1 = require("../View/Export/ReportExportDropdown");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const ExportSelector_1 = require("../View/Export/ExportSelector");

package/src/Strategy/FlashingCellModule.js

@@ -10,11 +10,11 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const AdaptableQuery_1 = require("../PredefinedConfig/Common/AdaptableQuery");
 const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
-const getFlashingCellDurationViewItems_1 = require("./Utilities/getFlashingCellDurationViewItems");
-const getFlashingCellStyleViewItems_1 = require("./Utilities/getFlashingCellStyleViewItems");
+const getFlashingCellDurationViewItems_1 = require("./Utilities/FlashingCell/getFlashingCellDurationViewItems");
 const FlashingCellWizard_1 = require("../View/FlashingCell/Wizard/FlashingCellWizard");
-const getFlashingTargetViewItems_1 = require("./Utilities/getFlashingTargetViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
+const getFlashingTargetViewItems_1 = require("./Utilities/FlashingCell/getFlashingTargetViewItems");
+const getFlashingCellStyleViewItems_1 = require("./Utilities/FlashingCell/getFlashingCellStyleViewItems");
 class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FlashingCellModuleId, 'Flashing Cell', 'flashing-cell', 'FlashingAlert', 'Flash cells when they change', api);

package/src/Strategy/FormatColumnModule.js

@@ -10,8 +10,8 @@ const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const FormatColumnWizard_1 = require("../View/FormatColumn/Wizard/FormatColumnWizard");
 const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 const FormatColumnFormatWizardSection_1 = require("../View/FormatColumn/Wizard/FormatColumnFormatWizardSection");
-const getFormatColumnSettingsViewItems_1 = require("./Utilities/getFormatColumnSettingsViewItems");
-const getFormatColumnStyleViewItems_1 = require("./Utilities/getFormatColumnStyleViewItems");
+const getFormatColumnSettingsViewItems_1 = require("./Utilities/FormatColumn/getFormatColumnSettingsViewItems");
+const getFormatColumnStyleViewItems_1 = require("./Utilities/FormatColumn/getFormatColumnStyleViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {

package/src/Strategy/LayoutModule.js

@@ -11,6 +11,9 @@ const LayoutStatusBarSubPanelPopover_1 = require("../View/Layout/LayoutStatusBar
 const EditCurrentLayoutButton_1 = require("../View/Layout/EditCurrentLayoutButton");
 const LayoutCloneButton_1 = require("../View/Layout/LayoutCloneButton");
 const SaveLayoutButton_1 = require("../View/Layout/SaveLayoutButton");
+const LayoutWizard_1 = require("../View/Layout/Wizard/LayoutWizard");
+const getLayoutFilterViewItems_1 = require("./Utilities/Layout/getLayoutFilterViewItems");
+const getLayoutSortViewItems_1 = require("./Utilities/Layout/getLayoutSortViewItems");
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, 'Layout', 'layout', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
@@ -243,14 +246,16 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     name: 'Name',
                     values: [layout.Name],
                 },
+                {
+                    name: 'Pivot Layout',
+                    values: [(layout === null || layout === void 0 ? void 0 : layout.EnablePivot) ? 'Yes' : 'No'],
+                },
                 {
                     name: 'Columns',
                     values: columns,
                 },
-                ((_e = layout.ColumnSorts) === null || _e === void 0 ? void 0 : _e.length) && {
-                    name: 'Sort',
-                    values: layout.ColumnSorts.map((customSort) => `[${columnIdToFriendlyName(customSort.ColumnId)}: ${customSort.SortOrder}]`),
-                },
+                ((_e = layout.ColumnSorts) === null || _e === void 0 ? void 0 : _e.length) && getLayoutSortViewItems_1.getLayoutSortViewItems(layout, this.api),
+                (layout === null || layout === void 0 ? void 0 : layout.ColumnFilters) && getLayoutFilterViewItems_1.getLayoutFilterViewItems(layout, this.api),
                 ((_f = layout === null || layout === void 0 ? void 0 : layout.RowGroupedColumns) === null || _f === void 0 ? void 0 : _f.length) && {
                     name: 'Grouped Columns',
                     values: layout.RowGroupedColumns.map((colId) => columnIdToFriendlyName(colId)),
@@ -259,10 +264,6 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     name: 'Pivot Columns',
                     values: layout.PivotColumns.map((colId) => columnIdToFriendlyName(colId)),
                 },
-                (layout === null || layout === void 0 ? void 0 : layout.EnablePivot) && {
-                    name: 'Pivot Enabled',
-                    values: ['Yes'],
-                },
             ].filter(Boolean),
             abObject: layout,
         };
@@ -277,15 +278,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 }
                 return LayoutRedux.LayoutDelete(layout);
             },
-            onOpenEditPopup: (layout) => {
-                if (!layout) {
-                    // consider it is new
-                    this.api.layoutApi.showLayoutEditor(null, 'New');
-                }
-                else {
-                    this.api.layoutApi.showLayoutEditor(layout.Name);
-                }
-            },
+            getEditWizard: () => LayoutWizard_1.LayoutWizard,
             getStatusBarPanelProps: () => {
                 const text = this.api.layoutApi.getCurrentLayoutName();
                 const layouts = this.api.layoutApi.getAllLayout();

package/src/Strategy/ShortcutModule.js

@@ -10,7 +10,7 @@ const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const ShortcutWizard_1 = require("../View/Shortcut/Wizard/ShortcutWizard");
 const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
-const getShortcutSettingsViewItems_1 = require("./Utilities/getShortcutSettingsViewItems");
+const getShortcutSettingsViewItems_1 = require("./Utilities/Shortcut/getShortcutSettingsViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class ShortcutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {

package/src/Strategy/Utilities/{getAlertBehaviourViewItems.js → Alert/getAlertBehaviourViewItems.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAlertBehaviourViewItems = void 0;
-const AdaptableContext_1 = require("../../View/AdaptableContext");
-const AlertBehaviourWizardSection_1 = require("../../View/Alert/Wizard/AlertBehaviourWizardSection");
+const AdaptableContext_1 = require("../../../View/AdaptableContext");
+const AlertBehaviourWizardSection_1 = require("../../../View/Alert/Wizard/AlertBehaviourWizardSection");
 const BehaviourView = (props) => {
     const adaptable = AdaptableContext_1.useAdaptable();
     return AlertBehaviourWizardSection_1.renderAlertBehaviourSummary(props.data, adaptable.api, true);

package/src/Strategy/Utilities/{getAlertPreviewViewItems.d.ts → Alert/getAlertPreviewViewItems.d.ts}

@@ -1,4 +1,4 @@
 import { AdaptableApi } from '../../../types';
-import { AlertDefinition } from '../../PredefinedConfig/AlertState';
-import { AdaptableObjectItemView } from '../Interface/IModule';
+import { AlertDefinition } from '../../../PredefinedConfig/AlertState';
+import { AdaptableObjectItemView } from '../../Interface/IModule';
 export declare const getAlertPreviewViewItems: (alert: AlertDefinition, api: AdaptableApi) => AdaptableObjectItemView;

package/src/Strategy/Utilities/{getAlertPreviewViewItems.js → Alert/getAlertPreviewViewItems.js}

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAlertPreviewViewItems = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const Tag_1 = require("../../components/Tag");
-const AlertDisplayWizardSection_1 = require("../../View/Alert/Wizard/AlertDisplayWizardSection");
+const Tag_1 = require("../../../components/Tag");
+const AlertDisplayWizardSection_1 = require("../../../View/Alert/Wizard/AlertDisplayWizardSection");
 const getAlertPreviewViewItems = (alert, api) => {
     return {
         name: 'Type and Display',

package/src/Strategy/Utilities/{getCustomSortColumnViewItems.d.ts → CustomSort/getCustomSortColumnViewItems.d.ts}

@@ -1,4 +1,4 @@
-import { AdaptableApi, CustomSort } from '../../../types';
+import { AdaptableApi, CustomSort } from '../../../../types';
 export declare const getCustomSortColumnViewItems: (customSort: CustomSort, api: AdaptableApi) => {
     name: string;
     values: string[];