@openui5/sap.ui.fl 1.109.0 → 1.111.0

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -134,7 +134,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.UriParser
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 */
 	var UriParser = {};
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -249,7 +249,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.Utils
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 */
 	var Utils = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/CAPAccess.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @experimental Since 1.93
 	 * @private
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 */
 	var CAPAccess = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/dialog/CustomFieldCAPDialog.js

@@ -1,7 +1,7 @@
 
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -80,7 +80,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @since 1.93
 	 * @experimental Since 1.93
 	 * @private

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/getEditorConfig.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  *
  * @private

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (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([
@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.booleanEditor.BooleanEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @private
 	 * @experimental 1.93

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (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([
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.rangeEditor.RangeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @private
 	 * @experimental 1.93

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (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([
@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.timeEditor.TimeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @private
 	 * @experimental 1.93

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/validators/IsRequired.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (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([], function () {

package/src/sap/ui/fl/write/_internal/flexState/FlexObjectState.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -62,7 +62,7 @@ sap.ui.define([
 			var oDataToRestore = FlexState.getInitialNonFlCompVariantData(mPropertyBag.reference);
 			if (oDataToRestore) {
 				Object.keys(oDataToRestore).forEach(function(sPersistencyKey) {
-					mCompEntities._initialize(sPersistencyKey, oDataToRestore[sPersistencyKey].variants);
+					mCompEntities._initialize(sPersistencyKey, oDataToRestore[sPersistencyKey].variants, oDataToRestore[sPersistencyKey].controlId);
 					CompVariantMerger.merge(sPersistencyKey, mCompEntities[sPersistencyKey], oDataToRestore[sPersistencyKey].standardVariant);
 				});
 			}
@@ -172,9 +172,10 @@ sap.ui.define([
 	 *
 	 * @param {object} mPropertyBag - Object with parameters as properties
 	 * @param {sap.ui.fl.Selector} mPropertyBag.selector - Retrieves the associated flex persistence
-	 * @param {boolean} mPropertyBag.invalidateCache - Flag if the cache should be invalidated
-	 * @param {boolean} mPropertyBag.includeCtrlVariants - Flag if control variant changes should be included
-	 * @param {boolean} mPropertyBag.includeDirtyChanges - Flag if dirty UI changes should be included
+	 * @param {boolean} [mPropertyBag.invalidateCache] - Flag if the cache should be invalidated
+	 * @param {boolean} [mPropertyBag.includeCtrlVariants] - Flag if control variant changes should be included
+	 * @param {boolean} [mPropertyBag.includeDirtyChanges] - Flag if dirty UI changes should be included
+	 * @param {boolean} [mPropertyBag.version] - The version for which the objects are retrieved
 	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Flex objects, containing changes, compVariants & changes as well as ctrl_variant and changes
 	 */
 	FlexObjectState.getFlexObjects = function (mPropertyBag) {
@@ -238,6 +239,7 @@ sap.ui.define([
 	 * @param {string} [mPropertyBag.cacheKey] - Key to validate the cache entry stored on client side
 	 * @param {boolean} [mPropertyBag.invalidateCache] - Indicates whether the cache is to be invalidated
 	 * @param {boolean} [mPropertyBag.removeOtherLayerChanges=false] - Whether to remove changes on other layers before saving
+	 * @param {boolean} [mPropertyBag.version] - Version for which the objects are saved
 	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Flex objects, containing changes, compVariants & changes as well as ctrl_variant and changes
 	 */
 	FlexObjectState.saveFlexObjects = function(mPropertyBag) {

package/src/sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -259,12 +259,20 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
 	var CompVariantState = {};
 
+	CompVariantState.checkSVMControlsForDirty = function(sReference) {
+		var mCompVariantsMap = FlexState.getCompVariantsMap(sReference);
+		return Object.values(mCompVariantsMap).some(function(mMap) {
+			var oControl = mMap.controlId && Core.byId(mMap.controlId);
+			return oControl && oControl.getModified();
+		});
+	};
+
 	/**
 	 * Creates a change to set which variant should be selected at the application start-up.
 	 *

package/src/sap/ui/fl/write/_internal/transport/TransportDialog.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @private
 	 * @alias sap.ui.fl.write._internal.transport.TransportSelection
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @since 1.74.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/write/_internal/transport/Transports.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -27,7 +27,7 @@ sap.ui.define([
 	 * Entity that handles ABAP transport related information.
 	 * @alias sap.ui.fl.write._internal.transport.Transports
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @since 1.74.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.transport

package/src/sap/ui/fl/write/api/AppVariantWriteAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/write/api/ChangesWriteAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/write/api/ContextBasedAdaptationsAPI.js

@@ -1,26 +1,26 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (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/base/util/uid",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/write/_internal/Storage",
-	"sap/ui/fl/write/_internal/Versions"
+	"sap/ui/fl/write/_internal/Versions",
+	"sap/ui/model/json/JSONModel"
 ], function (
-	uid,
 	ManifestUtils,
 	FlexUtils,
 	Storage,
-	Versions
+	Versions,
+	JSONModel
 ) {
 	"use strict";
 
 	/**
-	 * Provides an API for creating and managing context based adaptation.
+	 * Provides an API for creating and managing context-based adaptation.
 	 *
 	 * @namespace sap.ui.fl.write.api.ContextBasedAdaptationsAPI
 	 * @experimental Since 1.106
@@ -32,7 +32,6 @@ sap.ui.define([
 
 	function getFlexReferenceForControl(oControl) {
 		var sReference = ManifestUtils.getFlexReferenceForControl(oControl);
-
 		if (!sReference) {
 			throw Error("The application ID could not be determined");
 		}
@@ -40,22 +39,114 @@ sap.ui.define([
 	}
 
 	/**
-	 * Create new context based adaptation and saves it in the backend
+	 * Processing the response to activate the draft if the expected status is contained in the response object
+	 * @param {object} oResponse - Object with response data
+	 * @param {number} oResponse.status - HTTP response code
+	 * @param {number} nExpectedStatus - Expected HTTP response code
 	 * @param {object} mPropertyBag - Object with parameters as properties
-	 * @param {string} [mPropertyBag.layer] - Layer
-	 * @returns {Promise} Promise that resolves with the context based adaptation
-	 *
+	 * @param {string} mPropertyBag.reference - Reference of the application
+	 * @param {string} mPropertyBag.layer - Layer
+	 * @returns {object} Object with response data
+	 */
+	function handleResponseForVersioning(oResponse, nExpectedStatus, mPropertyBag) {
+		if (oResponse.status === nExpectedStatus) {
+			Versions.onAllChangesSaved({
+				reference: mPropertyBag.reference,
+				layer: mPropertyBag.layer,
+				contextBasedAdaptation: true
+			});
+		}
+		return oResponse;
+	}
+
+	/**
+	 * Create new context-based adaptation and saves it in the backend
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {sap.ui.core.Control} mPropertyBag.control - Control for which the request is done
+	 * @param {string} mPropertyBag.layer - Layer
+	 * @param {object} mPropertyBag.contextBasedAdaptation - Parameters
+	 * @param {string} mPropertyBag.contextBasedAdaptation.title - Title of the new adaptation
+	 * @param {object} mPropertyBag.contextBasedAdaptation.contexts - Contexts of the new adaptation, for example roles for which the adaptation is created
+	 * @returns {Promise} Promise that resolves with the context-based adaptation
 	 */
 	ContextBasedAdaptationsAPI.create = function (mPropertyBag) {
-		mPropertyBag.parameters.id = uid();
-		mPropertyBag.parameters.reference = getFlexReferenceForControl(mPropertyBag.control);
+		if (!mPropertyBag.layer) {
+			return Promise.reject("No layer was provided");
+		}
+		if (!mPropertyBag.control) {
+			return Promise.reject("No control was provided");
+		}
+		if (!mPropertyBag.contextBasedAdaptation) {
+			return Promise.reject("No contextBasedAdaptation was provided");
+		}
+		mPropertyBag.contextBasedAdaptation.id = FlexUtils.createDefaultFileName();
+		mPropertyBag.reference = getFlexReferenceForControl(mPropertyBag.control);
 		return Storage.contextBasedAdaptation.create({
 			layer: mPropertyBag.layer,
-			flexObject: mPropertyBag.parameters,
+			flexObject: mPropertyBag.contextBasedAdaptation,
 			reference: mPropertyBag.reference,
-			parentVersion: Versions.getVersionsModel({layer: mPropertyBag.layer, reference: mPropertyBag.parameters.reference}).getProperty("/displayedVersion")
+			parentVersion: Versions.getVersionsModel({ layer: mPropertyBag.layer, reference: mPropertyBag.reference }).getProperty("/displayedVersion")
+		}).then(function (oResponse) {
+			return handleResponseForVersioning(oResponse, 201, mPropertyBag);
 		});
 	};
 
+	/**
+	 * Reorder context-based adaptations based on their priorities
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {sap.ui.core.Control} mPropertyBag.control - Control for which the request is done
+	 * @param {string} mPropertyBag.layer - Layer
+	 * @param {object} mPropertyBag.parameters - Parameters
+	 * @param {string[]} mPropertyBag.parameters.priorities - Priority list
+	 * @returns {Promise} Promise that resolves with the context-based adaptation
+	 */
+	ContextBasedAdaptationsAPI.reorder = function (mPropertyBag) {
+		if (!mPropertyBag.layer) {
+			return Promise.reject("No layer was provided");
+		}
+		if (!mPropertyBag.control) {
+			return Promise.reject("No control was provided");
+		}
+		if (!mPropertyBag.parameters || !mPropertyBag.parameters.priorities) {
+			return Promise.reject("No valid priority list was provided");
+		}
+		mPropertyBag.reference = getFlexReferenceForControl(mPropertyBag.control);
+		return Storage.contextBasedAdaptation.reorder({
+			layer: mPropertyBag.layer,
+			flexObjects: mPropertyBag.parameters,
+			reference: mPropertyBag.reference,
+			parentVersion: Versions.getVersionsModel({ layer: mPropertyBag.layer, reference: mPropertyBag.reference }).getProperty("/displayedVersion")
+		}).then(function (oResponse) {
+			return handleResponseForVersioning(oResponse, 204, mPropertyBag);
+		});
+	};
+
+	/**
+	 * Load list of context-based adapations with priority
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {sap.ui.core.Control} mPropertyBag.control - Control for which the request is done
+	 * @param {string} mPropertyBag.layer - Layer
+	 * @returns {Promise} Promise that resolves with the list of context-based adaptations
+	 */
+	ContextBasedAdaptationsAPI.load = function (mPropertyBag) {
+		if (!mPropertyBag.layer) {
+			return Promise.reject("No layer was provided");
+		}
+		if (!mPropertyBag.control) {
+			return Promise.reject("No control was provided");
+		}
+		mPropertyBag.reference = getFlexReferenceForControl(mPropertyBag.control);
+		return Storage.contextBasedAdaptation.load({
+			layer: mPropertyBag.layer,
+			flexObject: mPropertyBag.parameters,
+			reference: mPropertyBag.reference,
+			version: Versions.getVersionsModel({ layer: mPropertyBag.layer, reference: mPropertyBag.reference }).getProperty("/displayedVersion")
+		}).then(function (oAdaptations) {
+			if (!oAdaptations) {
+				oAdaptations = { adaptations: [] };
+			}
+			return new JSONModel(oAdaptations);
+		});
+	};
 	return ContextBasedAdaptationsAPI;
 });

package/src/sap/ui/fl/write/api/ContextSharingAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -37,7 +37,6 @@ sap.ui.define([
 		 *
 		 * @param {object} mPropertyBag - Object with parameters as properties
 		 * @param {string} [mPropertyBag.layer] - Layer
-		 * @param {string} [mPropertyBag.isComp=true] - Flag if the control owning the Component is the comp.VariantManagement
 		 * @returns {Promise<sap.ui.core.ComponentContainer>} Promise resolving with the ComponentContainer or nothing depending on the availability of the feature in the used back end
 		 * @private
 		 * @ui5-restricted sap.ui.comp, sap.ui.fl
@@ -47,13 +46,18 @@ sap.ui.define([
 				return Promise.resolve();
 			}
 			return Settings.getInstance().then(function(oSettings) {
-				return (mPropertyBag.isComp) ? oSettings.isContextSharingEnabledForComp() : oSettings.isContextSharingEnabled();
+				return oSettings.isContextSharingEnabled();
 			}).then(function(bIsEnabled) {
 				if (bIsEnabled) {
 					if (!oComponentContainer || oComponentContainer.bIsDestroyed) {
 						var oComponent = new ContextSharingComponent("contextSharing");
+						oComponent.showMessageStrip(true);
 						oComponent.setSelectedContexts({role: []});
 						oComponentContainer = new ComponentContainer("contextSharingContainer", {component: oComponent});
+						// Ensure view is fully loaded
+						return oComponent.getRootControl().oAsyncState.promise.then(function() {
+							return oComponentContainer;
+						});
 					}
 					return oComponentContainer;
 				}

package/src/sap/ui/fl/write/api/ControlPersonalizationWriteAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/write/api/ExtensionPointRegistryAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/write/api/FeaturesAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/write/api/FieldExtensibility.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write.api.FieldExtensibility
 	 * @since 1.87
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta
 	 */

package/src/sap/ui/fl/write/api/LocalResetAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/write/api/PersistenceWriteAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -295,7 +295,7 @@ sap.ui.define([
 				oFlexController = ChangesController.getFlexControllerInstance(oAppComponent);
 				// remove custom data for flex change
 				if (oElement) {
-					FlexCustomData.sync.destroyAppliedCustomData(oElement, mPropertyBag.change, JsControlTreeModifier);
+					FlexCustomData.destroyAppliedCustomData(oElement, mPropertyBag.change, JsControlTreeModifier);
 				}
 				// delete from flex persistence map
 				oFlexController.deleteChange(mPropertyBag.change, oAppComponent);

package/src/sap/ui/fl/write/api/ReloadInfoAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -8,19 +8,23 @@ sap.ui.define([
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
+	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/write/api/Version",
 	"sap/ui/fl/write/api/VersionsAPI",
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
+	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
 	"sap/ui/fl/write/_internal/FlexInfoSession"
 ], function(
 	LayerUtils,
 	Layer,
 	Utils,
+	ManifestUtils,
 	Version,
 	VersionsAPI,
 	FeaturesAPI,
 	PersistenceWriteAPI,
+	CompVariantState,
 	FlexInfoSession
 ) {
 	"use strict";
@@ -79,9 +83,21 @@ sap.ui.define([
 			upToLayer: oReloadInfo.layer,
 			includeCtrlVariants: oReloadInfo.includeCtrlVariants,
 			includeDirtyChanges: true
+		})
+		.then(function(bResult) {
+			// not yet saved personalization on SmartVariantManagement controls is not tracked as a FlexObject,
+			// but it should be treated the same as already saved higher layer changes
+			return bResult || checkSVMControlsForDirty(oReloadInfo);
 		});
 	}
 
+	function checkSVMControlsForDirty(oReloadInfo) {
+		if (LayerUtils.isOverLayer(Layer.USER, oReloadInfo.layer)) {
+			return CompVariantState.checkSVMControlsForDirty((ManifestUtils.getFlexReferenceForControl(oReloadInfo.selector)));
+		}
+		return false;
+	}
+
 	/**
 	 * Should reload happen when starting RTA due to allContextsProvided flag.
 	 * allContextsProvided determines if the user has provided all nessesary roles to see the views.

package/src/sap/ui/fl/write/api/SmartBusinessWriteAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/write/api/SmartVariantManagementWriteAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/write/api/TranslationAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/write/api/UI2PersonalizationWriteAPI.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/write/api/Version.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */