@adaptabletools/adaptable-cjs 20.3.0 → 21.0.0-canary.1

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

@@ -63,7 +63,7 @@ export declare const SETTINGS_PANEL_SET = "SETTINGS_PANEL_SET";
 export declare const QUICK_FILTER_BAR_SHOW = "QUICK_FILTER_BAR_SHOW";
 export declare const QUICK_FILTER_BAR_HIDE = "QUICK_FILTER_BAR_HIDE";
 export declare const DISABLE_DELETE_CONFIRMATION = "DISABLE_DELETE_CONFIRMATION";
-export declare const LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = "LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS";
+export declare const LAYOUT_SHOW_NON_EXTENDED_OBJECTS = "LAYOUT_SHOW_NON_EXTENDED_OBJECTS";
 export declare const DASHBOARD_REFRESH = "DASHBOARD_REFRESH";
 export declare const DATA_SET_SELECT = "DATA_SET_SELECT";
 export declare const CHARTING_SET_CURRENT_CHART_MODELS = "CHARTING_SET_CURRENT_CHART_MODELS";
@@ -261,8 +261,8 @@ export interface QuickFilterBarShowAction extends Redux.Action {
 }
 export interface QuickFilterBarHideAction extends Redux.Action {
 }
-export interface LayoutShowNotAssociatedObjectsAction extends Redux.Action {
-    showNotAssociatedObjects: boolean;
+export interface LayoutShowNonExtendedObjectsAction extends Redux.Action {
+    showNonExtendedObjects: boolean;
 }
 export interface DataSetSelectAction extends Redux.Action {
     dataSet: DataSet;
@@ -324,7 +324,7 @@ export declare const DataChangeHistoryResume: () => DataChangeHistoryResumeActio
 export declare const SettingsPanelSet: (name: string, settings: InternalState['SettingsPanel']['0']) => SettingsPanelSetAction;
 export declare const QuickFilterBarShow: () => QuickFilterBarShowAction;
 export declare const QuickFilterBarHide: () => QuickFilterBarHideAction;
-export declare const LayoutShowNotAssociatedObjects: (showNotAssociatedObjects: boolean) => LayoutShowNotAssociatedObjectsAction;
+export declare const LayoutShowNonExtendedObjects: (showNonExtendedObjects: boolean) => LayoutShowNonExtendedObjectsAction;
 export declare const DashboardRefresh: () => DashboardRefreshAction;
 export declare const DataSetSelect: (dataSet: DataSet) => DataSetSelectAction;
 export declare const ChartingSetCurrentChartModels: (chartModels: ChartModel[]) => ChartingSetCurrentChartModelsAction;

package/src/Redux/ActionsReducers/InternalRedux.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DASHBOARD_REFRESH = exports.LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = exports.DISABLE_DELETE_CONFIRMATION = exports.QUICK_FILTER_BAR_HIDE = exports.QUICK_FILTER_BAR_SHOW = exports.SETTINGS_PANEL_SET = exports.DATA_CHANGE_HISTORY_RESUME = exports.DATA_CHANGE_HISTORY_SUSPEND = exports.DATA_CHANGE_HISTORY_DISABLE = exports.DATA_CHANGE_HISTORY_ENABLE = exports.DATA_CHANGE_HISTORY_CLEAR_ROW = exports.DATA_CHANGE_HISTORY_UNDO = exports.DATA_CHANGE_HISTORY_ADD = exports.LICENSE_DISABLE_PERSISTENCE = exports.LICENSE_SHOW_WATERMARK = exports.CREATE_CELL_SUMMARY_INFO = exports.SET_CELL_SUMMARY_INFO = exports.CELL_SUMMARY_CHANGE_OPERATION = exports.CACHED_QUERY_ADD = exports.BULK_UPDATE_CHANGE_VALUE = exports.BULK_UPDATE_SET_PREVIEW = exports.BULK_UPDATE_SET_VALID_SELECTION = exports.BULK_UPDATE_CHECK_CELL_SELECTION = exports.SMART_EDIT_CHANGE_OPERATION = exports.SMART_EDIT_CHANGE_VALUE = exports.SMARTEDIT_SET_PREVIEW = exports.SMARTEDIT_SET_VALID_SELECTION = exports.SMARTEDIT_FETCH_PREVIEW = exports.SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.ALERT_REMOVE_ROW_HIGHLIGHT = exports.ALERT_REMOVE_CELL_HIGHLIGHT = exports.ALERT_DELETE_ALL = exports.ALERT_DELETE = exports.ALERT_ADD = exports.HIGHLIGHT_ROW_DELETE_ALL = exports.HIGHLIGHT_ROWS_DELETE = exports.HIGHLIGHT_ROW_DELETE = exports.HIGHLIGHT_ROWS_ADD = exports.HIGHLIGHT_ROW_ADD = exports.HIGHLIGHT_CELL_DELETE_ALL = exports.HIGHLIGHT_CELL_DELETE = exports.HIGHLIGHT_CELL_ADD = exports.SET_DASHBOARD_MODULE_BUTTONS = exports.SET_SETTINGS_PANEL_ITEMS = exports.SET_SELECTED_ROWS = exports.SET_SELECTED_CELLS = exports.SET_COLUMNS = void 0;
+exports.DASHBOARD_REFRESH = exports.LAYOUT_SHOW_NON_EXTENDED_OBJECTS = exports.DISABLE_DELETE_CONFIRMATION = exports.QUICK_FILTER_BAR_HIDE = exports.QUICK_FILTER_BAR_SHOW = exports.SETTINGS_PANEL_SET = exports.DATA_CHANGE_HISTORY_RESUME = exports.DATA_CHANGE_HISTORY_SUSPEND = exports.DATA_CHANGE_HISTORY_DISABLE = exports.DATA_CHANGE_HISTORY_ENABLE = exports.DATA_CHANGE_HISTORY_CLEAR_ROW = exports.DATA_CHANGE_HISTORY_UNDO = exports.DATA_CHANGE_HISTORY_ADD = exports.LICENSE_DISABLE_PERSISTENCE = exports.LICENSE_SHOW_WATERMARK = exports.CREATE_CELL_SUMMARY_INFO = exports.SET_CELL_SUMMARY_INFO = exports.CELL_SUMMARY_CHANGE_OPERATION = exports.CACHED_QUERY_ADD = exports.BULK_UPDATE_CHANGE_VALUE = exports.BULK_UPDATE_SET_PREVIEW = exports.BULK_UPDATE_SET_VALID_SELECTION = exports.BULK_UPDATE_CHECK_CELL_SELECTION = exports.SMART_EDIT_CHANGE_OPERATION = exports.SMART_EDIT_CHANGE_VALUE = exports.SMARTEDIT_SET_PREVIEW = exports.SMARTEDIT_SET_VALID_SELECTION = exports.SMARTEDIT_FETCH_PREVIEW = exports.SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.ALERT_REMOVE_ROW_HIGHLIGHT = exports.ALERT_REMOVE_CELL_HIGHLIGHT = exports.ALERT_DELETE_ALL = exports.ALERT_DELETE = exports.ALERT_ADD = exports.HIGHLIGHT_ROW_DELETE_ALL = exports.HIGHLIGHT_ROWS_DELETE = exports.HIGHLIGHT_ROW_DELETE = exports.HIGHLIGHT_ROWS_ADD = exports.HIGHLIGHT_ROW_ADD = exports.HIGHLIGHT_CELL_DELETE_ALL = exports.HIGHLIGHT_CELL_DELETE = exports.HIGHLIGHT_CELL_ADD = exports.SET_DASHBOARD_MODULE_BUTTONS = exports.SET_SETTINGS_PANEL_ITEMS = exports.SET_SELECTED_ROWS = exports.SET_SELECTED_CELLS = exports.SET_COLUMNS = void 0;
 exports.DataChangeHistoryEnable = exports.DataChangeHistoryClearRow = exports.DataChangeHistoryUndo = exports.DataChangeHistoryAdd = exports.LicenseDisablePersistence = exports.LicenseShowWatermark = exports.CellSummaryChangeOperation = exports.CachedQueryAdd = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SetCellSummaryInfo = exports.CreateCellSummaryInfo = exports.AdaptableAlertRemoveRowHighlight = exports.AdaptableAlertRemoveCellHighlight = exports.AdaptableAlertDeleteAll = exports.AdaptableAlertDelete = exports.AdaptableAlertAdd = exports.SetDasboardModuleButtons = exports.SetSettingsPanelItems = exports.SetSelectedRows = exports.SetSelectedCells = exports.SetColumns = exports.GridHighlightRowDeleteAll = exports.GridHighlightRowsDelete = exports.HighlightRowDelete = exports.HighlightRowsAdd = exports.HighlightRowAdd = exports.HighlightCellDeleteAll = exports.HighlightCellDelete = exports.HighlightCellAdd = exports.DATA_IMPORT_COMPLETED = exports.SUMMARY_ROW_SET = exports.CELL_POPUP_EDIT_FOCUSED_ENTITY = exports.CELL_POPUP_HIDE = exports.CELL_POPUP_SHOW = exports.SYSTEM_EXPORT_END = exports.SYSTEM_EXPORT_BEGIN = exports.SET_QUICK_SEARCH_FLOATING_VISIBILITY = exports.CHARTING_SET_CURRENT_CHART_MODELS = exports.DATA_SET_SELECT = void 0;
-exports.InternalReducer = exports.DataImportCompleted = exports.CommentsAndNotesFocusedEntitySelector = exports.CommentsAndNotesEditModeSelector = exports.CommentsAndNotesSelector = exports.QuickSearchFloatingVisibilitySelector = exports.DisableDeleteConfirmationSelector = exports.CellPopupHide = exports.RowSummarySet = exports.CellPopupEditFocusedEntity = exports.CellPopupShow = exports.QuickSearchFloatingVisibility = exports.SystemExportEnd = exports.SystemExportBegin = exports.DisableDeleteConfirmation = exports.ChartingCurrentChartModelsSelector = exports.ChartingSetCurrentChartModels = exports.DataSetSelect = exports.DashboardRefresh = exports.LayoutShowNotAssociatedObjects = exports.QuickFilterBarHide = exports.QuickFilterBarShow = exports.SettingsPanelSet = exports.DataChangeHistoryResume = exports.DataChangeHistorySuspend = exports.DataChangeHistoryDisable = void 0;
+exports.InternalReducer = exports.DataImportCompleted = exports.CommentsAndNotesFocusedEntitySelector = exports.CommentsAndNotesEditModeSelector = exports.CommentsAndNotesSelector = exports.QuickSearchFloatingVisibilitySelector = exports.DisableDeleteConfirmationSelector = exports.CellPopupHide = exports.RowSummarySet = exports.CellPopupEditFocusedEntity = exports.CellPopupShow = exports.QuickSearchFloatingVisibility = exports.SystemExportEnd = exports.SystemExportBegin = exports.DisableDeleteConfirmation = exports.ChartingCurrentChartModelsSelector = exports.ChartingSetCurrentChartModels = exports.DataSetSelect = exports.DashboardRefresh = exports.LayoutShowNonExtendedObjects = exports.QuickFilterBarHide = exports.QuickFilterBarShow = exports.SettingsPanelSet = exports.DataChangeHistoryResume = exports.DataChangeHistorySuspend = exports.DataChangeHistoryDisable = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ReduxConstants_1 = require("../../Utilities/Constants/ReduxConstants");
 const Enums_1 = require("../../AdaptableState/Common/Enums");
@@ -80,7 +80,7 @@ exports.QUICK_FILTER_BAR_HIDE = 'QUICK_FILTER_BAR_HIDE';
 // Delete warning
 exports.DISABLE_DELETE_CONFIRMATION = 'DISABLE_DELETE_CONFIRMATION';
 // Layout
-exports.LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS = 'LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS';
+exports.LAYOUT_SHOW_NON_EXTENDED_OBJECTS = 'LAYOUT_SHOW_NON_EXTENDED_OBJECTS';
 exports.DASHBOARD_REFRESH = 'DASHBOARD_REFRESH';
 // DataSet
 exports.DATA_SET_SELECT = 'DATA_SET_SELECT';
@@ -326,11 +326,11 @@ const QuickFilterBarHide = () => ({
     type: exports.QUICK_FILTER_BAR_HIDE,
 });
 exports.QuickFilterBarHide = QuickFilterBarHide;
-const LayoutShowNotAssociatedObjects = (showNotAssociatedObjects) => ({
-    type: exports.LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS,
-    showNotAssociatedObjects,
+const LayoutShowNonExtendedObjects = (showNonExtendedObjects) => ({
+    type: exports.LAYOUT_SHOW_NON_EXTENDED_OBJECTS,
+    showNonExtendedObjects: showNonExtendedObjects,
 });
-exports.LayoutShowNotAssociatedObjects = LayoutShowNotAssociatedObjects;
+exports.LayoutShowNonExtendedObjects = LayoutShowNonExtendedObjects;
 const DashboardRefresh = () => ({
     type: exports.DASHBOARD_REFRESH,
 });
@@ -458,7 +458,7 @@ const initialState = {
         externalChartingDefinitions: [],
     },
     Layout: {
-        ShowLayoutNotAssociatedObjects: false,
+        showLayoutNonExtendedObjects: false,
     },
     DisableDeleteConfirmation: false,
     Export: {
@@ -839,12 +839,12 @@ const InternalReducer = (state = initialState, action) => {
             return Object.assign({}, state, { IsQuickFilterVisible: true });
         case exports.QUICK_FILTER_BAR_HIDE:
             return Object.assign({}, state, { IsQuickFilterVisible: false });
-        case exports.LAYOUT_SHOW_NOT_ASSOCIATED_OBJECTS: {
+        case exports.LAYOUT_SHOW_NON_EXTENDED_OBJECTS: {
             const typedAction = action;
             return {
                 ...state,
                 Layout: {
-                    ShowLayoutNotAssociatedObjects: typedAction.showNotAssociatedObjects,
+                    showLayoutNonExtendedObjects: typedAction.showNonExtendedObjects,
                 },
             };
         }

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

@@ -12,6 +12,10 @@ export declare const STYLED_COLUMN_EDIT = "STYLED_COLUMN_EDIT";
  * @ReduxAction A Special Column Style has been deleted
  */
 export declare const STYLED_COLUMN_DELETE = "STYLED_COLUMN_DELETE";
+/**
+ * @ReduxAction Delete ALL Styled Columns
+ */
+export declare const STYLED_COLUMN_DELETE_ALL = "STYLED_COLUMN_DELETE_ALL";
 /**
  * @ReduxAction StyledColumn Module is ready
  */
@@ -41,6 +45,8 @@ export interface StyledColumnEditAction extends StyledColumnAction {
 }
 export interface StyledColumnDeleteAction extends StyledColumnAction {
 }
+export interface StyledColumnDeleteAllAction extends Redux.Action {
+}
 export interface StyledColumnSuspendAction extends StyledColumnAction {
 }
 export interface StyledColumnUnSuspendAction extends StyledColumnAction {
@@ -55,6 +61,7 @@ export interface StyledColumnReadyAction extends Redux.Action {
 export declare const StyledColumnAdd: (formatColumn: StyledColumn) => StyledColumnAddAction;
 export declare const StyledColumnEdit: (formatColumn: StyledColumn) => StyledColumnEditAction;
 export declare const StyledColumnDelete: (formatColumn: StyledColumn) => StyledColumnDeleteAction;
+export declare const StyledColumnDeleteAll: () => StyledColumnDeleteAllAction;
 export declare const StyledColumnSuspend: (formatColumn: StyledColumn) => StyledColumnSuspendAction;
 export declare const StyledColumnUnSuspend: (formatColumn: StyledColumn) => StyledColumnSuspendAction;
 export declare const StyledColumnSuspendAll: () => StyledColumnSuspendAllAction;

package/src/Redux/ActionsReducers/StyledColumnRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StyledColumnReducer = exports.StyledColumnReady = exports.StyledColumnUnSuspendAll = exports.StyledColumnSuspendAll = exports.StyledColumnUnSuspend = exports.StyledColumnSuspend = exports.StyledColumnDelete = exports.StyledColumnEdit = exports.StyledColumnAdd = exports.STYLED_COLUMN_UNSUSPEND_ALL = exports.STYLED_COLUMN_SUSPEND_ALL = exports.STYLED_COLUMN_UNSUSPEND = exports.STYLED_COLUMN_SUSPEND = exports.STYLED_COLUMN_READY = exports.STYLED_COLUMN_DELETE = exports.STYLED_COLUMN_EDIT = exports.STYLED_COLUMN_ADD = void 0;
+exports.StyledColumnReducer = exports.StyledColumnReady = exports.StyledColumnUnSuspendAll = exports.StyledColumnSuspendAll = exports.StyledColumnUnSuspend = exports.StyledColumnSuspend = exports.StyledColumnDeleteAll = exports.StyledColumnDelete = exports.StyledColumnEdit = exports.StyledColumnAdd = exports.STYLED_COLUMN_UNSUSPEND_ALL = exports.STYLED_COLUMN_SUSPEND_ALL = exports.STYLED_COLUMN_UNSUSPEND = exports.STYLED_COLUMN_SUSPEND = exports.STYLED_COLUMN_READY = exports.STYLED_COLUMN_DELETE_ALL = exports.STYLED_COLUMN_DELETE = exports.STYLED_COLUMN_EDIT = exports.STYLED_COLUMN_ADD = void 0;
 const tslib_1 = require("tslib");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
@@ -17,6 +17,10 @@ exports.STYLED_COLUMN_EDIT = 'STYLED_COLUMN_EDIT';
  * @ReduxAction A Special Column Style has been deleted
  */
 exports.STYLED_COLUMN_DELETE = 'STYLED_COLUMN_DELETE';
+/**
+ * @ReduxAction Delete ALL Styled Columns
+ */
+exports.STYLED_COLUMN_DELETE_ALL = 'STYLED_COLUMN_DELETE_ALL';
 /**
  * @ReduxAction StyledColumn Module is ready
  */
@@ -52,6 +56,10 @@ const StyledColumnDelete = (formatColumn) => ({
     StyledColumn: formatColumn,
 });
 exports.StyledColumnDelete = StyledColumnDelete;
+const StyledColumnDeleteAll = () => ({
+    type: exports.STYLED_COLUMN_DELETE_ALL,
+});
+exports.StyledColumnDeleteAll = StyledColumnDeleteAll;
 const StyledColumnSuspend = (formatColumn) => ({
     type: exports.STYLED_COLUMN_SUSPEND,
     StyledColumn: formatColumn,
@@ -101,6 +109,12 @@ const StyledColumnReducer = (state = initialState, action) => {
                 StyledColumns: state.StyledColumns.filter((abObject) => abObject.Uuid !== actionStyledColumn.Uuid),
             };
         }
+        case exports.STYLED_COLUMN_DELETE_ALL: {
+            return {
+                ...state,
+                StyledColumns: [],
+            };
+        }
         case exports.STYLED_COLUMN_SUSPEND: {
             return {
                 ...state,

package/src/Redux/Store/AdaptableStore.js

@@ -899,18 +899,18 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     const newLayout = (newLayoutState.Layouts || []).find((l) => l.Name == newLayoutState.CurrentLayout) ||
                         newLayoutState.Layouts[0] ||
                         GeneralConstants_1.ERROR_LAYOUT;
-                    // Apply filtering if Column or Grid filters have been changed
-                    let refreshFilters = false;
+                    const changedColumnSorts = adaptable.api.layoutApi.internalApi.getChangedColumnSorts(oldLayout.ColumnSorts, newLayout.ColumnSorts);
+                    changedColumnSorts.forEach((columnId) => adaptable.api.filterApi.columnFilterApi.resetFilterValues(columnId));
+                    let refreshColumnFilters = false;
                     if (adaptable.api.filterApi.columnFilterApi.internalApi.areColumnFiltersDifferent(oldLayout.ColumnFilters, newLayout.ColumnFilters)) {
-                        refreshFilters = true;
+                        refreshColumnFilters = true;
                     }
-                    // Apply Grid filtering if Grid filter has been changed
-                    if (!refreshFilters &&
-                        adaptable.api.filterApi.gridFilterApi.internalApi.isGridFilterDifferent(oldLayout.GridFilter, newLayout.GridFilter)) {
-                        refreshFilters = true;
+                    let refreshGridFilter = false;
+                    if (adaptable.api.filterApi.gridFilterApi.internalApi.isGridFilterDifferent(oldLayout.GridFilter, newLayout.GridFilter)) {
+                        refreshGridFilter = true;
                     }
-                    if (refreshFilters) {
-                        adaptable.applyFiltering();
+                    if (refreshColumnFilters || refreshGridFilter) {
+                        adaptable.applyFiltering({ updateColumnFilterModel: refreshColumnFilters });
                     }
                     if (returnAction.type == LayoutRedux.LAYOUT_SELECT ||
                         returnAction.type == LayoutRedux.LAYOUT_DELETE) {
@@ -976,7 +976,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     adaptable.api.eventApi.internalApi.fireGridFilterAppliedEvent();
                     adaptable.api.eventApi.internalApi.fireLayoutChangedEvent(action.type, null, middlewareAPI.getState().Layout);
                     setTimeout(() => {
-                        adaptable.applyFiltering();
+                        adaptable.applyFiltering({ updateColumnFilterModel: false });
                     }, 5);
                     return next(returnAction);
                 }

package/src/Strategy/AdaptableModuleBase.d.ts

@@ -1,3 +1,4 @@
+import { AgModuleName } from 'ag-grid-enterprise';
 import { IModule, ModuleInfo, TeamSharingReferences } from './Interface/IModule';
 import { Action } from 'redux';
 import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
@@ -20,15 +21,24 @@ export declare abstract class AdaptableModuleBase implements IModule {
     protected api: AdaptableApi;
     moduleInfo: ModuleInfo;
     AccessLevel: AccessLevel;
+    agGridModuleDepsInfo: {
+        hasRequiredAgGridModuleDependencies: boolean;
+        missingAgGridModuleDependencies?: AgModuleName[];
+    };
     constructor(module: AdaptableModule, friendlyName: string, glyph: AdaptableSystemIconName, popup: string, description: string, api: AdaptableApi);
     protected getViewAccessLevel(): AccessLevel;
     protected getEditAccessLevel(): AccessLevel;
+    protected getAgGridModuleDependencies(): AgModuleName[];
+    isModuleEnabled(): boolean;
     isModuleAvailable(): boolean;
+    isModuleVisible(): boolean;
+    isModuleEditable(): boolean;
+    setAgGridDepsInfo(): void;
+    logMissingAgGridDepsInfos(): void;
     /**
      * Used inside the unified UI to show the share button
      */
     isModuleObjectsShareable(): boolean;
-    isModuleEditable(): boolean;
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(adaptableObject: AdaptableObject): string[];
     getReferencedNamedQueryNames(adaptableObject: AdaptableObject): string[];
@@ -56,10 +66,10 @@ export declare abstract class AdaptableModuleBase implements IModule {
     getTeamSharingReferences(adaptableObject: AdaptableObject): TeamSharingReferences;
     getPopupMaxWidth(): number | undefined;
     /**
-     * TRUE for objects of type {@link LayoutAssociatedObject}
+     * TRUE for objects of type {@link LayoutExtensionObject}
      */
-    canBeAssociatedWithLayouts(): boolean;
-    showLayoutNotAssociatedObjects(): boolean;
+    containsLayoutExtensions(): boolean;
+    showLayoutNonExtendedObjects(): boolean;
     private getFriendlyName;
     private hasRequiredAccessLevel;
 }

package/src/Strategy/AdaptableModuleBase.js

@@ -35,8 +35,48 @@ class AdaptableModuleBase {
         // override where necessary
         return 'Full';
     }
+    getAgGridModuleDependencies() {
+        // override where necessary
+        return [];
+    }
+    isModuleEnabled() {
+        // by default all modules are enabled; some modules may override this to check specific flags, configs, etc.
+        return true;
+    }
     isModuleAvailable() {
-        return this.hasRequiredAccessLevel(this.getViewAccessLevel());
+        return this.agGridModuleDepsInfo?.hasRequiredAgGridModuleDependencies;
+    }
+    isModuleVisible() {
+        return (this.isModuleEnabled() &&
+            this.isModuleAvailable() &&
+            this.hasRequiredAccessLevel(this.getViewAccessLevel()));
+    }
+    isModuleEditable() {
+        return (this.isModuleEnabled() &&
+            this.isModuleAvailable() &&
+            this.hasRequiredAccessLevel(this.getEditAccessLevel()));
+    }
+    setAgGridDepsInfo() {
+        const agGridModulesAdapter = this.api.internalApi.getAgGridModulesAdapter();
+        const missingAgGridModuleDependencies = this.getAgGridModuleDependencies().filter((agGridModule) => !agGridModulesAdapter.isAgGridModuleRegistered(agGridModule));
+        if (missingAgGridModuleDependencies.length) {
+            this.agGridModuleDepsInfo = {
+                hasRequiredAgGridModuleDependencies: false,
+                missingAgGridModuleDependencies,
+            };
+        }
+        else {
+            this.agGridModuleDepsInfo = {
+                hasRequiredAgGridModuleDependencies: true,
+            };
+        }
+    }
+    logMissingAgGridDepsInfos() {
+        if (this.isModuleEnabled() &&
+            this.hasRequiredAccessLevel(this.getViewAccessLevel()) &&
+            !this.isModuleAvailable()) {
+            this.api.logWarn(`Module '${this.moduleInfo.ModuleName}' is not available -  missing required AG Grid modules: ${this.agGridModuleDepsInfo.missingAgGridModuleDependencies.join(', ')}`);
+        }
     }
     /**
      * Used inside the unified UI to show the share button
@@ -44,9 +84,6 @@ class AdaptableModuleBase {
     isModuleObjectsShareable() {
         return true;
     }
-    isModuleEditable() {
-        return this.hasRequiredAccessLevel(this.getEditAccessLevel());
-    }
     getModuleAdaptableObjects() {
         // override where necessary in base classes
         return [];
@@ -74,7 +111,7 @@ class AdaptableModuleBase {
         this.AccessLevel = this.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
     }
     createModuleMenuItem(source) {
-        if (this.isModuleAvailable() && this.moduleInfo.Popup) {
+        if (this.isModuleVisible() && this.moduleInfo.Popup) {
             const moduleParams = {
                 source: source,
                 maxWidth: this.getPopupMaxWidth(),
@@ -196,13 +233,13 @@ class AdaptableModuleBase {
         return undefined;
     }
     /**
-     * TRUE for objects of type {@link LayoutAssociatedObject}
+     * TRUE for objects of type {@link LayoutExtensionObject}
      */
-    canBeAssociatedWithLayouts() {
+    containsLayoutExtensions() {
         return false;
     }
-    showLayoutNotAssociatedObjects() {
-        return this.api.layoutApi.internalApi.showLayoutNotAssociatedObjects();
+    showLayoutNonExtendedObjects() {
+        return this.api.layoutApi.internalApi.showLayoutNonExtendedObjects();
     }
     getFriendlyName(module, friendlyName) {
         let returnValue = friendlyName;

package/src/Strategy/AlertModule.d.ts

@@ -5,6 +5,7 @@ import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 import { ContextMenuContext } from '../AdaptableState/Common/Menu';
 import { TeamSharingImportInfo } from '../AdaptableState/TeamSharingState';
 import { MenuItemShowPopup } from '../Utilities/MenuItem';
+import { LayoutExtendedConfig } from '../types';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { ICellDataChangeListenerModule } from './Interface/ICellDataChangeListenerModule';
 import { AdaptableModuleView, AdaptableObjectCompactView, AdaptableObjectView } from './Interface/IModule';
@@ -15,9 +16,7 @@ export declare class AlertModule extends AdaptableModuleBase implements ICellDat
     shouldListenToDataChanges(): boolean;
     checkListenToCellDataChanged(): void;
     setupCellDataChangeListener(): void;
-    getModuleAdaptableObjects(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): AdaptableObject[];
+    getModuleAdaptableObjects(config?: LayoutExtendedConfig): AdaptableObject[];
     getExplicitlyReferencedColumnIds(alertDefinition: AlertDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: AlertDefinition): string[];
     createContextMenuItems(menuContext: ContextMenuContext): MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
@@ -30,5 +29,5 @@ export declare class AlertModule extends AdaptableModuleBase implements ICellDat
     toView(alert: AlertDefinition): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
     getViewProperties(): AdaptableModuleView;
-    canBeAssociatedWithLayouts(): boolean;
+    containsLayoutExtensions(): boolean;
 }

package/src/Strategy/AlertModule.js

@@ -103,7 +103,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     createContextMenuItems(menuContext) {
         const items = [];
-        if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
+        if (!menuContext.isRowGroupColumn && this.isModuleVisible()) {
             if (menuContext.adaptableColumn && menuContext.rowNode) {
                 let relevantAlert;
                 // find alerts which highlight the current cell
@@ -163,8 +163,11 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         });
     }
     getTeamSharingAction() {
+        const config = {
+            includeLayoutNotExtendedObjects: false,
+        };
         return {
-            ModuleEntities: this.api.alertApi.getAlertDefinitions(),
+            ModuleEntities: this.api.alertApi.getAlertDefinitions(config),
             AddAction: AlertRedux.AlertDefinitionAdd,
             EditAction: AlertRedux.AlertDefinitionEdit,
         };
@@ -199,7 +202,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     toViewAll() {
         return this.getModuleAdaptableObjects({
-            includeLayoutNotAssociatedObjects: this.showLayoutNotAssociatedObjects(),
+            includeLayoutNotExtendedObjects: this.showLayoutNonExtendedObjects(),
         }).map((alert) => this.toView(alert));
     }
     getViewProperties() {
@@ -225,7 +228,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             },
         };
     }
-    canBeAssociatedWithLayouts() {
+    containsLayoutExtensions() {
         return true;
     }
 }

package/src/Strategy/CalculatedColumnModule.js

@@ -67,7 +67,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!column) {
             return;
         }
-        if (!this.isModuleAvailable()) {
+        if (!this.isModuleVisible()) {
             return;
         }
         if (this.isModuleEditable() && column.isCalculatedColumn) {
@@ -85,7 +85,7 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!menuContext.adaptableColumn) {
             return;
         }
-        if (!this.isModuleAvailable()) {
+        if (!this.isModuleVisible()) {
             return;
         }
         if (this.isModuleEditable() &&

package/src/Strategy/CellSummaryModule.js

@@ -20,7 +20,7 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return 'Full';
     }
     createColumnMenuItems(column) {
-        if (!this.isModuleAvailable()) {
+        if (!this.isModuleVisible()) {
             return;
         }
         if (column.dataType !== 'number') {
@@ -40,7 +40,7 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         ];
     }
     createContextMenuItems(menuContext) {
-        if (!this.isModuleAvailable()) {
+        if (!this.isModuleVisible()) {
             return;
         }
         if (menuContext.adaptableColumn &&

package/src/Strategy/ChartingModule.d.ts

@@ -3,9 +3,11 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn, ChartDefinition } from '../types';
 import { ExternalChartDefinition } from '../AdaptableState/ChartingState';
+import { AgModuleName } from 'ag-grid-enterprise';
 export declare class ChartingModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    isModuleAvailable(): boolean;
+    protected getAgGridModuleDependencies(): AgModuleName[];
+    isModuleEnabled(): boolean;
     createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
     getModuleAdaptableObjects(): (ChartDefinition | ExternalChartDefinition)[];
     toViewAll(): AdaptableObjectView[];

package/src/Strategy/ChartingModule.js

@@ -16,10 +16,16 @@ class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ChartingModuleId, ModuleConstants.ChartingFriendlyName, 'chart', 'ChartPopup', 'Create AG Grid Charts in order to see Adaptable Data visually', api);
     }
-    isModuleAvailable() {
-        const agChartsAvailable = this.api.chartingApi.isChartingEnabled() && super.isModuleAvailable();
+    getAgGridModuleDependencies() {
+        return ['IntegratedChartsModule'];
+    }
+    isModuleEnabled() {
+        const agGridChartsEnabled = this.api.agGridApi.getGridOption('enableCharts');
+        if (agGridChartsEnabled) {
+            return true;
+        }
         const externalChartsAvailable = Helper_1.default.objectHasKeys(this.api.optionsApi.getChartingOptions().externalChartingOptions);
-        return Boolean(agChartsAvailable || externalChartsAvailable);
+        return externalChartsAvailable;
     }
     createColumnMenuItems(column) {
         if (column &&

package/src/Strategy/ColumnFilterModule.d.ts

@@ -8,11 +8,11 @@ import { AdaptableObject } from '../AdaptableState/Common/AdaptableObject';
 import { ColumnFilter } from '../types';
 export declare class ColumnFilterModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
+    onAdaptableReady(): void;
     setModuleEntitlement(): void;
     getModuleAdaptableObjects(): AdaptableObject[];
     getExplicitlyReferencedColumnIds(columnFilter: ColumnFilter): string[];
     hasNamedQueryReferences(): boolean;
-    onAdaptableReady(): void;
     createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<"separator" | "calculated-column-edit" | "cell-summary-show" | "chart-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
     createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<AdaptableContextMenuItemName>[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<ColumnFilter>;

package/src/Strategy/ColumnFilterModule.js

@@ -12,6 +12,36 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ColumnFilterModuleId, ModuleConstants.ColumnFilterFriendlyName, 'filter', 'FilterPopup', 'Advanced filtering capability allows users to see precisely the data they want', api);
     }
+    onAdaptableReady() {
+        if (this.api.optionsApi.getFilterOptions().columnFilterOptions.showQuickFilter == false) {
+            this.api.filterApi.columnFilterApi.hideQuickFilterBar();
+        }
+        else {
+            this.api.filterApi.columnFilterApi.showQuickFilterBar();
+        }
+        const columnFilters = this.api.filterApi.columnFilterApi.getColumnFilters();
+        columnFilters.forEach((cf) => {
+            if (!this.api.columnApi.isColumnInGrid(cf.ColumnId)) {
+                this.api.logError('Column Filter contains missing column: ' + cf.ColumnId);
+            }
+        });
+        this.api.internalApi
+            .getDataService()
+            .on('CellDataChanged', (cellDataChangedInfo) => {
+            const changedColumnId = cellDataChangedInfo.column.columnId;
+            this.api.filterApi.columnFilterApi.resetFilterValues(changedColumnId);
+        });
+        // we reset the filter cache on sort change, because we might have columns
+        // with "In" filters, with custom values, which use `context.orderedValues`
+        // customInFilterValues: (context: CustomInFilterValuesContext<Car>) => {
+        //   return context.orderedValues;
+        // }
+        // and that order will most likely change when sorting happens
+        // so we need to reset the cached filter values when sorting changes
+        this.api.eventApi.on('GridSorted', () => {
+            this.api.filterApi.columnFilterApi.resetAllFilterValues();
+        });
+    }
     setModuleEntitlement() {
         if (!this.api.optionsApi.getFilterOptions().useAdaptableFiltering) {
             this.AccessLevel = 'Hidden';
@@ -29,20 +59,6 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    onAdaptableReady() {
-        if (this.api.optionsApi.getFilterOptions().columnFilterOptions.showQuickFilter == false) {
-            this.api.filterApi.columnFilterApi.hideQuickFilterBar();
-        }
-        else {
-            this.api.filterApi.columnFilterApi.showQuickFilterBar();
-        }
-        const columnFilters = this.api.filterApi.columnFilterApi.getColumnFilters();
-        columnFilters.forEach((cf) => {
-            if (!this.api.columnApi.isColumnInGrid(cf.ColumnId)) {
-                this.api.logError('Column Filter contains missing column: ' + cf.ColumnId);
-            }
-        });
-    }
     createColumnMenuItems(column) {
         let columnFilterMenuItems = [];
         if (column &&
@@ -68,7 +84,7 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
     }
     createContextMenuItems(menuContext) {
-        if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
+        if (!menuContext.isRowGroupColumn && this.isModuleVisible()) {
             if (menuContext.adaptableColumn &&
                 menuContext.adaptableColumn.filterable &&
                 menuContext.isSingleSelectedColumn &&

package/src/Strategy/ColumnInfoModule.js

@@ -12,7 +12,7 @@ class ColumnInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return 'Full';
     }
     createColumnMenuItems(column) {
-        if (this.isModuleAvailable() && !column.isTreeColumn) {
+        if (this.isModuleVisible() && !column.isTreeColumn) {
             const columnPopUpParams = {
                 source: 'ColumnMenu',
                 column: column,
@@ -29,7 +29,7 @@ class ColumnInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
     }
     createContextMenuItems(menuContext) {
-        if (this.isModuleAvailable()) {
+        if (this.isModuleVisible()) {
             const columnPopUpParams = {
                 source: 'ColumnMenu',
                 column: menuContext.adaptableColumn,

package/src/Strategy/CommentModule.d.ts

@@ -5,7 +5,7 @@ import { IModule } from './Interface/IModule';
 export declare class CommentModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
-    isModuleAvailable(): boolean;
+    isModuleEnabled(): boolean;
     private loadComments;
     createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemDoClickFunction<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-all-data" | "export-all-data-excel-download" | "export-all-data-visualexcel-download" | "export-all-data-csv" | "export-all-data-csv-download" | "export-all-data-csv-clipboard" | "export-all-data-json" | "export-all-data-json-download" | "export-all-data-json-clipboard" | "export-current-layout" | "export-current-layout-excel-download" | "export-current-layout-visualexcel-download" | "export-current-layout-csv" | "export-current-layout-csv-download" | "export-current-layout-csv-clipboard" | "export-current-layout-json" | "export-current-layout-json-download" | "export-current-layout-json-clipboard" | "export-selected-data" | "export-selected-data-excel-download" | "export-selected-data-visualexcel-download" | "export-selected-data-csv" | "export-selected-data-csv-download" | "export-selected-data-csv-clipboard" | "export-selected-data-json" | "export-selected-data-json-download" | "export-selected-data-json-clipboard" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
 }

package/src/Strategy/CommentModule.js

@@ -11,7 +11,7 @@ class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     onAdaptableReady() {
         this.loadComments();
     }
-    isModuleAvailable() {
+    isModuleEnabled() {
         const options = this.api.optionsApi.getCommentOptions();
         if (!options || !options.persistCommentThreads || !options.loadCommentThreads) {
             return false;
@@ -19,7 +19,7 @@ class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.api.optionsApi.isAutogeneratePrimaryKey()) {
             return false;
         }
-        return super.isModuleAvailable();
+        return super.isModuleEnabled();
     }
     async loadComments() {
         const commentThreads = await this.api.optionsApi
@@ -28,7 +28,7 @@ class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.api.commentApi.setComments(commentThreads);
     }
     createContextMenuItems(menuContext) {
-        if (!this.isModuleAvailable()) {
+        if (!this.isModuleVisible()) {
             return;
         }
         if (!this.api.commentApi.internalApi.areCommentsSupportedInLayout()) {