@adaptabletools/adaptable 22.0.0-canary.1 → 22.0.0-canary.11

package/src/Strategy/SmartEditModule.js

@@ -43,8 +43,8 @@ export class SmartEditModule extends AdaptableModuleBase {
             return {
                 Alert: {
                     alertType: 'generic',
-                    header: 'Smart Edit Error',
-                    message: 'Cannot edit while Grid is in Pivot Mode.',
+                    header: 'Smart Edit',
+                    message: 'Editing is not available in Pivot Mode.',
                     alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };
@@ -53,8 +53,8 @@ export class SmartEditModule extends AdaptableModuleBase {
             return {
                 Alert: {
                     alertType: 'generic',
-                    header: 'Smart Edit Error',
-                    message: 'No cells are selected.\nPlease select some cells.',
+                    header: 'Smart Edit',
+                    message: 'No cells selected. Please select one or more cells to continue.',
                     alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };
@@ -63,8 +63,8 @@ export class SmartEditModule extends AdaptableModuleBase {
             return {
                 Alert: {
                     alertType: 'generic',
-                    header: 'Smart Edit Error',
-                    message: 'Smart Edit only supports single column edit.\nPlease adjust cell selection.',
+                    header: 'Smart Edit',
+                    message: 'Smart Edit supports editing a single column at a time. Please adjust your selection.',
                     alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };
@@ -75,8 +75,8 @@ export class SmartEditModule extends AdaptableModuleBase {
                 return {
                     Alert: {
                         alertType: 'generic',
-                        header: 'Smart Edit Error',
-                        message: 'Smart Edit only supports editing of numeric columns.\nPlease adjust the cell selection.',
+                        header: 'Smart Edit',
+                        message: 'Smart Edit only applies to numeric columns. Please adjust your selection.',
                         alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                     },
                 };
@@ -87,8 +87,8 @@ export class SmartEditModule extends AdaptableModuleBase {
             return {
                 Alert: {
                     alertType: 'generic',
-                    header: 'Smart Edit Error',
-                    message: 'Smart Edit is not permitted on readonly cells.\nPlease adjust the cell selection.',
+                    header: 'Smart Edit',
+                    message: 'Smart Edit is not available for read-only cells. Please adjust your selection.',
                     alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
                 },
             };

package/src/Strategy/TeamSharingModule.js

@@ -11,18 +11,18 @@ import ArrayExtensions from '../Utilities/Extensions/ArrayExtensions';
 import flatten from 'lodash/flatten';
 import AdaptableHelper from '../Utilities/Helpers/AdaptableHelper';
 export class TeamSharingModule extends AdaptableModuleBase {
+    SKIP_TEAMSHARING_UPDATE_ACTIONS = [
+        TEAMSHARING_GET,
+        TEAMSHARING_SET,
+        TEAMSHARING_SHARE,
+        TEAMSHARING_IMPORT_ITEM,
+        TEAMSHARING_PROCESS_IMPORT,
+        TEAMSHARING_REMOVE_ITEM,
+        TEAMSHARING_LINK_ITEM,
+        TEAMSHARING_UPDATE_ITEM,
+    ];
     constructor(api) {
         super(ModuleConstants.TeamSharingModuleId, ModuleConstants.TeamSharingFriendlyName, 'folder-shared', 'TeamSharingPopup', 'Team Sharing allows users to share - at run-time - Adaptable Objects between colleagues.', api);
-        this.SKIP_TEAMSHARING_UPDATE_ACTIONS = [
-            TEAMSHARING_GET,
-            TEAMSHARING_SET,
-            TEAMSHARING_SHARE,
-            TEAMSHARING_IMPORT_ITEM,
-            TEAMSHARING_PROCESS_IMPORT,
-            TEAMSHARING_REMOVE_ITEM,
-            TEAMSHARING_LINK_ITEM,
-            TEAMSHARING_UPDATE_ITEM,
-        ];
     }
     onAdaptableReady() {
         if (this.api.teamSharingApi.isTeamSharingAvailable()) {

package/src/Strategy/Utilities/FormatColumn/getFormatColumnSettingsViewItems.js

@@ -1,8 +1,5 @@
 export const getFormatColumnSettingsViewItems = (formatColumn) => {
     let values = [];
-    if (formatColumn.CellAlignment) {
-        values.push(`Cell Alignment: ${formatColumn.CellAlignment}`);
-    }
     if (formatColumn.RowScope) {
         if (formatColumn.RowScope.ExcludeDataRows) {
             values.push('Exclude Data Rows');

package/src/Utilities/Constants/DocumentationLinkConstants.d.ts

@@ -11,8 +11,8 @@ export declare const QuantileAggregatedScalarQueryDocsLink = "https://www.adapta
 export declare const PredicateDocsLink = "https://www.adaptabletools.com/docs/adaptable-predicate";
 export declare const PrimaryKeyDocsLink = "https://www.adaptabletools.com/docs/getting-started-primary-key";
 export declare const LicenseDocsLink = "https://www.adaptabletools.com/buy/buying-adaptable-licensing";
-export declare const AdaptableOptionsDocsLink = "https://www.adaptabletools.com/docs/reference-options-overview";
-export declare const AgGridModulesDocsLink = "https://www.adaptabletools.com/docs/dev-guide-aggrid-modules-overview";
+export declare const AdaptableOptionsDocsLink = "https://www.adaptabletools.com/docs/technical-reference-adaptable-options";
+export declare const AgGridModulesDocsLink = "https://www.adaptabletools.com/docs/getting-started-aggrid-modules";
 export declare const AlertMessageDocsLink = "https://www.adaptabletools.com/docs/handbook-alerting-message";
 export declare const FormatColumnPlaceholderDocsLink = "https://www.adaptabletools.com/docs/handbook-column-formatting-display-format-placeholder";
-export declare const AgGridRequiredModulesDocsLink = "https://www.adaptabletools.com/docs/dev-guide-aggrid-modules-overview#mandatory-modules";
+export declare const AgGridRequiredModulesDocsLink = "https://www.adaptabletools.com/docs/getting-started-aggrid-modules#mandatory-modules";

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -12,8 +12,8 @@ export const QuantileAggregatedScalarQueryDocsLink = `${HOST_URL_DOCS}/adaptable
 export const PredicateDocsLink = `${HOST_URL_DOCS}/adaptable-predicate`;
 export const PrimaryKeyDocsLink = `${HOST_URL_DOCS}/getting-started-primary-key`;
 export const LicenseDocsLink = `${HOST_URL_ROOT}/buy/buying-adaptable-licensing`;
-export const AdaptableOptionsDocsLink = `${HOST_URL_DOCS}/reference-options-overview`;
-export const AgGridModulesDocsLink = `${HOST_URL_DOCS}/dev-guide-aggrid-modules-overview`;
+export const AdaptableOptionsDocsLink = `${HOST_URL_DOCS}/technical-reference-adaptable-options`;
+export const AgGridModulesDocsLink = `${HOST_URL_DOCS}/getting-started-aggrid-modules`;
 export const AlertMessageDocsLink = `${HOST_URL_DOCS}/handbook-alerting-message`;
 export const FormatColumnPlaceholderDocsLink = `${HOST_URL_DOCS}/handbook-column-formatting-display-format-placeholder`;
-export const AgGridRequiredModulesDocsLink = `${HOST_URL_DOCS}/dev-guide-aggrid-modules-overview#mandatory-modules`;
+export const AgGridRequiredModulesDocsLink = `${HOST_URL_DOCS}/getting-started-aggrid-modules#mandatory-modules`;

package/src/Utilities/ExpressionFunctions/deepMap.js

@@ -1,5 +1,8 @@
 const SORT_ASC_REVISION = (p1, p2) => sortAscending(p1.revision, p2.revision);
 export class DeepMap {
+    map = new Map();
+    length = 0;
+    revision = 0;
     static clone(map) {
         const clone = new DeepMap();
         map.visit((pair, keys) => {
@@ -8,37 +11,6 @@ export class DeepMap {
         return clone;
     }
     constructor(initial) {
-        this.map = new Map();
-        this.length = 0;
-        this.revision = 0;
-        this.visit = (fn) => {
-            this.map.forEach((_, k) => this.visitKey(k, this.map, [], fn));
-        };
-        this.visitDepthFirst = (fn) => {
-            this.visitWithNext([], fn);
-        };
-        this.visitWithNext = (parentKeys, fn, currentMap = this.map) => {
-            if (!currentMap) {
-                return;
-            }
-            let i = 0;
-            currentMap.forEach((_, key) => {
-                const pair = currentMap.get(key);
-                if (!pair) {
-                    return;
-                }
-                const { map } = pair;
-                const keys = [...parentKeys, key];
-                const next = map ? () => this.visitWithNext(keys, fn, map) : undefined;
-                if (pair.hasOwnProperty('value')) {
-                    fn(pair.value, keys, i, next);
-                    i++;
-                }
-                else {
-                    next?.();
-                }
-            });
-        };
         if (initial) {
             initial.forEach((entry) => {
                 const [keys, value] = entry;
@@ -222,6 +194,34 @@ export class DeepMap {
         // if it was called by fn, it won't be called again, as it's once-d
         next();
     }
+    visit = (fn) => {
+        this.map.forEach((_, k) => this.visitKey(k, this.map, [], fn));
+    };
+    visitDepthFirst = (fn) => {
+        this.visitWithNext([], fn);
+    };
+    visitWithNext = (parentKeys, fn, currentMap = this.map) => {
+        if (!currentMap) {
+            return;
+        }
+        let i = 0;
+        currentMap.forEach((_, key) => {
+            const pair = currentMap.get(key);
+            if (!pair) {
+                return;
+            }
+            const { map } = pair;
+            const keys = [...parentKeys, key];
+            const next = map ? () => this.visitWithNext(keys, fn, map) : undefined;
+            if (pair.hasOwnProperty('value')) {
+                fn(pair.value, keys, i, next);
+                i++;
+            }
+            else {
+                next?.();
+            }
+        });
+    };
     getArray(fn) {
         const result = [];
         this.visit((pair, keys) => {

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -639,7 +639,7 @@ export const scalarExpressionFunctions = {
             }
             return result;
         },
-        description: "Returns the percentage difference between a cell's current value and its previous value.",
+        description: "Returns percentage difference between a cell's current value and previous value",
         signatures: [
             'PERCENT_CHANGE( [colName], <INCREASE|DECREASE> )',
             'PERCENT_CHANGE( COL(name: string), <INCREASE|DECREASE> )',
@@ -684,7 +684,7 @@ export const scalarExpressionFunctions = {
             }
             return result;
         },
-        description: "Returns the absolute difference between a cell's current value and its previous value.",
+        description: "Returns absolute difference between a cell's current value and previous value",
         signatures: [
             'ABSOLUTE_CHANGE( [colName] )',
             'ABSOLUTE_CHANGE( COL(name: string) )',
@@ -716,7 +716,7 @@ export const scalarExpressionFunctions = {
             const previousValue = context.dataChangedEvent.oldValue;
             return currentColumnValue !== previousValue;
         },
-        description: "Returns true if a cell's current value is different from its previous value, otherwise false. If no column is provided, it checks if any value has changed.",
+        description: "Returns true if cell's current value is different from previous value, otherwise false; if no column is provided, it checks if any value has changed",
         signatures: ['ANY_CHANGE( [colName] )', 'ANY_CHANGE()'],
         examples: ['ANY_CHANGE([col1])', 'ANY_CHANGE()'],
         category: 'changes',

package/src/Utilities/Extensions/StringExtensions.d.ts

@@ -17,6 +17,7 @@ export declare function Humanize(str: string): string;
 export declare function ReplaceEmptySpacesWithUnderscore(str?: string): string;
 export declare function IsNumeric(str: string): boolean;
 export declare function UnescapeHtmlEntities(str: string): string;
+export declare function ReplaceAllOccurencesExceptLastOne(str: string, searchTerm: string, replacement: string): string;
 export declare const StringExtensions: {
     IsNull: typeof IsNull;
     IsNotNull: typeof IsNotNull;
@@ -37,5 +38,6 @@ export declare const StringExtensions: {
     ReplaceEmptySpacesWithUnderscore: typeof ReplaceEmptySpacesWithUnderscore;
     IsNumeric: typeof IsNumeric;
     UnescapeHtmlEntities: typeof UnescapeHtmlEntities;
+    ReplaceAllOccurencesExceptLastOne: typeof ReplaceAllOccurencesExceptLastOne;
 };
 export default StringExtensions;

package/src/Utilities/Extensions/StringExtensions.js

@@ -92,6 +92,21 @@ export function UnescapeHtmlEntities(str) {
     }
     return preparedStr;
 }
+export function ReplaceAllOccurencesExceptLastOne(str, searchTerm, replacement) {
+    // Find the index of the last occurrence of the search string
+    const lastIndex = str.lastIndexOf(searchTerm);
+    // If the string is not found, return the original string
+    if (lastIndex === -1) {
+        return str;
+    }
+    // Slice the string into two parts: before and after the last occurrence
+    const partBeforeLast = str.slice(0, lastIndex);
+    const partAfterLast = str.slice(lastIndex);
+    // Replace all occurrences in the first part
+    const replacedPart = partBeforeLast.replaceAll(searchTerm, replacement);
+    // Recombine the modified first part with the untouched second part
+    return replacedPart + partAfterLast;
+}
 export const StringExtensions = {
     IsNull,
     IsNotNull,
@@ -112,5 +127,6 @@ export const StringExtensions = {
     ReplaceEmptySpacesWithUnderscore,
     IsNumeric,
     UnescapeHtmlEntities,
+    ReplaceAllOccurencesExceptLastOne,
 };
 export default StringExtensions;

package/src/Utilities/Helpers/FormatHelper.js

@@ -28,7 +28,6 @@ export function NumberFormatter(input, options = {}, rowNode, column, api) {
     if (isNaN(n)) {
         return preparedInput.toString();
     }
-    const fractionsSepatator = options.FractionSeparator ? options.FractionSeparator : '.';
     let multiplier = options.Multiplier ? options.Multiplier : 1;
     if (options.Multiplier !== undefined) {
         n *= multiplier;
@@ -65,6 +64,7 @@ export function NumberFormatter(input, options = {}, rowNode, column, api) {
     }
     let s;
     let digitsToUse;
+    const fractionsSepatator = options.FractionSeparator ?? '.';
     if (options.Truncate || options.Ceiling || options.Round || options.Floor) {
         digitsToUse = 0;
     }
@@ -84,7 +84,14 @@ export function NumberFormatter(input, options = {}, rowNode, column, api) {
         s = s.replace(/\./g, options.FractionSeparator);
     }
     if (options.IntegerSeparator !== undefined) {
-        s = s.replace(/\,/g, options.IntegerSeparator);
+        // if fraction separator is not a comma then simply replace all instances
+        if (options.FractionSeparator !== ',') {
+            s = s.replace(/\,/g, options.IntegerSeparator);
+        }
+        else {
+            // otherwise don't replace the last instance
+            s = StringExtensions.ReplaceAllOccurencesExceptLastOne(s, ',', options.IntegerSeparator);
+        }
     }
     s = (options.Prefix || '') + s + (options.Suffix || '');
     if (options.Parentheses === true && preparedInput < 0) {

package/src/Utilities/Helpers/StyleHelper.js

@@ -80,6 +80,20 @@ export const convertAdaptableStyleToCSS = (style) => {
                 break;
         }
     }
+    if (style.Alignment) {
+        switch (style.Alignment) {
+            case 'Default':
+            case 'Left':
+                result.textAlign = 'left';
+                break;
+            case 'Right':
+                result.textAlign = 'right';
+                break;
+            case 'Center':
+                result.textAlign = 'center';
+                break;
+        }
+    }
     // assertion added to comply with the ag-Grid types
     return result;
 };

package/src/Utilities/MenuItem.js

@@ -11,6 +11,12 @@ export class MenuItemDoReduxAction {
         };
         this.reduxAction = reduxAction;
     }
+    name;
+    reduxAction;
+    label;
+    category;
+    isVisible;
+    icon;
 }
 export class MenuItemDoClickFunction {
     constructor(name, label, module, clickFunction, icon, isVisible) {
@@ -23,6 +29,12 @@ export class MenuItemDoClickFunction {
         };
         this.onClick = clickFunction;
     }
+    name;
+    onClick;
+    label;
+    category;
+    isVisible;
+    icon;
 }
 // A menu item which shows a popup screen when it is clieked
 export class MenuItemShowPopup {
@@ -36,4 +48,10 @@ export class MenuItemShowPopup {
         };
         this.reduxAction = PopupRedux.PopupShowScreen(module, componentName, popupParams);
     }
+    name;
+    reduxAction;
+    label;
+    category;
+    isVisible;
+    icon;
 }

package/src/Utilities/ObjectFactory.js

@@ -6,7 +6,7 @@ import { Bounce, Flip, Slide, Zoom } from '../components/Toastify';
 import { BLACK, getHexForName, LIGHT_GRAY } from '../View/UIHelper';
 import { isPivotLayout } from '../Api/Implementation/LayoutHelpers';
 export function CreateEmptyCustomSort() {
-    return { Uuid: createUuid(), ColumnId: EMPTY_STRING, SortedValues: [] };
+    return { Uuid: createUuid(), Name: EMPTY_STRING, ColumnId: EMPTY_STRING, SortedValues: [] };
 }
 export function CreateAdaptableComment(text, api) {
     const comment = {
@@ -44,6 +44,7 @@ export function CreateEmptyNamedQuery(expression) {
 export function CreateEmptyPlusMinusNudge() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         Scope: undefined,
         Rule: undefined,
         NudgeValue: PLUS_MINUS_DEFAULT_NUDGE_VALUE,
@@ -81,6 +82,7 @@ export function CreateRowChangedAlert(alertHeader, alertMessage, alertDefinition
 export function CreateEmptyAlertDefinition() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         Scope: { All: true },
         Rule: {
             Predicates: [],
@@ -92,6 +94,7 @@ export function CreateEmptyAlertDefinition() {
 export function CreateEmptyFlashingCellDefinition() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         Scope: { ColumnIds: [] },
         Rule: {
             Predicates: [
@@ -108,6 +111,7 @@ export function CreateInternalAlertDefinitionForMessages(messageType, alertPrope
     };
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         Scope: undefined,
         Rule: {
             Predicates: [],
@@ -129,6 +133,7 @@ export function CreateEmptyReport() {
 export function CreateEmptyBaseSchedule(scheduleType) {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: scheduleType,
         Schedule: CreateEmptySchedule(),
     };
@@ -136,6 +141,7 @@ export function CreateEmptyBaseSchedule(scheduleType) {
 export function CreateEmptyReminderSchedule() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: ScheduleType.Reminder,
         Schedule: CreateEmptySchedule(),
         Header: EMPTY_STRING,
@@ -148,6 +154,7 @@ export function CreateEmptyReminderSchedule() {
 export function CreateEmptyReportSchedule() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: ScheduleType.Report,
         Schedule: CreateEmptySchedule(),
         ReportName: EMPTY_STRING,
@@ -172,6 +179,7 @@ export function CreateEmptyOpenFinReport() {
 export function CreateEmptyIPushPullSchedule() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: ScheduleType.ipushpull,
         Schedule: CreateEmptySchedule(),
         IPushPullReport: CreateEmptyIPushPullReport(),
@@ -181,6 +189,7 @@ export function CreateEmptyIPushPullSchedule() {
 export function CreateEmptyOpenFinSchedule() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: ScheduleType.OpenFin,
         Schedule: CreateEmptySchedule(),
         OpenFinReport: CreateEmptyOpenFinReport(),
@@ -190,6 +199,7 @@ export function CreateEmptyOpenFinSchedule() {
 export function CreateIPushPullSchedule(iPushPullReport) {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: ScheduleType.ipushpull,
         Schedule: CreateEmptySchedule(),
         IPushPullReport: iPushPullReport,
@@ -199,6 +209,7 @@ export function CreateIPushPullSchedule(iPushPullReport) {
 export function CreateReportSchedule(reportName, reportFormat) {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         ScheduleType: ScheduleType.Report,
         Schedule: CreateEmptySchedule(),
         ReportName: reportName,
@@ -207,7 +218,6 @@ export function CreateReportSchedule(reportName, reportFormat) {
 }
 export function CreateEmptySchedule() {
     return {
-        Uuid: createUuid(),
         OneOffDate: undefined,
         DaysOfWeek: [],
         Hour: 0,
@@ -217,6 +227,7 @@ export function CreateEmptySchedule() {
 export function CreateEmptyShortcut() {
     return {
         Uuid: createUuid(),
+        Name: EMPTY_STRING,
         Scope: undefined,
         ShortcutKey: EMPTY_STRING,
         ShortcutValue: undefined,
@@ -225,10 +236,11 @@ export function CreateEmptyShortcut() {
 }
 export function CreateEmptyFormatColumn() {
     return {
+        Uuid: createUuid(),
+        Name: EMPTY_STRING,
         Scope: undefined,
         Style: CreateEmptyStyle(),
         DisplayFormat: undefined,
-        CellAlignment: undefined,
         RowScope: undefined,
         Target: 'cell',
     };
@@ -292,6 +304,7 @@ export function CreateEmptyStyle() {
         FontStyle: undefined,
         FontSize: undefined,
         ClassName: undefined,
+        Alignment: undefined,
     };
 }
 export function CreateSystemStatusMessageInfo(message, type, furtherInfo) {

package/src/Utilities/Services/AggregatedScalarLiveValue.js

@@ -8,6 +8,14 @@ const logOnce = (message, loggingFn) => {
     doOnceFlags[message] = true;
 };
 export class AggregatedScalarLiveValue {
+    source;
+    requestingModule;
+    adaptableApi;
+    getRowNodes;
+    aggregationReducerName;
+    aggregatedScalarExpression;
+    expressionEvaluation;
+    aggregationResult;
     constructor(source, requestingModule, adaptableApi, getRowNodes) {
         this.source = source;
         this.requestingModule = requestingModule;

package/src/Utilities/Services/AlertService.js

@@ -3,12 +3,11 @@ import Emitter from '../Emitter';
 import { combineLatest, of } from 'rxjs';
 import { AlertModuleId } from '../Constants/ModuleConstants';
 export class AlertService {
+    adaptableApi;
+    emitter;
+    reactiveAlertsMap = new Map();
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
-        this.reactiveAlertsMap = new Map();
-        this.onReactiveAlertTriggered = (callback) => {
-            return this.emitter.on('ReactiveAlertTriggered', callback);
-        };
         this.emitter = new Emitter();
     }
     destroy() {
@@ -18,6 +17,9 @@ export class AlertService {
         this.reactiveAlertsMap.clear();
         this.reactiveAlertsMap = null;
     }
+    onReactiveAlertTriggered = (callback) => {
+        return this.emitter.on('ReactiveAlertTriggered', callback);
+    };
     createReactiveAlert(alertDefinition) {
         // if there is already a reactive alert for this definition, delete it (possible in case of editing definitions),
         this.deleteReactiveAlert(alertDefinition);

package/src/Utilities/Services/AnnotationsService.js

@@ -5,6 +5,9 @@ import ArrayExtensions from '../Extensions/ArrayExtensions';
  * If there are active Notes or Comments it listens to Cell Selection and Mouse Enter events
  */
 export class AnnotationsService {
+    api;
+    adaptable;
+    isListeningToEvents;
     constructor(api) {
         this.api = api;
         this.isListeningToEvents = false;
@@ -25,7 +28,7 @@ export class AnnotationsService {
         if (a?.ColumnId === b?.ColumnId && a?.PrimaryKeyValue === b?.PrimaryKeyValue) {
             return true;
         }
-        // Primary keys retreived from the grid dom are always strings, so we must also consider them strings
+        // Primary keys retrieved from the grid dom are always strings, so we must also consider them strings
         if ((typeof a.PrimaryKeyValue === 'number' && typeof b.PrimaryKeyValue === 'string') ||
             (typeof b.PrimaryKeyValue === 'string' && typeof a.PrimaryKeyValue === 'number')) {
             return (a.PrimaryKeyValue.toString() === b.PrimaryKeyValue.toString() && a.ColumnId === b.ColumnId);

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -1,9 +1,10 @@
 import { CalculatedColumnModuleId } from '../Constants/ModuleConstants';
 import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
 export class CalculatedColumnExpressionService {
+    adaptableApi;
+    aggregatedScalarLiveValuesMap = new Map();
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
-        this.aggregatedScalarLiveValuesMap = new Map();
         this.adaptableApi = adaptableApi;
     }
     listentoCellDataChange(cellDataChangedInfo) {

package/src/Utilities/Services/ChartingService.js

@@ -1,6 +1,7 @@
 import * as InternalRedux from '../../Redux/ActionsReducers/InternalRedux';
 import ObjectFactory from '../ObjectFactory';
 export class ChartingService {
+    api;
     constructor(api) {
         this.api = api;
     }

package/src/Utilities/Services/DataService.js

@@ -4,10 +4,16 @@ import Helper from '../Helpers/Helper';
 // ~ 8 hours
 const MAX_TIMEFRAME_SIZE = 86400000;
 export class DataService {
+    adaptable;
+    emitter;
+    cellDataChangeLogSubject$;
+    cellDataChangeLog$;
+    rowDataChangeLogSubject$;
+    rowDataChangeLog$;
+    undoChangeLog;
+    undoChangeTimers;
     constructor(adaptable) {
         this.adaptable = adaptable;
-        this.on = (eventName, callback) => this.emitter.on(eventName, callback);
-        this.emit = (eventName, data) => this.emitter.emit(eventName, data);
         this.adaptable = adaptable;
         this.emitter = new Emitter();
         this.cellDataChangeLogSubject$ = new Subject();
@@ -31,6 +37,8 @@ export class DataService {
         this.undoChangeTimers.clear();
         this.undoChangeTimers = null;
     }
+    on = (eventName, callback) => this.emitter.on(eventName, callback);
+    emit = (eventName, data) => this.emitter.emit(eventName, data);
     CreateCellDataChangedEvent(cellDataChangedInfo) {
         if (cellDataChangedInfo.newValue != cellDataChangedInfo.oldValue) {
             this.emitter.emitSync('CellDataChanged', cellDataChangedInfo);
@@ -56,7 +64,7 @@ export 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(() => {
-            this.adaptable.logger.warn(`Undo change was NOT handled, this should NOT happen: PK(${change.primaryKeyValue}) Col(${change.column}) RevertedValue(${change.newValue}) NewValue(${change.oldValue})`);
+            this.adaptable.logger.warn(`Undo change was not handled within timeout: column="${change.column}", primaryKey="${change.primaryKeyValue}", from=${change.newValue} to=${change.oldValue}.`);
             this.extractUndoChange(change);
         }, UNDO_WAIT);
         this.undoChangeTimers.set(undoChangeKey, timeoutId);

package/src/Utilities/Services/Fdc3Service.js

@@ -1,11 +1,13 @@
 import { ContextConfiguration } from '../../AdaptableState/Common/Fdc3Context';
 import { Fdc3IntentConfiguration } from '../../AdaptableState/Common/Fdc3Intent';
 export class Fdc3Service {
+    adaptableApi;
+    contextHandlerSubscriptions = [];
+    intentHandlerSubscriptions = [];
+    loggedAgentError = false;
+    uiControlsDefaultConfiguration;
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
-        this.contextHandlerSubscriptions = [];
-        this.intentHandlerSubscriptions = [];
-        this.loggedAgentError = false;
         // 1. Subscribe to FDC3 events
         const adaptableHandleIntentFn = this.getFdc3Options().intents?.handleIntent;
         const listenForIntents = this.getFdc3Options().intents?.listensFor ?? [];
@@ -76,7 +78,7 @@ export class Fdc3Service {
     getDesktopAgent() {
         if (globalThis.fdc3 == null && !this.loggedAgentError) {
             this.loggedAgentError = true;
-            this.adaptableApi.consoleError('FDC3 Desktop Agent not found. This should be provided by the wrapper application.');
+            this.adaptableApi.consoleError('FDC3 Desktop Agent not found. The host application must provide the FDC3 agent on globalThis.fdc3.');
         }
         return globalThis.fdc3;
     }
@@ -159,11 +161,11 @@ export class Fdc3Service {
         if (!this.getFdc3Options().enableLogging) {
             return;
         }
-        this.adaptableApi.consoleLog(`FDC3::${type} - `, params.join(' : '));
+        this.adaptableApi.consoleLog(`FDC3 ${type}: ${params.join(' : ')}`);
     }
     logFdc3Error(error) {
-        this.adaptableApi.consoleError(`FDC3 error`, error);
-        this.adaptableApi.alertApi.showAlertError('FDC3 Error', 'See console for details');
+        this.adaptableApi.consoleError('FDC3 operation failed.', error);
+        this.adaptableApi.alertApi.showAlertError('FDC3', 'An error occurred. See the browser console for details.');
     }
     getFdc3Api() {
         return this.adaptableApi.fdc3Api;