@adaptabletools/adaptable 18.0.0-canary.3 → 18.0.0-canary.31

package/src/Utilities/Services/RowEditService.js

@@ -1,4 +1,3 @@
-// @ts-ignore
 export class RowEditService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
@@ -37,4 +36,7 @@ export class RowEditService {
             adaptableApi.gridApi.addGridData([newRowData], config);
         }
     }
+    destroy() {
+        // nothing yet
+    }
 }

package/src/Utilities/Services/RowSummaryService.d.ts

@@ -0,0 +1,22 @@
+import { AdaptableApi, Layout } from '../../types';
+import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
+/**
+ * The logic is extracted here to make it easier to follow
+ */
+export declare class RowSummaryService {
+    private api;
+    cachedCellSummary: Map<string, AggregatedScalarLiveValue>;
+    previousRowSummaries: any;
+    previousLayout: Layout | null;
+    debouncedEvaluateRowSummary: import("lodash").DebouncedFunc<(reason?: {
+        columnId: string;
+    }) => void>;
+    constructor(api: AdaptableApi);
+    onAdapterReady(): void;
+    rowSummariesSubscriptions(): void;
+    /**
+     *
+     * @param colId optional to evaluate only one column
+     */
+    private evaluateRowSummary;
+}

package/src/Utilities/Services/RowSummaryService.js

