@adaptabletools/adaptable-cjs 18.0.0-canary.18 → 18.0.0-canary.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "18.0.0-canary.18",
+  "version": "18.0.0-canary.19",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -134,11 +134,11 @@ export interface AdaptableOptions<TData = any> {
      */
     containerOptions?: ContainerOptions;
     /**
-     * Options for managing Notes
+     * Options for managing personal Notes
      */
     noteOptions?: NoteOptions;
     /**
-     * Options for managing AdapTable Comments
+     * Options for managing collaborative Comments
      */
     commentOptions?: CommentOptions<TData>;
     /**

package/src/AdaptableOptions/CommentOptions.d.ts

@@ -1,18 +1,18 @@
-import { CommentThread, BaseContext, CellAddress } from '../../types';
+import { CommentThread, BaseContext, GridCell } from '../types';
 /**
  * Options for managing Comments and Comment Threads in AdapTable
  */
 export interface CommentOptions<TData = any> {
     /**
-     * Whether a cell can be receive Comments
+     * Whether a cell can contain Comments
      */
     isCellCommentable?: (commentableCellContext: CommentableCellContext) => boolean;
     /**
-     * Loads initial Comments
+     * Loads Comments
      */
     loadCommentThreads?(commentLoadContext: CommentLoadContext): Promise<CommentThread[]>;
     /**
-     * Called when Comments change
+     * Called when Comments change and need to be saved
      * @param commentThreads
      */
     persistCommentThreads?(commentThreads: CommentThread[]): void;
@@ -22,9 +22,12 @@ export interface CommentOptions<TData = any> {
  */
 export interface CommentableCellContext extends BaseContext {
     /**
-     * Cell in AdapTable which might receive a Comment
+     * Grid Cell in AdapTable which has been clicked
      */
-    cellAddress: CellAddress;
+    gridCell: GridCell;
 }
+/**
+ * Context used when loading Comments
+ */
 export interface CommentLoadContext extends BaseContext {
 }

package/src/AdaptableOptions/GroupingOptions.d.ts

@@ -4,13 +4,6 @@ import { KeyCreatorParams } from '@ag-grid-community/core';
  * Options for managing Row and Column Groups in AdapTable
  */
 export interface GroupingOptions<TData = any> {
-    /**
-     * Show aggregated totals row at top of Grid when row grouping
-     *
-     * @defaultValue false
-     * @gridInfoItem
-     */
-    showGroupingTotalsAsHeader?: boolean;
     /**
     * Value to use for 'Balanced Groups' (string columns only)
     */

package/src/AdaptableOptions/NoteOptions.d.ts

@@ -1,4 +1,4 @@
-import { BaseContext, CellAddress } from '../../types';
+import { BaseContext, GridCell } from '../../types';
 /**
  * Options for managing AdapTable Notes
  */
@@ -13,7 +13,7 @@ export interface NoteOptions<TData = any> {
  */
 export interface NotableCellContext extends BaseContext {
     /**
-     * Cell which should contain the Note
-     */
-    address: CellAddress;
+      * Grid Cell in AdapTable which has been clicked
+      */
+    gridCell: GridCell;
 }

package/src/Api/Events/GridDataChanged.d.ts

@@ -13,7 +13,7 @@ export type GridDataChangeTrigger = 'Add' | 'Edit' | 'Delete' | 'Load';
      */
     dataRows: TData[];
     /**
-     * Trigger for row change: 'Add', 'Edit', 'Delete', 'Load'
+     * Trigger for row change: Load, Add, Edit, or Delete
      */
     rowTrigger: GridDataChangeTrigger;
     /**

package/src/Api/Implementation/ApiBase.d.ts

@@ -7,7 +7,7 @@ import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
-import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ColumnFilterApi, ColumnFilterOptions, ColumnOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, GroupingOptions, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, NamedQueryApi, NoteOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions } from '../../types';
+import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ColumnFilterApi, ColumnFilterOptions, ColumnOptions, CommentOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, GroupingOptions, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, NamedQueryApi, NoteOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions } from '../../types';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 export declare abstract class ApiBase {
     protected adaptable: IAdaptable;
@@ -53,6 +53,7 @@ export declare abstract class ApiBase {
     protected getActionColumnOptions(): ActionColumnOptions;
     protected getActionRowOptions(): ActionRowOptions;
     protected getColumnOptions(): ColumnOptions;
+    protected getCommentOptions(): CommentOptions;
     protected getNoteOptions(): NoteOptions;
     protected getCustomSortOptions(): CustomSortOptions;
     protected getDataSetOptions(): DataSetOptions;

package/src/Api/Implementation/ApiBase.js

@@ -105,6 +105,9 @@ class ApiBase {
     getColumnOptions() {
         return this.getOptions().columnOptions;
     }
+    getCommentOptions() {
+        return this.getOptions().commentOptions;
+    }
     getNoteOptions() {
         return this.getOptions().noteOptions;
     }

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

@@ -49,6 +49,7 @@ export declare class ColumnFilterInternalApi extends ApiBase {
      * Fires Column Filter Applied Event - typically used to enable filtering on the server
      */
     fireColumnFilterAppliedEvent(): void;
+    fireGridFilterAppliedEvent(): void;
     /**
      * Compares to sets of Column Filters to see if they are identical
      * @param filters1

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -186,6 +186,18 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
             this.adaptable.api.eventApi.emit('ColumnFilterApplied', columnFilterAppliedInfo);
         }
     }
+    fireGridFilterAppliedEvent() {
+        if (this.adaptable.isReady) {
+            const adaptableApi = this.getAdaptableApi();
+            const gridFilterAppliedInfo = {
+                columnFilters: this.getColumnFilterApi().getColumnFilters(),
+                adaptableApi: adaptableApi,
+                userName: adaptableApi.optionsApi.getUserName(),
+                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
+            };
+            this.adaptable.api.eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
+        }
+    }
     /**
      * Compares to sets of Column Filters to see if they are identical
      * @param filters1

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

@@ -7,11 +7,7 @@ export interface DataUpdateConfig {
      */
     runAsync?: boolean;
     /**
-     * Whether to flush async updates.
-     *
-     * If `true`, any async transactions will be flushed.
-     * This flag can be true even if you runAsync is `false`.
-     * So even if the currenct transaction/operation is synchronous, this will flush existing async transactions.
+     * Whether to flush async updates
      */
     flushAsync?: boolean;
     /**

package/src/PredefinedConfig/NoteState.d.ts

@@ -16,7 +16,7 @@ export interface AdaptableNote extends AdaptableObject {
     /**
      * When Note was made
      */
-    Timestamp: number;
+    Timestamp?: number;
     /**
      * Content of the Note
      */

package/src/Redux/Store/AdaptableStore.js

@@ -796,17 +796,27 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case LayoutRedux.LAYOUT_GRID_FILTER_CLEAR:
                 case LayoutRedux.LAYOUT_GRID_FILTER_SUSPEND:
                 case LayoutRedux.LAYOUT_GRID_FILTER_UNSUSPEND: {
-                    setTimeout(() => adaptable.applyGridFiltering(), 5);
-                    adaptable.api.gridFilterApi.internalApi.fireGridFilterAppliedEvent();
-                    adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, null, middlewareAPI.getState().Layout);
                     const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
                     let returnAction;
+                    // - calls GridFilterApplied - examples
+                    adaptable.api.gridFilterApi.internalApi.fireGridFilterAppliedEvent();
+                    // - layout change event, row summary is triggered
+                    adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, null, middlewareAPI.getState().Layout);
+                    setTimeout(() => {
+                        // - agGridApi.onFilterChanged
+                        // - internal 'AdapTableFiltersApplied' event - evaluates row summary
+                        // - refresh selected cells and rows
+                        adaptable.applyGridFiltering();
+                    }, 5);
                     if (((_h = adaptable.adaptableOptions.layoutOptions) === null || _h === void 0 ? void 0 : _h.autoSaveLayouts) &&
                         !currentLayout.IsReadOnly) {
-                        returnAction = action;
+                        return next(action);
                     }
                     else {
-                        // This is different to what we do with column filters?
+                        if (!middlewareAPI.getState().Grid.CurrentLayout) {
+                            const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
+                            middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
+                        }
                         switch (action.type) {
                             case LayoutRedux.LAYOUT_GRID_FILTER_SET:
                                 returnAction = GridRedux.LayoutDraftGridFilterSet(Object.assign(Object.assign({}, currentLayout.GridFilter), { Expression: action.gridFilter }));

package/src/Strategy/CommentModule.js

@@ -8,13 +8,12 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.CommentModuleId, ModuleConstants.CommentFriendlyName, 'comments', 'CommentsPopup', 'comments', api);
-        this.adaptable = api.internalApi.getAdaptableInstance();
     }
     onAdaptableReady() {
         this.loadComments();
     }
     isModuleAvailable() {
-        const options = this.adaptable.api.optionsApi.getCommentOptions();
+        const options = this.api.optionsApi.getCommentOptions();
         if (!options || !options.persistCommentThreads || !options.loadCommentThreads) {
             return false;
         }
@@ -26,7 +25,7 @@ class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     async loadComments() {
         var _a, _b;
         const commentThreads = await ((_b = (_a = this.api.optionsApi
-            .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.loadCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+            .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.loadCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, (0, ObjectFactory_1.createBaseContext)(this.api)));
         this.api.commentApi.loadCommentThreads(commentThreads);
     }
     addContextMenuItems(menuContext) {
@@ -35,17 +34,9 @@ class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return undefined;
         }
         const items = [];
-        const isCellCommentable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
+        const isCellCommentable = (_b = (_a = this.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
         if (!isCellCommentable ||
-            isCellCommentable({
-                adaptableApi: this.adaptable.api,
-                cellAddress: {
-                    PrimaryKeyValue: menuContext.primaryKeyValue,
-                    ColumnId: menuContext.adaptableColumn.columnId,
-                },
-                userName: this.adaptable.api.optionsApi.getUserName(),
-                adaptableId: this.adaptable.adaptableOptions.adaptableId,
-            })) {
+            isCellCommentable(Object.assign({ gridCell: menuContext.gridCell }, (0, ObjectFactory_1.createBaseContext)(this.api)))) {
             items.push(...this.getAddRemoveCommentsMenuItems(menuContext));
         }
         return items;
@@ -57,7 +48,7 @@ class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             PrimaryKeyValue: menuContext.primaryKeyValue,
             ColumnId: menuContext.adaptableColumn.columnId,
         };
-        const comments = this.adaptable.api.commentApi.getComments(cellAddress);
+        const comments = this.api.commentApi.getComments(cellAddress);
         if (!this.api.commentApi.internalApi.areCommentsAvailable()) {
             return items;
         }

package/src/Strategy/NoteModule.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NoteModule = void 0;
 const tslib_1 = require("tslib");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
+const ObjectFactory_1 = require("../Utilities/ObjectFactory");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 class NoteModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
@@ -18,18 +19,14 @@ class NoteModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!this.isModuleAvailable()) {
             return undefined;
         }
+        const isReadOnly = this.adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName) === 'ReadOnly';
+        if (isReadOnly) {
+            return undefined;
+        }
         const items = [];
         const isCellNotable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable;
         if (!isCellNotable ||
-            isCellNotable({
-                adaptableApi: this.adaptable.api,
-                address: {
-                    PrimaryKeyValue: menuContext.primaryKeyValue,
-                    ColumnId: menuContext.adaptableColumn.columnId,
-                },
-                userName: this.adaptable.api.optionsApi.getUserName(),
-                adaptableId: this.adaptable.adaptableOptions.adaptableId,
-            }))
+            isCellNotable(Object.assign({ gridCell: menuContext.gridCell }, (0, ObjectFactory_1.createBaseContext)(this.api))))
             items.push(...this.getAddRemoveNoteMenuItems(menuContext));
         return items;
     }

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.
@@ -62,14 +63,14 @@ const CommentsEditor = (props) => {
                             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, { 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);
                             }
@@ -77,7 +78,7 @@ const CommentsEditor = (props) => {
                             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(AdaptableInput_1.default, { autoFocus: !comments || comments.length === 0, value: newCommentText, disabled: isReadOnlyModule, onChange: (event) => {
                 setNewCommentText(event.target.value);
             }, onKeyDown: (event) => {
                 if (event.key === 'Enter') {
@@ -87,7 +88,7 @@ const CommentsEditor = (props) => {
                         props.onRefreshContent();
                     });
                 }
-            }, 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('Comment');
                 adaptable.api.internalApi.getCellPopupService().hidePopup();
@@ -95,6 +96,6 @@ const CommentsEditor = (props) => {
             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

@@ -19,6 +19,7 @@ const tableDOMProps = {
 };
 const CellComments = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Comment') === 'ReadOnly';
     const columnsMap = React.useMemo(() => {
         const columns = {
             author: {
@@ -69,7 +70,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" },

package/src/View/Components/Selectors/PermittedValuesSelector.js

@@ -68,6 +68,6 @@ const PermittedValuesSelector = function (props) {
             handleSingleValueChange(value);
         }
     };
-    return (React.createElement(Select_1.Select, { isMulti: props.isMulti, className: props.className, disabled: props.disabled, "data-name": "permitted-values-selector", placeholder: props.placeholder || (props.allowNewValues ? 'Select or type new value' : 'Select value'), isCreatable: isCreatable, isClearable: true, options: options, isLoding: isLoading, onInputChange: setFilter, onChange: handleOnChange, value: props.value }));
+    return (React.createElement(Select_1.Select, { isMulti: props.isMulti, className: props.className, disabled: props.disabled, "data-name": "permitted-values-selector", placeholder: props.placeholder || (props.allowNewValues ? 'Select or type new value' : 'Select value'), isCreatable: isCreatable, isClearable: true, options: options, isLoading: isLoading, onInputChange: setFilter, onChange: handleOnChange, value: props.value }));
 };
 exports.PermittedValuesSelector = PermittedValuesSelector;

package/src/View/Note/NotePopup.js

@@ -20,6 +20,7 @@ const NotePopup = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const primaryKeyHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
     const allNotes = (0, react_redux_1.useSelector)((state) => (0, NoteRedux_1.GetAllNotesSelector)(state.Note));
+    const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Note') === 'ReadOnly';
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -36,19 +37,20 @@ const NotePopup = (props) => {
             text: {
                 field: 'Text',
                 header: 'Text',
-                defaultEditable: true,
+                defaultEditable: !isReadOnlyModule,
                 defaultFlex: 3,
             },
             timestamp: {
                 field: 'Timestamp',
                 valueGetter: (params) => {
-                    return new Date(params.data.Timestamp).toDateString();
+                    var _a;
+                    return (_a = new Date(params.data.Timestamp)) === null || _a === void 0 ? void 0 : _a.toDateString();
                 },
             },
             delete: {
                 defaultWidth: 50,
                 render: (params) => {
-                    return (React.createElement(AdaptableButton_1.AdaptableButtonComponent, { variant: "text", icon: "delete", onClick: () => {
+                    return (React.createElement(AdaptableButton_1.AdaptableButtonComponent, { disabled: isReadOnlyModule, variant: "text", icon: "delete", onClick: () => {
                             const note = adaptable.api.noteApi.getNoteByUuid(params.data.Uuid);
                             adaptable.api.noteApi.deleteNote(note);
                         } }));

package/src/agGrid/AdaptableAgGrid.js

@@ -1443,26 +1443,6 @@ class AdaptableAgGrid {
             this.onSortChanged();
             this.debouncedSetSelectedCells();
         }));
-        const showGroupingTotalsAsHeader = this.adaptableOptions.groupingOptions.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)
-         */
-        this.agGridAdapter.getAgGridApi().addEventListener(core_1.Events.EVENT_MODEL_UPDATED, (this.listenerModelUpdated = (params) => {
-            if (showGroupingTotalsAsHeader) {
-                if (params && params.api) {
-                    const pinnedData = params.api.getPinnedTopRow(0);
-                    const model = params.api.getModel();
-                    const rootNode = model.getRootNode();
-                    if (!pinnedData) {
-                        params.api.setPinnedTopRowData([rootNode.aggData]);
-                    }
-                    else {
-                        pinnedData.updateData(rootNode.aggData);
-                    }
-                }
-            }
-        }));
         const eventsThatTriggerChartingChanges = [
             core_1.Events.EVENT_CHART_CREATED,
             /** Chart Range selection has changed */

package/src/agGrid/defaultAdaptableOptions.js

@@ -148,7 +148,6 @@ const DefaultAdaptableOptions = {
     customSortOptions: { customSortComparers: undefined },
     dataSetOptions: { dataSets: GeneralConstants_1.EMPTY_ARRAY },
     groupingOptions: {
-        showGroupingTotalsAsHeader: false,
         balancedGroupsKey: undefined,
         restoreUngroupedColumns: false,
         autoOrderGroupedColumns: true,

package/src/components/Select/Select.d.ts

@@ -21,7 +21,7 @@ export type SelectProps<SelectValue extends unknown, IsMulti extends boolean = f
     'data-id'?: string;
     renderSingleValue?: (option: SelectOption<SelectValue>) => React.ReactNode;
     className?: string;
-    isLoding?: boolean;
+    isLoading?: boolean;
     onFocus?: () => void;
     accessLevel?: AccessLevel;
     style?: React.CSSProperties;

package/src/components/Select/Select.js

@@ -84,7 +84,7 @@ const Select = function (props) {
                 React.createElement(icons_1.Icon, { name: "triangle-down", style: { height: 20, width: 20 } })));
         };
     }, []);
-    return (React.createElement(SelectComponent, { onInputChange: props.onInputChange, onFocus: props.onFocus, isLoading: props.isLoding, options: props.options, className: props.className, isDisabled: disabled, menuPlacement: (_g = props.menuPlacement) !== null && _g !== void 0 ? _g : 'auto', isSearchable: props.searchable, isMulti: props.isMulti, value: selectedOption, menuPosition: (_h = props.menuPosition) !== null && _h !== void 0 ? _h : 'absolute', 
+    return (React.createElement(SelectComponent, { onInputChange: props.onInputChange, onFocus: props.onFocus, isLoading: props.isLoading, options: props.options, className: props.className, isDisabled: disabled, menuPlacement: (_g = props.menuPlacement) !== null && _g !== void 0 ? _g : 'auto', isSearchable: props.searchable, isMulti: props.isMulti, value: selectedOption, menuPosition: (_h = props.menuPosition) !== null && _h !== void 0 ? _h : 'absolute', 
         // This needed so the menu is not clipped by overflow: hidden
         menuPortalTarget: document.body, isClearable: props.isClearable, onChange: (option) => {
             if (props.isMulti) {

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1711631076312 || Date.now(),
-    VERSION: "18.0.0-canary.18" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1711969937271 || Date.now(),
+    VERSION: "18.0.0-canary.19" || '--current-version--',
 };

package/src/metamodel/adaptable.metamodel.d.ts

@@ -595,11 +595,17 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: {
+        props: ({
             name: string;
             kind: string;
             desc: string;
-        }[];
+            isOpt?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+        })[];
     };
     AdaptableNotes: {
         name: string;
@@ -1959,6 +1965,11 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         }[];
     };
+    CommentLoadContext: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     CommentOptions: {
         name: string;
         kind: string;
@@ -3644,14 +3655,6 @@ export declare const ADAPTABLE_METAMODEL: {
             noCode: string;
             defVal: string;
             gridInfo?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            gridInfo: string;
-            defVal: string;
-            noCode?: undefined;
         })[];
     };
     HandleFdc3Context: {