@adaptabletools/adaptable 15.4.3 → 16.0.0-canary.1

package/src/Api/Implementation/CustomSortApiImpl.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const CustomSortRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CustomSortRedux"));
 const ApiBase_1 = require("./ApiBase");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const CustomSortInternalApi_1 = require("../Internal/CustomSortInternalApi");
 class CustomSortApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
@@ -15,10 +14,6 @@ class CustomSortApiImpl extends ApiBase_1.ApiBase {
     getCustomSortState() {
         return this.getAdaptableState().CustomSort;
     }
-    getAllCustomSort(config) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CustomSortApi', 'getAllCustomSort', 'getCustomSorts');
-        return this.getCustomSorts(config);
-    }
     getCustomSorts(config) {
         var _a;
         return ((_a = this.handleLayoutAssociatedObjects(this.getCustomSortState().CustomSorts, 'CustomSort', config)) !== null && _a !== void 0 ? _a : []);
@@ -26,17 +21,9 @@ class CustomSortApiImpl extends ApiBase_1.ApiBase {
     getCustomSortById(id) {
         return this.getCustomSorts().find((customSort) => customSort.Uuid === id);
     }
-    getAllActiveCustomSort() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CustomSortApi', 'getAllActiveCustomSort', 'getActiveCustomSorts');
-        return this.getActiveCustomSorts();
-    }
     getActiveCustomSorts(config) {
         return this.getCustomSorts(config).filter((customSort) => !customSort.IsSuspended);
     }
-    getAllSuspendedCustomSort() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CustomSortApi', 'getAllSuspendedCustomSort', 'getSuspendedCustomSorts');
-        return this.getSuspendedCustomSorts();
-    }
     getSuspendedCustomSorts(config) {
         return this.getCustomSorts(config).filter((customSort) => customSort.IsSuspended);
     }
@@ -77,9 +64,6 @@ class CustomSortApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(CustomSortRedux.CustomSortUnSuspend(customSort));
         return this.getCustomSortById(customSort.Uuid);
     }
-    showCustomSortPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'CustomSortApi', 'showCustomSortPopup', 'openCustomSortSettingsPanel');
-    }
     openCustomSortSettingsPanel() {
         this.showModulePopup(ModuleConstants.CustomSortModuleId);
     }

package/src/Api/Implementation/DashboardApiImpl.d.ts

@@ -2,7 +2,6 @@ import { ApiBase } from './ApiBase';
 import { DashboardApi } from '../DashboardApi';
 import { DashboardState, DashboardTab } from '../../PredefinedConfig/DashboardState';
 import { AdaptableDashboardToolbar, AdaptableDashboardToolbars, AdaptableModuleButtons } from '../../PredefinedConfig/Common/Types';
-import { DashboardChangedInfo } from '../Events/DashboardChanged';
 import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
 import { DashboardButtonContext } from '../../types';
 import { CustomToolbar } from '../../AdaptableOptions/DashboardOptions';