@@ -0,0 +1,141 @@
+import { isEqual } from 'lodash';
+import { ROW_SUMMARY_ROW_ID, WEIGHTED_AVERAGE_AGGREATED_FUNCTION, } from '../../PredefinedConfig/Common/RowSummary';
+import { SystemRowSummarySet } from '../../Redux/ActionsReducers/SystemRedux';
+import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
+import Helper from '../Helpers/Helper';
+import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
+import { isObjectEmpty } from '../Extensions/ObjectExtensions';
+import debounce from 'lodash/debounce';
+/**
+ * The logic is extracted here to make it easier to follow
+ */
+export class RowSummaryService {
+    constructor(api) {
+        this.api = api;
+        this.cachedCellSummary = new Map();
+        this.debouncedEvaluateRowSummary = debounce(this.evaluateRowSummary, 300);
+    }
+    onAdapterReady() {
+        this.rowSummariesSubscriptions();
+    }
+    rowSummariesSubscriptions() {
+        // return;
+        if (this.api.isDestroyed()) {
+            return;
+        }
+        // Currently not available for serverside model
+        if (!this.api.layoutApi.internalApi.getLayoutSupportedFeatures().RowSummaries) {
+            return;
+        }
+        this.debouncedEvaluateRowSummary();
+        this.api.eventApi.on('AdaptableStateReloaded', () => {
+            this.debouncedEvaluateRowSummary();
+        });
+        this.api.eventApi.on('GridDataChanged', (event) => {
+            this.debouncedEvaluateRowSummary();
+        });
+        this.api.eventApi.on('CellChanged', (event) => {
+            const columnId = event.cellChange.column.columnId;
+            this.debouncedEvaluateRowSummary({
+                columnId,
+            });
+        });
+        this.api.eventApi.on('LayoutChanged', (event) => {
+            // exclude filter events, those are handled in another event
+            if (event.actionName.includes('FILTER')) {
+                return;
+            }
+            setTimeout(() => {
+                // the timeout is added so the grid has time to repond to the layout changed
+                this.debouncedEvaluateRowSummary();
+            }, 16);
+        });
+        const adaptable = this.api.internalApi.getAdaptableInstance();
+        adaptable._on('AdapTableFiltersApplied', () => {
+            // we need to use this instead of layout changed
+            // so the rows have time to update
+            this.debouncedEvaluateRowSummary();
+        });
+        adaptable._on('FirstDataRendered', () => {
+            this.debouncedEvaluateRowSummary();
+        });
+    }
+    /**
+     *
+     * @param colId optional to evaluate only one column
+     */
+    evaluateRowSummary(reason) {
+        var _a;
+        if (this.api.isDestroyed()) {
+            return;
+        }
+        const currentLayout = this.api.layoutApi.getCurrentLayout();
+        let previousLayout = this.previousLayout;
+        // it is added here to be sure it is saved
+        this.previousLayout = currentLayout;
+        /**
+         * If the previous & current layout does not have row summaries, it is safe to exit
+         */
+        if (isObjectEmpty(currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.RowSummaries) && isObjectEmpty(previousLayout === null || previousLayout === void 0 ? void 0 : previousLayout.RowSummaries)) {
+            return;
+        }
+        const rowSummaries = (_a = this.api.layoutApi.getCurrentLayout().RowSummaries) !== null && _a !== void 0 ? _a : [];
+        const rowSummariesResults = rowSummaries.map(({ ColumnsMap, Position }) => {
+            return {
+                Position,
+                RowData: Object.entries(ColumnsMap !== null && ColumnsMap !== void 0 ? ColumnsMap : {}).reduce((acc, [columnId, expression]) => {
+                    const key = `${columnId}-${expression}`;
+                    let expressionLiveValue = this.cachedCellSummary.get(key);
+                    if (expressionLiveValue) {
+                        if (!reason) {
+                            // refresh all of them
+                            expressionLiveValue.refresh();
+                        }
+                        else if ('columnId' in reason && reason.columnId === columnId) {
+                            expressionLiveValue.refresh();
+                        }
+                    }
+                    if (!expressionLiveValue) {
+                        try {
+                            let aggregatedScalarExpression = `${expression}([${columnId}])`;
+                            if (aggregatedScalarExpression.includes(WEIGHTED_AVERAGE_AGGREATED_FUNCTION) &&
+                                currentLayout.AggregationColumns[columnId] &&
+                                typeof currentLayout.AggregationColumns[columnId] === 'object') {
+                                const weight = currentLayout.AggregationColumns[columnId]
+                                    .weightedColumnId;
+                                if (weight) {
+                                    aggregatedScalarExpression = `AVG([${columnId}], WEIGHT([${weight}]))`;
+                                }
+                            }
+                            expressionLiveValue = new AggregatedScalarLiveValue({
+                                aggregatedScalarExpression,
+                            }, ModuleConstants.LayoutModuleId, this.api, () => {
+                                return this.api.gridApi.getVisibleRowNodes();
+                            });
+                        }
+                        catch (e) {
+                            this.api.logError('Error evaluating row summary', e);
+                        }
+                        this.cachedCellSummary.set(key, expressionLiveValue);
+                    }
+                    let value = null;
+                    if (expressionLiveValue) {
+                        value = expressionLiveValue.getGlobalAggregatedValue();
+                        if (typeof value === 'number' && !isNaN(value)) {
+                            value = Helper.roundNumber(value, 2);
+                        }
+                    }
+                    acc[columnId] = value;
+                    return acc;
+                }, {
+                    [ROW_SUMMARY_ROW_ID]: true,
+                }),
+            };
+        });
+        if (this.previousRowSummaries && isEqual(rowSummariesResults, this.previousRowSummaries)) {
+            return;
+        }
+        this.api.internalApi.dispatchReduxAction(SystemRowSummarySet(rowSummariesResults));
+        this.previousRowSummaries = rowSummariesResults;
+    }
+}

package/src/Utilities/adaptableQlUtils.d.ts

@@ -0,0 +1,2 @@
+import { AdaptableColumnDataType, ExpressionFunctionInputType } from '../types';
+export declare const mapColumnDataTypeToExpressionFunctionType: (dataType: AdaptableColumnDataType) => ExpressionFunctionInputType;

package/src/Utilities/adaptableQlUtils.js

@@ -0,0 +1,14 @@
+export const mapColumnDataTypeToExpressionFunctionType = (dataType) => {
+    if (dataType === 'Number') {
+        return 'number';
+    }
+    if (dataType === 'Boolean') {
+        return 'boolean';
+    }
+    if (dataType === 'String') {
+        return 'text';
+    }
+    if (dataType === 'Date') {
+        return 'date';
+    }
+};

package/src/Utilities/license/decode.js

