devexpress-reporting 23.1.2-build-2379-1247 → 23.2.0-build-000-1111

package/designer/services/_controlConverterService.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_controlConverterService.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/_controlConverterService.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_controlConverterService.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/_formatStringService.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_formatStringService.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/_formatStringService.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_formatStringService.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/_reportDataSourceService.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_reportDataSourceService.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/_reportDataSourceService.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_reportDataSourceService.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/_reportPreviewService.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_reportPreviewService.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/_reportPreviewService.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_reportPreviewService.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/_reportRenderingService.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_reportRenderingService.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/_reportRenderingService.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_reportRenderingService.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/_reportScriptService.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_reportScriptService.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/_reportScriptService.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_reportScriptService.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/_reportWizardService.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_reportWizardService.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */
@@ -10,9 +10,13 @@ import { JsonDataSource } from '@devexpress/analytics-core/analytics-data';
 import { IJsonDataSourceWizardState } from '@devexpress/analytics-core/analytics-wizard';
 import { IDataSourceInfo } from '../actions/_sqlDataSourceEditor';
 import { IReportWizardState } from '../wizard/reportWizardState';
+export interface IOldReportInfo {
+    json: string;
+    useInitialDataSource: boolean;
+}
 export declare class ReportWizardService {
-    static createNewWizardRequest(reportWizardState: IReportWizardState, requestType: any, state: any, customizeWizardModelAction: (wizardModel: any) => void, oldReportJSON?: any): string;
-    static generateReportFromWizardState(reportWizardState: IReportWizardState, requestType: any, state: any, customizeWizardModelAction: (wizardModel: any) => void, oldReportJSON?: string): any;
+    static createNewWizardRequest(reportWizardState: IReportWizardState, requestType: any, state: any, customizeWizardModelAction: (wizardModel: any) => void, oldReportInfo?: IOldReportInfo): string;
+    static generateReportFromWizardState(reportWizardState: IReportWizardState, requestType: any, state: any, customizeWizardModelAction: (wizardModel: any) => void, oldReportInfo?: IOldReportInfo): JQueryPromise<any>;
     static getLabelReportWizardData(): any;
     static createNewJsonDataSource(state: IJsonDataSourceWizardState, createJsonCallback: (dataSource: JsonDataSource) => JQueryPromise<IDataSourceInfo>): JQuery.Promise<string, any, any>;
 }