@@ -34,10 +33,7 @@ export declare class DashboardApiImpl extends ApiBase implements DashboardApi {
     setActiveTabIndex(tabIndex: number): void;
     setActiveTab(tabName: string): void;
     getCurrentToolbars(): AdaptableDashboardToolbars | string[] | undefined;
-    fireDashboardChangedEvent: (trigger: string, oldDashboardState: DashboardState, newDashboardState: DashboardState) => void;
-    showDashboardPopup(): void;
     openDashboardSettingsPanel(): void;
-    hasCustomToolbarChanged(dashboardChangedInfo: DashboardChangedInfo, customToolbarName: string): 'hidden' | 'visible' | 'none';
     isDashboardCollapsed(): boolean;
     isDashboardExpanded(): boolean;
     isDashboardFloating(): boolean;

package/src/Api/Implementation/DashboardApiImpl.js

@@ -8,17 +8,9 @@ const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/
 const React = tslib_1.__importStar(require("react"));
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const DashboardInternalApi_1 = require("../Internal/DashboardInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class DashboardApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        // it's called synchronously by DASHBOARD_SET_ACTIVE_TAB & DASHBOARD_SET_IS_COLLAPSED,
-        // both firing the same events, thus this function being called twice;
-        // so we debounced to only get tha latest call
-        this.fireDashboardChangedEvent = (trigger, oldDashboardState, newDashboardState) => {
-            (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'DashboardApi', 'fireDashboardChangedEvent');
-            this.internalApi.fireDashboardChangedEvent(trigger, oldDashboardState, newDashboardState);
-        };
         this.internalApi = new DashboardInternalApi_1.DashboardInternalApi(adaptable);
     }
     getDashboardState() {
@@ -34,6 +26,8 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
         const api = this.getAdaptableApi();
         const dashboardContext = {
             adaptableApi: api,
+            userName: this.getOptions().userName,
+            adaptableId: this.getOptions().adaptableId,
             dashboardState: api.dashboardApi.getDashboardState(),
         };
         return this.getDashboardOptions().customDashboardButtons.find((cb) => {
@@ -118,25 +112,9 @@ class DashboardApiImpl extends ApiBase_1.ApiBase {
         }
         return currentTab.Toolbars;
     }
-    showDashboardPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'DashboardApi', 'showDashboardPopup', 'openDashboardSettingsPanel');
-        this.openDashboardSettingsPanel();
-    }
     openDashboardSettingsPanel() {
         this.showModulePopup(ModuleConstants.DashboardModuleId);
     }
-    hasCustomToolbarChanged(dashboardChangedInfo, customToolbarName) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'DashboardApi', 'hasCustomToolbarChanged', null, 'Use instead the information provided in the DashboardChanged event.');
-        const visibleInNewState = this.internalApi.isToolbarInActiveTab(customToolbarName, dashboardChangedInfo.newDashboardState);
-        const visibleInOldState = this.internalApi.isToolbarInActiveTab(customToolbarName, dashboardChangedInfo.oldDashboardState);
-        if (visibleInNewState && !visibleInOldState) {
-            return 'visible';
-        }
-        if (visibleInOldState && !visibleInNewState) {
-            return 'hidden';
-        }
-        return 'none';
-    }
     isDashboardCollapsed() {
         return this.getDashboardState().IsCollapsed;
     }

package/src/Api/Implementation/DataChangeHistoryApiImpl.d.ts

@@ -8,6 +8,5 @@ export declare class DataChangeHistoryApiImpl extends ApiBase implements DataCha
     suspendDataChangeHistory(): void;
     getDataChangeHistoryLog(): CellDataChangedInfo[];
     undoDataChangeHistoryEntry(dataChangeInfo: CellDataChangedInfo): void;
-    showDataChangeHistoryPopup(): void;
     openDataChangeHistorySettingsPanel(): void;
 }

package/src/Api/Implementation/DataChangeHistoryApiImpl.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class DataChangeHistoryApiImpl extends ApiBase_1.ApiBase {
     getDataChangeHistoryMode() {
         return this.getAdaptableState().System.DataChangeHistory.currentMode;
@@ -41,10 +40,6 @@ class DataChangeHistoryApiImpl extends ApiBase_1.ApiBase {
     undoDataChangeHistoryEntry(dataChangeInfo) {
         this.dispatchAction((0, SystemRedux_1.SystemDataChangeHistoryUndo)(dataChangeInfo));
     }
-    showDataChangeHistoryPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'DataChangeHistoryApi', 'showDataChangeHistoryPopup', 'openDataChangeHistorySettingsPanel');
-        this.openDataChangeHistorySettingsPanel();
-    }
     openDataChangeHistorySettingsPanel() {
         this.showModulePopup(ModuleConstants.DataChangeHistoryModuleId);
     }

package/src/Api/Implementation/DataSetApiImpl.d.ts

@@ -1,18 +1,15 @@
 import { ApiBase } from './ApiBase';
 import { DataSetApi } from '../DataSetApi';
-import { DataSet } from '../../AdaptableOptions/GeneralOptions';
+import { DataSet } from '../../AdaptableOptions/DataSetOptions';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { DataSetInternalApi } from '../Internal/DataSetInternalApi';
 export declare class DataSetApiImpl extends ApiBase implements DataSetApi {
     internalApi: DataSetInternalApi;
     constructor(adaptable: IAdaptable);
-    getAllDataSets(): DataSet[];
     getDataSets(): DataSet[];
     getCurrentDataSet(): DataSet | undefined;
     getDataSetByName(dataSetName: string): DataSet | undefined;
     setDataSet(dataSetName: string): void;
     clearCurrentDataSet(): void;
-    showDataSetPopup(): void;
     openDataSetSettingsPanel(): void;
-    fireDataSetSelectedEvent(dataSet: DataSet): void;
 }

package/src/Api/Implementation/DataSetApiImpl.js

@@ -6,19 +6,14 @@ const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 const ApiBase_1 = require("./ApiBase");
 const DataSetInternalApi_1 = require("../Internal/DataSetInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class DataSetApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
         this.internalApi = new DataSetInternalApi_1.DataSetInternalApi(adaptable);
     }
-    getAllDataSets() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'DataSetApi', 'getAllDataSets', 'getDataSets');
-        return this.getDataSets();
-    }
     getDataSets() {
         var _a, _b, _c;
-        return (_c = (_b = (_a = this.adaptable.adaptableOptions) === null || _a === void 0 ? void 0 : _a.generalOptions) === null || _b === void 0 ? void 0 : _b.dataSets) !== null && _c !== void 0 ? _c : [];
+        return (_c = (_b = (_a = this.adaptable.adaptableOptions) === null || _a === void 0 ? void 0 : _a.dataSetOptions) === null || _b === void 0 ? void 0 : _b.dataSets) !== null && _c !== void 0 ? _c : [];
     }
     getCurrentDataSet() {
         let currentDataSetName = this.getAdaptableState().System.CurrentDataSet;
@@ -36,16 +31,8 @@ class DataSetApiImpl extends ApiBase_1.ApiBase {
     clearCurrentDataSet() {
         this.dispatchAction(SystemRedux.SystemDataSetSelect(null));
     }
-    showDataSetPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'DataSetApi', 'showDataSetPopup', 'openDataSetSettingsPanel');
-        this.openDataSetSettingsPanel();
-    }
     openDataSetSettingsPanel() {
         this.showModulePopup(ModuleConstants.DataSetModuleId);
     }
