@adaptabletools/adaptable 11.0.0-canary.2 → 11.0.0-canary.3

package/src/View/FreeTextColumn/Wizard/FreeTextColumnWizard.js

@@ -12,15 +12,22 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const FreeTextColumnRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/FreeTextColumnRedux"));
 const react_redux_1 = require("react-redux");
 exports.FreeTextColumnWizard = (props) => {
+    var _a;
+    const allFreeTextColumns = react_redux_1.useSelector((state) => state.FreeTextColumn.FreeTextColumns);
     const [freeTextColumn, setFreeTextColumn] = react_1.useState(() => {
-        const freeTextColumn = props.data
-            ? Helper_1.cloneObject(props.data)
-            : ObjectFactory_1.default.CreateEmptyFreeTextColumn(false);
-        return freeTextColumn;
+        var _a, _b;
+        if (props.data) {
+            return Helper_1.cloneObject(props.data);
+        }
+        if (((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit' && ((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.column)) {
+            return allFreeTextColumns.find((column) => column.ColumnId === props.popupParams.column.columnId);
+        }
+        return ObjectFactory_1.default.CreateEmptyFreeTextColumn(false);
     });
     const dispatch = react_redux_1.useDispatch();
+    const isEdit = props.data || ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit';
     const handleFinish = () => {
-        if (props.data) {
+        if (isEdit) {
             dispatch(FreeTextColumnRedux.FreeTextColumnEdit(freeTextColumn));
         }
         else {

package/src/View/PlusMinus/Wizard/PlusMinusWizard.js

@@ -13,8 +13,14 @@ const react_redux_1 = require("react-redux");
 const PlusMinusRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/PlusMinusRedux"));
 exports.PlusMinusWizard = (props) => {
     const [plusMinus, setPlusMinus] = React.useState(() => {
-        var _a, _b, _c, _d;
-        return Object.assign(Object.assign({}, (props.data ? props.data : ObjectFactory_1.default.CreateEmptyPlusMinusNudge())), { Scope: (_b = (_a = props === null || props === void 0 ? void 0 : props.data) === null || _a === void 0 ? void 0 : _a.Scope) !== null && _b !== void 0 ? _b : { All: true }, NudgeValue: (_d = (_c = props === null || props === void 0 ? void 0 : props.data) === null || _c === void 0 ? void 0 : _c.NudgeValue) !== null && _d !== void 0 ? _d : 20 });
+        var _a, _b, _c, _d, _e;
+        const newPlusMinus = Object.assign(Object.assign({}, (props.data ? props.data : ObjectFactory_1.default.CreateEmptyPlusMinusNudge())), { Scope: (_b = (_a = props === null || props === void 0 ? void 0 : props.data) === null || _a === void 0 ? void 0 : _a.Scope) !== null && _b !== void 0 ? _b : { All: true }, NudgeValue: (_d = (_c = props === null || props === void 0 ? void 0 : props.data) === null || _c === void 0 ? void 0 : _c.NudgeValue) !== null && _d !== void 0 ? _d : 20 });
+        if ((_e = props === null || props === void 0 ? void 0 : props.popupParams) === null || _e === void 0 ? void 0 : _e.column) {
+            newPlusMinus.Scope = {
+                ColumnIds: [props.popupParams.column.columnId],
+            };
+        }
+        return newPlusMinus;
     });
     const [hasCondition, setHasCondition] = React.useState(() => {
         var _a;

package/src/View/Query/QueryViewPanel.js

@@ -78,28 +78,31 @@ class QueryViewPanelComponent extends React.Component {
             };
         });
         const elementType = this.props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
+        const handleEnter = (e) => {
+            if (e.key === 'Enter') {
+                this.runQuery();
+            }
+        };
         const renderTextInput = () => {
             return this.props.viewType === 'Toolbar' ? (React.createElement(FieldWrap_1.default, { marginRight: 1, width: 600 },
                 React.createElement(ButtonExpand_1.ButtonExpand, { variant: "text", tone: "neutral", onClick: () => this.props.onExpand(this.state.expression), tooltip: "Expand", marginLeft: 1 }),
-                React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { fontFamily: 'monospace', fontSize: 12 }, onKeyDown: (e) => {
-                        if (e.key === 'Enter') {
-                            this.runQuery();
-                        }
-                    } }),
+                React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { fontFamily: 'monospace', fontSize: 12 } }),
                 isExpressionValid ? (React.createElement(ButtonPlay_1.ButtonPlay, { onClick: () => this.runQuery(), tooltip: '', accessLevel: 'Full', variant: "text", tone: "neutral", disabled: this.state.expression == '' || this.state.expression == this.props.CurrentQuery, marginRight: 1 })) : (React.createElement(ButtonInvalid_1.ButtonInvalid, { variant: "text", tone: "neutral", tooltip: "Invalid Query", marginRight: 1 })),
                 ' ',
-                this.props.CurrentQuery !== '' && (React.createElement(ButtonClear_1.ButtonClear, { onClick: () => this.props.onRunQuery(''), tooltip: "Clear Query", accessLevel: 'Full' })))) : (React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { width: '100%' } }));
+                this.props.CurrentQuery !== '' && (React.createElement(ButtonClear_1.ButtonClear, { onClick: () => this.clearQuery(), tooltip: "Clear Query", accessLevel: 'Full' })))) : (React.createElement(Input_1.default, { type: "text", placeholder: "Query", spellCheck: false, value: this.state.expression, onChange: (x) => this.setState({ expression: x.target.value }), style: { width: '100%' } }));
         };
         const queryModuleAccessLevel = this.props.api.internalApi
             .getEntitlementService()
             .getEntitlementAccessLevelForModule(ModuleConstants_1.QueryModuleId);
