@openui5/sap.ui.fl 1.90.3 → 1.90.7

package/src/sap/ui/fl/write/_internal/condenser/Condenser.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.Condenser
 	 * @author SAP SE
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 */
 	var Condenser = {};
 
@@ -66,7 +66,10 @@ sap.ui.define([
 	 * @returns {boolean} <code>true</code> if the 'move' subtype has been added to the data structure before 'create' subtype
 	 */
 	function isCreateAfterMoveSubtype(mSubtypes, oCondenserInfo) {
-		return oCondenserInfo.classification === sap.ui.fl.condenser.Classification.Create && mSubtypes[sap.ui.fl.condenser.Classification.Move];
+		var aMoveSubType = mSubtypes[sap.ui.fl.condenser.Classification.Move];
+		return oCondenserInfo.classification === sap.ui.fl.condenser.Classification.Create
+			&& aMoveSubType
+			&& aMoveSubType[aMoveSubType.length - 1].targetContainer === oCondenserInfo.targetContainer;
 	}
 
 	/**
@@ -376,6 +379,12 @@ sap.ui.define([
 		});
 	}
 
+	function sortCondenserInfosByInitialOrder(aChanges, aCondenserInfos) {
+		aCondenserInfos.sort(function(a, b) {
+			return aChanges.indexOf(a.change) - aChanges.indexOf(b.change);
+		});
+	}
+
 	function addAllIndexRelatedChanges(aReducedChanges, aIndexRelatedChanges) {
 		var aReducedChangeIds = aReducedChanges.map(function(oChange) {
 			return oChange.getId();
@@ -475,6 +484,7 @@ sap.ui.define([
 				Measurement.start("Condenser_handleIndexRelatedChanges", "handle index related changes - CondenserClass", ["sap.ui.fl", "Condenser"]);
 
 				var aCondenserInfos = getCondenserInfos(mReducedChanges, []);
+				sortCondenserInfosByInitialOrder(aChanges, aCondenserInfos);
 
 				Measurement.start("Condenser_sort", "sort index related changes - CondenserClass", ["sap.ui.fl", "Condenser"]);
 				var aReducedIndexRelatedChanges = UIReconstruction.sortIndexRelatedChanges(mUIReconstructions, aCondenserInfos);

package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.UIReconstruction
 	 * @author SAP SE
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 */
 	var UIReconstruction = {};
 
@@ -147,22 +147,6 @@ sap.ui.define([
 		});
 	}
 
-	/**
-	 * Shifts the index-related change from the source index to the target index.
-	 *
-	 * @param {Map} mUIReconstructions - Map of UI reconstructions that holds key-value pairs. A key is a selector ID of the container. A value is a nested map which contains initial and target UI reconstructions
-	 * @param {Object} oCondenserInfo - Instance of condenser info object
-	 */
-	function shiftToTargetIndex(mUIReconstructions, oCondenserInfo) {
-		var sContainerKey = oCondenserInfo.targetContainer;
-		var sAffectedControlId = oCondenserInfo.affectedControl;
-		var iTargetIndex = oCondenserInfo.getTargetIndex(oCondenserInfo.change);
-		var aContainerElements = mUIReconstructions[sContainerKey][oCondenserInfo.targetAggregation];
-		Utils.extendArrayWithPlaceholders(aContainerElements, undefined, iTargetIndex);
-		var iSourceIndex = aContainerElements.indexOf(sAffectedControlId);
-		shiftElement(aContainerElements, iSourceIndex, iTargetIndex);
-	}
-
 	/**
 	 * Verifies whether the passed arrays are equal.
 	 *
@@ -214,12 +198,6 @@ sap.ui.define([
 			INDEX_RELATED[oCondenserInfo.classification].simulate(mUIAggregationState[sAggregationName], oCondenserInfo, aInitialUIElementIds);
 		});
 
-		aCondenserInfos.forEach(function(oCondenserInfo) {
-			if (oCondenserInfo.classification === sap.ui.fl.condenser.Classification.Move) {
-				shiftToTargetIndex(mUISimulatedStates, oCondenserInfo);
-			}
-		});
-
 		var aSortedUIElementIds = mUISimulatedStates[sContainerKey][sAggregationName];
 		if (isEqual(aTargetUIElementIds, aSortedUIElementIds)) {
 			return true;

package/src/sap/ui/fl/write/_internal/condenser/classifications/Move.js

@@ -49,8 +49,19 @@ sap.ui.define([
 		 */
 		simulate: function(aContainerElements, oCondenserInfo, aInitialUIElementIds) {
 			var sAffectedControlId = oCondenserInfo.affectedControl;
-			var iSourceIndex = aInitialUIElementIds.indexOf(sAffectedControlId);
-			CondenserUtils.extendElementsArray(aContainerElements, iSourceIndex, undefined, sAffectedControlId);
+			var iInitialSourceIndex = aInitialUIElementIds.indexOf(sAffectedControlId);
+			// the move itself should not extend the array, just replace the placeholder
+			CondenserUtils.extendElementsArray(aContainerElements, iInitialSourceIndex, undefined, sAffectedControlId);
+
+			var iCurrentSourceIndex = aContainerElements.indexOf(sAffectedControlId);
+			var iTargetIndex = oCondenserInfo.getTargetIndex(oCondenserInfo.change);
+
+			// if the move was done from a different container the element can't be found
+			if (iInitialSourceIndex === -1) {
+				aContainerElements.splice(iTargetIndex, 0, sAffectedControlId);
+			} else {
+				aContainerElements.splice(iTargetIndex, 0, aContainerElements.splice(iCurrentSourceIndex, 1)[0]);
+			}
 		}
 	};
 });