-    fireDataSetSelectedEvent(dataSet) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'DataSetApi', 'fireDataSetSelectedEvent');
-        this.internalApi.fireDataSetSelectedEvent(dataSet);
-    }
 }
 exports.DataSetApiImpl = DataSetApiImpl;

package/src/Api/Implementation/ExportApiImpl.d.ts

@@ -2,8 +2,7 @@ import { ExportApi } from '../ExportApi';
 import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } from '../../PredefinedConfig/ExportState';
 import { ApiBase } from './ApiBase';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
-import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { AdaptableReportColumn, CustomDestination, ExportFormContext, ServerReport } from '../../AdaptableOptions/ExportOptions';
+import { AdaptableReportColumn, CustomDestination, ExportFormContext, ExternalReport } from '../../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExportInternalApi } from '../Internal/ExportInternalApi';
@@ -19,28 +18,23 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     getCurrentDestination(): ExportDestination | CustomDestination;
     getAvailableSystemReports(): SystemReportNames;
     getAvailableExportDestinations(): ExportDestination[];
-    getAllReports(): Report[];
     getReports(): Report[];
     getReportSchedules(): ReportSchedule[];
     sendReport(reportName: string, destination: 'Excel' | 'CSV' | 'Clipboard' | 'JSON' | string): void;
     selectReport(reportName: string): void;
     selectDestination(destinationName: string): void;
-    getAllCustomDestination(): CustomDestination[];
     getCustomDestinations(): CustomDestination[];
     isExportDestinationCustom(destinationName: string): boolean;
     getExportDestinationForm(destinationName: string): AdaptableForm<ExportFormContext> | undefined;
     canExportToExcel(): boolean;
     exportDataToExcel(reportData: ReportData, fileName: string): void;
-    showExportPopup(): void;
     openExportSettingsPanel(): void;
     editReport(report: Report): Report;
     editReports(reports: Report[]): Report[];
-    isDataChangeInReport(cellDataChangedInfo: CellDataChangedInfo, report: Report): boolean;
     exportVisualDataToExcel(): void;
-    getAllServerReports(): ServerReport[] | undefined;
-    getServerReports(): ServerReport[];
-    isServerReport(report: Report): boolean;
-    runServerReport(serverReportName: string): ReportData | undefined;
+    getExternalReports(): ExternalReport[];
+    isExternalReport(report: Report): boolean;
+    runExternalReport(externalReportName: string): ReportData | undefined;
     getReportDataForReport(reportName: string): ReportData | undefined;
     isColumnExportable(adaptableColumn: AdaptableReportColumn): boolean;
 }

package/src/Api/Implementation/ExportApiImpl.js

