@openui5/sap.m 1.104.0 → 1.105.0

package/src/sap/m/VariantManagement.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.
  */
@@ -42,6 +42,7 @@ sap.ui.define([
 	"sap/m/VBox",
 	'sap/m/HBox',
 	"sap/ui/events/KeyCodes",
+	'sap/base/Log',
 	"sap/ui/core/library",
 	"sap/m/library"
 ], function(
@@ -81,6 +82,7 @@ sap.ui.define([
 	VBox,
 	HBox,
 	KeyCodes,
+	Log,
 	coreLibrary,
 	mobileLibrary
 ) {
@@ -104,6 +106,8 @@ sap.ui.define([
 	// shortcut for sap.m.ScreenSize
 	var ScreenSize = mobileLibrary.ScreenSize;
 
+	var ListKeyboardMode = mobileLibrary.ListKeyboardMode;
+
 	// shortcut for sap.ui.core.ValueState
 	var ValueState = coreLibrary.ValueState;
 
@@ -1464,8 +1468,6 @@ sap.ui.define([
 			this.setDefaultKey(this.oDefault.getSelected());
 		}
 
-		this.setModified(false);
-
 		var oObj = {
 				key: sKey,
 				name: sName,
@@ -1517,12 +1519,17 @@ sap.ui.define([
 			key: oItem.getKey(),
 			def: bDefault
 		});
-
-		this.setModified(false);
 	};
 
 	// Manage Views dialog
 
+	VariantManagement.prototype.destroyManageDialog = function() {
+		if (this.oManagementDialog) {
+			this.oManagementDialog.destroy();
+			this.oManagementDialog = undefined;
+		}
+	};
+
 	/**
 	 * Opens the <i>Manage Views</i> dialog.
 	 * @param {boolean} bCreateAlways - Indicates that if this is set to <code>true</code>, the former dialog will be destroyed before a new one is created
@@ -1613,10 +1620,12 @@ sap.ui.define([
 
 	VariantManagement.prototype._createManagementDialog = function() {
 		if (!this.oManagementDialog || this.oManagementDialog.bIsDestroyed) {
+
 			this.oManagementTable = new Table(this.getId() + "-managementTable", {
 				contextualWidth: "Auto",
 				fixedLayout: false,
 				growing: true,
+				keyboardMode: ListKeyboardMode.Edit,
 				columns: [
 					new Column({
 						width: "3rem",
@@ -1792,9 +1801,18 @@ sap.ui.define([
 		var oRolesCell;
 		var oItem = oContext.getObject();
 		if (!oItem) {
+			Log.error("couldn't obtain the item for '" + oContext.getPath() + "'");
+			return undefined;
+		}
+
+		var nPos = this._determineIndex(oContext.getPath());
+		if (nPos < 0) {
+			Log.error("couldn't obtain item position for '" + oContext.getPath() + "'");
 			return undefined;
 		}
 
+		var sIdPrefix = this.getId() + "-manage";
+
 		var sModelName = "$mVariants";
 
 		var fLiveChange = function(oEvent) {
@@ -1831,7 +1849,7 @@ sap.ui.define([
 		}.bind(this);
 
 		if (oItem.getRename()) {
-			oNameControl = new Input({
+			oNameControl = new Input(sIdPrefix + "-input-" + nPos, {
 				liveChange: fLiveChange,
 				change: fChange,
 				value: '{' + sModelName + ">title}"
@@ -1843,7 +1861,7 @@ sap.ui.define([
 
 
 		} else {
-			oNameControl = new ObjectIdentifier({
+			oNameControl = new ObjectIdentifier(sIdPrefix + "-text-" + nPos, {
 				title: '{' + sModelName + ">title}"
 			});
 			if (sTooltip) {
@@ -1851,7 +1869,7 @@ sap.ui.define([
 			}
 		}
 
-		oDeleteButton = new Button({
+		oDeleteButton = new Button(sIdPrefix + "-del-" + nPos, {
 			icon: "sap-icon://decline",
 			enabled: true,
 			type: ButtonType.Transparent,
@@ -1860,9 +1878,7 @@ sap.ui.define([
 			visible: oItem.getRemove()
 		});
 
-		//this._assignColumnInfoForDeleteButton(oDeleteButton);
-
-		var oFavoriteIcon = new Icon({
+		var oFavoriteIcon = new Icon(sIdPrefix + "-fav-" + nPos, {
 			src: {
 				path: "favorite",
 				model: sModelName,
@@ -1877,7 +1893,8 @@ sap.ui.define([
 					return this._oRb.getText(bFlagged ? "VARIANT_MANAGEMENT_FAV_DEL_TOOLTIP" : "VARIANT_MANAGEMENT_FAV_ADD_TOOLTIP");
 				}.bind(this)
 			},
-			press: fSelectFav
+			press: fSelectFav,
+			decorative: false
 		});
 
 		if ((this.getStandardVariantKey() === oItem.getKey()) || (this.getDefaultKey() === oItem.getKey())) {
@@ -1887,19 +1904,13 @@ sap.ui.define([
 		}
 
 		if (this.getDisplayTextForExecuteOnSelectionForStandardVariant() && (this.getStandardVariantKey() === oItem.getKey())) {
-			oExecuteOnSelectCtrl = new CheckBox(this.getId() + "-manage-exe-0",{
+			oExecuteOnSelectCtrl = new CheckBox(sIdPrefix + "-exe-" + nPos, {
 				wrapping: true,
-				//text: this.getDisplayTextForExecuteOnSelectionForStandardVariant(),
 				text: '{' + sModelName + ">/displayTextForExecuteOnSelectionForStandardVariant}",
 				selected: '{' + sModelName + ">executeOnSelect}"
 			});
-		} else if (this.getStandardVariantKey() === oItem.getKey()) {
-			oExecuteOnSelectCtrl = new CheckBox(this.getId() + "-manage-exe-0",{
-				text: "",
-				selected: '{' + sModelName + ">executeOnSelect}"
-			});
 		} else {
-			oExecuteOnSelectCtrl = new CheckBox({
+			oExecuteOnSelectCtrl = new CheckBox(sIdPrefix + "-exe-" + nPos, {
 				text: "",
 				selected: '{' + sModelName + ">executeOnSelect}"
 			});
@@ -1915,16 +1926,17 @@ sap.ui.define([
 			});
 			oIcon.addStyleClass("sapMVarMngmtRolesEdit");
 			oIcon.setTooltip(this._oRb.getText("VARIANT_MANAGEMENT_VISIBILITY_ICON_TT"));
-			oRolesCell = new HBox({
+			oRolesCell = new HBox(sIdPrefix + "-role-" + nPos, {
 				items: [oText, oIcon]
 			});
 		} else {
 			oRolesCell = new Text();
 		}
 
+
 		return new ColumnListItem({
 			cells: [
-				oFavoriteIcon, oNameControl, new Text({
+				oFavoriteIcon, oNameControl, new Text(sIdPrefix + "-type-" + nPos, {
 					text: {
 						path: "sharing",
 						model: sModelName,
@@ -1933,7 +1945,7 @@ sap.ui.define([
 						}.bind(this)
 					},
 					textAlign: "Center"
-				}), new RadioButton({
+				}), new RadioButton(sIdPrefix + "-def-" + nPos, {
 					groupName: this.getId(),
 					select: fSelectRB,
 					selected: {
@@ -1943,7 +1955,7 @@ sap.ui.define([
 							return oItem.getKey() === sKey;
 						}
 					}
-				}), oExecuteOnSelectCtrl, oRolesCell, new Text({
+				}), oExecuteOnSelectCtrl, oRolesCell, new Text(sIdPrefix + "-author-" + nPos, {
 					text: '{' + sModelName + ">author}",
 					textAlign: "Begin"
 				}), oDeleteButton, new Text({
@@ -1953,6 +1965,7 @@ sap.ui.define([
 		});
 	};
 
+
 	VariantManagement.prototype._openManagementDialog = function() {
 		this._createManagementDialog();
 
@@ -1968,7 +1981,6 @@ sap.ui.define([
 		this._sOriginalDefaultKey = this._sDefaultKey;
 
 
-		//this.oManagementSave.setEnabled(false);
 		this._oSearchFieldOnMgmtDialog.setValue("");
 
 		// Ideally, this should be done only once in <code>_createManagementDialog</code>. However, the binding does not recognize a change if filtering is involved.
@@ -1979,12 +1991,7 @@ sap.ui.define([
 		if (this._bDeleteOccured) {
 			this._bDeleteOccured = false;
 
-			this.oManagementTable.bindAggregation("items", {
-				path: "/items",
-				model: "$mVariants",
-				factory: this._templateFactoryManagementDialog.bind(this),
-				filters: this._getVisibleFilter()
-			});
+			this.oManagementTable.getBinding("items").filter(this._getVisibleFilter());
 		}
 
 		this.oManagementDialog.open();
@@ -2024,7 +2031,17 @@ sap.ui.define([
 			if (bSelected) {
 				if (this.getSupportFavorites() && !oItem.getFavorite()) {
 					oItem.setFavorite(true);
-					this._setFavoriteIcon(oIcon, true);
+
+					var oRow = this._getRowForKey(oItem.getKey());
+					if (oRow) {
+						var aCells = oRow.getCells();
+						if (aCells) {
+							oIcon = aCells[VariantManagement.COLUMN_FAV_IDX];
+							this._setFavoriteIcon(oIcon, true);
+
+							aCells[VariantManagement.COLUMN_FAV_IDX + 3].focus();  // focus on default
+						}
+					}
 				}
 
 				this.setDefaultKey(sKey);
@@ -2035,13 +2052,17 @@ sap.ui.define([
 	};
 
 	VariantManagement.prototype._handleManageCancelPressed = function() {
-		var sDefaultKey = this._sDefaultKey;
-//		this._getDeletedItems().forEach(function(sKey) {
-//			var oItem = this._getItemByKey(sKey);
-//			if (oItem) {
-//				oItem.setVisible(true);
-//			}
-//		});
+
+		if (this._getDeletedItems().length > 0) {
+			this._bDeleteOccured = true;
+
+			this._getDeletedItems().forEach(function(sKey) {
+				var oItem = this._getItemByKey(sKey);
+				if (oItem) {
+					oItem.setVisible(true);
+				}
+			}.bind(this));
+		}
 
 		this.getItems().forEach(function(oItem) {
 			if (oItem.getVisible()) {
@@ -2049,26 +2070,23 @@ sap.ui.define([
 				oItem.setFavorite(oItem.getOriginalFavorite());
 				oItem.setExecuteOnSelect(oItem.getOriginalExecuteOnSelect());
 				oItem.setContexts(oItem.getOriginalContexts());
-			} else {
-				oItem.setVisible(true);
 			}
 		});
 
-		sDefaultKey = this._sOriginalDefaultKey;
-		if (sDefaultKey !== this.getDefaultKey()) {
-			this.setDefaultKey(sDefaultKey);
+		if (this._sOriginalDefaultKey !== this.getDefaultKey()) {
+			this.setDefaultKey(this._sOriginalDefaultKey);
 		}
 
 		this._clearRenamedItems();
 		this._clearDeletedItems();
 
-//		if (this._oManagedObjectModel) {
-//			this._oManagedObjectModel.checkUpdate();
-//		}
+		if (this._oManagedObjectModel) {
+			this._oManagedObjectModel.checkUpdate();
+		}
 
 		this.fireManageCancel();
 
-		//fireCancel may have deleted the ManageViews dialog
+		//fireManageCancel may have deleted the ManageViews dialog
 //		if (this.oManagementDialog) {
 //			this.oManagementTable.getBinding("items").filter(this._getVisibleFilter());
 //		}
@@ -2087,16 +2105,20 @@ sap.ui.define([
 		}
 
 		oItem.setFavorite(!oItem.getFavorite());
-		this._setFavoriteIcon(oIcon, oItem.getFavorite);
+		var oRow = this._getRowForKey(oItem.getKey());
+		if (oRow) {
+			oRow.getCells()[VariantManagement.COLUMN_FAV_IDX].focus();
+		}
 	};
 
+
+
 	VariantManagement.prototype._getRowForKey = function(sKey) {
 		var oRowForKey = null;
 		if (this.oManagementTable) {
 			this.oManagementTable.getItems().some(function(oRow) {
 				var oColumnItem = oRow.getCells()[0].getParent();
 				var oItem = this.getModel("$mVariants").getObject(oColumnItem.getBindingContextPath());
-				//if (sKey === oRow.getCells()[0].getBindingContext().getObject().key) {
 				if (sKey === oItem.getKey()) {
 					oRowForKey = oRow;
 				}
@@ -2108,6 +2130,16 @@ sap.ui.define([
 		return oRowForKey;
 	};
 
+	VariantManagement.prototype._determineIndex = function(sPath) {
+		var nIdx = -1;
+		var nPos = sPath.indexOf('/', 1);
+		if (nPos > 0) {
+			nIdx = parseInt(sPath.substring(nPos + 1));
+		}
+
+		return nIdx;
+	};
+
 	VariantManagement.prototype._handleManageDeletePressed = function(oItem) {
 		var sKey = oItem.getKey();
 

package/src/sap/m/ViewSettingsCustomItem.js

@@ -22,7 +22,7 @@ sap.ui.define(['./ViewSettingsItem', './library'],
 	 * @extends sap.m.ViewSettingsItem
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ViewSettingsCustomTab.js

@@ -20,7 +20,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/core/IconPool'],
 			 * @extends sap.ui.core.Item
 			 *
 			 * @author SAP SE
-			 * @version 1.104.0
+			 * @version 1.105.0
 			 *
 			 * @constructor
 			 * @public

package/src/sap/m/ViewSettingsDialog.js

@@ -144,7 +144,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ViewSettingsFilterItem.js

@@ -24,7 +24,7 @@ sap.ui.define(['./ViewSettingsItem', './library'],
 	 * @extends sap.m.ViewSettingsItem
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ViewSettingsItem.js

@@ -25,7 +25,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/VisibleItem.js

@@ -21,7 +21,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', "sap/ui/thirdparty/jquery"],
 		 * @extends sap.ui.core.Item
 		 *
 		 * @author SAP SE
-		 * @version 1.104.0
+		 * @version 1.105.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/WheelSlider.js

@@ -28,7 +28,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.104.0
+		 * @version 1.105.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/WheelSliderContainer.js

@@ -31,7 +31,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.104.0
+		 * @version 1.105.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/Wizard.js

@@ -14,7 +14,6 @@ sap.ui.define([
 	"sap/ui/Device",
 	"./WizardRenderer",
 	"sap/ui/core/CustomData",
-	"sap/ui/dom/containsOrEquals",
 	"sap/base/Log",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/dom/jquery/Focusable"
@@ -28,7 +27,6 @@ sap.ui.define([
 	Device,
 	WizardRenderer,
 	CustomData,
-	containsOrEquals,
 	Log,
 	jQuery
 ) {
@@ -86,7 +84,7 @@ sap.ui.define([
 		 *
 		 * @extends sap.ui.core.Control
 		 * @author SAP SE
-		 * @version 1.104.0
+		 * @version 1.105.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/WizardProgressNavigator.js

@@ -43,7 +43,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/WizardStep.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * <li>If the execution needs to branch after a given step, you should set all possible next steps in the <code>subsequentSteps</code> aggregation.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -16,19 +16,18 @@ sap.ui.define([
 	var CELLS_AGGREGATION_NAME = "cells";
 	var ITEMS_AGGREGATION_NAME = "items";
 
-	function getLabel(mChangeDefinition, mInnerControls, oModifier, oView, oAppComponent){
-		var sEntityType = ObjectPath.get("oDataInformation.entityType", mChangeDefinition);
+	function getLabel(oChangeContent, mInnerControls, oModifier, oView, oAppComponent, oChangeODataInformation){
+		var sEntityType = oChangeODataInformation && oChangeODataInformation.entityType;
 		if (sEntityType) {
-			var mContent = mChangeDefinition.content;
 			return Promise.resolve()
 				.then(oModifier.createControl.bind(
 					oModifier,
 					'sap.m.Text',
 					oAppComponent,
 					oView,
-					mContent.newFieldSelector.id + '--column',
+					oChangeContent.newFieldSelector.id + '--column',
 					{
-						text: "{/#" + sEntityType + "/" + mContent.bindingPath + "/@sap:label}"
+						text: "{/#" + sEntityType + "/" + oChangeContent.bindingPath + "/@sap:label}"
 					}
 				));
 		}
@@ -44,7 +43,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 *
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @experimental Since 1.51.0 This class is experimental and provides only limited functionality.
 	 * Also the API might be changed in future.
@@ -55,9 +54,9 @@ sap.ui.define([
 		aggregationName: COLUMNS_AGGREGATION_NAME,
 		parentAlias: "targetTable",
 		fieldSuffix: "--field",
-		skipCreateLabel: function(mPropertyBag) {
+		skipCreateLabel: function(oChangeODataInformation) {
 			//if entity type is given we create label ourselves
-			return !!ObjectPath.get("changeDefinition.oDataInformation.entityType", mPropertyBag);
+			return !!(oChangeODataInformation && oChangeODataInformation.entityType);
 		},
 		skipCreateLayout: true,
 		supportsDefault: true,
@@ -82,10 +81,10 @@ sap.ui.define([
 
 			var oChange = mPropertyBag.change;
 			var oRevertData = oChange.getRevertData();
-			var mChangeDefinition = oChange.getDefinition();
-			var mContent = mChangeDefinition.content;
-			var iIndex = mContent.newFieldIndex;
-			var mFieldSelector = mContent.newFieldSelector;
+			var oChangeContent = oChange.getContent();
+			var oChangeODataInformation = oChange.getODataInformation();
+			var iIndex = oChangeContent.newFieldIndex;
+			var mFieldSelector = oChangeContent.newFieldSelector;
 
 			return Promise.resolve()
 				.then(oModifier.getBindingTemplate.bind(oModifier,oTable, ITEMS_AGGREGATION_NAME, oView))
@@ -106,7 +105,7 @@ sap.ui.define([
 				})
 				.then(oModifier.createControl.bind(oModifier, 'sap.m.Column', oAppComponent, oView, mFieldSelector))
 				.then(function(oCreatedControl) {
-					return getLabel(mChangeDefinition, mInnerControls, oModifier, oView, oAppComponent)
+					return getLabel(oChangeContent, mInnerControls, oModifier, oView, oAppComponent, oChangeODataInformation)
 						.then(function(oLabel) {
 							return Promise.resolve()
 								.then(oModifier.insertAggregation.bind(oModifier, oCreatedControl, 'header', oLabel, 0, oView))

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.104.0
+	 * @version 1.105.0
 	 * @experimental Since 1.71
 	 */
 	var ChangeLinkTarget = {};
@@ -30,8 +30,7 @@ sap.ui.define(function () {
 	 */
 	ChangeLinkTarget.applyChange = function(oChange, oControl, mPropertyBag) {
 		var oModifier = mPropertyBag.modifier;
-		var oChangeDefinition = oChange.getDefinition();
-		var sTarget = oChangeDefinition.content;
+		var sTarget = oChange.getContent();
 		return Promise.resolve()
 			.then(oModifier.getProperty.bind(oModifier, oControl, "target"))
 			.then(function(oProperty) {