package/src/sap/ui/fl/write/_internal/connectors/BackendConnector.js

@@ -74,7 +74,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BackendConnector
 	 * @since 1.72
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors
 	 */

package/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.KeyUserConnector
 	 * @since 1.70
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/LrepConnector.js

@@ -146,7 +146,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.LrepConnector
 	 * @since 1.67
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/NeoLrepConnector.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.NeoLrepConnector
 	 * @since 1.81
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/ObjectPathConnector.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.ObjectPathConnector
 	 * @since 1.73
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/PersonalizationConnector.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.PersonalizationConnector
 	 * @since 1.70
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

package/src/sap/ui/fl/write/_internal/extensionPoint/Processor.js

@@ -28,7 +28,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 */
 	var Processor = {
 		applyExtensionPoint: function(oExtensionPoint) {

package/src/sap/ui/fl/write/_internal/extensionPoint/Registry.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.extensionPoint.Registry
 	 *
 	 * @author SAP SE
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPAccess
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 */
 	var ABAPAccess = {};
 

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @class
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @public
 	 * @param {sap.ui.base.ManagedObject} oControl - Control to add extensions
 	 */

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

@@ -117,7 +117,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariantFactory
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 */
 	var ABAPExtensibilityVariantFactory = {};
 

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.MultiTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @public
 	 */
 

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ServiceValidation
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 */
 	var ServiceValidation = {};
 

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.SingleTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @public
 	 */
 

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

@@ -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.90.3
+	 * @version 1.90.7
 	 */
 	var UriParser = {};
 

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

@@ -198,7 +198,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.Utils
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 */
 	var Utils = {};
 

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

@@ -10,6 +10,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/apply/_internal/ChangesController",
 	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
+	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/Utils",
@@ -20,6 +21,7 @@ sap.ui.define([
 	ManifestUtils,
 	ChangesController,
 	CompVariantState,
+	CompVariantMerger,
 	ChangePersistenceFactory,
 	LayerUtils,
 	CompVariantsUtils,
@@ -30,7 +32,7 @@ sap.ui.define([
 	/**
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -50,6 +52,17 @@ sap.ui.define([
 	function getCompVariantEntities(mPropertyBag) {
 		var mCompEntities = FlexState.getCompVariantsMap(mPropertyBag.reference);
 		var aEntities = [];
+		//Enhance CompVariantsMap with external data and standard variant after FlexState has been cleared and reinitialized
+		if (mPropertyBag.invalidateCache) {
+			var oDataToRestore = FlexState.getInitialNonFlCompVariantData(mPropertyBag.reference);
+			if (oDataToRestore) {
+				Object.keys(oDataToRestore).forEach(function(sPersistencyKey) {
+					mCompEntities._initialize(sPersistencyKey, oDataToRestore[sPersistencyKey].variants);
+					CompVariantMerger.merge(sPersistencyKey, mCompEntities[sPersistencyKey], oDataToRestore[sPersistencyKey].standardVariant);
+				});
+			}
+		}
+
 		for (var sPersistencyKey in mCompEntities) {
 			var mCompVariantsOfPersistencyKey = mCompEntities[sPersistencyKey];
 			for (var sId in mCompVariantsOfPersistencyKey.byId) {
@@ -108,15 +121,8 @@ sap.ui.define([
 	FlexObjectState.getFlexObjects = function (mPropertyBag) {
 		return initFlexStateAndSetReference(mPropertyBag)
 			.then(function () {
-				var aCompVariantEntities = getCompVariantEntities(mPropertyBag);
-				var aChangePersistenceEntities = getChangePersistenceEntities(mPropertyBag);
-
-				return Promise.all([
-					aCompVariantEntities,
-					aChangePersistenceEntities
-				]).then(function (aEntities) {
-					return aEntities[0] // compVariant entities (changes of type defaultVariant / standardVariant, variant)
-						.concat(aEntities[1]); // ChangePersistence entities (change, ctrl_variant, ctrl_variant_change, ctrl_variant_management_change)
+				return getChangePersistenceEntities(mPropertyBag).then(function (aChangePersistenceEntities) {
+					return getCompVariantEntities(mPropertyBag).concat(aChangePersistenceEntities);
 				});
 			});
 	};

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

@@ -261,7 +261,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -442,6 +442,7 @@ sap.ui.define([
 	 * @param {string} mPropertyBag.persistencyKey - Key of the variant management
 	 * @param {string} mPropertyBag.id - ID of the variant
 	 * @param {string} [mPropertyBag.packageName] - ID of the package in which the update should be transported - only valid for sap-ui-layer=VENDOR use case
+	 * @param {string} [mPropertyBag.transportId] - ID of the transport in which the update should be transported
 	 * @param {object} [mPropertyBag.revert=false] - Flag if the update is a revert operation
 	 * @param {object} [mPropertyBag.name] - Title of the variant
 	 * @param {object} [mPropertyBag.content] - Content of the new change
@@ -456,7 +457,7 @@ sap.ui.define([
 	CompVariantState.updateVariant = function (mPropertyBag) {
 		function variantCanBeUpdated(oVariant, sLayer) {
 			var bSameLayer = oVariant.getLayer() === sLayer;
-			var sPackageName = oVariant.getDefinition().packageName;
+			var sPackageName = oVariant.getPackage();
 			var bNotTransported = !sPackageName || sPackageName === "$TMP";
 			// in case changes were already done within the layer, no update of the variant can be done to safeguard the execution order
 			var bIsChangedOnLayer = oVariant.getChanges().some(function (oChange) {
@@ -487,8 +488,8 @@ sap.ui.define([
 			if (mPropertyBag.name) {
 				oVariant.storeName(mPropertyBag.name);
 			}
-			if (mPropertyBag.packageName) {
-				oVariant.setRequest(mPropertyBag.packageName);
+			if (mPropertyBag.transportId) {
+				oVariant.setRequest(mPropertyBag.transportId);
 			}
 			oVariant.storeContent(mPropertyBag.content || oVariant.getContent());
 		}
@@ -529,6 +530,9 @@ sap.ui.define([
 				};
 			}
 			oChange.setContent(oChangeContent);
+			if (mPropertyBag.transportId) {
+				oChange.setRequest(mPropertyBag.transportId);
+			}
 			CompVariantMerger.applyChangeOnVariant(oVariant, oChange);
 			storeRevertDataInVariant(mPropertyBag, oVariant, CompVariantState.operationType.UpdateVariantViaChangeUpdate, oChange);
 		}
@@ -563,6 +567,9 @@ sap.ui.define([
 			}
 
 			var oChange = new Change(oChangeDefinition);
+			if (mPropertyBag.transportId) {
+				oChange.setRequest(mPropertyBag.transportId);
+			}
 			addChange(oChange);
 			storeRevertDataInVariant(mPropertyBag, oVariant, CompVariantState.operationType.NewChange, oChange);
 			CompVariantMerger.applyChangeOnVariant(oVariant, oChange);

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.transport.TransportSelection
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * Entity that handles ABAP transport related information.
 	 * @alias sap.ui.fl.write._internal.transport.Transports
 	 * @author SAP SE
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @since 1.74.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.transport

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write.api.FieldExtensibility
 	 * @since 1.87
-	 * @version 1.90.3
+	 * @version 1.90.7
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta
 	 */

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

@@ -84,6 +84,7 @@ sap.ui.define([
 		 * 			sap.ui.comp.smartchart.SmartChart} mPropertyBag.control - Variant management control for which the variant should be updated
 		 * @param {string} mPropertyBag.id - ID of the variant
 		 * @param {string} [mPropertyBag.packageName] - ID of the package in which the update should be transported - only valid for sap-ui-layer=VENDOR use case
+		 * @param {string} [mPropertyBag.transportId] - ID of the transport in which the update should be assigned
 		 * @param {object} [mPropertyBag.name] - Title of the variant
 		 * @param {object} [mPropertyBag.content] - Content of the new change
 		 * @param {object} [mPropertyBag.favorite] - Flag if the variant should be flagged as a favorite