@adaptabletools/adaptable-cjs 18.0.0-canary.8 → 18.0.0

package/src/Utilities/Services/RowSummaryService.js

@@ -0,0 +1,160 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RowSummaryService = void 0;
+const tslib_1 = require("tslib");
+const lodash_1 = require("lodash");
+const RowSummary_1 = require("../../PredefinedConfig/Common/RowSummary");
+const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
+const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
+const Helper_1 = tslib_1.__importDefault(require("../Helpers/Helper"));
+const AggregatedScalarLiveValue_1 = require("./AggregatedScalarLiveValue");
+const ObjectExtensions_1 = require("../Extensions/ObjectExtensions");
+const throttle_1 = tslib_1.__importDefault(require("lodash/throttle"));
+/**
+ * The logic is extracted here to make it easier to follow
+ */
+class RowSummaryService {
+    constructor(api) {
+        this.api = api;
+        this.cachedCellSummary = new Map();
+        this._throttleAcumulatedColumnsThatChanged = new Set();
+        /**
+         *
+         * @param colId optional to evaluate only one column
+         */
+        this._throttledEvaluateRowSummary = (0, throttle_1.default)(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.throttledEvaluateRowSummary();
+        this.api.eventApi.on('AdaptableStateReloaded', () => {
+            this.throttledEvaluateRowSummary();
+        });
+        this.api.eventApi.on('GridDataChanged', (event) => {
+            this.throttledEvaluateRowSummary();
+        });
+        this.api.eventApi.on('CellChanged', (event) => {
+            const columnId = event.cellChange.column.columnId;
+            this.throttledEvaluateRowSummary({
+                columnIds: [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.throttledEvaluateRowSummary();
+            }, 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.throttledEvaluateRowSummary();
+        });
+        adaptable._on('FirstDataRendered', () => {
+            this.throttledEvaluateRowSummary();
+        });
+    }
+    throttledEvaluateRowSummary(reason) {
+        if (reason) {
+            reason.columnIds.forEach((col) => this._throttleAcumulatedColumnsThatChanged.add(col));
+        }
+        this._throttledEvaluateRowSummary(reason);
+    }
+    evaluateRowSummary(reason) {
+        var _a;
+        if (this._throttleAcumulatedColumnsThatChanged.size > 0) {
+            const columnIds = Array.from(this._throttleAcumulatedColumnsThatChanged.values());
+            reason = {
+                columnIds,
+            };
+            this._throttleAcumulatedColumnsThatChanged.clear();
+        }
+        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 ((0, ObjectExtensions_1.isObjectEmpty)(currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.RowSummaries) && (0, ObjectExtensions_1.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 ('columnIds' in reason && reason.columnIds.includes(columnId)) {
+                            expressionLiveValue.refresh();
+                        }
+                    }
+                    if (!expressionLiveValue) {
+                        try {
+                            let aggregatedScalarExpression = `${expression}([${columnId}])`;
+                            if (aggregatedScalarExpression.includes(RowSummary_1.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_1.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_1.default.roundNumber(value, 2);
+                        }
+                    }
+                    acc[columnId] = value;
+                    return acc;
+                }, {
+                    [RowSummary_1.ROW_SUMMARY_ROW_ID]: true,
+                }),
+            };
+        });
+        if (this.previousRowSummaries && (0, lodash_1.isEqual)(rowSummariesResults, this.previousRowSummaries)) {
+            return;
+        }
+        this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemRowSummarySet)(rowSummariesResults));
+        this.previousRowSummaries = rowSummariesResults;
+    }
+}
+exports.RowSummaryService = RowSummaryService;

package/src/Utilities/Services/ValidationService.js

@@ -19,7 +19,7 @@ class ValidationService {
         }
         let editingRules = this.adaptableApi.alertApi.internalApi
             .getAlertDefinitionsWithPreventEdit()