@@ -1,65 +1 @@
-import { compute_string } from './hashing';
-const getGenericError = () => new Error('Invalid License');
-export const GENERIC_APP_NAME = 'GenericAdaptableApp';
-export const fieldsToLicenseDetails = (fields) => {
-    var _a;
-    const fieldsMap = fields.reduce((acc, field) => {
-        acc.set(field.name, field.value);
-        return acc;
-    }, new Map());
-    const details = {
-        start: new Date(fieldsMap.get('StartDate')),
-        end: new Date(fieldsMap.get('EndDate')),
-        owner: fieldsMap.get('Owner'),
-        appName: fieldsMap.get('AppName') || GENERIC_APP_NAME,
-        timestamp: fieldsMap.get('TS') ? Number(fieldsMap.get('TS')) : 0,
-        trial: fieldsMap.get('Trial') === 'true' ? true : false,
-        ref: (_a = fieldsMap.get('Ref')) !== null && _a !== void 0 ? _a : '',
-    };
-    if (!details.start ||
-        !details.end ||
-        !details.owner ||
-        typeof details.trial !== 'boolean' ||
-        !details.ref) {
-        throw getGenericError();
-    }
-    return details;
-};
-export const decode = (licenseKey) => {
-    let crc = '';
-    let fields = licenseKey.split('|').map((part) => {
-        let [name, value] = part.split('=');
-        if (name === 'C') {
-            crc = value;
-        }
-        return {
-            name,
-            value,
-        };
-    });
-    if (!crc) {
-        throw getGenericError();
-    }
-    const crcParts = crc.split(',').reverse();
-    const overallCrc = crcParts.pop();
-    crcParts.forEach((fieldCrc, index) => {
-        const field = fields[index];
-        if (compute_string(field.value) !== fieldCrc) {
-            throw getGenericError();
-        }
-    });
-    const fieldsWithoutC = [...fields];
-    fieldsWithoutC.pop();
-    const fieldsWithoutCString = fieldsWithoutC
-        .map((field) => {
-        return `${field.name}=${field.value}`;
-    })
-        .join('|');
-    if (compute_string(fieldsWithoutCString) !== overallCrc) {
-        throw getGenericError();
-    }
-    fields = fields.map((f) => {
-        return Object.assign(Object.assign({}, f), { value: decodeURI(f.value) });
-    });
-    return fieldsToLicenseDetails(fields);
-};
+import{compute_string as e}from"./hashing";const t=()=>new Error("Invalid License");export const GENERIC_APP_NAME="GenericAdaptableApp";export const fieldsToLicenseDetails=e=>{var a;const r=e.reduce(((e,t)=>(e.set(t.name,t.value),e)),new Map),n={start:new Date(r.get("StartDate")),end:new Date(r.get("EndDate")),owner:r.get("Owner"),appName:r.get("AppName")||GENERIC_APP_NAME,timestamp:r.get("TS")?Number(r.get("TS")):0,trial:"true"===r.get("Trial"),ref:null!==(a=r.get("Ref"))&&void 0!==a?a:""};if(!(n.start&&n.end&&n.owner&&"boolean"==typeof n.trial&&n.ref))throw t();return n};export const decode=a=>{let r="",n=a.split("|").map((e=>{let[t,a]=e.split("=");return"C"===t&&(r=a),{name:t,value:a}}));if(!r)throw t();const o=r.split(",").reverse(),s=o.pop();o.forEach(((a,r)=>{const o=n[r];if(e(o.value)!==a)throw t()}));const i=[...n];i.pop();const p=i.map((e=>`${e.name}=${e.value}`)).join("|");if(e(p)!==s)throw t();return n=n.map((e=>Object.assign(Object.assign({},e),{value:decodeURI(e.value)}))),fieldsToLicenseDetails(n)};

package/src/Utilities/license/hashing.js