@@ -9,7 +9,6 @@ const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const ExportInternalApi_1 = require("../Internal/ExportInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class ExportApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -62,18 +61,14 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         });
         return systemDestinations;
     }
-    getAllReports() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ExportApi', 'getAllReports', 'getReports');
-        return this.getReports();
-    }
     getReports() {
         const reports = this.getAvailableSystemReports()
             .map((s) => this.getReportByName(s))
             .concat(this.getExportState().Reports);
-        const serverReports = this.getServerReports();
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(serverReports)) {
-            reports.push(...serverReports.map((c) => {
-                return ObjectFactory_1.default.CreateServerReport(c.name);
+        const externalReports = this.getExternalReports();
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(externalReports)) {
+            reports.push(...externalReports.map((c) => {
+                return ObjectFactory_1.default.CreateExternalReport(c.name);
             }));
         }
         return reports;
@@ -93,10 +88,6 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
     selectDestination(destinationName) {
         this.dispatchAction(ExportRedux.DestinationSelect(destinationName));
     }
-    getAllCustomDestination() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ExportApi', 'getAllCustomDestination', 'getCustomDestinations');
-        return this.getCustomDestinations();
-    }
     getCustomDestinations() {
         var _a;
         return (_a = this.getExportOptions().customDestinations) !== null && _a !== void 0 ? _a : [];
@@ -114,10 +105,6 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
     exportDataToExcel(reportData, fileName) {
         this.adaptable.exportToExcel(reportData, fileName);
     }
-    showExportPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ExportApi', 'showExportPopup', 'openExportSettingsPanel');
-        this.openExportSettingsPanel();
-    }
     openExportSettingsPanel() {
         this.showModulePopup(ModuleConstants.ExportModuleId);
     }
@@ -131,33 +118,25 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         });
         return reports === null || reports === void 0 ? void 0 : reports.map((report) => this.getReportById(report.Uuid));
     }
-    isDataChangeInReport(cellDataChangedInfo, report) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'ExportApi', 'isDataChangeInReport');
-        return this.internalApi.isDataChangeInReport(cellDataChangedInfo, report);
-    }
     exportVisualDataToExcel() {
         this.adaptable.exportVisualDataToExcel();
     }
