@adaptabletools/adaptable 10.0.2 → 10.0.4-canary.2

package/src/Utilities/Constants/ModuleConstants.js

@@ -1,34 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataChangeHistoryModuleId = exports.QueryModuleId = exports.ToolPanelModuleId = exports.ThemeModuleId = exports.TeamSharingModuleId = exports.SystemStatusModuleId = exports.StateManagementModuleId = exports.SmartEditModuleId = exports.ShortcutModuleId = exports.ScheduleModuleId = exports.QuickSearchModuleId = exports.PlusMinusModuleId = exports.SparklineColumnModuleId = exports.GridInfoModuleId = exports.LayoutModuleId = exports.IPushPullModuleId = exports.Glue42ModuleId = exports.OpenFinModuleId = exports.FreeTextColumnModuleId = exports.FormatColumnModuleId = exports.ExportModuleId = exports.DataSourceModuleId = exports.DashboardModuleId = exports.CustomSortModuleId = exports.ConditionalStyleModuleId = exports.FilterModuleId = exports.ChartModuleId = exports.CellSummaryModuleId = exports.CalculatedColumnModuleId = exports.BulkUpdateModuleId = exports.AlertModuleId = void 0;
+exports.ToolPanelModuleId = exports.ThemeModuleId = exports.TeamSharingModuleId = exports.SystemStatusModuleId = exports.StateManagementModuleId = exports.SparklineColumnModuleId = exports.SmartEditModuleId = exports.ShortcutModuleId = exports.ScheduleModuleId = exports.QuickSearchModuleId = exports.QueryModuleId = exports.PlusMinusModuleId = exports.OpenFinModuleId = exports.LayoutModuleId = exports.IPushPullModuleId = exports.GridInfoModuleId = exports.Glue42ModuleId = exports.FreeTextColumnModuleId = exports.FormatColumnModuleId = exports.FilterModuleId = exports.ExportModuleId = exports.DataSourceModuleId = exports.DataChangeHistoryModuleId = exports.DashboardModuleId = exports.CustomSortModuleId = exports.ConditionalStyleModuleId = exports.ChartModuleId = exports.CellSummaryModuleId = exports.CalculatedColumnModuleId = exports.BulkUpdateModuleId = exports.AlertModuleId = void 0;
 exports.AlertModuleId = 'Alert';
 exports.BulkUpdateModuleId = 'BulkUpdate';
 exports.CalculatedColumnModuleId = 'CalculatedColumn';
 exports.CellSummaryModuleId = 'CellSummary';
 exports.ChartModuleId = 'Chart';
-exports.FilterModuleId = 'Filter';
 exports.ConditionalStyleModuleId = 'ConditionalStyle';
 exports.CustomSortModuleId = 'CustomSort';
 exports.DashboardModuleId = 'Dashboard';
+exports.DataChangeHistoryModuleId = 'DataChangeHistory';
 exports.DataSourceModuleId = 'DataSource';
 exports.ExportModuleId = 'Export';
+exports.FilterModuleId = 'Filter';
 exports.FormatColumnModuleId = 'FormatColumn';
 exports.FreeTextColumnModuleId = 'FreeTextColumn';
-exports.OpenFinModuleId = 'OpenFin';
 exports.Glue42ModuleId = 'Glue42';
+exports.GridInfoModuleId = 'GridInfo';
 exports.IPushPullModuleId = 'IPushPull';
 exports.LayoutModuleId = 'Layout';
-exports.GridInfoModuleId = 'GridInfo';
-exports.SparklineColumnModuleId = 'SparklineColumn';
+exports.OpenFinModuleId = 'OpenFin';
 exports.PlusMinusModuleId = 'PlusMinus';
+exports.QueryModuleId = 'Query';
 exports.QuickSearchModuleId = 'QuickSearch';
 exports.ScheduleModuleId = 'Schedule';
 exports.ShortcutModuleId = 'Shortcut';
 exports.SmartEditModuleId = 'SmartEdit';
+exports.SparklineColumnModuleId = 'SparklineColumn';
 exports.StateManagementModuleId = 'StateManagement';
 exports.SystemStatusModuleId = 'SystemStatus';
 exports.TeamSharingModuleId = 'TeamSharing';
 exports.ThemeModuleId = 'Theme';
 exports.ToolPanelModuleId = 'ToolPanel';