-            .filter((v) => this.adaptableApi.scopeApi.isColumnInScope(cellDataChangedInfo.column, v.Scope));
+            .filter((v) => this.adaptableApi.columnScopeApi.isColumnInScope(cellDataChangedInfo.column, v.Scope));
         let failedValidations = [];
         if (ArrayExtensions_1.ArrayExtensions.IsNotEmpty(editingRules)) {
             editingRules.forEach((alertDefinition) => {
@@ -131,7 +131,7 @@ class ValidationService {
     }
     createValidationDescription(alertDefinition) {
         var _a, _b;
-        return (this.adaptableApi.scopeApi.getScopeDescription(alertDefinition.Scope) +
+        return (this.adaptableApi.columnScopeApi.getScopeDescription(alertDefinition.Scope) +
             ' ' +
             ((_b = (_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.map((predicate) => this.adaptableApi.predicateApi.predicateToString(predicate)).join(' AND ')));
     }

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,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapColumnDataTypeToExpressionFunctionType = void 0;
+const mapColumnDataTypeToExpressionFunctionType = (dataType) => {
+    if (dataType === 'Number') {
+        return 'number';
+    }
+    if (dataType === 'Boolean') {
+        return 'boolean';
+    }
+    if (dataType === 'String') {
+        return 'text';
+    }
+    if (dataType === 'Date') {
+        return 'date';
+    }
+};
+exports.mapColumnDataTypeToExpressionFunctionType = mapColumnDataTypeToExpressionFunctionType;

package/src/Utilities/license/decode.js

@@ -1,70 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decode = exports.fieldsToLicenseDetails = exports.GENERIC_APP_NAME = void 0;
-const hashing_1 = require("./hashing");
-const getGenericError = () => new Error('Invalid License');
-exports.GENERIC_APP_NAME = 'GenericAdaptableApp';
-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') || exports.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;
-};
-exports.fieldsToLicenseDetails = fieldsToLicenseDetails;
-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 ((0, hashing_1.compute_string)(field.value) !== fieldCrc) {
-            throw getGenericError();
-        }
-    });
-    const fieldsWithoutC = [...fields];
-    fieldsWithoutC.pop();
-    const fieldsWithoutCString = fieldsWithoutC
-        .map((field) => {
-        return `${field.name}=${field.value}`;
-    })
-        .join('|');
-    if ((0, hashing_1.compute_string)(fieldsWithoutCString) !== overallCrc) {
-        throw getGenericError();
-    }
-    fields = fields.map((f) => {
-        return Object.assign(Object.assign({}, f), { value: decodeURI(f.value) });
-    });
-    return (0, exports.fieldsToLicenseDetails)(fields);
-};
-exports.decode = decode;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.decode=exports.fieldsToLicenseDetails=exports.GENERIC_APP_NAME=void 0;const e=require("./hashing"),t=()=>new Error("Invalid License");exports.GENERIC_APP_NAME="GenericAdaptableApp";const r=e=>{var r;const s=e.reduce(((e,t)=>(e.set(t.name,t.value),e)),new Map),o={start:new Date(s.get("StartDate")),end:new Date(s.get("EndDate")),owner:s.get("Owner"),appName:s.get("AppName")||exports.GENERIC_APP_NAME,timestamp:s.get("TS")?Number(s.get("TS")):0,trial:"true"===s.get("Trial"),ref:null!==(r=s.get("Ref"))&&void 0!==r?r:""};if(!(o.start&&o.end&&o.owner&&"boolean"==typeof o.trial&&o.ref))throw t();return o};exports.fieldsToLicenseDetails=r;const s=r=>{let s="",o=r.split("|").map((e=>{let[t,r]=e.split("=");return"C"===t&&(s=r),{name:t,value:r}}));if(!s)throw t();const a=s.split(",").reverse(),n=a.pop();a.forEach(((r,s)=>{const a=o[s];if((0,e.compute_string)(a.value)!==r)throw t()}));const i=[...o];i.pop();const p=i.map((e=>`${e.name}=${e.value}`)).join("|");if((0,e.compute_string)(p)!==n)throw t();return o=o.map((e=>Object.assign(Object.assign({},e),{value:decodeURI(e.value)}))),(0,exports.fieldsToLicenseDetails)(o)};exports.decode=s;

package/src/Utilities/license/hashing.js

@@ -1,47 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.compute_string = void 0;
-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;
-}
-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}`;
-}
-exports.compute_string = compute_string;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.compute_string=void 0;const r=3988292384;function t(t=r){var e,n,o,u=new Array;for(e=0;e<256;e++){for(o=e,n=8;n>0;n--)1&~o?o>>>=1:o=o>>>1^t;u[e]=o}return u}function e(){return 4294967295}function n(r,t,e){return t=t>>>8^r[e^255&t]}function o(r){return r=(r=~r)<0?4294967295+r+1:r}function u(u,c=r){var i,f=t(c),s=0;for(s=e(),i=0;i<u.length;i++)s=n(f,s,u.charCodeAt(i));return`${s=o(s)}`}exports.compute_string=u;

package/src/View/AdaptableViewFactory.js

@@ -33,7 +33,7 @@ const StatusBarPopup_1 = require("./StatusBar/StatusBarPopup");
 const ChartingViewPanel_1 = require("./Charting/ChartingViewPanel");
 const GridFilterPopup_1 = require("./GridFilter/GridFilterPopup");
 const ColumnInfoPopup_1 = require("./ColumnInfo/ColumnInfoPopup");
-const NotesPopup_1 = require("./Notes/NotesPopup");
+const NotePopup_1 = require("./Note/NotePopup");
 const CommentsPopup_1 = require("./Comments/CommentsPopup");
 const DataImportPopup_1 = require("./DataImport/DataImportPopup");
 exports.AdaptableViewFactory = {
@@ -50,7 +50,7 @@ exports.AdaptableViewFactory = {
     ToolPanelPopup: ToolPanelPopup_1.ToolPanelPopup,
     SystemStatusPopup: SystemStatusPopup_1.SystemStatusPopup,
     DataChangeHistoryPopup: DataChangeHistoryPopup_1.DataChangeHistoryPopup,
-    NotesPopup: NotesPopup_1.NotesPopup,
+    NotePopup: NotePopup_1.NotePopup,
     CommentsPopup: CommentsPopup_1.CommentsPopup,
     DataImportPopup: DataImportPopup_1.DataImportPopup,
     GridFilterPopup: GridFilterPopup_1.GridFilterPopup,

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

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

package/src/View/Alert/AlertEntityRow.js

@@ -13,7 +13,7 @@ class AlertEntityRow extends React.Component {
         let alertDefinition = this.props.adaptableObject;
         let messageTypes = ['Info', 'Success', 'Warning', 'Error'];
         let colItems = (0, Helper_1.cloneObject)(this.props.colItems);
-        colItems[0].Content = (React.createElement(EntityRowItem_1.EntityRowItem, { Content: this.props.api.scopeApi.getScopeToString(alertDefinition.Scope) }));
+        colItems[0].Content = (React.createElement(EntityRowItem_1.EntityRowItem, { Content: this.props.api.columnScopeApi.getScopeToString(alertDefinition.Scope) }));
         colItems[1].Content = (React.createElement(EntityRowItem_1.EntityRowItem, { Content: this.props.api.alertApi.internalApi.getAlertRuleDescription(alertDefinition) }));
         colItems[2].Content = (React.createElement("div", null,
             React.createElement(DropdownButton_1.default, { showClearButton: false, items: messageTypes.map((item) => ({

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/Alert/Wizard/AlertScopeWizardSection.js

@@ -28,7 +28,7 @@ const AlertScopeWizardSection = (props) => {
                         Predicates: [{ PredicateId: 'AnyChange' }],
                     };
                 }
-                if (newData.Rule.ObservableExpression !== undefined && !api.scopeApi.scopeIsAll(Scope)) {
+                if (newData.Rule.ObservableExpression !== undefined && !api.columnScopeApi.scopeIsAll(Scope)) {
                     // if it had observable expression and the scope is changed to partial
                     // we need to reset to not be an observable expression, as observable is not supported
                     // for partial scope
@@ -36,7 +36,7 @@ const AlertScopeWizardSection = (props) => {
                     newData.Rule.BooleanExpression = '';
                 }
                 if (newData.Rule.AggregatedBooleanExpression !== undefined &&
-                    !api.scopeApi.scopeIsAll(Scope)) {
+                    !api.columnScopeApi.scopeIsAll(Scope)) {
                     // if it had aggregation expression and the scope is changed to partial
                     // we need to reset to not be an aggregation expression, as aggregation is not supported
                     // for partial scope

package/src/View/Alert/Wizard/BaseAlertScopeWizardSection.js

@@ -7,7 +7,7 @@ const rebass_1 = require("rebass");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const ValueSelector_1 = require("../../Components/ValueSelector");
 const renderScopeSummary = (data) => {
-    const { api: { scopeApi }, } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    const { api: { columnScopeApi: scopeApi }, } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const columnsInScope = scopeApi.getColumnsForScope(data.Scope);
     return (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Box, null,

package/src/View/BulkUpdate/BulkUpdatePopup.js

@@ -54,7 +54,7 @@ class BulkUpdatePopupComponent extends React.Component {
                     React.createElement(SimpleButton_1.default, { disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(this.props.BulkUpdateValue) ||
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All', onClick: () => {
                             this.onApplyClick();
-                        }, variant: "raised", tone: "accent" }, "Apply to Grid")))) : (React.createElement(React.Fragment, null,
+                        }, variant: "raised", tone: "accent" }, "Apply Bulk Update")))) : (React.createElement(React.Fragment, null,
                 React.createElement(HelpBlock_1.default, { marginTop: 2, marginBottom: 2 }, "Select an existing Column value from the dropdown, or enter a new value"),
                 React.createElement(rebass_1.Flex, { marginTop: 2, flexDirection: "row", alignItems: "center" },
                     React.createElement(rebass_1.Flex, { alignItems: "center", flexDirection: "row", flex: 1, marginRight: 2 },
@@ -63,7 +63,7 @@ class BulkUpdatePopupComponent extends React.Component {
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All' ||
                             hasDataTypeError, variant: "raised", tone: "accent", marginRight: 2, onClick: () => {
                             this.onApplyClick();
-                        } }, "Apply to Grid"),
+                        } }, "Apply Bulk Update"),
                     ' ',
                     hasDataTypeError && (React.createElement(AdaptablePopover_1.AdaptablePopover, { headerText: 'Update Error', bodyText: [dataTypeErrorMessage], MessageType: 'Error' })),
                     StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.props.BulkUpdateValue) &&

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

@@ -37,10 +37,10 @@ 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 (0, Helper_1.cloneObject)(calculatedColumn);
             }
         }
-        return ObjectFactory_1.default.CreateEmptyCalculatedColumn();
+        return ObjectFactory_1.default.CreateEmptyCalculatedColumn(adaptable.api.gridApi.internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef());
     });
     const dispatch = (0, react_redux_1.useDispatch)();
     const isEdit = Boolean(props.data) || ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit';
@@ -55,7 +55,7 @@ const CalculatedColumnWizard = (props) => {
     };
     const [expressionType, setExpressionType] = (0, react_1.useState)(() => {
         var _a;
-        return (_a = (0, utils_1.getExpressionType)(props.data, adaptable.api)) !== null && _a !== void 0 ? _a : 'ScalarExpression';
+        return (_a = (0, utils_1.getExpressionType)(calculatedColumn, adaptable.api)) !== null && _a !== void 0 ? _a : 'ScalarExpression';
     });
     const handleExpressionTypeChange = (type) => {
         setExpressionType(type);

package/src/View/ColumnInfo/ColumnInfo.js

@@ -136,7 +136,7 @@ const ModuleView = (props) => {
         var _a;
         if ('Scope' in item.abObject) {
             const abColumn = adaptable.api.columnApi.getColumnWithColumnId(props.selectedColumnId);
-            return adaptable.api.scopeApi.isColumnInScope(abColumn, item.abObject.Scope);
+            return adaptable.api.columnScopeApi.isColumnInScope(abColumn, item.abObject.Scope);
         }
         if ('ColumnId' in item.abObject) {
             return ((_a = item.abObject) === null || _a === void 0 ? void 0 : _a.ColumnId) === props.selectedColumnId;

package/src/View/Comments/CommentsEditor.js

@@ -28,6 +28,7 @@ const CommentsEditor = (props) => {
         return adaptable.api.optionsApi.getUserName();
     }, []);
     const commentThread = (0, react_redux_1.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.
@@ -39,12 +40,23 @@ 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_1.default, { color: "var(--ab-color-text-on-primary)", onClick: () => props.enableEditMode(), minWidth: 250 },
-        comments &&
+    return (React.createElement(Panel_1.default, { color: "var(--ab-color-text-on-primary)", onClick: () => props.enableEditMode(), minWidth: 250, className: "ab-CommentPopup" },
+        React.createElement(rebass_1.Flex, { style: {
+                overflow: 'auto',
+                maxHeight: 300,
+            }, flexDirection: "column", ref: commentsWrapperRef }, comments &&
             comments.length > 0 &&
             comments.map((comment, index) => {
                 var _a, _b, _c, _d;
@@ -54,30 +66,28 @@ 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(rebass_1.Box, { p: 2, key: (_c = comment.Uuid) !== null && _c !== void 0 ? _c : index, style: {
-                        borderBottom: '1px solid var(--ab-color-primarydark)',
-                    } },
+                return (React.createElement(rebass_1.Box, { p: 2, key: (_c = comment.Uuid) !== null && _c !== void 0 ? _c : index, className: "ab-Comment" },
                     React.createElement(rebass_1.Flex, { mb: 2, alignItems: "center" },
                         React.createElement(rebass_1.Box, null,
-                            React.createElement(rebass_1.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(rebass_1.Box, { fontSize: 2 }, (0, dateUtils_1.formatDate)(comment.Timestamp, 'MM.DD.YYYY HH:mm')))),
+                            React.createElement(rebass_1.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(rebass_1.Box, { "data-name": "comment-timestamp", fontSize: 2 }, (0, dateUtils_1.formatDate)(comment.Timestamp, 'MM.DD.YYYY HH:mm')))),
                         React.createElement(rebass_1.Box, { flex: 1 }),
-                        React.createElement(SimpleButton_1.default, { variant: "text", icon: "edit", disabled: !isOwnComment, onClick: () => setActiveEditingComment(comment.Uuid) }),
-                        React.createElement(SimpleButton_1.default, { variant: "text", icon: "delete", disabled: !isOwnComment, onClick: () => {
+                        React.createElement(SimpleButton_1.default, { variant: "text", icon: "edit", disabled: !isOwnComment || isReadOnlyModule, onClick: () => setActiveEditingComment(comment.Uuid) }),
+                        React.createElement(SimpleButton_1.default, { variant: "text", icon: "delete", disabled: !isOwnComment || isReadOnlyModule, onClick: () => {
                                 adaptable.api.commentApi.deleteComment(comment, cellAddress);
                                 requestAnimationFrame(() => {
                                     props.onRefreshContent();
                                 });
                             } })),
-                    React.createElement(rebass_1.Box, { onClick: () => setActiveEditingComment(comment.Uuid) }, comment.Uuid === activeEditingComment ? (React.createElement(AdaptableInput_1.default, { autoFocus: true, width: "100%", defaultValue: comment.Value, onBlur: () => {
+                    React.createElement(rebass_1.Box, { onClick: () => setActiveEditingComment(comment.Uuid) }, comment.Uuid === activeEditingComment ? (React.createElement(AdaptableInput_1.default, { 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(rebass_1.Text, null, comment.Value)))));
-            }),
-        React.createElement(AdaptableInput_1.default, { autoFocus: !comments || comments.length === 0, value: newCommentText, onChange: (event) => {
+                        } })) : (React.createElement(rebass_1.Text, { "data-name": "comment-text" }, comment.Value)))));
+            })),
+        React.createElement(AdaptableInput_1.default, { autoFocus: !comments || comments.length === 0, value: newCommentText, disabled: isReadOnlyModule, onChange: (event) => {
                 setNewCommentText(event.target.value);
             }, onKeyDown: (event) => {
                 if (event.key === 'Enter') {
@@ -85,16 +95,17 @@ 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_1.default, { width: "100%", variant: "raised", onClick: () => {
-                adaptable.api.settingsPanelApi.openSettingsPanel('Comments');
+                adaptable.api.settingsPanelApi.openSettingsPanel('Comment');
                 adaptable.api.internalApi.getCellPopupService().hidePopup();
             } },
             React.createElement(rebass_1.Box, { mr: 2 },
                 React.createElement(icons_1.Icon, { name: "folder" })),
             ' ',
-            "Open all comments")));
+            "Open all Comments")));
 };
 exports.CommentsEditor = CommentsEditor;

package/src/View/Comments/CommentsPopup.js

@@ -7,10 +7,11 @@ const react_redux_1 = require("react-redux");
 const InfiniteTable_1 = require("../../components/InfiniteTable");
 const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
 const rebass_1 = require("rebass");
-const dateUtils_1 = require("../../Utilities/ExpressionFunctions/dateUtils");
+const format_1 = tslib_1.__importDefault(require("date-fns/format"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
+const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const tableDOMProps = {
     style: {
         minHeight: 160,
@@ -18,7 +19,10 @@ const tableDOMProps = {
     },
 };
 const CellComments = (props) => {
+    var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const dateFormat = (_a = adaptable.api.optionsApi.getCommentOptions().dateFormat) !== null && _a !== void 0 ? _a : GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME;
+    const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Comment') === 'ReadOnly';
     const columnsMap = React.useMemo(() => {
         const columns = {
             author: {
@@ -30,7 +34,7 @@ const CellComments = (props) => {
                 field: 'Timestamp',
                 maxWidth: 150,
                 valueGetter: (params) => {
-                    return (0, dateUtils_1.formatDate)(params.data.Timestamp, 'MM.DD.YYYY HH:mm');
+                    return (0, format_1.default)(params.data.Timestamp, dateFormat);
                 },
             },
             text: {
@@ -49,14 +53,18 @@ const CellComments = (props) => {
     const columnFriendlyName = adaptable.api.columnApi.getFriendlyNameForColumnId(props.commentThread.ColumnId);
     return (React.createElement(Panel_1.default, { mb: 2, header: React.createElement(rebass_1.Flex, { width: "100%", alignItems: "center" },
             React.createElement(rebass_1.Box, { mr: 2 },
-                "Cell Value: ",
+                React.createElement("b", null, "Cell Value:"),
+                " ",
                 cellValue),
             React.createElement(rebass_1.Box, { mr: 2 },
-                primaryKeyHeader,
-                ": ",
+                React.createElement("b", null,
+                    primaryKeyHeader,
+                    ":"),
+                " ",
                 props.commentThread.PrimaryKeyValue),
             React.createElement(rebass_1.Box, null,
-                "Column: ",
+                React.createElement("b", null, "Column:"),
+                " ",
                 columnFriendlyName),
             React.createElement(rebass_1.Box, { flex: 1 }),
             React.createElement(AdaptableButton_1.AdaptableButtonComponent, { mr: 1, variant: "text", icon: "visibility-on", onClick: () => {
@@ -65,7 +73,7 @@ const CellComments = (props) => {
                         PrimaryKeyValue: props.commentThread.PrimaryKeyValue,
                     }, true);
                 } }),
-            React.createElement(AdaptableButton_1.AdaptableButtonComponent, { icon: "delete", variant: "text", onClick: () => {
+            React.createElement(AdaptableButton_1.AdaptableButtonComponent, { icon: "delete", disabled: isReadOnlyModule, variant: "text", onClick: () => {
                     adaptable.api.commentApi.deleteCommentThread(props.commentThread);
                 } })) },
         React.createElement(InfiniteTable_1.DataSource, { data: props.commentThread.Comments, primaryKey: "Uuid" },