@openui5/sap.ui.rta 1.136.4 → 1.139.0

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.js

@@ -6,84 +6,48 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/base/ManagedObject",
-	"sap/ui/core/Fragment",
-	"sap/ui/core/library",
 	"sap/ui/core/Element",
+	"sap/ui/core/Fragment",
 	"sap/ui/core/Lib",
+	"sap/ui/core/library",
+	"sap/ui/fl/util/getContainerUserInfo",
 	"sap/ui/model/json/JSONModel",
-	"sap/ui/rta/Utils",
+	"sap/ui/model/resource/ResourceModel",
 	"sap/ui/rta/plugin/iframe/AddIFrameDialogController",
-	"sap/ui/fl/util/getContainerUserInfo"
+	"sap/ui/rta/Utils"
 ], function(
 	Log,
 	ManagedObject,
-	Fragment,
-	coreLibrary,
 	Element,
+	Fragment,
 	Lib,
+	coreLibrary,
+	getContainerUserInfo,
 	JSONModel,
-	RtaUtils,
+	ResourceModel,
 	AddIFrameDialogController,
-	getContainerUserInfo
+	RtaUtils
 ) {
 	"use strict";
 
 	// shortcut for sap.ui.core.ValueState
 	var {ValueState} = coreLibrary;
 	var _oTextResources = Lib.getResourceBundleFor("sap.ui.rta");
-	var _sDocumentationURL = "https://help.sap.com/docs/search?q=Embedding%20Content%20%28Object%20Pages%29";
-	var _sDocumentationHTML = `${_oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_URL_WARNING_TEXT")} (` + `<a href=${_sDocumentationURL}>${_oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_URL_WARNING_LINKTEXT")}</a>)`;
-	var _mText = {
-		dialogTitle: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_TITLE"),
-		dialogCreateTitle: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_TITLE"),
-		dialogUpdateTitle: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_UPDATE_TITLE"),
-		sizeTitle: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SIZE_TITLE"),
-		widthLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_WIDTH_LABEL"),
-		widthUnitLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_WIDTH_UNITLABEL"),
-		heightLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_HEIGHT_LABEL"),
-		heightUnitLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_HEIGHT_UNITLABEL"),
-		dimensionsErrorText: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_DIMENSIONS_ERROR"),
-		saveText: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_BUTTON_SAVE"),
-		cancelText: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_BUTTON_CANCEL"),
-		previewUrlLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_PREVIEW_URL_LABEL"),
-		previewUrlMessage: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_BUTTON_PREVIEW_MESSAGE"),
-		previewButtonText: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_BUTTON_SHOW_PREVIEW"),
-		showPreviewButton: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_BUTTON_SHOW_PREVIEW"),
-		updatePreviewButton: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_BUTTON_UPDATE_PREVIEW"),
-		previewFrameLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_PREVIEW_FRAME_LABEL"),
-		parameterSearchLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_PARAMETER_SEARCH_LABEL"),
-		editUrlLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_EDIT_URL_LABEL"),
-		parametersLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_PARAMETERS_LABEL"),
-		columnParameterLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_TABLE_PARAMETER_LABEL"),
-		columnUiValueLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_TABLE_UI_VALUE_LABEL"),
-		containerTitleLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_CONTAINER_TITLE_LABEL"),
-		containerTitleDefaultValue: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_CONTAINER_TITLE_DEFAULT_VALUE_TEXT"),
-		selectAdditionalTextPercentSection: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_PERCENT_SECTION"),
-		selectAdditionalTextPercentHeader: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_PERCENT_HEADER"),
-		selectAdditionalTextVh: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_VH"),
-		selectAdditionalTextPx: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_PX"),
-		selectAdditionalTextRem: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_REM"),
-		advancedSettingsTitle: _oTextResources.getText("IFRAME_ADDIFRAME_ADVANCED_SETTINGS"),
-		additionalParametersSecurityWarningText: _oTextResources.getText("IFRAME_ADDIFRAME_ADDITIONAL_PARAMETERS_SECURITY_WARNING_TEXT"),
-		additionalParametersWarningMoreInfoText: _oTextResources.getText("IFRAME_ADDIFRAME_ADDITIONAL_PARAMETERS_WARNING_MORE_INFO_TEXT"),
-		additionalSandboxParametersLabel: _oTextResources.getText("IFRAME_ADDIFRAME_ADD_ADDITIONAL_SANDBOX_PARAMETERS_LABEL"),
-		additionalSandboxParametersPlaceholder: _oTextResources.getText("IFRAME_ADDIFRAME_ADD_ADDITIONAL_SANDBOX_PARAMETERS_PLACEHOLDER")
-	};
 
 	function createJSONModel(bSetUpdateTitle, bAsContainer, sFrameWidthValue, sFrameHeightValue, oAdvancedSettings) {
-		_mText.dialogTitle = bSetUpdateTitle ? _mText.dialogUpdateTitle : _mText.dialogCreateTitle;
-
 		var sSelectAdditionalTextPercent = bAsContainer
-			? _mText.selectAdditionalTextPercentSection
-			: _mText.selectAdditionalTextPercentHeader;
+			? _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_PERCENT_SECTION")
+			: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_PERCENT_HEADER");
 
 		return new JSONModel({
-			text: _mText,
+			dialogTitle: bSetUpdateTitle ?
+				_oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_UPDATE_TITLE") :
+				_oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_TITLE"),
 			asContainer: {
 				value: bAsContainer
 			},
 			title: {
-				value: _mText.containerTitleDefaultValue,
+				value: bAsContainer ? _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_CONTAINER_TITLE_DEFAULT_VALUE_TEXT") : null,
 				valueState: ValueState.None,
 				id: "sapUiRtaAddIFrameDialog_ContainerTitle_TitleInput"
 			},
@@ -96,7 +60,7 @@ sap.ui.define([
 				value: "%"
 			},
 			frameHeight: {
-				value: parseFloat(sFrameHeightValue) || 50,
+				value: parseFloat(sFrameHeightValue) || 35,
 				valueState: ValueState.None,
 				id: "sapUiRtaAddIFrameDialog_HeightInput"
 			},
@@ -114,29 +78,26 @@ sap.ui.define([
 				value: undefined
 			},
 			previewUrl: { value: "" },
-			documentationLink: {
-				HTML: _sDocumentationHTML
-			},
 			parameters: { value: [] },
 			unitsOfWidthMeasure: [{
 				unit: "%",
 				descriptionText: sSelectAdditionalTextPercent
 			}, {
 				unit: "px",
-				descriptionText: _mText.selectAdditionalTextPx
+				descriptionText: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_PX")
 			}, {
 				unit: "rem",
-				descriptionText: _mText.selectAdditionalTextRem
+				descriptionText: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_REM")
 			}],
 			unitsOfHeightMeasure: [{
 				unit: "vh",
-				descriptionText: _mText.selectAdditionalTextVh
+				descriptionText: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_VH")
 			}, {
 				unit: "px",
-				descriptionText: _mText.selectAdditionalTextPx
+				descriptionText: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_PX")
 			}, {
 				unit: "rem",
-				descriptionText: _mText.selectAdditionalTextRem
+				descriptionText: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_REM")
 			}],
 			advancedSettings: {
 				value: {
@@ -149,6 +110,9 @@ sap.ui.define([
 			},
 			settingsUpdate: {
 				value: false
+			},
+			showParameters: {
+				value: false
 			}
 		});
 	}
@@ -159,7 +123,7 @@ sap.ui.define([
 	 * @class Context - Dialog for IFrame settings in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.78
@@ -214,6 +178,8 @@ sap.ui.define([
 			this._oDialog.setModel(this._oJSONModel, "dialogInfo");
 			this._oDialog.setModel(oReferenceControl.getModel());
 			this._oDialog.setBindingContext(oReferenceControl.getBindingContext());
+			const oI18nModel = new ResourceModel({ bundleName: "sap.ui.rta.messagebundle" });
+			this._oDialog.setModel(oI18nModel, "i18n");
 			this._openDialog();
 		}.bind(this)).catch(function(oError) {
 			Log.error("Error loading fragment sap.ui.rta.plugin.iframe.AddIFrameDialog: ", oError);
@@ -227,7 +193,6 @@ sap.ui.define([
 	 */
 	AddIFrameDialog.prototype._openDialog = function() {
 		this._oDialog.attachAfterOpen(function() {
-			this._disablePanelExpand();
 			const oIframe = Element.getElementById("sapUiRtaAddIFrameDialog_PreviewFrame");
 			const oUserModel = oIframe.getModel("$user");
 			this._oDialog.setModel(oUserModel, "$user");
@@ -244,18 +209,6 @@ sap.ui.define([
 		this._oDialog.open();
 	};
 
-	/**
-	 * Disables the opening of the Panel at start
-	 *
-	 * @private
-	 */
-	AddIFrameDialog.prototype._disablePanelExpand = function() {
-		var oPanelButton = Element.getElementById("sapUiRtaAddIFrameDialog_PreviewLinkPanel").getDependents()[0];
-		if (oPanelButton) {
-			oPanelButton.setEnabled(false);
-		}
-	};
-
 	/**
 	 * Helper to extract current context URL parameters for the URL builder
 	 *

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialogController.js

@@ -57,6 +57,14 @@ sap.ui.define([
 		return new Token({key: sText, text: sText});
 	}
 
+	function setNewPreviewSize(sPropertyName) {
+		const sUnit = this._oJSONModel.getProperty(`${sPropertyName}Unit/value`);
+		const sValue = this._oJSONModel.getProperty(`${sPropertyName}/value`);
+		const oIFramePreview = Element.getElementById("sapUiRtaAddIFrameDialog_PreviewFrame");
+		const sIFramePropertyName = sPropertyName === "/frameWidth" ? "width" : "height";
+		oIFramePreview.setProperty(sIFramePropertyName, sValue + sUnit);
+	}
+
 	return Controller.extend("sap.ui.rta.plugin.iframe.AddIFrameDialogController", {
 		// eslint-disable-next-line object-shorthand
 		constructor: function(oJSONModel, mSettings) {
@@ -64,7 +72,15 @@ sap.ui.define([
 			this._importSettings(mSettings);
 		},
 
-		configureMultiInput() {
+		onBeforeOpen() {
+			if (this._buildPreviewURL()) {
+				// If a URL is set initially (updateIframe), validate it
+				this.onValidateUrl();
+			} else {
+				// Disable the save button but don't show an error message
+				this._checkIfAllFieldsValid(false);
+			}
+			// Configure the MultiInput field
 			// This syntax is the suggested way by the UI5 documentation to trigger a submit on the input field on focus loss
 			const oMultiInput = Element.getElementById("sapUiRtaAddIFrameDialog_AddAdditionalParametersInput");
 			oMultiInput.addValidator(multiInputValidator);
@@ -103,8 +119,7 @@ sap.ui.define([
 		 */
 		onValidationSuccess(oEvent) {
 			oEvent.getSource().setValueState(ValueState.None);
-			this._oJSONModel.setProperty("/areAllFieldsValid",
-				this._areAllTextFieldsValid() && this._areAllValueStateNones());
+			this._checkIfAllFieldsValid(true);
 		},
 
 		/**
@@ -113,7 +128,7 @@ sap.ui.define([
 		 */
 		onValidationError(oEvent) {
 			oEvent.getSource().setValueState(ValueState.Error);
-			this._oJSONModel.setProperty("/areAllFieldsValid", false);
+			this._checkIfAllFieldsValid(false);
 			this._setFocusOnInvalidInput();
 		},
 
@@ -131,9 +146,8 @@ sap.ui.define([
 
 		/**
 		 * Event handler for Show Preview button
-		 * @param {sap.ui.base.Event} oEvent - Event
 		 */
-		onShowPreview() {
+		onPreviewPress() {
 			const sReturnedURL = this._buildReturnedURL();
 			const sURL = this._buildPreviewURL();
 
@@ -141,15 +155,6 @@ sap.ui.define([
 				return;
 			}
 			const oIFrame = Element.getElementById("sapUiRtaAddIFrameDialog_PreviewFrame");
-			// enable/disable expanding the Panel
-			const oPanel = Element.getElementById("sapUiRtaAddIFrameDialog_PreviewLinkPanel");
-			const oPanelButton = oPanel.getDependents()[0];
-			if (sURL) {
-				oPanelButton.setEnabled(true);
-			} else {
-				oPanel.setExpanded(false);
-				oPanelButton.setEnabled(false);
-			}
 			try {
 				this._oJSONModel.setProperty("/previousFrameUrl/value", sReturnedURL);
 				this._oJSONModel.setProperty("/settingsUpdate/value", false);
@@ -157,11 +162,23 @@ sap.ui.define([
 				oIFrame.applySettings({ url: sURL, advancedSettings: {...this._oJSONModel.getProperty("/advancedSettings/value")} });
 				// Use the URL from the IFrame to ensure that the complete path is shown
 				this._oJSONModel.setProperty("/previewUrl/value", oIFrame.getUrl());
+				// Prevent the URL preview link (next element in the DOM) from getting the focus because it looks bad
+				setTimeout(() => {
+					Element.getElementById("sapUiRtaAddIFrameDialog_PreviewLink").getFocusDomRef().blur();
+				}, 0);
 			} catch (oError) {
 				Log.error("Error previewing the URL: ", oError);
 			}
 		},
 
+		/**
+		 * Event handler for handling the visibility of the parameters table
+		 */
+		toggleParameterVisibility() {
+			const bValue = this._oJSONModel.getProperty("/showParameters/value");
+			this._oJSONModel.setProperty("/showParameters/value", !bValue);
+		},
+
 		/**
 		 * Event handler for pressing a parameter
 		 * @param {sap.ui.base.Event} oEvent - Event
@@ -182,6 +199,34 @@ sap.ui.define([
 			oBinding.filter([oFilter]);
 		},
 
+		/**
+		 * Event handler for size value change - can be the width or height
+		 * This is used to update the iFrame size in the preview
+		 * @param {sap.ui.base.Event} oEvent - Event
+		 */
+		onSizeValueChange(oEvent) {
+			// Get changed field and retrieve its unit from this._oJSONModel
+			const oSource = oEvent.getSource();
+			const sPropertyPath = oSource.getBindingInfo("value").parts[0].path;
+			// Extract "/frameWidth" or "/frameHeight" from the binding path (e.g. /frameWidth/value)
+			const sPropertyName = sPropertyPath.replace(/\/value$/, "");
+			setNewPreviewSize.call(this, sPropertyName);
+		},
+
+		/**
+		 * Event handler for size unit change - can be the width or height
+		 * This is used to update the iFrame size in the preview
+		 * @param {sap.ui.base.Event} oEvent - Event
+		 */
+		onSizeUnitChange(oEvent) {
+			// Get changed field and retrieve its unit from this._oJSONModel
+			const oSource = oEvent.getSource();
+			const sPropertyPath = oSource.getBindingInfo("selectedKey").parts[0].path;
+			// Extract "/frameWidth" or "/frameHeight" from the binding path (e.g. /frameWidthUnit/value)
+			const sPropertyName = sPropertyPath.replace(/Unit\/value$/, "");
+			setNewPreviewSize.call(this, sPropertyName);
+		},
+
 		/**
 		 * Build preview URL
 		 * @returns {string} URL with resolved bindings
@@ -237,6 +282,16 @@ sap.ui.define([
 			return urlCleaner(this._oJSONModel.getProperty("/frameUrl/value"));
 		},
 
+		_checkIfAllFieldsValid(bExternalValidationSuccess) {
+			const bAllFieldsValid = (
+				bExternalValidationSuccess
+				&& !this._oJSONModel.getProperty("/frameUrlError/value")
+				&& this._areAllTextFieldsValid()
+				&& this._areAllValueStateNones()
+			);
+			this._oJSONModel.setProperty("/areAllFieldsValid", bAllFieldsValid);
+		},
+
 		onValidateUrl() {
 			const sUrl = this._buildPreviewURL();
 			const { result: bResult, error: sError } = isValidUrl(sUrl);
@@ -252,6 +307,7 @@ sap.ui.define([
 				const sErrorText = _oTextResources.getText(sErrorKey);
 				this._oJSONModel.setProperty("/frameUrlError/value", sErrorText);
 			}
+			this._checkIfAllFieldsValid(bResult);
 		},
 
 		/**
@@ -281,8 +337,7 @@ sap.ui.define([
 				bValidationError = true;
 			}
 
-			const bAllFieldsValid = this._areAllTextFieldsValid() && this._areAllValueStateNones() && !bValidationError;
-			this._oJSONModel.setProperty("/areAllFieldsValid", bAllFieldsValid);
+			this._checkIfAllFieldsValid(!bValidationError);
 			oInput.setValueState(sValueState);
 			return bValidationError;
 		},

package/src/sap/ui/rta/plugin/rename/Rename.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/rename/RenameDialog.fragment.xml

@@ -7,7 +7,7 @@
 		resizable="false"
 		draggable="true"
 		contentWidth="50rem"
-		title="{i18n>RENAME_DIALOG_TITLE}"
+		title="{= ${/dialogSettings/title} || ${i18n>RENAME_DIALOG_TITLE}}"
 		class="sapUiContentPadding"
 		initialFocus="sapUiRtaRenameDialog_input"
 		escapeHandler=".onCancel"
@@ -45,7 +45,7 @@
 		<beginButton>
 			<Button
 				id="sapUiRtaRenameDialog_saveButton"
-				enabled="{= ${/validationError} === undefined }"
+				enabled="{/isSaveEnabled}"
 				type="Emphasized"
 				text="{i18n>RENAME_DIALOG_CONFIRM}"
 				press="onSave"

package/src/sap/ui/rta/plugin/rename/RenameDialog.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class Constructor for a new sap.ui.rta.plugin.rename.RenameDialog.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @since 1.136
 	 * @private
@@ -58,18 +58,42 @@ sap.ui.define([
 		});
 	};
 
-	RenameDialog.prototype.openDialogAndHandleRename = async function(mPropertyBag) {
-		this._oDialog = await this._createPopup();
+	function getCurrentText(mPropertyBag) {
+		if (mPropertyBag.currentText) {
+			return mPropertyBag.currentText;
+		}
 		const oOverlay = mPropertyBag.overlay;
 		const oElement = oOverlay.getElement();
 		const oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
 		const oEditableControlDomRef = oDesignTimeMetadata.getAssociatedDomRef(oElement, mPropertyBag.domRef);
-		const sCurrentText = typeof mPropertyBag.action.getTextMutators === "function"
-			? mPropertyBag.action.getTextMutators(oElement).getText()
-			: oEditableControlDomRef.textContent;
+		if (typeof mPropertyBag.action.getTextMutators === "function") {
+			return mPropertyBag.action.getTextMutators(oElement).getText();
+		}
+		return oEditableControlDomRef.textContent;
+	}
+
+	/**
+	 * Opens the rename dialog and handles the rename.
+	 * @param {object} mPropertyBag - Properties for the rename dialog
+	 * @param {object} mPropertyBag.action - Action definition used to retrieve validators
+	 * @param {sap.ui.dt.ElementOverlay} mPropertyBag.overlay - Overlay of the element to be renamed
+	 * @param {string} [mPropertyBag.currentText] - Current text of the element, if not provided it will be fetched via the designtime metadata
+	 * @param {boolean} [mPropertyBag.acceptSameText] - If true, the save button is still enabled and will return the same text if no changes are made
+	 * @param {object} [mPropertyBag.dialogSettings] - Additional settings to customize the dialog
+	 * @param {string} [mPropertyBag.dialogSettings.title] - Title of the dialog
+	 * @returns {Promise<string>} Promise that resolves with the new text after renaming or undefined if cancelled
+	 * @private
+	 * @ui5-restricted sap.ui.rta
+	 */
+	RenameDialog.prototype.openDialogAndHandleRename = async function(mPropertyBag) {
+		this._oDialog = await this._createPopup();
+		const sCurrentText = getCurrentText(mPropertyBag);
+		this.bAcceptSameText = mPropertyBag.acceptSameText || false;
 		this.oDialogModel.setData({
 			oldText: sCurrentText,
-			newText: sCurrentText
+			newText: sCurrentText,
+			dialogSettings: mPropertyBag.dialogSettings || {},
+			isSaveEnabled: this.bAcceptSameText
 		});
 		this.oDialogModel.refresh(true);
 		this.oAction = mPropertyBag.action;
@@ -85,43 +109,37 @@ sap.ui.define([
 		return sNewText;
 	};
 
-	const VALIDATION_STATES = {
-		VALID: "VALID",
-		INVALID: "INVALID",
-		SAME_TEXT: "SAME_TEXT"
-	};
-
-	RenameDialog.prototype.checkValidRename = function() {
+	function checkValidRename() {
 		const oModelData = this.oDialogModel.getData();
 		const sNewText = oModelData.newText || "";
 		const sOldText = oModelData.oldText || "";
 		try {
 			validateText(sNewText, sOldText, this.oAction);
 			this.oDialogModel.setProperty("/validationError", undefined);
-			return VALIDATION_STATES.VALID;
+			this.oDialogModel.setProperty("/isSaveEnabled", true);
+			return true;
 		} catch (oError) {
 			if (oError.message === "sameTextError") {
 				// Do not show error message in case of same text
 				this.oDialogModel.setProperty("/validationError", undefined);
-				return VALIDATION_STATES.SAME_TEXT;
+				this.oDialogModel.setProperty("/isSaveEnabled", this.bAcceptSameText);
+				return true;
 			}
 			this.oDialogModel.setProperty("/validationError", oError.message);
-			this.oDialogModel.setProperty("/isValidRename", false);
-			return VALIDATION_STATES.INVALID;
+			this.oDialogModel.setProperty("/isSaveEnabled", false);
+			return false;
 		}
-	};
+	}
 
 	RenameDialog.prototype.onTextChange = function(oEvent) {
 		const sNewText = oEvent.getParameter("value").trim("");
 		this.oDialogModel.setProperty("/newText", sNewText.length ? sNewText : "\xa0");
-		this.checkValidRename();
+		checkValidRename.call(this);
 	};
 
 	RenameDialog.prototype.onSave = function() {
-		if (this.checkValidRename() === VALIDATION_STATES.VALID) {
+		if (checkValidRename.call(this)) {
 			this._fnResolveAfterClose(this.oDialogModel.getData().newText);
-		} else if (this.checkValidRename() === VALIDATION_STATES.SAME_TEXT) {
-			this._fnResolveAfterClose();
 		}
 	};
 

package/src/sap/ui/rta/service/Action.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Action
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	 *

package/src/sap/ui/rta/service/ControllerExtension.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.ControllerExtension
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/Outline.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Outline
 	 * @author SAP SE
 	 * @since 1.56
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/service/Property.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Property
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/Selection.js

@@ -14,7 +14,7 @@ sap.ui.define(function() {
 	 * @name sap.ui.rta.service.Selection
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/SupportTools.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.SupportTools
 	 * @author SAP SE
 	 * @since 1.106
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	 */