@adaptabletools/adaptable 23.0.4 → 23.0.5-canary.1

package/src/Api/Implementation/LayoutHelpers.js

@@ -29,12 +29,9 @@ function cleanupAdaptableObjectPrimitives(layout) {
     const l = layout;
     for (const key in l) {
         if (key === 'ColumnFilters') {
-            // we don't want to cleanup ColumnFilters
-            // as we rely on the Uuids for identifying the filters
             if (Array.isArray(l[key])) {
                 l[key].forEach((item) => {
                     if (typeof item === 'object') {
-                        // but we do want to cleanup further down - eg: predicates in the filter
                         for (const k in item) {
                             if (typeof item[k] === 'object') {
                                 removeAdaptableObjectPrimitivesInlineDeep(item[k]);
@@ -50,11 +47,6 @@ function cleanupAdaptableObjectPrimitives(layout) {
         }
     }
 }
-/**
- * Compares 2 Layouts for equality
- * @param layout1 First Layout
- * @param layout2 Second Layout
- */
 export const areLayoutsEqual = (layout1, layout2) => {
     if (!layout1 && !layout2) {
         return true;
@@ -83,7 +75,6 @@ export const normalizePivotLayout = (pivotLayout) => {
     return pivotLayout;
 };
 const errorOnceMessages = new Map();
-/** Clears module-scoped dedupe state when a new Adaptable instance starts (e.g. Playwright retries). */
 export const resetLayoutHelperErrorOnceMessages = () => {
     errorOnceMessages.clear();
 };
@@ -173,7 +164,6 @@ export const checkForDuplicateColumns = (layout) => {
             layout.TableColumns.reduce((acc, col) => {
                 acc[col] = (acc[col] || 0) + 1;
                 if (acc[col] > 1) {
-                    // if you change this message, make sure you also update the associated test error-on-duplicate-column.spec.ts
                     errorOnce(`Duplicate column "${col}" in layout "${layout.Name}"!`);
                 }
                 return acc;
@@ -392,9 +382,7 @@ export const tableLayoutModelToTableLayout = (layoutModel) => {
     if (layoutModel.Ignore_OpenCharts) {
         tableLayout.OpenCharts = layoutModel.Ignore_OpenCharts;
     }
-    // if (layoutModel.RowGroupDisplayType) {
     tableLayout.RowGroupDisplayType = layoutModel.RowGroupDisplayType ?? 'single';
-    // }
     if (layoutModel.RowGroupedColumns) {
         tableLayout.RowGroupedColumns = layoutModel.RowGroupedColumns;
     }
@@ -420,7 +408,6 @@ export const tableLayoutModelToTableLayout = (layoutModel) => {
         if ((layoutModel.ColumnGroupValues.ColumnGroupDisplay === 'collapsed' ||
             layoutModel.ColumnGroupValues.ColumnGroupDisplay === 'expanded') &&
             layoutModel.ColumnGroupValues.Values) {
-            // @ts-ignore
             tableLayout.ColumnGroupValues.ExceptionGroupKeys = layoutModel.ColumnGroupValues.Values;
         }
     }
@@ -556,13 +543,10 @@ export const pivotLayoutModelToPivotLayout = (layoutModel) => {
         if ((layoutModel.ColumnGroupValues.ColumnGroupDisplay === 'collapsed' ||
             layoutModel.ColumnGroupValues.ColumnGroupDisplay === 'expanded') &&
             layoutModel.ColumnGroupValues.Values) {
-            // @ts-ignore
             pivotLayout.ColumnGroupValues.ExceptionGroupKeys = layoutModel.ColumnGroupValues.Values;
         }
     }
-    // if (layoutModel.RowGroupDisplayType) {
     pivotLayout.RowGroupDisplayType = layoutModel.RowGroupDisplayType ?? 'single';
-    // }
     if (layoutModel.RowSelection != null) {
         pivotLayout.RowSelection = layoutModel.RowSelection;
     }

package/src/Api/Implementation/NamedQueryApiImpl.js

@@ -28,7 +28,6 @@ export class NamedQueryApiImpl extends ApiBase {
         if (IsNullOrEmptyOrWhiteSpace(namedQuery?.Name)) {
             return { valid: false, message: 'A name is required for the Named Query.' };
         }
-        // check that there is no other existing named query with the same name
         const duplicate = this.getNamedQueries().find((q) => q.Name === namedQuery.Name && q.Uuid !== namedQuery.Uuid);
         if (duplicate) {
             return {

package/src/Api/Implementation/PredicateApiImpl.js

@@ -106,7 +106,6 @@ export class PredicateApiImpl extends ApiBase {
         if (!adaptablePredicateDef) {
             return false;
         }
-        // not perfect but if there are no inputs - and there should be some - we treat the filter as invalid
         if (adaptablePredicateDef.inputs) {
             if (ArrayExtensions.IsNullOrEmpty(predicate.Inputs) ||
                 StringExtensions.IsNullOrEmpty(predicate.Inputs[0])) {
@@ -126,7 +125,6 @@ export class PredicateApiImpl extends ApiBase {
         const paramsForColumn = {
             ...context,
             column: this.getColumnApi().getColumnWithColumnId(predicate.ColumnId),
-            // value: params?.node?.data?.[predicate.ColumnId],
             value: this.getGridApi().getRawValueFromRowNode(context.node, predicate.ColumnId),
         };
         if ('oldValue' in paramsForColumn) {
@@ -141,9 +139,6 @@ export class PredicateApiImpl extends ApiBase {
         if (!predicate) {
             return defaultReturn;
         }
-        // memoization to avoid repeated lookups
-        // during filtering of large datasets
-        // see #column_filter_predicates_evaluation
         let predicateDef = predicateDefMap_MEMO.get(predicate.PredicateId);
         if (predicateDef === undefined) {
             predicateDef = this.getPredicateDefById(predicate.PredicateId);

package/src/Api/Implementation/RowFormApiImpl.js

@@ -17,7 +17,6 @@ export class RowFormApiImpl extends ApiBase {
         this.dispatchAction(PopupShowForm({
             Id: 'edit_row_form',
             Form: editForm,
-            // formProps are added to the formContext
             FormProps: {
                 rowNode,
             },
@@ -40,7 +39,6 @@ export class RowFormApiImpl extends ApiBase {
         this.dispatchAction(PopupShowForm({
             Id: 'create_row_form',
             Form: createForm,
-            // formProps are added to the formContext
             FormProps: {
                 clonedRowNode: rowNode,
             },

package/src/Api/Implementation/StateApiImpl.js

@@ -42,9 +42,7 @@ export class StateApiImpl extends ApiBase {
         Helper.copyToClipboard(stringifiedState);
     }
     copyUserStateToClipboard() {
-        // This doesnt currently work...
         let state = this.getAdaptableState();
-        //  let userState = state
         let stringifiedState = JSON.stringify(state);
         Helper.copyToClipboard(stringifiedState);
     }
@@ -111,8 +109,6 @@ export class StateApiImpl extends ApiBase {
         return new Promise((resolve, reject) => {
             this.getAdaptableInternalApi().executeWithProgressIndicator(config?.progressIndicatorLabel ?? `Initialising...`, () => {
                 const flushCurrentState = !config || config.flushCurrentState !== false;
-                // make sure we persist any "pending" changes to state - since stateOptions.debounceStateDelay can cause
-                // the state to be persisted with a delay, which we dont want in this case
                 const flushStatePromise = flushCurrentState
                     ? this.getAdaptableStore().saveStateNow(this._adaptable)
                     : Promise.resolve(true);
@@ -141,10 +137,8 @@ export class StateApiImpl extends ApiBase {
                         this._adaptable.refreshLayout();
                     })
                         .then(() => {
-                        // resolve main(result) promise
                         resolve();
                     }, (error) => {
-                        // reject main(result) promise
                         reject(error);
                     })
                         .catch((e) => {
@@ -247,7 +241,6 @@ export class StateApiImpl extends ApiBase {
         else {
             state.Revision.Key += 1;
         }
-        // need to save it...
     }
     getAlertState(returnJson = false) {
         return this.getUserStateByStateKey('Alert', returnJson);

package/src/Api/Implementation/SystemStatusApiImpl.js

@@ -18,7 +18,6 @@ export class SystemStatusApiImpl extends ApiBase {
     setSystemStatus(statusMessage, messageType, statusFurtherInformation) {
         let systemStatusMessageInfo = ObjectFactory.CreateSystemStatusMessageInfo(statusMessage, messageType, statusFurtherInformation ? statusFurtherInformation : '');
         this.internalApi.addSystemStatusMessageInfo(systemStatusMessageInfo);
-        // publish the event
         this.getEventApi().internalApi.fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo);
         if (this.getNotificationsOptions().showSystemStatusMessageNotifications) {
             const alertApi = this.getAlertApi();
@@ -44,7 +43,6 @@ export class SystemStatusApiImpl extends ApiBase {
         if (this.getContainerOptions().systemStatusContainer != null) {
             this.displayMessageInDiv(statusMessage, statusFurtherInformation, messageType);
         }
-        // doesnt do anything but useful for Audit
         this.dispatchAction(SystemStatusRedux.SystemStatusSetMesage(systemStatusMessageInfo));
     }
     displayMessageInDiv(statusMessage, statusFurtherInformation, messageType) {

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -18,12 +18,9 @@ export class TeamSharingApiImpl extends ApiBase {
         const teamSharingOptions = this.getTeamSharingOptions();
         const sharedEntitiesContext = this.getAdaptableInternalApi().buildBaseContext();
         let loadedSharedEntities = await teamSharingOptions.loadSharedEntities(sharedEntitiesContext);
-        // with v15 we introduced 2 types of SharedEntity: AdaptableSharedEntity (basically the old one) and the new CustomSharedEntity
-        // for backwards compatibility, we add default the 'EntityType' property to 'adaptableEntity'
         loadedSharedEntities = loadedSharedEntities.map((sharedEntity) => {
             if (sharedEntity.EntityType !== 'adaptableEntity' &&
                 sharedEntity.EntityType !== 'customEntity') {
-                // @ts-ignore
                 sharedEntity.EntityType = 'adaptableEntity';
             }
             return sharedEntity;

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -30,7 +30,6 @@ export class UserInterfaceApiImpl extends ApiBase {
     getCustomIcons() {
         let customIconsProp = this.getUserInterfaceOptions().customIcons;
         if (customIconsProp != null) {
-            // first do the function then get hardcoded items
             return typeof customIconsProp === 'function'
                 ? customIconsProp()
                 : customIconsProp;

package/src/Api/Internal/ActionColumnInternalApi.js

@@ -47,7 +47,6 @@ export class ActionColumnInternalApi extends ApiBase {
     }
     getActionColumnsAndButtons(colDef) {
         let actionColumn;
-        // this should probably be in FDC3 api...
         if (!actionColumn && this.getFdc3Api().internalApi.isFdc3MainActionColumn(colDef.colId)) {
             const actionButtons = this.getFdc3Api().internalApi.getButtonsForFdc3MainActionColumn();
             const actionColumnDefaultConfiguration = this.getFdc3Options().actionColumnDefaultConfiguration;

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

@@ -19,7 +19,6 @@ import { ITeamSharingService } from '../../Utilities/Services/Interface/ITeamSha
 import { ButtonStyle } from '../../AdaptableState/Common/ButtonStyle';
 import { AdaptableButton } from '../../AdaptableState/Common/AdaptableButton';
 import { AdaptableFrameworkComponent } from '../../agGrid/AdaptableFrameworkComponent';
-import { IMetamodelService } from '../../Utilities/Services/Interface/IMetamodelService';
 import { IModuleCollection } from '../../Strategy/Interface/IModule';
 import { AdaptableObjectTag, AdaptableObjectWithScope } from '../../AdaptableState/Common/AdaptableObject';
 import { AdaptableForm, CellSummmaryInfo, FormContext, RowDataChangeTrigger, RowDataChangedInfo, AdaptableColumn, AdaptableColumnContext } from '../../../types';
@@ -73,7 +72,6 @@ export declare class AdaptableInternalApi extends ApiBase {
     getQueryLanguageService(): IQueryLanguageService;
     getAlertService(): IAlertService;
     getTeamSharingService(): ITeamSharingService;
-    getMetamodelService(): IMetamodelService;
     getRowFormService(): RowFormService;
     getFdc3Service(): Fdc3Service;
     getFlashingCellService(): FlashingCellService;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -13,7 +13,6 @@ export class AdaptableInternalApi extends ApiBase {
     getAdaptableJSXElement() {
         return this._adaptable._PRIVATE_adaptableJSXElement ?? null;
     }
-    // Popup Redux Actions
     showPopupConfirmation(confirmation) {
         this.dispatchAction(PopupRedux.PopupShowConfirmation(confirmation));
     }
@@ -106,9 +105,6 @@ export class AdaptableInternalApi extends ApiBase {
     getTeamSharingService() {
         return this._adaptable.TeamSharingService;
     }
-    getMetamodelService() {
-        return this._adaptable.MetamodelService;
-    }
     getRowFormService() {
         return this._adaptable.RowFormService;
     }
@@ -188,21 +184,18 @@ export class AdaptableInternalApi extends ApiBase {
     isDocumentationLinksDisplayed() {
         return this.getUserInterfaceOptions().showDocumentationLinks;
     }
-    // the row data which is used to preview the expression evaluation (usually the first row data)
     getQueryPreviewData() {
         const firstRowNode = this.getGridApi().getFirstRowNode();
         if (firstRowNode == undefined) {
             return {};
         }
         const firstRowData = firstRowNode?.data ? { ...firstRowNode?.data } : {};
-        // handle CalcCols which are not persisted in the rowModel
         this.getCalculatedColumnApi()
             .getCalculatedColumns()
             .forEach((calculatedColumn) => {
             const columnRawValue = this._adaptable.api.gridApi.getRawValueFromRowNode(firstRowNode, calculatedColumn.ColumnId);
             firstRowData[calculatedColumn.ColumnId] = columnRawValue;
         });
-        // handle FreeTextCols which are not persisted in the rowModel
         this.getFreeTextColumnApi()
             .getFreeTextColumns()
             .forEach((freeTextColumn) => {
@@ -212,9 +205,7 @@ export class AdaptableInternalApi extends ApiBase {
         return firstRowData;
     }
     createFrameworkComponent(containerDomNode, frameworkComponent, componentType) {
-        const createComponentFn = () => 
-        // delegate the logic to framework wrapper
-        this._adaptable._emitSync('FrameworkComponentChange', {
+        const createComponentFn = () => this._adaptable._emitSync('FrameworkComponentChange', {
             command: 'create',
             containerDomNode,
             frameworkComponent,
@@ -224,8 +215,6 @@ export class AdaptableInternalApi extends ApiBase {
             createComponentFn();
         }
         else {
-            // adaptable may not be initialized yet if the framework component is part of the initial render
-            // AFL 2021.10.14 - not really sure if this is necessary anymore?! (see the other changes in this commit)
             waitForCondition(() => this.isAdapTableReady()).then(() => {
                 createComponentFn();
             });
@@ -249,7 +238,6 @@ export class AdaptableInternalApi extends ApiBase {
     }
     executeWithProgressIndicator(label, executeFn, errorHandlingFn) {
         this.getUserInterfaceApi().showProgressIndicator({ text: label, delay: 300 });
-        // setTimeout required to give the ProgressIndicator rendering a head-start (see RAF in ProgressIndicator implementation)
         setTimeout(() => {
             try {
                 executeFn();
@@ -289,7 +277,6 @@ export class AdaptableInternalApi extends ApiBase {
             return userInterfaceOptions.objectTags;
         }
         if (typeof userInterfaceOptions.objectTags === 'function') {
-            // sanitize the provided tags, just to be sure that the user does NOT break the UI
             return userInterfaceOptions
                 .objectTags(this.buildBaseContext())
                 .filter((tag) => typeof tag === 'string');
@@ -314,24 +301,19 @@ export class AdaptableInternalApi extends ApiBase {
                 ...this.buildBaseContext(),
             };
             const customGeneratedTags = layoutOptions.layoutTagOptions.autoGenerateTagsForLayouts(autoGenerateTagsForLayoutsContext);
-            // sanitize the provided tags, just to be sure that the user does NOT break the UI
             return customGeneratedTags.filter((tag) => typeof tag === 'string');
         }
     }
-    // General way to get to store from inside Adaptable...
     dispatchReduxAction(action) {
         this.dispatchAction(action);
     }
-    // doing it this way to avoid having to expose Module Params which is internal
     showSettingsPanel(module, moduleParams) {
         this.showModulePopup(module, moduleParams);
     }
     getLabelForTag(adaptableObjectTag) {
-        // not very interesting right now, but useful later when tag is not only a plain string
         return adaptableObjectTag;
     }
     getValueForTag(adaptableObjectTag) {
-        // not very interesting right now, but useful later when tag is not only a plain string
         return adaptableObjectTag;
     }
     getAdaptableQueryExpressionText(query) {
@@ -343,21 +325,14 @@ export class AdaptableInternalApi extends ApiBase {
             ? this.getExpressionApi().getAdaptableQueryExpressionWithColumnFriendlyNames(query)
             : this.getExpressionApi().getAdaptableQueryExpression(query);
     }
-    /**
-     * Gets a value from a rowData object using a field name.
-     * Supports deep values (e.g. fieldName = 'address.street')
-     */
-    // "borrowed" from https://github.com/ag-grid/ag-grid/blob/v28.2.1/community-modules/core/src/ts/utils/object.ts#L205
     getValueUsingField(rowData, fieldName) {
         if (!rowData || !fieldName?.length) {
             return;
         }
         const isColumnValueKeyNested = fieldName?.includes('.');
-        // if no '.', then it's not a deep value
         if (!isColumnValueKeyNested) {
             return rowData[fieldName];
         }
-        // otherwise it is a deep value, so need to dig for it
         const fields = fieldName.split('.');
         let currentObject = rowData;
         for (let i = 0; i < fields.length; i++) {
@@ -368,11 +343,6 @@ export class AdaptableInternalApi extends ApiBase {
         }
         return currentObject;
     }
-    /**
-     * Sets a value in a rowData object using a field name.
-     * Supports deep values (e.g. fieldName = 'address.street')
-     */
-    // "borrowed" from https://github.com/ag-grid/ag-grid/blob/v28.2.1/community-modules/core/src/ts/valueService/valueService.ts#L236
     setValueUsingField(rowData, fieldName, newValue) {
         if (!rowData || !fieldName?.length) {
             return;
@@ -380,27 +350,23 @@ export class AdaptableInternalApi extends ApiBase {
         const isColumnValueKeyContainsDots = fieldName?.includes('.');
         let valuesAreSame = false;
         if (!isColumnValueKeyContainsDots) {
-            // soft comparison to match strings and numbers
             valuesAreSame = rowData[fieldName] == newValue;
             if (!valuesAreSame) {
                 rowData[fieldName] = newValue;
             }
         }
         else {
-            // otherwise it is a deep value, so need to dig for it
             const fieldPieces = fieldName.split('.');
             let currentObject = rowData;
             while (fieldPieces.length > 0 && currentObject) {
                 const fieldPiece = fieldPieces.shift();
                 if (fieldPieces.length === 0) {
-                    // soft comparison to match strings and numbers
                     valuesAreSame = currentObject[fieldPiece] == newValue;
                     if (!valuesAreSame) {
                         currentObject[fieldPiece] = newValue;
                     }
                 }
                 else {
-                    // NOTE AFL: this was NOT in the original AG Grid code, but we need it to handle inserting deep values (the original implementation only handled updating)
                     if (currentObject[fieldPiece] == null) {
                         currentObject[fieldPiece] = {};
                     }
@@ -415,15 +381,12 @@ export class AdaptableInternalApi extends ApiBase {
             return [];
         }
         let locatedAdaptableObjects = [...specificAdaptableObjects];
-        // IDs are the most specific locators
         if (ids?.length) {
             locatedAdaptableObjects = locatedAdaptableObjects.filter((adaptableObject) => ids.includes(adaptableObject.Uuid));
         }
-        // secondly filter by Tags
         if (tag) {
             locatedAdaptableObjects = locatedAdaptableObjects.filter((adaptableObject) => adaptableObject.Tags?.includes(tag));
         }
-        // lastly filter by scope
         if (scope) {
             locatedAdaptableObjects = locatedAdaptableObjects.filter((adaptableObject) => this.getColumnScopeApi().isScopeInScope(adaptableObject.Scope, scope));
         }
@@ -452,7 +415,6 @@ export class AdaptableInternalApi extends ApiBase {
     parseDateValue(dateValue) {
         const dateFormat = this.getUserInterfaceOptions().dateInputOptions.dateFormat;
         if (dateFormat === 'yyyy-MM-dd') {
-            // if the format is ISO, we don't pass it so that we use the date-fns `parseISO` which is more robust
             return parseDateValue(dateValue);
         }
         return parseDateValue(dateValue, dateFormat);

package/src/Api/Internal/AlertInternalApi.js

@@ -23,67 +23,34 @@ export class AlertInternalApi extends ApiBase {
                     : undefined;
         return expression;
     }
-    /**
-     * Retrieves the Adaptable Form with the given name
-     * @param name name of the Form
-     */
     getAdaptableFormByName(name) {
         const alertForms = this.getAlertOptions().alertForms || [];
         return alertForms.find((f) => f.name === name)?.form;
     }
-    /**
-     * Retrieves all Alert Definitions in Alert State which are NOT Reactive (BooleanQuery)
-     * @returns alert definitions
-     */
     getNonReactiveAlertDefinitions(config) {
         return this.getAlertApi()
             .getAlertDefinitions(config)
             .filter((alertDef) => isRuleBasedAlertDefinition(alertDef) &&
             !isReactiveQuery(alertDef.Rule));
     }
-    /**
-     * Retrieves all active (non-suspended) Alert Definitions in Alert State which are NOT Reactive (BooleanQuery)
-     * @returns alert definitions
-     */
     getActiveNonReactiveAlertDefinitions(config) {
         return this.getNonReactiveAlertDefinitions(config).filter((alertDef) => !alertDef.IsSuspended);
     }
-    /**
-     *
-     * Retrieves all Alert Definitions in Alert State which are reactive (ObservableQuery & AggregationQuery)
-     * @returns alert definitions
-     */
     getReactiveAlertDefinitions(config) {
         return this.getAlertApi()
             .getAlertDefinitions(config)
             .filter((alertDef) => isRuleBasedAlertDefinition(alertDef) &&
             isReactiveQuery(alertDef.Rule));
     }
-    /**
-     *
-     * Retrieves all active (non-suspended) Alert Definitions in Alert State which are reactive (ObservableQuery & AggregationQuery)
-     * @returns alert definitions
-     */
     getActiveReactiveAlertDefinitions() {
         return this.getReactiveAlertDefinitions().filter((alertDef) => !alertDef.IsSuspended);
     }
-    /**
-     * Retrieves all Alert Definitions which prevent a Cell Edit
-     * @returns alert definitions
-     */
     getAlertDefinitionsWithPreventEdit(config) {
         return this.getActiveNonReactiveAlertDefinitions(config).filter((a) => a.AlertProperties != null && a.AlertProperties.PreventEdit === true);
     }
-    /**
-     * Retrieves all Alert Definitions which allow a Cell Edit
-     *  @returns alert definitions
-     */
     getAlertDefinitionsWithAllowEdit(config) {
         return this.getActiveNonReactiveAlertDefinitions(config).filter((a) => a.AlertProperties == null || a.AlertProperties.PreventEdit !== true);
     }
-    /**
-     * Runs after a button in an Alert Form is clicked
-     */
     executeAlertButton(button, context) {
         if (button.Command) {
             let commands = button.Command;
@@ -110,11 +77,6 @@ export class AlertInternalApi extends ApiBase {
             });
         }
     }
-    /**
-     * Runs after an Alert Command is invoked
-     * @param command Action which has been invoked
-     * @param details Info about the Alert and Form
-     */
     executeAlertCommand(command, details) {
         const { alertDefinition, cellDataChangedInfo: cellDataChangedInfo, rowDataChangedInfo: rowDataChangedInfo, } = details;
         const getBackgroundColor = (alertDefinition) => {
@@ -158,7 +120,6 @@ export class AlertInternalApi extends ApiBase {
         }
         if (command === 'highlight-row' &&
             rowDataChangedInfo &&
-            // no sense to highlight a deleted(non-existing) row
             rowDataChangedInfo?.rowTrigger !== 'Delete') {
             const primaryKeyValues = this.getGridApi().getPrimaryKeyValuesForRowNodes(rowDataChangedInfo.rowNodes);
             const rowsHighlightInfo = {
@@ -174,11 +135,8 @@ export class AlertInternalApi extends ApiBase {
             this.getGridApi().jumpToCell(cellDataChangedInfo.primaryKeyValue, cellDataChangedInfo.column.columnId, cellDataChangedInfo.rowNode);
         }
         if (command === 'jump-to-row' &&
-            // either a cell change
             (cellDataChangedInfo ||
-                // or a grid change, but NOT row deletion
                 (rowDataChangedInfo &&
-                    // no sense to jump to a deleted(non-existing) row
                     rowDataChangedInfo?.rowTrigger !== 'Delete'))) {
             const [firstRowNode] = cellDataChangedInfo
                 ? [cellDataChangedInfo.rowNode]
@@ -198,19 +156,11 @@ export class AlertInternalApi extends ApiBase {
             this.getGridApi().undoCellEdit(cellDataChangedInfo);
         }
     }
-    /**
-     * Retrieves all Predicate Defs that match given Scope
-     * @param scope the Scope to check
-     */
     getAlertPredicateDefsForScope(scope) {
         return this.getPredicateApi()
             .internalApi.getAlertPredicateDefs(scope)
             .filter((predicateDef) => this.getColumnScopeApi().isScopeInScope(scope, predicateDef.columnScope));
     }
-    /**
-     * Returns a description of an Alert Definition
-     * @param alertDefinition Alert Definition to use
-     */
     getAlertDescriptionForDataChange(alertDefinition, cellDataChangedInfo) {
         let customMessage = this.getCustomAlertDescription(alertDefinition, { cellDataChangedInfo });
         const anotationContext = cellDataChangedInfo
@@ -249,10 +199,6 @@ export class AlertInternalApi extends ApiBase {
         let ruleDescription = this.getAlertRuleDescription(alertDefinition);
         return scopeDescription + ' - ' + ruleDescription;
     }
-    /**
-     * Returns a description title of an Alert Definition
-     * @param alertDefinition Alert Definition to use
-     */
     getAlertMessageHeaderForDataChange(alertDefinition, cellDataChangedInfo) {
         const anotationContext = cellDataChangedInfo
             ? {
@@ -322,12 +268,6 @@ export class AlertInternalApi extends ApiBase {
         }
         return header;
     }
-    /**
-     * Returns custom description for alert using the 'alertMessageText' property
-     *
-     * @param alertDefinition Alert Definition to use
-     * @param dataChangedInfo data change info, it can be eighter grid or cell data chantged info
-     */
     getCustomAlertDescription(alertDefinition, dataChangedInfo) {
         const alertMessageFunction = this.getAlertOptions()?.alertMessageText;
         if (alertMessageFunction) {
@@ -343,11 +283,6 @@ export class AlertInternalApi extends ApiBase {
         }
         return null;
     }
-    /**
-     * Returns custom title defined by 'alertMessageHeader' property
-     * @param alertDefinition Alert Definition to use
-     * @param dataChangedInfo Data change info, it can be eighter grid or cell data chantged info
-     */
     getCustomAlertMessageHeader(alertDefinition, dataChangedInfo) {
         const alertMessageFunction = this.getAlertOptions()?.alertMessageHeader;
         if (alertMessageFunction) {
@@ -365,10 +300,6 @@ export class AlertInternalApi extends ApiBase {
         }
         return null;
     }
-    /**
-     * Returns a description of an Alert Definition's Rule
-     * @param alertDefinition Alert Definition to use
-     */
     getAlertRuleDescription(alertDefinition) {
         if (!isRuleBasedAlertDefinition(alertDefinition)) {
             return '';
@@ -378,31 +309,15 @@ export class AlertInternalApi extends ApiBase {
             : this.getAdaptableInternalApi().getAdaptableQueryExpressionText(alertDefinition.Rule);
         return ruleDescription;
     }
-    /**
-     * Was Adaptable Alert fired due to a Cell Change
-     * @param alert AdaptableAlert to check
-     */
     isCellChangedAdaptableAlert(alert) {
         return alert.alertType === 'cellChanged';
     }
-    /**
-     * Was Adaptable Alert fired due to a Row Change
-     * @param alert AdaptableAlert to check
-     */
     isRowChangedAdaptableAlert(alert) {
         return alert.alertType === 'rowChanged';
     }
-    /**
-     * Is Adaptable Alert a Generic one
-     * @param alert AdaptableAlert to check
-     */
     isGenericAdaptableAlert(alert) {
         return alert.alertType === 'generic';
     }
-    /**
-     * Returns for the Alert Type for an Adaptable Alert
-     * @param alert AdaptableAlert to check
-     */
     getAlertTypeForAdaptableAlert(alert) {
         return alert.alertType;
     }
@@ -431,14 +346,12 @@ export class AlertInternalApi extends ApiBase {
             return;
         }
         if (adaptableAlertForm && adaptableAlertForm.buttons) {
-            // dont mutate the form, but clone it
             adaptableAlertForm = { ...adaptableAlertForm };
             adaptableAlertForm.buttons = adaptableAlertForm.buttons?.map((button) => {
                 let buttonStyle = isActionForm
                     ? button.ButtonStyle
                     : this.getAdaptableInternalApi().getStyleForButton(button, context);
                 if (defaultMessageType && !buttonStyle?.tone) {
-                    // force the button tone to be the alert tone, if the tone is missing from button style (or button style non-existent)
                     buttonStyle = {
                         ...buttonStyle,
                         tone: defaultMessageType.toLowerCase(),
@@ -469,7 +382,6 @@ export class AlertInternalApi extends ApiBase {
         return this.getAdaptableAlerts().filter(isAdaptableRowChangedAlert);
     }
     getAdaptableAlertWithHighlightCell(columnId, rowNode) {
-        // only alerts triggered by cell changes are relevant for HighlightCell actions
         return this.getAdaptableCellChangedAlerts().find((alert) => getRuleAlertProperties(alert.alertDefinition)?.HighlightCell &&
             alert.cellDataChangedInfo?.column?.columnId === columnId &&
             alert.cellDataChangedInfo?.rowNode === rowNode);
@@ -637,8 +549,6 @@ export class AlertInternalApi extends ApiBase {
         return true;
     }
     getDefaultAlertNotificationForm() {
-        // we still need the default Notification Form  for historical reasons
-        // (i.e. to be able to display the AlertForm with the default buttons when the user has not defined any buttons)
         return {
             fields: [],
             Buttons: [this.getDefaultButton()],
@@ -652,15 +562,6 @@ export class AlertInternalApi extends ApiBase {
             },
         };
     }
-    /**
-     * Supported tokens:
-     * - column-that-changed-name -> [column]
-     * - rowData.newValue -> [rowData.newValue]
-     * - rowData.oldValue -> [rowData.oldValue]
-     * - primaryKey -> [primaryKeyValue]
-     * - timestamp -> [timestamp]
-     * - trigger -> [trigger]
-     */
     annotateAlertText(text, context) {
         if (!text) {
             return text;
@@ -696,9 +597,7 @@ export class AlertInternalApi extends ApiBase {
                 Delete: 'Deleted',
                 Load: 'Loaded',
             };
-            const mappedTrigger = 
-            // @ts-ignore
-            (dataChangeTriggerMap[context.trigger] || rowChangeTriggerMap[context.trigger]) ??
+            const mappedTrigger = (dataChangeTriggerMap[context.trigger] || rowChangeTriggerMap[context.trigger]) ??
                 context.trigger;
             text = Helper.replaceAll(text, '[trigger]', mappedTrigger);
         }