@openui5/sap.ui.mdc 1.92.0 → 1.93.3

package/src/sap/ui/mdc/odata/v4/util/DelegateUtil.js

@@ -7,8 +7,13 @@
 // ------------------------------------------------------------------------------------------
 // Utility class used by mdc v4 delegates for parameter handling
 // ------------------------------------------------------------------------------------------
-sap.ui.define(['sap/ui/mdc/util/FilterUtil', "sap/ui/mdc/condition/ConditionConverter", 'sap/base/Log', 'sap/base/util/merge', "sap/ui/model/odata/v4/ODataUtils"],
-		function(FilterUtil, ConditionConverter, Log, merge, ODataUtils) {
+sap.ui.define(['sap/ui/mdc/util/FilterUtil',
+			   "sap/ui/mdc/condition/ConditionConverter",
+			   'sap/base/Log',
+			   'sap/base/util/merge',
+			   "sap/ui/model/FilterOperator",
+			   "sap/ui/model/odata/v4/ODataUtils"],
+		function(FilterUtil, ConditionConverter, Log, merge, FilterOperator, ODataUtils) {
 	"use strict";
 
 	/**
@@ -33,75 +38,62 @@ sap.ui.define(['sap/ui/mdc/util/FilterUtil', "sap/ui/mdc/condition/ConditionConv
 			return oParameters;
 		},
 
-		_getParameterPath: function(oMDCFilterBar, mConditions, oParameters) {
+		/**
+		 * Determines the parameter path
+		 *
+		 * @param {sap.ui.mdc.FilterBar} oMDCFilterBar - instance of the filter bar
+		 * @returns {string | null} path information
+		 * @protected
+		 */
+		getParametersInfo : function(oMDCFilterBar) {
+			var oParameters = DelegateUtil._getParameters(oMDCFilterBar);
 
-			var i, sFieldPath,  mInternalParameterConditions = {}, oConditionInternal;
-			var aParams, sEdmType;
+			return DelegateUtil._getParameterPath(oMDCFilterBar, oParameters);
+		},
 
-			if (!oParameters || (oParameters.parameters.length <= 0)) {
+		_getParametersListUrl : function(oMDCFilterBar, aParameterNames) {
+			var aParams = [];
+			var mConditionsMap = FilterUtil.getConditionsMap(oMDCFilterBar, aParameterNames);
+			var aPropertyInfos = oMDCFilterBar.getPropertyInfoSet();
+
+			aParameterNames.forEach(function(sParameterName) {
+				var oProperty = FilterUtil.getPropertyByKey(aPropertyInfos, sParameterName);
+
+				if (oProperty && (oProperty.maxConditions === 1)) {    						// only single valued parameters are considered
+					mConditionsMap[sParameterName].forEach(function(oCondition) {
+						if (oCondition.operator === FilterOperator.EQ) {   		            // only the EQ operators are considered
+							aParams.push(sParameterName + '=' + encodeURIComponent(ODataUtils.formatLiteral(oCondition.values[0], oProperty.typeConfig.className)));
+						}
+					});
+				}
+			});
+
+			return aParams;
+		},
+
+		_getParameterPath: function(oMDCFilterBar, oParameters) {
+
+			if (!oMDCFilterBar || !oMDCFilterBar.isA("sap.ui.mdc.FilterBar")) {
 				return null;
 			}
 
-			var aPropertiesMetadata = oMDCFilterBar.getPropertyInfoSet ? oMDCFilterBar.getPropertyInfoSet() : null;
-			if (!aPropertiesMetadata) {
+			if (!oParameters || (oParameters.parameters.length <= 0)) {
 				return null;
 			}
 
 			var sEntitySetName = oMDCFilterBar.getDelegate().payload.collectionName;
 
-			for (sFieldPath in mConditions) {
-				var oProperty = FilterUtil.getPropertyByKey(aPropertiesMetadata, sFieldPath);
-				if (oProperty && (oParameters.parameters.indexOf(sFieldPath) >= 0)) {
-
-					mInternalParameterConditions[sFieldPath] = [];
-					//convert from externalized to model-specific value representation
-					for (i = 0; i < mConditions[sFieldPath].length; i++) {
-						oConditionInternal = merge({}, mConditions[sFieldPath][i]);
-						mInternalParameterConditions[sFieldPath].push(ConditionConverter.toType(oConditionInternal, oProperty.typeConfig, oMDCFilterBar.getTypeUtil()));
-					}
-				} else if (!oProperty) {
-					Log.error("no such property: " + sFieldPath);
-				}
-			}
-
-			aParams = [];
-			for (i = 0; i < oParameters.parameters.length; i++) {
-				sFieldPath = oParameters.parameters[i];
-				if (mInternalParameterConditions[sFieldPath] && (mInternalParameterConditions[sFieldPath].length > 0)) {
-					sEdmType = oParameters.parameterTypes[sFieldPath];
-					aParams.push(sFieldPath + '=' + encodeURIComponent(ODataUtils.formatLiteral(mInternalParameterConditions[sFieldPath][0].values[0], sEdmType)));
-				} else {
-					Log.error("no value found parameter '" + sFieldPath + "'");
-				}
-
-			}
-
+			var aParams = DelegateUtil._getParametersListUrl(oMDCFilterBar, oParameters.parameters);
 
 			// create parameter context
 			return '/' + sEntitySetName + '(' + aParams.toString() + ")/" + oParameters.parameterNavigationName;
 		},
 
 		/**
-		 * Determines the parameter path
-		 *
-		 * @param {sap.ui.mdc.FilterBar} oMDCFilterBar - instance of the filter bar
-		 * @param {map} mConditions - map with externalized conditions
-		 * @returns {string} path information
-		 * @protected
-		 */
-		getParametersInfo : function(oMDCFilterBar, mConditions) {
-			var oParameters = DelegateUtil._getParameters(oMDCFilterBar);
-
-			return DelegateUtil._getParameterPath(oMDCFilterBar, mConditions, oParameters);
-		},
-
-
-		/**
-		 * Static function that replaces special characters with a underscore.<br>
+		 * Static function that returns the parameter names..
 		 *
 		 * @param {sap.ui.mdc.FilterBar} oMDCFilterBar - instance of the filter bar
-		 * @param {map} mConditions - map with externalized conditions
-		 * @returns {string} path information
+		 * @returns {array | null} list of parameter names
 		 * @protected
 		 */
 		getParameterNames : function(oMDCFilterBar) {

package/src/sap/ui/mdc/odata/v4/vizChart/ChartDelegateNew.js

@@ -359,17 +359,26 @@ sap.ui.define([
 
                         //TODO: Alias might be changing after backend request
                         aVisibleMeasures.push(this._getAggregatedMeasureNameForMDCItem(oItem));
-                        var oMeasure = new Measure({
+
+                        var oMeasureSettings = {
                             name: this._getAggregatedMeasureNameForMDCItem(oItem),//"average" + oItem.getName(),
                             label: oItem.getLabel(),
-                            role: "axis1",
-                            analyticalInfo: {
-                                propertyPath: propertyPath, //TODO: What to fill here without PropertyInfos? Consider property at MDC Item level
+                            role: oItem.getRole() ? oItem.getRole() : "axis1"
+                        };
+
+                        if (aggregationMethod && propertyPath) {
+                            oMeasureSettings.analyticalInfo = {
+                                propertyPath: propertyPath,
                                 "with": aggregationMethod
-                            }
-                        });
+                            };
+                        }
+
+                        var oMeasure = new Measure(oMeasureSettings);
                         this._oInnerChart.addMeasure(oMeasure);
                         break;
+
+                    default:
+                        Log.error("MDC Chart Item " + oItem.getId() + " with label " + oItem.getLabel() + " has no known type. Supported typed are: \"groupable\" & \"aggregatable\"");
                 }
 
                 aColorPromises.push(this._prepareColoringForItem(oItem));
@@ -838,15 +847,22 @@ sap.ui.define([
             var propertyPath = oPropertyInfo.propertyPath;
 
             //TODO: Check for Criticality, Coloring and so on
-            var oMeasure = new Measure({
+
+            var oMeasureSettings = {
                 name: this._getAggregatedMeasureNameForMDCItem(oMDChartItem),//"average" + oItem.getName(),
                 label: oMDChartItem.getLabel(),
-                role: "axis1",
-                analyticalInfo: {
+                role: oMDChartItem.getRole() ? oMDChartItem.getRole() : "axis1"
+            };
+
+            if (aggregationMethod && propertyPath) {
+                oMeasureSettings.analyticalInfo = {
                     propertyPath: propertyPath, //TODO: What to fill here without PropertyInfos? Consider property at MDC Item level
                     "with": aggregationMethod
-                }
-            });
+                };
+            }
+
+
+            var oMeasure = new Measure(oMeasureSettings);
             this._oInnerChart.addMeasure(oMeasure);
         }.bind(this));
 
@@ -929,19 +945,19 @@ sap.ui.define([
 
                 var aPropertiesMetadata = oFilter.getPropertyInfoSet ? oFilter.getPropertyInfoSet() : null;
                 var aParameterNames = DelegateUtil.getParameterNames(oFilter);
-                var oFilterInfo = FilterUtil.getFilterInfo(oFilter, mConditions, aPropertiesMetadata, aParameterNames);
+                var oFilterInfo = FilterUtil.getFilterInfo(ChartDelegate.getTypeUtil(), mConditions, aPropertiesMetadata, aParameterNames);
                 if (oFilterInfo) {
                     oBindingInfo.filters = oFilterInfo.filters;
                 }
 
-                var sParameterPath = DelegateUtil.getParametersInfo(oFilter, mConditions);
+                var sParameterPath = DelegateUtil.getParametersInfo(oFilter);
                 if (sParameterPath) {
                     oBindingInfo.path = sParameterPath;
                 }
             }
 
             // get the basic search
-            var sSearchText = oFilter.getSearch();
+            var sSearchText = oFilter.getSearch instanceof Function ? oFilter.getSearch() :  "";
             if (sSearchText) {
 
                 if (!oBindingInfo) {
@@ -1034,11 +1050,9 @@ sap.ui.define([
                 }
                 // Make this dynamic for setter calls
                 this._vizTooltip.connect(this._oInnerChart.getVizUid());
-            } else {
-                if (this._vizTooltip) {
+            } else if (this._vizTooltip) {
                     this._vizTooltip.destroy();
                 }
-            }
         } else {
             Log.error("Trying to set chart tooltip while inner chart was not yet initialized");
         }

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.92.0
+	 * @version 1.93.3
 	 *
 	 * @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.92.0
+	 * @version 1.93.3
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -353,37 +353,42 @@ sap.ui.define([
 	 * @param {object} mEnhanceConfig.controlMeta.property The affected property name (such as <code>width</code> or <code>lable</code>)
 	 * @param {object} mEnhanceConfig.value The value that should be written in the xConfig
 	 * @param {object} [mEnhanceConfig.propertyBag] Optional propertybag for the <code>ModificationHandler</code>
+	 * @returns {Promise} Promise resolving when the XConfig is successfully enhanced
 	 */
 	Engine.prototype.enhanceXConfig = function(vControl, mEnhanceConfig) {
 
 		var oControl = Engine.getControlInstance(vControl);
 		var oRegistryEntry = this._getRegistryEntry(vControl);
 
-		if (oRegistryEntry) {
-			var oModificationHandler = this.getModificationHandler(vControl);
-			var oConfig = oModificationHandler.enhanceConfig(oControl, mEnhanceConfig);
-
-			oRegistryEntry.xConfig = oConfig;
-		} else {
-			throw new Error("The control instance needs to be registered to use xConfig!");
-		}
-
+		return Promise.resolve()
+			.then(function() {
+				if (oRegistryEntry) {
+					var oModificationHandler = this.getModificationHandler(vControl);
+					return oModificationHandler.enhanceConfig(oControl, mEnhanceConfig)
+						.then(function(oConfig){
+							oRegistryEntry.xConfig = oConfig;
+						});
+				} else {
+					throw new Error("The control instance needs to be registered to use xConfig!");
+				}
+			}.bind(this));
 	};
 
 	/**
 	 * Returns a copy of the xConfig object
 	 *
-	 * @param {sap.ui.core.Element} oControl The according element which should be checked
-	 * @param {object} [oModificationPayload] An object providing a modification handler specific payload
-	 * @param {object} [oModificationPayload.propertyBag] Optional propertybag for different modification handler derivations
+	 * @param {sap.ui.core.Element} vControl The according element which should be checked
+	 * @param {object} [mEnhanceConfig] An object providing a modification handler specific payload
+	 * @param {object} [mEnhanceConfig.propertyBag] Optional propertybag for different modification handler derivations
+	 * @param {boolean} [bSync] If the method should be executed synchronously; e.g. for the Table
 	 *
-	 * @returns {object} The adapted xConfig object
+	 * @returns {Promise<object>} Promise resolving with the adapted xConfig object
 	 */
-	Engine.prototype.readXConfig = function(vControl, mEnhanceConfig) {
+	Engine.prototype.readXConfig = function(vControl, mEnhanceConfig, bSync) {
 
 		var oControl = Engine.getControlInstance(vControl);
 		var oModificationHandler = this.getModificationHandler(vControl);
-		return oModificationHandler.readConfig(oControl, mEnhanceConfig) || {};
+		return oModificationHandler.readConfig(oControl, mEnhanceConfig, bSync) || Promise.resolve({});
 
 	};
 

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.92.0
+	 * @version 1.93.3
 	 *
 	 * @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.92.0
+	 * @version 1.93.3
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

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

@@ -88,67 +88,89 @@ sap.ui.define([
 	 * @param {object} oModificationPayload.value The value that should be written in nthe xConfig
 	 * @param {object} [oModificationPayload.propertyBag] Optional propertybag for different modification handler derivations
 	 *
-	 * @returns {object} The adapted xConfig object
+	 * @returns {Promise<object>} Promise resolving to the adapted xConfig object
 	 */
 	ModificationHandler.prototype.enhanceConfig = function(oControl, oModificationPayload) {
 		var mPropertyBag = oModificationPayload.propertyBag;
-        var oModifier = mPropertyBag ? mPropertyBag.modifier : JsControlTreeModifier;
+		var oModifier = mPropertyBag ? mPropertyBag.modifier : JsControlTreeModifier;
 		var sPropertyInfoKey = oModificationPayload.name;
 		var mControlMeta = oModificationPayload.controlMeta;
 
-        var sAffectedAggregation = mControlMeta.aggregation;
-        var sAffectedProperty = mControlMeta.property;
+		var sAffectedAggregation = mControlMeta.aggregation;
+		var sAffectedProperty = mControlMeta.property;
 
-        var vValue = oModificationPayload.value;
+		var vValue = oModificationPayload.value;
+		var oControlMetadata;
+		var sAggregationName;
+		var oXConfig;
 
-		var oControlMetadata = oModifier.getControlMetadata(oControl);
-		var sAggregationName = sAffectedAggregation ? sAffectedAggregation : oControlMetadata.getDefaultAggregation().name;
+		return Promise.resolve()
+			.then(oModifier.getControlMetadata.bind(oModifier, 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";
+						});
+				});
+			})
+			.then(function(oRetrievedXConfig) {
+				oXConfig = oRetrievedXConfig;
+				if (oXConfig) {
+					return oModifier.getProperty(oXConfig, "value");
+				}
+				return {
+					aggregations: {}
+				};
+			})
+			.then(function(oConfig) {
+				if (!oConfig.aggregations.hasOwnProperty(sAggregationName)) {
+					if (oControlMetadata.hasAggregation(sAggregationName)) {
+						oConfig.aggregations[sAggregationName] = {};
+					} else {
+						throw new Error("The aggregation " + sAggregationName + " does not exist for" + oControl);
+					}
+				}
 
-		var oXConfig = oModifier.getAggregation(oControl, "customData").find(function(oCustomData){
-            return oModifier.getProperty(oCustomData, "key") == "xConfig";
-        });
+				if (!oConfig.aggregations.hasOwnProperty(sPropertyInfoKey)) {
+					oConfig.aggregations[sAggregationName][sPropertyInfoKey] = {};
+				}
 
-        var oConfig = oXConfig ? oModifier.getProperty(oXConfig, "value") : {
-			aggregations: {}
-		};
-
-		if (!oConfig.aggregations.hasOwnProperty(sAggregationName)) {
-			if (oControlMetadata.hasAggregation(sAggregationName)) {
-				oConfig.aggregations[sAggregationName] = {};
-			} else {
-				throw new Error("The aggregation " + sAggregationName + " does not exist for" + oControl);
-			}
-		}
-
-		if (!oConfig.aggregations.hasOwnProperty(sPropertyInfoKey)) {
-			oConfig.aggregations[sAggregationName][sPropertyInfoKey] = {};
-		}
+				if (vValue !== null) {
+					oConfig.aggregations[sAggregationName][sPropertyInfoKey][sAffectedProperty] = vValue;
+				} else {
+					delete oConfig.aggregations[sAggregationName][sPropertyInfoKey][sAffectedProperty];
 
-        if (vValue !== null) {
-            oConfig.aggregations[sAggregationName][sPropertyInfoKey][sAffectedProperty] = vValue;
-        } else {
-            delete oConfig.aggregations[sAggregationName][sPropertyInfoKey][sAffectedProperty];
+					//Delete empty property name object
+					if (Object.keys(oConfig.aggregations[sAggregationName][sPropertyInfoKey]).length === 0) {
+						delete oConfig.aggregations[sAggregationName][sPropertyInfoKey];
 
-            //Delete empty property name object
-            if (Object.keys(oConfig.aggregations[sAggregationName][sPropertyInfoKey]).length === 0) {
-                delete oConfig.aggregations[sAggregationName][sPropertyInfoKey];
+						//Delete empty aggregation name object
+						if (Object.keys(oConfig.aggregations[sAggregationName]).length === 0) {
+							delete oConfig.aggregations[sAggregationName];
+						}
+					}
+				}
 
-                //Delete empty aggregation name object
-                if (Object.keys(oConfig.aggregations[sAggregationName]).length === 0) {
-                    delete oConfig.aggregations[sAggregationName];
-                }
-            }
-        }
+				var oAppComponent = mPropertyBag ? mPropertyBag.appComponent : undefined;
 
-		var oAppComponent = mPropertyBag ? mPropertyBag.appComponent : undefined;
-
-		if (!oXConfig) {
-			oModifier.createAndAddCustomData(oControl, "xConfig", oConfig, oAppComponent);
-		} else {
-			oModifier.setProperty(oXConfig, "value", oConfig);
-		}
-
-		return oConfig;
+				if (!oXConfig) {
+					return Promise.resolve()
+						.then(oModifier.createAndAddCustomData.bind(oModifier, oControl, "xConfig", oConfig, oAppComponent))
+						.then(function() {
+							return oConfig;
+						});
+				} else {
+					oModifier.setProperty(oXConfig, "value", oConfig);
+					return oConfig;
+				}
+			});
 	};
 
 	/**
@@ -158,16 +180,73 @@ sap.ui.define([
 	 * @param {object} [oModificationPayload] An object providing a modification handler specific payload
 	 * @param {object} [oModificationPayload.propertyBag] Optional propertybag for different modification handler derivations
 	 *
-	 * @returns {object} The adapted xConfig object
+	 * @returns {Promise<object>|object} A promise resolving to the adapted xConfig object or the object directly
 	 */
 	ModificationHandler.prototype.readConfig = function(oControl, oModificationPayload) {
-        var oConfig, oAggregationConfig;
-		var oModifier = oModificationPayload && oModificationPayload.propertyBag ? oModificationPayload.propertyBag .modifier : JsControlTreeModifier;
-		oAggregationConfig = oModifier.getAggregation(oControl, "customData").find(function(oCustomData){
-			return oModifier.getProperty(oCustomData, "key") == "xConfig";
+		var oConfig, oAggregationConfig;
+
+		if (oModificationPayload) {
+			var oModifier = oModificationPayload.propertyBag ? oModificationPayload.propertyBag.modifier : JsControlTreeModifier;
+			return Promise.resolve()
+				.then(oModifier.getAggregation.bind(oModifier, 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";
+							});
+					});
+				})
+				.then(function(oAggregationConfig) {
+					if (oAggregationConfig) {
+						return Promise.resolve()
+							.then(oModifier.getProperty.bind(oModifier, oAggregationConfig, "value"))
+							.then(function(oValue) {
+								return merge({}, oValue);
+							});
+					}
+					return null;
+				});
+		}
+
+		// These functions are used instead of the modifier to avoid that the
+		// entire call stack is changed to async when it's not needed
+		var fnGetAggregationSync = function(oParent, sAggregationName) {
+			var fnFindAggregation = function(oControl, sAggregationName) {
+				if (oControl) {
+					if (oControl.getMetadata) {
+						var oMetadata = oControl.getMetadata();
+						var oAggregations = oMetadata.getAllAggregations();
+						if (oAggregations) {
+							return oAggregations[sAggregationName];
+						}
+					}
+				}
+				return undefined;
+			};
+
+			var oAggregation = fnFindAggregation(oParent, sAggregationName);
+			if (oAggregation) {
+				return oParent[oAggregation._sGetter]();
+			}
+			return undefined;
+		};
+
+		var fnGetPropertySync = function(oControl, sPropertyName) {
+			var oMetadata = oControl.getMetadata().getPropertyLikeSetting(sPropertyName);
+			if (oMetadata) {
+				var sPropertyGetter = oMetadata._sGetter;
+				return oControl[sPropertyGetter]();
+			}
+			return undefined;
+		};
+
+		oAggregationConfig = fnGetAggregationSync(oControl, "customData").find(function(oCustomData){
+			return fnGetPropertySync(oCustomData, "key") == "xConfig";
 		});
-		oConfig = oAggregationConfig ? merge({}, oModifier.getProperty(oAggregationConfig, "value")) : null;
-        return oConfig;
+		oConfig = oAggregationConfig ? merge({}, fnGetPropertySync(oAggregationConfig, "value")) : null;
+		return oConfig;
 	};
 
 	ModificationHandler.getInstance = function() {

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

@@ -37,7 +37,7 @@ sap.ui.define([
 				 * Determines whether the reordering of items should be enabled
 				 */
 				enableReorder: {
-					type: "Boolean",
+					type: "boolean",
 					defaultValue: true
 				},
 				/**
@@ -78,10 +78,10 @@ sap.ui.define([
 				 */
 				change: {
 					reason: {
-						type: "String"
+						type: "string"
 					},
 					item: {
-						type: "Object"
+						type: "object"
 					}
 				}
 			}
@@ -109,7 +109,7 @@ sap.ui.define([
 		this._oListControl = this._createInnerListControl();
 
 		// disable 'select all'
-		this._oListControl.bPreventMassSelection = true;
+		this._oListControl.setMultiSelectMode("ClearAll");
 
 		this._setInnerLayout();
 	};
@@ -330,7 +330,7 @@ sap.ui.define([
 	BasePanel.prototype._getListControlConfig = function() {
 		return {
 			mode:"MultiSelect",
-			rememberSelections: false,
+			rememberSelections: true,
 			itemPress: [this._onItemPressed, this],
 			selectionChange: [this._onSelectionChange, this],
 			sticky: ["HeaderToolbar", "ColumnHeaders", "InfoToolbar"],

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

@@ -17,7 +17,7 @@ sap.ui.define([
      * @extends sap.ui.mdc.p13n.panels.QueryPanel
      *
      * @author SAP SE
-     * @version 1.92.0
+     * @version 1.93.3
      *
      * @private
      * @ui5-restricted sap.ui.mdc

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

@@ -145,6 +145,14 @@ sap.ui.define([
 	GroupView.prototype._createGroupListTemplate = function() {
 		var oList = new List({
 			keyboardMode: ListKeyboardMode.Navigation,
+			updateStarted: function() {
+				this._removeFactoryControl();
+			}.bind(this),
+			updateFinished: function(oEvt) {
+				if (this.getShowFactory() && this._aInitializedLists.indexOf(oEvt.getSource().getId()) > -1) {
+					this._addFactoryControl(oEvt.getSource());
+				}
+			}.bind(this),
 			selectionChange: function(oBindingInfo) {
 				var sPath = oBindingInfo.getParameter("listItem").getBindingContext(this.P13N_MODEL).sPath;
 				var oItem = this.getP13nModel().getProperty(sPath);
@@ -338,8 +346,6 @@ sap.ui.define([
 			return;
 		}
 
-		var aInitializedGroups = this._removeFactoryControl();
-
 		this._oListControl.getItems().forEach(function(oOuterItem){
 			var oPanel = oOuterItem.getContent()[0];
 			var oInnerList = oPanel.getContent()[0];
@@ -349,9 +355,6 @@ sap.ui.define([
 				this._togglePanelVisibility(oPanel);
 			}
 
-			if (this.getShowFactory() && aInitializedGroups.indexOf(oInnerList.getId()) > -1) {
-				this._addFactoryControl(oInnerList);
-			}
 		}.bind(this));
 
 		this._aCurrentFilters = aFilter;
@@ -415,7 +418,7 @@ sap.ui.define([
 			){
 				this._bInitialized = true;
 				var oFirstList = this._oListControl.getItems()[0].getContent()[0].getContent()[0];
-				this._addFactoryControl(oFirstList);
+				this._addFactoryControl(oFirstList); //TODO: remove this call
 				this._addInitializedList(oFirstList);
 			}
 	};