@openui5/sap.ui.fl 1.136.3 → 1.139.0

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

@@ -5,28 +5,28 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/Utils",
-	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/Layer",
-	"sap/ui/fl/write/_internal/transport/Transports",
+	"sap/ui/core/BusyIndicator",
+	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/write/_internal/transport/TransportDialog",
-	"sap/ui/fl/registry/Settings",
-	"sap/ui/core/BusyIndicator"
+	"sap/ui/fl/write/_internal/transport/Transports",
+	"sap/ui/fl/Layer",
+	"sap/ui/fl/LayerUtils",
+	"sap/ui/fl/Utils"
 ], function(
-	FlUtils,
-	LayerUtils,
-	Layer,
-	Transports,
-	TransportDialog,
+	BusyIndicator,
 	FlexSettings,
-	BusyIndicator
+	TransportDialog,
+	Transports,
+	Layer,
+	LayerUtils,
+	FlUtils
 ) {
 	"use strict";
 	/**
 	 * @private
 	 * @alias sap.ui.fl.write._internal.transport.TransportSelection
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.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.
@@ -83,7 +83,7 @@ sap.ui.define([
 		if (sLayerType && ((sLayerType === Layer.CUSTOMER) || (sLayerType === Layer.CUSTOMER_BASE))) {
 			// CUSTOMER layer --> retrieve the settings and check if ATO is enabled
 			FlexSettings.getInstance().then(function(oSettings) {
-				if (oSettings.isAtoEnabled()) {
+				if (oSettings.getIsAtoEnabled()) {
 					// ATO is enabled
 					if (!(oObjectInfo && oObjectInfo.name && oObjectInfo.namespace && oObjectInfo.type)) {
 						// Object info is not completed (public scenario)+ ATO is enabled + CUSTOMER layer: No getTransport is necessary

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

@@ -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.136.3
+	 * @version 1.139.0
 	 * @since 1.74.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.transport

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

@@ -9,8 +9,10 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/write/_internal/flexState/FlexObjectManager",
 	"sap/ui/fl/write/_internal/Storage",
+	"sap/ui/fl/write/api/ChangesWriteAPI",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils"
 ], (
@@ -18,8 +20,10 @@ sap.ui.define([
 	ControlVariantsUtils,
 	FlexObjectFactory,
 	ManifestUtils,
+	FlexInfoSession,
 	FlexObjectManager,
 	Storage,
+	ChangesWriteAPI,
 	Layer,
 	Utils
 ) => {
@@ -31,7 +35,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias module:sap/ui/fl/write/api/BusinessNetworkAPI
 	 * @since 1.135
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted SAP Business Network
 	 */
@@ -133,5 +137,54 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Set the max layer to CUSTOMER to disable personalization.
+	 *
+	 * @param {string} sReference - Flex reference of the app
+	 * @throws {Error} If the provided reference is invalid
+	 * @private
+	 * @ui5-restricted SAP Business Network
+	 */
+	BusinessNetworkAPI.disablePersonalization = function(sReference) {
+		const oFlexInfoSession = FlexInfoSession.getByReference(sReference);
+		if (!oFlexInfoSession || Object.keys(oFlexInfoSession).length === 0) {
+			throw new Error(`Invalid reference provided: ${sReference}`);
+		}
+
+		oFlexInfoSession.maxLayer = Layer.CUSTOMER;
+		// The flag can't be cleared here because the app is started in a different flow. But not clearing the flag will only have an effect
+		// if the user would start the app again in that session, which is not a supported scenario.
+		oFlexInfoSession.saveChangeKeepSession = true;
+		FlexInfoSession.setByReference(oFlexInfoSession, sReference);
+		window.sessionStorage.setItem("sap.ui.rta.skipReload", true);
+	};
+
+	/**
+	 * Deletes a list of control variants and their associated changes, and saves.
+	 *
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {sap.ui.fl.variants.VariantManagement} mPropertyBag.vmControl - Variant Management control instance
+	 * @param {string[]} mPropertyBag.variants - Variant IDs to be deleted
+	 * @param {sap.ui.fl.Layer} [mPropertyBag.layer="CUSTOMER"] - Layer of the variants to be deleted
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of flex objects that were deleted
+	 * @private
+	 * @ui5-restricted SAP Business Network
+	 */
+	BusinessNetworkAPI.deleteVariants = async function(mPropertyBag) {
+		const aFlexObjectsToDelete = ChangesWriteAPI.deleteVariantsAndRelatedObjects({
+			variantManagementControl: mPropertyBag.vmControl,
+			variants: mPropertyBag.variants,
+			layer: mPropertyBag.layer || Layer.CUSTOMER,
+			forceDelete: true // Skips the deletion checks such as draft status
+		});
+		await FlexObjectManager.saveFlexObjects({
+			selector: mPropertyBag.vmControl,
+			flexObjects: aFlexObjectsToDelete,
+			layer: mPropertyBag.layer || Layer.CUSTOMER,
+			includeCtrlVariants: true
+		});
+		return aFlexObjectsToDelete;
+	};
+
 	return BusinessNetworkAPI;
-});
+});

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

