@adaptabletools/adaptable 18.0.0-canary.17 → 18.0.0-canary.19

package/src/Strategy/StyledColumnModule.js

@@ -45,6 +45,9 @@ export class StyledColumnModule extends AdaptableModuleBase {
                         styledColumn = Object.assign(Object.assign({}, ObjectFactory.CreateEmptyStyledColumn()), { ColumnId: column.columnId, SparkLineStyle: {} });
                     }
                     let label = hasSparklineStyle ? 'Edit ' : 'Create ';
+                    let name = hasSparklineStyle
+                        ? 'styled-column-sparkline-edit'
+                        : 'styled-column-sparkline-add';
                     let popupParam = {
                         action: sparklineColumnExists ? 'Edit' : 'New',
                         source: 'ColumnMenu',
@@ -53,7 +56,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                             defaultCurrentSectionName: 'Settings',
                         },
                     };
-                    returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('styled-column-sparkline', label + 'Sparkline Column', this.moduleInfo.Popup, this.getGlyphForStyledColumn(styledColumn), popupParam));
+                    returnColumnMenuItems.push(this.createMenuItemShowPopup(name, label + 'Sparkline Column', this.moduleInfo.Popup, this.getGlyphForStyledColumn(styledColumn), popupParam));
                 }
             }
             // Next do non sparkline
@@ -79,7 +82,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                         const icon = this.getGlyphForStyledColumn(styledColumn);
                         const label = `Edit ${this.getTypeLabel(styledColumn)} Style`;
                         const name = this.getTypeName(styledColumn);
-                        returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(name, label, this.moduleInfo.Popup, icon, popupParam));
+                        returnColumnMenuItems.push(this.createMenuItemShowPopup(name, label, this.moduleInfo.Popup, icon, popupParam));
                     }
                 }
                 else {
@@ -91,7 +94,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                         config: {},
                     };
                     const badgeLabel = column.dataType === 'Number' ? 'Badge' : 'Create Badge Style';
