@openui5/sap.ui.fl 1.97.1 → 1.100.0

package/src/sap/ui/fl/apply/_internal/changes/Applier.js

@@ -65,8 +65,10 @@ sap.ui.define([
 			if (bHasAppliedCustomData) {
 				// if the change was applied, set the revert data fetched from the custom data
 				oChange.setRevertData(FlexCustomData.sync.getParsedRevertDataFromCustomData(oControl, oChange));
+				oChange.markSuccessful();
+			} else {
+				oChange.markFailed();
 			}
-			oChange.markFinished();
 		}
 	}
 
@@ -114,14 +116,14 @@ sap.ui.define([
 						return FlexCustomData.getParsedRevertDataFromCustomData(oControl, oChange, oModifier)
 							.then(function (oParsedRevertDataFromCustomData) {
 								oChange.setRevertData(oParsedRevertDataFromCustomData);
-								oChange.markFinished();
+								oChange.markSuccessful();
 							});
 					}
-					oChange.markFinished();
+					oChange.markFailed();
 					return undefined;
 				} else if (bChangeStatusAppliedFinished && bIsCurrentlyAppliedOnControl) {
 					// both the change instance and the UI Control are already applied, so the change can be directly marked as finished
-					oChange.markFinished();
+					oChange.markSuccessful();
 				}
 				return undefined;
 			});
