@openui5/sap.ui.fl 1.103.0 → 1.105.0

package/src/sap/ui/fl/apply/_internal/flexState/FlexState.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -19,7 +19,8 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/StorageUtils",
 	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/write/_internal/FlexInfoSession"
 ], function(
 	_omit,
 	each,
@@ -35,7 +36,8 @@ sap.ui.define([
 	ManifestUtils,
 	StorageUtils,
 	LayerUtils,
-	Utils
+	Utils,
+	FlexInfoSession
 ) {
 	"use strict";
 
@@ -76,7 +78,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @experimental
 	 * @since 1.73
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -133,7 +135,8 @@ sap.ui.define([
 				unfilteredStorageResponse: _mInstances[sReference].unfilteredStorageResponse,
 				storageResponse: _mInstances[sReference].storageResponse,
 				componentId: _mInstances[sReference].componentId,
-				componentData: _mInstances[sReference].componentData
+				componentData: _mInstances[sReference].componentData,
+				reference: sReference
 			};
 			_mInstances[sReference].preparedMaps[sMapName] = FlexState.callPrepareFunction(sMapName, mPropertyBag);
 		}
@@ -203,6 +206,7 @@ sap.ui.define([
 				// TODO remove as soon as both with and without '.Component' are harmonized
 				createSecondInstanceIfNecessary(mPropertyBag);
 				registerMaxLayerHandler(mPropertyBag.reference);
+				storeAllContextsProvided(mPropertyBag.reference, mResponse);
 
 				// no further changes to storageResponse properties allowed
 				// TODO enable the Object.freeze as soon as its possible
@@ -214,6 +218,18 @@ sap.ui.define([
 		return _mInitPromises[mPropertyBag.reference];
 	}
 
+	function storeAllContextsProvided(sReference, mResponse) {
+		var oResponse = mResponse && mResponse.changes || {};
+		if (oResponse.info !== undefined) {
+			var oFlexInfoSession = FlexInfoSession.getByReference(sReference);
+			if (oFlexInfoSession === null) {
+				oFlexInfoSession = {};
+			}
+			oFlexInfoSession.allContextsProvided = oResponse.info.allContextsProvided;
+			FlexInfoSession.setByReference(oFlexInfoSession, sReference);
+		}
+	}
+
 	function registerMaxLayerHandler(sReference) {
 		var oShellNavigationService = getUShellService("ShellNavigation");
 		if (oShellNavigationService && !_mNavigationHandlers[sReference]) {

package/src/sap/ui/fl/apply/_internal/flexState/Loader.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -73,7 +73,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/ManifestUtils.js

@@ -33,7 +33,7 @@ function(
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @private
 	 */
 	var ManifestUtils = {

package/src/sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @experimental Since 1.75
 	 * @since 1.75
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/appDescriptorChanges/prepareAppDescriptorMap.js

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

package/src/sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.DependencyHandler
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @experimental Since 1.79
 	 * @since 1.79
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -94,7 +94,7 @@ sap.ui.define([
 	 * @param {string} mPropertyBag.extensionPointName - Name of the extension point
 	 * @returns {Promise} Promise that resolves with an array of changes
 	 * @private
-	 * @restricted sap.ui.fl.apply._internal.extensionPoint.Processor
+	 * @ui5-restricted sap.ui.fl.apply._internal.extensionPoint.Processor
 	 */
 	ExtensionPointState.getChangesForExtensionPoint = function(oChangePersistence, mPropertyBag) {
 		if (!mPropertyBag.extensionPointName) {

package/src/sap/ui/fl/apply/_internal/flexState/changes/prepareChangesMap.js

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

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -117,7 +117,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -182,7 +182,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.103.0
+		 * @version 1.105.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/Utils.js

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

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/prepareCompVariantsMap.js

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

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -91,7 +91,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -17,8 +17,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/Change",
 	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/Utils",
-	"sap/ui/fl/Variant"
+	"sap/ui/fl/Utils"
 ], function(
 	_omit,
 	_pick,
@@ -32,8 +31,7 @@ sap.ui.define([
 	FlexState,
 	Change,
 	LayerUtils,
-	Utils,
-	Variant
+	Utils
 ) {
 	"use strict";
 
@@ -43,7 +41,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -53,13 +51,13 @@ sap.ui.define([
 
 	function getReferencedChanges(mPropertyBag) {
 		var aReferencedVariantChanges = [];
-		if (mPropertyBag.variantData.content.variantReference) {
+		if (mPropertyBag.variantData.instance.getVariantReference()) {
 			aReferencedVariantChanges = VariantManagementState.getControlChangesForVariant(Object.assign(
 				mPropertyBag, {
-					vReference: mPropertyBag.variantData.content.variantReference
+					vReference: mPropertyBag.variantData.instance.getVariantReference()
 				}));
 			return aReferencedVariantChanges.filter(function(oReferencedChange) {
-				return LayerUtils.compareAgainstCurrentLayer(oReferencedChange.getDefinition().layer, mPropertyBag.variantData.content.layer) === -1; /* Referenced change layer below current layer*/
+				return LayerUtils.compareAgainstCurrentLayer(oReferencedChange.getLayer(), mPropertyBag.variantData.instance.getLayer()) === -1; /* Referenced change layer below current layer*/
 			});
 		}
 		return aReferencedVariantChanges;
@@ -224,7 +222,7 @@ sap.ui.define([
 		mPropertyBag.vReference = mPropertyBag.vReference || oVariantsMap[mPropertyBag.vmReference].defaultVariant;
 		var aVariants = getVariants(mPropertyBag);
 		aVariants.some(function(oCurrentVariant) {
-			if (oCurrentVariant.content.fileName === mPropertyBag.vReference) {
+			if (oCurrentVariant.instance.getId() === mPropertyBag.vReference) {
 				oVariant = oCurrentVariant;
 				return true;
 			}
@@ -275,7 +273,7 @@ sap.ui.define([
 		var iIndex = VariantsApplyUtil.getIndexToSortVariant(aVariants, mPropertyBag.variantData);
 
 		//Set the whole list of changes to the variant
-		if (mPropertyBag.variantData.content.variantReference) {
+		if (mPropertyBag.variantData.instance.getVariantReference()) {
 			var aReferencedVariantChanges = getReferencedChanges(mPropertyBag);
 			mPropertyBag.variantData.controlChanges = aReferencedVariantChanges.concat(mPropertyBag.variantData.controlChanges);
 		}
@@ -302,8 +300,7 @@ sap.ui.define([
 		var oVariantsMap = VariantManagementState.getContent(mPropertyBag.reference);
 		var bFound = oVariantsMap[mPropertyBag.vmReference].variants.some(
 			function(oCurrentVariantContent, index) {
-				var oCurrentVariant = new Variant(oCurrentVariantContent); //why?
-				if (oCurrentVariant.getId() === mPropertyBag.variant.getId()) {
+				if (oCurrentVariantContent.instance.getId() === mPropertyBag.variant.getId()) {
 					iIndex = index;
 					return true;
 				}
@@ -318,7 +315,6 @@ sap.ui.define([
 	 * Sorts and re-orders the passed variant object in the variants map
 	 *
 	 * @param {object} mPropertyBag - Object with the necessary properties
-	 * @param {object} mPropertyBag.variantData - Variant data
 	 * @param {string} mPropertyBag.vmReference - Variant management reference
 	 * @param {string} mPropertyBag.reference - Component reference
 	 * @param {int} mPropertyBag.previousIndex - Previous index of variant object
@@ -331,14 +327,9 @@ sap.ui.define([
 		var oVariantsMap = VariantManagementState.getContent(mPropertyBag.reference);
 		var aVariants = oVariantsMap[mPropertyBag.vmReference].variants;
 		var oVariantData = aVariants[mPropertyBag.previousIndex];
-		Object.keys(mPropertyBag.variantData).forEach(function(sProperty) {
-			if (oVariantData.content.content[sProperty]) {
-				oVariantData.content.content[sProperty] = mPropertyBag.variantData[sProperty];
-			}
-		});
 
 		//Standard variant should always be at the first position, all others are sorted alphabetically
-		if (oVariantData.content.fileName !== mPropertyBag.vmReference) {
+		if (oVariantData.instance.getId() !== mPropertyBag.vmReference) {
 			//remove element
 			aVariants.splice(mPropertyBag.previousIndex, 1);
 
@@ -471,19 +462,20 @@ sap.ui.define([
 					oVariantData[sVMReference].currentVariant = oVariantsMap[sVMReference].currentVariant;
 				}
 				getVariants(Object.assign(mPropertyBag, {vmReference: sVMReference}))
-					.forEach(function(oVariant, index) {
+					.forEach(function(oVariantEntry, index) {
+						var oVariant = oVariantEntry.instance;
 						oVariantData[sVMReference].variants[index] =
 							//JSON.parse(JSON.stringify()) used to remove undefined properties e.g. standard variant layer
 							JSON.parse(
 								JSON.stringify({
-									key: oVariant.content.fileName,
-									title: oVariant.content.content.title,
-									layer: oVariant.content.layer,
-									favorite: oVariant.content.content.favorite,
-									executeOnSelect: oVariant.content.content.executeOnSelect,
-									visible: oVariant.content.content.visible,
-									author: ObjectPath.get("content.support.user", oVariant),
-									contexts: oVariant.content.contexts
+									key: oVariant.getId(),
+									title: oVariant.getName(),
+									layer: oVariant.getLayer(),
+									favorite: oVariant.getFavorite(),
+									executeOnSelect: oVariant.getExecuteOnSelection(),
+									visible: oVariant.getVisible(),
+									author: oVariant.getSupportInformation().user,
+									contexts: oVariant.getContexts()
 								})
 							);
 					});
@@ -507,9 +499,9 @@ sap.ui.define([
 		var oVariantsMap = VariantManagementState.getContent(mPropertyBag.reference);
 		var oVariantManagement = oVariantsMap[mPropertyBag.vmReference];
 		if (mPropertyBag.changeContent.fileType === "ctrl_variant_change") {
-			oVariantManagement.variants.some(function(oVariant) {
-				if (oVariant.content.fileName === mPropertyBag.changeContent.selector.id) {
-					addChangeContentToVariantMap(oVariant.variantChanges, mPropertyBag.changeContent, mPropertyBag.add);
+			oVariantManagement.variants.some(function(oVariantData) {
+				if (oVariantData.instance.getId() === mPropertyBag.changeContent.selector.id) {
+					addChangeContentToVariantMap(oVariantData.variantChanges, mPropertyBag.changeContent, mPropertyBag.add);
 				}
 			});
 		} else if (mPropertyBag.changeContent.fileType === "ctrl_variant_management_change") {
@@ -562,10 +554,10 @@ sap.ui.define([
 		if (mPropertyBag.changeToBeAddedOrDeleted) {
 			switch (mPropertyBag.changeToBeAddedOrDeleted.getState()) {
 				case States.NEW:
-					addChange(mPropertyBag.changeToBeAddedOrDeleted.getDefinition(), oFlexObjects);
+					addChange(mPropertyBag.changeToBeAddedOrDeleted.convertToFileContent(), oFlexObjects);
 					break;
 				case States.DELETE:
-					deleteChange(mPropertyBag.changeToBeAddedOrDeleted.getDefinition(), oFlexObjects);
+					deleteChange(mPropertyBag.changeToBeAddedOrDeleted.convertToFileContent(), oFlexObjects);
 					break;
 				default:
 			}