package/designer/services/_reportWizardService.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\_reportWizardService.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */
@@ -14,7 +14,7 @@ import { HandlerUri } from '../utils/settings';
 import { _convertToStateDataSource } from '../wizard/pages/chooseAvailableDataSourcePage';
 import { ReportStorageWeb } from './reportStorageWeb';
 export class ReportWizardService {
-    static createNewWizardRequest(reportWizardState, requestType, state, customizeWizardModelAction, oldReportJSON) {
+    static createNewWizardRequest(reportWizardState, requestType, state, customizeWizardModelAction, oldReportInfo) {
         var dataSourceJSON = null;
         var dataSources = [];
         reportWizardState.dataSource = reportWizardState.dataSource || reportWizardState.newDataSource;
@@ -34,7 +34,8 @@ export class ReportWizardService {
             reportModel: wizardModel,
             dataSource: dataSourceJSON,
             dataSources: dataSources,
-            oldReport: oldReportJSON,
+            oldReport: oldReportInfo === null || oldReportInfo === void 0 ? void 0 : oldReportInfo.json,
+            useInitialDataSource: oldReportInfo === null || oldReportInfo === void 0 ? void 0 : oldReportInfo.useInitialDataSource,
             state: state,
             colorScheme: reportWizardState.colorScheme && (reportWizardState.colorScheme.name === 'Custom' ? reportWizardState.colorScheme.baseColor : reportWizardState.colorScheme.name),
             customData: {
@@ -44,8 +45,8 @@ export class ReportWizardService {
         });
         return encodeURIComponent(requestJson);
     }
-    static generateReportFromWizardState(reportWizardState, requestType, state, customizeWizardModelAction, oldReportJSON) {
-        return ajax(HandlerUri(), 'generateReportFromWizardModel', this.createNewWizardRequest(reportWizardState, requestType, state, customizeWizardModelAction, oldReportJSON), ReportStorageWeb.getErrorMessageHandler());
+    static generateReportFromWizardState(reportWizardState, requestType, state, customizeWizardModelAction, oldReportInfo) {
+        return ajax(HandlerUri(), 'generateReportFromWizardModel', this.createNewWizardRequest(reportWizardState, requestType, state, customizeWizardModelAction, oldReportInfo), ReportStorageWeb.getErrorMessageHandler());
     }
     static getLabelReportWizardData() {
         return ajax(HandlerUri(), 'labelReportWizardData', '');

package/designer/services/reportStorageWeb.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\reportStorageWeb.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/services/reportStorageWeb.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\services\reportStorageWeb.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/dialogs/editParametersDialog.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\dialogs\editParametersDialog.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/dialogs/editParametersDialog.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\dialogs\editParametersDialog.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/dialogs/openReportDialog.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\dialogs\openReportDialog.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/dialogs/openReportDialog.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\dialogs\openReportDialog.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/dialogs/parametersDialogs.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\dialogs\parametersDialogs.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/dialogs/parametersDialogs.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\dialogs\parametersDialogs.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/dialogs/reportDialogBase.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\dialogs\reportDialogBase.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/dialogs/reportDialogBase.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\dialogs\reportDialogBase.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/dialogs/saveAsReportDialog.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\dialogs\saveAsReportDialog.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/dialogs/saveAsReportDialog.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\dialogs\saveAsReportDialog.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/dialogs/saveReportDialog.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\dialogs\saveReportDialog.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/dialogs/saveReportDialog.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\dialogs\saveReportDialog.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/generator/_inititalizer.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\generator\_inititalizer.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */
@@ -14,7 +14,7 @@ import * as ko from 'knockout';
 import { IEnumType } from '../../../common/customTypes';
 import { IPreviewCustomizationHandler } from '../../../viewer/utils/initializer';
 import { ReportItemsProvider } from '../../internal/reportExplorer/_reportItemsProvider';
-import { ICultureInfoList, ICustomControlInfo, IReportDesignerCustomizationHandler, IReportDesignerErrorPanelSettings, IReportWizardSettings } from '../../utils/inititalizer';
+import { ICultureInfoList, ICustomControlTypeInfo, ICustomExpressionInfo, IReportDesignerCustomizationHandler, IReportDesignerErrorPanelSettings, IReportWizardSettings } from '../../utils/inititalizer';
 import { DataBindingModeValue, DefaultCrossTabControlValue } from '../../utils/settings';
 import { IReportDesignerContext, IReportDesignerRootContext } from './reportDesignerContext';
 import { ReportMenuSettings } from './_reportMenuSettings';
@@ -93,7 +93,6 @@ export declare class ReportDesignerInitializer extends CommonDesignerGenerator<I
     private _createMultiQueryDataSourceWizardAction;
     private _customizeDesignerActions;
     private _patchReportBeforeRedesign;
-    private _restoreAfterFail;
     addContextActions(func?: (contextActions: ContextActionsSettings) => void): ReportDesignerInitializer;
     addActionList(actionListFunc?: () => ActionLists): ReportDesignerInitializer;
     private _createChartDesignerPart;
@@ -112,7 +111,8 @@ export declare class ReportDesignerInitializer extends CommonDesignerGenerator<I
     initBindingMode(dataBiningMode: string, convertBindingsToExpressions: string): ReportDesignerInitializer;
     initDefaultCrossTabControl(defaultCrossTabControl: DefaultCrossTabControlValue): ReportDesignerInitializer;
     registerControls(dataBindingMode: DataBindingModeValue, reportItemsProvider: ko.Observable<ReportItemsProvider> | ko.Computed<ReportItemsProvider>): ReportDesignerInitializer;
-    registerCustomControls(controls: ICustomControlInfo[]): ReportDesignerInitializer;
+    registerCustomControls(controls: ICustomControlTypeInfo[]): ReportDesignerInitializer;
+    registerCustomExpressions(globalExpressions: ICustomExpressionInfo[], reportExpressions: ICustomExpressionInfo[]): ReportDesignerInitializer;
     addCallbacks(callbacks: {
         designer?: IReportDesignerCustomizationHandler;
         preview?: IPreviewCustomizationHandler;

package/designer/tools/generator/_inititalizer.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\generator\_inititalizer.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */
@@ -45,7 +45,6 @@ import { XRChartViewModel } from '../../controls/xrChart';
 import { XRPivotGridViewModel } from '../../controls/xrPivotgrid';
 import { ReportViewModel } from '../../controls/xrReport';
 import { TableOfContentsLevel } from '../../controls/xrTableOfContentsLevel';
-import { DataFederationDataSource } from '../../dataObjects/dataFederation';
 import { calculatedFieldScripts } from '../../dataObjects/metadata/calculatedField';
 import { createNewObjectItem } from '../../dataObjects/objectItemCreation';
 import { LookUpValue } from '../../dataObjects/parameters/lookUpValue';
@@ -84,6 +83,7 @@ import { ReportDesignerAddOns, ReportDesignerElements } from '../../utils/report
 import { controlsFactory, DataBindingMode as UtilsDataBindingMode, DefaultCrossTabControl, formatStringEditorCustomSet, HandlerUri as UtilsHandlerUri, smartTagFactory as UtilsSmartTagFactory } from '../../utils/settings';
 import { registerControls } from '../../utils/_registerControls';
 import { registerCustomControls } from '../../utils/_registerCustomControls';
+import { registerCustomGlobalExpressions, registerCustomReportExpressions } from '../../utils/_registerCustomExpressions';
 import { StylesEditorHeaderModel } from '../../widgets/styleseditor';
 import { FullscreenReportWizard } from '../../wizard/fullscreenReportWizard';
 import { _convertToStateDataSource, _restoreDataSourceFromState } from '../../wizard/pages/chooseAvailableDataSourcePage';
@@ -407,7 +407,8 @@ export class ReportDesignerInitializer extends CommonDesignerGenerator {
                 rtl: options.rtl,
                 accessibilityCompliant: false,
                 exportSettings: options.exportSettings,
-                progressBarSettings: options.progressBarSettings
+                progressBarSettings: options.progressBarSettings,
+                searchSettings: options.searchSettings
             },
             element: options.element,
             callbacks: Object.assign(Object.assign({}, options.callbacks), { _onGetBuildStatus: errorsAction, _onGetDocumentDetails: errorsAction })
@@ -1004,23 +1005,22 @@ export class ReportDesignerInitializer extends CommonDesignerGenerator {
                 }
                 var createReport = (wizardState) => {
                     designerModel.isLoading(true);
+                    designerModel.navigateByReports.currentTab().undoEngine.start();
+                    designerModel.isDirty(true);
                     var _patchedInfo = this._patchReportBeforeRedesign(designerModel.model(), wizardState);
                     ReportWizardService.generateReportFromWizardState(wizardState, reportWizard._requestModelType, state(), (wizardModel) => {
                         reportWizard.events.call('beforeFinish', { state: wizardState, wizardModel: wizardModel });
-                    }, _patchedInfo.json)
+                    }, _patchedInfo)
                         .done((result) => {
-                        designerModel.navigateByReports.currentTab().undoEngine.start();
-                        designerModel.isDirty(true);
                         var newReport = createReportViewModel(result, designerModel.model());
                         designerModel.model(newReport);
-                        designerModel.navigateByReports.currentTab().undoEngine.end();
-                        designerModel.isLoading(false);
                         deferred.resolve(newReport);
                     })
                         .fail(() => {
-                        this._restoreAfterFail(designerModel.model(), _patchedInfo.removedDataSourceInfos);
-                        designerModel.isLoading(false);
                         deferred.reject();
+                    }).always(() => {
+                        designerModel.navigateByReports.currentTab().undoEngine.end();
+                        designerModel.isLoading(false);
                     });
                 };
                 if (reportWizardState.jsonDataSourceWizard.jsonSource && reportWizardState.newDataSource) {
@@ -1298,37 +1298,26 @@ export class ReportDesignerInitializer extends CommonDesignerGenerator {
         });
     }
     _patchReportBeforeRedesign(reportViewModel, state) {
-        var removedDataSourceInfos = [];
+        var useInitialDataSource = false;
         if (!state.newDataSource && reportViewModel.dataSource() && state.dataSource) {
             var stateDsInfo = _restoreDataSourceFromState(state.dataSource);
             var dataSourceInfo = reportViewModel.dataSourceHelper().findDataSourceInfoByName(stateDsInfo.name);
-            removedDataSourceInfos.push(dataSourceInfo);
-            reportViewModel.dataSourceHelper().removeDataSource(dataSourceInfo);
-            reportViewModel.dataSourceHelper().allDataSources().forEach((dataSource) => {
-                if (dataSource.data instanceof DataFederationDataSource) {
-                    var federationDataSourceInfo = reportViewModel.dataSourceHelper().findDataSourceInfoByName(dataSource.name);
-                    if (federationDataSourceInfo) {
-                        removedDataSourceInfos.push(federationDataSourceInfo);
-                        reportViewModel.dataSourceHelper().removeDataSource(federationDataSourceInfo);
-                    }
-                }
-            });
+            useInitialDataSource = true;
+            if (reportViewModel.dataSource().name() !== stateDsInfo.name) {
+                reportViewModel.dataSource(dataSourceInfo.data);
+            }
         }
         var reportJson = reportViewModel.serialize();
         delete reportJson.LocalizationItems;
         return {
             json: JSON.stringify({ 'XtraReportsLayoutSerializer': reportJson }),
-            removedDataSourceInfos: removedDataSourceInfos,
+            useInitialDataSource: useInitialDataSource
         };
     }
-    _restoreAfterFail(reportViewModel, removedDataSourceInfos) {
-        removedDataSourceInfos.forEach(info => {
-            reportViewModel.dataSourceHelper().restoreDataSource(info);
-        });
-    }
     addContextActions(func = (settings) => {
         var isDisabled = () => this.buildingModel.model() && this.buildingModel.model().language() !== defaultCulture;
-        settings.actionProviders = [new ReportElementActions(this.buildingModel.surface, this.buildingModel.selection),
+        var disposableProviders = [
+            new ReportElementActions(this.buildingModel.surface, this.buildingModel.selection),
             new ElementsGroupActions(this.buildingModel.surface, this.buildingModel.selection),
             new ReportActions(this._designerCallbacks.componentAdded),
             new TableRowActions(this.buildingModel.selection, this._designerCallbacks.componentAdded, isDisabled),
@@ -1337,7 +1326,10 @@ export class ReportDesignerInitializer extends CommonDesignerGenerator {
             new TableCellGroupActions(this.buildingModel.selection),
             new PdfContentActions(this.buildingModel.selection, isDisabled),
             new CrossTabActions(this._converters, isDisabled),
-            new PivotGridActions(this._converters, isDisabled)];
+            new PivotGridActions(this._converters, isDisabled)
+        ];
+        this._disposables.push(...disposableProviders);
+        settings.actionProviders = disposableProviders;
         settings.createDefaultGroupAction(this.buildingModel.editableObject, this.buildingModel.undoEngine);
     }) {
         super.addContextActions(func);
@@ -1363,7 +1355,7 @@ export class ReportDesignerInitializer extends CommonDesignerGenerator {
     _createChartDesignerPart(context) {
         var chartValueBindingProvider = ko.computed(() => context() && context().chartValueBindingProvider);
         this._addDisposable(chartValueBindingProvider);
-        var chartDesignerOptions = createChartDesignerOptions(this.buildingModel, this.buildingModel.dataSourceHelper, this.buildingModel.model, this.buildingModel.parameters, chartValueBindingProvider);
+        var chartDesignerOptions = createChartDesignerOptions(this.buildingModel, this.buildingModel.dataSourceHelper, this.buildingModel.model, this.buildingModel.parameters, chartValueBindingProvider, this._accessibilityProvider);
         this.addElement('runChartDesigner', () => (chart) => {
             chartDesignerOptions.run(chart);
         });
@@ -1513,6 +1505,11 @@ export class ReportDesignerInitializer extends CommonDesignerGenerator {
         registerCustomControls(controls);
         return this;
     }
+    registerCustomExpressions(globalExpressions, reportExpressions) {
+        registerCustomGlobalExpressions(globalExpressions);
+        registerCustomReportExpressions(reportExpressions);
+        return this;
+    }
     addCallbacks(callbacks) {
         this._callbacks = callbacks;
         if (!this._callbacks.designer)

package/designer/tools/generator/_qBRequestWrapper.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\generator\_qBRequestWrapper.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/generator/_qBRequestWrapper.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\generator\_qBRequestWrapper.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/generator/_reportMenuSettings.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\generator\_reportMenuSettings.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/generator/_reportMenuSettings.js

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\generator\_reportMenuSettings.js)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */

package/designer/tools/generator/_settings.d.ts

@@ -1,7 +1,7 @@
 /**
 * DevExpress HTML/JS Reporting (designer\tools\generator\_settings.d.ts)
-* Version:  23.1.2-build-2379-1247
-* Build date: Mar 20, 2023
+* Version:  23.2.1-build-23191-1448
+* Build date: Jul 10, 2023
 * Copyright (c) 2012 - 2023 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs/universal.xml
 */
@@ -13,7 +13,7 @@ import * as ko from 'knockout';
 import { IEnumType } from '../../../common/customTypes';
 import { IKeyValuePair } from '../../../common/types';
 import { IReportParametersInfo } from '../../../viewer/parameters/previewParametersViewModel';
-import { IExportSettings, IPreviewCustomizationHandler, IProgressBarSettings } from '../../../viewer/utils/initializer';
+import { IExportSettings, IPreviewCustomizationHandler, IProgressBarSettings, ISearchSettings } from '../../../viewer/utils/initializer';
 import { DataSourceActions } from '../../actions/_dataSourceActions';
 import { FederationDataSourceEditor } from '../../actions/_federationDataSourceEditor';
 import { JsonDataSourceEditor } from '../../actions/_jsonDataSourceEditor';
@@ -49,6 +49,7 @@ export interface IReportDesignerGeneratorSettings {
 export interface IReportPreviewSettings {
     exportSettings?: IExportSettings;
     progressBarSettings?: IProgressBarSettings;
+    searchSettings?: ISearchSettings;
 }
 export interface IReportUriSettings {
     reportDesignerUri?: string;
@@ -63,6 +64,7 @@ export interface PreviewOptions {
     rtl?: boolean;
     exportSettings?: IExportSettings;
     progressBarSettings?: IProgressBarSettings;
+    searchSettings?: ISearchSettings;
 }
 export declare class WizardsInitializerSettings {
     private callbacks;