@openui5/sap.ui.mdc 1.98.0 → 1.101.0

package/src/sap/ui/mdc/ValueHelpDelegate.js

@@ -10,23 +10,28 @@
 
 sap.ui.define([
 	"sap/ui/mdc/BaseDelegate",
-	"sap/ui/model/FilterType"
+	"sap/ui/model/FilterType",
+	"sap/ui/mdc/enum/ConditionValidated"
 ], function(
 	BaseDelegate,
-	FilterType
+	FilterType,
+	ConditionValidated
 ) {
 	"use strict";
 
 	/**
-	 * @class Delegate class for {@link sap.ui.mdc.ValueHelp ValueHelp}.<br>
+	 * Delegate for {@link sap.ui.mdc.ValueHelp ValueHelp}.<br>
 	 * <b>Note:</b> The class is experimental and the API/behavior is not finalized and hence this should not be used for productive usage.
 	 *
+	 * @namespace
 	 * @author SAP SE
 	 * @private
-	 * @ui5-restricted sap.ui.mdc.ValueHelp
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
 	 * @experimental As of version 1.95
 	 * @since 1.95.0
-	 * @alias sap.ui.mdc.ValueHelpDelegate
+	 * @extends module:sap/ui/mdc/BaseDelegate
+	 * @alias module:sap/ui/mdc/ValueHelpDelegate
 	 */
 	var ValueHelpDelegate = Object.assign({}, BaseDelegate);
 
@@ -41,12 +46,14 @@ sap.ui.define([
 	 *
 	 * @param {object} oPayload Payload for delegate
 	 * @param {sap.ui.mdc.valuehelp.base.Container} oContainer Container instance
+	 * @param {string} sContentId id of the content shown after this call to retrieveContent
+	 *
 	 * @returns {Promise} Promise that is resolved if all content is available
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
 	 */
-	ValueHelpDelegate.retrieveContent = function (oPayload, oContainer) {
+	ValueHelpDelegate.retrieveContent = function (oPayload, oContainer, sContentId) {
 		return Promise.resolve();
 	};
 
@@ -54,12 +61,13 @@ sap.ui.define([
 	 * Checks if a <code>ListBinding</code> supports $Search.
 	 *
 	 * @param {object} oPayload Payload for delegate
+	 * @param {sap.ui.mdc.valuehelp.base.Content} oContent Content element
 	 * @param {sap.ui.model.ListBinding} oListBinding ListBinding
 	 * @returns {boolean} true if $search is supported
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
 	 */
-	ValueHelpDelegate.isSearchSupported = function(oPayload, oListBinding) {
+	ValueHelpDelegate.isSearchSupported = function(oPayload, oContent, oListBinding) {
 		return false;
 	};
 
@@ -163,5 +171,144 @@ sap.ui.define([
 		return false;
 	};
 
+	//  InOut =====
+
+	/**
+	 * Callback invoked everytime a {@link sap.ui.mdc.ValueHelp ValueHelp} fires a select event or the vlaue of the corresponding field changes
+	 * This callback may be used to update external fields.
+	 *
+	 * @param {object} oPayload Payload for delegate
+  	 * @param {sap.ui.mdc.ValueHelp} oValueHelp <code>ValueHelp</code> control instance receiving the <code>controlChange</code>
+	 * @param {sap.ui.mdc.enum.PropagationReason} sReason Reason why the method was invoked
+ 	 * @param {object} oConfig current configuration provided by the calling control
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.101.0
+	 */
+	ValueHelpDelegate.onConditionPropagation = function (oPayload, oValueHelp, sReason, oConfig) {
+
+	};
+
+	/**
+	 * Provides an initial condition configuration everytime a value help content is shown.
+	 *
+	 * @param {object} oPayload Payload for delegate
+ 	 * @param {sap.ui.mdc.ValueHelp} oContent ValueHelp content requesting conditions configuration
+	 * @param {sap.ui.core.Control} oControl Instance of the calling control
+	 * @returns {Promise<object>|object} Returns a map of conditions suitable for a sap.ui.mdc.FilterBar control
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.101.0
+	 */
+	ValueHelpDelegate.getInitialFilterConditions = function (oPayload, oContent, oControl) {
+
+		var oConditions = {};
+		return oConditions;
+
+	};
+
+	/**
+	 * Provides the possibility to customize selections in 'Select from list' scenarios.
+	 * By default, only condition keys are considered. This may be extended with payload dependent filters.
+	 *
+	 * @param {object} oPayload Payload for delegate
+ 	 * @param {sap.ui.mdc.valuehelp.base.FilterableListContent} oContent <code>ValueHelp</code> content instance
+	 * @param {sap.ui.core.Element} oItem Entry of a given list
+	 * @param {sap.ui.mdc.condition.ConditionObject[]} aConditions current conditions
+	 * @returns {boolean} True, if item is selected
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.101.0
+	 */
+	ValueHelpDelegate.isFilterableListItemSelected = function (oPayload, oContent, oItem, aConditions) {
+		var sModelName = oContent._getListBindingInfo().model;
+		var oContext = oItem && oItem.getBindingContext(sModelName);
+		var oItemData = oContent._getItemFromContext(oContext);
+
+		for (var i = 0; i < aConditions.length; i++) {
+			var oCondition = aConditions[i];
+			if (oCondition.validated === ConditionValidated.Validated && oItemData.key === oCondition.values[0]) { // TODO: check for specific EQ operator
+				return true;
+			}
+		}
+
+		return false;
+	};
+
+	/**
+	 * Provides the possibility to customize selection events in 'Select from list' scenarios.
+	 * This enables an application to reuse conditions in collective search scenarios, instead of always creating new ones.
+	 *
+	 * @param {object} oPayload Payload for delegate
+ 	 * @param {sap.ui.mdc.valuehelp.base.FilterableListContent} oContent <code>ValueHelp</code> content instance
+	 * @param {object} oChange Selection event configuration
+	 * @param {sap.ui.mdc.enum.SelectType} oChange.type Type of the selection change (add, remove)
+	 * @param {object[]} oChange.conditions Array of changed conditions with structure {@link sap.ui.mdc.condition.ConditionObject ConditionObject}
+	 * @returns {object} oRestult Selection event configuration object
+	 * @returns {sap.ui.mdc.enum.SelectType} oRestult.type Type of the selection change (add, remove)
+	 * @returns {object[]} oRestult.conditions Array of changed conditions with structure {@link sap.ui.mdc.condition.ConditionObject ConditionObject}
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.101.0
+	 */
+	ValueHelpDelegate.modifySelectionBehaviour = function (oPayload, oContent, oChange) {
+		return oChange;
+	};
+
+	/**
+	 * Provides the possibility to convey custom data in conditions.
+	 * This enables an application to enhance conditions with data relevant for combined key or outparameter scenarios.
+	 *
+	 * @param {object} oPayload Payload for delegate
+	 * @param {sap.ui.mdc.valuehelp.base.FilterableListContent} oContent <code>ValueHelp</code> content instance
+	 * @param {any[]} aValues key, description pair for the condition which is to be created.
+	 * @param {sap.ui.model.Context} [oContext] optional additional context
+	 * @returns {undefined|object} Optionally returns a serializeable object to be stored in the condition payload field.
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.101.0
+	 */
+	ValueHelpDelegate.createConditionPayload = function (oPayload, oContent, aValues, oContext) {
+		return undefined;
+	};
+
+	/**
+	 * Provides type information for listcontent filtering
+	 *
+	 * @param {object} oPayload Payload for delegate
+	 * @param {sap.ui.mdc.valuehelp.base.FilterableListContent} oContent <code>ValueHelp</code> content instance
+	 * @param {object} oConditions set of conditions to create filters for
+	 * @returns {object} Returns a type map for property paths
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.101.0
+	 */
+	ValueHelpDelegate.getTypesForConditions = function (oPayload, oContent, oConditions) {	// TODO: MDC.Table add UI.Table support
+		var oConditionTypes = {};
+		var oListBindingInfo = oContent && oContent._getListBindingInfo();
+
+		if (oListBindingInfo && oListBindingInfo.template) {
+			oListBindingInfo.template.mAggregations.cells.forEach(function (oCell) {
+				Object.values(oCell.mBindingInfos).forEach(function (oBindingInfo) {
+					oBindingInfo.parts.forEach(function (oPartInfo) {
+						oConditionTypes[oPartInfo.path] = {type: oPartInfo.type || null};
+					});
+				});
+			}, {});
+		}
+
+		return oConditionTypes;
+	};
+
+	/* ValueHelpDelegate.getCount = function (oPayload, oContent, aConditions, sGroup) {
+		return 0;
+	}; */
+
 	return ValueHelpDelegate;
 });

package/src/sap/ui/mdc/actiontoolbar/ActionToolbarAction.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @class The action for an {@link sap.ui.mdc.ActionToolbar ActionToolbar}) control
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @since 1.58
@@ -93,7 +93,7 @@ sap.ui.define([
 
     /**
      *
-     * @returns {String} a text defining the label of this <code>ActionToolbarAction</code> defined by the inner action.
+     * @returns {string} a text defining the label of this <code>ActionToolbarAction</code> defined by the inner action.
      */
     ActionToolbarAction.prototype.getLabel = function() {
         var oAction = this.getAction();

package/src/sap/ui/mdc/actiontoolbar/ActionToolbarActionRenderer.js

@@ -19,7 +19,7 @@ sap.ui.define([], function() {
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} rm the RenderManager that can be used for writing to the Render-Output-Buffer
-	 * @param {sap.ui.mdc.Form} oForm an object representation of the control that should be rendered
+	 * @param {sap.ui.mdc.actiontoolbar.ActionToolbarAction} oActionToolbarAction an object representation of the control that should be rendered
 	 */
     ActionToolbarActionRenderer.render = function(rm, oActionToolbarAction) {
         var mAriaProps = { role: "form" };

package/src/sap/ui/mdc/chart/ChartSelectionDetails.js

@@ -33,7 +33,7 @@ sap.ui.define([
          * @class The ChartSelectionDetails control creates a sap.m.SelectionDetails popover based on metadata and the configuration specified.
          * @extends sap.m.SelectionDetails
          * @author SAP SE
-         * @version 1.98.0
+         * @version 1.101.0
          * @constructor
          * @experimental As of version ...
          * @private

package/src/sap/ui/mdc/chart/ChartToolbar.js

@@ -15,7 +15,8 @@ sap.ui.define([
         "sap/ui/mdc/library",
         "sap/ui/mdc/chart/ChartTypeButton",
         "sap/ui/mdc/chart/ChartSettings",
-        "./ChartSelectionDetails"
+        "./ChartSelectionDetails",
+        "sap/m/ToolbarSeparator"
     ],
     function (
         Core,
@@ -28,22 +29,22 @@ sap.ui.define([
         MDCLib,
         ChartTypeButton,
         ChartSettings,
-        ChartSelectionDetails
+        ChartSelectionDetails,
+        ToolbarSeparator
     ) {
         "use strict";
 
         /**
-         /**
          * Constructor for a new ChartToolbar.
          *
          * @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 The ChartToolbar control creates a sap.m.OverflowToolbar based on metadata and the configuration specified.
-         * @extends sap.m.OverflowToolbar
+         * @class The ChartToolbar control is a sap.m.OverflowToolbar based on metadata and the configuration specified.
+         * @extends sap.ui.mdc.ActionToolbar
          * @author SAP SE
-         * @version 1.98.0
+         * @version 1.101.0
          * @constructor
-         * @experimental As of version ...
+         * @experimental As of version 1.88
          * @private
          * @since 1.88
          * @alias sap.ui.mdc.chart.ChartToolbar
@@ -76,7 +77,8 @@ sap.ui.define([
         };
 
         ChartToolbar.prototype.createToolbarContent = function (oMDCChart) {
-            this.setEnabled(false);
+            //Keep track of chart buttons to enable them later on
+            this._chartInternalButtonsToEnable = [];
 
             /**add beginning**/
             var title = new Title(oMDCChart.getId() + "-title", {
@@ -84,6 +86,11 @@ sap.ui.define([
             });
             this.addBegin(title);
 
+            /** variant management */
+            if (oMDCChart.getVariant()){
+                this.addVariantManagement(oMDCChart.getVariant());
+            }
+
             /**add end **/
             this._oChartSelectionDetails = new ChartSelectionDetails(oMDCChart.getId() + "-selectionDetails", {});
             this._oChartSelectionDetails.attachBeforeOpen(function (oEvent) {
@@ -100,11 +107,13 @@ sap.ui.define([
                     icon: "sap-icon://drill-down",
                     tooltip: MDCRb.getText("chart.CHART_DRILLDOWN_TITLE"),
 					text: MDCRb.getText("chart.CHART_DRILLDOWN_TITLE"),
+                    enabled: false,
                     press: function (oEvent) {
                         oMDCChart._showDrillDown(this._oDrillDownBtn);
                     }.bind(this)
                 });
                 this.addEnd(this._oDrillDownBtn);
+                this._chartInternalButtonsToEnable.push(this._oDrillDownBtn);
             }
 
             if (!oMDCChart.getIgnoreToolbarActions().length || oMDCChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.Legend) < 0) {
@@ -113,10 +122,11 @@ sap.ui.define([
                     text: MDCRb.getText("chart.LEGENDBTN_TEXT"),
                     tooltip: MDCRb.getText("chart.LEGENDBTN_TOOLTIP"),
                     icon: "sap-icon://legend",
-                    pressed: "{$mdcChart>/legendVisible}"
-
+                    pressed: "{$mdcChart>/legendVisible}",
+                    enabled: false
                 });
                 this.addEnd(this._oLegendBtn);
+                this._chartInternalButtonsToEnable.push(this._oLegendBtn);
             }
 
             if (!oMDCChart.getIgnoreToolbarActions().length || oMDCChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.ZoomInOut)) {
@@ -124,6 +134,7 @@ sap.ui.define([
                     icon: "sap-icon://zoom-in",
                     tooltip: MDCRb.getText("chart.TOOLBAR_ZOOM_IN"),
                     text: MDCRb.getText("chart.TOOLBAR_ZOOM_IN"),
+                    enabled: false,
                     press: function onZoomOutButtonPressed(oControlEvent) {
                         oMDCChart.zoomIn();
                         this.toggleZoomButtons(oMDCChart);
@@ -134,6 +145,7 @@ sap.ui.define([
                     icon: "sap-icon://zoom-out",
                     tooltip: MDCRb.getText("chart.TOOLBAR_ZOOM_OUT"),
                     text: MDCRb.getText("chart.TOOLBAR_ZOOM_OUT"),
+                    enabled: false,
                     press: function onZoomOutButtonPressed(oControlEvent) {
                         oMDCChart.zoomOut();
                         this.toggleZoomButtons(oMDCChart);
@@ -141,6 +153,7 @@ sap.ui.define([
                 });
                 this.addEnd(this.oZoomInButton);
                 this.addEnd(this.oZoomOutButton);
+                //Enabled via toggleZoomButtons()
             }
 
             if (aP13nMode.indexOf("Sort") > -1 || aP13nMode.indexOf("Item") > -1) {
@@ -148,16 +161,43 @@ sap.ui.define([
                     icon: "sap-icon://action-settings",//TODO the right icon for P13n chart dialog
                     tooltip: MDCRb.getText('chart.PERSONALIZATION_DIALOG_TITLE'),
 					text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_TITLE'),
+                    enabled: false,
                     press: function (oEvent) {
-                        oMDCChart.getEngine().uimanager.show(oMDCChart, oMDCChart.getP13nMode());
+                        var aP13nMode = oMDCChart.getP13nMode();
+                        aP13nMode.pop("Type");
+
+                        //TODO: Move this to p13n functionality?
+                        if (oMDCChart.isPropertyHelperFinal()){
+                            oMDCChart.getEngine().uimanager.show(oMDCChart, aP13nMode);
+                        } else {
+                            oMDCChart.finalizePropertyHelper().then(function(){
+                                oMDCChart.getEngine().uimanager.show(oMDCChart, aP13nMode);
+                            });
+                        }
                     }
                 });
                 this.addEnd(this._oSettingsBtn);
+                this._chartInternalButtonsToEnable.push(this._oSettingsBtn);
             }
 
             if (oMDCChart._getTypeBtnActive()) {
                 this._oChartTypeBtn = new ChartTypeButton(oMDCChart);
+                this._oChartTypeBtn.setEnabled(false);
                 this.addEnd(this._oChartTypeBtn);
+                this._chartInternalButtonsToEnable.push(this._oChartTypeBtn);
+            }
+
+        };
+
+        ChartToolbar.prototype.addVariantManagement = function(oVariantManagement) {
+
+            if (oVariantManagement){
+                if (this._oVariantManagement) {
+                    this.removeBetween(this._oVariantManagement);
+                }
+
+                this._oVariantManagement = oVariantManagement;
+                this.addBetween(this._oVariantManagement);
             }
 
         };
@@ -180,6 +220,11 @@ sap.ui.define([
 
             if (!this._toolbarInitialUpdated) {
                 this.setEnabled(true);
+
+                this._chartInternalButtonsToEnable.forEach(function(oBtn){
+                    oBtn.setEnabled(true);
+                });
+
                 this._toolbarInitialUpdated = true;
             }
 

package/src/sap/ui/mdc/chart/ChartTypeButton.js

@@ -4,10 +4,13 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/m/OverflowToolbarButton", "sap/m/ButtonRenderer", "sap/ui/base/ManagedObjectObserver", "sap/ui/core/library", "sap/m/PlacementType"
-], function(OverflowToolbarButton, ButtonRenderer, ManagedObjectObserver, CoreLibrary, PlacementType) {
+	"sap/m/OverflowToolbarButton", "sap/m/ButtonRenderer", "sap/ui/base/ManagedObjectObserver", "sap/ui/core/library", "sap/m/library"
+], function(OverflowToolbarButton, ButtonRenderer, ManagedObjectObserver, CoreLibrary, mobileLibrary) {
 	"use strict";
 
+	// shortcut for sap.m.PlacementType
+	var PlacementType = mobileLibrary.PlacementType;
+
 	var HasPopup = CoreLibrary.aria.HasPopup;
 	var ResponsivePopover, List, Bar, SearchField, StandardListItem, InvisibleText, Device, oRb;
 
@@ -134,11 +137,14 @@ sap.ui.define([
 		}
 
 		this.oReadyPromise.then(function() {
-			this.oPopover = this._createPopover(oButton, oMDCChart);
-			this.oPopover.attachAfterClose(function(){
-				this.oPopover.destroy();
-			}.bind(this));
-			return this.oPopover.openBy(oButton);
+			if (!this.oPopover){
+				this.oPopover = this._createPopover(oButton, oMDCChart);
+				this.oPopover.attachAfterClose(function(){
+					this.oPopover.destroy();
+					delete this.oPopover;
+				}.bind(this));
+				return this.oPopover.openBy(oButton);
+			}
 		}.bind(this));
 	};
 
@@ -176,12 +182,21 @@ sap.ui.define([
 								sap.ui.require([
 									"sap/ui/mdc/p13n/FlexUtil", "sap/ui/mdc/flexibility/Chart.flexibility"
 								], function(FlexUtil,ChartFlex) {
-									var aChanges = [];
+									//var aChanges = [];
+
+									oMDCChart.getEngine().createChanges({
+										control: oMDCChart,
+										key: "Type",
+										state: {
+											type: oObj.key
+										}
+									});
+									/*
 									aChanges.push(ChartFlex["setChartType"].changeHandler.createChange({
 										control: oMDCChart,
 										chartType: oObj.key
 									}));
-									FlexUtil.handleChanges(aChanges);
+									FlexUtil.handleChanges(aChanges);*/
 								});
 							}
 						}
@@ -291,5 +306,4 @@ sap.ui.define([
 	};
 
 	return ChartTypeButton;
-
 });

package/src/sap/ui/mdc/chart/DrillBreadcrumbs.js

@@ -26,13 +26,15 @@ sap.ui.define([
 
     DrillBreadcrumbs.prototype.init = function(){
         Breadcrumbs.prototype.init.apply(this, arguments);
+
+        this.addStyleClass("sapUiMDCChartBreadcrumbs");
     };
 
 
     /**
-	 * Updates the breadcrumps shown on the MDC Chart
+	 * Updates the breadcrumbs shown on the MDC Chart
 	 *
-	 * @param {sap.ui.mdc.Chart} oChart the MDC Chart to update the breadcrumps on
+	 * @param {sap.ui.mdc.Chart} oMDCChart the MDC Chart to update the breadcrumbs on
 	 * @param {*} oDrillableItems the drillable items
 	 *
 	 * @experimental
@@ -54,7 +56,7 @@ sap.ui.define([
                 oDrillableItems.forEach(function(dim, index, array) {
 
                     // show breadcrumbs
-                    //If Breadcrumps were set invisible for no drill stack, they need to be set visible again
+                    //If Breadcrumbs were set invisible for no drill stack, they need to be set visible again
                     this.setVisible(true);
 
                     // use the last entry of each drill-stack entry to built
@@ -121,11 +123,11 @@ sap.ui.define([
 	};
 
     /**
-	 * Creates a breadcrump with given settings
-	 * @param oChart the chart the breadcrump is for
-	 * @param oCrumbSettings settings for the breadcrump
+	 * Creates a breadcrumb with given settings
+	 * @param oMDCChart the chart the breadcrumb is for
+	 * @param oCrumbSettings settings for the breadcrumb
 	 *
-	 * @returns the created breadcrump
+	 * @returns {sap.m.Link} the created breadcrumb
 	 *
 	 * @experimental
 	 * @private

package/src/sap/ui/mdc/chart/DrillStackHandler.js

@@ -53,7 +53,7 @@ sap.ui.define([
 
 	/**
 	 * Handles all drill-stack operations on a mdc.Chart instance
-	 * inlcuding drill-downs, drill-ups and updating of depending controls
+	 * including drill-downs, drill-ups and updating of depending controls
 	 * @constructor
 	 */
 	var DrillStackHandler = function() {
@@ -62,7 +62,7 @@ sap.ui.define([
 
 	/**
 	 * Creates a drill down popover
-	 * @param oChart
+	 * @param oMDCChart
 	 * @returns the popover object
 	 *
 	 * @private
@@ -90,7 +90,7 @@ sap.ui.define([
 						control: oMDCChart,
 						key: "Item",
 						state: [{
-							name: oListItem.data("dim").name,
+							name: oListItem.data("dim").dim.name,
 							position: oMDCChart.getItems().length
 						}]
 					});
@@ -135,8 +135,8 @@ sap.ui.define([
 
 	/**
 	 * Shows the drill-down popover on the toolbar button of an mdc.Chart instance
-	 * @param {sap.ui.mdc.Chart} oChart
-     * @param {sap.m.Button}
+	 * @param {sap.ui.mdc.Chart} oMDCChart
+     * @param {sap.m.Button} oDrillBtn
 	 *
 	 * @experimental
 	 * @private
@@ -181,7 +181,7 @@ sap.ui.define([
 					type: ListType.Active
 				});
 
-				oListItem.data("dim", oDimension);
+				oListItem.data("dim", {dim: oDimension});
 
 				/*sTooltip = this._getFieldTooltip(oDimension.name);
 				if (sTooltip) {

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/condition/Condition.js

@@ -23,13 +23,12 @@ sap.ui.define([
 		 */
 
 		/**
-		 *
 		 * Utilities to create conditions to be used in {@link sap.ui.mdc.FilterField FilterField},
 		 * {@link sap.ui.mdc.FilterBar FilterBar} or {@link sap.ui.mdc.condition.ConditionModel ConditionModel}
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.101.0
 		 * @since 1.61.0
 		 * @alias sap.ui.mdc.condition.Condition
 		 *
@@ -53,6 +52,7 @@ sap.ui.define([
 				 * @property {object} [outParameters] Out parameters of the condition. For each field path, a value is stored
 				 * @property {boolean} [isEmpty] If set, the condition is empty (used as dummy condition in {@link sap.ui.mdc.field.DefineConditionPanel DefineConditionPanel})
 				 * @property {sap.ui.mdc.enum.ConditionValidated} validated If set to <code>ConditionValidated.Validated</code>, the condition is validated (by the field help) and not shown in the {@link sap.ui.mdc.field.DefineConditionPanel DefineConditionPanel} control
+				 * @property {object} [payload] Payload of the condition. Set by application. Data needs to be stringified. (as stored and loaded in variants)
 				 * @private
 				 * @ui5-restricted sap.fe
 				 * @MDC_PUBLIC_CANDIDATE
@@ -66,15 +66,16 @@ sap.ui.define([
 				 *
 				 * @param {string} sKey Operator for the condition
 				 * @param {string} sDescription Description of the operator
-				 * @param {object} oInParameters In parameters of the condition
-				 * @param {object} oOutParameters Out parameters of the condition
+				 * @param {object} [oInParameters] In parameters of the condition
+				 * @param {object} [oOutParameters] Out parameters of the condition
+				 * @param {object} [oPayload] Payload of the condition
 				 * @returns {sap.ui.mdc.condition.ConditionObject} The new condition object with the EQ operator along with <code>sKey</code> and <code>sDescription</code> as <code>aValues</code>
 				 * @private
 				 * @ui5-restricted sap.fe
 				 * @MDC_PUBLIC_CANDIDATE
 				 *
 				 */
-				createItemCondition: function(sKey, sDescription, oInParameters, oOutParameters) {
+				createItemCondition: function(sKey, sDescription, oInParameters, oOutParameters, oPayload) {
 					var sValidated = ConditionValidated.NotValidated;
 					var aValues = [sKey, sDescription];
 					if (sDescription === null || sDescription === undefined) {
@@ -82,7 +83,7 @@ sap.ui.define([
 					} else {
 						sValidated = ConditionValidated.Validated; // if there is a description set it is validated (even if empty string)
 					}
-					return this.createCondition("EQ", aValues, oInParameters, oOutParameters, sValidated);
+					return this.createCondition("EQ", aValues, oInParameters, oOutParameters, sValidated, oPayload);
 				},
 
 				/**
@@ -90,16 +91,17 @@ sap.ui.define([
 				 *
 				 * @param {string} sOperator Operator for the condition
 				 * @param {any[]} aValues Array of values for the condition
-				 * @param {object} oInParameters In parameters of the condition
-				 * @param {object} oOutParameters Out parameters of the condition
+				 * @param {object} [oInParameters] In parameters of the condition
+				 * @param {object} [oOutParameters] Out parameters of the condition
 				 * @param {sap.ui.mdc.enum.ConditionValidated} sValidated If set to <code>ConditionValidated.Validated</code>, the condition is validated (by the field help) and not shown in the <code>DefineConditionPanel</code> control
+				 * @param {object} [oPayload] Payload of the condition
 				 * @returns {sap.ui.mdc.condition.ConditionObject} The new condition object with the given operator and values
 				 * @private
 				 * @ui5-restricted sap.fe
 				 * @MDC_PUBLIC_CANDIDATE
 				 *
 				 */
-				createCondition: function(sOperator, aValues, oInParameters, oOutParameters, sValidated) {
+				createCondition: function(sOperator, aValues, oInParameters, oOutParameters, sValidated, oPayload) {
 					var oCondition = { operator: sOperator, values: aValues, isEmpty: null, validated: sValidated }; // use null as undefined is not recognized by filter
 					if (oInParameters) {
 						oCondition.inParameters = oInParameters;
@@ -107,6 +109,9 @@ sap.ui.define([
 					if (oOutParameters) {
 						oCondition.outParameters = oOutParameters;
 					}
+					if (oPayload) {
+						oCondition.payload = oPayload;
+					}
 					return oCondition;
 				},