@adaptabletools/adaptable 19.2.0 → 19.2.1-canary.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "19.2.0",
+  "version": "19.2.1-canary.1",
   "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/DefaultAdaptableOptions.js

@@ -318,6 +318,7 @@ const DefaultAdaptableOptions = {
         navigation: {},
         alwaysShowInDashboard: false,
         alwaysShowInToolPanel: false,
+        showModuleIcons: true
     },
     fdc3Options: {
         enableLogging: false,

package/src/AdaptableOptions/EditOptions.d.ts

@@ -3,11 +3,11 @@ import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedI
 import { MathOperation } from '../PredefinedConfig/Common/Enums';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 /**
- * Options related to Editing in AdapTable - includes Server Validation, Smart Edit Operations and Row Forms
+ * Options related to Editing in AdapTable - includes Server Validation, Smart Edit Operations and Cell Editabiility
  */
 export interface EditOptions<TData = any> {
     /**
-     * Function to validate AdapTable data edits on Server
+     * Function to validate AdapTable data edits remotely
      */
     validateOnServer?: (serverValidationContext: ServerValidationContext<TData>) => Promise<ServerValidationResult>;
     /**
@@ -100,5 +100,5 @@ export interface CellEditableContext<TData = any> extends BaseContext {
     /**
      * Default editability according to the AG Grid Column Definition (`ColDef.editable`)
      */
-    defaultColDefEditableValue?: boolean;
+    defaultColDefEditableValue: boolean;
 }

package/src/AdaptableOptions/SettingsPanelOptions.d.ts

@@ -13,10 +13,11 @@ export interface SettingsPanelOptions {
      */
     title?: string;
     /**
-     * Settings Panel Icon: `ConfigurationIcon`, `ApplicationIcon` or custom Icon
+     * Icon shown in top left of Settings Panel: Can be `ConfigurationIcon`, `ApplicationIcon` or custom Icon
      * @defaultValue `ConfigurationIcon`
      */
     icon?: 'ConfigurationIcon' | 'ApplicationIcon' | AdaptableIcon;
+    showModuleIcons?: boolean;
     /**
      * Whether a Settings Panel button should always be displayed in `ModuleButtons` area of Dashboard
      * @defaultValue false

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -17,13 +17,13 @@ export interface UserInterfaceOptions<TData = any> {
      */
     useCustomMacLikeScrollbars?: boolean;
     /**
-     * The application icon to appear in Dashboard and elsewhere (e.g. OpenFin notifications)
+     * The application icon to appear in Dashboard and elsewhere (e.g. in Notifications)
      *
      * @defaultValue null
      */
     applicationIcon?: AdaptableIcon;
     /**
-     * Bespoke icons that can be used in Adaptable (e.g. Badge Styles and Buttons)
+     * Bespoke icons that can be used in AdapTable (e.g. Badge Styles and Buttons)
      */
     customIcons?: CustomIcon[];
     /**

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

@@ -120,5 +120,5 @@ export declare class GridInternalApi extends ApiBase {
      *
      * DO NOT USE THIS METHOD DIRECTLY - use `GridApi.isCellEditable` instead
      */
-    isCellEditableAccordingToEditOptions(gridCell: GridCell, defaultColDefinitionEditableValue?: boolean): boolean | undefined;
+    isCellEditableAccordingToEditOptions(gridCell: GridCell, defaultColDefinitionEditableValue: boolean): boolean | undefined;
 }

package/src/Api/Internal/GridInternalApi.js

@@ -510,9 +510,10 @@ export class GridInternalApi extends ApiBase {
     isCellEditableAccordingToEditOptions(gridCell, defaultColDefinitionEditableValue) {
         var _a;
         const cellEditable = (_a = this.getEditOptions()) === null || _a === void 0 ? void 0 : _a.isCellEditable;
-        if (typeof cellEditable === 'function') {
+        if (cellEditable) {
             const cellEditableContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { gridCell, defaultColDefEditableValue: defaultColDefinitionEditableValue });
             return cellEditable(cellEditableContext);
         }
+        return undefined;
     }
 }

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

@@ -1,12 +1,14 @@
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableApi, CellAddress } from '../../types';
+import { IAdaptableService } from './Interface/IAdaptableService';
 /**
  * This service controls the interaction between notes and comments
  */
