@adaptabletools/adaptable 10.0.0 → 10.0.4-canary.0

package/src/Strategy/PlusMinusModule.js

@@ -22,7 +22,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.api.scopeApi.scopeHasColumns(plusMinusNudge.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(plusMinusNudge.Scope)
-                .map((adaptableColumn) => adaptableColumn.ColumnId);
+                .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
@@ -52,7 +52,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.shouldHandleKeyDown = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(plusMinusNudges);
     }
     addColumnMenuItems(column) {
-        if (column && this.isModuleEditable() && column.DataType == 'Number') {
+        if (column && this.isModuleEditable() && column.dataType == 'Number') {
             let popupParam = {
                 column: column,
                 action: 'New',
@@ -86,15 +86,14 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let failedPreventEdits = [];
         let side = direction == 'up' ? 1 : -1;
         cellsToUpdate.forEach((gridCell) => {
-            let selectedColumn = this.api.columnApi.getColumnFromId(gridCell.columnId);
-            if (selectedColumn &&
-                selectedColumn.DataType == Enums_1.DataType.Number &&
-                !selectedColumn.ReadOnly) {
+            if (gridCell.column &&
+                gridCell.column.dataType == Enums_1.DataType.Number &&
+                !gridCell.column.readOnly) {
                 let foundRule;
                 let replacementGridCell;
                 plusMinusNudges.forEach((pmr) => {
                     if (!foundRule) {
-                        if (this.api.scopeApi.isColumnInScope(selectedColumn, pmr.Scope)) {
+                        if (this.api.scopeApi.isColumnInScope(gridCell.column, pmr.Scope)) {
                             if (this.api.gridApi.areCellsEditable([gridCell])) {
                                 //for aggrid as we are getting strings sometimes
                                 if (typeof gridCell.rawValue != 'number') {
@@ -109,7 +108,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                                     //   computedValue=   parseFloat(computedValue.toFixed(12));
                                     replacementGridCell = {
                                         primaryKeyValue: gridCell.primaryKeyValue,
-                                        columnId: gridCell.columnId,
+                                        column: gridCell.column,
                                         rawValue: computedValue,
                                         displayValue: computedValue,
                                         normalisedValue: computedValue,
@@ -124,7 +123,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     const dataChangedEvent = this.api.internalApi.buildDataChangedInfo({
                         oldValue: Number(gridCell.rawValue),
                         newValue: replacementGridCell.rawValue,
-                        columnId: gridCell.columnId,
+                        column: gridCell.column,
                         primaryKeyValue: gridCell.primaryKeyValue,
                         rowNode: gridCell.rowNode,
                         trigger: 'edit',

package/src/Strategy/SmartEditModule.js

@@ -23,8 +23,8 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         let menuItemShowPopup = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleEditable()) {
             if (menuContext.adaptableColumn &&
-                menuContext.adaptableColumn.DataType == Enums_1.DataType.Number &&
-                !menuContext.adaptableColumn.ReadOnly &&
+                menuContext.adaptableColumn.dataType == Enums_1.DataType.Number &&
+                !menuContext.adaptableColumn.readOnly &&
                 menuContext.isSelectedCell &&
                 menuContext.isSingleSelectedColumn &&
                 this.api.gridApi.areCellsEditable(menuContext.selectedCellInfo.gridCells)) {
@@ -75,7 +75,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         let column = selectedCellInfo.columns[0];
         if (column) {
-            if (column.DataType != Enums_1.DataType.Number) {
+            if (column.dataType != Enums_1.DataType.Number) {
                 return {
                     Alert: {
                         header: 'Smart Edit Error',
@@ -84,7 +84,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     },
                 };
             }
-            if (column.ReadOnly) {
+            if (column.readOnly) {
                 return {
                     Alert: {
                         header: 'Smart Edit Error',
@@ -114,7 +114,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             if (ArrayExtensions_1.default.IsNotNullOrEmpty(selectedCellInfo.columns)) {
                 let column = selectedCellInfo.columns[0];
                 if (column) {
-                    columnId = column.ColumnId;
+                    columnId = column.columnId;
                     selectedCellInfo.gridCells.forEach((selectedCell) => {
                         let newValue;
                         switch (smartEditOperation) {
@@ -138,7 +138,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         let dataChangedEvent = this.api.internalApi.buildDataChangedInfo({
                             oldValue: Number(selectedCell.rawValue),
                             newValue: newValue,
-                            columnId: selectedCell.columnId,
+                            column: selectedCell.column,
                             primaryKeyValue: selectedCell.primaryKeyValue,
                             rowNode: selectedCell.rowNode,
                             trigger: 'edit',

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -131,6 +131,7 @@ exports.DefaultAdaptableOptions = {
         useAdaptableQuickFilter: true,
         clearFiltersOnStartUp: false,
         quickFilterTrigger: 'mouseenter',
+        quickFilterValuesTrigger: 'mouseenter',
         filterActionOnUserDataChange: {
             applyFilter: GeneralConstants.FILTER_ALWAYS,
             throttleDelay: 0,

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

@@ -1,4 +1,10 @@
 export declare const isValidDate: (date: Date) => boolean;
+/**
+ * Checks if the data contains a value that represents a valid date.
+ *
+ * @param data any kind of data
+ */
+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.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"));
@@ -9,30 +9,52 @@ const FormatHelper_1 = require("./FormatHelper");
 exports.isValidDate = (date) => {
     return date instanceof Date && !isNaN(date.getTime());
 };
+/**
+ * Checks if the data contains a value that represents a valid date.
+ *
+ * @param data any kind of data
+ */
+exports.isValueValidDate = (data) => {
+    if (!data || typeof data === 'boolean') {
+        return false;
+    }
+    const date = new Date(data);
+    return !isNaN(date.getTime());
+};
 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: this.adaptable.api.columnApi.getColumnFromId(previewInfo.columnId),
                 });
             }
         }
@@ -54,7 +54,7 @@ function GetCellInfosFromPreview(previewInfo, bypassValidationWarnings) {
             .forEach((pr) => {
             newValues.push({
                 primaryKeyValue: pr.id,
-                columnId: previewInfo.columnId,
+                column: this.adaptable.api.columnApi.getColumnFromId(previewInfo.columnId),
                 rawValue: pr.computedValue,
                 displayValue: pr.computedValue,
                 normalisedValue: pr.computedValue,

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/MetamodelService.js

@@ -16,6 +16,7 @@ class MetamodelService {
     buildGridInfoOptions() {
         const gridInfoOptions = new Map();
         const adaptableMetamodel = adaptable_metamodel_1.ADAPTABLE_METAMODEL;
+        console.log({ adaptableMetamodel });
         const adaptableOptionsMetamodel = adaptableMetamodel['AdaptableOptions'];
         const adaptableOptionsValues = this.adaptable.adaptableOptions;
         const adaptableOptionsDefaultValues = DefaultAdaptableOptions_1.DefaultAdaptableOptions;

package/src/Utilities/Services/ModuleService.js

@@ -76,62 +76,69 @@ class ModuleService {
     }
     getModuleDocumentationPageByModule(adaptableModule) {
         let url = `${DocumentationLinkConstants_1.HOST_URL_DOCS}/`;
-        let moduleUrl = url + 'adaptable-modules/';
+        let notificationUrl = url + 'notifications/';
+        let editingUrl = url + 'editing/';
+        let searchingUrl = url + 'searching/';
+        let filteringUrl = url + 'filtering/';
+        let themingUrl = url + 'theming/';
+        let stylingUrl = url + 'styling/';
+        let advancedFeaturesUrl = url + 'advanced-features/';
+        let gridManagementUrl = url + 'grid-management/';
         let userInterfaceUrl = url + 'user-interface/';
         let pluginUrl = url + 'plugins/';
         switch (adaptableModule) {
             case 'Alert':
-                return moduleUrl + 'alert-module';
+                return notificationUrl + 'alerts-module';
             case 'BulkUpdate':
-                return moduleUrl + 'bulk-update-module';
+                return editingUrl + 'bulk-update-module';
             case 'CalculatedColumn':
-                return moduleUrl + 'calculated-column-module';
+                return advancedFeaturesUrl + 'calculated-column-module';
             case 'CellSummary':
-                return moduleUrl + 'cell-summary-module';
+                return advancedFeaturesUrl + 'cell-summary-module';
             case 'ConditionalStyle':
-                return moduleUrl + 'conditional-style-module';
+                return stylingUrl + 'conditional-style-module';
             case 'CustomSort':
-                return moduleUrl + 'custom-sort-module';
+                return advancedFeaturesUrl + 'custom-sort-module';
             case 'Dashboard':
                 return userInterfaceUrl + 'dashboard';
             case 'DataSource':
-                return moduleUrl + 'data-source-module';
+                return searchingUrl + 'data-source-module';
             case 'Export':
-                return moduleUrl + 'export-module';
+                return gridManagementUrl + 'export-module';
             case 'Filter':
-                return moduleUrl + 'filter-module';
+                return filteringUrl + 'filter-module';
             case 'FormatColumn':
-                return moduleUrl + 'format-column-module';
+                return stylingUrl + 'format-column-module';
             case 'FreeTextColumn':
-                return moduleUrl + 'free-text-column-module';
+                return advancedFeaturesUrl + 'freetext-column-module';
             case 'GridInfo':
-                return moduleUrl + 'grid-info-module';
+                return advancedFeaturesUrl + 'grid-info-module';
             case 'Layout':
-                return moduleUrl + 'layout-module';
+                return advancedFeaturesUrl + 'layout-module';
             case 'PlusMinus':
-                return moduleUrl + 'plus-minus-module';
+                return editingUrl + 'plus-minus-module';
             case 'Query':
-                return moduleUrl + 'query-module';
+                return searchingUrl + 'query-module';
             case 'QuickSearch':
-                return moduleUrl + 'quick-search-module';
+                return searchingUrl + 'quick-search-module';
             case 'Schedule':
-                return moduleUrl + 'schedule-module';
+                return advancedFeaturesUrl + 'schedule-module';
             case 'Shortcut':
-                return moduleUrl + 'shortcut-module';
+                return editingUrl + 'shortcut-module';
             case 'SmartEdit':
-                return moduleUrl + 'smart-edit-module';
+                return editingUrl + 'smart-edit-module';
             case 'StateManagement':
-                return moduleUrl + 'state-management-module';
+                return advancedFeaturesUrl + 'adaptable-state-overview';
             case 'SystemStatus':
-                return moduleUrl + 'system-status-module';
+                return notificationUrl + 'system-status-module';
             case 'TeamSharing':
                 return url + 'key-topics/team-sharing';
             case 'Theme':
-                return moduleUrl + 'theme-module';
+                return themingUrl + 'using-themes';
             case 'ToolPanel':
                 return userInterfaceUrl + 'tool-panel';
             case 'DataChangeHistory':
-                return moduleUrl + 'change-history-module';
+                return editingUrl + 'change-history-module';
             case 'Chart':
                 return pluginUrl + 'chart/chart-plugin';
             case 'SparklineColumn':

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) {
@@ -329,7 +329,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.getVendorGridColumnFieldForColumn(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;