@openui5/sap.m 1.91.0 → 1.93.2

package/src/sap/m/changeHandler/AddTableColumn.js

@@ -20,17 +20,19 @@ sap.ui.define([
 		var sEntityType = ObjectPath.get("oDataInformation.entityType", mChangeDefinition);
 		if (sEntityType) {
 			var mContent = mChangeDefinition.content;
-			return oModifier.createControl(
-				'sap.m.Text',
-				oAppComponent,
-				oView,
-				mContent.newFieldSelector.id + '--column',
-				{
-					text: "{/#" + sEntityType + "/" + mContent.bindingPath + "/@sap:label}"
-				}
-			);
+			return Promise.resolve()
+				.then(oModifier.createControl.bind(
+					oModifier,
+					'sap.m.Text',
+					oAppComponent,
+					oView,
+					mContent.newFieldSelector.id + '--column',
+					{
+						text: "{/#" + sEntityType + "/" + mContent.bindingPath + "/@sap:label}"
+					}
+				));
 		}
-		return mInnerControls.label;
+		return Promise.resolve(mInnerControls.label);
 	}
 
 	/**
@@ -42,7 +44,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 *
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @experimental Since 1.51.0 This class is experimental and provides only limited functionality.
 	 * Also the API might be changed in future.
@@ -50,16 +52,27 @@ sap.ui.define([
 
 	var AddTableColumn = BaseAddViaDelegate.createAddViaDelegateChangeHandler({
 
+		aggregationName: COLUMNS_AGGREGATION_NAME,
+		parentAlias: "targetTable",
+		fieldSuffix: "--field",
+		skipCreateLabel: function(mPropertyBag) {
+			//if entity type is given we create label ourselves
+			return !!ObjectPath.get("changeDefinition.oDataInformation.entityType", mPropertyBag);
+		},
+		skipCreateLayout: true,
+		supportsDefault: true,
+
 		/**
 		 * Add a new column
 		 * @param {*} mPropertyBag - Parameters
+		 * @returns {Promise} Promise resolving when the column is added
 		 */
 		addProperty : function(mPropertyBag) {
 			var mInnerControls = mPropertyBag.innerControls;
 			if (mInnerControls.valueHelp) {
 				//TODO clarify if value help needs to be supported and where to add them
 				//for V2 addODataProperty compatibility it is not necessary to support value helps
-				throw Error("Adding properties with value helps is not yet supported by addTableColumn change handler");
+				return Promise.reject(new Error("Adding properties with value helps is not yet supported by addTableColumn change handler"));
 			}
 
 			var oTable = mPropertyBag.control;
@@ -74,53 +87,72 @@ sap.ui.define([
 			var iIndex = mContent.newFieldIndex;
 			var mFieldSelector = mContent.newFieldSelector;
 
-			var oTemplate = oModifier.getBindingTemplate(oTable, ITEMS_AGGREGATION_NAME, oView);
-			if (oTemplate) {
-				var oSmartField = mInnerControls.control;
+			return Promise.resolve()
+				.then(oModifier.getBindingTemplate.bind(oModifier,oTable, ITEMS_AGGREGATION_NAME, oView))
+				.then(function (oTemplate) {
+					if (oTemplate) {
+						var oSmartField = mInnerControls.control;
 
-				oModifier.insertAggregation(oTemplate, CELLS_AGGREGATION_NAME, oSmartField, iIndex, oView);
-				oModifier.updateAggregation(oTable, ITEMS_AGGREGATION_NAME);//only needed in JS case
-				oRevertData.newCellSelector = {
-					id: mFieldSelector.id + '--field',
-					idIsLocal: true
-				};
-			}
-
-			var oControl = oModifier.createControl('sap.m.Column', oAppComponent, oView, mFieldSelector);
-			var oLabel = getLabel(mChangeDefinition, mInnerControls, oModifier, oView, oAppComponent);
-			oModifier.insertAggregation(oControl, 'header', oLabel, 0, oView);
-			oModifier.insertAggregation(oTable, COLUMNS_AGGREGATION_NAME, oControl, iIndex, oView);
+						return Promise.resolve()
+							.then(oModifier.insertAggregation.bind(oModifier, oTemplate, CELLS_AGGREGATION_NAME, oSmartField, iIndex, oView))
+							.then(oModifier.updateAggregation.bind(oModifier, oTable, ITEMS_AGGREGATION_NAME)) //only needed in JS case
+							.then(function() {
+								oRevertData.newCellSelector = {
+									id: mFieldSelector.id + '--field',
+									idIsLocal: true
+								};
+								oChange.setRevertData(oRevertData);
+							});
+					}
+					return undefined;
+				})
+				.then(oModifier.createControl.bind(oModifier, 'sap.m.Column', oAppComponent, oView, mFieldSelector))
+				.then(function(oCreatedControl) {
+					return getLabel(mChangeDefinition, mInnerControls, oModifier, oView, oAppComponent)
+						.then(function(oLabel) {
+							return Promise.resolve()
+								.then(oModifier.insertAggregation.bind(oModifier, oCreatedControl, 'header', oLabel, 0, oView))
+								.then(oModifier.insertAggregation.bind(oModifier, oTable, COLUMNS_AGGREGATION_NAME, oCreatedControl, iIndex, oView));
+						});
+				});
 		},
+
 		/**
 		 * Revert the controls for the cell that are added in addition to the new column
 		 * @param {*} mPropertyBag - Parameters
+		 * @returns {Promise} Promise resolving when the controls are reverted
 		 */
 		revertAdditionalControls : function(mPropertyBag) {
 			var oTable = mPropertyBag.control;
 			var oChange = mPropertyBag.change;
+			var oChangeRevertData = oChange.getRevertData();
 
 			var oModifier = mPropertyBag.modifier;
 			var oAppComponent = mPropertyBag.appComponent;
 
+			var oTemplate, oNewCell;
+
 			// Column Content
-			var oTemplate = oModifier.getBindingTemplate(oTable, ITEMS_AGGREGATION_NAME);
-			if (oTemplate) {
-				var oNewCell = oModifier.bySelector(oChange.getRevertData().newCellSelector, oAppComponent);
-				oModifier.removeAggregation(oTemplate, CELLS_AGGREGATION_NAME, oNewCell);
-				oModifier.destroy(oNewCell);
-				oModifier.updateAggregation(oTable, ITEMS_AGGREGATION_NAME);
-			}
+			return Promise.resolve()
+				.then(oModifier.getBindingTemplate.bind(oModifier, oTable, ITEMS_AGGREGATION_NAME))
+				.then(function(oRetrievedTemplate){
+					oTemplate = oRetrievedTemplate;
+					if (oTemplate) {
+						return Promise.resolve()
+							.then(oModifier.bySelector.bind(oModifier, oChangeRevertData.newCellSelector, oAppComponent))
+							.then(function(oCreatedCell) {
+								oNewCell = oCreatedCell;
+								return oModifier.removeAggregation(oTemplate, CELLS_AGGREGATION_NAME, oNewCell);
+							})
+							.then(function() {
+								return oModifier.destroy(oNewCell);
+							})
+							.then(oModifier.updateAggregation.bind(oModifier, oTable, ITEMS_AGGREGATION_NAME));
+					}
+					return undefined;
+				});
+		}
 
-		},
-		aggregationName: COLUMNS_AGGREGATION_NAME,
-		parentAlias: "targetTable",
-		fieldSuffix: "--field",
-		skipCreateLabel: function(mPropertyBag) {
-			//if entity type is given we create label ourselves
-			return !!ObjectPath.get("changeDefinition.oDataInformation.entityType", mPropertyBag);
-		},
-		skipCreateLayout: true,
-		supportsDefault: true
 	});
 
 	return AddTableColumn;