-    getAllServerReports() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ExportApi', 'getAllServerReports', 'getServerReports');
-        return this.getServerReports();
-    }
-    getServerReports() {
+    getExternalReports() {
         var _a;
-        return (_a = this.getExportOptions().serverReports) !== null && _a !== void 0 ? _a : [];
+        return (_a = this.getExportOptions().externalReports) !== null && _a !== void 0 ? _a : [];
     }
-    isServerReport(report) {
+    isExternalReport(report) {
         var _a;
-        return ((_a = this.getServerReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
+        return ((_a = this.getExternalReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
     }
-    runServerReport(serverReportName) {
+    runExternalReport(externalReportName) {
         var _a;
-        const serverReport = (_a = this.getServerReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == serverReportName);
-        if (!serverReport) {
-            this.logWarn(`Server Report '${serverReportName}' not found!`);
+        const externalReport = (_a = this.getExternalReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == externalReportName);
+        if (!externalReport) {
+            this.logWarn(`External Report '${externalReportName}' not found!`);
             return undefined;
         }
-        return serverReport.onRunReport();
+        return externalReport.onRunReport();
     }
     getReportDataForReport(reportName) {
         const report = this.getReportByName(reportName);
@@ -172,6 +151,8 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         if (typeof isExportableFn === 'function') {
             return isExportableFn({
                 adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
                 adaptableColumn,
             });
         }

package/src/Api/Implementation/{QueryLanguageApiImpl.d.ts → ExpressionApiImpl.d.ts}

@@ -1,12 +1,12 @@
 import { ApiBase } from './ApiBase';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
-import { QueryLanguageApi } from '../QueryLanguageApi';
+import { ExpressionApi } from '../ExpressionApi';
 import { AdaptableQuery } from '../../PredefinedConfig/Common/AdaptableQuery';
 import { AdaptableColumnBase } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { QueryLanguageInternalApi } from '../Internal/QueryLanguageInternalApi';
-export declare class QueryLanguageApiImpl extends ApiBase implements QueryLanguageApi {
-    internalApi: QueryLanguageInternalApi;
+import { ExpressionInternalApi } from '../Internal/ExpressionnternalApi';
+export declare class ExpressionApiImpl extends ApiBase implements ExpressionApi {
+    internalApi: ExpressionInternalApi;
     constructor(adaptable: IAdaptable);
     isValidBooleanExpression(query: string, module: AdaptableModule, validationErrorMessage?: string): boolean;
     isValidObservableExpression(expression: string, module: AdaptableModule, validationErrorMessage?: string): boolean;

package/src/Api/Implementation/{QueryLanguageApiImpl.js → ExpressionApiImpl.js}

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryLanguageApiImpl = void 0;
+exports.ExpressionApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const parser = tslib_1.__importStar(require("../../parser/src"));
-const QueryLanguageInternalApi_1 = require("../Internal/QueryLanguageInternalApi");
-class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
+const ExpressionnternalApi_1 = require("../Internal/ExpressionnternalApi");
+class ExpressionApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new QueryLanguageInternalApi_1.QueryLanguageInternalApi(adaptable);
+        this.internalApi = new ExpressionnternalApi_1.ExpressionInternalApi(adaptable);
     }
     isValidBooleanExpression(query, module, validationErrorMessage) {
         const { isValid, errorMessage } = this.adaptable.api.internalApi
@@ -76,6 +76,8 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
             const queryableColumnContext = {
                 adaptableColumn: adaptableColumnBase,
                 adaptableApi: this.getAdaptableApi(),
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
             };
             return queryableColumnFn(queryableColumnContext);
         }
@@ -91,4 +93,4 @@ class QueryLanguageApiImpl extends ApiBase_1.ApiBase {
             .getExpressionWithColumnFriendlyNames(this.getAdaptableQueryExpression(query));
     }
 }
-exports.QueryLanguageApiImpl = QueryLanguageApiImpl;
+exports.ExpressionApiImpl = ExpressionApiImpl;

package/src/Api/Implementation/FilterApiImpl.d.ts

@@ -1,17 +1,13 @@
-import * as Redux from 'redux';
-import * as LayoutRedux from '../../Redux/ActionsReducers/LayoutRedux';
 import { ApiBase } from './ApiBase';
 import { FilterApi } from '../FilterApi';
 import { AdaptablePredicateDef, ColumnFilterDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { ColumnFilter, GridCell } from '../../types';
-import { IRowNode } from '@ag-grid-community/core';
+import { ColumnFilter } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { FilterInternalApi } from '../Internal/FilterInternalApi';
 export declare class FilterApiImpl extends ApiBase implements FilterApi {
     internalApi: FilterInternalApi;
     constructor(adaptable: IAdaptable);
-    findPredicateDefByShortcut(shortcut: string, column: AdaptableColumn): AdaptablePredicateDef;
     getFilterPredicateDefsForColumn(column: AdaptableColumn): AdaptablePredicateDef[];
     getFilterPredicateDefsForColumnId(columnId: string): AdaptablePredicateDef[] | undefined;
     showQuickFilterBar(): void;
@@ -22,22 +18,13 @@ export declare class FilterApiImpl extends ApiBase implements FilterApi {
     getActiveColumnFilters(): ColumnFilter[];
     getColumnFilterDefs(): ColumnFilterDef[];
     getColumnFiltersForLayout(layoutName: string): ColumnFilter[];
-    setColumnFilter(columnFilters: ColumnFilter[]): ColumnFilter[] | null;
     setColumnFilters(columnFilters: ColumnFilter[]): ColumnFilter[] | null;
     clearColumnFilter(columnFilter: ColumnFilter): void;
-    clearColumnFilterByColumns(columns: string[]): void;
     clearColumnFiltersForColumns(columns: string[]): void;
-    clearColumnFilterByColumn(column: string): void;
     clearColumnFilters(): void;
-    clearAndSetColumnFilter(columnFilters: ColumnFilter[]): void;
     clearAndSetColumnFilters(columnFilters: ColumnFilter[]): void;
-    getAllColumnFilterForColumn(column: string): ColumnFilter[];
-    getColumnFilter(columnId: string): ColumnFilter | undefined;
-    createValuesColumnFilterForCells(gridCells: GridCell[]): ColumnFilter | null;
-    createEqualityColumnFilterForCell(gridCell: GridCell): ColumnFilter | null;
     columnFilterToString(columnFilter: ColumnFilter): string;
     columnFiltersToString(columnFilters: ColumnFilter[]): string;
-    evaluateColumnFilter(columnFilter: ColumnFilter, node: IRowNode): boolean;
     private getColumnFilterById;
     /**
      * Checks if a filter is applied. It is applied when:
@@ -47,9 +34,6 @@ export declare class FilterApiImpl extends ApiBase implements FilterApi {
      * @param filter
      */
     isFilterActive(filter: ColumnFilter): boolean;
-    shouldNewColumnFilterTriggerGridFiltering(action: LayoutRedux.LayoutColumnFilterAction | Redux.Action): boolean;
-    areColumnFiltersDifferent(oldFilters: ColumnFilter[], newFilters: ColumnFilter[]): boolean;
-    fireFilterAppliedEvent(): void;
     suspendColumnFilter(columnFilter: ColumnFilter): void;
     unSuspendColumnFilter(columnFilter: ColumnFilter): void;
     suspendAllColumnFilters(): void;

package/src/Api/Implementation/FilterApiImpl.js

@@ -7,16 +7,11 @@ const LayoutRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/La
 const ApiBase_1 = require("./ApiBase");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const FilterInternalApi_1 = require("../Internal/FilterInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class FilterApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
         this.internalApi = new FilterInternalApi_1.FilterInternalApi(adaptable);
     }
-    findPredicateDefByShortcut(shortcut, column) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FilterApi', 'findPredicateDefByShortcut');
-        return this.internalApi.findPredicateDefByShortcut(shortcut, column);
-    }
     getFilterPredicateDefsForColumn(column) {
         const scope = {
             ColumnIds: [column.columnId]
@@ -67,10 +62,6 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         const layout = this.adaptable.api.layoutApi.getLayoutByName(layoutName);
         return (_a = layout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
     }
-    setColumnFilter(columnFilters) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FilterApi', 'setColumnFilter', 'setColumnFilters');
-        return this.setColumnFilters(columnFilters);
-    }
     setColumnFilters(columnFilters) {
         columnFilters.forEach((columnFilter) => {
             if (!columnFilter.Predicate) {
@@ -97,57 +88,25 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
     clearColumnFilter(columnFilter) {
         this.dispatchAction(LayoutRedux.LayoutColumnFilterClear(columnFilter));
     }
-    clearColumnFilterByColumns(columns) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FilterApi', 'clearColumnFilterByColumns', 'clearColumnFiltersForColumns');
-        this.clearColumnFiltersForColumns(columns);
-    }
     clearColumnFiltersForColumns(columns) {
         columns.forEach((c) => {
             this.clearColumnFilterForColumn(c);
         });
     }
-    clearColumnFilterByColumn(column) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FilterApi', 'clearColumnFilterByColumn', 'clearColumnFilterForColumn');
-        this.clearColumnFilterForColumn(column);
-    }
     clearColumnFilters() {
         this.dispatchAction(LayoutRedux.LayoutColumnFilterClearAll());
         this.adaptable.clearGridFiltering();
     }
-    clearAndSetColumnFilter(columnFilters) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FilterApi', 'clearAndSetColumnFilter', 'clearAndSetColumnFilters');
-        this.clearAndSetColumnFilters(columnFilters);
-    }
     clearAndSetColumnFilters(columnFilters) {
         this.clearColumnFilters();
         this.setColumnFilters(columnFilters);
     }
-    getAllColumnFilterForColumn(column) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FilterApi', 'getAllColumnFilterForColumn', 'getColumnFilterForColumn', 'One Column may have at most one ColumnFilter applied!');
-        return [this.getColumnFilterForColumn(column)];
-    }
-    getColumnFilter(columnId) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FilterApi', 'getColumnFilter', 'getColumnFilterForColumn');
-        return this.getColumnFilterForColumn(columnId);
-    }
-    createValuesColumnFilterForCells(gridCells) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FilterApi', 'createValuesColumnFilterForCells');
-        return this.internalApi.createValuesColumnFilterForCells(gridCells);
-    }
-    createEqualityColumnFilterForCell(gridCell) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FilterApi', 'createEqualityColumnFilterForCell');
-        return this.internalApi.createEqualityColumnFilterForCell(gridCell);
-    }
     columnFilterToString(columnFilter) {
         return this.internalApi.columnFilterToString(columnFilter);
     }
     columnFiltersToString(columnFilters) {
         return this.internalApi.columnFiltersToString(columnFilters);
     }
-    evaluateColumnFilter(columnFilter, node) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FilterApi', 'evaluateColumnFilter');
-        return this.internalApi.evaluateColumnFilter(columnFilter, node);
-    }
     getColumnFilterById(id) {
         var _a;
         return (_a = this.getColumnFilters()) === null || _a === void 0 ? void 0 : _a.find((columnFilter) => columnFilter.Uuid === id);
@@ -179,18 +138,6 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         });
         return allInputsHaveValues;
     }
-    shouldNewColumnFilterTriggerGridFiltering(action) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FilterApi', 'shouldNewColumnFilterTriggerGridFiltering');
-        return this.internalApi.shouldNewColumnFilterTriggerGridFiltering(action);
-    }
-    areColumnFiltersDifferent(oldFilters, newFilters) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FilterApi', 'areColumnFiltersDifferent');
-        return this.internalApi.areColumnFiltersDifferent(oldFilters, newFilters);
-    }
-    fireFilterAppliedEvent() {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FilterApi', 'fireFilterAppliedEvent');
-        this.internalApi.fireFilterAppliedEvent();
-    }
     suspendColumnFilter(columnFilter) {
         this.dispatchAction(LayoutRedux.LayoutColumnFilterSuspend(columnFilter));
     }

package/src/Api/Implementation/FlashingCellApiImpl.d.ts

@@ -12,7 +12,6 @@ export declare class FlashingCellApiImpl extends ApiBase implements FlashingCell
     constructor(adaptable: IAdaptable);
     getFlashingCellState(): FlashingCellState;
     getFlashingCellDefinitions(config?: LayoutAssociatedObjectLoadConfig): FlashingCellDefinition[];
-    mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
     getFlashingCellDefinitionById(id: FlashingCellDefinition['Uuid']): FlashingCellDefinition;
     getActiveFlashingCellDefinitions(): FlashingCellDefinition[];
     getFlashingCellFlashTarget(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition['FlashTarget'];
@@ -25,9 +24,7 @@ export declare class FlashingCellApiImpl extends ApiBase implements FlashingCell
     addFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
     editFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
     getFlashingCellPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
-    clearGridFlashing(): void;
     clearAllFlashingCells(): void;
-    areCellsCurrentlyFlashed(): boolean;
     isAnyFlashingCellActive(): boolean;
     findFlashingCellDefinitions(criteria: AdaptableObjectLookupCriteria): FlashingCellDefinition[];
 }

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -6,7 +6,6 @@ const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/Sy
 const FlashingCellRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FlashingCellRedux"));
 const ApiBase_1 = require("./ApiBase");
 const FlashingCellInternalApi_1 = require("../Internal/FlashingCellInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class FlashingCellApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -22,10 +21,6 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
             return this.internalApi.mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition);
         });
     }
-    mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'FlashingCellApi', 'mergeFlashingCellDefinitionWithDefaults');
-        return this.internalApi.mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition);
-    }
     getFlashingCellDefinitionById(id) {
         var _a;
         return (_a = this.getFlashingCellDefinitions()) === null || _a === void 0 ? void 0 : _a.find((fc) => (fc === null || fc === void 0 ? void 0 : fc.Uuid) === id);
@@ -42,6 +37,8 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
         const flashingCellFiredInfo = {
             adaptableApi: this.adaptable.api,
             flashingCell: flashingCellToShow,
+            userName: this.adaptable.api.optionsApi.getUserName(),
+            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
         };
         const results = this.adaptable.api.eventApi.emitSync('FlashingCellDisplayed', flashingCellFiredInfo);
         const shouldShow = results.reduce((endResult, aResult) => {
@@ -93,17 +90,9 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
             .predicateApi.internalApi.getFlashingCellPredicateDefs(scope)
             .filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
     }
-    clearGridFlashing() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FlashingCellApi', 'clearGridFlashing', 'clearAllFlashingCells');
-        this.clearAllFlashingCells();
-    }
     clearAllFlashingCells() {
         this.dispatchAction(SystemRedux.SystemFlashingCellDeleteAll());
     }
-    areCellsCurrentlyFlashed() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'FlashingCellApi', 'areCellsCurrentlyFlashed', 'isAnyFlashingCellActive');
-        return this.isAnyFlashingCellActive();
-    }
     isAnyFlashingCellActive() {
         const currentFlashingCells = this.getAdaptableState().System.AdaptableFlashingCells;
         return currentFlashingCells.keys != null;