@@ -1,43 +1 @@
-const DEFAULT_ReversedPolynomial = 0xedb88320;
-/*
- * CRC-32 implementation
- */
-function generate(reversedPolynomial = DEFAULT_ReversedPolynomial) {
-    var table = new Array();
-    var i, j, n;
-    for (i = 0; i < 256; i++) {
-        n = i;
-        for (j = 8; j > 0; j--) {
-            if ((n & 1) == 1) {
-                n = (n >>> 1) ^ reversedPolynomial;
-            }
-            else {
-                n = n >>> 1;
-            }
-        }
-        table[i] = n;
-    }
-    return table;
-}
-function crc32_initial() {
-    return 0xffffffff;
-}
-function crc32_add_byte(table, crc, byte) {
-    crc = (crc >>> 8) ^ table[byte ^ (crc & 0x000000ff)];
-    return crc;
-}
-function crc32_final(crc) {
-    crc = ~crc;
-    crc = crc < 0 ? 0xffffffff + crc + 1 : crc;
-    return crc;
-}
-export function compute_string(str, reversedPolynomial = DEFAULT_ReversedPolynomial) {
-    var table = generate(reversedPolynomial);
-    var crc = 0;
-    var i;
-    crc = crc32_initial();
-    for (i = 0; i < str.length; i++)
-        crc = crc32_add_byte(table, crc, str.charCodeAt(i));
-    crc = crc32_final(crc);
-    return `${crc}`;
-}
+const r=3988292384;function n(n=r){var t,o,u,e=new Array;for(t=0;t<256;t++){for(u=t,o=8;o>0;o--)1&~u?u>>>=1:u=u>>>1^n;e[t]=u}return e}function t(){return 4294967295}function o(r,n,t){return n=n>>>8^r[t^255&n]}function u(r){return r=(r=~r)<0?4294967295+r+1:r}export function compute_string(e,c=r){var f,i=n(c),a=0;for(a=t(),f=0;f<e.length;f++)a=o(i,a,e.charCodeAt(f));return`${a=u(a)}`}

package/src/View/AdaptableView.js

@@ -3,7 +3,6 @@ import { connect } from 'react-redux';
 import { ProgressIndicator } from '../components/ProgressIndicator/ProgressIndicator';
 import { ToastContainer } from '../components/Toastify';
 import * as PopupRedux from '../Redux/ActionsReducers/PopupRedux';
-import { AdaptableLoadingScreen } from './Components/Popups/AdaptableLoadingScreen';
 import { AdaptablePopup } from './Components/Popups/AdaptablePopup';
 import { AdaptablePopupConfirmation } from './Components/Popups/AdaptablePopupConfirmation';
 import { AdaptablePopupPrompt } from './Components/Popups/AdaptablePopupPrompt';
@@ -23,7 +22,6 @@ class AdaptableView extends React.Component {
             React.createElement(GridCellPopup, null),
             React.createElement(QuickSearchDrawer, null),
             this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard, { api: this.props.AdaptableApi })),
-            this.props.AdaptableApi.optionsApi.getUserInterfaceOptions().showLoadingScreen && (React.createElement(AdaptableLoadingScreen, { onClose: this.props.onCloseLoadingPopup, showLoadingScreen: this.props.PopupState.LoadingPopup.ShowLoadingPopup })),
             this.props.PopupState.PromptPopup.ShowPromptPopup && (React.createElement(AdaptablePopupPrompt, { message: this.props.PopupState.PromptPopup.Message, header: this.props.PopupState.PromptPopup.Header, onClose: this.props.onClosePromptPopup, onConfirm: this.props.onConfirmPromptPopup, onConfirmActionCreator: this.props.PopupState.PromptPopup.ConfirmActionCreator, defaultValue: this.props.PopupState.PromptPopup.DefaultValue })),
             Boolean(this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup) && (React.createElement(AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi })),
             Boolean(this.props.PopupState.ScreenPopup.ShowScreenPopup) && (React.createElement(AdaptablePopup, { componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps })),