package/src/sap/m/changeHandler/ChangeLinkTarget.js

@@ -12,7 +12,7 @@ sap.ui.define(function () {
 	 *
 	 * @alias sap.m.changeHandler.ChangeLinkTarget
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 * @experimental Since 1.71
 	 */
 	var ChangeLinkTarget = {};
@@ -24,22 +24,23 @@ sap.ui.define(function () {
 	 * @param {sap.m.Link} oControl - Link which target should be changed
 	 * @param {object} mPropertyBag - Map of properties
 	 * @param {object} mPropertyBag.modifier - Modifier for the controls
-	 * @return {boolean} true if change could be applied
+	 * @return {Promise} Promise resolving when change was successfully applied
 	 *
 	 * @public
 	 */
 	ChangeLinkTarget.applyChange = function(oChange, oControl, mPropertyBag) {
-		var oModifier = mPropertyBag.modifier,
-			oChangeDefinition = oChange.getDefinition(),
-			sTarget = oChangeDefinition.content,
-			oRevertData = {
-				target: oModifier.getProperty(oControl, "target")
-			};
-
-		oModifier.setProperty(oControl, "target", sTarget);
-		oChange.setRevertData(oRevertData);
-
-		return true;
+		var oModifier = mPropertyBag.modifier;
+		var oChangeDefinition = oChange.getDefinition();
+		var sTarget = oChangeDefinition.content;
+		return Promise.resolve()
+			.then(oModifier.getProperty.bind(oModifier, oControl, "target"))
+			.then(function(oProperty) {
+				var oRevertData = {
+					target: oProperty
+				};
+				oModifier.setProperty(oControl, "target", sTarget);
+				oChange.setRevertData(oRevertData);
+			});
 	};
 
 	/**
@@ -49,17 +50,14 @@ sap.ui.define(function () {
 	 * @param {sap.m.Link} oControl - Link that matches the change selector for reverting the change
 	 * @param {object} mPropertyBag - Property bag containing the modifier and the view
 	 * @param {object} mPropertyBag.modifier - Modifier for the controls
-	 * @return {boolean} true if successful
 	 * @public
 	 */
 	ChangeLinkTarget.revertChange = function(oChange, oControl, mPropertyBag) {
-		var oModifier = mPropertyBag.modifier,
-			oRevertData = oChange.getRevertData(),
-			sTarget = oRevertData.target;
+		var oModifier = mPropertyBag.modifier;
+		var oRevertData = oChange.getRevertData();
+		var sTarget = oRevertData.target;
 
 		oModifier.setProperty(oControl, "target", sTarget);
-
-		return true;
 	};
 
 	/**
@@ -72,10 +70,7 @@ sap.ui.define(function () {
 	 *
 	 * @public
 	 */
-	ChangeLinkTarget.completeChangeContent = function(oChange, oSpecificChangeInfo, mPropertyBag) {
-
-		return true;
-	};
+	ChangeLinkTarget.completeChangeContent = function(oChange, oSpecificChangeInfo, mPropertyBag) {};
 
 
 	return ChangeLinkTarget;