@adaptabletools/adaptable 19.1.0 → 19.1.2-canary.0

package/src/Api/Internal/PredicateInternalApi.js

@@ -18,7 +18,7 @@ export class PredicateInternalApi extends ApiBase {
     getSystemFilterPredicateIds(scope) {
         const systemFilterPredicates = this.getPredicateOptions().systemFilterPredicates;
         if (typeof systemFilterPredicates === 'function') {
-            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('columnFilter'), moduleScope: 'columnFilter', columnScope: scope });
+            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('columnFilter'), moduleScope: 'columnFilter', columnScope: scope });
             return systemFilterPredicates(systemPredicateContext);
         }
         return systemFilterPredicates;
@@ -33,7 +33,7 @@ export class PredicateInternalApi extends ApiBase {
     getSystemAlertPredicateIds(scope) {
         const systemAlertPredicates = this.getPredicateOptions().systemAlertPredicates;
         if (typeof systemAlertPredicates === 'function') {
-            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('alert'), moduleScope: 'alert', columnScope: scope });
+            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('alert'), moduleScope: 'alert', columnScope: scope });
             return systemAlertPredicates(systemPredicateContext);
         }
         return systemAlertPredicates;
@@ -41,7 +41,7 @@ export class PredicateInternalApi extends ApiBase {
     getSystemBadgeStylePredicateIds(scope) {
         const systemBadgeStylePredicates = this.getPredicateOptions().systemBadgeStylePredicates;
         if (typeof systemBadgeStylePredicates === 'function') {
-            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('badgeStyle'), moduleScope: 'badgeStyle', columnScope: scope });
+            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('badgeStyle'), moduleScope: 'badgeStyle', columnScope: scope });
             return systemBadgeStylePredicates(systemPredicateContext);
         }
         return systemBadgeStylePredicates;
@@ -56,7 +56,7 @@ export class PredicateInternalApi extends ApiBase {
     getSystemFormatColumnPredicateIds(scope) {
         const systemFormatColumnPredicates = this.getPredicateOptions().systemFormatColumnPredicates;
         if (typeof systemFormatColumnPredicates === 'function') {
-            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('formatColumn'), moduleScope: 'formatColumn', columnScope: scope });
+            const systemPredicateContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('formatColumn'), moduleScope: 'formatColumn', columnScope: scope });
             return systemFormatColumnPredicates(systemPredicateContext);
         }
         return systemFormatColumnPredicates;
@@ -71,7 +71,7 @@ export class PredicateInternalApi extends ApiBase {
     getSystemFlashingCellPredicateIds(scope) {
         const systemFlashingCellPredicates = this.getPredicateOptions().systemFlashingCellPredicates;
         if (typeof systemFlashingCellPredicates === 'function') {
-            const systemPredicateContext = Object.assign({ systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('flashingcell'), moduleScope: 'flashingcell', columnScope: scope }, this.getAdaptableApi().internalApi.buildBaseContext());
+            const systemPredicateContext = Object.assign({ systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('flashingcell'), moduleScope: 'flashingcell', columnScope: scope }, this.getAdaptableInternalApi().buildBaseContext());
             return systemFlashingCellPredicates(systemPredicateContext);
         }
         return systemFlashingCellPredicates;

package/src/Api/Internal/ScheduleInternalApi.js

@@ -5,7 +5,7 @@ export class ScheduleInternalApi extends ApiBase {
      */
     fireScheduleTriggeredEvent(schedule) {
         const adaptableApi = this.getAdaptableApi();
-        const scheduleTriggeredInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { schedule: schedule });
+        const scheduleTriggeredInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { schedule: schedule });
         adaptableApi.eventApi.emit('ScheduleTriggered', scheduleTriggeredInfo);
     }
 }

package/src/Api/Internal/StyledColumnInternalApi.js