+        const saveButton = (React.createElement(ButtonSave_1.ButtonSave, { onClick: () => this.saveQuery(), tooltip: "Save as New Query", accessLevel: queryModuleAccessLevel, disabled: !isExpressionValid || isExpressionNamedQuery || this.state.expression == '', variant: "text", tone: "neutral", marginRight: 1 }));
         const renderButtons = () => {
             return this.props.viewType === 'Toolbar' ? (React.createElement(React.Fragment, null,
-                React.createElement(ButtonSave_1.ButtonSave, { onClick: () => this.saveQuery(), tooltip: "Save as New Query", accessLevel: queryModuleAccessLevel, disabled: !isExpressionValid || isExpressionNamedQuery || this.state.expression == '', variant: "text", tone: "neutral", marginRight: 1 }),
+                saveButton,
                 React.createElement(DropdownButton_1.default, { variant: "text", items: availableColumns, marginRight: 1, tooltip: "Pick Columns" },
                     React.createElement(icons_1.Icon, { name: 'list' })),
                 React.createElement(DropdownButton_1.default, { disabled: ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(availableSearches), variant: "text", items: availableSearches, marginRight: 1, tooltip: "Load Query", icon: "folder-open" }),
                 ' ')) : (React.createElement(React.Fragment, null,
+                saveButton,
                 React.createElement(ButtonExpand_1.ButtonExpand, { variant: "text", tone: "neutral", onClick: () => this.props.onExpand(this.state.expression), tooltip: "Expand", marginLeft: 1 }),
                 React.createElement(ButtonClear_1.ButtonClear, { onClick: () => this.clearQuery(), tooltip: "Clear Query", accessLevel: 'Full', disabled: this.state.expression == '' }),
                 React.createElement(ButtonPlay_1.ButtonPlay, { onClick: () => this.runQuery(), tooltip: "Run Query", accessLevel: 'Full', variant: "text", tone: "neutral", disabled: !isExpressionValid ||
@@ -107,12 +110,12 @@ class QueryViewPanelComponent extends React.Component {
                         this.state.expression == this.props.CurrentQuery, marginRight: 1 }),
                 React.createElement(DropdownButton_1.default, { variant: "text", disabled: ArrayExtensions_1.ArrayExtensions.IsNullOrEmpty(availableSearches), items: availableSearches, marginRight: 1, tooltip: "Load Query", icon: "folder-open" })));
         };
-        return (React.createElement(rebass_1.Flex, { flexDirection: "row", className: `ab-${elementType}__Query__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
+        return (React.createElement(rebass_1.Flex, { onKeyDown: handleEnter, flexDirection: "row", className: `ab-${elementType}__Query__wrap`, flexWrap: this.props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
             React.createElement(rebass_1.Flex, null, renderTextInput()),
             React.createElement(rebass_1.Flex, null, renderButtons())));
     }
     clearQuery() {
-        this.setState({ expression: '' });
+        this.props.onRunQuery('');
     }
     saveQuery() {
         this.props.onShowNamedQueries(this.state.expression, this.props.moduleInfo.Popup);

package/src/View/Query/Wizard/NamedQueryWizard.js

@@ -14,9 +14,11 @@ const react_redux_1 = require("react-redux");
 const QueryRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/QueryRedux"));
 function NamedQueryWizard(props) {
     const [namedQuery, setNamedQuery] = react_1.useState(() => {
+        var _a, _b;
+        const value = (_b = (_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : '';
         return props.data
             ? Helper_1.cloneObject(props.data)
-            : ObjectFactory_1.default.CreateEmptyNamedQuery();
+            : ObjectFactory_1.default.CreateEmptyNamedQuery(value);
     });
     const dispatch = react_redux_1.useDispatch();
     const handleFinish = () => {

package/src/View/QuickSearch/useQuickSearchDebounced.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useQuickSearchDebounced = void 0;
 const tslib_1 = require("tslib");
 const react_1 = require("react");
-const debounce_1 = tslib_1.__importDefault(require("lodash-es/debounce"));
+const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 exports.useQuickSearchDebounced = (props) => {
     var _a;

package/src/View/Schedule/Wizard/ScheduleWizard.js

@@ -13,39 +13,39 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const react_redux_1 = require("react-redux");
 const ScheduleRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ScheduleRedux"));
 exports.ScheduleWizard = (props) => {
-    var _a;
-    const scheduleType = props.data
-        ? props.data.ScheduleType
-        : (_a = props === null || props === void 0 ? void 0 : props.abObjectType) === null || _a === void 0 ? void 0 : _a.name;
+    var _a, _b;
+    const data = (_a = props.data) !== null && _a !== void 0 ? _a : props.popupParams.value;
+    const isNew = props.popupParams.action ? props.popupParams.action === 'New' : !props.data;
+    const scheduleType = data ? data.ScheduleType : (_b = props === null || props === void 0 ? void 0 : props.abObjectType) === null || _b === void 0 ? void 0 : _b.name;
     const [schedule, setSchedule] = React.useState(() => {
-        if (props.data) {
-            return props.data;
+        if (data) {
+            return data;
         }
-        let data = null;
+        let scheduleState = null;
         switch (scheduleType) {
             case Enums_1.ScheduleType.Reminder:
-                data = ObjectFactory_1.default.CreateEmptyReminderSchedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyReminderSchedule();
                 break;
             case Enums_1.ScheduleType.Report:
-                data = ObjectFactory_1.default.CreateEmptyReportSchedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyReportSchedule();
                 break;
             case Enums_1.ScheduleType.ipushpull:
-                data = ObjectFactory_1.default.CreateEmptyIPushPullSchedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyIPushPullSchedule();
                 break;
             case Enums_1.ScheduleType.Glue42:
-                data = ObjectFactory_1.default.CreateEmptyGlue42Schedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyGlue42Schedule();
                 break;
             case Enums_1.ScheduleType.OpenFin:
-                data = ObjectFactory_1.default.CreateEmptyOpenFinSchedule();
+                scheduleState = ObjectFactory_1.default.CreateEmptyOpenFinSchedule();
                 break;
         }
-        return data;
+        return scheduleState;
     });
     const [isOneOff, setIsOneOff] = React.useState(false);
     const dispatch = react_redux_1.useDispatch();
     const handleFinish = () => {
         let action = null;
-        if (props.data) {
+        if (!isNew) {
             switch (scheduleType) {
                 case Enums_1.ScheduleType.Reminder:
                     action = ScheduleRedux.ReminderScheduleEdit(schedule);

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpecialColumnSettingsWizardStep = void 0;
 const tslib_1 = require("tslib");
-const chunk_1 = tslib_1.__importDefault(require("lodash-es/chunk"));
+const chunk_1 = tslib_1.__importDefault(require("lodash/chunk"));
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
 const CheckBox_1 = require("../components/CheckBox");
@@ -12,7 +12,8 @@ const AdaptableContext_1 = require("./AdaptableContext");
 exports.SpecialColumnSettingsWizardStep = (props) => {
     var _a, _b;
     const adaptable = AdaptableContext_1.useAdaptable();
-    const possibleColumnTypes = adaptable.api.internalApi.getAdaptableOptions().userInterfaceOptions.columnTypes;
+    const possibleColumnTypes = adaptable.api.internalApi.getAdaptableOptions().userInterfaceOptions
+        .columnTypes;
     const { Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable, SuppressMenu, SuppressMovable, } = (_a = props.settings) !== null && _a !== void 0 ? _a : {};
     const handleColumnTypeChange = (columnType, checked) => {
         var _a, _b, _c;

package/src/View/Wizard/AdaptableWizard.js

@@ -9,7 +9,7 @@ const rebass_1 = require("rebass");
 const Dialog_1 = tslib_1.__importDefault(require("../../components/Dialog"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
-const kebabCase_1 = tslib_1.__importDefault(require("lodash-es/kebabCase"));
+const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
 exports.AdaptableWizardContext = React.createContext({
     data: null,
     updateGoBackState: () => { },

package/src/View/Wizard/Interface/IAdaptableWizard.d.ts

@@ -2,6 +2,7 @@
 import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 import { ModuleInfo } from '../../../Strategy/Interface/IModule';
+import { ModuleParams } from '../../Components/SharedProps/ModuleViewPopupProps';
 export interface AdaptableWizardStep {
     canNext(): boolean;
     canBack(): boolean;
@@ -44,4 +45,5 @@ export interface AdaptableOnePageWizardProps<T extends AdaptableObject> {
         name: string;
         label?: string;
     };
+    popupParams?: ModuleParams;
 }

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -9,7 +9,7 @@ const rebass_1 = require("rebass");
 const QueryRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QueryRedux"));
 const Dialog_1 = tslib_1.__importDefault(require("../../components/Dialog"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
-const kebabCase_1 = tslib_1.__importDefault(require("lodash-es/kebabCase"));
+const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
 const useProperty_1 = tslib_1.__importDefault(require("../../components/utils/useProperty"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const isMacLike_1 = require("../../Utilities/isMacLike");

package/src/agGrid/Adaptable.d.ts

@@ -129,8 +129,6 @@ export declare class Adaptable implements IAdaptable {
     private getAlertCellClass;
     private getAlertRowClass;
     private getAlertRowStyle;
-    private getFlashingCellRowStyle;
-    private getFlashingCellStyleFor;
     private getFlashingCellStyle;
     private getCellHighlightStyle;
     private getRowHighlightStyle;

package/src/agGrid/Adaptable.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.bindAdaptableAgGrid = exports.AdaptableNoCodeWizard = exports.Adaptable = void 0;
 const tslib_1 = require("tslib");
 const all_modules_1 = require("@ag-grid-community/all-modules");
-const debounce_1 = tslib_1.__importDefault(require("lodash-es/debounce"));
-const isEqual_1 = tslib_1.__importDefault(require("lodash-es/isEqual"));
-const throttle_1 = tslib_1.__importDefault(require("lodash-es/throttle"));
-const uniqBy_1 = tslib_1.__importDefault(require("lodash-es/uniqBy"));
+const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
+const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
+const throttle_1 = tslib_1.__importDefault(require("lodash/throttle"));
+const uniqBy_1 = tslib_1.__importDefault(require("lodash/uniqBy"));
 const React = tslib_1.__importStar(require("react"));
 const ReactDOM = tslib_1.__importStar(require("react-dom"));
-const clamp_1 = tslib_1.__importDefault(require("lodash-es/clamp"));
+const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
 const AdaptableApiImpl_1 = require("../Api/Implementation/AdaptableApiImpl");
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -340,8 +340,7 @@ class Adaptable {
         // TODO: if  a custom 'aggFunc' property is defined (see setupColumnAggFunc()), it won't be evaluated
         if (!this.getDefaultGroupOrderComparator(this.gridOptions) &&
             this.adaptableOptions.generalOptions.autoOrderGroupedColumns) {
-            this.gridOptions.defaultGroupOrderComparator =
-                this.agGridHelper.runAdaptableGroupComparerFunction();
+            this.gridOptions.defaultGroupOrderComparator = this.agGridHelper.runAdaptableGroupComparerFunction();
         }
         // we prefer the grid to be NOT instantiated so that we can do it
         // perhaps in future we will force instantiation only?
@@ -903,13 +902,12 @@ class Adaptable {
         }
         return null;
     }
-    getFlashingCellRowStyle(params) {
-        const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
-        return this.getFlashingCellStyleFor(primaryKeyValue);
-    }
-    getFlashingCellStyleFor(primaryKey, colId) {
+    getFlashingCellStyle(col, params) {
         var _a;
-        const flashingCell = this.api.internalApi.getAdaptableFlashingCellFor(primaryKey, colId);
+        const primaryKey = params.node.aggData
+            ? params.node.id
+            : this.getPrimaryKeyValueFromRowNode(params.node);
+        const flashingCell = this.api.internalApi.getAdaptableFlashingCellFor(primaryKey, col.columnId);
         if (!flashingCell) {
             return {};
         }
@@ -919,10 +917,6 @@ class Adaptable {
                 ? flashingCell.flashingCellDefinition.DownChangeStyle
                 : flashingCell.flashingCellDefinition.NeutralChangeStyle)) !== null && _a !== void 0 ? _a : {});
     }
-    getFlashingCellStyle(col, params) {
-        const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
-        return this.getFlashingCellStyleFor(primaryKeyValue, col.columnId);
-    }
     getCellHighlightStyle(col, params) {
         const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
         const cellHightlight = this.api.internalApi
@@ -1948,8 +1942,10 @@ class Adaptable {
         ];
     }
     getColDefsForFreeTextColumns() {
-        const specialColumnsAreFilterable = this.api.internalApi.getAdaptableOptions().filterOptions.enableFilterOnSpecialColumns;
-        const defaultFreeTextColumnSettings = ObjectFactory_1.CreateEmptyFreeTextColumn(specialColumnsAreFilterable).FreeTextColumnSettings;
+        const specialColumnsAreFilterable = this.api.internalApi.getAdaptableOptions().filterOptions
+            .enableFilterOnSpecialColumns;
+        const defaultFreeTextColumnSettings = ObjectFactory_1.CreateEmptyFreeTextColumn(specialColumnsAreFilterable)
+            .FreeTextColumnSettings;
         return this.api.freeTextColumnApi.getAllFreeTextColumn().map((freeTextColumn) => {
             var _a;
             const freeTextColumnSettings = Object.assign(Object.assign({}, defaultFreeTextColumnSettings), freeTextColumn.FreeTextColumnSettings);
@@ -2093,13 +2089,13 @@ class Adaptable {
             .enableFilterOnSpecialColumns
             ? this.adaptableOptions.filterOptions.enableFilterOnSpecialColumns
             : true;
-        const defaultCalculatedColumnSettings = ObjectFactory_1.CreateEmptyCalculatedColumn(specialColumnsAreFilterable).CalculatedColumnSettings;
+        const defaultCalculatedColumnSettings = ObjectFactory_1.CreateEmptyCalculatedColumn(specialColumnsAreFilterable)
+            .CalculatedColumnSettings;
         return this.api.calculatedColumnApi.getAllCalculatedColumn().map((calculatedColumn) => {
             var _a;
             const calculatedColumnSettings = Object.assign(Object.assign({}, defaultCalculatedColumnSettings), calculatedColumn.CalculatedColumnSettings);
             if (!calculatedColumnSettings.DataType) {
-                calculatedColumnSettings.DataType =
-                    this.CalculatedColumnExpressionService.GetCalculatedColumnDataType((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
+                calculatedColumnSettings.DataType = this.CalculatedColumnExpressionService.GetCalculatedColumnDataType((_a = calculatedColumn.Query) === null || _a === void 0 ? void 0 : _a.ScalarExpression);
             }
             const columnTypes = [
                 GeneralConstants_1.AB_SPECIAL_COLUMN,
@@ -2478,7 +2474,8 @@ class Adaptable {
             this.onSortChanged();
             this.debouncedSetSelectedCells();
         });
-        const showGroupingTotalsAsHeader = this.adaptableOptions.generalOptions.showGroupingTotalsAsHeader;
+        const showGroupingTotalsAsHeader = this.adaptableOptions.generalOptions
+            .showGroupingTotalsAsHeader;
         /**
          * Use Case: Model has updated
          * Action: If user has set to see grouping totals as header create a pinned row (bit of a hack)
@@ -2912,7 +2909,8 @@ class Adaptable {
             // set the default to the AG Grid provided values
             // from https://github.com/ag-grid/ag-grid/blob/v26.1.0/community-modules/core/src/ts/columns/columnModel.ts#L2515
             let resultHeaderName = userHeaderName !== null && userHeaderName !== void 0 ? userHeaderName : StringExtensions_1.StringExtensions.CamelCaseToHumanText(col.getColDef().field);
-            const layoutCustomHeader = (_a = this.api.layoutApi.getCurrentLayout().ColumnHeadersMap) === null || _a === void 0 ? void 0 : _a[col.getColId()];
+            const layoutCustomHeader = (_a = this.api.layoutApi.getCurrentLayout()
+                .ColumnHeadersMap) === null || _a === void 0 ? void 0 : _a[col.getColId()];
             if (layoutCustomHeader) {
                 resultHeaderName = layoutCustomHeader;
             }
@@ -3155,14 +3153,30 @@ class Adaptable {
         if (oldValue == newValue) {
             return;
         }
-        const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(rowNode);
-        if (!primaryKeyValue) {
-            return;
-        }
         const abColumn = this.api.columnApi.getColumnFromId(colId);
         if (!abColumn) {
             return;
         }
+        if (this.isGroupRowNode(rowNode)) {
+            const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
+                oldValue: oldValue,
+                newValue: newValue,
+                column: abColumn,
+                /**
+                 * A grouped row does not have an underling data item.
+                 * Because of this we use the rowNode.id as an identifier.
+                 */
+                primaryKeyValue: rowNode.id,
+                rowNode: rowNode,
+                trigger: 'aggChange',
+            });
+            this.DataService.CreateDataChangedEvent(dataChangedInfo);
+            return;
+        }
+        const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(rowNode);
+        if (!primaryKeyValue) {
+            return;
+        }
         const dataChangedInfo = this.api.internalApi.buildDataChangedInfo({
             oldValue: oldValue,
             newValue: newValue,

package/src/agGrid/agGridHelper.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.agGridHelper = void 0;
 const tslib_1 = require("tslib");
-const clamp_1 = tslib_1.__importDefault(require("lodash-es/clamp"));
+const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
 const AlertModule_1 = require("../Strategy/AlertModule");

package/src/agGrid/agGridMenuHelper.js

@@ -4,7 +4,7 @@ exports.agGridMenuHelper = void 0;
 const tslib_1 = require("tslib");
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const icons_1 = require("../components/icons");
-const flatten_1 = tslib_1.__importDefault(require("lodash-es/flatten"));
+const flatten_1 = tslib_1.__importDefault(require("lodash/flatten"));
 // tslint:disable-next-line: class-name
 class agGridMenuHelper {
     constructor(adaptable, gridOptions) {

package/src/components/Dashboard/DashboardManager.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { DashboardTab } from '../../PredefinedConfig/DashboardState';
 import { AdaptableDashboardToolbar } from '../../PredefinedConfig/Common/Types';
 import { AdaptableApi } from '../../Api/AdaptableApi';
@@ -6,10 +6,12 @@ export interface DashboardToolbar {
     Id: AdaptableDashboardToolbar | string;
     Title: string;
 }
-declare function DashboardManager({ tabs, onTabsChange, availableToolbars, api, }: {
+interface DashboardManagerProps {
     tabs: DashboardTab[];
     onTabsChange: (tabs: DashboardTab[]) => void;
     availableToolbars: DashboardToolbar[];
     api: AdaptableApi;
-}): JSX.Element;
+    disabled: boolean;
+}
+declare const DashboardManager: React.FunctionComponent<DashboardManagerProps>;
 export default DashboardManager;

package/src/components/Dashboard/DashboardManager.js

@@ -14,22 +14,22 @@ const getToolbarTitle = (availableToolbars, toolbarId) => {
     const found = availableToolbars.find((t) => t.Id === toolbarId);
     return found ? found.Title : toolbarId;
 };
-function TabList({ tabs, onRemoveTab, onRemoveToolbar, onChangeTabName, }) {
+function TabList({ tabs, onRemoveTab, onRemoveToolbar, onChangeTabName, disabled, }) {
     return (React.createElement(react_beautiful_dnd_1.Droppable, { droppableId: "MAIN", type: "TAB", direction: "horizontal" }, (provided) => (React.createElement("div", Object.assign({ ref: provided.innerRef }, provided.droppableProps, { style: { display: 'flex' }, "data-name": "dashboard-tabs" }),
-        tabs.map((tab, tabIndex) => (React.createElement(TabItem, { key: tabIndex, tabIndex: tabIndex, tab: tab, onRemove: () => onRemoveTab(tabIndex), onRemoveToolbar: (toolbarIndex) => onRemoveToolbar(tabIndex, toolbarIndex), onChangeTabName: (tabName) => onChangeTabName(tabIndex, tabName) }))),
+        tabs.map((tab, tabIndex) => (React.createElement(TabItem, { disabled: disabled, key: tabIndex, tabIndex: tabIndex, tab: tab, onRemove: () => onRemoveTab(tabIndex), onRemoveToolbar: (toolbarIndex) => onRemoveToolbar(tabIndex, toolbarIndex), onChangeTabName: (tabName) => onChangeTabName(tabIndex, tabName) }))),
         provided.placeholder))));
 }
-function TabItem({ tab, tabIndex, onRemove, onRemoveToolbar, onChangeTabName, }) {
-    return (React.createElement(react_beautiful_dnd_1.Draggable, { draggableId: String(tabIndex), index: tabIndex }, (provided) => (React.createElement("div", Object.assign({ "data-name": "dashboard-tab", ref: provided.innerRef }, provided.draggableProps, { style: Object.assign(Object.assign({}, provided.draggableProps.style), { boxSizing: 'border-box', border: '1px solid var(--ab-color-primarydark)', borderRadius: 'var(--ab__border-radius)', marginRight: 'var(--ab-space-2)', width: 160, display: 'flex', flexDirection: 'column' }) }),
+function TabItem({ tab, tabIndex, onRemove, onRemoveToolbar, onChangeTabName, disabled, }) {
+    return (React.createElement(react_beautiful_dnd_1.Draggable, { isDragDisabled: disabled, draggableId: String(tabIndex), index: tabIndex }, (provided) => (React.createElement("div", Object.assign({ "data-name": "dashboard-tab", ref: provided.innerRef }, provided.draggableProps, { style: Object.assign(Object.assign({}, (disabled ? {} : provided.draggableProps.style)), { boxSizing: 'border-box', border: '1px solid var(--ab-color-primarydark)', borderRadius: 'var(--ab__border-radius)', marginRight: 'var(--ab-space-2)', width: 160, display: 'flex', flexDirection: 'column' }) }),
         React.createElement("div", { style: {
                 display: 'flex',
                 alignItems: 'center',
                 padding: 'var(--ab-space-1)',
                 borderBottom: '1px solid var(--ab-color-primarydark)',
             } },
-            React.createElement("div", Object.assign({}, provided.dragHandleProps, { style: {} }),
+            React.createElement("div", Object.assign({}, (disabled ? {} : provided.dragHandleProps), { style: {} }),
                 React.createElement(icons_1.Icon, { name: "drag" })),
-            React.createElement("input", { type: "text", value: tab.Name, style: {
+            React.createElement("input", { type: "text", disabled: disabled, value: tab.Name, style: {
                     flex: 1,
                     width: '100%',
                     border: 'none',
@@ -41,11 +41,11 @@ function TabItem({ tab, tabIndex, onRemove, onRemoveToolbar, onChangeTabName, })
                 }, onChange: (event) => {
                     onChangeTabName(event.target.value);
                 } }),
-            React.createElement(SimpleButton_1.default, { icon: "delete", variant: "text", onClick: onRemove })),
-        React.createElement(ToolbarList, { toolbars: tab.Toolbars, droppableId: String(tabIndex), onRemove: onRemoveToolbar })))));
+            React.createElement(SimpleButton_1.default, { disabled: disabled, icon: "delete", variant: "text", onClick: onRemove })),
+        React.createElement(ToolbarList, { disabled: disabled, toolbars: tab.Toolbars, droppableId: String(tabIndex), onRemove: onRemoveToolbar })))));
 }
-function ToolbarList({ toolbars, droppableId, onRemove, }) {
-    return (React.createElement(react_beautiful_dnd_1.Droppable, { droppableId: droppableId, type: "TOOLBAR" }, (provided, snapshot) => (React.createElement("div", Object.assign({ ref: provided.innerRef }, provided.droppableProps, { "data-name": "dashboard-toolbar-drop-target", style: {
+function ToolbarList({ toolbars, droppableId, onRemove, disabled, }) {
+    return (React.createElement(react_beautiful_dnd_1.Droppable, { droppableId: droppableId, type: "TOOLBAR" }, (provided, snapshot) => (React.createElement("div", Object.assign({ ref: provided.innerRef }, (disabled ? {} : provided.droppableProps), { "data-name": "dashboard-toolbar-drop-target", style: {
             flex: 1,
             padding: 4,
             paddingBottom: 0,
@@ -54,18 +54,18 @@ function ToolbarList({ toolbars, droppableId, onRemove, }) {
                 : '',
             minHeight: 200,
         } }),
-        toolbars.map((toolbar, toolbarIndex) => (React.createElement(ToolbarItem, { key: toolbar, toolbar: toolbar, toolbarIndex: toolbarIndex, onRemove: () => onRemove(toolbarIndex) }))),
+        toolbars.map((toolbar, toolbarIndex) => (React.createElement(ToolbarItem, { disabled: disabled, key: toolbar, toolbar: toolbar, toolbarIndex: toolbarIndex, onRemove: () => onRemove(toolbarIndex) }))),
         provided.placeholder))));
 }
-function ToolbarItem({ toolbar, toolbarIndex, onRemove, }) {
+function ToolbarItem({ toolbar, toolbarIndex, onRemove, disabled, }) {
     const { availableToolbars } = react_1.useContext(DashboardManagerContext);
-    return (React.createElement(react_beautiful_dnd_1.Draggable, { draggableId: toolbar, index: toolbarIndex }, (provided, snapshot) => (React.createElement("div", Object.assign({ ref: provided.innerRef }, provided.draggableProps, provided.dragHandleProps, { style: Object.assign(Object.assign({}, provided.draggableProps.style), { display: 'flex', alignItems: 'center', border: '1px solid var(--ab-color-primary)', backgroundColor: snapshot.isDragging
+    return (React.createElement(react_beautiful_dnd_1.Draggable, { isDragDisabled: disabled, draggableId: toolbar, index: toolbarIndex }, (provided, snapshot) => (React.createElement("div", Object.assign({ ref: provided.innerRef }, provided.draggableProps, provided.dragHandleProps, { style: Object.assign(Object.assign({}, provided.draggableProps.style), { display: 'flex', alignItems: 'center', border: '1px solid var(--ab-color-primary)', backgroundColor: snapshot.isDragging
                 ? 'var(--ab-dashboard-toolbar-drag__background)'
                 : 'var(--ab-color-primarylight)', paddingLeft: 'var(--ab-space-1)', marginBottom: 'var(--ab-space-1)' }) }),
         React.createElement("div", { style: { flex: 1 } }, getToolbarTitle(availableToolbars, toolbar)),
-        React.createElement(SimpleButton_1.default, { icon: "clear", variant: "text", padding: 1, onClick: onRemove })))));
+        React.createElement(SimpleButton_1.default, { disabled: disabled, icon: "clear", variant: "text", padding: 1, onClick: onRemove })))));
 }
-function UnusedPanel({ toolbars }) {
+function UnusedPanel({ toolbars, disabled }) {
     return (React.createElement("div", { "data-name": "dashboard-toolbars", style: {
             border: '1px solid var(--ab-color-primarydark)',
             borderRadius: 'var(--ab__border-radius)',
@@ -76,9 +76,9 @@ function UnusedPanel({ toolbars }) {
         React.createElement("div", { style: { padding: 'var(--ab-space-2)' } },
             React.createElement("b", null, "Available Toolbars"),
             " (drag into a Tab below)"),
-        React.createElement(UnusedToolbarList, { toolbars: toolbars })));
+        React.createElement(UnusedToolbarList, { disabled: disabled, toolbars: toolbars })));
 }
-function UnusedToolbarList({ toolbars }) {
+function UnusedToolbarList({ toolbars, disabled }) {
     return (React.createElement(react_beautiful_dnd_1.Droppable, { droppableId: "UNUSED", type: "TOOLBAR", isDropDisabled: true, direction: "horizontal" }, (provided) => (React.createElement("div", Object.assign({ ref: provided.innerRef, "data-name": "dashboard-toolbars-list" }, provided.droppableProps, { style: {
             display: 'flex',
             flexDirection: 'row',
@@ -86,16 +86,22 @@ function UnusedToolbarList({ toolbars }) {
             paddingLeft: 'var(--ab-space-2)',
             paddingRight: 'var(--ab-space-2)',
         } }),
-        toolbars.map((toolbar, toolbarIndex) => (React.createElement(UnusedToolbarItem, { key: toolbar, toolbar: toolbar, toolbarIndex: toolbarIndex }))),
+        toolbars.map((toolbar, toolbarIndex) => (React.createElement(UnusedToolbarItem, { disabled: disabled, key: toolbar, toolbar: toolbar, toolbarIndex: toolbarIndex }))),
         provided.placeholder))));
 }
-function UnusedToolbarItem({ toolbar, toolbarIndex }) {
+function UnusedToolbarItem({ toolbar, toolbarIndex, disabled, }) {
     const { availableToolbars } = react_1.useContext(DashboardManagerContext);
-    return (React.createElement(react_beautiful_dnd_1.Draggable, { draggableId: toolbar, index: toolbarIndex }, (provided, snapshot) => (React.createElement("div", Object.assign({ "data-name": "dashboard-toolbar", ref: provided.innerRef }, provided.draggableProps, provided.dragHandleProps, { style: Object.assign(Object.assign({}, provided.draggableProps.style), { border: '1px solid var(--ab-color-primary)', backgroundColor: snapshot.isDragging
-                ? 'var(--ab-dashboard-toolbar-drag__background)'
-                : 'var(--ab-color-primarylight)', padding: 'var(--ab-space-1) var(--ab-space-2)', marginRight: 'var(--ab-space-1)', marginBottom: 'var(--ab-space-1)' }) }), getToolbarTitle(availableToolbars, toolbar)))));
+    return (React.createElement(react_beautiful_dnd_1.Draggable, { isDragDisabled: disabled, draggableId: toolbar, index: toolbarIndex }, (provided, snapshot) => {
+        const eventHandlers = disabled
+            ? {}
+            : Object.assign(Object.assign({}, provided.draggableProps), provided.dragHandleProps);
+        const dragStyle = disabled ? {} : provided.draggableProps.style;
+        return (React.createElement("div", Object.assign({ "data-name": "dashboard-toolbar", ref: provided.innerRef }, eventHandlers, { style: Object.assign(Object.assign({}, dragStyle), { border: '1px solid var(--ab-color-primary)', backgroundColor: snapshot.isDragging
+                    ? 'var(--ab-dashboard-toolbar-drag__background)'
+                    : 'var(--ab-color-primarylight)', padding: 'var(--ab-space-1) var(--ab-space-2)', marginRight: 'var(--ab-space-1)', marginBottom: 'var(--ab-space-1)' }) }), getToolbarTitle(availableToolbars, toolbar)));
+    }));
 }
-function DashboardManager({ tabs, onTabsChange, availableToolbars, api, }) {
+const DashboardManager = ({ tabs, onTabsChange, availableToolbars, api, disabled, }) => {
     const moduleService = api.internalApi.getModuleService();
     const moduleInfo = moduleService.getModuleInfoByModule('Dashboard');
     const contextValue = react_1.useMemo(() => ({
@@ -157,9 +163,9 @@ function DashboardManager({ tabs, onTabsChange, availableToolbars, api, }) {
         } },
         React.createElement(DashboardManagerContext.Provider, { value: contextValue },
             React.createElement("div", { style: { display: 'flex', flexDirection: 'column' } },
-                React.createElement(UnusedPanel, { toolbars: unusedToolbars }),
-                React.createElement(PanelWithButton_1.PanelWithButton, { headerText: moduleInfo.FriendlyName + ' Tabs', button: React.createElement(SimpleButton_1.default, { onClick: handleTabAdd }, "Add Tab") },
+                React.createElement(UnusedPanel, { disabled: disabled, toolbars: unusedToolbars }),
+                React.createElement(PanelWithButton_1.PanelWithButton, { headerText: moduleInfo.FriendlyName + ' Tabs', button: React.createElement(SimpleButton_1.default, { disabled: disabled, onClick: handleTabAdd }, "Add Tab") },
                     React.createElement("div", { style: { display: 'flex', flex: 1 } },
-                        React.createElement(TabList, { tabs: tabs, onRemoveTab: handleRemoveTab, onRemoveToolbar: handleRemoveToolbar, onChangeTabName: handleChangeTabName })))))));
-}
+                        React.createElement(TabList, { disabled: disabled, tabs: tabs, onRemoveTab: handleRemoveTab, onRemoveToolbar: handleRemoveToolbar, onChangeTabName: handleChangeTabName })))))));
+};
 exports.default = DashboardManager;

package/src/components/DropdownButton/renderItem.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const isPlainObject_1 = tslib_1.__importDefault(require("lodash-es/isPlainObject"));
+const isPlainObject_1 = tslib_1.__importDefault(require("lodash/isPlainObject"));
 exports.default = ({ domProps, item, onItemClick, index, columns, className, idProperty, style, }) => {
     const key = item[idProperty] || index;
     if (!isPlainObject_1.default(item)) {

package/src/components/FormLayout/index.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
 const react_1 = require("react");
-const merge_1 = tslib_1.__importDefault(require("lodash-es/merge"));
+const merge_1 = tslib_1.__importDefault(require("lodash/merge"));
 const join_1 = tslib_1.__importDefault(require("../utils/join"));
 const FormLayoutContext = react_1.createContext(null);
 const defaultColumns = {

package/src/components/OverlayTrigger/Overlay.js

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const batchUpdate_1 = tslib_1.__importDefault(require("../utils/batchUpdate"));
 const usePrevious_1 = tslib_1.__importDefault(require("../utils/usePrevious"));
-const isEqual_1 = tslib_1.__importDefault(require("lodash-es/isEqual"));
+const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 const utils_1 = require("./utils");
 exports.useRefresh = () => {
     const [x, update] = react_1.useState(0);

package/src/metamodel/adaptable.metamodel.js

@@ -4443,7 +4443,7 @@ exports.ADAPTABLE_METAMODEL = {
             {
                 "name": "defaultAccessLevel",
                 "kind": "unknown",
-                "description": "AccessLevel to use when an Entitlement is not explicitly set; may be provided as a hardcoded value or as a function to invoke",
+                "description": "AccessLevel to use when an Entitlement is not explicitly set; can be hardcoded value or a function to invoke",
                 "uiLabel": "Default Access Level",
                 "isOptional": true,
                 "gridInfo": "item",

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "11.0.0-canary.2";
+declare const _default: "11.0.0-canary.3";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '11.0.0-canary.2'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '11.0.0-canary.3'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version