-exports.QueryModuleId = 'Query';
-exports.DataChangeHistoryModuleId = 'DataChangeHistory';

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -33,6 +33,7 @@ exports.DefaultAdaptableOptions = {
         isDraggable: false,
         transition: 'Slide',
         actionHandlers: undefined,
+        showApplicationIcon: false,
         flashingAlertDefaultProperties: {
             FlashDuration: 500,
             DownChangeStyle: {
@@ -50,8 +51,8 @@ exports.DefaultAdaptableOptions = {
     },
     containerOptions: {
         adaptableContainer: 'adaptable',
-        vendorContainer: 'grid',
-        vendorContainerWaitTimeout: 60000,
+        agGridContainer: 'grid',
+        agGridContainerWaitTimeout: 60000,
         modalContainer: undefined,
         chartContainer: undefined,
         systemStatusContainer: undefined,
@@ -117,8 +118,8 @@ exports.DefaultAdaptableOptions = {
         showAdaptableContextMenu: true,
         showAdaptableColumnMenu: true,
         showUngroupColumnMenuItem: true,
-        columnMenuOrder: ['vendor', 'adaptable', 'user'],
-        contextMenuOrder: ['vendor', 'adaptable', 'user'],
+        columnMenuOrder: ['aggrid', 'adaptable', 'user'],
+        contextMenuOrder: ['aggrid', 'adaptable', 'user'],
         columnMenuItems: undefined,
         contextMenuItems: undefined,
     },
@@ -127,10 +128,11 @@ exports.DefaultAdaptableOptions = {
         hideQuickFilterInput: undefined,
         indicateFilteredColumns: true,
         useAdaptableFilterForm: true,
-        useVendorFilterFormStyle: true,
+        useAgGridFilterFormStyle: true,
         useAdaptableQuickFilter: true,
         clearFiltersOnStartUp: false,
         quickFilterTrigger: 'mouseenter',
+        quickFilterValuesTrigger: 'mouseenter',
         filterActionOnUserDataChange: {
             applyFilter: GeneralConstants.FILTER_ALWAYS,
             throttleDelay: 0,
@@ -202,7 +204,7 @@ exports.DefaultAdaptableOptions = {
         width: UIHelper_1.default.getAdaptableToolPanelWidth(),
         minWidth: UIHelper_1.default.getAdaptableToolPanelWidth(),
         maxWidth: undefined,
-        toolPanelOrder: ['filters', 'columns', 'AdaptableToolPanel'],
+        toolPanelOrder: ['filters', 'columns', 'adaptable'],
     },
     queryLanguageOptions: {
         defaultBooleanFunctions: booleanExpressionFunctions_1.booleanExpressionFunctions,
@@ -216,7 +218,7 @@ exports.DefaultAdaptableOptions = {
     },
     dataChangeHistoryOptions: {
         activeByDefault: false,
-        filterDataChange: undefined,
+        showDataChange: undefined,
     },
     customPredicateDefs: [],
 };

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -227,7 +227,7 @@ exports.booleanExpressionFunctions = {
             const searchTerm = expressionFunctionUtils_1.getStringValue(context, String(args[0]));
             return (_a = context.api) === null || _a === void 0 ? void 0 : _a.columnApi.getColumns().some((column) => {
                 var _a;
-                const value = (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getNormalisedValueFromRowNode(context.node, column.ColumnId);
+                const value = (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getNormalisedValueFromRowNode(context.node, column.columnId);
                 const columnValue = expressionFunctionUtils_1.getStringValue(context, String(value));
                 return columnValue.indexOf(searchTerm) !== -1;
             });

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.js

@@ -23,7 +23,7 @@ exports.isTextSearchCaseInsensitive = (context) => !context.api.internalApi.isTe
 exports.getDataChangeLog$ = (context, columnNameFilter) => {
     let dataChangeLog$ = context.api.internalApi.getDataService().dataChangeLog$;
     // filter only the given column changes
-    dataChangeLog$ = dataChangeLog$.pipe(operators_1.filter((dataChangeLog) => dataChangeLog.columnId === columnNameFilter));
+    dataChangeLog$ = dataChangeLog$.pipe(operators_1.filter((dataChangeLog) => dataChangeLog.column.columnId === columnNameFilter));
     // filter based on the WHERE clause
     if (context.filterFn) {
         dataChangeLog$ = dataChangeLog$.pipe(operators_1.filter((value) => context.filterFn(value.rowNode)));
@@ -92,7 +92,7 @@ const validateColumnId = (columnId, api) => {
     if (!column) {
         throw new ExpressionEvaluationError_1.ExpressionEvaluationError('', `Column name "${columnId}" is not found`);
     }
-    if (!column.Queryable) {
+    if (!column.queryable) {
         throw new ExpressionEvaluationError_1.ExpressionEvaluationError('', `Column name "${columnId}" is not queryable`);
     }
 };

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -244,14 +244,15 @@ const getDataChangedInfoStub = (context) => {
     const rowNode = rowNodeStub;
     if (rowNode) {
         const primaryKeyValue = context.api.gridApi.getPrimaryKeyValueForRowNode(rowNode);
-        const columnId = (_a = context.api.columnApi.getQueryableColumns()[0]) === null || _a === void 0 ? void 0 : _a.ColumnId;
+        const columnId = (_a = context.api.columnApi.getQueryableColumns()[0]) === null || _a === void 0 ? void 0 : _a.columnId;
         const oldValue = context.api.gridApi.getCellRawValue(primaryKeyValue, columnId);
+        const column = context.api.columnApi.getColumnFromId(columnId);
         const newValue = oldValue;
         return {
             changedAt: Date.now(),
             rowNode,
             primaryKeyValue,
-            columnId,
+            column: column,
             oldValue,
             newValue,
         };

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -89,7 +89,7 @@ exports.scalarExpressionFunctions = {
             if (!column) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not found`);
             }
-            if (!column.Queryable) {
+            if (!column.queryable) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not queryable`);
             }
             return (_b = context.api) === null || _b === void 0 ? void 0 : _b.gridApi.getNormalisedValueFromRowNode(context.node, columnId);

package/src/Utilities/Helpers/DateHelper.d.ts

@@ -6,5 +6,5 @@ export declare const isValidDate: (date: Date) => boolean;
  */
 export declare const isValueValidDate: (data: any) => boolean;
 export declare const dateToISO: (date: Date | number | string) => string;
-export declare const parseToISO: (date: string | Date | number, dateFormat: string) => string;
-export declare const parseDate: (date: string, dateFormat: string) => Date | undefined;
+export declare const parseToISO: (date: string | Date | number, dateFormat?: string) => string;
+export declare const parseDateValue: (dateValue: string | Date | number, dateFormat?: string) => Date | undefined;

package/src/Utilities/Helpers/DateHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseDate = exports.parseToISO = exports.dateToISO = exports.isValueValidDate = exports.isValidDate = void 0;
+exports.parseDateValue = exports.parseToISO = exports.dateToISO = exports.isValueValidDate = exports.isValidDate = void 0;
 const tslib_1 = require("tslib");
 const parseISO_1 = tslib_1.__importDefault(require("date-fns/parseISO"));
 const parse_1 = tslib_1.__importDefault(require("date-fns/parse"));
@@ -25,26 +25,36 @@ exports.dateToISO = (date) => {
     return FormatHelper_1.DateFormatter(date, { Pattern: 'yyyy-MM-dd' });
 };
 exports.parseToISO = (date, dateFormat) => {
-    let dateInstance = date instanceof Date
-        ? date
-        : typeof date === 'number'
-            ? new Date(date)
-            : exports.parseDate(date, dateFormat);
-    let valid = dateInstance && exports.isValidDate(dateInstance);
-    if (!valid) {
-        dateInstance = new Date(date);
-        valid = exports.isValidDate(dateInstance);
-    }
-    return valid ? exports.dateToISO(dateInstance) : '';
+    const dateInstance = exports.parseDateValue(date, dateFormat);
+    return exports.isValidDate(dateInstance) ? exports.dateToISO(dateInstance) : '';
 };
-exports.parseDate = (date, dateFormat) => {
-    let d = parse_1.default(date, dateFormat, new Date());
-    if (!exports.isValidDate(d)) {
-        d = parseISO_1.default(date);
+exports.parseDateValue = (dateValue, dateFormat) => {
+    if (dateValue == undefined) {
+        return undefined;
+    }
+    if (dateValue instanceof Date) {
+        return !isNaN(dateValue.getTime()) ? dateValue : undefined;
+    }
+    let dateInstance;
+    if (typeof dateValue === 'number') {
+        dateInstance = new Date(dateValue);
+    }
+    else {
+        // typeof dateValue === 'string'
+        if (dateFormat) {
+            dateInstance = parse_1.default(dateValue, dateFormat, new Date());
+        }
+        else {
+            dateInstance = parseISO_1.default(dateValue);
+        }
+        if (!exports.isValidDate(dateInstance)) {
+            // last chance: try to use the native Date.parse(), https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse
+            dateInstance = new Date(Date.parse(dateValue));
+        }
     }
-    if (!exports.isValidDate(d)) {
-        LoggingHelper_1.LogAdaptableError(`Invalid date value "${date}" - cannot be converted to a Date instance. Please make sure you specify adaptableOptions.userInterfaceOptions.dateInputOptions.dateFormat correctly.`);
-        d = undefined;
+    if (!exports.isValidDate(dateInstance)) {
+        LoggingHelper_1.LogAdaptableError(`Invalid date value "${dateValue}" - cannot be converted to a Date instance. Please make sure you specify adaptableOptions.userInterfaceOptions.dateInputOptions.dateFormat correctly.`);
+        dateInstance = undefined;
     }
-    return d;
+    return dateInstance;
 };

package/src/Utilities/Helpers/PreviewHelper.js

@@ -39,11 +39,11 @@ function GetCellInfosFromPreview(previewInfo, bypassValidationWarnings) {
             if (previewResult.validationRules.length == 0) {
                 newValues.push({
                     primaryKeyValue: previewResult.id,
-                    columnId: previewInfo.columnId,
                     rawValue: previewResult.computedValue,
                     displayValue: previewResult.computedValue,
                     normalisedValue: previewResult.computedValue,
                     rowNode: previewResult.rowNode,
+                    column: previewInfo.column,
                 });
             }
         }
@@ -54,7 +54,7 @@ function GetCellInfosFromPreview(previewInfo, bypassValidationWarnings) {
             .forEach((pr) => {
             newValues.push({
                 primaryKeyValue: pr.id,
-                columnId: previewInfo.columnId,
+                column: previewInfo.column,
                 rawValue: pr.computedValue,
                 displayValue: pr.computedValue,
                 normalisedValue: pr.computedValue,

package/src/Utilities/Interface/Preview.d.ts

@@ -1,7 +1,8 @@
 import { AlertDefinition } from '../../PredefinedConfig/AlertState';
 import { RowNode } from '@ag-grid-community/all-modules';
+import { AdaptableColumn } from '../../../types';
 export interface PreviewInfo {
-    columnId: string;
+    column: AdaptableColumn;
     previewResults: PreviewResult[];
     previewValidationSummary: PreviewValidationSummary;
 }

package/src/Utilities/ObjectFactory.d.ts

@@ -61,7 +61,7 @@ export declare function CreateEmptySchedule(): Schedule;
 export declare function CreateEmptyShortcut(): Shortcut;
 export declare function CreateEmptyConditionalStyle(): ConditionalStyle;
 export declare function CreateEmptyFormatColumn(): FormatColumn;
-export declare function CreateEmptyFreeTextColumn(): FreeTextColumn;
+export declare function CreateEmptyFreeTextColumn(isFilterable: boolean): FreeTextColumn;
 export declare function CreateEmptyLayout(layout?: Partial<Layout> & {
     Name: string;
 }, adaptableColumns?: AdaptableColumn[]): Layout;

package/src/Utilities/ObjectFactory.js

@@ -74,6 +74,8 @@ function CreateEmptyCalculatedColumn(isFilterable) {
             Sortable: true,
             Pivotable: true,
             Aggregatable: true,
+            SuppressMenu: false,
+            SuppressMovable: false,
         },
     };
 }
@@ -334,13 +336,23 @@ function CreateEmptyFormatColumn() {
     };
 }
 exports.CreateEmptyFormatColumn = CreateEmptyFormatColumn;
-function CreateEmptyFreeTextColumn() {
+function CreateEmptyFreeTextColumn(isFilterable) {
     return {
         Uuid: Uuid_1.createUuid(),
         ColumnId: GeneralConstants_1.EMPTY_STRING,
         DefaultValue: GeneralConstants_1.EMPTY_STRING,
         FreeTextStoredValues: [],
         TextEditor: 'Inline',
+        FreeTextColumnSettings: {
+            Filterable: isFilterable,
+            Resizable: true,
+            Groupable: true,
+            Sortable: true,
+            Pivotable: true,
+            Aggregatable: true,
+            SuppressMenu: false,
+            SuppressMovable: false,
+        },
     };
 }
 exports.CreateEmptyFreeTextColumn = CreateEmptyFreeTextColumn;
@@ -348,7 +360,7 @@ function CreateEmptyLayout(layout, adaptableColumns) {
     return Object.assign(Object.assign({}, layout), { Uuid: Uuid_1.createUuid(), Columns: layout.Columns || [], ColumnSorts: layout.ColumnSorts || [], 
         //  ColumnFlexMap: layout.ColumnFlexMap || {},
         ColumnWidthMap: layout.ColumnWidthMap || {}, RowGroupedColumns: layout.RowGroupedColumns ||
-            (adaptableColumns ? adaptableColumns.filter((c) => c.IsGrouped).map((c) => c.ColumnId) : []) });
+            (adaptableColumns ? adaptableColumns.filter((c) => c.isGrouped).map((c) => c.columnId) : []) });
 }
 exports.CreateEmptyLayout = CreateEmptyLayout;
 function CreateEmptyStyle() {

package/src/Utilities/Services/DataService.js

@@ -30,8 +30,8 @@ class DataService {
     // we need this temporary "shared memory" because the value change and the AG Grid cellChanged event are asynchronous
     // in the first phase we keep the undone change
     logUndoChange(change) {
-        const { primaryKeyValue, columnId, oldValue, newValue } = change;
-        const undoChangeKey = this.getUndoChangeKey(primaryKeyValue, columnId, oldValue, newValue);
+        const { primaryKeyValue, column, oldValue, newValue } = change;
+        const undoChangeKey = this.getUndoChangeKey(primaryKeyValue, column.columnId, oldValue, newValue);
         this.undoChangeLog.set(undoChangeKey, change);
         // normally the extractUndoChange() should be executed right after this method
         // just to be sure that no 'zombie' undo change remains here (if something goes wrong with the undo value change)
@@ -39,16 +39,16 @@ class DataService {
         // why 2 and not 3 or 1? no good reason, only seems like a reasonable waiting time :)
         const UNDO_WAIT = 2000;
         const timeoutId = setTimeout(() => {
-            LoggingHelper_1.LogAdaptableInfo(`Undo change was NOT handled, this should NOT happen: PK(${change.primaryKeyValue}) Col(${change.columnId}) RevertedValue(${change.newValue}) NewValue(${change.oldValue})`);
+            LoggingHelper_1.LogAdaptableInfo(`Undo change was NOT handled, this should NOT happen: PK(${change.primaryKeyValue}) Col(${change.column}) RevertedValue(${change.newValue}) NewValue(${change.oldValue})`);
             this.extractUndoChange(change);
         }, UNDO_WAIT);
         this.undoChangeTimers.set(undoChangeKey, timeoutId);
     }
     // in the second phase, when AG-Grid triggers the cellChange event, we check if it corresponds to an undone change
     extractUndoChange(change) {
-        const { primaryKeyValue, columnId, oldValue, newValue } = change;
+        const { primaryKeyValue, column, oldValue, newValue } = change;
         // this is post-undo, so we have to swap the new& old values
-        const undoChangeKey = this.getUndoChangeKey(primaryKeyValue, columnId, newValue, oldValue);
+        const undoChangeKey = this.getUndoChangeKey(primaryKeyValue, column.columnId, newValue, oldValue);
         const result = this.undoChangeLog.get(undoChangeKey);
         this.undoChangeLog.delete(undoChangeKey);
         const timeoutId = this.undoChangeTimers.get(undoChangeKey);

package/src/Utilities/Services/LicenseService.js

@@ -23,19 +23,33 @@ var LicenseValidityType;
     LicenseValidityType["COMMERCIAL_EXPIRED_IN_SCOPE"] = "COMMERCIAL_EXPIRED_IN_SCOPE";
     LicenseValidityType["COMMERCIAL_EXPIRED_OUT_OF_SCOPE"] = "COMMERCIAL_EXPIRED_OUT_OF_SCOPE";
 })(LicenseValidityType = exports.LicenseValidityType || (exports.LicenseValidityType = {}));
+const SANDPACK_REGEX = /(https):\/\/\d+\-\d+\-\d\-(sandpack\.codesandbox\.io)/g;
+const SANDBOX_REGEX = /(https):\/\/\S+(\.csb\.app\/)/g;
+const origin = typeof window !== 'undefined' ? window.location.origin : '';
+const isInsideSandpack = () => {
+    const [_fullUrl, protocol, sandpackUrl] = Array.from(SANDPACK_REGEX.exec(origin) || []);
+    return protocol === 'https' && sandpackUrl === 'sandpack.codesandbox.io';
+};
+const isInsideSandbox = () => {
+    const [_fullUrl, protocol, sandboxUrl] = Array.from(SANDBOX_REGEX.exec(origin) || []);
+    return protocol === 'https' && sandboxUrl === '.csb.app/';
+};
 class LicenseService {
     constructor(adaptable, licenseKey, packageDetails) {
         this.adaptable = adaptable;
         this.adaptable = adaptable;
         let details = null;
-        if (licenseKey)
+        if (licenseKey) {
             try {
                 details = decode_1.decode(licenseKey);
             }
             catch (error) {
                 details = error;
             }
-        this.handleLicenseValidation(details, this.getValidityType(details, packageDetails));
+        }
+        if (!isInsideSandpack() && !isInsideSandbox()) {
+            this.handleLicenseValidation(details, this.getValidityType(details, packageDetails));
+        }
     }
     getValidityType(details, packageDetails) {
         if (!details) {

package/src/Utilities/Services/ReportService.js

@@ -160,14 +160,14 @@ class ReportService {
                 reportColumns = gridColumns;
                 break;
             case Enums_1.ReportColumnScope.VisibleColumns:
-                reportColumns = gridColumns.filter((c) => c.Visible);
+                reportColumns = gridColumns.filter((c) => c.visible);
                 break;
             case Enums_1.ReportColumnScope.SelectedColumns:
                 // we extract the selected columns from the grid columns to preserve the grid column order
                 const selectedColumnIds = this.adaptable.api.gridApi
                     .getSelectedCellInfo()
-                    .columns.map((column) => column.ColumnId);
-                reportColumns = gridColumns.filter((gridColumn) => selectedColumnIds.includes(gridColumn.ColumnId));
+                    .columns.map((column) => column.columnId);
+                reportColumns = gridColumns.filter((gridColumn) => selectedColumnIds.includes(gridColumn.columnId));
                 break;
             case Enums_1.ReportColumnScope.ScopeColumns:
                 if ('ColumnIds' in report.Scope) {
@@ -182,7 +182,7 @@ class ReportService {
                 break;
         }
         if (includePrimaryKey) {
-            const pkColumn = reportColumns.find((column) => column.ColumnId === this.adaptable.adaptableOptions.primaryKey);
+            const pkColumn = reportColumns.find((column) => column.columnId === this.adaptable.adaptableOptions.primaryKey);
             // TODO simplify after we fix the IsPrimaryKey bug
             // const pkColumn = reportColumns.find(column => column.IsPrimaryKey);
             if (!pkColumn && !!this.adaptable.api.columnApi.getPrimaryKeyColumn()) {
@@ -194,16 +194,16 @@ class ReportService {
     getReportData(report, includePrimaryKey = false) {
         var _a, _b;
         const columns = this.GetReportColumnsForReport(report, includePrimaryKey).map((column) => ({
-            ColumnId: column.ColumnId,
-            FriendlyName: column.FriendlyName,
-            DataType: column.DataType,
+            columnId: column.columnId,
+            friendlyName: column.friendlyName,
+            dataType: column.dataType,
         }));
         if (ArrayExtensions_1.default.IsNullOrEmpty(columns) &&
             report.ReportRowScope !== Enums_1.ReportRowScope.CustomRows) {
             return { columns: [], rows: [] };
         }
         const data = { columns, rows: [] };
-        const columnIds = columns.map((column) => column.ColumnId);
+        const columnIds = columns.map((column) => column.columnId);
         switch (report.ReportRowScope) {
             case Enums_1.ReportRowScope.AllRows:
                 this.adaptable.forAllRowNodesDo((rowNode) => {
@@ -240,7 +240,7 @@ class ReportService {
                     const rowPrimaryKeyValue = this.adaptable.getPrimaryKeyValueFromRowNode(rowNode);
                     const selectedRowCells = selectedCellsByPrimaryKey[rowPrimaryKeyValue];
                     if (selectedRowCells) {
-                        const selectedRowColumnIds = selectedRowCells.map((rowCell) => rowCell.columnId);
+                        const selectedRowColumnIds = selectedRowCells.map((rowCell) => rowCell.column.columnId);
                         const selectedColumnIds = columnIds.filter((columnId) => selectedRowColumnIds.includes(columnId));
                         const row = this.getRowObjectForColumnIds(rowNode, selectedColumnIds);
                         if (includePrimaryKey) {
@@ -275,8 +275,8 @@ class ReportService {
     }
     convertReportDataToArray(reportData) {
         return [
-            reportData.columns.map((column) => column.FriendlyName),
-            ...reportData.rows.map((row) => reportData.columns.map((column) => row[column.ColumnId])),
+            reportData.columns.map((column) => column.friendlyName),
+            ...reportData.rows.map((row) => reportData.columns.map((column) => row[column.columnId])),
         ];
     }
     getRowObjectForColumnIds(rowNode, columnIds) {
@@ -287,6 +287,7 @@ class ReportService {
     }
     PublishLiveLiveDataChangedEvent(reportDestination, liveDataTrigger, liveReport) {
         const liveDataChangedInfo = {
+            adaptableApi: this.adaptable.api,
             reportDestination: reportDestination,
             liveDataTrigger: liveDataTrigger,
             liveReport: liveReport,
@@ -329,7 +330,7 @@ class ReportService {
         return type === 'rawValue'
             ? cellRawValue
             : // type === formattedValue
-                this.adaptable.getFormattedValueFromRawValue(cellRawValue, columnId);
+                this.adaptable.getDisplayValueFromRawValue(columnId, cellRawValue);
     }
     computeCellExportValueFormat(columnType) {
         if (this.adaptable.adaptableOptions.exportOptions.exportFormatType === 'rawValue' ||

package/src/Utilities/Services/ValidationService.js

@@ -18,7 +18,7 @@ class ValidationService {
         }
         let editingRules = this.adaptable.api.alertApi
             .getAlertDefinitionsWithPreventEdit()
-            .filter((v) => this.adaptable.api.scopeApi.isColumnInScope(this.adaptable.api.columnApi.getColumnFromId(dataChangedInfo.columnId), v.Scope));
+            .filter((v) => this.adaptable.api.scopeApi.isColumnInScope(dataChangedInfo.column, v.Scope));
         let failedValidations = [];
         if (ArrayExtensions_1.ArrayExtensions.IsNotEmpty(editingRules)) {
             editingRules.forEach((alertDefinition) => {
@@ -55,13 +55,12 @@ class ValidationService {
         return true;
     }
     IsAlertDefinitionTriggered(alertDefinition, dataChangedEvent) {
-        const column = this.adaptable.api.columnApi.getColumnFromId(dataChangedEvent.columnId);
         return this.adaptable.api.predicateApi.handlePredicate(alertDefinition.Rule.Predicate, {
             value: dataChangedEvent.newValue,
             oldValue: dataChangedEvent.oldValue,
-            displayValue: this.adaptable.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.columnId),
+            displayValue: this.adaptable.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.column.columnId),
             node: dataChangedEvent.rowNode,
-            column,
+            column: dataChangedEvent.column,
         }, false);
     }
     performServerValidation(dataChangedInfo, config) {
@@ -82,7 +81,7 @@ class ValidationService {
                     if (!row) {
                         return;
                     }
-                    row[(_b = this.adaptable.api.columnApi.getVendorGridColumnFieldForColumn(dataChangedInfo.columnId)) !== null && _b !== void 0 ? _b : dataChangedInfo.columnId] = validationResult.NewValue;
+                    row[(_b = this.adaptable.api.columnApi.getAgGridColumnFieldForAdaptableColumn(dataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : dataChangedInfo.column.columnId] = validationResult.NewValue;
                     this.adaptable.api.gridApi.updateGridData([row]);
                     if (StringExtensions_1.default.IsNotNullOrEmpty(validationResult.ValidationMessage) &&
                         this.adaptable.adaptableOptions.editOptions.displayServerValidationMessages) {

package/src/Utilities/runIfNotResolvedIn.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Calls the callback if the promise does not resolve in a amount of time.
+ *
+ * @param promise
+ * @param callback Called if promise does not resolve in the time defined by 'delay'
+ * @param delay Time after which if the promise was not resolved the callback (fn) is called.
+ */
+export declare const runIfNotResolvedIn: <T>(promise: Promise<T>, callback: () => void, delay?: number) => Promise<T>;

package/src/Utilities/runIfNotResolvedIn.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runIfNotResolvedIn = void 0;
+/**
+ * Calls the callback if the promise does not resolve in a amount of time.
+ *
+ * @param promise
+ * @param callback Called if promise does not resolve in the time defined by 'delay'
+ * @param delay Time after which if the promise was not resolved the callback (fn) is called.
+ */
+exports.runIfNotResolvedIn = async (promise, callback, delay = 100) => {
+    let isFulfilled = false;
+    promise === null || promise === void 0 ? void 0 : promise.then(() => {
+        isFulfilled = true;
+    });
+    (async () => {
+        await new Promise((resolve) => setTimeout(resolve, delay));
+        if (!isFulfilled) {
+            callback();
+        }
+    })();
+    return promise;
+};

package/src/View/AdaptableView.js

@@ -15,9 +15,9 @@ const ChartEnums_1 = require("../PredefinedConfig/Common/ChartEnums");
 const AdaptableLoadingScreen_1 = require("./Components/Popups/AdaptableLoadingScreen");
 const Toastify_1 = require("../components/Toastify");
 const renderWithAdaptableContext_1 = require("./renderWithAdaptableContext");
-const ProgressIndicator_1 = require("./Export/ProgressIndicator");
 const License_1 = require("./License");
 const ExportCustomDestinationFormPopups_1 = require("./Export/ExportCustomDestinationFormPopups");
+const ProgressIndicator_1 = require("../components/ProgressIndicator/ProgressIndicator");
 class AdaptableView extends React.Component {
     render() {
         var _a, _b, _c, _d, _e;

package/src/View/AdaptableViewFactory.d.ts

@@ -1,7 +1,8 @@
+import * as React from 'react';
 import { ConnectedComponent } from 'react-redux';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 export declare const AdaptableViewFactory: IAdaptableViewFactory;
-export declare const AdaptableViewPanelFactory: Map<AdaptableModule, ConnectedComponent<any, any>>;
+export declare const AdaptableViewPanelFactory: Map<AdaptableModule, React.FunctionComponent<any> | ConnectedComponent<any, any>>;
 export interface IAdaptableViewFactory {
     [key: string]: any;
 }

package/src/View/AdaptableViewFactory.js

@@ -44,6 +44,7 @@ const ThemeViewPanel_1 = require("./Theme/ThemeViewPanel");
 const DataSourceViewPanel_1 = require("./DataSource/DataSourceViewPanel");
 const DataChangeHistoryPopup_1 = require("./DataChangeHistory/DataChangeHistoryPopup");
 const DataChangeHistoryViewPanel_1 = require("./DataChangeHistory/DataChangeHistoryViewPanel");
+const StateManagementViewPanel_1 = require("./StateManagement/StateManagementViewPanel");
 exports.AdaptableViewFactory = {
     ExpandedQueryPopup: ExpandedQueryPopup_1.ExpandedQueryPopup,
     AlertPopup: AlertPopup_1.AlertPopup,
@@ -88,4 +89,5 @@ exports.AdaptableViewPanelFactory = new Map([
     [ModuleConstants.ThemeModuleId, ThemeViewPanel_1.ThemeViewPanelControl],
     [ModuleConstants.DataSourceModuleId, DataSourceViewPanel_1.DataSourceViewPanelControl],
     [ModuleConstants.DataChangeHistoryModuleId, DataChangeHistoryViewPanel_1.DataChangeHistoryViewPanelControl],
+    [ModuleConstants.StateManagementModuleId, StateManagementViewPanel_1.StateManagementViewPanel],
 ]);