@openui5/sap.ui.fl 1.124.1 → 1.125.0

package/src/sap/ui/fl/support/api/SupportAPI.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support.api.SupportAPI
 	 * @since 1.98
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted ui5 support tools
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetails.controller.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetails
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetailsEdit.controller.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetailsEdit
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/LayerContentMaster.controller.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.LayerContentMaster
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/Layers.controller.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.Layers
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.lrepConnector.LRepConnector
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.utils.DataUtils
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @since 1.45
 	 * @private
 	 */
@@ -68,8 +68,7 @@ sap.ui.define([
 			}
 
 			return new GroupHeaderListItem({
-				title: sTitle,
-				upperCase: false
+				title: sTitle
 			});
 		},
 

package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js

@@ -17,7 +17,7 @@ function(MessageItem, MessagePopover, JSONModel) {
 		 * @constructor
 		 * @alias sap.ui.fl.support.apps.contentbrowser.utils.ErrorUtils
 		 * @author SAP SE
-		 * @version 1.124.1
+		 * @version 1.125.0
 		 * @since 1.45
 		 * @private
 		 */

package/src/sap/ui/fl/transport/TransportSelection.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.transport.TransportSelection
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @since 1.38.0
 	 * Helper object to select an ABAP transport for an LREP object. This is not a generic utility to select a transport request, but part
 	 *        of the SmartVariant control.

package/src/sap/ui/fl/util/IFrame.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/util/ManagedObjectModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/util/resolveBinding.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @alias sap.ui.fl.util.resolveBinding
 	 * @since 1.91
 	 * @private

package/src/sap/ui/fl/variants/VariantModel.js

@@ -21,9 +21,9 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/controlVariants/URLHandler",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
-	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/Layer",
@@ -50,9 +50,9 @@ sap.ui.define([
 	URLHandler,
 	FlexObjectFactory,
 	DependencyHandler,
-	UIChangesState,
 	Switcher,
 	VariantManagementState,
+	FlexObjectState,
 	ManifestUtils,
 	VariantUtil,
 	Layer,
@@ -174,7 +174,7 @@ sap.ui.define([
 		oModel._oVariantSwitchPromise = oModel._oVariantSwitchPromise
 		.catch(function() {})
 		.then(fnCallback);
-		oModel.oFlexController.setVariantSwitchPromise(oModel._oVariantSwitchPromise);
+		VariantManagementState.setVariantSwitchPromise(oModel.sFlexReference, oModel._oVariantSwitchPromise);
 		return oModel._oVariantSwitchPromise;
 	}
 
@@ -285,12 +285,28 @@ sap.ui.define([
 		return bHasAdaptationsModel && ContextBasedAdaptationsAPI.getDisplayedAdaptationId(mContextBasedAdaptationBag);
 	}
 
+	function waitForInitialVariantChanges(mPropertyBag) {
+		const aCurrentVariantChanges = VariantManagementState.getInitialUIChanges({
+			vmReference: mPropertyBag.vmReference,
+			reference: mPropertyBag.reference
+		});
+		const aSelectors = aCurrentVariantChanges.reduce((aCurrentControls, oChange) => {
+			const oSelector = oChange.getSelector();
+			const oControl = JsControlTreeModifier.bySelector(oSelector, mPropertyBag.appComponent);
+			if (oControl && Utils.indexOfObject(aCurrentControls, { selector: oControl }) === -1) {
+				aCurrentControls.push({ selector: oControl });
+			}
+			return aCurrentControls;
+		}, []);
+		return aSelectors.length ? FlexObjectState.waitForFlexObjectsToBeApplied(aSelectors) : Promise.resolve();
+	}
+
 	/**
 	 * Constructor for a new sap.ui.fl.variants.VariantModel model.
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @param {object} oData - Either the URL where to load the JSON from or a JS object
 	 * @param {object} mPropertyBag - Map of properties required for the constructor
 	 * @param {sap.ui.fl.FlexController} mPropertyBag.flexController - <code>FlexController</code> instance for the component which uses the variant model
@@ -332,7 +348,7 @@ sap.ui.define([
 			// Initialize data
 			this.updateData();
 
-			const oLiveDependencyMap = UIChangesState.getLiveDependencyMap(this.sFlexReference);
+			const oLiveDependencyMap = FlexObjectState.getLiveDependencyMap(this.sFlexReference);
 			VariantManagementState.getInitialUIChanges(
 				{reference: this.sFlexReference},
 				this.oAppComponent.getId(),
@@ -514,10 +530,9 @@ sap.ui.define([
 				var mParameters = {
 					appComponent: this.oAppComponent,
 					reference: this.sFlexReference,
-					vmReference: sVMReference,
-					flexController: this.oFlexController
+					vmReference: sVMReference
 				};
-				VariantManagementState.waitForInitialVariantChanges(mParameters).then(function() {
+				waitForInitialVariantChanges(mParameters).then(function() {
 					var sCurrentVariantReference = this.oData[sVMReference].currentVariant;
 					this.callVariantSwitchListeners(sVMReference, sCurrentVariantReference, mPropertyBag.callback);
 				}.bind(this));
@@ -1244,9 +1259,14 @@ sap.ui.define([
 			});
 
 			if (mParameters.overwrite) {
-				// handle triggered "Save" button
+				// handle triggered "Save" button.
+				// Include special handling for PUBLIC variant which requires changing of all the dirty changes to PUBLIC layer before saving.
+				aNewVariantDirtyChanges = this._getDirtyChangesFromVariantChanges(aSourceVariantChanges);
+				if (this.getVariant(sSourceVariantReference, sVariantManagementReference).layer === Layer.PUBLIC) {
+					aNewVariantDirtyChanges.forEach((oChange) => oChange.setLayer(Layer.PUBLIC));
+				}
 				return this.oFlexController.saveSequenceOfDirtyChanges(
-					this._getDirtyChangesFromVariantChanges(aSourceVariantChanges),
+					aNewVariantDirtyChanges,
 					oAppComponent
 				)
 				.then(function(oResponse) {
@@ -1446,10 +1466,9 @@ sap.ui.define([
 		var mParameters = {
 			appComponent: this.oAppComponent,
 			reference: this.sFlexReference,
-			vmReference: sVariantManagementReference,
-			flexController: this.oFlexController
+			vmReference: sVariantManagementReference
 		};
-		this._oVariantSwitchPromise = this._oVariantSwitchPromise.then(VariantManagementState.waitForInitialVariantChanges.bind(undefined, mParameters));
+		this._oVariantSwitchPromise = this._oVariantSwitchPromise.then(waitForInitialVariantChanges.bind(undefined, mParameters));
 	};
 
 	VariantModel.prototype.waitForVMControlInit = function(sVMReference) {

package/src/sap/ui/fl/variants/context/controller/ContextVisibility.controller.js

@@ -200,11 +200,11 @@ sap.ui.define([
 		},
 
 		isRemoveAllEnabled(aSelectedRoleIds) {
-			return aSelectedRoleIds && aSelectedRoleIds.length !== 0;
+			return aSelectedRoleIds && aSelectedRoleIds?.length !== 0;
 		},
 
 		isMessageStripVisible(aSelectedRoles, bShowMessageStrip) {
-			return bShowMessageStrip && aSelectedRoles.length === 0;
+			return bShowMessageStrip && aSelectedRoles?.length === 0;
 		}
 	});
 });

package/src/sap/ui/fl/variants/context/i18n/i18n_sh.properties

@@ -1,12 +1,12 @@
 RADIO_BUTTON_GROUP_LABEL=Vidljivost
 ADD_CONTEXTS_BUTTON=Dodaj uloge
 REMOVE_ALL_BUTTON=Ukloni sve
-NO_DATA=Uloge nijesu na\u0111ene
+NO_DATA=Uloge nisu na\u0111ene
 SELECT_ROLE_DIALOG_TITLE=Odaberi uloge
 COLUMN_CONTEXT_ID=Uloga
 COLUMN_CONTEXT_DESCRIPTION=Opis
 SELECTED_CONTEXT_LIST_TITLE=Odabrane uloge
 NO_DESCRIPTION=Opis nije dostupan
-NO_SELECTED_ROLES=Uloge nijesu odabrane.
-NO_SELECTED_ROLES_WITH_ADVICE=Uloge nijesu odabrane. Odaberite najmanje jednu ulogu.
+NO_SELECTED_ROLES=Uloge nisu odabrane.
+NO_SELECTED_ROLES_WITH_ADVICE=Uloge nisu odabrane. Odaberite najmanje jednu ulogu.
 VISIBILITY=Vidljivo za sve korisnike. Dodajte uloge za ograni\u010Davanje vidljivosti pogleda.

package/src/sap/ui/fl/write/_internal/Storage.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Storage
 	 * @since 1.67
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/Versions.js

@@ -198,7 +198,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Versions
 	 * @since 1.74
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariant.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariant
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantFactory.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantFactory
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChange.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChange
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/condenser/Condenser.js

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.Condenser
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 */
 	var Condenser = {};
 

package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.UIReconstruction
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 */
 	var UIReconstruction = {};
 

package/src/sap/ui/fl/write/_internal/connectors/BackendConnector.js

@@ -74,7 +74,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BackendConnector
 	 * @since 1.72
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors
 	 */

package/src/sap/ui/fl/write/_internal/connectors/BtpServiceConnector.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Connector for saving and deleting data from SAPUI5 Flexibility KeyUser service - including personalization.
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BtpServiceConnector
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.KeyUserConnector
 	 * @since 1.70
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/LrepConnector.js

@@ -167,7 +167,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.LrepConnector
 	 * @since 1.67
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/NeoLrepConnector.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.NeoLrepConnector
 	 * @since 1.81
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/ObjectPathConnector.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.ObjectPathConnector
 	 * @since 1.73
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/PersonalizationConnector.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.PersonalizationConnector
 	 * @since 1.70
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/Utils.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

package/src/sap/ui/fl/write/_internal/extensionPoint/Processor.js

@@ -35,7 +35,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 */
 	var Processor = {
 		applyExtensionPoint(oExtensionPoint) {

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPAccess.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPAccess
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 */
 	var ABAPAccess = {};
@@ -61,6 +61,7 @@ sap.ui.define([
 	 */
 	ABAPAccess.isExtensibilityEnabled = function(oControl) {
 		return getExtensibilityVariant(oControl).then(function(oExtensibilityVariant) {
+			// Can any extensibility app be navigated to (uses fallback mechanism of getNavigationUri)?
 			return oExtensibilityVariant.getNavigationUri().then(function(sNavigationUri) {
 				return Boolean(sNavigationUri);
 			});
@@ -91,9 +92,9 @@ sap.ui.define([
 	/**
 	 * @inheritDoc
 	 */
-	ABAPAccess.onTriggerCreateExtensionData = function() {
+	ABAPAccess.onTriggerCreateExtensionData = function(oExtensibilityInfo, sRtaStyleClassName, sActionKey) {
 		return getExtensibilityVariant().then(function(oExtensibilityVariant) {
-			return oExtensibilityVariant.getNavigationUri().then(function(sNavigationUri) {
+			return oExtensibilityVariant.getNavigationUri(sActionKey).then(function(sNavigationUri) {
 				if (sNavigationUri) {
 					openWindow(sNavigationUri, "_blank");
 				}

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariant.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @class
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @public
 	 * @param {sap.ui.base.ManagedObject} oControl - Control to add extensions
 	 */

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariantFactory.js

@@ -115,7 +115,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariantFactory
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 */
 	var ABAPExtensibilityVariantFactory = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/MultiTenantABAPExtensibilityVariant.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.MultiTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @public
 	 */
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ServiceValidation.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ServiceValidation
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.124.1
+	 * @version 1.125.0
 	 * @private
 	 */
 	var ServiceValidation = {};