@openui5/sap.ui.rta 1.111.1 → 1.112.0

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicatorRegistry.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry
 	 * @author SAP SE
 	 * @since 1.86.0
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 * @private
 	 */
 	var ChangeIndicatorRegistry = ManagedObject.extend("sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry", {
@@ -242,7 +242,7 @@ sap.ui.define([
 		return getInfoFromChangeHandler(oAppComponent, oChange)
 			.then(function(oInfoFromChangeHandler) {
 				var mVisualizationInfo = oInfoFromChangeHandler || {};
-				var aAffectedElementIds = getSelectorIds(mVisualizationInfo.affectedControls || [oChange.getSelector()]);
+				var aAffectedElementIds = getSelectorIds(mVisualizationInfo.affectedControls || oChange.getSelector && [oChange.getSelector()] || []);
 
 				return {
 					affectedElementIds: aAffectedElementIds,
@@ -255,7 +255,7 @@ sap.ui.define([
 	}
 
 	function getInfoFromChangeHandler(oAppComponent, oChange) {
-		var oControl = JsControlTreeModifier.bySelector(oChange.getSelector(), oAppComponent);
+		var oControl = oChange.getSelector && JsControlTreeModifier.bySelector(oChange.getSelector(), oAppComponent);
 		if (oControl) {
 			return ChangesWriteAPI.getChangeHandler({
 				changeType: oChange.getChangeType(),
@@ -264,7 +264,10 @@ sap.ui.define([
 				layer: oChange.getLayer()
 			})
 				.then(function(oChangeHandler) {
-					if (oChangeHandler && typeof oChangeHandler.getChangeVisualizationInfo === "function") {
+					if (
+						oChangeHandler && typeof oChangeHandler.getChangeVisualizationInfo === "function"
+						&& oChange.isSuccessfullyApplied && oChange.isSuccessfullyApplied()
+					) {
 						return oChangeHandler.getChangeVisualizationInfo(oChange, oAppComponent);
 					}
 					return undefined;
@@ -325,7 +328,7 @@ sap.ui.define([
 
 	/**
 	 * Removes changes without any displayElementIds from the registry so the change can be re-registered and
-	 * the visualizationInfo is updated => if an element is inside a dialog which hasnt been opened yet
+	 * the visualizationInfo is updated => if an element is inside a dialog which hasn't been opened yet
 	 */
 	ChangeIndicatorRegistry.prototype.removeRegisteredChangesWithoutVizInfo = function () {
 		this.getAllRegisteredChanges().forEach(function(oChange) {

package/src/sap/ui/rta/util/changeVisualization/ChangeVisualization.js

@@ -5,6 +5,7 @@
  */
 
 sap.ui.define([
+	"sap/ui/core/Core",
 	"sap/ui/core/Fragment",
 	"sap/base/util/restricted/_difference",
 	"sap/base/util/deepEqual",
@@ -22,6 +23,7 @@ sap.ui.define([
 	"sap/ui/rta/util/changeVisualization/ChangeCategories",
 	"sap/ui/rta/util/changeVisualization/ChangeStates"
 ], function(
+	Core,
 	Fragment,
 	difference,
 	deepEqual,
@@ -63,7 +65,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeVisualization
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.111.1
+	 * @version 1.112.0
 	 * @private
 	 */
 	var ChangeVisualization = Control.extend("sap.ui.rta.util.changeVisualization.ChangeVisualization", {
@@ -98,7 +100,7 @@ sap.ui.define([
 
 			Control.prototype.constructor.apply(this, arguments);
 
-			this._oTextBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
+			this._oTextBundle = Core.getLibraryResourceBundle("sap.ui.rta");
 			this.setModel(new ResourceModel({
 				bundle: this._oTextBundle
 			}), "i18n");
@@ -294,7 +296,7 @@ sap.ui.define([
 	ChangeVisualization.prototype.openChangeCategorySelectionPopover = function(oEvent) {
 		if (!this._oToolbarButton) {
 			// Event bubbled through the toolbar, get original source
-			this._oToolbarButton = sap.ui.getCore().byId(oEvent.getParameter("id"));
+			this._oToolbarButton = Core.byId(oEvent.getParameter("id"));
 		}
 		var oPopover = this.getPopover();
 
@@ -372,6 +374,10 @@ sap.ui.define([
 			return sCommand;
 		}
 
+		if (!oChange.getSelector || !oChange.getSelector()) {
+			return false;
+		}
+
 		var oComponent = this._getComponent();
 		var oSelectorControl = JsControlTreeModifier.bySelector(oChange.getSelector(), oComponent);
 		var oLastDependentSelector = oChange.getDependentSelectorList().slice(-1)[0];
@@ -415,7 +421,7 @@ sap.ui.define([
 		var mPropertyBag = {
 			selector: oComponent,
 			invalidateCache: false,
-			// includeCtrlVariants: true,
+			includeCtrlVariants: true,
 			currentLayer: Layer.CUSTOMER,
 			includeDirtyChanges: true,
 			onlyCurrentVariants: true
@@ -435,11 +441,6 @@ sap.ui.define([
 			}
 			var aRegisteredChangeIds = this._oChangeIndicatorRegistry.getRegisteredChangeIds();
 			var oCurrentChanges = aChanges
-				.filter(function(oChange) {
-					// Filter out changes with different fileTypes (e.g. variant)
-					// or without selectors (e.g. App Descriptor changes)
-					return oChange.getFileType() === "change" && oChange.getSelector();
-				})
 				.reduce(function(oChanges, oChange) {
 					oChanges[oChange.getId()] = oChange;
 					return oChanges;
@@ -585,7 +586,7 @@ sap.ui.define([
 		// Sort the Indicators according XY-Position
 		// Set the tabindex according the sorting
 		// Focus the first visible indicator
-		sap.ui.getCore().applyChanges();
+		Core.applyChanges();
 
 		var aVisibleIndicators = this._oChangeIndicatorRegistry.getChangeIndicators()
 			.filter(function(oIndicator) {
@@ -675,6 +676,10 @@ sap.ui.define([
 		this._updateChangeRegistry()
 			.then(function() {
 				this._selectChangeCategory(this._sSelectedChangeCategory);
+				// This is required to avoid flickering of the toolbar when switching
+				// to visualization mode when the mode switcher is displayed as icons
+				oToolbar.adjustToolbarSectionWidths();
+
 				this._updateVisualizationModelMenuData();
 				oToolbar.setModel(this._oChangeVisualizationModel, "visualizationModel");
 			}.bind(this));

package/src/sap/ui/rta/util/validateText.js

@@ -0,0 +1,71 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([
+	"sap/ui/base/BindingParser",
+	"sap/ui/core/Core"
+], function(
+	BindingParser,
+	Core
+) {
+	"use strict";
+
+	var sEmptyTextKey = "\xa0";
+	var oValidators = {
+		noEmptyText: {
+			validatorFunction: function(sNewText) {
+				return sNewText !== sEmptyTextKey;
+			},
+			errorMessage: Core.getLibraryResourceBundle("sap.ui.rta").getText("RENAME_EMPTY_ERROR_TEXT")
+		}
+	};
+
+	function checkPreconditionsAndThrowError(sNewText, sOldText) {
+		if (sOldText === sNewText) {
+			throw Error("sameTextError");
+		}
+		var oBindingParserResult;
+		var bError;
+
+		try {
+			oBindingParserResult = BindingParser.complexParser(sNewText, undefined, true);
+		} catch (error) {
+			bError = true;
+		}
+
+		if (oBindingParserResult && typeof oBindingParserResult === "object" || bError) {
+			throw Error(sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta").getText("RENAME_BINDING_ERROR_TEXT"));
+		}
+	}
+
+	return function(sNewText, sOldText, oAction) {
+		checkPreconditionsAndThrowError(sNewText, sOldText);
+		var sErrorText;
+		var aValidators = oAction && oAction.validators || [];
+
+		aValidators.some(function(vValidator) {
+			var oValidator;
+
+			if (
+				typeof vValidator === "string" && oValidators[vValidator]
+			) {
+				oValidator = oValidators[vValidator];
+			} else {
+				oValidator = vValidator;
+			}
+
+			if (!oValidator.validatorFunction(sNewText)) {
+				sErrorText = oValidator.errorMessage;
+				return true;
+			}
+
+			return false;
+		});
+
+		if (sErrorText) {
+			throw Error(sErrorText);
+		}
+	};
+}, true);