@openui5/sap.ui.fl 1.136.3 → 1.139.0

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

@@ -8,63 +8,58 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/initial/api/Version",
 	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
 	"sap/ui/fl/write/api/VersionsAPI",
 	"sap/ui/fl/Layer",
-	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/registry/Settings",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/LayerUtils"
 ], function(
 	FlexState,
 	ManifestUtils,
 	FlexInfoSession,
+	Settings,
 	Version,
 	CompVariantState,
 	FeaturesAPI,
 	PersistenceWriteAPI,
 	VersionsAPI,
 	Layer,
-	LayerUtils,
-	Settings,
-	Utils
+	LayerUtils
 ) {
 	"use strict";
 
-	function isDraftAvailable(oReloadInfo, sReference) {
+	async function isDraftAvailable(oReloadInfo, sReference) {
 		if (FlexInfoSession.getByReference(sReference).version) {
-			return Promise.resolve(false);
+			return false;
 		}
 
-		return FeaturesAPI.isVersioningEnabled(oReloadInfo.layer).then(function(bVersioningAvailable) {
-			return bVersioningAvailable && VersionsAPI.isDraftAvailable({
-				control: oReloadInfo.selector,
-				layer: oReloadInfo.layer
-			});
+		const bVersioningAvailable = await FeaturesAPI.isVersioningEnabled(oReloadInfo.layer);
+		return bVersioningAvailable && VersionsAPI.isDraftAvailable({
+			control: oReloadInfo.selector,
+			layer: oReloadInfo.layer
 		});
 	}
 
-	function areHigherLayerChangesAvailable(oReloadInfo, sReference) {
+	async function areHigherLayerChangesAvailable(oReloadInfo, sReference) {
 		var oFlexInfoSession = FlexInfoSession.getByReference(sReference);
 		var bUserLayer = oReloadInfo.layer === Layer.USER;
 		if (bUserLayer || (oFlexInfoSession.maxLayer && oFlexInfoSession.maxLayer === oReloadInfo.layer)) {
-			return Promise.resolve(false);
+			return false;
 		}
 
-		return PersistenceWriteAPI.hasHigherLayerChanges({
+		const bHasHigherLayerChanges = await PersistenceWriteAPI.hasHigherLayerChanges({
 			selector: oReloadInfo.selector,
 			ignoreMaxLayerParameter: oReloadInfo.ignoreMaxLayerParameter,
 			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);
 		});
+		// 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 bHasHigherLayerChanges || checkSVMControlsForDirty(oReloadInfo);
 	}
 
 	function checkSVMControlsForDirty(oReloadInfo) {
@@ -107,8 +102,8 @@ sap.ui.define([
 		return !oFlexInfoSession.allContextsProvided;
 	}
 
-	function isAllContextsAvailable(sReference, sLayer) {
-		if (!Settings.getInstanceOrUndef()?.isContextSharingEnabled(sLayer)) {
+	function isAllContextsAvailable(sReference) {
+		if (!Settings.getInstanceOrUndef()?.getIsContextSharingEnabled()) {
 			return false;
 		}
 
@@ -143,16 +138,16 @@ sap.ui.define([
 		 * @private
 		 * @ui5-restricted sap.ui.rta
 		 */
-		getReloadReasonsForStart(oReloadInfo) {
+		async getReloadReasonsForStart(oReloadInfo) {
 			const sReference = ManifestUtils.getFlexReferenceForControl(oReloadInfo.selector);
-			return Promise.all([
+			const aReasons = await Promise.all([
 				areHigherLayerChangesAvailable.call(this, oReloadInfo, sReference),
 				isDraftAvailable(oReloadInfo, sReference),
 				needContextSpecificReload(oReloadInfo, sReference)
-			]).then(function(aReasons) {
-				[oReloadInfo.hasHigherLayerChanges, oReloadInfo.isDraftAvailable, oReloadInfo.allContexts] = aReasons;
-				return oReloadInfo;
-			});
+			]);
+			const oReloadReasons = {};
+			[oReloadReasons.hasHigherLayerChanges, oReloadReasons.isDraftAvailable, oReloadReasons.allContexts] = aReasons;
+			return oReloadReasons;
 		},
 
 		/**
@@ -207,16 +202,13 @@ sap.ui.define([
 		 * Standalone: Adds the version to the session or removes it.
 		 *
 		 * @param {object} oReloadInfo - Contains the information needed to add the correct URL parameters
-		 * @param {sap.ui.fl.Layer} oReloadInfo.layer - Current layer
 		 * @param {boolean} oReloadInfo.hasHigherLayerChanges - Indicates if higher layer changes exist
 		 * @param {boolean} oReloadInfo.ignoreMaxLayerParameter - Indicates if the max layer parameter should be ignored
-		 * @param {string|object} oReloadInfo.parameters - The URL parameters to be modified
 		 * @param {string} oReloadInfo.versionSwitch - Indicates if we are in a version switch scenario
 		 * @param {string} oReloadInfo.version - Version we want to switch to
 		 * @param {string} oReloadInfo.removeVersionParameter - Indicates if the version parameter should be removed
 		 * @param {string} oReloadInfo.removeDraft - Indicates if the draft parameter should be removed
 		 * @param {sap.ui.fl.Selector} oReloadInfo.selector - Root control instance
-		 * @param {string} sScenario - Current scenario. Can be 'flp' or 'standalone'
 		 *
 		 * @returns {boolean} Indicates if the parameters have changed
 		 *
@@ -257,7 +249,6 @@ sap.ui.define([
 		 * @param {boolean} oReloadInfo.isDraftAvailable - Indicates if a draft is available
 		 * @param {sap.ui.fl.Layer} oReloadInfo.layer - Current layer
 		 * @param {sap.ui.fl.Selector} oReloadInfo.selector - Root control instance
-		 * @param {string} sScenario - Current scenario. Can be 'flp' or 'standalone'
 		 *
 		 * @returns {boolean} <code>true</code> to indicate that the session has been changed
 		 *
@@ -305,75 +296,56 @@ sap.ui.define([
 		},
 
 		/**
-		 * Determines if a reload on exit is needed and if yes - it returns what kind of reload should happen
-		 * (ushell Navigation or hard reload).
+		 * Determines if a reload on exit is needed and why.
 		 *
-		 * @param {object} oReloadInfo - Contains the information needed to check if a reload on exit should happen
-		 * @param {sap.ui.fl.Layer} oReloadInfo.layer - Current layer
-		 * @param {boolean} oReloadInfo.isDraftAvailable - Indicates if a draft is available
-		 * @param {boolean} oReloadInfo.hasHigherLayerChanges - Indicates if higher layer changes exist
-		 * @param {boolean} oReloadInfo.changesNeedReload - Indicates if changes (e.g. app descriptor changes) need a hard reload
-		 * @param {boolean} oReloadInfo.initialDraftGotActivated - Indicates if a draft got activated and had a draft initially when the key user entered UI adaptation
-		 * @param {boolean} oReloadInfo.activeVersion - Indicates the current active version
-		 * @param {sap.ui.fl.Selector} oReloadInfo.selector - Root control instance
+		 * @param {object} oPropertyBag - Contains the information needed to check if a reload on exit should happen
+		 * @param {sap.ui.fl.Layer} oPropertyBag.layer - Current layer
+		 * @param {boolean} oPropertyBag.isDraftAvailable - Indicates if a draft is available
+		 * @param {boolean} oPropertyBag.hasHigherLayerChanges - Indicates if higher layer changes exist
+		 * @param {boolean} oPropertyBag.initialDraftGotActivated - Indicates if a draft got activated and had a draft initially when the key user entered UI adaptation
+		 * @param {boolean} oPropertyBag.activeVersion - Indicates the current active version
+		 * @param {sap.ui.fl.Selector} oPropertyBag.selector - Root control instance
 		 *
-		 * @returns {boolean} <code>true</code> if a draft got activated and had a draft initially when entering UI adaptation
+		 * @returns {object} An object containing the reload information
 		 *
 		 * @private
 		 * @ui5-restricted sap.ui.rta
 		 */
-		getReloadMethod(oReloadInfo) {
-			const sReference = ManifestUtils.getFlexReferenceForControl(oReloadInfo.selector);
-			var oRELOAD = {
-				NOT_NEEDED: "NO_RELOAD",
-				RELOAD_PAGE: "HARD_RELOAD",
-				VIA_HASH: "CROSS_APP_NAVIGATION"
-			};
-			oReloadInfo.reloadMethod = oRELOAD.NOT_NEEDED;
+		getReloadInfo(oPropertyBag) {
+			const sReference = ManifestUtils.getFlexReferenceForControl(oPropertyBag.selector);
+			const oReloadInfo = {};
 
-			// TODO fix app descriptor handling and reload behavior
-			// TODO move changesNeedReload near flexState; set flag when saving change that needs a reload
-			oReloadInfo.isDraftAvailable ||= ReloadInfoAPI.hasVersionStorage(
-				{value: Version.Number.Draft},
-				oReloadInfo.selector
+			oReloadInfo.isDraftAvailable = oPropertyBag.isDraftAvailable || ReloadInfoAPI.hasVersionStorage(
+				{ value: Version.Number.Draft },
+				oPropertyBag.selector
 			);
 
-			oReloadInfo.isDraftAvailable ||= ReloadInfoAPI.hasVersionStorage({value: Version.Number.Draft}, oReloadInfo.selector);
 			oReloadInfo.hasVersionStorage = !!FlexInfoSession.getByReference(sReference).version;
 
 			if (
-				oReloadInfo.activeVersion
-				&& oReloadInfo.activeVersion !== Version.Number.Original
+				oPropertyBag.activeVersion
+				&& oPropertyBag.activeVersion !== Version.Number.Original
 				&& oReloadInfo.hasVersionStorage
 			) {
 				oReloadInfo.activeVersionNotSelected = !ReloadInfoAPI.hasVersionStorage(
-					{value: oReloadInfo.activeVersion},
-					oReloadInfo.selector
+					{ value: oPropertyBag.activeVersion }, oPropertyBag.selector
 				);
 			}
 
-			oReloadInfo.hasHigherLayerChanges = ReloadInfoAPI.hasMaxLayerStorage({value: oReloadInfo.layer}, oReloadInfo.selector);
-			oReloadInfo.initialDraftGotActivated = ReloadInfoAPI.initialDraftGotActivated(oReloadInfo);
+			oReloadInfo.hasHigherLayerChanges = ReloadInfoAPI.hasMaxLayerStorage({ value: oPropertyBag.layer }, oPropertyBag.selector);
+			oReloadInfo.initialDraftGotActivated = ReloadInfoAPI.initialDraftGotActivated(oPropertyBag);
 			if (oReloadInfo.initialDraftGotActivated) {
 				oReloadInfo.isDraftAvailable = false;
 			}
-			oReloadInfo.allContexts = isAllContextsAvailable(sReference, oReloadInfo.layer);
+			oReloadInfo.allContexts = isAllContextsAvailable(sReference);
 			oReloadInfo.switchEndUserAdaptation = needAdaptationReloadOnExit(sReference);
-			if (oReloadInfo.changesNeedReload
-				|| oReloadInfo.isDraftAvailable
+			oReloadInfo.reloadNeeded = oReloadInfo.isDraftAvailable
 				|| oReloadInfo.hasHigherLayerChanges
 				|| oReloadInfo.initialDraftGotActivated
 				|| oReloadInfo.activeVersionNotSelected
 				|| oReloadInfo.allContexts
-				|| oReloadInfo.switchEndUserAdaptation
-			) {
-				oReloadInfo.reloadMethod = oRELOAD.RELOAD_PAGE;
-				// always try cross-app navigation (via hash); we only need a hard reload because of appdescr changes
-				// (changesNeedReload = true)
-				if (!oReloadInfo.changesNeedReload && Utils.getUshellContainer()) {
-					oReloadInfo.reloadMethod = oRELOAD.VIA_HASH;
-				}
-			}
+				|| oReloadInfo.switchEndUserAdaptation;
+
 			return oReloadInfo;
 		}
 	};

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

@@ -6,7 +6,7 @@
 
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
-	"sap/ui/fl/registry/Settings",
+	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/write/_internal/appVariant/AppVariantFactory",
 	"sap/ui/fl/write/_internal/connectors/LrepConnector",
 	"sap/ui/fl/write/_internal/SaveAs",
@@ -27,7 +27,7 @@ sap.ui.define([
 
 	function _checkSettingsAndExecuteActionByName(sActionName, mPropertyBag) {
 		return Settings.getInstance().then(function(oSettings) {
-			if (oSettings.isAtoEnabled()) {
+			if (oSettings.getIsAtoEnabled()) {
 				// For smart business, we already set the transport and skipIam flag,
 				// so that there should be no transport handling done on connector level.
 				mPropertyBag.skipIam = true;

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

@@ -7,17 +7,17 @@
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/compVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
-	"sap/ui/fl/write/_internal/transport/TransportSelection",
-	"sap/ui/fl/registry/Settings"
+	"sap/ui/fl/write/_internal/transport/TransportSelection"
 ], function(
 	CompVariantUtils,
 	ManifestUtils,
+	Settings,
 	ContextBasedAdaptationsAPI,
 	CompVariantState,
-	TransportSelection,
-	Settings
+	TransportSelection
 ) {
 	"use strict";
 
@@ -293,7 +293,7 @@ sap.ui.define([
 		 */
 		isVariantSharingEnabled() {
 			return Settings.getInstance().then(function(oInstance) {
-				return oInstance.isVariantSharingEnabled();
+				return oInstance.getIsVariantSharingEnabled();
 			});
 		},
 
@@ -308,7 +308,7 @@ sap.ui.define([
 		 */
 		isVariantPersonalizationEnabled() {
 			return Settings.getInstance().then(function(oInstance) {
-				return oInstance.isVariantPersonalizationEnabled();
+				return oInstance.getIsVariantPersonalizationEnabled();
 			});
 		},
 
@@ -323,7 +323,7 @@ sap.ui.define([
 		 */
 		isVariantAdaptationEnabled() {
 			return Settings.getInstance().then(function(oInstance) {
-				return oInstance.isVariantAdaptationEnabled();
+				return oInstance.getIsVariantAdaptationEnabled();
 			});
 		},
 

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

@@ -391,5 +391,20 @@ sap.ui.define([
 		return Versions.publish(mPropertyBag);
 	};
 
+	/**
+	 * Returns the list of versions created by a specific user
+	 *
+	 * @param {object} mPropertyBag - Property bag
+	 * @param {sap.ui.core.Control} mPropertyBag.control - Control for which the request is done
+	 * @param {string} mPropertyBag.layer - Layer for which the versions should be retrieved
+	 * @param {string} sUser - User ID for which the versions should be retrieved
+	 * @returns {Array} List of versions created by the user
+	 */
+	VersionsAPI.getCreatedVersionsByUser = function(mPropertyBag, sUser) {
+		const oModel = getVersionsModel(mPropertyBag);
+		const aVersions = oModel.getProperty("/versions");
+		return aVersions.filter((oVersion) => oVersion.activatedBy === sUser);
+	};
+
 	return VersionsAPI;
 });

package/src/sap/ui/fl/write/connectors/BaseConnector.js

@@ -186,15 +186,6 @@ sap.ui.define([
 			return Promise.reject("loadContextDescriptions is not implemented");
 		},
 
-		/**
-		 * Interface called to check if variant management context sharing is enabled.
-		 *
-		 * @returns {Promise<object>} Resolves with an object containing the data for the flex features
-		 */
-		isContextSharingEnabled() {
-			return Promise.resolve(false);
-		},
-
 		contextBasedAdaptation: {
 			create() {
 				return Promise.reject("contextBasedAdaptation.create is not implemented");

package/ui5.yaml

@@ -35,7 +35,6 @@ builder:
               - sap/ui/fl/initial/
               - sap/ui/fl/interfaces/Delegate.js
               - sap/ui/fl/interfaces/BaseLoadConnector.js
-              - sap/ui/fl/registry/Settings.js
               - sap/ui/fl/util/ManagedObjectModel.js
               - sap/ui/fl/variants/VariantManagement.js
               # exclude all bundles