@adaptabletools/adaptable 11.1.4 → 11.1.7

package/src/Utilities/Services/QueryLanguageService.js

@@ -6,8 +6,8 @@ const parser = tslib_1.__importStar(require("../../parser/src"));
 const rxjs_1 = require("rxjs");
 const LoggingHelper_1 = require("../Helpers/LoggingHelper");
 class QueryLanguageService {
-    constructor(adaptable) {
-        this.adaptable = adaptable;
+    constructor(adaptableApi) {
+        this.adaptableApi = adaptableApi;
         this.cacheBooleanValidation = new Map();
         this.cacheObservableValidation = new Map();
         this.cacheAggregatedBooleanValidation = new Map();
@@ -19,7 +19,7 @@ class QueryLanguageService {
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         return parser.evaluate(expression, {
             node: rowNode,
-            api: this.adaptable.api,
+            api: this.adaptableApi,
             functions: booleanAndScalarFunctions,
         });
     }
@@ -31,7 +31,7 @@ class QueryLanguageService {
         const aggregatedScalarFunctions = this.getModuleExpressionFunctions(module).aggregatedScalarFunctions;
         return parser.evaluate(expression, {
             node: null,
-            api: this.adaptable.api,
+            api: this.adaptableApi,
             functions: aggregatedScalarFunctions,
         });
     }
@@ -40,7 +40,7 @@ class QueryLanguageService {
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         const reactiveExpression$ = parser.evaluate(reactiveExpression, {
             node: reactiveExpression,
-            api: this.adaptable.api,
+            api: this.adaptableApi,
             functions: moduleExpressionFunctions.observableFunctions,
             whereClauseFunctions: booleanAndScalarFunctions,
         });
@@ -51,7 +51,7 @@ class QueryLanguageService {
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         const aggregationExpression$ = parser.evaluate(aggregationExpression, {
             node: aggregationExpression,
-            api: this.adaptable.api,
+            api: this.adaptableApi,
             functions: moduleExpressionFunctions.aggregatedBooleanFunctions,
             whereClauseFunctions: booleanAndScalarFunctions,
         });
@@ -75,7 +75,7 @@ class QueryLanguageService {
             }
             const force = (_a = config === null || config === void 0 ? void 0 : config.force) !== null && _a !== void 0 ? _a : false;
             // get searchOptions to see if validation should be performed
-            if (!this.adaptable.api.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
+            if (!this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
                 .performExpressionValidation &&
                 !force) {
                 const result = { isValid: true, errorMessage: '' };
@@ -103,7 +103,7 @@ class QueryLanguageService {
                 return result;
             }
             // evaluating the expression is the only way to catch circular named query references
-            let firstRowNode = this.adaptable.getFirstRowNode();
+            let firstRowNode = this.adaptableApi.gridApi.getFirstRowNode();
             this.evaluateBooleanExpression(expression, module, firstRowNode);
             const result = {
                 isValid: true,
@@ -243,15 +243,15 @@ class QueryLanguageService {
         if (!module) {
             LoggingHelper_1.LogAdaptableInfo(`QueryLanguageService.getModuleExpressionFunctions() was called with an undefined 'module' param, this should never happen`);
             return {
-                booleanFunctions: this.adaptable.adaptableOptions.adaptableQLOptions.expressionOptions
+                booleanFunctions: this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
                     .defaultBooleanFunctions,
-                scalarFunctions: this.adaptable.adaptableOptions.adaptableQLOptions.expressionOptions
+                scalarFunctions: this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
                     .defaultScalarFunctions,
-                observableFunctions: this.adaptable.adaptableOptions.adaptableQLOptions.expressionOptions
+                observableFunctions: this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
                     .defaultObservableFunctions,
-                aggregatedBooleanFunctions: this.adaptable.adaptableOptions.adaptableQLOptions.expressionOptions
+                aggregatedBooleanFunctions: this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
                     .defaultAggregatedBooleanFunctions,
-                aggregatedScalarFunctions: this.adaptable.adaptableOptions.adaptableQLOptions.expressionOptions
+                aggregatedScalarFunctions: this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
                     .defaultAggregatedScalarFunctions,
             };
         }
@@ -259,17 +259,18 @@ class QueryLanguageService {
         if (cachedResult) {
             return cachedResult;
         }
-        const moduleSpecificOptions = (_b = (_a = this.adaptable.adaptableOptions.adaptableQLOptions.expressionOptions
+        const moduleSpecificOptions = (_b = (_a = this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
             .moduleExpressionFunctions) === null || _a === void 0 ? void 0 : _a[module]) !== null && _b !== void 0 ? _b : {};
         const moduleSpecificFunctions = {
-            booleanFunctions: (_c = moduleSpecificOptions.booleanFunctions) !== null && _c !== void 0 ? _c : this.adaptable.adaptableOptions.adaptableQLOptions.expressionOptions
+            booleanFunctions: (_c = moduleSpecificOptions.booleanFunctions) !== null && _c !== void 0 ? _c : this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
                 .defaultBooleanFunctions,
-            scalarFunctions: (_d = moduleSpecificOptions.scalarFunctions) !== null && _d !== void 0 ? _d : this.adaptable.adaptableOptions.adaptableQLOptions.expressionOptions.defaultScalarFunctions,
-            observableFunctions: (_e = moduleSpecificOptions.observableFunctions) !== null && _e !== void 0 ? _e : this.adaptable.adaptableOptions.adaptableQLOptions.expressionOptions
+            scalarFunctions: (_d = moduleSpecificOptions.scalarFunctions) !== null && _d !== void 0 ? _d : this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
+                .defaultScalarFunctions,
+            observableFunctions: (_e = moduleSpecificOptions.observableFunctions) !== null && _e !== void 0 ? _e : this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
                 .defaultObservableFunctions,
-            aggregatedBooleanFunctions: (_f = moduleSpecificOptions.aggregatedBooleanFunctions) !== null && _f !== void 0 ? _f : this.adaptable.adaptableOptions.adaptableQLOptions.expressionOptions
+            aggregatedBooleanFunctions: (_f = moduleSpecificOptions.aggregatedBooleanFunctions) !== null && _f !== void 0 ? _f : this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
                 .defaultAggregatedBooleanFunctions,
-            aggregatedScalarFunctions: (_g = moduleSpecificOptions.aggregatedScalarFunctions) !== null && _g !== void 0 ? _g : this.adaptable.adaptableOptions.adaptableQLOptions.expressionOptions
+            aggregatedScalarFunctions: (_g = moduleSpecificOptions.aggregatedScalarFunctions) !== null && _g !== void 0 ? _g : this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
                 .defaultAggregatedScalarFunctions,
         };
         this.cacheModuleSpecificExpressionFunctions.set(module, moduleSpecificFunctions);

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

@@ -1,17 +1,17 @@
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { Report, ReportData, SystemReportName } from '../../PredefinedConfig/ExportState';
 import { IReportService } from './Interface/IReportService';
 import { RowNode } from '@ag-grid-community/all-modules';
 import { SystemExportDestination } from '../../AdaptableOptions/ExportOptions';
+import { AdaptableApi } from '../../../types';
 export declare class ReportService implements IReportService {
-    private adaptable;
-    constructor(adaptable: IAdaptable);
+    private adaptableApi;
+    constructor(adaptableApi: AdaptableApi);
     CreateSystemReport(systemReportName: SystemReportName): Report;
     IsSystemReport(reportName: string): boolean;
     IsSystemReportActive(reportName: SystemReportName): boolean;
     IsSystemExportDestinationActive(exportDestination: SystemExportDestination): boolean;
-    GetReportColumnScopeShortDescription(report: Report): string;
+    GetReportColumnScopeShortDescription(report: Report): string[];
     GetReportColumnScopeLongDescription(report: Report): string;
     GetReportExpressionDescription(report: Report, cols: AdaptableColumn[]): string;
     GetReportColumnsForReport(report: Report, includePrimaryKey?: boolean): AdaptableColumn[];

package/src/Utilities/Services/ReportService.js

@@ -11,9 +11,9 @@ const FormatHelper_1 = tslib_1.__importStar(require("../Helpers/FormatHelper"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 class ReportService {
-    constructor(adaptable) {
-        this.adaptable = adaptable;
-        this.adaptable = adaptable;
+    constructor(adaptableApi) {
+        this.adaptableApi = adaptableApi;
+        this.adaptableApi = adaptableApi;
     }
     CreateSystemReport(systemReportName) {
         switch (systemReportName) {
@@ -74,10 +74,10 @@ class ReportService {
     }
     IsSystemReportActive(reportName) {
         if (reportName == GeneralConstants_1.SELECTED_CELLS_REPORT || reportName == GeneralConstants_1.SELECTED_ROWS_REPORT) {
-            return this.adaptable.isGridSelectable();
+            return this.adaptableApi.gridApi.isGridSelectable();
         }
         if (reportName === GeneralConstants_1.VISUAL_DATA_REPORT) {
-            return this.adaptable.api.exportApi
+            return this.adaptableApi.exportApi
                 .getAvailableExportDestinations()
                 .includes(Enums_1.ExportDestination.Excel);
         }
@@ -85,22 +85,26 @@ class ReportService {
     }
     IsSystemExportDestinationActive(exportDestination) {
         if (exportDestination === Enums_1.ExportDestination.Excel) {
-            return this.adaptable.canExportToExcel();
+            return this.adaptableApi.exportApi.canExportToExcel();
         }
         return true;
     }
     GetReportColumnScopeShortDescription(report) {
+        var _a, _b;
         switch (report.ReportColumnScope) {
             case Enums_1.ReportColumnScope.AllColumns:
-                return '[All Columns]';
+                return ['[All Columns]'];
             case Enums_1.ReportColumnScope.VisibleColumns:
-                return '[Visible Columns]';
+                return ['[Visible Columns]'];
             case Enums_1.ReportColumnScope.SelectedColumns:
-                return '[Selected Columns]';
+                return ['[Selected Columns]'];
             case Enums_1.ReportColumnScope.ScopeColumns:
-                return '[Bespoke Columns]';
+                if ('ColumnIds' in (report === null || report === void 0 ? void 0 : report.Scope)) {
+                    return (_b = (_a = report.Scope.ColumnIds).map) === null || _b === void 0 ? void 0 : _b.call(_a, (columnId) => { var _a; return (_a = this.adaptableApi.columnApi.getFriendlyNameFromColumnId(columnId)) !== null && _a !== void 0 ? _a : columnId; });
+                }
+                return ['[Bespoke Columns]'];
             case Enums_1.ReportColumnScope.CustomColumns:
-                return '[Custom Columns]';
+                return ['[Custom Columns]'];
         }
     }
     GetReportColumnScopeLongDescription(report) {
@@ -112,7 +116,7 @@ class ReportService {
             case Enums_1.ReportColumnScope.SelectedColumns:
                 return '[Selected Columns]';
             case Enums_1.ReportColumnScope.ScopeColumns:
-                return this.adaptable.api.scopeApi.getScopeDescription(report.Scope);
+                return this.adaptableApi.scopeApi.getScopeDescription(report.Scope);
             case Enums_1.ReportColumnScope.CustomColumns:
                 return '[Custom Columns]';
         }
@@ -153,7 +157,7 @@ class ReportService {
     }
     GetReportColumnsForReport(report, includePrimaryKey = false) {
         let reportColumns = [];
-        let gridColumns = this.adaptable.api.columnApi.getColumns();
+        let gridColumns = this.adaptableApi.columnApi.getColumns();
         // first get the cols depending on the Column Scope
         switch (report.ReportColumnScope) {
             case Enums_1.ReportColumnScope.AllColumns:
@@ -164,17 +168,17 @@ class ReportService {
                 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
+                const selectedColumnIds = this.adaptableApi.gridApi
                     .getSelectedCellInfo()
                     .columns.map((column) => column.columnId);
                 reportColumns = gridColumns.filter((gridColumn) => selectedColumnIds.includes(gridColumn.columnId));
                 break;
             case Enums_1.ReportColumnScope.ScopeColumns:
                 if ('ColumnIds' in report.Scope) {
-                    reportColumns = report.Scope.ColumnIds.map((columnId) => this.adaptable.api.columnApi.getColumnFromId(columnId)).filter((c) => c);
+                    reportColumns = report.Scope.ColumnIds.map((columnId) => this.adaptableApi.columnApi.getColumnFromId(columnId)).filter((c) => c);
                 }
                 else {
-                    reportColumns = this.adaptable.api.scopeApi.getColumnsForScope(report.Scope);
+                    reportColumns = this.adaptableApi.scopeApi.getColumnsForScope(report.Scope);
                 }
                 break;
             case Enums_1.ReportColumnScope.CustomColumns:
@@ -182,11 +186,11 @@ class ReportService {
                 break;
         }
         if (includePrimaryKey) {
-            const pkColumn = reportColumns.find((column) => column.columnId === this.adaptable.adaptableOptions.primaryKey);
+            const pkColumn = reportColumns.find((column) => column.columnId === this.adaptableApi.internalApi.getAdaptableOptions().primaryKey);
             // TODO simplify after we fix the IsPrimaryKey bug
             // const pkColumn = reportColumns.find(column => column.IsPrimaryKey);
-            if (!pkColumn && !!this.adaptable.api.columnApi.getPrimaryKeyColumn()) {
-                reportColumns.push(this.adaptable.api.columnApi.getPrimaryKeyColumn());
+            if (!pkColumn && !!this.adaptableApi.columnApi.getPrimaryKeyColumn()) {
+                reportColumns.push(this.adaptableApi.columnApi.getPrimaryKeyColumn());
             }
         }
         return reportColumns;
@@ -206,7 +210,7 @@ class ReportService {
         const columnIds = columns.map((column) => column.columnId);
         switch (report.ReportRowScope) {
             case Enums_1.ReportRowScope.AllRows:
-                this.adaptable.forAllRowNodesDo((rowNode) => {
+                this.adaptableApi.internalApi.forAllRowNodesDo((rowNode) => {
                     // skip row groups
                     if (!rowNode.group) {
                         data.rows.push(this.getRowObjectForColumnIds(rowNode, columnIds));
@@ -214,7 +218,7 @@ class ReportService {
                 });
                 break;
             case Enums_1.ReportRowScope.VisibleRows:
-                this.adaptable.forAllVisibleRowNodesDo((rowNode) => {
+                this.adaptableApi.internalApi.forAllVisibleRowNodesDo((rowNode) => {
                     // skip row groups
                     if (!rowNode.group) {
                         data.rows.push(this.getRowObjectForColumnIds(rowNode, columnIds));
@@ -222,9 +226,9 @@ class ReportService {
                 });
                 break;
             case Enums_1.ReportRowScope.ExpressionRows:
-                this.adaptable.forAllRowNodesDo((rowNode) => {
+                this.adaptableApi.internalApi.forAllRowNodesDo((rowNode) => {
                     var _a;
-                    if (this.adaptable.api.internalApi
+                    if (this.adaptableApi.internalApi
                         .getQueryLanguageService()
                         .evaluateBooleanExpression((_a = report.Query) === null || _a === void 0 ? void 0 : _a.BooleanExpression, ModuleConstants_1.ExportModuleId, rowNode)) {
                         data.rows.push(this.getRowObjectForColumnIds(rowNode, columnIds));
@@ -232,30 +236,31 @@ class ReportService {
                 });
                 break;
             case Enums_1.ReportRowScope.SelectedCellRows:
-                const selectedCellInfo = this.adaptable.api.gridApi.getSelectedCellInfo();
+                const selectedCellInfo = this.adaptableApi.gridApi.getSelectedCellInfo();
                 const { gridCells: GridCells } = selectedCellInfo;
                 let selectedCellsByPrimaryKey = groupBy_1.default(GridCells, 'primaryKeyValue');
                 // we iterate over all visibleRowNodes to preserve the current order
-                this.adaptable.forAllVisibleRowNodesDo((rowNode) => {
-                    const rowPrimaryKeyValue = this.adaptable.getPrimaryKeyValueFromRowNode(rowNode);
+                this.adaptableApi.internalApi.forAllVisibleRowNodesDo((rowNode) => {
+                    const rowPrimaryKeyValue = this.adaptableApi.gridApi.getPrimaryKeyValueForRowNode(rowNode);
                     const selectedRowCells = selectedCellsByPrimaryKey[rowPrimaryKeyValue];
                     if (selectedRowCells) {
                         const selectedRowColumnIds = selectedRowCells.map((rowCell) => rowCell.column.columnId);
                         const selectedColumnIds = columnIds.filter((columnId) => selectedRowColumnIds.includes(columnId));
                         const row = this.getRowObjectForColumnIds(rowNode, selectedColumnIds);
                         if (includePrimaryKey) {
-                            row[this.adaptable.adaptableOptions.primaryKey] = rowPrimaryKeyValue;
+                            row[this.adaptableApi.internalApi.getAdaptableOptions().primaryKey] =
+                                rowPrimaryKeyValue;
                         }
                         data.rows.push(row);
                     }
                 });
                 break;
             case Enums_1.ReportRowScope.SelectedRows:
-                const selectedRowInfo = this.adaptable.api.gridApi.getSelectedRowInfo();
+                const selectedRowInfo = this.adaptableApi.gridApi.getSelectedRowInfo();
                 const selectedGridRowPrimaryKeys = (_b = (_a = selectedRowInfo === null || selectedRowInfo === void 0 ? void 0 : selectedRowInfo.gridRows) === null || _a === void 0 ? void 0 : _a.filter((gr) => gr.rowInfo.isGroup == false).map((gridRow) => gridRow.primaryKeyValue)) !== null && _b !== void 0 ? _b : [];
                 if (selectedGridRowPrimaryKeys.length) {
-                    this.adaptable.forAllRowNodesDo((rowNode) => {
-                        const rowPrimaryKeyValue = this.adaptable.getPrimaryKeyValueFromRowNode(rowNode);
+                    this.adaptableApi.internalApi.forAllRowNodesDo((rowNode) => {
+                        const rowPrimaryKeyValue = this.adaptableApi.gridApi.getPrimaryKeyValueForRowNode(rowNode);
                         if (selectedGridRowPrimaryKeys.includes(rowPrimaryKeyValue)) {
                             data.rows.push(this.getRowObjectForColumnIds(rowNode, columnIds));
                         }
@@ -263,7 +268,7 @@ class ReportService {
                 }
                 break;
             case Enums_1.ReportRowScope.CustomRows:
-                const reportData = this.adaptable.api.exportApi.runCustomReport(report.Name);
+                const reportData = this.adaptableApi.exportApi.runCustomReport(report.Name);
                 return reportData;
             //  break;
         }
@@ -287,21 +292,21 @@ class ReportService {
     }
     PublishLiveLiveDataChangedEvent(reportDestination, liveDataTrigger, liveReport) {
         const liveDataChangedInfo = {
-            adaptableApi: this.adaptable.api,
+            adaptableApi: this.adaptableApi,
             reportDestination: reportDestination,
             liveDataTrigger: liveDataTrigger,
             liveReport: liveReport,
         };
-        this.adaptable.api.eventApi.emit('LiveDataChanged', liveDataChangedInfo);
+        this.adaptableApi.eventApi.emit('LiveDataChanged', liveDataChangedInfo);
     }
     getCellExportValueFromRowNode(rowNode, columnId) {
-        return this.getCellExportValueFromRawValue(this.adaptable.getRawValueFromRowNode(rowNode, columnId), columnId);
+        return this.getCellExportValueFromRawValue(this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, columnId), columnId);
     }
     getCellExportValueFromRawValue(cellRawValue, columnId) {
         if (StringExtensions_1.default.IsNullOrEmpty(cellRawValue)) {
             return cellRawValue;
         }
-        const columnType = this.adaptable.api.columnApi.getColumnDataTypeFromColumnId(columnId);
+        const columnType = this.adaptableApi.columnApi.getColumnDataTypeFromColumnId(columnId);
         // if this is a date column and there is a custom export date format provided, that will take precedence
         if (columnType === 'Date' && !!this.getCustomExportDateFormat()) {
             const exportDateFormat = this.getCustomExportDateFormat();
@@ -315,7 +320,7 @@ class ReportService {
     }
     getReportFileName(reportName) {
         let fileName = StringExtensions_1.default.ReplaceEmptySpacesWithUnderscore(reportName);
-        if (this.adaptable.adaptableOptions.exportOptions.appendFileTimestamp) {
+        if (this.adaptableApi.internalApi.getAdaptableOptions().exportOptions.appendFileTimestamp) {
             fileName = `${fileName}_${FormatHelper_1.DateFormatter(new Date(), {
                 Pattern: 'yyyyMMdd_HHmmss',
             })}`;
@@ -326,7 +331,7 @@ class ReportService {
         // TO DO
     }
     getCustomExportDateFormat() {
-        return this.adaptable.adaptableOptions.exportOptions.exportDateFormat;
+        return this.adaptableApi.internalApi.getAdaptableOptions().exportOptions.exportDateFormat;
     }
     getCellExportValueFromRawValueByType(cellRawValue, columnId, 
     // default to rawValue if, for some reason, the configs provide invalid values
@@ -334,22 +339,23 @@ class ReportService {
         return type === 'rawValue'
             ? cellRawValue
             : // type === formattedValue
-                this.adaptable.getDisplayValueFromRawValue(columnId, cellRawValue);
+                this.adaptableApi.gridApi.getFormattedValueFromRawValue(columnId, cellRawValue);
     }
     computeCellExportValueFormat(columnType) {
-        if (this.adaptable.adaptableOptions.exportOptions.exportFormatType === 'rawValue' ||
-            this.adaptable.adaptableOptions.exportOptions.exportFormatType === 'formattedValue') {
-            return this.adaptable.adaptableOptions.exportOptions.exportFormatType;
+        const exportOptions = this.adaptableApi.internalApi.getAdaptableOptions().exportOptions;
+        if (exportOptions.exportFormatType === 'rawValue' ||
+            exportOptions.exportFormatType === 'formattedValue') {
+            return exportOptions.exportFormatType;
         }
         // format is customized based on column data type
         switch (columnType) {
             case 'String':
-                return this.adaptable.adaptableOptions.exportOptions.exportFormatType.string;
+                return exportOptions.exportFormatType.string;
             case 'Number':
             case 'NumberArray':
-                return this.adaptable.adaptableOptions.exportOptions.exportFormatType.number;
+                return exportOptions.exportFormatType.number;
             case 'Date':
-                return this.adaptable.adaptableOptions.exportOptions.exportFormatType.date;
+                return exportOptions.exportFormatType.date;
             default:
                 // default to rawValue for all other column types
                 return 'rawValue';

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

@@ -1,13 +1,13 @@
 import { ITeamSharingService } from './Interface/ITeamSharingService';
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
 import { SharedEntity, SharedEntityConfig, SharedEntityActiveStatus, TeamSharingImportStep } from '../../PredefinedConfig/TeamSharingState';
 import { TypeUuid } from '../../PredefinedConfig/Uuid';
+import { AdaptableApi } from '../../../types';
 export declare class TeamSharingService implements ITeamSharingService {
-    private adaptable;
+    private adaptableApi;
     private updateCheckTimerId;
-    constructor(adaptable: IAdaptable);
+    constructor(adaptableApi: AdaptableApi);
     buildSharedEntityWithDependencies(adaptableObject: AdaptableObject, module: AdaptableModule, configuration: SharedEntityConfig): SharedEntity[];
     getSharedEntityDependants(sharedEntityId: TypeUuid, sharedEntities: SharedEntity[]): SharedEntity[];
     updateActiveSharedEntity(changedAdaptableObject: AdaptableObject, userName: string, sharedEntities: SharedEntity[]): [SharedEntity[], SharedEntity[]];

package/src/Utilities/Services/TeamSharingService.js

@@ -3,18 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamSharingService = void 0;
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
 class TeamSharingService {
-    constructor(adaptable) {
-        this.adaptable = adaptable;
-        if (adaptable.adaptableOptions.teamSharingOptions.updateInterval > 0) {
+    constructor(adaptableApi) {
+        this.adaptableApi = adaptableApi;
+        const teamSharingOptions = adaptableApi.internalApi.getAdaptableOptions().teamSharingOptions;
+        if (teamSharingOptions.updateInterval > 0) {
             // convert minutes to millis
-            const updateInterval = adaptable.adaptableOptions.teamSharingOptions.updateInterval * 60000;
+            const updateInterval = teamSharingOptions.updateInterval * 60000;
             this.updateCheckTimerId = setInterval(() => {
-                this.adaptable.api.teamSharingApi.checkForUpdates();
+                this.adaptableApi.teamSharingApi.checkForUpdates();
             }, updateInterval);
         }
     }
     buildSharedEntityWithDependencies(adaptableObject, module, configuration) {
-        const sharingUserName = this.adaptable.adaptableOptions.userName;
+        const sharingUserName = this.adaptableApi.internalApi.getAdaptableOptions().userName;
         const sharingTimestamp = new Date().getTime();
         const createdSharedEntities = [];
         this.createSharedEntity(adaptableObject, module, configuration, sharingUserName, sharingTimestamp, createdSharedEntities);
@@ -62,7 +63,9 @@ class TeamSharingService {
         // either ADD or EDIT(in which case the user will need to confirm the overwrite)
         const getSharedEntityImportAction = (sharedEntity) => {
             const { Module, Entity } = sharedEntity;
-            const importInfo = this.adaptable.ModuleService.getTeamSharingAction(Module);
+            const importInfo = this.adaptableApi.internalApi
+                .getModuleService()
+                .getTeamSharingAction(Module);
             if (importInfo === null || importInfo === void 0 ? void 0 : importInfo.ModuleEntities.some((moduleEntity) => moduleEntity.Uuid === Entity.Uuid)) {
                 configOverwriteNeedsConfirmation = true;
                 return importInfo === null || importInfo === void 0 ? void 0 : importInfo.EditAction(Entity);
@@ -71,7 +74,7 @@ class TeamSharingService {
                 return importInfo === null || importInfo === void 0 ? void 0 : importInfo.AddAction(Entity);
             }
         };
-        const existingSharedEntities = this.adaptable.api.teamSharingApi.getSharedEntities();
+        const existingSharedEntities = this.adaptableApi.teamSharingApi.getSharedEntities();
         const sharedEntityDependencyTree = this.getSharedEntityDependencyTree(importedSharedEntity, existingSharedEntities);
         const importSteps = sharedEntityDependencyTree.map((sharedEntity) => ({
             sharedEntity,
@@ -81,13 +84,13 @@ class TeamSharingService {
     }
     getSharedEntityLocalAndRemoteRevisions(changedAdaptableObjectId, remoteSharedEntities) {
         var _a, _b, _c, _d;
-        const localRevision = (_b = (_a = this.adaptable.api.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap[changedAdaptableObjectId]) === null || _a === void 0 ? void 0 : _a.Revision) !== null && _b !== void 0 ? _b : -1;
+        const localRevision = (_b = (_a = this.adaptableApi.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap[changedAdaptableObjectId]) === null || _a === void 0 ? void 0 : _a.Revision) !== null && _b !== void 0 ? _b : -1;
         const remoteRevision = (_d = (_c = remoteSharedEntities.find((sharedEntity) => sharedEntity.Entity.Uuid === changedAdaptableObjectId)) === null || _c === void 0 ? void 0 : _c.Revision) !== null && _d !== void 0 ? _d : -1;
         return [localRevision, remoteRevision];
     }
     getStaleActiveSharedEntities() {
-        const sharedEntities = this.adaptable.api.teamSharingApi.getSharedEntities();
-        const activeEntities = this.adaptable.api.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap;
+        const sharedEntities = this.adaptableApi.teamSharingApi.getSharedEntities();
+        const activeEntities = this.adaptableApi.teamSharingApi.getTeamSharingState().ActiveSharedEntityMap;
         const result = {};
         sharedEntities
             .filter((sharedEntity) => sharedEntity.Type === 'Active')
@@ -105,21 +108,21 @@ class TeamSharingService {
         return result;
     }
     showUpdateNotifications() {
-        const { updateNotification } = this.adaptable.adaptableOptions.teamSharingOptions;
+        const { updateNotification } = this.adaptableApi.internalApi.getAdaptableOptions().teamSharingOptions;
         if (!updateNotification) {
             return;
         }
         Object.values(this.getStaleActiveSharedEntities()).forEach((sharedEntityActiveInfo) => {
             const notificationMessage = `Active share ${sharedEntityActiveInfo.sharedEntity.Module} has a new Revision: ${sharedEntityActiveInfo.sharedEntity.Revision}`;
             if (updateNotification === 'Alert' || updateNotification === 'AlertWithNotification') {
-                this.adaptable.api.alertApi.showAlert('TeamSharing', notificationMessage, 'Info', {
+                this.adaptableApi.alertApi.showAlert('TeamSharing', notificationMessage, 'Info', {
                     DisplayNotification: updateNotification === 'AlertWithNotification',
                 });
             }
             if (updateNotification === 'SystemStatus') {
-                this.adaptable.api.systemStatusApi.setInfoSystemStatus(`TeamSharing: ${notificationMessage}`);
+                this.adaptableApi.systemStatusApi.setInfoSystemStatus(`TeamSharing: ${notificationMessage}`);
             }
-            this.adaptable.api.teamSharingApi.fireTeamSharingEntityChangedEvent(sharedEntityActiveInfo.sharedEntity);
+            this.adaptableApi.teamSharingApi.fireTeamSharingEntityChangedEvent(sharedEntityActiveInfo.sharedEntity);
         });
     }
     destroy() {
@@ -174,7 +177,7 @@ class TeamSharingService {
         return Array.from(result.values());
     }
     getTeamSharingReferences(adaptableObject, module) {
-        return this.adaptable.api.internalApi
+        return this.adaptableApi.internalApi
             .getModuleService()
             .getModuleById(module)
             .getTeamSharingReferences(adaptableObject);

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

@@ -1,10 +1,10 @@
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { IValidationService } from './Interface/IValidationService';
 import { AlertDefinition } from '../../PredefinedConfig/AlertState';
+import { AdaptableApi } from '../../../types';
 export declare class ValidationService implements IValidationService {
-    private adaptable;
-    constructor(adaptable: IAdaptable);
+    private adaptableApi;
+    constructor(adaptableApi: AdaptableApi);
     getValidationRulesForDataChange(cellDataChangedInfo: CellDataChangedInfo): AlertDefinition[];
     performValidation(cellDataChangedInfo: CellDataChangedInfo): boolean;
     private IsAlertDefinitionTriggered;

package/src/Utilities/Services/ValidationService.js

@@ -6,9 +6,9 @@ const ArrayExtensions_1 = require("../Extensions/ArrayExtensions");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 class ValidationService {
-    constructor(adaptable) {
-        this.adaptable = adaptable;
-        this.adaptable = adaptable;
+    constructor(adaptableApi) {
+        this.adaptableApi = adaptableApi;
+        this.adaptableApi = adaptableApi;
     }
     // Not sure where to put this: was in the Module but might be better here until I can work out a way of having an event with a callback...
     getValidationRulesForDataChange(cellDataChangedInfo) {
@@ -16,15 +16,15 @@ class ValidationService {
         if (cellDataChangedInfo.oldValue == cellDataChangedInfo.newValue) {
             return [];
         }
-        let editingRules = this.adaptable.api.alertApi
+        let editingRules = this.adaptableApi.alertApi
             .getAlertDefinitionsWithPreventEdit()
-            .filter((v) => this.adaptable.api.scopeApi.isColumnInScope(cellDataChangedInfo.column, v.Scope));
+            .filter((v) => this.adaptableApi.scopeApi.isColumnInScope(cellDataChangedInfo.column, v.Scope));
         let failedValidations = [];
         if (ArrayExtensions_1.ArrayExtensions.IsNotEmpty(editingRules)) {
             editingRules.forEach((alertDefinition) => {
                 if (alertDefinition.Rule.BooleanExpression) {
                     let isSatisfiedExpression = cellDataChangedInfo.rowNode != null &&
-                        this.adaptable.api.internalApi
+                        this.adaptableApi.internalApi
                             .getQueryLanguageService()
                             .evaluateBooleanExpression(alertDefinition.Rule.BooleanExpression, ModuleConstants_1.AlertModuleId, cellDataChangedInfo.rowNode);
                     if (isSatisfiedExpression) {
@@ -50,24 +50,25 @@ class ValidationService {
                 alertDefinition: failedRules[0],
                 cellDataChangedInfo: cellDataChangedInfo,
             };
-            this.adaptable.api.alertApi.publishAlertFiredEvent(alert);
+            this.adaptableApi.alertApi.publishAlertFiredEvent(alert);
             return false;
         }
         return true;
     }
     IsAlertDefinitionTriggered(alertDefinition, dataChangedEvent) {
-        return this.adaptable.api.predicateApi.handlePredicate(alertDefinition.Rule.Predicate, {
+        return this.adaptableApi.predicateApi.handlePredicate(alertDefinition.Rule.Predicate, {
             value: dataChangedEvent.newValue,
             oldValue: dataChangedEvent.oldValue,
-            displayValue: this.adaptable.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.column.columnId),
+            displayValue: this.adaptableApi.gridApi.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.column.columnId),
             node: dataChangedEvent.rowNode,
             column: dataChangedEvent.column,
         }, false);
     }
     performServerValidation(cellDataChangedInfo, config) {
         return () => {
-            this.adaptable.adaptableOptions.editOptions
-                .validateOnServer(cellDataChangedInfo)
+            this.adaptableApi.internalApi
+                .getAdaptableOptions()
+                .editOptions.validateOnServer(cellDataChangedInfo)
                 .then((validationResult) => {
                 var _a, _b;
                 if (validationResult.NewValue === undefined) {
@@ -82,11 +83,12 @@ class ValidationService {
                     if (!row) {
                         return;
                     }
-                    row[(_b = this.adaptable.api.columnApi.getAgGridColumnFieldForAdaptableColumn(cellDataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : cellDataChangedInfo.column.columnId] = validationResult.NewValue;
-                    this.adaptable.api.gridApi.updateGridData([row]);
+                    row[(_b = this.adaptableApi.columnApi.getAgGridColumnFieldForAdaptableColumn(cellDataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : cellDataChangedInfo.column.columnId] = validationResult.NewValue;
+                    this.adaptableApi.gridApi.updateGridData([row]);
                     if (StringExtensions_1.default.IsNotNullOrEmpty(validationResult.ValidationMessage) &&
-                        this.adaptable.adaptableOptions.editOptions.displayServerValidationMessages) {
-                        this.adaptable.api.alertApi.showAlertInfo('Server Validation Message', validationResult.ValidationMessage);
+                        this.adaptableApi.internalApi.getAdaptableOptions().editOptions
+                            .displayServerValidationMessages) {
+                        this.adaptableApi.alertApi.showAlertInfo('Server Validation Message', validationResult.ValidationMessage);
                     }
                 }
                 config.onServerValidationCompleted();
@@ -95,9 +97,9 @@ class ValidationService {
         };
     }
     createValidationDescription(alertDefinition) {
-        return (this.adaptable.api.scopeApi.getScopeDescription(alertDefinition.Scope) +
+        return (this.adaptableApi.scopeApi.getScopeDescription(alertDefinition.Scope) +
             ' ' +
-            this.adaptable.api.predicateApi.predicateToString(alertDefinition.Rule.Predicate));
+            this.adaptableApi.predicateApi.predicateToString(alertDefinition.Rule.Predicate));
     }
     createValidationMessage(alertDefinition) {
         let returnMessage = this.createValidationDescription(alertDefinition);