-export declare class CellPopupService {
+export declare class CellPopupService implements IAdaptableService {
     private api;
     adaptable: IAdaptable;
     constructor(api: AdaptableApi);
+    destroy(): void;
     private getAdaptableState;
     private dispatchAction;
     static isSameAddress(a: CellAddress, b: CellAddress): boolean;

package/src/Utilities/Services/CellPopupService.js

@@ -8,6 +8,7 @@ export class CellPopupService {
         this.adaptable = api.internalApi.getAdaptableInstance();
         this.adaptable.api.eventApi.on('AdaptableReady', () => this.handleAdaptableReady());
     }
+    destroy() { }
     getAdaptableState() {
         return this.api.internalApi.getAdaptableState();
     }

package/src/View/Components/Popups/AdaptablePopup/Navigation.js

@@ -46,7 +46,7 @@ export const Navigation = (props) => {
                 React.createElement("button", { type: "button", className: `${baseClassName}__Button`, onClick: () => {
                         dispatch(menuItem.reduxAction);
                     }, "data-name": dataName },
-                    menuItem.icon && (React.createElement(AdaptableIconComponent, { icon: menuItem.icon, iconClassName: `${baseClassName}__Icon` })),
+                    props.api.optionsApi.getSettingsPanelOptions().showModuleIcons && menuItem.icon && (React.createElement(AdaptableIconComponent, { icon: menuItem.icon, iconClassName: `${baseClassName}__Icon` })),
                     customIcon && React.createElement(AdaptableIconComponent, { icon: customIcon }),
                     menuItem.label)));
         }))));

package/src/View/GridInfo/GridInfoPopup/GridInfoPopup.js