-                    const newBadgeButton = this.createColumnMenuItemShowPopup('styled-column-badge', badgeLabel, this.moduleInfo.Popup, 'badge', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { BadgeStyle: {
+                    const newBadgeButton = this.createMenuItemShowPopup('styled-column-badge-add', badgeLabel, this.moduleInfo.Popup, 'badge', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { BadgeStyle: {
                                 Badges: [ObjectFactory.CreateDefaultStyledColumnBadge()],
                             } }), config: {
                             defaultCurrentSectionName: 'Badges',
@@ -103,18 +106,18 @@ export class StyledColumnModule extends AdaptableModuleBase {
                             const emptyRanges = this.api.scopeApi.createCellColorRangesForScope({
                                 ColumnIds: [column.columnId],
                             });
-                            const newGrandientButton = this.createColumnMenuItemShowPopup('styled-column-gradient', 'Gradient', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
+                            const newGrandientButton = this.createMenuItemShowPopup('styled-column-gradient-add', 'Gradient', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
                                         CellRanges: emptyRanges,
                                     } }), config: {
                                     defaultCurrentSectionName: 'Style',
                                 } }));
-                            const newPrecentBarButton = this.createColumnMenuItemShowPopup('styled-column-percent-bar', 'Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
+                            const newPrecentBarButton = this.createMenuItemShowPopup('styled-column-percent-bar-add', 'Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
                                         CellRanges: emptyRanges,
                                     } }), config: {
                                     defaultCurrentSectionName: 'Style',
                                 } }));
                             returnColumnMenuItems.push({
-                                name: 'styled-column',
+                                name: 'parent',
                                 label: 'Create Styled Column',
                                 module: this.moduleInfo.ModuleName,
                                 isVisible: true,
@@ -235,16 +238,16 @@ export class StyledColumnModule extends AdaptableModuleBase {
     getTypeName(styledColumn) {
         let type = null;
         if (styledColumn.GradientStyle) {
-            type = 'styled-column-gradient';
+            type = 'styled-column-gradient-edit';
         }
         else if (styledColumn.PercentBarStyle) {
-            type = 'styled-column-percent-bar';
+            type = 'styled-column-percent-bar-edit';
         }
         else if (styledColumn.SparkLineStyle) {
-            type = 'styled-column-sparkline';
+            type = 'styled-column-sparkline-edit';
         }
         else if (styledColumn.BadgeStyle) {
-            type = 'styled-column-badge';
+            type = 'styled-column-badge-edit';
         }
         return type;
     }

package/src/Strategy/SystemStatusModule.js

@@ -8,7 +8,7 @@ export class SystemStatusModule extends AdaptableModuleBase {
     addColumnMenuItems(column) {
         if (this.isModuleAvailable()) {
             return [
-                this.createColumnMenuItemShowPopup('system-status-show', 'Show System Status', this.moduleInfo.Popup, this.moduleInfo.Glyph),
+                this.createMenuItemShowPopup('system-status-show', 'Show System Status', this.moduleInfo.Popup, this.moduleInfo.Glyph),
             ];
         }
     }

package/src/Utilities/MenuItem.d.ts

@@ -1,11 +1,11 @@
 import * as Redux from 'redux';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableMenuItem, AdaptableMenuItemName } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, AdaptableContextMenuItemName, AdaptableColumnMenuItemName } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { AdaptableIcon, AdaptableSystemIconName } from '../PredefinedConfig/Common/AdaptableIcon';
 export declare class MenuItemDoReduxAction implements AdaptableMenuItem {
-    constructor(name: AdaptableMenuItemName, label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
-    name: AdaptableMenuItemName;
+    constructor(name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName, label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
+    name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName;
     reduxAction: Redux.Action;
     label: string;
     module: AdaptableModule;
@@ -13,8 +13,8 @@ export declare class MenuItemDoReduxAction implements AdaptableMenuItem {
     icon: AdaptableIcon;
 }
 export declare class MenuItemDoClickFunction implements AdaptableMenuItem {
-    constructor(name: AdaptableMenuItemName, label: string, module: AdaptableModule, clickFunction: () => void, icon: AdaptableSystemIconName, isVisible: boolean);
-    name: AdaptableMenuItemName;
+    constructor(name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName, label: string, module: AdaptableModule, clickFunction: () => void, icon: AdaptableSystemIconName, isVisible: boolean);
+    name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName;
     onClick: () => void;
     label: string;
     module: AdaptableModule;
@@ -22,8 +22,8 @@ export declare class MenuItemDoClickFunction implements AdaptableMenuItem {
     icon: AdaptableIcon;
 }
 export declare class MenuItemShowPopup implements AdaptableMenuItem {
-    constructor(name: AdaptableMenuItemName, label: string, module: AdaptableModule, componentName: string, icon: AdaptableSystemIconName, isVisible: boolean, popupParams?: ModuleParams);
-    name: AdaptableMenuItemName;
+    constructor(name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName, label: string, module: AdaptableModule, componentName: string, icon: AdaptableSystemIconName, isVisible: boolean, popupParams?: ModuleParams);
+    name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName;
     reduxAction: Redux.Action;
     label: string;
     module: AdaptableModule;

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.
@@ -58,14 +59,14 @@ export const CommentsEditor = (props) => {
                             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, { 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);
                             }
@@ -73,7 +74,7 @@ export const CommentsEditor = (props) => {
                             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(AdaptableInput, { autoFocus: !comments || comments.length === 0, value: newCommentText, disabled: isReadOnlyModule, onChange: (event) => {
                 setNewCommentText(event.target.value);
             }, onKeyDown: (event) => {
                 if (event.key === 'Enter') {
@@ -83,7 +84,7 @@ export 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, { width: "100%", variant: "raised", onClick: () => {
                 adaptable.api.settingsPanelApi.openSettingsPanel('Comment');
                 adaptable.api.internalApi.getCellPopupService().hidePopup();
@@ -91,5 +92,5 @@ export const CommentsEditor = (props) => {
             React.createElement(Box, { mr: 2 },
                 React.createElement(Icon, { name: "folder" })),
             ' ',
-            "Open all comments")));
+            "Open all Comments")));
 };

package/src/View/Comments/CommentsPopup.js

@@ -15,6 +15,7 @@ const tableDOMProps = {
 };
 const CellComments = (props) => {
     const adaptable = useAdaptable();
+    const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Comment') === 'ReadOnly';
     const columnsMap = React.useMemo(() => {
         const columns = {
             author: {
@@ -65,7 +66,7 @@ const CellComments = (props) => {
                         PrimaryKeyValue: props.commentThread.PrimaryKeyValue,
                     }, true);
                 } }),
-            React.createElement(AdaptableButtonComponent, { icon: "delete", variant: "text", onClick: () => {
+            React.createElement(AdaptableButtonComponent, { icon: "delete", disabled: isReadOnlyModule, variant: "text", onClick: () => {
                     adaptable.api.commentApi.deleteCommentThread(props.commentThread);
                 } })) },
         React.createElement(DataSource, { data: props.commentThread.Comments, primaryKey: "Uuid" },

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

@@ -64,5 +64,5 @@ export const PermittedValuesSelector = function (props) {
             handleSingleValueChange(value);
         }
     };
-    return (React.createElement(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, { 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 }));
 };

package/src/View/Note/NotePopup.js

@@ -16,6 +16,7 @@ export const NotePopup = (props) => {
     const adaptable = useAdaptable();
     const primaryKeyHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
     const allNotes = useSelector((state) => GetAllNotesSelector(state.Note));
+    const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Note') === 'ReadOnly';
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -32,19 +33,20 @@ export 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(AdaptableButtonComponent, { variant: "text", icon: "delete", onClick: () => {
+                    return (React.createElement(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

@@ -1439,26 +1439,6 @@ export 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(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 = [
             Events.EVENT_CHART_CREATED,
             /** Chart Range selection has changed */

package/src/agGrid/defaultAdaptableOptions.js

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

package/src/agGrid/editors/AdaptableDateEditor/index.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ICellEditorParams, ICellEditorComp } from '@ag-grid-community/core';
+import { ICellEditorComp, ICellEditorParams } from '@ag-grid-community/core';
 import { IAdaptable } from '../../../AdaptableInterfaces/IAdaptable';
 export declare const ReactAdaptableDateEditor: React.ForwardRefExoticComponent<ICellEditorParams<any, any, any> & {
     showClearButton?: boolean;

package/src/agGrid/editors/AdaptableDateEditor/index.js

@@ -2,8 +2,8 @@ import * as React from 'react';
 import { renderWithAdaptableContext } from '../../../View/renderWithAdaptableContext';
 import { InternalAdaptableDateEditor, } from './InternalAdaptableDateEditor';
 import { KeyCode, } from '@ag-grid-community/core';
-import { DateFormatter } from '../../../Utilities/Helpers/FormatHelper';
 import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
+import { DateFormatter } from '../../../Utilities/Helpers/FormatHelper';
 function shouldClearExistingValue(params) {
     return params.eventKey === KeyCode.BACKSPACE || params.eventKey === KeyCode.DELETE;
 }

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

@@ -80,7 +80,7 @@ export const Select = function (props) {
                 React.createElement(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

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

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

@@ -563,12 +563,6 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
             isOpt?: undefined;
             ref?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            desc: string;
-            ref: string;
-            isOpt?: undefined;
         } | {
             name: string;
             kind: string;
@@ -601,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;
@@ -1965,6 +1965,11 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         }[];
     };
+    CommentLoadContext: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     CommentOptions: {
         name: string;
         kind: string;
@@ -3650,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: {