@openui5/sap.ui.fl 1.124.2 → 1.126.0

package/src/sap/ui/fl/messagebundle_tr.properties

@@ -59,6 +59,16 @@ BTN_ADD_FIELD=\u00D6zel alan ekle
 
 BTN_ADD_LOGIC=\u00D6zel mant\u0131k ekle
 
+BTN_CREATE=Olu\u015Ftur
+
+BTN_MENU_CREATE_CUSTOM_FIELD=\u00D6zel alan
+
+BTN_CREATE_CUSTOM_FIELD=\u00D6zel alan olu\u015Ftur
+
+BTN_MENU_CREATE_CUSTOM_LOGIC=\u00D6zel mant\u0131k
+
+BTN_CREATE_CUSTOM_LOGIC=\u00D6zel mant\u0131k olu\u015Ftur
+
 CAP_ADD_FIELD_TITLE=CAP'de \u00F6zel alan ekle
 
 CAP_ADD_FIELD_CREATE=Olu\u015Ftur

package/src/sap/ui/fl/messagebundle_uk.properties

@@ -59,6 +59,16 @@ BTN_ADD_FIELD=\u0414\u043E\u0434\u0430\u0442\u0438 \u043A\u043E\u0440\u0438\u044
 
 BTN_ADD_LOGIC=\u0414\u043E\u0434\u0430\u0442\u0438 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044C\u043A\u0443 \u043B\u043E\u0433\u0456\u043A\u0443
 
+BTN_CREATE=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438
+
+BTN_MENU_CREATE_CUSTOM_FIELD=\u041A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044C\u043A\u0435 \u043F\u043E\u043B\u0435
+
+BTN_CREATE_CUSTOM_FIELD=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044C\u043A\u0435 \u043F\u043E\u043B\u0435
+
+BTN_MENU_CREATE_CUSTOM_LOGIC=\u041A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044C\u043A\u0430 \u043B\u043E\u0433\u0456\u043A\u0430
+
+BTN_CREATE_CUSTOM_LOGIC=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044C\u043A\u0443 \u043B\u043E\u0433\u0456\u043A\u0443
+
 CAP_ADD_FIELD_TITLE=\u0414\u043E\u0434\u0430\u0442\u0438 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044C\u043A\u0435 \u043F\u043E\u043B\u0435 On CAP
 
 CAP_ADD_FIELD_CREATE=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438

package/src/sap/ui/fl/messagebundle_vi.properties

@@ -59,6 +59,16 @@ BTN_ADD_FIELD=Th\u00EAm tr\u01B0\u01A1\u0300ng tu\u0300y chi\u0309nh
 
 BTN_ADD_LOGIC=Th\u00EAm l\u00F4gic tu\u0300y chi\u0309nh
 
+BTN_CREATE=Ta\u0323o
+
+BTN_MENU_CREATE_CUSTOM_FIELD=Tr\u01B0\u1EDDng t\u00F9y ch\u1EC9nh
+
+BTN_CREATE_CUSTOM_FIELD=Ta\u0323o tr\u01B0\u01A1\u0300ng tu\u0300y chi\u0309nh
+
+BTN_MENU_CREATE_CUSTOM_LOGIC=L\u00F4gic t\u00F9y ch\u1EC9nh
+
+BTN_CREATE_CUSTOM_LOGIC=T\u1EA1o l\u00F4gic t\u00F9y ch\u1EC9nh
+
 CAP_ADD_FIELD_TITLE=Th\u00EAm tr\u01B0\u01A1\u0300ng tu\u0300y chi\u0309nh tr\u00EAn CAP
 
 CAP_ADD_FIELD_CREATE=Ta\u0323o

package/src/sap/ui/fl/messagebundle_zh_CN.properties

@@ -59,6 +59,16 @@ BTN_ADD_FIELD=\u6DFB\u52A0\u81EA\u5B9A\u4E49\u5B57\u6BB5
 
 BTN_ADD_LOGIC=\u6DFB\u52A0\u81EA\u5B9A\u4E49\u903B\u8F91
 
+BTN_CREATE=\u521B\u5EFA
+
+BTN_MENU_CREATE_CUSTOM_FIELD=\u81EA\u5B9A\u4E49\u5B57\u6BB5
+
+BTN_CREATE_CUSTOM_FIELD=\u521B\u5EFA\u81EA\u5B9A\u4E49\u5B57\u6BB5
+
+BTN_MENU_CREATE_CUSTOM_LOGIC=\u81EA\u5B9A\u4E49\u903B\u8F91
+
+BTN_CREATE_CUSTOM_LOGIC=\u521B\u5EFA\u81EA\u5B9A\u4E49\u903B\u8F91
+
 CAP_ADD_FIELD_TITLE=\u5728 CAP \u4E0A\u6DFB\u52A0\u81EA\u5B9A\u4E49\u5B57\u6BB5
 
 CAP_ADD_FIELD_CREATE=\u521B\u5EFA

