@adaptabletools/adaptable-cjs 19.1.1 → 19.1.2-canary.0

package/package.json

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { ChartModel, ChartRef, Column, GridApi, GridOptions, IRowNode, Module, RowModelType, StatusPanelDef } from '@ag-grid-community/core';
-import { AdaptableApi } from '../Api/AdaptableApi';
+import { AdaptableApi, DestroyConfig } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../PredefinedConfig/Common/ColumnSort';
 import { DataUpdateConfig } from '../PredefinedConfig/Common/DataUpdateConfig';
@@ -262,10 +262,7 @@ export interface IAdaptable {
     getAgGridColumnForColumnId(columnId: string): Column;
     getMinMaxCachedValueForColumn(column: AdaptableColumn, minMax: 'min' | 'max'): number | undefined;
     getAgGridRegisteredModules(): Module[];
-    destroy(config?: {
-        unmount: boolean;
-        destroyApi?: boolean;
-    }): void;
+    destroy(config?: DestroyConfig): void;
     setLayout(layout?: Layout): void;
     canExportToExcel(): boolean;
     exportToExcel(reportData: ReportData, fileName: string): void;

package/src/AdaptableOptions/AlertOptions.d.ts

@@ -68,6 +68,9 @@ export interface AlertOptions<TData = any> {
      */
     showMissingPrimaryKeyAlert?: boolean;
 }
+/**
+ * Cell Change that will trigger an Alert: can be 'rawValue' or 'formattedValue'
+ */
 export type DataChangeDetectionPolicy = 'rawValue' | 'formattedValue';
 /**
  * Handles a Form Button Action

package/src/AdaptableOptions/ColumnMenuOptions.d.ts

@@ -91,4 +91,4 @@ export interface UserColumnMenuItem {
 /**
  * Defines AG Grid Column Menu Items
  */
-export type AgGridColumnMenuItemType = 'pinSubMenu' | 'valueAggSubMenu' | 'autoSizeThis' | 'autoSizeAll' | 'rowGroup' | 'rowUnGroup' | 'resetColumns' | 'expandAll' | 'contractAll' | 'separator';
+export type AgGridColumnMenuItemType = 'sortAscending' | 'sortDescending' | 'sortUnSort' | 'columnFilter' | 'columnChooser' | 'pinSubMenu' | 'valueAggSubMenu' | 'autoSizeThis' | 'autoSizeAll' | 'rowGroup' | 'rowUnGroup' | 'resetColumns' | 'expandAll' | 'contractAll' | 'separator';

package/src/AdaptableOptions/CommentOptions.d.ts

@@ -17,11 +17,11 @@ export interface CommentOptions<TData = any> {
      */
     persistCommentThreads?(commentThreads: CommentThread[]): Promise<void>;
     /**
-     * Format string for dates in Comments Popup
+     * Format string for Dates in Comments Popup
      *
      * @defaultValue 'dd-MM-yyyy HH:mm:ss'
      */
-    dateFormat?: string;
+    dateFormat?: string | (() => string);
     /**
      * Show the Close Button in the Comments Popup
      * @defaultValue true

package/src/AdaptableOptions/NoteOptions.d.ts

@@ -8,11 +8,11 @@ export interface NoteOptions<TData = any> {
      */
     isCellNotable?: (context: NotableCellContext) => boolean;
     /**
-     * Format string for formatting in the Notes Popup
+     * Format string for Dates in Notes Popup
      *
      * @defaultValue 'dd-MM-yyyy HH:mm:ss'
      */
-    dateFormat?: string;
+    dateFormat?: string | (() => string);
     /**
      * Show the Close Button in the Notes Popup
      *

package/src/Api/AdaptableApi.d.ts

@@ -258,23 +258,33 @@ export interface AdaptableApi {
      */
     gridFilterApi: GridFilterApi;
     /**
-     * Cleanup method - should be called only when using the vanilla javascript component, as framework components cleanup is performed when the component is destroyed/unmounted.
-     * This destroys the Adaptable instance.
+     * Cleanup method - call only for vanilla JavaScript components, as framework components handle cleanup on destroy/unmount. By default, it unmounts the Adaptable component and destroys the AG Grid instance.
+     * @param config - optional configuration object
      */
-    destroy: (config?: {
-        unmount: boolean;
-        destroyApi?: boolean;
-    }) => void;
+    destroy: (config?: DestroyConfig) => void;
     /**
      * Whether the Adaptable instance has been destroyed
      */
     isDestroyed: () => boolean;
+}
+/**
+ * Adaptable Destroy Configuration
+ */
+export interface DestroyConfig {
+    /**
+     * Unmount the Adaptable component (Dashboard)
+     *
+     * @defaultValue true
+     */
+    unmount: boolean;
+    /**
+     * @deprecated use `destroyAgGrid` instead
+     */
+    destroyApi?: boolean;
     /**
-     * Cleanup method that only cleans up this api instance (clears event listeners and sets every property to null), but does not destroy the Adaptable instance.
+     * Destroy the AgGrid instance
      *
+     * @defaultValue true
      */
-    internalDestroySelf: (config?: {
-        unmount: boolean;
-        destroyApi?: boolean;
-    }) => void;
+    destroyAgGrid: boolean;
 }

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

@@ -1,5 +1,8 @@
 import { IRowNode } from '@ag-grid-community/core';
 import { BaseEventInfo } from './BaseEventInfo';
+/**
+ * What row action triggered the Grid change: 'Add', 'Update', 'Delete' or 'Load'
+ */
 export type GridDataChangeTrigger = 'Add' | 'Update' | 'Delete' | 'Load';
 /**
  * EventInfo returned by GridDataChanged event

package/src/Api/GridApi.d.ts

@@ -457,6 +457,10 @@ export interface GridApi {
      * @param columnIds ColumnIds which contain cells to refresh
      */
     refreshCells(rowNodes: IRowNode[], columnIds: string[], suppressFlash?: boolean): void;
+    /**
+     * Refreshes all Cells in the Grid
+     * @param forceUpdate forces AG Grid change detection
+     */
     refreshAllCells(forceUpdate?: boolean): void;
     /**
      * Refreshes a single Grid Cell
@@ -469,7 +473,7 @@ export interface GridApi {
      */
     refreshGridCells(gridCells: GridCell[]): void;
     /**
-     * Forces a re-render of the row with the given primary key value
+     * Forces a re-render of Row with given Primary Key value
      * @param primaryKey row primary key
      */
     refreshRowByPrimaryKey(primaryKey: any): void;
@@ -504,7 +508,7 @@ export interface GridApi {
      */
     getVisibleColumnCount(): number;
     /**
-     * Destroys current AdapTable instance
+     * @deprecated use `AdaptableApi.destroy()` instead
      */
     destroy(): void;
     /**

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

@@ -1,6 +1,6 @@
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableInternalApi } from '../Internal/AdaptableInternalApi';
-import { AdaptableApi, ColumnMenuApi, ContextMenuApi, DataImportApi, NamedQueryApi, OptionsApi, SettingsPanelApi } from '../../types';
+import { AdaptableApi, ColumnMenuApi, ContextMenuApi, DataImportApi, DestroyConfig, NamedQueryApi, OptionsApi, SettingsPanelApi } from '../../types';
 import { AlertApi } from '../AlertApi';
 import { BulkUpdateApi } from '../BulkUpdateApi';
 import { CalendarApi } from '../CalendarApi';
@@ -104,11 +104,8 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     /**
      * This is only meant to be called by the Adaptable instance.
      */
-    internalDestroySelf(): void;
-    destroy(config?: {
-        unmount: boolean;
-        destroyApi?: boolean;
-    }): void;
+    _internalDestroySelf(): void;
+    destroy(config?: DestroyConfig): void;
     isDestroyed(): boolean;
     logConsoleMessage(message: string, ...optionalParams: any[]): void;
     logInfo(message: string, ...optionalParams: any[]): void;

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -116,7 +116,7 @@ class AdaptableApiImpl {
     /**
      * This is only meant to be called by the Adaptable instance.
      */
-    internalDestroySelf() {
+    _internalDestroySelf() {
         if (this.destroyed) {
             return;
         }

package/src/Api/Implementation/GridApiImpl.js

@@ -10,6 +10,7 @@ const GridInternalApi_1 = require("../Internal/GridInternalApi");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const windowFactory_1 = require("../../View/Components/Popups/WindowPopups/windowFactory");
 const RowSummary_1 = require("../../PredefinedConfig/Common/RowSummary");
+const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class GridApiImpl extends ApiBase_1.ApiBase {
     constructor(_adaptable) {
         super(_adaptable);
@@ -554,7 +555,8 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this._adaptable.deselectAll();
     }
     destroy() {
-        this._adaptable.destroy();
+        (0, logDeprecation_1.logDeprecationExternal)(this._adaptable.logger, 'GridApi', 'destroy', 'AdaptableApi', 'destroy');
+        this.getAdaptableApi().destroy();
     }
     getGridContainerElement() {
         return this._adaptable.getAgGridContainerElement();

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

@@ -1,4 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
 export declare class CommentsInternalApi extends ApiBase {
     areCommentsSupported(): boolean;
+    getCommentsDateFormat(): string;
 }

package/src/Api/Internal/CommentsInternalApi.js

@@ -10,5 +10,9 @@ class CommentsInternalApi extends ApiBase_1.ApiBase {
         }
         return true;
     }
+    getCommentsDateFormat() {
+        const dateFormat = this.getCommentOptions().dateFormat;
+        return typeof dateFormat === 'function' ? dateFormat() : dateFormat;
+    }
 }
 exports.CommentsInternalApi = CommentsInternalApi;

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

@@ -1,4 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
 export declare class NoteInternalApi extends ApiBase {
     areNotesSupported(): boolean;
+    getNotesDateFormat(): string;
 }

package/src/Api/Internal/NoteInternalApi.js

@@ -10,5 +10,9 @@ class NoteInternalApi extends ApiBase_1.ApiBase {
         }
         return true;
     }
+    getNotesDateFormat() {
+        const dateFormat = this.getNoteOptions().dateFormat;
+        return typeof dateFormat === 'function' ? dateFormat() : dateFormat;
+    }
 }
 exports.NoteInternalApi = NoteInternalApi;

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

@@ -3,10 +3,25 @@ import { AdaptableModule, AdaptableObject, Layout } from '../../types';
  * Defines an Extended Layout - provides a Layout and all objects that refer to it
  */
 export interface ExtendedLayoutInfo {
+    /**
+     * Layout being extended
+     */
     Layout: Layout;
+    /**
+     * Object to be included in the Layout
+     */
     Extensions: LayoutExtension[];
 }
+/**
+ * Defines an object being extended in a Layout
+ */
 export interface LayoutExtension {
+    /**
+     * Module to which Extended Object belongs
+     */
     Module: AdaptableModule;
+    /**
+     * Object being Extended
+     */
     Object: AdaptableObject;
 }

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

@@ -11,4 +11,7 @@ export interface FilterActionOnDataChange {
      */
     throttleDelay?: number;
 }
+/**
+ * When to apply a Filter: 'Always', 'Never' or 'Throttle'
+ */
 export type ApplyFilterAction = 'Always' | 'Never' | 'Throttle';

package/src/View/Comments/CommentsEditor.js

@@ -10,9 +10,9 @@ const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const CommentsRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CommentsRedux"));
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
-const dateUtils_1 = require("../../Utilities/ExpressionFunctions/dateUtils");
 const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../Components/AdaptableInput"));
+const format_1 = tslib_1.__importDefault(require("date-fns/format"));
 // Edit Mode
 // [author] [edit, delete]
 // [text-editor] * this is different
@@ -82,7 +82,7 @@ const CommentsEditor = (props) => {
                     React.createElement(rebass_1.Flex, { mb: 2, alignItems: "center" },
                         React.createElement(rebass_1.Box, null,
                             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')))),
+                            comment.Timestamp && (React.createElement(rebass_1.Box, { "data-name": "comment-timestamp", fontSize: 2 }, (0, format_1.default)(comment.Timestamp, adaptable.api.commentApi.internalApi.getCommentsDateFormat())))),
                         React.createElement(rebass_1.Box, { flex: 1 }),
                         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: () => {

package/src/View/Comments/CommentsPopup.js

@@ -11,7 +11,6 @@ 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,
@@ -19,9 +18,7 @@ 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 = {
@@ -34,7 +31,7 @@ const CellComments = (props) => {
                 field: 'Timestamp',
                 maxWidth: 150,
                 valueGetter: (params) => {
-                    return (0, format_1.default)(params.data.Timestamp, dateFormat);
+                    return (0, format_1.default)(params.data.Timestamp, adaptable.api.commentApi.internalApi.getCommentsDateFormat());
                 },
             },
             text: {

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -35,7 +35,7 @@ const DataChangeHistoryGrid = (props) => {
         return () => {
             requestAnimationFrame(() => {
                 var _a;
-                (_a = adaptableApiRef.current) === null || _a === void 0 ? void 0 : _a.internalApi.getAdaptableInstance().destroy({ unmount: true, destroyApi: true });
+                (_a = adaptableApiRef.current) === null || _a === void 0 ? void 0 : _a.internalApi.getAdaptableInstance().destroy({ unmount: true, destroyAgGrid: true });
             });
         };
     }, []);

package/src/View/Layout/TransposedPopup.js

@@ -25,7 +25,7 @@ const TransposedPopup = (props) => {
     const [syntheticTransposedByColumnId, doSetSyntheticTransposedByColumnId] = React.useState(transposedColumnId);
     const setSyntheticTransposedByColumnId = (syntheticTransposedByColumnId) => {
         var _a;
-        (_a = transposedAdaptableApiRef.current) === null || _a === void 0 ? void 0 : _a.destroy({ unmount: true, destroyApi: true });
+        (_a = transposedAdaptableApiRef.current) === null || _a === void 0 ? void 0 : _a.destroy({ unmount: true, destroyAgGrid: true });
         doSetSyntheticTransposedByColumnId(syntheticTransposedByColumnId);
     };
     const transposedAdaptableApiRef = React.useRef(null);
@@ -185,7 +185,7 @@ const TransposedPopup = (props) => {
         return () => {
             requestAnimationFrame(() => {
                 var _a;
-                (_a = transposedAdaptableApiRef.current) === null || _a === void 0 ? void 0 : _a.destroy({ unmount: true, destroyApi: true });
+                (_a = transposedAdaptableApiRef.current) === null || _a === void 0 ? void 0 : _a.destroy({ unmount: true, destroyAgGrid: true });
             });
         };
     }, []);

package/src/View/Note/NotePopup.js

@@ -10,7 +10,6 @@ const format_1 = tslib_1.__importDefault(require("date-fns/format"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
-const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const tableDOMProps = {
     style: {
@@ -20,12 +19,10 @@ const tableDOMProps = {
     },
 };
 const NotePopup = (props) => {
-    var _a, _b, _c, _d;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const primaryKeyHeader = adaptable.api.columnApi.getPrimaryKeyColumn()
         ? adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId)
         : StringExtensions_1.default.Humanize(adaptable.adaptableOptions.primaryKey);
-    const dateFormat = (_d = (_c = (_b = (_a = adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions) === null || _b === void 0 ? void 0 : _b.call(_a)) === null || _c === void 0 ? void 0 : _c.dateFormat) !== null && _d !== void 0 ? _d : GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME;
     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(() => {
@@ -50,7 +47,7 @@ const NotePopup = (props) => {
             timestamp: {
                 field: 'Timestamp',
                 valueGetter: (params) => {
-                    return (0, format_1.default)(params.data.Timestamp, dateFormat);
+                    return (0, format_1.default)(params.data.Timestamp, adaptable.api.noteApi.internalApi.getNotesDateFormat());
                 },
             },
             delete: {

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -2,7 +2,7 @@
 import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { ChartRef, Column, GridApi, GridOptions, IRowNode, Module, RowModelType } from '@ag-grid-community/core';
 import { AdaptableLogger } from './AdaptableLogger';
-import { AdaptableApi } from '../Api/AdaptableApi';
+import { AdaptableApi, DestroyConfig } from '../Api/AdaptableApi';
 import { AdaptableVariant, DistinctColumnValuesParams, IAdaptable, NormalizeAdaptableStateOptions } from '../AdaptableInterfaces/IAdaptable';
 import { EmitterCallback } from '../Utilities/Emitter';
 import { AdaptablePlugin } from '../AdaptableOptions/AdaptablePlugin';
@@ -308,10 +308,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     getAgGridColumnForColumnId(columnId: string): Column;
     getMinMaxCachedValueForColumn(column: AdaptableColumn, minMax: 'min' | 'max'): number;
     getAgGridRegisteredModules(): Module[];
-    destroy(config?: {
-        unmount: boolean;
-        destroyApi?: boolean;
-    }): void;
+    destroy(config?: DestroyConfig): void;
     canExportToExcel(): boolean;
     exportToExcel(reportData: ReportData, fileName: string): void;
     exportVisualDataToExcel(): void;

package/src/agGrid/AdaptableAgGrid.js

@@ -2978,7 +2978,25 @@ 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;
+        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;
+        if (!config) {
+            config = {
+                unmount: true,
+                destroyAgGrid: true,
+            };
+        }
+        else {
+            // should not happen unless someone ignored the TypeScript warnings
+            if (config.unmount == undefined) {
+                config.unmount = true;
+            }
+            if (config.destroyAgGrid == undefined) {
+                config.destroyAgGrid = true;
+            }
+        }
+        if ((config === null || config === void 0 ? void 0 : config.destroyApi) === true) {
+            this.logger.warn(`Use of 'destroyApi' is deprecated. Use 'destroyAgGrid' instead.`);
+        }
         if (((_a = this.agGridAdapter) === null || _a === void 0 ? void 0 : _a.getAgGridApi()) && !this.agGridAdapter.getAgGridApi().isDestroyed()) {
             this.agGridAdapter
                 .getAgGridApi()
@@ -3061,7 +3079,7 @@ class AdaptableAgGrid {
             }
         }
         DANGER_AG_GRID_BEANS_MAP[this._agGridId] = null;
-        if ((config === null || config === void 0 ? void 0 : config.destroyApi) === true) {
+        if ((config === null || config === void 0 ? void 0 : config.destroyApi) === true || (config === null || config === void 0 ? void 0 : config.destroyAgGrid) === true) {
             (_b = this.agGridAdapter.getAgGridApi()) === null || _b === void 0 ? void 0 : _b.destroy();
         }
         this.previousAgGridLayoutState = '';
@@ -3074,7 +3092,7 @@ class AdaptableAgGrid {
             this.agGridListenerMouseEnter = null;
             this.agGridListenerMouseLeave = null;
         }
-        this.api.internalDestroySelf();
+        this.api._internalDestroySelf();
         (_c = this.agGridOptionsService) === null || _c === void 0 ? void 0 : _c.destroy();
         this.agGridOptionsService = null;
         (_d = this.agGridAdapter) === null || _d === void 0 ? void 0 : _d.destroy();
@@ -3090,46 +3108,49 @@ class AdaptableAgGrid {
         this.columnMinMaxValuesCache = null;
         this.lifecycleState = 'preDestroyed';
         AdaptableAgGrid.dismissInstance(this);
-        (_g = this.unmountLoadingScreen) === null || _g === void 0 ? void 0 : _g.call(this);
-        this.unmountLoadingScreen = null;
-        if (config && !config.unmount) {
-            return;
-        }
-        const abContainerElement = this.getAdaptableContainerElement();
-        if (abContainerElement != null) {
-            (_h = this.unmountReactRoot) === null || _h === void 0 ? void 0 : _h.call(this);
-        }
-        this.unmountReactRoot = null;
         this.DANGER_USE_GETTER_adaptableContainerElement = null;
         this.DANGER_USE_GETTER_agGridContainerElement = null;
-        (_j = this.adaptableStore) === null || _j === void 0 ? void 0 : _j.destroy();
+        (_g = this.adaptableStore) === null || _g === void 0 ? void 0 : _g.destroy();
         this.adaptableStore = null;
         this.adaptableOptions = null;
         this.adaptableStatusPanelKeys = null;
-        (_l = (_k = this.CalculatedColumnExpressionService) === null || _k === void 0 ? void 0 : _k.destroy) === null || _l === void 0 ? void 0 : _l.call(_k);
+        (_j = (_h = this.CalculatedColumnExpressionService) === null || _h === void 0 ? void 0 : _h.destroy) === null || _j === void 0 ? void 0 : _j.call(_h);
         this.CalculatedColumnExpressionService = null;
-        (_o = (_m = this.DataService) === null || _m === void 0 ? void 0 : _m.destroy) === null || _o === void 0 ? void 0 : _o.call(_m);
+        (_l = (_k = this.DataService) === null || _k === void 0 ? void 0 : _k.destroy) === null || _l === void 0 ? void 0 : _l.call(_k);
         this.DataService = null;
-        (_q = (_p = this.Fdc3Service) === null || _p === void 0 ? void 0 : _p.destroy) === null || _q === void 0 ? void 0 : _q.call(_p);
+        (_o = (_m = this.Fdc3Service) === null || _m === void 0 ? void 0 : _m.destroy) === null || _o === void 0 ? void 0 : _o.call(_m);
         this.Fdc3Service = null;
-        (_s = (_r = this.ModuleService) === null || _r === void 0 ? void 0 : _r.destroy) === null || _s === void 0 ? void 0 : _s.call(_r);
+        (_q = (_p = this.ModuleService) === null || _p === void 0 ? void 0 : _p.destroy) === null || _q === void 0 ? void 0 : _q.call(_p);
         this.ModuleService = null;
-        (_u = (_t = this.ValidationService) === null || _t === void 0 ? void 0 : _t.destroy) === null || _u === void 0 ? void 0 : _u.call(_t);
+        (_s = (_r = this.ValidationService) === null || _r === void 0 ? void 0 : _r.destroy) === null || _s === void 0 ? void 0 : _s.call(_r);
         this.ValidationService = null;
-        (_w = (_v = this.QueryLanguageService) === null || _v === void 0 ? void 0 : _v.destroy) === null || _w === void 0 ? void 0 : _w.call(_v);
+        (_u = (_t = this.QueryLanguageService) === null || _t === void 0 ? void 0 : _t.destroy) === null || _u === void 0 ? void 0 : _u.call(_t);
         this.QueryLanguageService = null;
-        (_y = (_x = this.AlertService) === null || _x === void 0 ? void 0 : _x.destroy) === null || _y === void 0 ? void 0 : _y.call(_x);
+        (_w = (_v = this.AlertService) === null || _v === void 0 ? void 0 : _v.destroy) === null || _w === void 0 ? void 0 : _w.call(_v);
         this.AlertService = null;
-        (_0 = (_z = this.TeamSharingService) === null || _z === void 0 ? void 0 : _z.destroy) === null || _0 === void 0 ? void 0 : _0.call(_z);
+        (_y = (_x = this.TeamSharingService) === null || _x === void 0 ? void 0 : _x.destroy) === null || _y === void 0 ? void 0 : _y.call(_x);
         this.TeamSharingService = null;
-        (_2 = (_1 = this.RowEditService) === null || _1 === void 0 ? void 0 : _1.destroy) === null || _2 === void 0 ? void 0 : _2.call(_1);
+        (_0 = (_z = this.RowEditService) === null || _z === void 0 ? void 0 : _z.destroy) === null || _0 === void 0 ? void 0 : _0.call(_z);
         this.RowEditService = null;
-        (_4 = (_3 = this.MetamodelService) === null || _3 === void 0 ? void 0 : _3.destroy) === null || _4 === void 0 ? void 0 : _4.call(_3);
+        (_2 = (_1 = this.MetamodelService) === null || _1 === void 0 ? void 0 : _1.destroy) === null || _2 === void 0 ? void 0 : _2.call(_1);
         this.MetamodelService = null;
-        (_6 = (_5 = this.LicenseService) === null || _5 === void 0 ? void 0 : _5.destroy) === null || _6 === void 0 ? void 0 : _6.call(_5);
+        (_4 = (_3 = this.LicenseService) === null || _3 === void 0 ? void 0 : _3.destroy) === null || _4 === void 0 ? void 0 : _4.call(_3);
         this.LicenseService = null;
-        (_8 = (_7 = this.FlashingCellService) === null || _7 === void 0 ? void 0 : _7.destroy) === null || _8 === void 0 ? void 0 : _8.call(_7);
+        (_6 = (_5 = this.FlashingCellService) === null || _5 === void 0 ? void 0 : _5.destroy) === null || _6 === void 0 ? void 0 : _6.call(_5);
         this.FlashingCellService = null;
+        (_8 = (_7 = this.ThemeService) === null || _7 === void 0 ? void 0 : _7.destroy) === null || _8 === void 0 ? void 0 : _8.call(_7);
+        this.ThemeService = null;
+        (_10 = (_9 = this.ChartingService) === null || _9 === void 0 ? void 0 : _9.destroy) === null || _10 === void 0 ? void 0 : _10.call(_9);
+        this.ChartingService = null;
+        (_11 = this.unmountLoadingScreen) === null || _11 === void 0 ? void 0 : _11.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);
+            }
+            this.unmountReactRoot = null;
+        }
     }
     canExportToExcel() {
         return this.agGridAdapter.isModulePresent(core_1.ModuleNames.ExcelExportModule);

package/src/agGrid/AgGridAdapter.js

@@ -331,14 +331,14 @@ class AgGridAdapter {
         let row = this.getAgGridApi().getDisplayedRowAtIndex(0);
         if (row == null) {
             // possible that there will be no data.
-            this.adaptableInstance.logger.warn(`No data in grid so returning type "Unknown" for Column: "${column.getColId()}"`);
+            this.adaptableInstance.logger.consoleError(`No data in grid, returning type "Unknown" for Column: "${column.getColId()}". This will impact several Adaptable features, such as Filters and ColumnFormats.`);
             return 'Unknown';
         }
         // if it's a group we need the content of the group
         if (row.group) {
             const childNodes = row.childrenAfterGroup;
             if (ArrayExtensions_1.default.IsNullOrEmpty(childNodes)) {
-                this.adaptableInstance.logger.warn(`No data in grid so returning type "Unknown" for Column: "${column.getColId()}"`);
+                this.adaptableInstance.logger.consoleError(`No data in grid, returning type "Unknown" for Column: "${column.getColId()}". This will impact several Adaptable features, such as Filters and ColumnFormats.`);
                 return 'Unknown';
             }
             row = childNodes[0];
@@ -368,7 +368,7 @@ class AgGridAdapter {
                     break;
             }
         }
-        this.adaptableInstance.logger.warn(`No defined type for column '${column.getColId()}'. Defaulting to type of first value: ${dataType}`);
+        this.adaptableInstance.logger.consoleWarn(`No defined type for column '${column.getColId()}'. Defaulting to type of first row value: ${dataType}`);
         return dataType;
     }
     getAbColDefValue(colType) {