@@ -33,7 +31,7 @@ class AdaptableView extends React.Component {
             , { 
                 // we NEEEEED!!!! this containerId, otherwise, toastify will have memory leaks when the adaptable
                 // instance is destroyed and re-created many times
-                containerId: adaptableOptions.adaptableId, limit: adaptableOptions.notificationsOptions.maxNotifications, closeButton: false, icon: false, theme: "colored" }),
+                containerId: `Toastify-${adaptableOptions.adaptableId}`, limit: adaptableOptions.notificationsOptions.maxNotifications, closeButton: false, icon: false, theme: "colored" }),
             (watermark === null || watermark === void 0 ? void 0 : watermark.show) && React.createElement(LicenseWatermark, null, watermark === null || watermark === void 0 ? void 0 : watermark.text),
             React.createElement(WindowPopups, null),
             React.createElement(FormPopups, null),

package/src/View/AdaptableViewFactory.js

@@ -29,7 +29,7 @@ import { StatusBarPopup } from './StatusBar/StatusBarPopup';
 import { ChartingViewPanel } from './Charting/ChartingViewPanel';
 import { GridFilterPopup } from './GridFilter/GridFilterPopup';
 import { ColumnInfoPopup } from './ColumnInfo/ColumnInfoPopup';
-import { NotesPopup } from './Notes/NotesPopup';
+import { NotePopup } from './Note/NotePopup';
 import { CommentsPopup } from './Comments/CommentsPopup';
 import { DataImportPopup } from './DataImport/DataImportPopup';
 export const AdaptableViewFactory = {
@@ -46,7 +46,7 @@ export const AdaptableViewFactory = {
     ToolPanelPopup,
     SystemStatusPopup,
     DataChangeHistoryPopup,
-    NotesPopup,
+    NotePopup,
     CommentsPopup,
     DataImportPopup,
     GridFilterPopup,

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 AdaptableHelper from '../../../Utilities/Helpers/AdaptableHelper';
+import { applyDefaultAdaptableOptions } from '../../../agGrid/defaultAdaptableOptions';
 export const ConfigurationWizard = (props) => {
     const [isPrimaryKeySelected, setIsValid] = React.useState(true);
     const [adaptableConfig, setAdaptableConfig] = useState(() => {
@@ -17,7 +17,7 @@ export const ConfigurationWizard = (props) => {
             },
         };
         const gridOptions = Object.assign(Object.assign({}, gridOptionDefaults), props.adaptableConfig.gridOptions);
-        const adaptableOptions = AdaptableHelper.assignAdaptableOptions(props.adaptableConfig.adaptableOptions);
+        const adaptableOptions = applyDefaultAdaptableOptions(props.adaptableConfig.adaptableOptions);
         return { gridOptions, adaptableOptions };
     });
     const [selectedColumns, setSelectedColumns] = useState(() => {

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsStatusbarForm.js

@@ -83,7 +83,7 @@ export const UIOptionsStatusbarForm = (props) => {
                 React.createElement(Box, { as: "b" }, "Create Adaptable Statusbar Panel"),
                 React.createElement(FormLayout, { mt: 2 },
                     React.createElement(FormRow, { label: "Panel Name" },
-                        React.createElement(Input, { value: adaptablePanelTitle, placehoder: 'Adaptable Panel Name', onChange: (event) => setAdaptablePanelTitle(event.target.value) })),
+                        React.createElement(Input, { value: adaptablePanelTitle, placeholder: 'Adaptable Panel Name', onChange: (event) => setAdaptablePanelTitle(event.target.value) })),
                     React.createElement(FormRow, { label: "Align" },
                         React.createElement(DropdownButton, { columns: ['label'], items: alignOptions }, (_d = alignOptions.find((option) => option.value === adaptablePanelAlign)) === null || _d === void 0 ? void 0 : _d.label)),
                     React.createElement(FormRow, { label: "" },

package/src/View/Alert/Utilities/getAvailablePredicates.d.ts

@@ -1,3 +1,3 @@
-import { AdaptableApi, AdaptablePredicateDef, AdaptableScope } from '../../../types';
+import { AdaptableApi, AdaptablePredicateDef, ColumnScope } from '../../../types';
 import { AlertType } from './getAlertType';
-export declare const getAvailablePredicateDefinitions: (api: AdaptableApi, scope: AdaptableScope, alertType: AlertType) => AdaptablePredicateDef<string>[];
+export declare const getAvailablePredicateDefinitions: (api: AdaptableApi, scope: ColumnScope, alertType: AlertType) => AdaptablePredicateDef<string>[];

package/src/View/Alert/Utilities/getDefaultAlertDefinition.d.ts

@@ -6,7 +6,7 @@ import { AlertType } from './getAlertType';
  */
 export declare const getDefaultAlertDefinition: (alertDefinition: AlertDefinition, type: AlertType) => {
     Uuid: string;
-    Scope: import("../../../types").AdaptableScope<import("../../../PredefinedConfig/Common/AdaptableScope").ScopeDataType>;
+    Scope: import("../../../types").ColumnScope<import("../../../PredefinedConfig/Common/ColumnScope").ScopeDataType>;
     Rule: ({
         Predicates?: never;
     } & (({

package/src/View/BulkUpdate/BulkUpdatePopup.js

@@ -51,7 +51,7 @@ class BulkUpdatePopupComponent extends React.Component {
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All', onClick: () => {
                             this.onApplyClick();
                         }, variant: "raised", tone: "accent" }, "Apply to Grid")))) : (React.createElement(React.Fragment, null,
-                React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, "Select an existing column value from the dropdown, or enter a new value"),
+                React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, "Select an existing Column value from the dropdown, or enter a new value"),
                 React.createElement(Flex, { marginTop: 2, flexDirection: "row", alignItems: "center" },
                     React.createElement(Flex, { alignItems: "center", flexDirection: "row", flex: 1, marginRight: 2 },
                         React.createElement(ColumnValueSelector, { selectedGridCells: this.props.SelectedGridCells, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: col, api: this.props.api, onColumnValueChange: (columns) => this.onColumnValueSelectedChanged(columns), style: { width: '100%', maxWidth: 'inherit' } })),

package/src/View/CalculatedColumn/Wizard/CalculatedColumnWizard.d.ts

@@ -2,7 +2,7 @@
 import { CalculatedColumn } from '../../../types';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
 export declare const calculatedColumnTypes: readonly ["ScalarExpression", "AggregatedScalarExpression", "CumulativeAggregatedExpression", "QuantileAggregatedExpression"];
-export type ExpressionType = typeof calculatedColumnTypes[number];
+export type ExpressionType = (typeof calculatedColumnTypes)[number];
 export interface CalculatedColumnWizardProps extends AdaptableOnePageWizardProps<CalculatedColumn> {
 }
 export declare const CalculatedColumnWizard: (props: CalculatedColumnWizardProps) => JSX.Element;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnWizard.js

@@ -33,10 +33,10 @@ export const CalculatedColumnWizard = (props) => {
         if ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.column) {
             const calculatedColumn = allCalculatedColumns.find((calculatedColumn) => calculatedColumn.ColumnId === props.popupParams.column.columnId);
             if (calculatedColumn) {
-                return calculatedColumn;
+                return cloneObject(calculatedColumn);
             }
         }
-        return ObjectFactory.CreateEmptyCalculatedColumn();
+        return ObjectFactory.CreateEmptyCalculatedColumn(adaptable.api.gridApi.internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef());
     });
     const dispatch = useDispatch();
     const isEdit = Boolean(props.data) || ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit';
@@ -51,7 +51,7 @@ export const CalculatedColumnWizard = (props) => {
     };
     const [expressionType, setExpressionType] = useState(() => {
         var _a;
-        return (_a = getExpressionType(props.data, adaptable.api)) !== null && _a !== void 0 ? _a : 'ScalarExpression';
+        return (_a = getExpressionType(calculatedColumn, adaptable.api)) !== null && _a !== void 0 ? _a : 'ScalarExpression';
     });
     const handleExpressionTypeChange = (type) => {
         setExpressionType(type);

package/src/View/CalculatedColumn/utils.d.ts

@@ -1,2 +1,2 @@
 import { AdaptableApi, CalculatedColumn } from '../../types';
-export declare const getExpressionType: (calculatedColumn: CalculatedColumn, api: AdaptableApi) => "ScalarExpression" | "AggregatedScalarExpression" | "CumulativeAggregatedExpression" | "QuantileAggregatedExpression";
+export declare const getExpressionType: (calculatedColumn: CalculatedColumn, api: AdaptableApi) => "AggregatedScalarExpression" | "ScalarExpression" | "CumulativeAggregatedExpression" | "QuantileAggregatedExpression";

package/src/View/CellSummary/CellSummaryPopup.js

@@ -11,7 +11,7 @@ class CellSummaryPopupComponent extends React.Component {
             // afterwards, we will go on with the cell summary logic, as that will evaluate the current(column) cell selection
             this.props.api.columnApi.selectColumn((_c = this.props.popupParams) === null || _c === void 0 ? void 0 : _c.column.columnId);
             // we also need to update the internal state of the selected cells
-            this.props.api.internalApi.getAdaptableInstance().setSelectedCells();
+            this.props.api.internalApi.getAdaptableInstance().refreshSelectedCellsState();
         }
         this.props.onCreateCellSummary();
     }

package/src/View/Comments/CommentsEditor.js

@@ -24,6 +24,7 @@ export const CommentsEditor = (props) => {
         return adaptable.api.optionsApi.getUserName();
     }, []);
     const commentThread = useSelector((state) => CommentsRedux.GetCellCommentSelector(state.Comment, cellAddress));
+    const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Comment') === 'ReadOnly';
     const [activeEditingComment, setActiveEditingComment] = React.useState(() => {
         /**
          * When opening the popup and there is only one comment, we want to open it in edit mode.
@@ -35,12 +36,23 @@ export const CommentsEditor = (props) => {
         return null;
     });
     const [newCommentText, setNewCommentText] = React.useState('');
+    const commentsWrapperRef = React.useRef(null);
+    const comments = commentThread === null || commentThread === void 0 ? void 0 : commentThread.Comments;
+    const scrollToBottom = () => {
+        var _a, _b;
+        (_a = commentsWrapperRef === null || commentsWrapperRef === void 0 ? void 0 : commentsWrapperRef.current) === null || _a === void 0 ? void 0 : _a.scrollTo(0, (_b = commentsWrapperRef === null || commentsWrapperRef === void 0 ? void 0 : commentsWrapperRef.current) === null || _b === void 0 ? void 0 : _b.scrollHeight);
+    };
+    React.useEffect(() => {
+        scrollToBottom();
+    }, []);
     if (!commentThread) {
         return null;
     }
-    const comments = commentThread.Comments;
-    return (React.createElement(Panel, { color: "var(--ab-color-text-on-primary)", onClick: () => props.enableEditMode(), minWidth: 250 },
-        comments &&
+    return (React.createElement(Panel, { color: "var(--ab-color-text-on-primary)", onClick: () => props.enableEditMode(), minWidth: 250, className: "ab-CommentPopup" },
+        React.createElement(Flex, { style: {
+                overflow: 'auto',
+                maxHeight: 300,
+            }, flexDirection: "column", ref: commentsWrapperRef }, comments &&
             comments.length > 0 &&
             comments.map((comment, index) => {
                 var _a, _b, _c, _d;
@@ -50,30 +62,28 @@ export const CommentsEditor = (props) => {
                 const isOwnComment = ((_a = comment === null || comment === void 0 ? void 0 : comment.Author) === null || _a === void 0 ? void 0 : _a.UserName)
                     ? ((_b = comment === null || comment === void 0 ? void 0 : comment.Author) === null || _b === void 0 ? void 0 : _b.UserName) === userId
                     : true; // no owner means it's the current user
-                return (React.createElement(Box, { p: 2, key: (_c = comment.Uuid) !== null && _c !== void 0 ? _c : index, style: {
-                        borderBottom: '1px solid var(--ab-color-primarydark)',
-                    } },
+                return (React.createElement(Box, { p: 2, key: (_c = comment.Uuid) !== null && _c !== void 0 ? _c : index, className: "ab-Comment" },
                     React.createElement(Flex, { mb: 2, alignItems: "center" },
                         React.createElement(Box, null,
-                            React.createElement(Box, { fontSize: 3, fontWeight: "bold" }, (_d = comment === null || comment === void 0 ? void 0 : comment.Author) === null || _d === void 0 ? void 0 : _d.UserName),
-                            comment.Timestamp && (React.createElement(Box, { fontSize: 2 }, formatDate(comment.Timestamp, 'MM.DD.YYYY HH:mm')))),
+                            React.createElement(Box, { "data-name": "comment-username", fontSize: 3, fontWeight: "bold" }, (_d = comment === null || comment === void 0 ? void 0 : comment.Author) === null || _d === void 0 ? void 0 : _d.UserName),
+                            comment.Timestamp && (React.createElement(Box, { "data-name": "comment-timestamp", fontSize: 2 }, formatDate(comment.Timestamp, 'MM.DD.YYYY HH:mm')))),
                         React.createElement(Box, { flex: 1 }),
-                        React.createElement(SimpleButton, { variant: "text", icon: "edit", disabled: !isOwnComment, onClick: () => setActiveEditingComment(comment.Uuid) }),
-                        React.createElement(SimpleButton, { variant: "text", icon: "delete", disabled: !isOwnComment, onClick: () => {
+                        React.createElement(SimpleButton, { variant: "text", icon: "edit", disabled: !isOwnComment || isReadOnlyModule, onClick: () => setActiveEditingComment(comment.Uuid) }),
+                        React.createElement(SimpleButton, { variant: "text", icon: "delete", disabled: !isOwnComment || isReadOnlyModule, onClick: () => {
                                 adaptable.api.commentApi.deleteComment(comment, cellAddress);
                                 requestAnimationFrame(() => {
                                     props.onRefreshContent();
                                 });
                             } })),
-                    React.createElement(Box, { onClick: () => setActiveEditingComment(comment.Uuid) }, comment.Uuid === activeEditingComment ? (React.createElement(AdaptableInput, { autoFocus: true, width: "100%", defaultValue: comment.Value, onBlur: () => {
+                    React.createElement(Box, { onClick: () => setActiveEditingComment(comment.Uuid) }, comment.Uuid === activeEditingComment ? (React.createElement(AdaptableInput, { autoFocus: true, width: "100%", defaultValue: comment.Value, disabled: isReadOnlyModule, onBlur: () => {
                             if (comment.Uuid === activeEditingComment) {
                                 setActiveEditingComment(null);
                             }
                         }, onChange: (event) => {
                             adaptable.api.commentApi.editComment(Object.assign(Object.assign({}, comment), { Value: event.target.value }), cellAddress);
-                        } })) : (React.createElement(Text, null, comment.Value)))));
-            }),
-        React.createElement(AdaptableInput, { autoFocus: !comments || comments.length === 0, value: newCommentText, onChange: (event) => {
+                        } })) : (React.createElement(Text, { "data-name": "comment-text" }, comment.Value)))));
+            })),
+        React.createElement(AdaptableInput, { autoFocus: !comments || comments.length === 0, value: newCommentText, disabled: isReadOnlyModule, onChange: (event) => {
                 setNewCommentText(event.target.value);
             }, onKeyDown: (event) => {
                 if (event.key === 'Enter') {
@@ -81,15 +91,16 @@ export const CommentsEditor = (props) => {
                     setNewCommentText('');
                     requestAnimationFrame(() => {
                         props.onRefreshContent();
+                        scrollToBottom();
                     });
                 }
-            }, mt: 2, mb: "2", width: "100%", placeholder: "Write new comment" }),
+            }, mt: 2, mb: "2", width: "100%", placeholder: "Write new Comment" }),
         React.createElement(SimpleButton, { width: "100%", variant: "raised", onClick: () => {
-                adaptable.api.settingsPanelApi.openSettingsPanel('Comments');
+                adaptable.api.settingsPanelApi.openSettingsPanel('Comment');
                 adaptable.api.internalApi.getCellPopupService().hidePopup();
             } },
             React.createElement(Box, { mr: 2 },
                 React.createElement(Icon, { name: "folder" })),
             ' ',
-            "Open all comments")));
+            "Open all Comments")));
 };