package/src/sap/ui/fl/messagebundle_zh_TW.properties

@@ -59,6 +59,16 @@ BTN_ADD_FIELD=\u65B0\u589E\u81EA\u8A02\u6B04\u4F4D
 
 BTN_ADD_LOGIC=\u65B0\u589E\u81EA\u8A02\u908F\u8F2F
 
+BTN_CREATE=\u5EFA\u7ACB
+
+BTN_MENU_CREATE_CUSTOM_FIELD=\u81EA\u8A02\u6B04\u4F4D
+
+BTN_CREATE_CUSTOM_FIELD=\u5EFA\u7ACB\u81EA\u8A02\u6B04\u4F4D
+
+BTN_MENU_CREATE_CUSTOM_LOGIC=\u81EA\u8A02\u908F\u8F2F
+
+BTN_CREATE_CUSTOM_LOGIC=\u5EFA\u7ACB\u81EA\u8A02\u908F\u8F2F
+
 CAP_ADD_FIELD_TITLE=\u5728 CAP \u4E0A\u65B0\u589E\u81EA\u8A02\u6B04\u4F4D
 
 CAP_ADD_FIELD_CREATE=\u5EFA\u7ACB

package/src/sap/ui/fl/registry/Settings.js

@@ -117,6 +117,7 @@ sap.ui.define([
 					isLocalResetEnabled: false,
 					isVariantAdaptationEnabled: false,
 					isVariantAuthorNameAvailable: false,
+					isSeenFeaturesAvailable: false,
 					versioning: {},
 					_bFlexChangeMode: false,
 					_bFlexibilityAdaptationButtonAllowed: false
@@ -394,6 +395,15 @@ sap.ui.define([
 		return this._getBooleanProperty("isLocalResetEnabled");
 	};
 
+	/**
+	 * Returns the information if a backend supports to save viewed features for Whats New.
+	 *
+	 * @returns {boolean} <code>true</code> if viewed features is supported
+	 */
+	 Settings.prototype.isSeenFeaturesAvailable = function() {
+		return this._getBooleanProperty("isSeenFeaturesAvailable");
+	};
+
 	/**
 	 * Getter for the system ID of the connected back end.
 	 * This is taken from the <code>system</code> property of the flex settings. Only filled for an ABAP back end.

package/src/sap/ui/fl/support/_internal/getAllUIChanges.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getAllUIChanges
 	 * @since 1.121
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */

package/src/sap/ui/fl/support/_internal/getChangeDependencies.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getChangeDependencies
 	 * @since 1.98
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */

package/src/sap/ui/fl/support/_internal/getFlexSettings.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getFlexSettings
 	 * @since 1.99
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */

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.2
+	 * @version 1.126.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.2
+	 * @version 1.126.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.2
+	 * @version 1.126.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.2
+	 * @version 1.126.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.2
+	 * @version 1.126.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.2
+	 * @version 1.126.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.2
+	 * @version 1.126.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.2
+		 * @version 1.126.0
 		 * @since 1.45
 		 * @private
 		 */

package/src/sap/ui/fl/themes/sap_hcb/library.source.less

@@ -4,5 +4,16 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-@import "../base/library.source.less";
+/* ============================================================================== */
+/* Due to deprecation of sap_hcb with SAPUI5 version 1.46 the library.source.less */
+/* file of base is resolved: Imports to base.less and global.less of              */
+/* base are added to this library.source.less file (sap_hcb) and the              */
+/* respective control css files of base are added to the sap_hcb theme folder.    */
+/* This decoupling of the base theme is introduced with SAPUI5 version 1.126.     */
+/* ============================================================================== */
+
+@import "../../../core/themes/base/base.less";
+@import "../../../core/themes/base/global.less";
+
+
 @import "../../../../../sap/ui/core/themes/sap_hcb/global.less";

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.2
+	 * @version 1.126.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

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.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.2
+	 * @version 1.126.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.2
+	 * @version 1.126.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,
@@ -150,7 +150,7 @@ sap.ui.define([
 				return Reverter.revertMultipleChanges(aVariantDirtyChanges, {
 					appComponent: mPropertyBag.model.oAppComponent,
 					modifier: JsControlTreeModifier,
-					flexController: mPropertyBag.model.oFlexController
+					reference: mPropertyBag.model.sFlexReference
 				});
 			}
 			return undefined;
@@ -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.2
+	 * @version 1.126.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(),
@@ -407,7 +423,6 @@ sap.ui.define([
 			vmReference: mPropertyBag.variantManagementReference,
 			currentVReference: this.getCurrentVariantReference(mPropertyBag.variantManagementReference),
 			newVReference: mPropertyBag.newVariantReference,
-			flexController: this.oFlexController,
 			appComponent: mPropertyBag.appComponent || this.oAppComponent,
 			modifier: JsControlTreeModifier,
 			reference: this.sFlexReference
@@ -514,10 +529,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));
@@ -1040,7 +1054,7 @@ sap.ui.define([
 				mAdditionalChangeContent.defaultVariant = mPropertyBag.defaultVariant;
 				// Update hash data
 				var aHashParameters = URLHandler.getStoredHashParams({model: this});
-				if (aHashParameters) {
+				if (aHashParameters && this.oData[sVariantManagementReference].updateVariantInURL) {
 					if (
 						oData[sVariantManagementReference].defaultVariant !== oData[sVariantManagementReference].currentVariant
 						&& aHashParameters.indexOf(oData[sVariantManagementReference].currentVariant) === -1
@@ -1048,7 +1062,7 @@ sap.ui.define([
 						// if default variant is changed from the current variant, then add the current variant id as a variant URI parameter
 						URLHandler.update({
 							parameters: aHashParameters.concat(oData[sVariantManagementReference].currentVariant),
-							updateURL: !this._bDesignTimeMode && this.oData[sVariantManagementReference].updateVariantInURL,
+							updateURL: !this._bDesignTimeMode,
 							updateHashEntry: true,
 							model: this
 						});
@@ -1060,7 +1074,7 @@ sap.ui.define([
 						aHashParameters.splice(aHashParameters.indexOf(oData[sVariantManagementReference].currentVariant), 1);
 						URLHandler.update({
 							parameters: aHashParameters,
-							updateURL: !this._bDesignTimeMode && this.oData[sVariantManagementReference].updateVariantInURL,
+							updateURL: !this._bDesignTimeMode,
 							updateHashEntry: true,
 							model: this
 						});
@@ -1091,6 +1105,9 @@ sap.ui.define([
 			});
 
 			VariantManagementState.addRuntimeSteadyObject(this.sFlexReference, this.oAppComponent.getId(), oStandardVariantInstance);
+			// save all VariantManagement references for which a standard variant is created
+			this._aCreatedStandardVariantsFor ||= [];
+			this._aCreatedStandardVariantsFor.push(sVariantManagementReference);
 		}
 	};
 
@@ -1104,11 +1121,11 @@ sap.ui.define([
 
 			if (bDesignTimeModeToBeSet) {
 				URLHandler.clearAllVariantURLParameters({model: this});
-			} else if (bOriginalMode) {
+			} else if (bOriginalMode && this.oData[sVariantManagementReference].updateVariantInURL) {
 				// use case: switch from end user -> key user with a restart; the initial hash data is empty
 				URLHandler.update({
 					parameters: URLHandler.getStoredHashParams({model: this}),
-					updateURL: this.oData[sVariantManagementReference].updateVariantInURL,
+					updateURL: true,
 					updateHashEntry: false,
 					model: this
 				});
@@ -1206,16 +1223,17 @@ sap.ui.define([
 		if (!this._bDesignTimeMode) {
 			return oFlexController.saveSequenceOfDirtyChanges(aCopiedVariantDirtyChanges, oAppComponent)
 			.then(function(oResponse) {
-				// TODO: as soon as the invalidation is done automatically this can be removed
-				this.invalidateMap();
 				if (oResponse) {
-					var oResponseData = oResponse.response[0];
-					this.oData[sVariantManagementReference].variants.forEach(function(oVariant) {
-						if (oVariant.key === oResponseData.fileName) {
-							oVariant.author = oResponseData.support.user;
-						}
-					});
+					const oResponseData = oResponse.response[0];
+					const oAffectedVariant = this.oData[sVariantManagementReference].variants
+					.find((oVariant) => oVariant.key === oResponseData.fileName);
+					const oSupportInformation = oAffectedVariant.instance.getSupportInformation();
+					oSupportInformation.user = oResponseData.support.user;
+					oAffectedVariant.instance.setSupportInformation(oSupportInformation);
 				}
+
+				// TODO: as soon as the invalidation is done automatically this can be removed
+				this.invalidateMap();
 			}.bind(this));
 		}
 		return Promise.resolve();
@@ -1398,7 +1416,7 @@ sap.ui.define([
 	}
 
 	VariantModel.prototype.registerToModel = function(oVariantManagementControl) {
-		var sVariantManagementReference = this.getVariantManagementReferenceForControl(oVariantManagementControl);
+		const sVariantManagementReference = this.getVariantManagementReferenceForControl(oVariantManagementControl);
 
 		// ensure standard variants are mocked, if no variants are present in the changes.variantSection response from the backend
 		this._ensureStandardVariantExists(sVariantManagementReference);
@@ -1426,17 +1444,19 @@ sap.ui.define([
 		this.setModelPropertiesForControl(sVariantManagementReference, false, oVariantManagementControl);
 
 		// control property updateVariantInURL set initially
-		var sUpdateURL = oVariantManagementControl.getUpdateVariantInURL(); // default false
-		this.oData[sVariantManagementReference].updateVariantInURL = sUpdateURL;
-		URLHandler.registerControl({
-			vmReference: sVariantManagementReference,
-			updateURL: !!sUpdateURL,
-			model: this
-		});
-		URLHandler.handleModelContextChange({
-			model: this,
-			vmControl: oVariantManagementControl
-		});
+		const bUpdateURL = oVariantManagementControl.getUpdateVariantInURL(); // default false
+		this.oData[sVariantManagementReference].updateVariantInURL = bUpdateURL;
+		if (bUpdateURL) {
+			URLHandler.registerControl({
+				vmReference: sVariantManagementReference,
+				updateURL: true,
+				model: this
+			});
+			URLHandler.handleModelContextChange({
+				model: this,
+				vmControl: oVariantManagementControl
+			});
+		}
 
 		if (this.oData[sVariantManagementReference].initPromise) {
 			this.oData[sVariantManagementReference].initPromise.resolveFunction();
@@ -1448,13 +1468,12 @@ sap.ui.define([
 		// the initial changes are not applied via a variant switch
 		// to enable early variant switches to work properly they need to wait for the initial changes
 		// so the initial changes are set as a variant switch
-		var mParameters = {
+		const 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) {
@@ -1540,6 +1559,23 @@ sap.ui.define([
 		});
 
 		this.oDataSelector.removeUpdateListener(this.fnUpdateListener);
+
+		// as soon as there is a change / variant referencing a standard variant, the model is not in charge of creating the standard
+		// variant anymore and it needs to be available already at an earlier point in time. Therefore the standard variant needs to
+		// be added to the runtime persistence, mirroring the behavior of the InitialPrepareFunction.
+		const aFakeVariantsToBeAdded = [];
+		(this._aCreatedStandardVariantsFor || []).forEach((sVariantManagementReference) => {
+			if (
+				oVariantsMap[sVariantManagementReference]?.variants.length > 1
+				|| oVariantsMap[sVariantManagementReference]?.variants[0].controlChanges.length
+			) {
+				aFakeVariantsToBeAdded.push(oVariantsMap[sVariantManagementReference].variants[0].instance);
+			}
+		});
+		if (aFakeVariantsToBeAdded.length) {
+			VariantManagementState.addRuntimeOnlyFlexObjects(this.sFlexReference, aFakeVariantsToBeAdded);
+		}
+
 		VariantManagementState.clearRuntimeSteadyObjects(this.sFlexReference, this.oAppComponent.getId());
 		VariantManagementState.resetCurrentVariantReference(this.sFlexReference);
 		JSONModel.prototype.destroy.apply(this);

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?.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.2
+	 * @version 1.126.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -329,6 +329,14 @@ sap.ui.define([
 		return _executeActionByName("getFlexInfo", mPropertyBag);
 	};
 
+	Storage.getSeenFeatureIds = function(mPropertyBag) {
+		return _executeActionByName("getSeenFeatureIds", mPropertyBag);
+	};
+
+	Storage.setSeenFeatureIds = function(mPropertyBag) {
+		return _executeActionByName("setSeenFeatureIds", mPropertyBag);
+	};
+
 	/**
 	 * Gets the variant management context information.
 	 * The context information is a JSON object that has boolean property 'lastHitReached'

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.2
+	 * @version 1.126.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.2
+	 * @version 1.126.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.2
+	 * @version 1.126.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.2
+	 * @version 1.126.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.2
+	 * @version 1.126.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */