@adaptabletools/adaptable 19.1.2 → 19.2.1-canary.0

package/src/Api/Internal/FlashingCellInternalApi.js

@@ -42,7 +42,7 @@ export class FlashingCellInternalApi extends ApiBase {
             ? toFlashingAlert(forPrimaryKey[columnId])
             : toFlashingAlert(forPrimaryKey[FLASHING_CELL_ROW_KEY]);
         if ((adaptableFlashingCell === null || adaptableFlashingCell === void 0 ? void 0 : adaptableFlashingCell.flashingCellDefinition) &&
-            !this.getAdaptableApi().layoutApi.internalApi.isObjectAvailableInLayout(adaptableFlashingCell.flashingCellDefinition, 'FlashingCell', this.getAdaptableApi().layoutApi.getCurrentLayout())) {
+            !this.getLayoutApi().internalApi.isObjectAvailableInLayout(adaptableFlashingCell.flashingCellDefinition, 'FlashingCell', this.getLayoutApi().getCurrentLayout())) {
             return;
         }
         return adaptableFlashingCell;

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -59,7 +59,7 @@ export class FormatColumnInternalApi extends ApiBase {
         return this.getFormatColumnsWithStyleForColumn(column, config).filter((formatColumn) => { var _a; return StringExtensions.IsNotNullOrEmpty((_a = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName); });
     }
     getFormatColumnWithColumnInScope(formatColumns, column) {
-        return this.getFormatColumnInColumnScope(formatColumns).filter((scopedFormatColumn) => this.getAdaptableApi().columnScopeApi.isColumnInScope(column, scopedFormatColumn.Scope));
+        return this.getFormatColumnInColumnScope(formatColumns).filter((scopedFormatColumn) => this.getColumnScopeApi().isColumnInScope(column, scopedFormatColumn.Scope));
     }
     // TODO is this really needed, I don't think it achieves anything
     getFormatColumnInColumnScope(formatColumns) {
@@ -67,11 +67,11 @@ export class FormatColumnInternalApi extends ApiBase {
         return formatColumns.filter((fc) => {
             return (
                 // this.getFormatColumnsWithColumnScope(formatColumns)
-                (this.getAdaptableApi().columnScopeApi.scopeHasColumns(fc.Scope) ||
+                (this.getColumnScopeApi().scopeHasColumns(fc.Scope) ||
                     // this.getFormatColumnsWithDataTypeScope(formatColumns)
-                    this.getAdaptableApi().columnScopeApi.scopeHasDataType(fc.Scope) ||
+                    this.getColumnScopeApi().scopeHasDataType(fc.Scope) ||
                     // this.getFormatColumnsWithAllScope(formatColumns)
-                    this.getAdaptableApi().columnScopeApi.scopeIsAll(fc.Scope) || this.getAdaptableApi().columnScopeApi.scopeHasColumnType(fc.Scope))
+                    this.getColumnScopeApi().scopeIsAll(fc.Scope) || this.getColumnScopeApi().scopeHasColumnType(fc.Scope))
             );
         });
     }
@@ -143,7 +143,7 @@ export class FormatColumnInternalApi extends ApiBase {
     getFormatColumnDefsForScope(scope) {
         return this.getAdaptableApi()
             .predicateApi.internalApi.getFormatColumnPredicateDefs(scope)
-            .filter((predicateDef) => this.getAdaptableApi().columnScopeApi.isScopeInScope(scope, predicateDef.columnScope));
+            .filter((predicateDef) => this.getColumnScopeApi().isScopeInScope(scope, predicateDef.columnScope));
     }
     /**
      * Checks if format column is relevant for a given cell (intersection of given AdaptableColumn and RowNode)
@@ -158,8 +158,8 @@ export class FormatColumnInternalApi extends ApiBase {
         if (formatColumn.IsSuspended) {
             return false;
         }
-        const isSummaryNode = this.getAdaptableApi().gridApi.isSummaryNode(rowNode);
-        const isGroupedRowNode = this.getAdaptableApi().gridApi.isGroupRowNode(rowNode);
+        const isSummaryNode = this.getGridApi().isSummaryNode(rowNode);
+        const isGroupedRowNode = this.getGridApi().isGroupRowNode(rowNode);
         // For Summary Rows cannot be excluded
         if (isSummaryNode) {
             if ((_a = formatColumn.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeSummaryRows) {
@@ -192,7 +192,7 @@ export class FormatColumnInternalApi extends ApiBase {
     }
     evaluatePredicate(formatColumn, predicateDefHandlerContext) {
         var _a;
-        return this.getAdaptableApi().predicateApi.handleColumnPredicates((_a = formatColumn.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, false);
+        return this.getPredicateApi().handleColumnPredicates((_a = formatColumn.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, false);
     }
     evaluateExpression(formatColumn, node) {
         const isValidExpression = this.getAdaptableApi().expressionApi.isValidBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, `Invalid format column rule '${formatColumn.Rule.BooleanExpression}'`);

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

@@ -114,4 +114,11 @@ export declare class GridInternalApi extends ApiBase {
     getAlertRowClass(params: RowClassParams): string | null;
     getRowHighlightClass(params: RowClassParams): string | null;
     deriveSpecialColumnSettingsFromAgGridDefaultColDef(): Partial<SpecialColumnSettings>;
+    hasCellEditableAccordingToEditOptions(): boolean;
+    /**
+     * Returns UNDEFINED if no EditOptions.isCellEditable is provided, otherwise returns the result of the function
+     *
+     * DO NOT USE THIS METHOD DIRECTLY - use `GridApi.isCellEditable` instead
+     */
+    isCellEditableAccordingToEditOptions(gridCell: GridCell, defaultColDefinitionEditableValue: boolean): boolean | undefined;
 }

package/src/Api/Internal/GridInternalApi.js

@@ -24,7 +24,7 @@ export class GridInternalApi extends ApiBase {
     fireCellChangedEvent(cellDataChangedInfo) {
         if (this.isAdapTableReady()) {
             const cellChangedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { cellChange: cellDataChangedInfo });
-            this.getAdaptableApi().eventApi.emit('CellChanged', cellChangedInfo);
+            this.getEventApi().emit('CellChanged', cellChangedInfo);
         }
     }
     /**
@@ -35,7 +35,7 @@ export class GridInternalApi extends ApiBase {
             const gridDataChangedInfo = Object.assign({ changedAt: Date.now(), rowTrigger,
                 dataRows,
                 rowNodes }, this.getAdaptableInternalApi().buildBaseContext());
-            this.getAdaptableApi().eventApi.emit('GridDataChanged', gridDataChangedInfo);
+            this.getEventApi().emit('GridDataChanged', gridDataChangedInfo);
             this.getAdaptableInternalApi().getDataService().CreateGridChangedEvent(gridDataChangedInfo);
         }
     }
@@ -365,7 +365,7 @@ export class GridInternalApi extends ApiBase {
         // this does NOT into account Custom Sort - far too hard for now...
         let sortOrder = SortOrder.Asc;
         if (this.getColumnFilterOptions().valuesFilterOptions.sortValuesFilter) {
-            let columnSort = this.getAdaptableApi().gridApi.getColumnSortForColumn(column.columnId);
+            let columnSort = this.getGridApi().getColumnSortForColumn(column.columnId);
             if (columnSort && columnSort.SortOrder == 'Desc') {
                 sortOrder = SortOrder.Desc;
             }
@@ -498,4 +498,22 @@ export class GridInternalApi extends ApiBase {
             Width: defaultColumnDefinition.width,
         };
     }
+    hasCellEditableAccordingToEditOptions() {
+        var _a;
+        return typeof ((_a = this.getEditOptions()) === null || _a === void 0 ? void 0 : _a.isCellEditable) === 'function';
+    }
+    /**
+     * Returns UNDEFINED if no EditOptions.isCellEditable is provided, otherwise returns the result of the function
+     *
+     * DO NOT USE THIS METHOD DIRECTLY - use `GridApi.isCellEditable` instead
+     */
+    isCellEditableAccordingToEditOptions(gridCell, defaultColDefinitionEditableValue) {
+        var _a;
+        const cellEditable = (_a = this.getEditOptions()) === null || _a === void 0 ? void 0 : _a.isCellEditable;
+        if (cellEditable) {
+            const cellEditableContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { gridCell, defaultColDefEditableValue: defaultColDefinitionEditableValue });
+            return cellEditable(cellEditableContext);
+        }
+        return undefined;
+    }
 }

package/src/Api/Internal/LayoutInternalApi.js

@@ -17,7 +17,7 @@ export class LayoutInternalApi extends ApiBase {
         if (!skipEqualityCheck && isEqual(oldSate, newState)) {
             return;
         }
-        this.getAdaptableApi().eventApi.emit('LayoutChanged', layoutChangedInfo);
+        this.getEventApi().emit('LayoutChanged', layoutChangedInfo);
     }
     /**
      * Compares 2 Layouts for equality
@@ -46,7 +46,7 @@ export class LayoutInternalApi extends ApiBase {
      * @returns layout
      */
     createDefaultLayoutIfNeeded() {
-        let gridState = this.getAdaptableApi().gridApi.getGridState();
+        let gridState = this.getGridApi().getGridState();
         let layoutState = this.getLayoutApi().getLayoutState();
         const isLayoutDefined = (layoutName) => !!layoutState.Layouts.filter((layout) => layout.Name === layoutName)[0];
         let defaultLayoutColumns = gridState.Columns.filter((column) => column.visible);
@@ -58,7 +58,7 @@ export class LayoutInternalApi extends ApiBase {
             if (!layoutState.Layouts || !isLayoutDefined(DEFAULT_LAYOUT)) {
                 // augogroup columns are not in columns list
                 // the code that adds column ok grid state explicitly ignores autoColumns
-                const allGridColumns = this.getAdaptableApi().gridApi.getAllAgGridColumns();
+                const allGridColumns = this.getGridApi().getAllAgGridColumns();
                 let defaultLayout = ObjectFactory.CreateEmptyLayout({
                     Name: DEFAULT_LAYOUT,
                     Columns: defaultLayoutColumns.map((c) => c.columnId),

package/src/Api/Internal/StyledColumnInternalApi.js

@@ -30,11 +30,11 @@ export class StyledColumnInternalApi extends ApiBase {
             }
             else {
                 let columnId = columnComparison.MinValue;
-                if (!this.getAdaptableApi().columnApi.isColumnInGrid(columnId)) {
+                if (!this.getColumnApi().isColumnInGrid(columnId)) {
                     return 0;
                 }
                 else {
-                    return this.getAdaptableApi().gridApi.getRawValueFromRowNode(rowNode, columnId);
+                    return this.getGridApi().getRawValueFromRowNode(rowNode, columnId);
                 }
             }
         }
@@ -93,11 +93,11 @@ export class StyledColumnInternalApi extends ApiBase {
             }
             else {
                 let columnId = columnComparison.MaxValue;
-                if (!this.getAdaptableApi().columnApi.isColumnInGrid(columnId)) {
+                if (!this.getColumnApi().isColumnInGrid(columnId)) {
                     return 0;
                 }
                 else {
-                    return this.getAdaptableApi().gridApi.getRawValueFromRowNode(rowNode, columnId);
+                    return this.getGridApi().getRawValueFromRowNode(rowNode, columnId);
                 }
             }
         }
@@ -265,7 +265,7 @@ export class StyledColumnInternalApi extends ApiBase {
         return firstBadgeWithAll !== null && firstBadgeWithAll !== void 0 ? firstBadgeWithAll : null;
     }
     getBadgePredicateDefsForColumn(columnId) {
-        const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+        const column = this.getColumnApi().getColumnWithColumnId(columnId);
         if (!column) {
             return undefined;
         }
@@ -274,6 +274,6 @@ export class StyledColumnInternalApi extends ApiBase {
         };
         return this.getAdaptableApi()
             .predicateApi.internalApi.getBadgeStylePredicateDefs(scope)
-            .filter((predicate) => this.getAdaptableApi().columnScopeApi.isColumnInScope(column, predicate.columnScope));
+            .filter((predicate) => this.getColumnScopeApi().isColumnInScope(column, predicate.columnScope));
     }
 }

package/src/Api/Internal/SystemStatusInternalApi.js

@@ -7,7 +7,7 @@ export class SystemStatusInternalApi extends ApiBase {
      */
     fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo) {
         const systemStatusMessageDisplayedInfo = Object.assign({ systemStatusMessageInfo: systemStatusMessageInfo }, this.getAdaptableInternalApi().buildBaseContext());
-        this.getAdaptableApi().eventApi.emit('SystemStatusMessageDisplayed', systemStatusMessageDisplayedInfo);
+        this.getEventApi().emit('SystemStatusMessageDisplayed', systemStatusMessageDisplayedInfo);
     }
     addSystemStatusMessageInfo(systemStatusMessageInfo) {
         const maxMessagesInStore = this.getNotificationsOptions().maxSystemMessagesInStore;

package/src/Api/Internal/TeamSharingInternalApi.js

@@ -7,7 +7,7 @@ export class TeamSharingInternalApi extends ApiBase {
     fireTeamSharingEntityChangedEvent(sharedEntity) {
         if (this.isAdapTableReady()) {
             const teamSharingEntityChangedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { sharedEntity: sharedEntity });
-            this.getAdaptableApi().eventApi.emit('TeamSharingEntityChanged', teamSharingEntityChangedInfo);
+            this.getEventApi().emit('TeamSharingEntityChanged', teamSharingEntityChangedInfo);
         }
     }
     /**
@@ -33,7 +33,7 @@ export class TeamSharingInternalApi extends ApiBase {
                 reject(false);
             }, waitThreshold);
             // poll state for changes:
-            const unsubscribe = this.getAdaptableApi().eventApi.on('AdaptableStateChanged', () => {
+            const unsubscribe = this.getEventApi().on('AdaptableStateChanged', () => {
                 clearTimeout(pollTimer);
                 pollTimer = setTimeout(() => {
                     // state is stable, cleanup all subscriptions before returning

package/src/Api/Internal/UserInterfaceInternalApi.js

@@ -3,7 +3,7 @@ export class UserInterfaceInternalApi extends ApiBase {
     prepareAdaptableIconDef(icon) {
         if (icon && 'name' in icon) {
             let customIcon = icon && 'name' in icon
-                ? this.getAdaptableApi().userInterfaceApi.getCustomIconDefinition(icon.name)
+                ? this.getUserInterfaceApi().getCustomIconDefinition(icon.name)
                 : null;
             if (customIcon) {
                 icon = customIcon;

package/src/Api/StatusBarApi.d.ts

@@ -11,10 +11,10 @@ export interface StatusBarApi {
     /**
      * Retrieves current AdapTable Status Bar Panels
      */
-    getAdaptableStatusBars: () => AdaptableStatusBar[];
+    getAdaptableStatusBars(): AdaptableStatusBar[];
     /**
      * Sets Adaptable Status Bar Panels
      * @param statusPanels Adaptable Status Bar Panels
      */
-    setStatusBarPanels: (statusPanels: AdaptableStatusBar[]) => void;
+    setStatusBarPanels(statusPanels: AdaptableStatusBar[]): void;
 }

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

@@ -0,0 +1,22 @@
+import { ColumnFilter, DataSet } from '../../types';
+/**
+ * Current Searches and Filter in AdapTable
+ */
+export interface AdaptableSearchState {
+    /**
+     * Current DataSet (if one selected)
+     */
+    dataSet: DataSet | undefined;
+    /**
+     * Current Grid Filter
+     */
+    gridFilter: string | undefined;
+    /**
+     * AST for Grid Filter
+     */
+    gridFilterAST: any;
+    /**
+     * Currently applied Column Filters
+     */
+    columnFilters: ColumnFilter[] | undefined;
+}

package/src/PredefinedConfig/Common/AdaptableSearchState.js

@@ -0,0 +1 @@
+export {};

package/src/PredefinedConfig/PredefinedConfig.d.ts

@@ -91,14 +91,14 @@ export interface PredefinedConfig {
      * Supplies a collection of *Shortcut* objects to aid data entry and prevent 'fat finger' issues
      */
     Shortcut?: ShortcutState;
-    /**
-     * Supplies a collection of Special Column Styles
-     */
-    StyledColumn?: StyledColumnState;
     /**
      * Configures the Adaptable Status Bar
      */
     StatusBar?: StatusBarState;
+    /**
+     * Supplies a collection of Special Column Styles
+     */
+    StyledColumn?: StyledColumnState;
     /**
      * Specifies the current Theme and lists the User and System themes available for selection.
      */

package/src/Strategy/BulkUpdateModule.js

@@ -15,7 +15,6 @@ export class BulkUpdateModule extends AdaptableModuleBase {
         let menuItemShowPopup = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleEditable()) {
             if (menuContext.adaptableColumn &&
-                !menuContext.adaptableColumn.readOnly &&
                 menuContext.isSelectedCell &&
                 menuContext.isSingleSelectedColumn &&
                 this.api.gridApi.isEveryCellEditable(menuContext.selectedCellInfo.gridCells)) {
@@ -69,17 +68,6 @@ export class BulkUpdateModule extends AdaptableModuleBase {
             };
         }
         let selectedColumn = selectedCellInfo.columns[0];
-        if (selectedColumn && selectedColumn.readOnly) {
-            return {
-                IsValid: false,
-                Alert: {
-                    alertType: 'generic',
-                    header: 'Bulk Update Error',
-                    message: 'Bulk Update is not permitted on readonly columns.\nPlease adjust the cell selection.',
-                    alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-                },
-            };
-        }
         if (ArrayExtensions.IsNotNullOrEmpty(selectedCellInfo.gridCells) &&
             !this.api.gridApi.isEveryCellEditable(selectedCellInfo.gridCells)) {
             return {

package/src/Strategy/PlusMinusModule.js

@@ -87,35 +87,35 @@ export class PlusMinusModule extends AdaptableModuleBase {
         let failedPreventEdits = [];
         let side = direction == 'up' ? 1 : -1;
         cellsToUpdate.forEach((gridCell) => {
-            if (gridCell.column && gridCell.column.dataType == 'Number' && !gridCell.column.readOnly) {
+            if (gridCell.column &&
+                gridCell.column.dataType == 'Number' &&
+                this.api.gridApi.isCellEditable(gridCell)) {
                 let foundRule;
                 let replacementGridCell;
                 plusMinusNudges.forEach((pmr) => {
                     if (!foundRule) {
                         if (this.api.columnScopeApi.isColumnInScope(gridCell.column, pmr.Scope)) {
-                            if (this.api.gridApi.isCellEditable(gridCell)) {
-                                //for aggrid as we are getting strings sometimes
-                                if (typeof gridCell.rawValue != 'number') {
-                                    gridCell.rawValue = parseFloat(gridCell.rawValue);
-                                }
-                                const isSatisfiedExpression = this.isPlusMinusNudgeApplied(pmr, gridCell);
-                                if (isSatisfiedExpression) {
-                                    foundRule = pmr;
-                                    shouldApplyPlusMinus = true;
-                                    let computedValue = gridCell.rawValue + pmr.NudgeValue * side;
-                                    //avoid the 0.0000000000x??
-                                    //   computedValue=   parseFloat(computedValue.toFixed(12));
-                                    replacementGridCell = {
-                                        primaryKeyValue: gridCell.primaryKeyValue,
-                                        column: gridCell.column,
-                                        rawValue: computedValue,
-                                        displayValue: computedValue,
-                                        normalisedValue: computedValue,
-                                        rowNode: gridCell.rowNode,
-                                        isPivotCell: false,
-                                        isRowGroupCell: false,
-                                    };
-                                }
+                            //for aggrid as we are getting strings sometimes
+                            if (typeof gridCell.rawValue != 'number') {
+                                gridCell.rawValue = parseFloat(gridCell.rawValue);
+                            }
+                            const isSatisfiedExpression = this.isPlusMinusNudgeApplied(pmr, gridCell);
+                            if (isSatisfiedExpression) {
+                                foundRule = pmr;
+                                shouldApplyPlusMinus = true;
+                                let computedValue = gridCell.rawValue + pmr.NudgeValue * side;
+                                //avoid the 0.0000000000x??
+                                //   computedValue=   parseFloat(computedValue.toFixed(12));
+                                replacementGridCell = {
+                                    primaryKeyValue: gridCell.primaryKeyValue,
+                                    column: gridCell.column,
+                                    rawValue: computedValue,
+                                    displayValue: computedValue,
+                                    normalisedValue: computedValue,
+                                    rowNode: gridCell.rowNode,
+                                    isPivotCell: false,
+                                    isRowGroupCell: false,
+                                };
                             }
                         }
                     }

package/src/Strategy/SmartEditModule.js

@@ -20,7 +20,6 @@ export class SmartEditModule extends AdaptableModuleBase {
         if (!menuContext.isRowGroupColumn && this.isModuleEditable()) {
             if (menuContext.adaptableColumn &&
                 menuContext.adaptableColumn.dataType == 'Number' &&
-                !menuContext.adaptableColumn.readOnly &&
                 menuContext.isSelectedCell &&
                 menuContext.isSingleSelectedColumn &&
                 this.api.gridApi.isEveryCellEditable(menuContext.selectedCellInfo.gridCells)) {
@@ -82,16 +81,6 @@ export class SmartEditModule extends AdaptableModuleBase {
                     },
                 };
             }
-            if (column.readOnly) {
-                return {
-                    Alert: {
-                        alertType: 'generic',
-                        header: 'Smart Edit Error',
-                        message: 'Smart Edit is not permitted on readonly columns.\nPlease adjust the cell selection.',
-                        alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-                    },
-                };
-            }
         }
         if (ArrayExtensions.IsNotNullOrEmpty(selectedCellInfo.gridCells) &&
             !this.api.gridApi.isEveryCellEditable(selectedCellInfo.gridCells)) {

package/src/Utilities/Services/MetamodelService.js

@@ -2,7 +2,7 @@ import { ADAPTABLE_METAMODEL } from '../../metamodel/adaptable.metamodel';
 import { AdaptableOptionsDocsLink } from '../Constants/DocumentationLinkConstants';
 import StringExtensions from '../Extensions/StringExtensions';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
-import { getDefaultAdaptableOptions } from '../../agGrid/defaultAdaptableOptions';
+import { getDefaultAdaptableOptions } from '../../AdaptableOptions/DefaultAdaptableOptions';
 const supportedMetamodelTypes = ['s', 'n', 'b', 'a', 'f', 'R'];
 export class MetamodelService {
     constructor(getAdaptableOptions, validateOptions) {

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizard.js

@@ -7,7 +7,7 @@ import GridOptionsForm from './GridOptionsForm';
 import EntitlementsForm from './EntitlementsForm';
 import { UIElementsForm } from './UIOptions/UiOptionsForm';
 import { AdaptableOptionsForm } from './AdaptableOptionsForm';
-import { applyDefaultAdaptableOptions } from '../../../agGrid/defaultAdaptableOptions';
+import { applyDefaultAdaptableOptions } from '../../../AdaptableOptions/DefaultAdaptableOptions';
 export const ConfigurationWizard = (props) => {
     const [isPrimaryKeySelected, setIsValid] = React.useState(true);
     const [adaptableConfig, setAdaptableConfig] = useState(() => {

package/src/View/Components/Popups/AdaptablePopup/Navigation.js

@@ -46,7 +46,7 @@ export const Navigation = (props) => {
                 React.createElement("button", { type: "button", className: `${baseClassName}__Button`, onClick: () => {
                         dispatch(menuItem.reduxAction);
                     }, "data-name": dataName },
-                    menuItem.icon && (React.createElement(AdaptableIconComponent, { icon: menuItem.icon, iconClassName: `${baseClassName}__Icon` })),
+                    props.api.optionsApi.getSettingsPanelOptions().showModuleIcons && menuItem.icon && (React.createElement(AdaptableIconComponent, { icon: menuItem.icon, iconClassName: `${baseClassName}__Icon` })),
                     customIcon && React.createElement(AdaptableIconComponent, { icon: customIcon }),
                     menuItem.label)));
         }))));

package/src/View/GridInfo/GridInfoPopup/GridInfoPopup.js

@@ -72,7 +72,7 @@ export const GridInfoPopup = (props) => {
             React.createElement(Panel, { flex: 1 },
                 React.createElement(Tabs, null,
                     React.createElement(Tabs.Tab, null, "Grid Summary"),
-                    React.createElement(Tabs.Tab, null, "Config"),
+                    React.createElement(Tabs.Tab, null, "Grid Config"),
                     React.createElement(Tabs.Content, null,
                         React.createElement(AdaptableObjectCollection, { margin: 2, colItems: propValueColItems, items: gridSummaries })),
                     React.createElement(Tabs.Content, null,

package/src/agGrid/Adaptable.js

@@ -3,7 +3,7 @@ import { AgGridModulesDocsLink } from '../Utilities/Constants/DocumentationLinkC
 import { AdaptableLogger } from './AdaptableLogger';
 import { AdaptableAgGrid } from './AdaptableAgGrid';
 import { ModuleRegistry } from '@ag-grid-community/core';
-import { getDefaultAdaptableOptions } from './defaultAdaptableOptions';
+import { getDefaultAdaptableOptions } from '../AdaptableOptions/DefaultAdaptableOptions';
 import { renderReactRoot as defaultRenderReactRoot } from '../renderReactRoot';
 import AdaptableWizardView from '../View/AdaptableWizardView';
 export class Adaptable {

package/src/agGrid/AdaptableAgGrid.js

@@ -5,7 +5,7 @@ import { AdaptableLogger } from './AdaptableLogger';
 import { PrimaryKeyDocsLink } from '../Utilities/Constants/DocumentationLinkConstants';
 import StringExtensions from '../Utilities/Extensions/StringExtensions';
 import Emitter from '../Utilities/Emitter';
-import { applyDefaultAdaptableOptions } from './defaultAdaptableOptions';
+import { applyDefaultAdaptableOptions } from '../AdaptableOptions/DefaultAdaptableOptions';
 import { AgGridAdapter } from './AgGridAdapter';
 import * as GeneralConstants from '../Utilities/Constants/GeneralConstants';
 import { AB_FDC3_COLUMN, AB_SPECIAL_COLUMN, ADAPTABLE_ROW_ACTION_BUTTONS, AG_GRID_GROUPED_COLUMN, AUTOGENERATED_PK_COLUMN, DARK_THEME, DEFAULT_LAYOUT, GROUP_PATH_SEPARATOR, HALF_SECOND, LIGHT_THEME, } from '../Utilities/Constants/GeneralConstants';
@@ -1785,8 +1785,7 @@ export class AdaptableAgGrid {
                 return acc;
             }
             const ColumnGroupId = columnGroup.getGroupId();
-            const AllowGroupSplit = !columnGroup.getProvidedColumnGroup().getColGroupDef()
-                .marryChildren;
+            const AllowGroupSplit = !columnGroup.getProvidedColumnGroup().getColGroupDef().marryChildren;
             const FriendlyName = (_c = columnGroup.getProvidedColumnGroup().getColGroupDef().headerName) !== null && _c !== void 0 ? _c : ColumnGroupId;
             const columnsInGroup = columnGroup.getLeafColumns();
             columnsInGroup.forEach((col) => {
@@ -2974,7 +2973,7 @@ export class AdaptableAgGrid {
         return this.agGridAdapter.getRegisteredModules();
     }
     destroy(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13;
         if (!config) {
             config = {
                 unmount: true,
@@ -3108,42 +3107,44 @@ export class AdaptableAgGrid {
         this.DANGER_USE_GETTER_agGridContainerElement = null;
         (_g = this.adaptableStore) === null || _g === void 0 ? void 0 : _g.destroy();
         this.adaptableStore = null;
+        (_h = this.adaptableModules) === null || _h === void 0 ? void 0 : _h.clear();
+        this.adaptableModules = null;
         this.adaptableOptions = null;
         this.adaptableStatusPanelKeys = null;
-        (_j = (_h = this.CalculatedColumnExpressionService) === null || _h === void 0 ? void 0 : _h.destroy) === null || _j === void 0 ? void 0 : _j.call(_h);
+        (_k = (_j = this.CalculatedColumnExpressionService) === null || _j === void 0 ? void 0 : _j.destroy) === null || _k === void 0 ? void 0 : _k.call(_j);
         this.CalculatedColumnExpressionService = null;
-        (_l = (_k = this.DataService) === null || _k === void 0 ? void 0 : _k.destroy) === null || _l === void 0 ? void 0 : _l.call(_k);
+        (_m = (_l = this.DataService) === null || _l === void 0 ? void 0 : _l.destroy) === null || _m === void 0 ? void 0 : _m.call(_l);
         this.DataService = null;
-        (_o = (_m = this.Fdc3Service) === null || _m === void 0 ? void 0 : _m.destroy) === null || _o === void 0 ? void 0 : _o.call(_m);
+        (_p = (_o = this.Fdc3Service) === null || _o === void 0 ? void 0 : _o.destroy) === null || _p === void 0 ? void 0 : _p.call(_o);
         this.Fdc3Service = null;
-        (_q = (_p = this.ModuleService) === null || _p === void 0 ? void 0 : _p.destroy) === null || _q === void 0 ? void 0 : _q.call(_p);
+        (_r = (_q = this.ModuleService) === null || _q === void 0 ? void 0 : _q.destroy) === null || _r === void 0 ? void 0 : _r.call(_q);
         this.ModuleService = null;
-        (_s = (_r = this.ValidationService) === null || _r === void 0 ? void 0 : _r.destroy) === null || _s === void 0 ? void 0 : _s.call(_r);
+        (_t = (_s = this.ValidationService) === null || _s === void 0 ? void 0 : _s.destroy) === null || _t === void 0 ? void 0 : _t.call(_s);
         this.ValidationService = null;
-        (_u = (_t = this.QueryLanguageService) === null || _t === void 0 ? void 0 : _t.destroy) === null || _u === void 0 ? void 0 : _u.call(_t);
+        (_v = (_u = this.QueryLanguageService) === null || _u === void 0 ? void 0 : _u.destroy) === null || _v === void 0 ? void 0 : _v.call(_u);
         this.QueryLanguageService = null;
-        (_w = (_v = this.AlertService) === null || _v === void 0 ? void 0 : _v.destroy) === null || _w === void 0 ? void 0 : _w.call(_v);
+        (_x = (_w = this.AlertService) === null || _w === void 0 ? void 0 : _w.destroy) === null || _x === void 0 ? void 0 : _x.call(_w);
         this.AlertService = null;
-        (_y = (_x = this.TeamSharingService) === null || _x === void 0 ? void 0 : _x.destroy) === null || _y === void 0 ? void 0 : _y.call(_x);
+        (_z = (_y = this.TeamSharingService) === null || _y === void 0 ? void 0 : _y.destroy) === null || _z === void 0 ? void 0 : _z.call(_y);
         this.TeamSharingService = null;
-        (_0 = (_z = this.RowEditService) === null || _z === void 0 ? void 0 : _z.destroy) === null || _0 === void 0 ? void 0 : _0.call(_z);
+        (_1 = (_0 = this.RowEditService) === null || _0 === void 0 ? void 0 : _0.destroy) === null || _1 === void 0 ? void 0 : _1.call(_0);
         this.RowEditService = null;
-        (_2 = (_1 = this.MetamodelService) === null || _1 === void 0 ? void 0 : _1.destroy) === null || _2 === void 0 ? void 0 : _2.call(_1);
+        (_3 = (_2 = this.MetamodelService) === null || _2 === void 0 ? void 0 : _2.destroy) === null || _3 === void 0 ? void 0 : _3.call(_2);
         this.MetamodelService = null;
-        (_4 = (_3 = this.LicenseService) === null || _3 === void 0 ? void 0 : _3.destroy) === null || _4 === void 0 ? void 0 : _4.call(_3);
+        (_5 = (_4 = this.LicenseService) === null || _4 === void 0 ? void 0 : _4.destroy) === null || _5 === void 0 ? void 0 : _5.call(_4);
         this.LicenseService = null;
-        (_6 = (_5 = this.FlashingCellService) === null || _5 === void 0 ? void 0 : _5.destroy) === null || _6 === void 0 ? void 0 : _6.call(_5);
+        (_7 = (_6 = this.FlashingCellService) === null || _6 === void 0 ? void 0 : _6.destroy) === null || _7 === void 0 ? void 0 : _7.call(_6);
         this.FlashingCellService = null;
-        (_8 = (_7 = this.ThemeService) === null || _7 === void 0 ? void 0 : _7.destroy) === null || _8 === void 0 ? void 0 : _8.call(_7);
+        (_9 = (_8 = this.ThemeService) === null || _8 === void 0 ? void 0 : _8.destroy) === null || _9 === void 0 ? void 0 : _9.call(_8);
         this.ThemeService = null;
-        (_10 = (_9 = this.ChartingService) === null || _9 === void 0 ? void 0 : _9.destroy) === null || _10 === void 0 ? void 0 : _10.call(_9);
+        (_11 = (_10 = this.ChartingService) === null || _10 === void 0 ? void 0 : _10.destroy) === null || _11 === void 0 ? void 0 : _11.call(_10);
         this.ChartingService = null;
-        (_11 = this.unmountLoadingScreen) === null || _11 === void 0 ? void 0 : _11.call(this);
+        (_12 = this.unmountLoadingScreen) === null || _12 === void 0 ? void 0 : _12.call(this);
         this.unmountLoadingScreen = null;
         if (config === null || config === void 0 ? void 0 : config.unmount) {
             const abContainerElement = this.getAdaptableContainerElement();
             if (abContainerElement != null) {
-                (_12 = this.unmountReactRoot) === null || _12 === void 0 ? void 0 : _12.call(this);
+                (_13 = this.unmountReactRoot) === null || _13 === void 0 ? void 0 : _13.call(this);
             }
             this.unmountReactRoot = null;
         }

package/src/agGrid/AgGridAdapter.js

@@ -399,8 +399,11 @@ export class AgGridAdapter {
         return 'Unknown';
     }
     isColumnReadonly(colDef) {
+        if (!colDef) {
+            return true;
+        }
         // if the column has conditional/dynamic editability, we assume some rows may be editable
-        if (colDef && typeof colDef.editable === 'function') {
+        if (typeof colDef.editable === 'function') {
             return false;
         }
         // otherwise we evaluate the colDef.editable property (columns are NOT editable by default)

package/src/agGrid/AgGridColumnAdapter.js

@@ -421,21 +421,27 @@ export class AgGridColumnAdapter {
         });
     }
     setupColumnEditable({ col }) {
-        this.setColDefProperty(col, 'editable', (userValue) => {
-            // if AG Grid defines the column as NOT editable, we don't mess with it
-            if (typeof userValue === 'boolean' && userValue === false) {
-                return userValue;
-            }
+        this.setColDefProperty(col, 'editable', (original_editable) => {
+            // cell is NOT editable by default
             const editableCallback = (params) => {
-                if (typeof userValue === 'function') {
-                    const agGridColDefEditable = userValue(params);
-                    if (agGridColDefEditable === false) {
-                        return false;
+                const getOriginalColDefEditable = () => {
+                    if (typeof original_editable === 'function') {
+                        return original_editable(params);
+                    }
+                    else {
+                        return original_editable;
+                    }
+                };
+                // 1. evaluate EditOptions.isCellEditable if provided
+                if (this.adaptableApi.gridApi.internalApi.hasCellEditableAccordingToEditOptions()) {
+                    const gridCell = this.adaptableInstance.getGridCellFromRowNode(params.node, params.column.getColId());
+                    const editOptionsEditability = this.adaptableApi.gridApi.internalApi.isCellEditableAccordingToEditOptions(gridCell, getOriginalColDefEditable());
+                    if (editOptionsEditability) {
+                        return editOptionsEditability;
                     }
                 }
-                // if AG Grid editable is still true, we check if Adaptable allows it
-                const gridCell = this.adaptableInstance.getGridCellFromRowNode(params.node, params.column.getColId());
-                return this.adaptableApi.gridApi.isCellEditable(gridCell);
+                // 2. otherwise, fallback to colDef.editable
+                return getOriginalColDefEditable();
             };
             return editableCallback;
         });

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1732030718243 || Date.now(),
-    VERSION: "19.1.2" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1732624906372 || Date.now(),
+    VERSION: "19.2.1-canary.0" || '--current-version--',
 };