@@ -162,7 +164,7 @@ sap.ui.define([
 			.then(function () {
 				// if a change was reverted previously remove the flag as it is not reverted anymore
 				var oResult = {success: true};
-				oChange.markFinished(oResult);
+				oChange.markSuccessful(oResult);
 				return oResult;
 			});
 	}
@@ -194,7 +196,7 @@ sap.ui.define([
 				if (bXmlModifier) {
 					oChange.setInitialApplyState();
 				} else {
-					oChange.markFinished(oResult);
+					oChange.markFailed(oResult);
 				}
 				return oResult;
 			});
@@ -282,7 +284,7 @@ sap.ui.define([
 				if (oChange.hasApplyProcessStarted()) {
 					// wait for the change to be finished and then clean up the status and queue
 					return oChange.addPromiseForApplyProcessing().then(function(oResult) {
-						oChange.markFinished();
+						oChange.markSuccessful();
 						return oResult;
 					});
 				} else if (!oChange.isApplyProcessFinished()) {
@@ -300,7 +302,7 @@ sap.ui.define([
 
 				// make sure that everything that goes with finishing the apply process is done, even though the change was already applied
 				var oResult = {success: true};
-				oChange.markFinished(oResult);
+				oChange.markSuccessful(oResult);
 				return oResult;
 			})
 

package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexCustomData
 	 * @experimental Since 1.61.0
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 */
 	var FlexCustomData = {};
 	FlexCustomData.sync = {};

package/src/sap/ui/fl/apply/_internal/changes/Reverter.js

@@ -69,7 +69,7 @@ sap.ui.define([
 		})
 		.then(_waitForApplyIfNecessary.bind(null, oChange))
 		.then(function() {
-			if (oChange.isApplyProcessFinished()) {
+			if (oChange.isSuccessfullyApplied()) {
 				oChange.startReverting();
 				return oChangeHandler.revertChange(oChange, mControl.control, mPropertyBag);
 			}

package/src/sap/ui/fl/apply/_internal/changes/Utils.js

@@ -18,9 +18,9 @@ sap.ui.define([
 	/**
 	 * Util class for Applier/ChangeReverter.
 	 *
-	 * @namespace sap.ui.fl.apply._internal.connectors.changes.Utils
+	 * @namespace sap.ui.fl.apply._internal.changes.Utils
 	 * @since 1.70
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */
@@ -108,6 +108,50 @@ sap.ui.define([
 			var oControl = oModifier.bySelector(oChange.getSelector(), oAppComponent);
 			return FlexCustomData.hasChangeApplyFinishedCustomData(oControl, oChange, oModifier)
 				.then(isDependencyStillValid.bind(null, oChange));
+		},
+
+		/**
+		 * Checks if the passed change belongs to the given view
+		 *
+		 * @param {object} mPropertyBag - Additional information
+		 * @param {object} mPropertyBag.modifier - Reuse operations handling the changes on the given view type
+		 * @param {object} mPropertyBag.appComponent - Application component for the view
+		 * @param {object} mPropertyBag.viewId - ID of the view
+		 * @param {sap.ui.fl.Change} oChange - Change instance to check
+		 * @returns {boolean} <code>true</code> if the change belongs to the given view
+		 */
+		filterChangeByView: function(mPropertyBag, oChange) {
+			var oModifier = mPropertyBag.modifier;
+			var oAppComponent = mPropertyBag.appComponent;
+			var oSelector = oChange.getSelector();
+			if (!oSelector) {
+				return false;
+			}
+			if (oSelector.viewSelector) {
+				var sSelectorViewId = oModifier.getControlIdBySelector(oSelector.viewSelector, oAppComponent);
+				return sSelectorViewId === mPropertyBag.viewId;
+			}
+			var sSelectorId = oSelector.id;
+			if (sSelectorId) {
+				var sViewId;
+				if (oChange.getSelector().idIsLocal) {
+					if (oAppComponent) {
+						sViewId = oAppComponent.getLocalId(mPropertyBag.viewId);
+					}
+				} else {
+					sViewId = mPropertyBag.viewId;
+				}
+				var iIndex = 0;
+				var sSelectorIdViewPrefix;
+				do {
+					iIndex = sSelectorId.indexOf("--", iIndex);
+					sSelectorIdViewPrefix = sSelectorId.slice(0, iIndex);
+					iIndex++;
+				} while (sSelectorIdViewPrefix !== sViewId && iIndex > 0);
+
+				return sSelectorIdViewPrefix === sViewId;
+			}
+			return false;
 		}
 	};
 

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Preprocessor
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Registration
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -29,7 +29,8 @@ sap.ui.define([
 		appdescr_ovp_addNewCard: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/ovp/AddNewCard"),
 		appdescr_ovp_removeCard: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/ovp/DeleteCard"),
 		appdescr_ui_generic_app_addNewObjectPage: requireAsync.bind(this, "sap/suite/ui/generic/template/manifestMerger/AddNewObjectPage"),
-		appdescr_ui_generic_app_changePageConfiguration: requireAsync.bind(this, "sap/suite/ui/generic/template/manifestMerger/ChangePageConfiguration")
+		appdescr_ui_generic_app_changePageConfiguration: requireAsync.bind(this, "sap/suite/ui/generic/template/manifestMerger/ChangePageConfiguration"),
+		appdescr_fe_changePageConfiguration: requireAsync.bind(this, "sap/fe/core/manifestMerger/ChangePageConfiguration")
 	};
 	return Registration;
 });

package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild
 	 * @experimental
 	 * @since 1.77
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData.js

@@ -139,7 +139,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
 	 * @experimental
 	 * @since 1.87
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeDataSource.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.ChangeDataSouce
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound.js

@@ -25,7 +25,7 @@ sap.ui.define([
      *
      * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.ChangeInbound
      * @experimental
-     * @version 1.97.1
+     * @version 1.100.0
      * @private
      * @ui5-restricted sap.ui.fl.apply._internal
      */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/SetTitle.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.SetTitle
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetAbstract
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetRegistrationIds.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetRegistrationIds
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/AddNewCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.AddNewCard
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/ChangeCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.ChangeCard
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/DeleteCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.DeleteCard
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddComponentUsages.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddComponentUsages
 	 * @experimental
 	 * @since 1.86
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddLibrary.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddLibrary
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel.js

@@ -97,7 +97,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModel
 	 * @experimental
 	 * @since 1.87
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModelEnhanceWith.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModelEnhanceWith
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.SetFlexExtensionPointEnabled
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetMinUI5Version.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.SetMinUI5Version
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils.js

@@ -12,7 +12,7 @@ sap.ui.define([], function () {
 	 *
 	 * @namespace sap.ui.fl.initial._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
 	 */

package/src/sap/ui/fl/apply/_internal/controlVariants/URLHandler.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * Checks if the parsed shell hash contains outdated variant parameters.
 	 *
 	 * @param {array} aNewHashParameters - Variant URL Parameters
-	 * @param {sap.ui.fl.Model} oModel - Variant model
+	 * @param {sap.ui.fl.variants.VariantModel} oModel - Variant model
 	 *
 	 * @returns {object} oIfUpdateIsRequiredWithCurrentVariants
 	 * @returns {boolean} oIfUpdateIsRequiredWithCurrentVariants.updateRequired - If update is required
@@ -176,7 +176,10 @@ sap.ui.define([
 		var oParsedHash = oURLParsingService && oURLParsingService.parseShellHash(hasher.getHash());
 
 		if (oParsedHash && oParsedHash.params) {
-			var mTechnicalParameters = Utils.getTechnicalParametersForComponent(oModel.oAppComponent);
+			var mTechnicalParameters = oModel.oAppComponent
+				&& oModel.oAppComponent.getComponentData
+				&& oModel.oAppComponent.getComponentData()
+				&& oModel.oAppComponent.getComponentData().technicalParameters;
 			// if mTechnicalParameters are not available we write a warning and continue updating the hash
 			if (!mTechnicalParameters) {
 				Log.warning("Component instance not provided, so technical parameters in component data and browser history remain unchanged");
@@ -382,8 +385,7 @@ sap.ui.define([
 				// this promise is not returned since the component is getting destroyed,
 				// which will also destroy the variant model anyway,
 				// but this is just to ensure the model is in sync with the variants state (which is persisted)
-				mPropertyBag.model.resetMap(true)
-					.then(mPropertyBag.model.destroy.bind(mPropertyBag.model));
+				mPropertyBag.model.destroy();
 				mPropertyBag.model.oComponentDestroyObserver.unobserve(mPropertyBag.model.oAppComponent, {destroy: true});
 				mPropertyBag.model.oComponentDestroyObserver.destroy();
 			});

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

@@ -32,7 +32,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 */
 	var Processor;
 

package/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js

@@ -34,14 +34,13 @@ sap.ui.define([
 	 * @param {sap.ui.fl.Layer} sLayer - Layer of the variant
 	 * @param {sap.ui.fl.Layer} [sActiveLayer] - Layer in which the operation may take place
 	 * @param {string} sUserId - ID of the variants creator
-	 * @param {boolean} bAllowedForAnyLayer - Flag if the operation is also allowed on objects from any layers
 	 * @returns {boolean} <code>true</code> if the variant is read only
 	 *
 	 * @private
 	 */
-	 function checkLayerAndUserAuthorization(sLayer, sActiveLayer, sUserId, bAllowedForAnyLayer) {
+	 function checkLayerAndUserAuthorization(sLayer, sActiveLayer, sUserId) {
 		if (sActiveLayer) {
-			return bAllowedForAnyLayer || sLayer === sActiveLayer;
+			return sLayer === sActiveLayer;
 		} else if (sLayer === Layer.USER) {
 			return true;
 		}
@@ -181,14 +180,14 @@ sap.ui.define([
 	/**
 	 * Checks whenever the variant can be renamed updating the entity or crating an <code>updateChange</code>.
 	 *
-	 * @param {sap.ui.fl.Layer} sLayer - Layer in which the edition may take place
+	 * @param {sap.ui.fl.Layer} [sLayer] - Layer in which the edition may take place
 	 *
 	 * @returns {boolean} <code>true</code> if the variant can be updated
 	 *
 	 * @public
 	 */
 	CompVariant.prototype.isRenameEnabled = function (sLayer) {
-		return this.isEditEnabled(sLayer) && isRenameEnableDueToOriginalLanguage(this.getOriginalLanguage()) && !this.getStandardVariant();
+		return !this.getStandardVariant() && this.isEditEnabled(sLayer) && isRenameEnableDueToOriginalLanguage(this._oDefinition.content.originalLanguage);
 	};
 
 	/**
@@ -201,22 +200,23 @@ sap.ui.define([
 	 * @public
 	 */
 	CompVariant.prototype.isEditEnabled = function (sActiveLayer) {
-		return isOriginSystem(this.getSourceSystem(), this.getSourceClient())
-			&& checkLayerAndUserAuthorization(this.getLayer(), sActiveLayer, this.getOwnerId(), true)
-			&& (sActiveLayer && LayerUtils.isDeveloperLayer(sActiveLayer) || !this.getStandardVariant());
+		var bDeveloperLayer = sActiveLayer && LayerUtils.isDeveloperLayer(sActiveLayer);
+		var bOriginSystem = isOriginSystem(this._oDefinition.sourceSystem, this._oDefinition.sourceClient);
+		var bUserAuthorized = checkLayerAndUserAuthorization(this.getLayer(), sActiveLayer, this.getOwnerId());
+		return bDeveloperLayer || bOriginSystem && bUserAuthorized;
 	};
 
 	/**
 	 * Checks whenever the variant can be deleted.
 	 *
-	 * @param {sap.ui.fl.Layer} sLayer - Layer in which the deletion may take place
+	 * @param {sap.ui.fl.Layer} [sLayer] - Layer in which the deletion may take place
 	 *
 	 * @returns {boolean} <code>true</code> if the variant file can be deleted
 	 *
 	 * @public
 	 */
 	CompVariant.prototype.isDeleteEnabled = function (sLayer) {
-		return isOriginSystem(this.getSourceSystem(), this.getSourceClient())
+		return isOriginSystem(this._oDefinition.sourceSystem, this._oDefinition.sourceClient)
 			&& checkLayerAndUserAuthorization(this.getLayer(), sLayer, this.getOwnerId())
 			&& !this.getStandardVariant();
 	};
@@ -266,6 +266,11 @@ sap.ui.define([
 		return this.getProperty("content");
 	};
 
+
+	CompVariant.prototype.getOwnerId = function() {
+		return this._oDefinition.support ? this._oDefinition.support.user : "";
+	};
+
 	/**
 	 * Sets the content of the runtime instance as well as the persistent representation.
 	 * This results in setting the definition as well as flagging the entity as 'dirty'.

package/src/sap/ui/fl/apply/_internal/flexObjects/CompVariantRevertData.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.RevertData
 	 * @private
 	 * @ui5-restricted
-	 * @since Since 1.87.0
+	 * @since 1.87.0
 	 */
 	return RevertData.extend("sap.ui.fl.apply._internal.flexObjects.CompVariantRevertData", {
 		metadata: {