@@ -17,6 +17,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
+	"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/descriptorRelated/api/DescriptorChangeFactory",
@@ -25,7 +26,9 @@ sap.ui.define([
 	"sap/ui/fl/write/_internal/controlVariants/ControlVariantWriteUtils",
 	"sap/ui/fl/write/_internal/flexState/FlexObjectManager",
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
+	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/write/api/VersionsAPI",
+	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils"
 ], function(
 	_omit,
@@ -40,6 +43,7 @@ sap.ui.define([
 	ChangesUtils,
 	FlexObjectFactory,
 	States,
+	VariantManagementState,
 	FlexObjectState,
 	ManifestUtils,
 	DescriptorChangeFactory,
@@ -48,7 +52,9 @@ sap.ui.define([
 	ControlVariantWriteUtils,
 	FlexObjectManager,
 	ContextBasedAdaptationsAPI,
+	FeaturesAPI,
 	VersionsAPI,
+	Layer,
 	Utils
 ) {
 	"use strict";
@@ -347,14 +353,17 @@ sap.ui.define([
 	};
 
 	/**
-	 * Deletes the variants and their related FlexObjects. Only variants that are in the draft or dirty state can be deleted,
-	 * as they have no dependencies on them. Returns all FlexObjects that were deleted in the process.
+	 * Deletes the variants and their related FlexObjects. By default, only variants that are in the draft
+	 * or dirty state can be deleted, as they have no dependencies on them.
+	 * The Business Network scenario can delete any variants (forceDelete=true).
+	 * Returns all FlexObjects that were deleted in the process.
 	 *
 	 * @param {object} mPropertyBag - Object with parameters as properties
 	 * @param {sap.ui.core.Control} mPropertyBag.variantManagementControl - Variant management control
 	 * @param {string[]} mPropertyBag.variants - Variant IDs to be deleted
-	 * @param {string} mPropertyBag.layer - Layer to get the draft objects from
-	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of deleted FlexObjects
+	 * @param {string} mPropertyBag.layer - Layer that the variants belong to
+	 * @param {boolean} [mPropertyBag.forceDelete=false] - If set to true, the deletion will not check for draft or dirty state of the variants
+	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Promise resolving with the array of deleted FlexObjects
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta, similar tools
 	 */
@@ -366,20 +375,33 @@ sap.ui.define([
 		const oAppComponent = Utils.getAppComponentForControl(oVariantManagementControl);
 		const sVariantManagementReference = JsControlTreeModifier.getSelector(oVariantManagementControl, oAppComponent).id;
 		const sFlexReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
-		const aDraftFilenames = VersionsAPI.getDraftFilenames({
-			control: oVariantManagementControl,
-			layer: mPropertyBag.layer
+		// Filter out passed variants from other layers
+		let aVariantsToBeDeleted = mPropertyBag.variants.filter((sVariantId) => {
+			const oVariant = VariantManagementState.getVariant({
+				vmReference: sVariantManagementReference,
+				reference: sFlexReference,
+				vReference: sVariantId
+			});
+			if (!oVariant) {
+				Log.warning(`Variant with ID '${sVariantId}' does not exist in the Variant Management control.`);
+				return false;
+			}
+			return oVariant.layer === mPropertyBag.layer;
 		});
-		const aDirtyFlexObjectIds = FlexObjectState.getDirtyFlexObjects(sFlexReference).map((oFlexObject) => (
-			oFlexObject.getId()
-		));
-		const aVariantsToBeDeleted = mPropertyBag.variants.filter((sVariantID) => (
-			aDraftFilenames.includes(sVariantID) || aDirtyFlexObjectIds.includes(sVariantID)
-		));
+		if (!mPropertyBag.forceDelete) {
+			const aDraftFilenames = VersionsAPI.getDraftFilenames({
+				control: oVariantManagementControl,
+				layer: mPropertyBag.layer
+			});
+			const aDirtyFlexObjectIds = FlexObjectState.getDirtyFlexObjects(sFlexReference).map((oFlexObject) => (
+				oFlexObject.getId()
+			));
+			aVariantsToBeDeleted = aVariantsToBeDeleted.filter((sVariantID) => (
+				aDraftFilenames.includes(sVariantID) || aDirtyFlexObjectIds.includes(sVariantID)
+			));
+		}
 		return aVariantsToBeDeleted
-		.map((sVariantId) => (
-			ControlVariantWriteUtils.deleteVariant(sFlexReference, sVariantManagementReference, sVariantId)
-		))
+		.map((sVariantId) => (ControlVariantWriteUtils.deleteVariant(sFlexReference, sVariantManagementReference, sVariantId)))
 		.flat();
 	};
 

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

@@ -6,18 +6,18 @@
 
 sap.ui.define([
 	"sap/ui/core/Component",
+	"sap/ui/core/ComponentContainer",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
-	"sap/ui/core/ComponentContainer",
-	"sap/ui/fl/Layer",
-	"sap/ui/fl/registry/Settings"
+	"sap/ui/fl/Layer"
 ], function(
 	Component,
+	ComponentContainer,
 	ManifestUtils,
+	Settings,
 	ContextBasedAdaptationsAPI,
-	ComponentContainer,
-	Layer,
-	Settings
+	Layer
 ) {
 	"use strict";
 
@@ -46,7 +46,7 @@ sap.ui.define([
 			}
 			const sReference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.variantManagementControl);
 			const oSettings = await Settings.getInstance();
-			const bIsEnabled = oSettings.isContextSharingEnabled()
+			const bIsEnabled = oSettings.getIsContextSharingEnabled()
 				&& !ContextBasedAdaptationsAPI.adaptationExists({reference: sReference, layer: Layer.CUSTOMER});
 			return bIsEnabled;
 		},

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

@@ -15,11 +15,10 @@ sap.ui.define([
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/apply/api/FlexRuntimeInfoAPI",
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage",
-	"sap/ui/fl/registry/Settings",
+	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/write/_internal/flexState/changes/UIChangeManager",
 	"sap/ui/fl/write/_internal/flexState/FlexObjectManager",
 	"sap/ui/fl/write/api/ChangesWriteAPI",
-	"sap/ui/fl/FlexControllerFactory",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils"
 ], function(
@@ -37,7 +36,6 @@ sap.ui.define([
 	UIChangeManager,
 	FlexObjectManager,
 	ChangesWriteAPI,
-	FlexControllerFactory,
 	Layer,
 	Utils
 ) {
@@ -383,10 +381,9 @@ sap.ui.define([
 			if (!oAppComponent) {
 				return logAndReject("App Component could not be determined");
 			}
-			var oFlexController = FlexControllerFactory.createForControl(oAppComponent);
 
 			if (FlexState.isInitialized({control: oAppComponent})) {
-				return oFlexController.saveSequenceOfDirtyChanges(mPropertyBag.changes, oAppComponent);
+				return FlexObjectManager.saveFlexObjects({ flexObjects: mPropertyBag.changes, selector: oAppComponent });
 			}
 			return Promise.resolve();
 		},
@@ -422,13 +419,11 @@ sap.ui.define([
 		 *
 		 * @returns {Promise<boolean>} Resolves to a boolean indicating if condensing is enabled
 		 * @private
-		 * @sapui5-restricted sap.ovp
+		 * @ui5-restricted sap.ovp
 		 */
-		isCondensingEnabled() {
-			return Settings.getInstance()
-			.then(function(oSettings) {
-				return oSettings.isCondensingEnabled(Layer.USER);
-			});
+		async isCondensingEnabled() {
+			const oSettings = await Settings.getInstance();
+			return oSettings.getIsCondensingEnabled();
 		},
 
 		/**

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

@@ -5,14 +5,14 @@
  */
 
 sap.ui.define([
+	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/initial/api/InitialFlexAPI",
-	"sap/ui/fl/registry/Settings",
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils"
 ], function(
-	InitialFlexAPI,
 	Settings,
+	InitialFlexAPI,
 	Storage,
 	Layer,
 	Utils
@@ -41,8 +41,14 @@ sap.ui.define([
 		isPublishAvailable() {
 			return Settings.getInstance().then(function(oSettings) {
 				return (
-					oSettings.isPublishAvailable() ||
-					(!oSettings.isProductiveSystem() && oSettings.isSystemWithTransports())
+					oSettings.getIsPublishAvailable() ||
+					// if the flag is not given, publish should be available on ABAP systems (?) which are not productive systems
+					!!(
+						!oSettings.getIsProductiveSystem()
+						// TODO this is pretty arbitrary, not sure what the intention here is
+						&& oSettings.getSystem()
+						&& oSettings.getClient()
+					)
 				);
 			});
 		},
@@ -70,7 +76,8 @@ sap.ui.define([
 				var oSettings = aPromises[0];
 				var oCrossAppNav = aPromises[1];
 				return (
-					oSettings.isAppVariantSaveAsEnabled()
+					!oSettings.getIsContextBasedAdaptationEnabled()
+					&& oSettings.getIsAppVariantSaveAsEnabled()
 					&& sLayer === Layer.CUSTOMER
 					&& oCrossAppNav !== undefined // Not a standalone app
 				);
@@ -92,7 +99,7 @@ sap.ui.define([
 		 */
 		isContextBasedAdaptationAvailable(sLayer) {
 			return Settings.getInstance().then(function(oSettings) {
-				if (oSettings.isContextBasedAdaptationEnabled() && sLayer === Layer.CUSTOMER) {
+				if (oSettings.getIsContextBasedAdaptationEnabled() && sLayer === Layer.CUSTOMER) {
 					return true;
 				}
 				return false;
@@ -120,11 +127,10 @@ sap.ui.define([
 		 * @private
 		 * @ui5-restricted sap.ui.rta
 		 */
-		isVersioningEnabled(sLayer) {
-			return Settings.getInstance()
-			.then(function(oSettings) {
-				return oSettings.isVersioningEnabled(sLayer);
-			});
+		async isVersioningEnabled(sLayer) {
+			const oSettings = await Settings.getInstance();
+			const oVersionInfo = oSettings.getVersioning();
+			return !!(oVersionInfo[sLayer] || oVersionInfo.ALL);
 		},
 
 		/**
@@ -139,7 +145,7 @@ sap.ui.define([
 			if (sLayer === Layer.CUSTOMER) {
 				return Settings.getInstance()
 				.then(function(oSettings) {
-					return oSettings.isKeyUserTranslationEnabled();
+					return oSettings.getIsKeyUserTranslationEnabled();
 				});
 			}
 			return Promise.resolve(false);
@@ -160,7 +166,7 @@ sap.ui.define([
 			}
 			return Settings.getInstance()
 			.then(function(oSettings) {
-				return oSettings.isContextSharingEnabled({layer: sLayer});
+				return oSettings.getIsContextSharingEnabled({layer: sLayer});
 			});
 		},
 
@@ -172,7 +178,7 @@ sap.ui.define([
 		 */
 		async isSeenFeaturesAvailable() {
 			const oSettings = await Settings.getInstance();
-			return oSettings.isSeenFeaturesAvailable();
+			return oSettings.getIsSeenFeaturesAvailable();
 		},
 
 		/**
@@ -216,7 +222,7 @@ sap.ui.define([
 		 */
 		isVariantAdaptationEnabled() {
 			const oSettings = Settings.getInstanceOrUndef();
-			return oSettings?.isVariantAdaptationEnabled();
+			return oSettings?.getIsVariantAdaptationEnabled();
 		},
 
 		/**
@@ -227,7 +233,7 @@ sap.ui.define([
 		 */
 		isLocalResetEnabled() {
 			const oSettings = Settings.getInstanceOrUndef();
-			return oSettings?.isLocalResetEnabled();
+			return oSettings?.getIsLocalResetEnabled();
 		},
 
 		/**
@@ -238,7 +244,7 @@ sap.ui.define([
 		 */
 		areAnnotationChangesEnabled() {
 			const oSettings = Settings.getInstanceOrUndef();
-			return oSettings?.isAnnotationChangeEnabled();
+			return oSettings?.getIsAnnotationChangeEnabled();
 		}
 	};
 

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write.api.FieldExtensibility
 	 * @since 1.87
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta, sap.ui.mdc
 	 */

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

@@ -15,7 +15,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/apply/api/FlexRuntimeInfoAPI",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
-	"sap/ui/fl/registry/Settings",
+	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/write/_internal/condenser/Condenser",
 	"sap/ui/fl/write/_internal/flexState/changes/UIChangeManager",
 	"sap/ui/fl/write/_internal/flexState/FlexObjectManager",
@@ -79,8 +79,7 @@ sap.ui.define([
 	 * @returns {Promise<boolean>} Promise that resolves to a boolean indicating if changes exist
 	 */
 	function hasChanges(mPropertyBag) {
-		mPropertyBag.includeCtrlVariants = true;
-		return PersistenceWriteAPI._getUIChanges(mPropertyBag)
+		return PersistenceWriteAPI._getUIChanges({...mPropertyBag, includeCtrlVariants: true})
 		.then(function(aChanges) {
 			return aChanges.length > 0;
 		});
@@ -141,8 +140,7 @@ sap.ui.define([
 	 * @param {string} [mPropertyBag.layer=CUSTOMER] - Proposed layer (might be overwritten by the backend) when creating a new app variant - Smart Business must pass the layer
 	 * @param {boolean} [mPropertyBag.draft=false] - Indicates if changes should be written as a draft
 	 * @param {boolean} [mPropertyBag.removeOtherLayerChanges=false] - Whether to remove changes on other layers before saving
-	 *
-	 * @returns {Promise} Promise that resolves with an array of responses or is rejected with the first error
+	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Resolves with all loaded flex objects after saving
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta
 	 */
@@ -150,11 +148,20 @@ sap.ui.define([
 		// when save or activate a version in rta no reload is triggered but flex/data request is send
 		// and will delete version and maxLayer without saveChangeKeepSession
 		// after the request saveChangeKeepSession needs to be delete again
-		const sReference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.selector);
+		const sReference = ManifestUtils.getFlexReferenceForSelector(mPropertyBag.selector);
 		let oFlexInfoSession = FlexInfoSession.getByReference(sReference);
 		oFlexInfoSession.saveChangeKeepSession = true;
 		FlexInfoSession.setByReference(oFlexInfoSession, sReference);
-		const aFlexObjects = await FlexObjectManager.saveFlexObjects(mPropertyBag);
+		await FlexObjectManager.saveFlexObjects(mPropertyBag);
+
+		// This is needed as long the save requests does not return the necessary information to update the FlexState without a new request
+		const aFlexObjects = await FlexObjectManager.getFlexObjects({
+			..._omit(mPropertyBag, ["skipUpdateCache", "layer"]),
+			invalidateCache: true,
+			currentLayer: mPropertyBag.layer,
+			includeCtrlVariants: true
+		});
+
 		if (aFlexObjects?.length > 0) {
 			await PersistenceWriteAPI.updateResetAndPublishInfo(mPropertyBag);
 		}
@@ -176,6 +183,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta
 	 */
 	PersistenceWriteAPI.updateResetAndPublishInfo = async function(mPropertyBag) {
+		const sReference = ManifestUtils.getFlexReferenceForSelector(mPropertyBag.selector);
 		const [bHasChanges, bIsPublishAvailable] = await Promise.all([
 			hasChanges(mPropertyBag),
 			FeaturesAPI.isPublishAvailable()
@@ -192,7 +200,10 @@ sap.ui.define([
 		// If the layer is transportable, fetch additional information from the backend
 		if (bIsLayerTransportable) {
 			try {
-				const oResponse = await Storage.getFlexInfo(mPropertyBag);
+				const oResponse = await Storage.getFlexInfo({
+					...mPropertyBag,
+					reference: sReference
+				});
 				// default is true, so only set to false if explicitly set to false
 				oFlexInfo.allContextsProvided = oResponse.allContextsProvided !== false;
 				oFlexInfo.isResetEnabled = oResponse.isResetEnabled;
@@ -203,7 +214,6 @@ sap.ui.define([
 		}
 
 		// Update the Flex Info Session
-		const sReference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.selector);
 		const oOldFlexInfoSession = FlexInfoSession.getByReference(sReference);
 		const oNewFlexInfoSession = {
 			...oOldFlexInfoSession,
@@ -379,14 +389,19 @@ sap.ui.define([
 	 */
 	PersistenceWriteAPI.getChangesWarning = function(mPropertyBag) {
 		return this._getUIChanges(mPropertyBag).then(function(aChanges) {
-			var bHasChangesFromOtherSystem = aChanges.some(function(oChange) {
+			const bHasChangesFromOtherSystem = aChanges.some(function(oChange) {
 				return oChange.isChangeFromOtherSystem();
 			});
 
-			var oSettingsInstance = Settings.getInstanceOrUndef();
-			var isProductiveSystemWithTransports = oSettingsInstance && oSettingsInstance.isProductiveSystemWithTransports();
-			var bHasNoChanges = aChanges.length === 0;
-			var oChangesWarning = {showWarning: false};
+			const oSettingsInstance = Settings.getInstanceOrUndef();
+			// TODO System and Client info have nothing to do with the transport system
+			const isProductiveSystemWithTransports =
+				oSettingsInstance
+				&& oSettingsInstance.getIsProductiveSystem()
+				&& oSettingsInstance.getSystem()
+				&& oSettingsInstance.getClient();
+			const bHasNoChanges = aChanges.length === 0;
+			let oChangesWarning = {showWarning: false};
 
 			if (bHasChangesFromOtherSystem) {
 				oChangesWarning = {showWarning: true, warningType: "mixedChangesWarning"};