@openui5/sap.ui.mdc 1.93.3 → 1.96.1

package/src/sap/ui/mdc/p13n/DefaultProviderRegistry.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/p13n/Engine.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -957,6 +957,7 @@ sap.ui.define([
 	Engine.prototype._retrievePropertyHelper = function(vControl, aCustomPropertyInfo){
 
 		var oRegistryEntry = this._getRegistryEntry(vControl);
+		var oControl = Engine.getControlInstance(vControl);
 
 		if (aCustomPropertyInfo) {
 			if (oRegistryEntry.helper){
@@ -970,7 +971,7 @@ sap.ui.define([
 			return Promise.resolve(oRegistryEntry.helper);
 		}
 
-		return vControl.initPropertyHelper().then(function(oPropertyHelper){
+		return oControl.initPropertyHelper().then(function(oPropertyHelper){
 			oRegistryEntry.helper = oPropertyHelper;
 			return oPropertyHelper;
 		}, function(sHelperError){

package/src/sap/ui/mdc/p13n/P13nBuilder.js

@@ -171,7 +171,8 @@ sap.ui.define([
                     text: sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc").getText("p13nDialog.RESET"),
                     press: function(oEvt) {
 
-                        var oControl = oEvt.getSource().getParent().getParent().getParent();
+                        var oDialog =  oEvt.getSource().getParent().getParent();
+                        var oControl = oDialog.getParent();
 
                         var sResetText = mSettings.warningText ? mSettings.warningText : sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc").getText("filterbar.ADAPT_RESET_WARNING");
                         MessageBox.warning(sResetText, {
@@ -179,6 +180,8 @@ sap.ui.define([
                             emphasizedAction: MessageBox.Action.OK,
                             onClose: function (sAction) {
                                 if (sAction === MessageBox.Action.OK) {
+                                    // --> focus "OK" button after 'reset' has been triggered
+                                    oDialog.getButtons()[0].focus();
                                     mSettings.reset(oControl);
                                 }
                             }
@@ -193,7 +196,7 @@ sap.ui.define([
         prepareAdaptationData: function(vProperties, fnEnhace, bGroupData) {
 
 			var oPropertyHelper =
-				vProperties.isA && vProperties.isA("sap.ui.mdc.util.PropertyHelper") ?
+				vProperties && vProperties.getProperties instanceof Function ?
 				vProperties : new P13nPropertyHelper(vProperties);
 
             var aItems = [];
@@ -214,7 +217,7 @@ sap.ui.define([
 
                 mItem.name = oProperty.name;
                 mItem.label = oProperty.getLabel() || oProperty.name;
-                mItem.tooltip = oProperty.tooltip ? oProperty.tooltip : oProperty.getLabel();
+                mItem.tooltip = oProperty.tooltip;
 
                 if (mItemsGrouped) {
                     mItem.group = oProperty.group ? oProperty.group : "BASIC";
@@ -239,63 +242,6 @@ sap.ui.define([
 
         },
 
-        //TODO: align comp<>mdc
-        prepareP13nData: function(oCurrentState, vProperties, fnEnhace) {
-
-			var oPropertyHelper =
-				vProperties.isA && vProperties.isA("sap.ui.mdc.util.PropertyHelper") ?
-				vProperties : new P13nPropertyHelper(vProperties);
-
-            var aItems = [], mItemsGrouped = {};
-
-            //TODO----
-            var aItemState = oCurrentState.items || [];
-            var mExistingFilters = oCurrentState.filter || [];
-            var mExistingProperties = this.arrayToMap(aItemState);
-            //TODO-----
-
-			oPropertyHelper.getProperties().forEach(function(oProperty) {
-
-                var mItem = merge({}, oProperty, mExistingProperties[oProperty.name]);
-
-                //TODO-----
-                var sKey = oProperty.name;
-                var oExistingProperty = mExistingProperties[sKey];
-                mItem.visible = oExistingProperty ? true : false;
-                mItem.position = oExistingProperty ? oExistingProperty.position : -1;
-                if (mExistingFilters[sKey]) {
-                    var aExistingFilters = mExistingFilters[sKey];
-                    mItem.isFiltered = aExistingFilters && aExistingFilters.length > 0 ? true : false;
-                }
-                //TODO------
-
-
-                if (fnEnhace instanceof Function) {
-                    var bIsValid = fnEnhace(mItem, oProperty);
-                    if (!bIsValid) {
-                        return;
-                    }
-                }
-
-                mItem.name = oProperty.name;
-                mItem.label = oProperty.getLabel() || oProperty.name;
-                mItem.tooltip = oProperty.tooltip ? oProperty.tooltip : oProperty.getLabel();
-                mItem.visibleInDialog = oProperty.hasOwnProperty("visibleInDialog") ? oProperty.visibleInDialog : true;
-
-                mItem.group = mItem.group ? mItem.group : "BASIC";
-                mItemsGrouped[mItem.group] = mItemsGrouped[mItem.group] ? mItemsGrouped[mItem.group] : [];
-                mItemsGrouped[mItem.group].push(mItem);
-
-                aItems.push(mItem);
-
-            });
-
-            return {
-                items: aItems,
-                itemsGrouped: this._buildGroupStructure(mItemsGrouped)
-            };
-        },
-
         //TODO: generify
         sortP13nData: function (oSorting, aItems) {
 

package/src/sap/ui/mdc/p13n/PropertyHelper.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/p13n/UIManager.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/p13n/modification/ModificationHandler.js

@@ -104,20 +104,20 @@ sap.ui.define([
 		var sAggregationName;
 		var oXConfig;
 
-		return Promise.resolve()
-			.then(oModifier.getControlMetadata.bind(oModifier, oControl))
+		return oModifier.getControlMetadata(oControl)
 			.then(function(oRetrievedControlMetadata) {
 				oControlMetadata = oRetrievedControlMetadata;
 				sAggregationName = sAffectedAggregation ? sAffectedAggregation : oControlMetadata.getDefaultAggregation().name;
 				return oModifier.getAggregation(oControl, "customData");
 			})
 			.then(function(aCustomData) {
-				return aCustomData.find(function(oCustomData) {
-					return Promise.resolve()
-						.then(oModifier.getProperty.bind(oModifier, oCustomData, "key"))
-						.then(function(sKey) {
-							return sKey == "xConfig";
-						});
+
+				return Promise.all(aCustomData.map(function(oCustomData){
+					return oModifier.getProperty(oCustomData, "key");
+				})).then(function(aCustomDataKeys){
+					return aCustomData.reduce(function(oResult, mCustomData, iIndex){
+						return aCustomDataKeys[iIndex] === "xConfig" ? mCustomData : oResult;
+					}, undefined);
 				});
 			})
 			.then(function(oRetrievedXConfig) {
@@ -160,12 +160,12 @@ sap.ui.define([
 
 				var oAppComponent = mPropertyBag ? mPropertyBag.appComponent : undefined;
 
-				if (!oXConfig) {
-					return Promise.resolve()
-						.then(oModifier.createAndAddCustomData.bind(oModifier, oControl, "xConfig", oConfig, oAppComponent))
-						.then(function() {
-							return oConfig;
-						});
+				if (!oControl._bHasXConfig) {
+					oControl._bHasXConfig = true;
+					return oModifier.createAndAddCustomData(oControl, "xConfig", oConfig, oAppComponent)
+					.then(function() {
+						return oConfig;
+					});
 				} else {
 					oModifier.setProperty(oXConfig, "value", oConfig);
 					return oConfig;
@@ -187,21 +187,19 @@ sap.ui.define([
 
 		if (oModificationPayload) {
 			var oModifier = oModificationPayload.propertyBag ? oModificationPayload.propertyBag.modifier : JsControlTreeModifier;
-			return Promise.resolve()
-				.then(oModifier.getAggregation.bind(oModifier, oControl, "customData"))
+			return oModifier.getAggregation(oControl, "customData")
 				.then(function(aCustomData) {
-					return aCustomData.find(function(oCustomData) {
-						return Promise.resolve()
-							.then(oModifier.getProperty.bind(oModifier, oCustomData, "key"))
-							.then(function(sKey) {
-								return sKey == "xConfig";
-							});
+					return Promise.all(aCustomData.map(function(oCustomData){
+						return oModifier.getProperty(oCustomData, "key");
+					})).then(function(aCustomDataKeys){
+						return aCustomData.reduce(function(oResult, mCustomData, iIndex){
+							return aCustomDataKeys[iIndex] === "xConfig" ? mCustomData : oResult;
+						}, undefined);
 					});
 				})
 				.then(function(oAggregationConfig) {
 					if (oAggregationConfig) {
-						return Promise.resolve()
-							.then(oModifier.getProperty.bind(oModifier, oAggregationConfig, "value"))
+						return oModifier.getProperty(oAggregationConfig, "value")
 							.then(function(oValue) {
 								return merge({}, oValue);
 							});

package/src/sap/ui/mdc/p13n/panels/ActionToolbarPanel.js

@@ -0,0 +1,59 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([
+    "./ListView",
+    "sap/ui/model/Sorter"
+], function(ListView, Sorter) {
+	"use strict";
+
+    /**
+	 * Constructor for a new ActionToolbarPanel
+	 *
+	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
+	 * @param {object} [mSettings] initial settings for the new control
+	 * @class
+	 * @extends sap.ui.mdc.p13n.panels.ListView
+	 * @author SAP SE
+	 * @constructor The ActionToolbarPanel is a list based view to personalize selection and ordering of a Control aggregation.
+	 * @private
+	 * @experimental
+	 * @since 1.85
+	 * @alias sap.ui.mdc.p13n.panels.ActionToolbarPanel
+	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
+	 */
+	var ActionToolbarPanel = ListView.extend("sap.ui.mdc.p13n.panels.ActionToolbarPanel", {
+		metadata: {
+            library: "sap.ui.mdc"
+        },
+		renderer: {
+			apiVersion: 2
+		}
+    });
+
+    ActionToolbarPanel.prototype._bindListItems = function(mBindingInfo) {
+        var oTemplate = this.getTemplate();
+		if (oTemplate) {
+            var fnGetAlignment = function(oContext) {
+                return oContext.getProperty("alignment");
+            };
+            var oSorter = new Sorter({
+                path: "alignment",
+                descending: false,
+                group: fnGetAlignment
+            });
+			this._oListControl.bindItems(Object.assign({
+				path: this.P13N_MODEL + ">/items",
+                sorter: oSorter,
+				key: "name",
+				templateShareable: false,
+				template: this.getTemplate().clone()
+			}, mBindingInfo));
+		}
+    };
+
+    return ActionToolbarPanel;
+
+});

package/src/sap/ui/mdc/p13n/panels/AdaptFiltersPanel.js

@@ -31,10 +31,9 @@ sap.ui.define([
 	 *
 	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
 	 * @param {object} [mSettings] initial settings for the new control
-	 * @class
+	 * @class The AdaptFiltersPanel is meant to provide a container for different filter personalization views.
 	 * @extends sap.ui.mdc.ui.Container
 	 * @author SAP SE
-	 * @constructor The AdaptFiltersPanel is meant to provide a container for different filter personalization views.
 	 * @private
 	 * @experimental
 	 * @since 1.85

package/src/sap/ui/mdc/p13n/panels/BasePanel.js

@@ -19,7 +19,6 @@ sap.ui.define([
 	 *        The control is experimental and the API/behaviour is not finalised and hence this should not be used for productive usage.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @constructor The API/behaviour is not finalised and hence this control should not be used for productive usage.
 	 * @private
 	 * @experimental
 	 * @since 1.66
@@ -77,9 +76,15 @@ sap.ui.define([
 				 * This event is fired if there has been made any change within the <code>BasePanel</code> control.
 				 */
 				change: {
+					/**
+					 * Reason for the change (e.g. Add, Remove, Move, SelectAll, DeselectAll)
+					 */
 					reason: {
 						type: "string"
 					},
+					/**
+					 * The affected item (Note: this may only provided in case one item is affected)
+					 */
 					item: {
 						type: "object"
 					}
@@ -470,7 +475,10 @@ sap.ui.define([
 		}, this);
 
 		if (bSelectAll || bDeSelectAll) {
-			this.fireChange();
+			this.fireChange({
+				reason: bSelectAll ? "SelectAll" : "DeselectAll",
+				item: undefined //No direct item is affected
+			});
 		}
 
 		// in case of 'deselect all', the move buttons for positioning are going to be disabled
@@ -602,7 +610,7 @@ sap.ui.define([
 	};
 
 	BasePanel.prototype._selectTableItem = function(oTableItem, bSelectAll) {
-		this._updateEnableOfMoveButtons(oTableItem, true);
+		this._updateEnableOfMoveButtons(oTableItem, bSelectAll ? false : true);
 		this._oSelectedItem = oTableItem;
 		if (!bSelectAll) {
 			var oItem = this.getP13nModel().getProperty(this._oSelectedItem.getBindingContext(this.P13N_MODEL).sPath);
@@ -637,19 +645,19 @@ sap.ui.define([
 		var aFields = this.getP13nModel().getProperty("/items");
 
 		// index of the item in the model not the index in the aggregation
-		var iOldIndex = aFields.indexOf(oItem.getBindingContext(this.P13N_MODEL).getObject());
+		var iOlModelIndex = aFields.indexOf(oItem.getBindingContext(this.P13N_MODEL).getObject());
 
 		// limit the minumum and maximum index
 		iNewIndex = (iNewIndex <= 0) ? 0 : Math.min(iNewIndex, aItems.length - 1);
 
 		// new index of the item in the model
-		iNewIndex = aFields.indexOf(aItems[iNewIndex].getBindingContext(this.P13N_MODEL).getObject());
-		if (iNewIndex == iOldIndex) {
+		var iNewModelIndex = aFields.indexOf(aItems[iNewIndex].getBindingContext(this.P13N_MODEL).getObject());
+		if (iNewModelIndex == iOlModelIndex) {
 			return;
 		}
 
 		// remove data from old position and insert it into new position
-		aFields.splice(iNewIndex, 0, aFields.splice(iOldIndex, 1)[0]);
+		aFields.splice(iNewModelIndex, 0, aFields.splice(iOlModelIndex, 1)[0]);
 		this.getP13nModel().setProperty("/items", aFields);
 
 		// store the moved item again due to binding
@@ -678,12 +686,13 @@ sap.ui.define([
 
 	BasePanel.prototype._updateEnableOfMoveButtons = function(oTableItem, bFocus) {
 		var iTableItemPos = this._oListControl.getItems().indexOf(oTableItem);
+		var iLastItemPos =  this._oListControl.getItems().length - 1;
 		var bUpEnabled = true, bDownEnabled = true;
 		if (iTableItemPos == 0) {
 			// disable move buttons upwards, if the item is at the top
 			bUpEnabled = false;
 		}
-		if (iTableItemPos == this._oListControl.getItems().length - 1) {
+		if (iTableItemPos == iLastItemPos) {
 			// disable move buttons downwards, if the item is at the bottom
 			bDownEnabled = false;
 		}

package/src/sap/ui/mdc/p13n/panels/ChartItemPanel.js

@@ -18,7 +18,6 @@ sap.ui.define([
 	 *        The control is experimental and the API/behaviour is not finalised and hence this should not be used for productive usage.
 	 * @extends sap.ui.mdc.p13n.panels.BasePanel
 	 * @author SAP SE
-	 * @constructor The API/behaviour is not finalised and hence this control should not be used for productive usage.
 	 * @private
 	 * @experimental
 	 * @since 1.66
@@ -135,4 +134,4 @@ sap.ui.define([
 
 	return ChartItemPanel;
 
-});
+});