@@ -5,13 +5,13 @@ export class StyledColumnInternalApi extends ApiBase {
         if (column.dataType !== 'Number') {
             return undefined;
         }
-        return this.adaptable.getMinMaxCachedValueForColumn(column, 'min');
+        return this._adaptable.getMinMaxCachedValueForColumn(column, 'min');
     }
     getMaxValueForNumericColumn(column) {
         if (column.dataType !== 'Number') {
             return undefined;
         }
-        return this.adaptable.getMinMaxCachedValueForColumn(column, 'max');
+        return this._adaptable.getMinMaxCachedValueForColumn(column, 'max');
     }
     /**
      * Gets the Minimum Value to display for a Styled Column

package/src/Api/Internal/SystemStatusInternalApi.js

@@ -6,7 +6,7 @@ export class SystemStatusInternalApi extends ApiBase {
      * @param systemStatusMessageInfo Info about new System Status Message
      */
     fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo) {
-        const systemStatusMessageDisplayedInfo = Object.assign({ systemStatusMessageInfo: systemStatusMessageInfo }, this.getAdaptableApi().internalApi.buildBaseContext());
+        const systemStatusMessageDisplayedInfo = Object.assign({ systemStatusMessageInfo: systemStatusMessageInfo }, this.getAdaptableInternalApi().buildBaseContext());
         this.getAdaptableApi().eventApi.emit('SystemStatusMessageDisplayed', systemStatusMessageDisplayedInfo);
     }
     addSystemStatusMessageInfo(systemStatusMessageInfo) {

package/src/Api/Internal/TeamSharingInternalApi.js

@@ -5,8 +5,8 @@ export class TeamSharingInternalApi extends ApiBase {
      * @param sharedEntity Entity that has been changed
      */
     fireTeamSharingEntityChangedEvent(sharedEntity) {
-        if (this.adaptable.isReady) {
-            const teamSharingEntityChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { sharedEntity: sharedEntity });
+        if (this.isAdapTableReady()) {
+            const teamSharingEntityChangedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { sharedEntity: sharedEntity });
             this.getAdaptableApi().eventApi.emit('TeamSharingEntityChanged', teamSharingEntityChangedInfo);
         }
     }

package/src/Api/Internal/ThemeInternalApi.js

@@ -10,7 +10,7 @@ export class ThemeInternalApi extends ApiBase {
         return `ab--theme-${theme}`;
     }
     openInWindow() {
-        this.getAdaptableApi().internalApi.showPopupWindow({
+        this.getAdaptableInternalApi().showPopupWindow({
             id: SHOW_THEME_EDITOR,
             title: 'Theme',
             icon: 'theme',

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/Strategy/NoteModule.d.ts

@@ -3,7 +3,6 @@ import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 export declare class NoteModule extends AdaptableModuleBase implements IModule {
-    private adaptable;
     constructor(api: AdaptableApi);
     isModuleAvailable(): boolean;
     createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemDoClickFunction<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];

package/src/Strategy/NoteModule.js

@@ -4,7 +4,6 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 export class NoteModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.NoteModuleId, ModuleConstants.NoteFriendlyName, 'note', 'NotePopup', 'Notes', api);
-        this.adaptable = api.internalApi.getAdaptableInstance();
     }
     isModuleAvailable() {
         // Note module doesn't support autogenerated primary keys
@@ -21,17 +20,17 @@ export class NoteModule extends AdaptableModuleBase {
         if (menuContext.isRowGroupColumn || menuContext.isGroupedNode) {
             return;
         }
-        const isReadOnly = this.adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName) === 'ReadOnly';
+        const isReadOnly = this.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName) === 'ReadOnly';
         if (isReadOnly) {
             return undefined;
         }
-        const isCellNotable = typeof ((_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable) === 'function'
-            ? this.adaptable.api.optionsApi.getNoteOptions().isCellNotable(Object.assign({ gridCell: menuContext.gridCell }, createBaseContext(this.api)))
+        const isCellNotable = typeof ((_b = (_a = this.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable) === 'function'
+            ? this.api.optionsApi.getNoteOptions().isCellNotable(Object.assign({ gridCell: menuContext.gridCell }, createBaseContext(this.api)))
             : true;
         if (!isCellNotable) {
             return;
         }
-        const note = this.adaptable.api.noteApi.getNoteForCell({
+        const note = this.api.noteApi.getNoteForCell({
             PrimaryKeyValue: menuContext.primaryKeyValue,
             ColumnId: menuContext.adaptableColumn.columnId,
         });

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -241,7 +241,7 @@ export const scalarExpressionFunctions = {
                 // expression is syntactically valid, but operates with incompatible values
                 return;
             }
-            return sanitizedArguments.reduce((a, b) => a + b) / args.length;
+            return sanitizedArguments.reduce((a, b) => a + b) / sanitizedArguments.length;
         },
         description: 'Returns the average of inputted numbers',
         signatures: ['AVG(number, number, ...number)'],

package/src/Utilities/Services/AggregatedScalarLiveValue.js

@@ -39,7 +39,7 @@ export class AggregatedScalarLiveValue {
         const aggregationValue = this.getAggregationValue(rowNode);
         if (aggregationValue == undefined) {
             logOnce(`${this.aggregatedScalarExpression} :: aggregation value is NOT available!`, (message) => {
-                this.adaptableApi.internalApi.getAdaptableInstance().logger.warn(message);
+                this.adaptableApi.logWarn(message);
             });
             return;
         }

package/src/Utilities/Services/CellPopupService.js

@@ -74,8 +74,8 @@ export class CellPopupService {
             this.hidePopup();
             return;
         }
-        const cellNote = this.adaptable.api.noteApi.getNoteForCell(cellPosition);
-        const cellComments = this.adaptable.api.commentApi.getCommentThread(cellPosition);
+        const cellNote = this.api.noteApi.getNoteForCell(cellPosition);
+        const cellComments = this.api.commentApi.getCommentThread(cellPosition);
         const hasNotesOrComments = cellNote || cellComments;
         // call only if it is different
         if (CellPopupService.isSameAddress(openCellAddress, cellPosition)) {
@@ -92,8 +92,8 @@ export class CellPopupService {
             return;
         }
         // if open but this has no note, close
-        const cellNote = this.adaptable.api.noteApi.getNoteForCell(cellAddress);
-        const cellComments = this.adaptable.api.commentApi.getCommentThread(cellAddress);
+        const cellNote = this.api.noteApi.getNoteForCell(cellAddress);
+        const cellComments = this.api.commentApi.getCommentThread(cellAddress);
         const hasNotesOrComments = cellNote || cellComments;
         if (openCellAddress && !hasNotesOrComments) {
             // hide only if in edit mode

package/src/Utilities/Services/Fdc3Service.js

@@ -122,9 +122,7 @@ export class Fdc3Service {
         if (!this.getFdc3Options().enableLogging) {
             return;
         }
-        this.adaptableApi.internalApi
-            .getAdaptableInstance()
-            .logger.consoleLog(`FDC3::${type} - `, params.join(' : '));
+        this.adaptableApi.consoleLog(`FDC3::${type} - `, params.join(' : '));
     }
     logFdc3Error(error) {
         this.adaptableApi.consoleError(`FDC3 error`, error);

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

@@ -1,4 +1,3 @@
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableApi, AdaptableFlashingCell } from '../../types';
 import { TypeUuid } from '../../PredefinedConfig/Uuid';
 import { IAdaptableService } from './Interface/IAdaptableService';
@@ -8,7 +7,6 @@ export declare const FLASHING_CELL_ROW_KEY = "__ROW";
  */
 export declare class FlashingCellService implements IAdaptableService {
     private api;
-    adaptable: IAdaptable;
     gridCellsCurrentlyFlashing: Record<string, Record<string, TypeUuid>>;
     flashingCellsMapping: Record<TypeUuid, AdaptableFlashingCell>;
     constructor(api: AdaptableApi);

package/src/Utilities/Services/FlashingCellService.js

@@ -5,7 +5,6 @@ export const FLASHING_CELL_ROW_KEY = '__ROW';
 export class FlashingCellService {
     constructor(api) {
         this.api = api;
-        this.adaptable = api.internalApi.getAdaptableInstance();
         this.gridCellsCurrentlyFlashing = {};
         this.flashingCellsMapping = {};
     }
@@ -50,7 +49,7 @@ export class FlashingCellService {
     clearAllGridCellFlashes() {
         this.gridCellsCurrentlyFlashing = {};
         this.flashingCellsMapping = {};
-        this.adaptable.refreshAllCells(true);
+        this.api.gridApi.refreshAllCells(true);
     }
     isAnyFlashingCellActive() {
         return Object.keys(this.gridCellsCurrentlyFlashing).length > 0;
@@ -60,6 +59,6 @@ export class FlashingCellService {
         if (!cellDataChangedInfo) {
             return;
         }
-        this.adaptable.refreshCells([cellDataChangedInfo.rowNode], Object.keys(flashingCell.flashColumnIds), true);
+        this.api.gridApi.refreshCells([cellDataChangedInfo.rowNode], Object.keys(flashingCell.flashColumnIds), true);
     }
 }

package/src/Utilities/Services/RowEditService.js

@@ -1,9 +1,8 @@
 export class RowEditService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
-        const adaptableInstance = this.adaptableApi.internalApi.getAdaptableInstance();
-        if (adaptableInstance.adaptableOptions.actionRowOptions.autoHandle) {
-            adaptableInstance.api.eventApi.on('ActionRowSubmitted', (eventInfo) => this.autoHandleActionRowButtons(eventInfo));
+        if (adaptableApi.optionsApi.getActionRowOptions().autoHandle) {
+            adaptableApi.eventApi.on('ActionRowSubmitted', (eventInfo) => this.autoHandleActionRowButtons(eventInfo));
         }
     }
     autoHandleActionRowButtons(actionRowSubmittedInfo) {
@@ -20,8 +19,7 @@ export class RowEditService {
         }
         if (actionRowSubmittedInfo.type === 'rowCreated') {
             const { formData } = actionRowSubmittedInfo;
-            const setPrimaryKeyValueFunction = adaptableApi.internalApi.getAdaptableInstance().adaptableOptions.actionRowOptions
-                .setPrimaryKeyValue;
+            const setPrimaryKeyValueFunction = adaptableApi.optionsApi.getActionRowOptions().setPrimaryKeyValue;
             const newRowData = typeof setPrimaryKeyValueFunction === 'function'
                 ? setPrimaryKeyValueFunction(Object.assign({ rowData: formData }, adaptableApi.internalApi.buildBaseContext()))
                 : Object.assign({}, formData);

package/src/View/Alert/AlertStatusSubPanel.js

@@ -7,16 +7,16 @@ import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { ActiveAlertsPanel } from './ActiveAlertsPanel';
 const initialStyle = { color: '', background: '' };
 export const AlertStatusPanel = () => {
-    const adaptable = useAdaptable();
+    const adaptableApi = useAdaptable().api;
     const [style, setStyle] = React.useState(initialStyle);
-    const module = adaptable.ModuleService.getModuleById(ModuleConstants.AlertModuleId);
-    const statusbarHighlightDuration = adaptable.adaptableOptions.alertOptions.statusbarHighlightDuration;
+    const module = adaptableApi.internalApi.getModuleService().getModuleById(ModuleConstants.AlertModuleId);
+    const statusbarHighlightDuration = adaptableApi.optionsApi.getAlertOptions().statusbarHighlightDuration;
     /**
      * Using a selector to so the component updates each time an alert is triggered.
      */
     const alerts = useSelector((state) => state.System.AdaptableAlerts);
     const text = alerts.length == 0 ? '0 Alerts' : alerts.length == 1 ? '1 Alert' : alerts.length + ' Alerts';
-    const handleAction = React.useCallback(() => adaptable.api.alertApi.openAlertSettingsPanel(), []);
+    const handleAction = React.useCallback(() => adaptableApi.alertApi.openAlertSettingsPanel(), []);
     // blinking logic
     const previousAlerts = React.useRef(alerts);
     const timeoutId = React.useRef();

package/src/View/Charting/ShowChartButton.js

@@ -21,13 +21,13 @@ const BaseShowChartButton = (props) => {
         React.createElement(SimpleButton, { variant: "raised", tone: "success" }, "Open")));
 };
 const ShowAgChartButton = (props) => {
-    var _a, _b;
-    const adaptable = useAdaptable();
-    const chartingOptions = (_a = adaptable.adaptableOptions) === null || _a === void 0 ? void 0 : _a.chartingOptions;
+    var _a;
+    const adaptableApi = useAdaptable().api;
+    const chartingOptions = adaptableApi.optionsApi.getChartingOptions();
     const chartContainers = chartingOptions === null || chartingOptions === void 0 ? void 0 : chartingOptions.chartContainers;
     const { isOpen, showChart, closeChart } = useAgChartState(props.chartDefinition);
     const containerOptions = [
-        Object.assign({ label: (_b = chartingOptions.agGridContainerName) !== null && _b !== void 0 ? _b : AG_GRID_CHART_WINDOW, onClick: () => {
+        Object.assign({ label: (_a = chartingOptions.agGridContainerName) !== null && _a !== void 0 ? _a : AG_GRID_CHART_WINDOW, onClick: () => {
                 showChart(null);
             } }, (chartContainers
             ? chartContainers === null || chartContainers === void 0 ? void 0 : chartContainers.map((contianerDef) => ({

package/src/View/Comments/CommentsEditor.js

@@ -6,9 +6,9 @@ import Panel from '../../components/Panel';
 import SimpleButton from '../../components/SimpleButton';
 import * as CommentsRedux from '../../Redux/ActionsReducers/CommentsRedux';
 import { SystemCommentsAndNotesSelector } from '../../Redux/ActionsReducers/SystemRedux';
-import { formatDate } from '../../Utilities/ExpressionFunctions/dateUtils';
 import { useAdaptable } from '../AdaptableContext';
 import AdaptableInput from '../Components/AdaptableInput';
+import dateFnsFormat from 'date-fns/format';
 // Edit Mode
 // [author] [edit, delete]
 // [text-editor] * this is different
@@ -78,7 +78,7 @@ export const CommentsEditor = (props) => {
                     React.createElement(Flex, { mb: 2, alignItems: "center" },
                         React.createElement(Box, null,
                             React.createElement(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(Box, { "data-name": "comment-timestamp", fontSize: 2 }, formatDate(comment.Timestamp, 'MM.DD.YYYY HH:mm')))),
+                            comment.Timestamp && (React.createElement(Box, { "data-name": "comment-timestamp", fontSize: 2 }, dateFnsFormat(comment.Timestamp, adaptable.api.commentApi.internalApi.getCommentsDateFormat())))),
                         React.createElement(Box, { flex: 1 }),
                         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: () => {

package/src/View/Comments/CommentsPopup.js

@@ -7,7 +7,6 @@ import dateFnsFormat from 'date-fns/format';
 import { useAdaptable } from '../AdaptableContext';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
 import { AdaptableButtonComponent } from '../Components/AdaptableButton';
-import { DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME } from '../../Utilities/Constants/GeneralConstants';
 const tableDOMProps = {
     style: {
         minHeight: 160,
@@ -15,9 +14,7 @@ const tableDOMProps = {
     },
 };
 const CellComments = (props) => {
-    var _a;
     const adaptable = useAdaptable();
-    const dateFormat = (_a = adaptable.api.optionsApi.getCommentOptions().dateFormat) !== null && _a !== void 0 ? _a : DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME;
     const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Comment') === 'ReadOnly';
     const columnsMap = React.useMemo(() => {
         const columns = {
@@ -30,7 +27,7 @@ const CellComments = (props) => {
                 field: 'Timestamp',
                 maxWidth: 150,
                 valueGetter: (params) => {
-                    return dateFnsFormat(params.data.Timestamp, dateFormat);
+                    return dateFnsFormat(params.data.Timestamp, adaptable.api.commentApi.internalApi.getCommentsDateFormat());
                 },
             },
             text: {

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -31,7 +31,7 @@ export 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/DataImport/DataImportWizard/DataImportWizard.js

@@ -11,8 +11,9 @@ import { ValidationSection } from './sections/ValidationSection';
 export const DataImportWizard = (props) => {
     var _a;
     const adaptable = useAdaptable();
-    const dataImportOptions = adaptable.api.optionsApi.getDataImportOptions();
-    const module = adaptable.ModuleService.getModuleById('DataImport');
+    const adaptableApi = adaptable.api;
+    const dataImportOptions = adaptableApi.optionsApi.getDataImportOptions();
+    const module = adaptableApi.internalApi.getModuleService().getModuleById('DataImport');
     const [rowData, setRowData] = React.useState(null);
     const [file, setFile] = React.useState(null);
     const [text, setText] = React.useState('');
@@ -20,17 +21,17 @@ export const DataImportWizard = (props) => {
     // - columnsMap changes
     // - new data is loaded
     const [importType, setImportType] = React.useState('file');
-    const primaryKey = adaptable.api.optionsApi.getPrimaryKey();
+    const primaryKey = adaptableApi.optionsApi.getPrimaryKey();
     const hasDynamicallyAddedPrimaryKey = typeof dataImportOptions._getPrimaryKeyValue === 'function';
     const getPrimaryKeyValue = (rowData) => {
         if (hasDynamicallyAddedPrimaryKey) {
-            return dataImportOptions._getPrimaryKeyValue(Object.assign(Object.assign({}, createBaseContext(adaptable.api)), { rowData }));
+            return dataImportOptions._getPrimaryKeyValue(Object.assign(Object.assign({}, createBaseContext(adaptableApi)), { rowData }));
         }
         return rowData[primaryKey];
     };
     const preprocessRowData = (rowData) => {
         if (typeof (dataImportOptions === null || dataImportOptions === void 0 ? void 0 : dataImportOptions._preprocessRowData) === 'function') {
-            return dataImportOptions._preprocessRowData(Object.assign(Object.assign({}, createBaseContext(adaptable.api)), { rowData }));
+            return dataImportOptions._preprocessRowData(Object.assign(Object.assign({}, createBaseContext(adaptableApi)), { rowData }));
         }
         // by default just trim the keys
         let processedRowData = {};
@@ -75,7 +76,7 @@ export const DataImportWizard = (props) => {
                     fields.add(field);
                 });
             });
-            const allAbColumns = adaptable.api.columnApi.getColumns();
+            const allAbColumns = adaptableApi.columnApi.getColumns();
             const columnsMap = Array.from(fields).map((field) => {
                 const abColumn = allAbColumns.find((c) => {
                     // exact field match
@@ -128,7 +129,7 @@ export const DataImportWizard = (props) => {
     // ---- FILE HANDLERS ----
     const fileHandlers = React.useMemo(() => {
         var _a, _b;
-        const userDefinedHandlers = (_b = (_a = adaptable.api.optionsApi.getDataImportOptions()) === null || _a === void 0 ? void 0 : _a.fileHandlers) !== null && _b !== void 0 ? _b : [];
+        const userDefinedHandlers = (_b = (_a = adaptableApi.optionsApi.getDataImportOptions()) === null || _a === void 0 ? void 0 : _a.fileHandlers) !== null && _b !== void 0 ? _b : [];
         return [...userDefinedHandlers, ...systemFileHandlers];
     }, []);
     const supportedFileFormats = React.useMemo(() => {
@@ -136,11 +137,11 @@ export const DataImportWizard = (props) => {
     }, [fileHandlers]);
     const readFile = React.useCallback(async (file) => {
         var _a, _b;
-        const userDefinedFileHandlers = (_b = (_a = adaptable.api.optionsApi.getDataImportOptions()) === null || _a === void 0 ? void 0 : _a.fileHandlers) !== null && _b !== void 0 ? _b : [];
+        const userDefinedFileHandlers = (_b = (_a = adaptableApi.optionsApi.getDataImportOptions()) === null || _a === void 0 ? void 0 : _a.fileHandlers) !== null && _b !== void 0 ? _b : [];
         const fileExtension = `.${file.name.split('.').pop()}`;
         const handler = [...userDefinedFileHandlers, ...systemFileHandlers].find((fh) => fh.fileExtension === fileExtension);
         if (!handler) {
-            adaptable.api.logError(`No file handler found for file extension ${fileExtension}. Please provide a file handler in Data Import Options.`);
+            adaptableApi.logError(`No file handler found for file extension ${fileExtension}. Please provide a file handler in Data Import Options.`);
             return;
         }
         try {
@@ -150,7 +151,7 @@ export const DataImportWizard = (props) => {
             return data;
         }
         catch (_c) {
-            adaptable.api.logError(`Error reading file ${file.name}. Please check the file is valid.`);
+            adaptableApi.logError(`Error reading file ${file.name}. Please check the file is valid.`);
         }
     }, [adaptable]);
     const fileMessage = file ? (React.createElement(HelpBlock, { mb: 2 },
@@ -164,7 +165,7 @@ export const DataImportWizard = (props) => {
     const handleTextChange = React.useCallback(async (text) => {
         var _a;
         //
-        let textHandler = (_a = adaptable.api.optionsApi.getDataImportOptions()) === null || _a === void 0 ? void 0 : _a.textHandler;
+        let textHandler = (_a = adaptableApi.optionsApi.getDataImportOptions()) === null || _a === void 0 ? void 0 : _a.textHandler;
         if (!textHandler) {
             // regex to test for json
             const jsonRegex = /^\s*[\[{]/;
@@ -208,7 +209,7 @@ export const DataImportWizard = (props) => {
             return null;
         }
         return (_a = rowData === null || rowData === void 0 ? void 0 : rowData.reduce) === null || _a === void 0 ? void 0 : _a.call(rowData, (acc, rowData) => {
-            const error = dataImportOptions.validate(Object.assign({ rowData }, createBaseContext(adaptable.api)));
+            const error = dataImportOptions.validate(Object.assign({ rowData }, createBaseContext(adaptableApi)));
             const primaryKeyValue = getPrimaryKeyValue(rowData);
             if (error && primaryKeyValue && error.length) {
                 acc[primaryKeyValue] = error;
@@ -222,7 +223,7 @@ export const DataImportWizard = (props) => {
             const rowErrors = errors[getPrimaryKeyValue(row)];
             return !rowErrors || rowErrors.length === 0;
         });
-        adaptable.api.dataImportApi.internalApi.importData(validData);
+        adaptableApi.dataImportApi.internalApi.importData(validData);
     };
     return (React.createElement(OnePageAdaptableWizard, { data: null, moduleInfo: module.moduleInfo, finishText: "Import", onFinish: () => {
             handleFinish();

package/src/View/Layout/TransposedPopup.js

@@ -21,7 +21,7 @@ export 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);
@@ -181,7 +181,7 @@ export 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

@@ -6,7 +6,6 @@ import dateFnsFormat from 'date-fns/format';
 import { useAdaptable } from '../AdaptableContext';
 import { AdaptableButtonComponent } from '../Components/AdaptableButton';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
-import { DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME } from '../../Utilities/Constants/GeneralConstants';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
 const tableDOMProps = {
     style: {
@@ -16,12 +15,10 @@ const tableDOMProps = {
     },
 };
 export const NotePopup = (props) => {
-    var _a, _b, _c, _d;
     const adaptable = useAdaptable();
     const primaryKeyHeader = adaptable.api.columnApi.getPrimaryKeyColumn()
         ? adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId)
         : StringExtensions.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 : DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME;
     const allNotes = useSelector((state) => GetAllNotesSelector(state.Note));
     const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Note') === 'ReadOnly';
     const columnsMap = React.useMemo(() => {
@@ -46,7 +43,7 @@ export const NotePopup = (props) => {
             timestamp: {
                 field: 'Timestamp',
                 valueGetter: (params) => {
-                    return dateFnsFormat(params.data.Timestamp, dateFormat);
+                    return dateFnsFormat(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;