@@ -72,7 +72,7 @@ export const GridInfoPopup = (props) => {
             React.createElement(Panel, { flex: 1 },
                 React.createElement(Tabs, null,
                     React.createElement(Tabs.Tab, null, "Grid Summary"),
-                    React.createElement(Tabs.Tab, null, "Config"),
+                    React.createElement(Tabs.Tab, null, "Grid Config"),
                     React.createElement(Tabs.Content, null,
                         React.createElement(AdaptableObjectCollection, { margin: 2, colItems: propValueColItems, items: gridSummaries })),
                     React.createElement(Tabs.Content, null,

package/src/agGrid/AdaptableAgGrid.js

@@ -1785,8 +1785,7 @@ export class AdaptableAgGrid {
                 return acc;
             }
             const ColumnGroupId = columnGroup.getGroupId();
-            const AllowGroupSplit = !columnGroup.getProvidedColumnGroup().getColGroupDef()
-                .marryChildren;
+            const AllowGroupSplit = !columnGroup.getProvidedColumnGroup().getColGroupDef().marryChildren;
             const FriendlyName = (_c = columnGroup.getProvidedColumnGroup().getColGroupDef().headerName) !== null && _c !== void 0 ? _c : ColumnGroupId;
             const columnsInGroup = columnGroup.getLeafColumns();
             columnsInGroup.forEach((col) => {
@@ -2974,7 +2973,7 @@ export class AdaptableAgGrid {
         return this.agGridAdapter.getRegisteredModules();
     }
     destroy(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15;
         if (!config) {
             config = {
                 unmount: true,
@@ -3108,42 +3107,46 @@ export class AdaptableAgGrid {
         this.DANGER_USE_GETTER_agGridContainerElement = null;
         (_g = this.adaptableStore) === null || _g === void 0 ? void 0 : _g.destroy();
         this.adaptableStore = null;
+        (_h = this.adaptableModules) === null || _h === void 0 ? void 0 : _h.clear();
+        this.adaptableModules = null;
         this.adaptableOptions = null;
         this.adaptableStatusPanelKeys = null;
-        (_j = (_h = this.CalculatedColumnExpressionService) === null || _h === void 0 ? void 0 : _h.destroy) === null || _j === void 0 ? void 0 : _j.call(_h);
+        (_k = (_j = this.CalculatedColumnExpressionService) === null || _j === void 0 ? void 0 : _j.destroy) === null || _k === void 0 ? void 0 : _k.call(_j);
         this.CalculatedColumnExpressionService = null;
-        (_l = (_k = this.DataService) === null || _k === void 0 ? void 0 : _k.destroy) === null || _l === void 0 ? void 0 : _l.call(_k);
+        (_m = (_l = this.DataService) === null || _l === void 0 ? void 0 : _l.destroy) === null || _m === void 0 ? void 0 : _m.call(_l);
         this.DataService = null;
-        (_o = (_m = this.Fdc3Service) === null || _m === void 0 ? void 0 : _m.destroy) === null || _o === void 0 ? void 0 : _o.call(_m);
+        (_p = (_o = this.Fdc3Service) === null || _o === void 0 ? void 0 : _o.destroy) === null || _p === void 0 ? void 0 : _p.call(_o);
         this.Fdc3Service = null;
-        (_q = (_p = this.ModuleService) === null || _p === void 0 ? void 0 : _p.destroy) === null || _q === void 0 ? void 0 : _q.call(_p);
+        (_r = (_q = this.ModuleService) === null || _q === void 0 ? void 0 : _q.destroy) === null || _r === void 0 ? void 0 : _r.call(_q);
         this.ModuleService = null;
-        (_s = (_r = this.ValidationService) === null || _r === void 0 ? void 0 : _r.destroy) === null || _s === void 0 ? void 0 : _s.call(_r);
+        (_t = (_s = this.ValidationService) === null || _s === void 0 ? void 0 : _s.destroy) === null || _t === void 0 ? void 0 : _t.call(_s);
         this.ValidationService = null;
-        (_u = (_t = this.QueryLanguageService) === null || _t === void 0 ? void 0 : _t.destroy) === null || _u === void 0 ? void 0 : _u.call(_t);
+        (_v = (_u = this.QueryLanguageService) === null || _u === void 0 ? void 0 : _u.destroy) === null || _v === void 0 ? void 0 : _v.call(_u);
         this.QueryLanguageService = null;
-        (_w = (_v = this.AlertService) === null || _v === void 0 ? void 0 : _v.destroy) === null || _w === void 0 ? void 0 : _w.call(_v);
+        (_x = (_w = this.AlertService) === null || _w === void 0 ? void 0 : _w.destroy) === null || _x === void 0 ? void 0 : _x.call(_w);
         this.AlertService = null;
-        (_y = (_x = this.TeamSharingService) === null || _x === void 0 ? void 0 : _x.destroy) === null || _y === void 0 ? void 0 : _y.call(_x);
+        (_z = (_y = this.TeamSharingService) === null || _y === void 0 ? void 0 : _y.destroy) === null || _z === void 0 ? void 0 : _z.call(_y);
         this.TeamSharingService = null;
-        (_0 = (_z = this.RowEditService) === null || _z === void 0 ? void 0 : _z.destroy) === null || _0 === void 0 ? void 0 : _0.call(_z);
+        (_1 = (_0 = this.RowEditService) === null || _0 === void 0 ? void 0 : _0.destroy) === null || _1 === void 0 ? void 0 : _1.call(_0);
         this.RowEditService = null;
-        (_2 = (_1 = this.MetamodelService) === null || _1 === void 0 ? void 0 : _1.destroy) === null || _2 === void 0 ? void 0 : _2.call(_1);
+        (_3 = (_2 = this.MetamodelService) === null || _2 === void 0 ? void 0 : _2.destroy) === null || _3 === void 0 ? void 0 : _3.call(_2);
         this.MetamodelService = null;
-        (_4 = (_3 = this.LicenseService) === null || _3 === void 0 ? void 0 : _3.destroy) === null || _4 === void 0 ? void 0 : _4.call(_3);
+        (_5 = (_4 = this.LicenseService) === null || _4 === void 0 ? void 0 : _4.destroy) === null || _5 === void 0 ? void 0 : _5.call(_4);
         this.LicenseService = null;
-        (_6 = (_5 = this.FlashingCellService) === null || _5 === void 0 ? void 0 : _5.destroy) === null || _6 === void 0 ? void 0 : _6.call(_5);
+        (_7 = (_6 = this.FlashingCellService) === null || _6 === void 0 ? void 0 : _6.destroy) === null || _7 === void 0 ? void 0 : _7.call(_6);
         this.FlashingCellService = null;
-        (_8 = (_7 = this.ThemeService) === null || _7 === void 0 ? void 0 : _7.destroy) === null || _8 === void 0 ? void 0 : _8.call(_7);
+        (_9 = (_8 = this.ThemeService) === null || _8 === void 0 ? void 0 : _8.destroy) === null || _9 === void 0 ? void 0 : _9.call(_8);
         this.ThemeService = null;
-        (_10 = (_9 = this.ChartingService) === null || _9 === void 0 ? void 0 : _9.destroy) === null || _10 === void 0 ? void 0 : _10.call(_9);
+        (_11 = (_10 = this.ChartingService) === null || _10 === void 0 ? void 0 : _10.destroy) === null || _11 === void 0 ? void 0 : _11.call(_10);
         this.ChartingService = null;
-        (_11 = this.unmountLoadingScreen) === null || _11 === void 0 ? void 0 : _11.call(this);
+        (_13 = (_12 = this.CellPopupService) === null || _12 === void 0 ? void 0 : _12.destroy) === null || _13 === void 0 ? void 0 : _13.call(_12);
+        this.CellPopupService = null;
+        (_14 = this.unmountLoadingScreen) === null || _14 === void 0 ? void 0 : _14.call(this);
         this.unmountLoadingScreen = null;
         if (config === null || config === void 0 ? void 0 : config.unmount) {
             const abContainerElement = this.getAdaptableContainerElement();
             if (abContainerElement != null) {
-                (_12 = this.unmountReactRoot) === null || _12 === void 0 ? void 0 : _12.call(this);
+                (_15 = this.unmountReactRoot) === null || _15 === void 0 ? void 0 : _15.call(this);
             }
             this.unmountReactRoot = null;
         }

package/src/agGrid/AgGridColumnAdapter.js

@@ -435,7 +435,10 @@ export class AgGridColumnAdapter {
                 // 1. evaluate EditOptions.isCellEditable if provided
                 if (this.adaptableApi.gridApi.internalApi.hasCellEditableAccordingToEditOptions()) {
                     const gridCell = this.adaptableInstance.getGridCellFromRowNode(params.node, params.column.getColId());
-                    return this.adaptableApi.gridApi.internalApi.isCellEditableAccordingToEditOptions(gridCell, getOriginalColDefEditable());
+                    const editOptionsEditability = this.adaptableApi.gridApi.internalApi.isCellEditableAccordingToEditOptions(gridCell, getOriginalColDefEditable());
+                    if (editOptionsEditability) {
+                        return editOptionsEditability;
+                    }
                 }
                 // 2. otherwise, fallback to colDef.editable
                 return getOriginalColDefEditable();

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: 1732529750757 || Date.now(),
-    VERSION: "19.2.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1732626145480 || Date.now(),
+    VERSION: "19.2.1-canary.1" || '--current-version--',
 };

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

@@ -1761,17 +1761,11 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: ({
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-        } | {
+        props: {
             name: string;
             kind: string;
             desc: string;
-            isOpt?: undefined;
-        })[];
+        }[];
     };
     CellHighlightInfo: {
         name: string;