@openui5/sap.ui.mdc 1.96.5 → 1.99.0

package/src/sap/ui/mdc/odata/v4/vizChart/{ChartDelegateNew.js → ChartDelegate.js}

@@ -5,26 +5,32 @@
  */
 
 sap.ui.define([
-    "../ChartDelegateNew",
+    "../ChartDelegate",
     "../../../util/loadModules",
     "sap/ui/core/Core",
+    "sap/m/library",
     "sap/m/Text",
     "sap/ui/mdc/library",
     "sap/ui/mdc/odata/v4/ODataMetaModelUtil",
     "sap/base/Log",
     'sap/ui/mdc/util/FilterUtil',
     'sap/ui/mdc/odata/v4/util/DelegateUtil',
-    "sap/ui/mdc/chartNew/ChartTypeButtonNew",
-    "sap/ui/mdc/chartNew/ItemNew",
+    "sap/ui/mdc/chart/ChartTypeButton",
+    "sap/ui/mdc/chart/Item",
     "sap/ui/model/Sorter",
     "sap/m/VBox",
     "sap/ui/base/ManagedObjectObserver",
     "sap/ui/core/ResizeHandler",
-    "sap/ui/mdc/p13n/panels/ChartItemPanelNew"
+    "sap/ui/mdc/p13n/panels/ChartItemPanel",
+    "sap/m/MessageStrip",
+    "../TypeUtil",
+    "../FilterBarDelegate",
+    "sap/ui/model/Filter"
 ], function (
     V4ChartDelegate,
     loadModules,
     Core,
+    mobileLibrary,
     Text,
     MDCLib,
     ODataMetaModelUtil,
@@ -37,21 +43,27 @@ sap.ui.define([
     VBox,
     ManagedObjectObserver,
     ResizeHandler,
-    ChartItemPanel
+    ChartItemPanel,
+    MessageStrip,
+    V4TypeUtil,
+    V4FilterBarDelegate,
+    Filter
 ) {
     "use strict";
     /**
-     * Delegate class for sap.ui.mdc.ChartNew and ODataV4.
+     * Delegate class for sap.ui.mdc.Chart and ODataV4.
      * Enables additional analytical capabilities.
      * <b>Note:</b> The class is experimental and the API/behavior is not finalized.
      *
      * @author SAP SE
      * @private
      * @since 1.88
-     * @alias sap.ui.mdc.odata.v4.vizChart.ChartDelegateNew
+     * @alias sap.ui.mdc.odata.v4.vizChart.ChartDelegate
      */
     var ChartDelegate = Object.assign({}, V4ChartDelegate);
 
+	var FlexJustifyContent = mobileLibrary.FlexJustifyContent;
+	var FlexAlignItems = mobileLibrary.FlexAlignItems;
 
     var mStateMap = new window.WeakMap();
     //var ChartLibrary;
@@ -76,6 +88,14 @@ sap.ui.define([
         mStateMap.set(oMDCChart, oState);
     };
 
+    ChartDelegate.getTypeUtil = function() {
+        return V4TypeUtil;
+    };
+
+    ChartDelegate.getFilterDelegate = function() {
+        return V4FilterBarDelegate;
+    };
+
     ChartDelegate._deleteState = function(oMDCChart) {
 
         if (this._getState(oMDCChart).vizTooltip) {
@@ -170,36 +190,6 @@ sap.ui.define([
      * ...
      */
 
-    /**
-     * Provides the table's filter delegate that provides basic filter functionality such as adding filter fields.
-     * <b>Note:</b> The functionality provided in this delegate should act as a subset of a FilterBarDelegate
-     * to enable the table for inbuilt filtering.
-     *
-     * @example <caption>Example usage of <code>getFilterDelegate</code></caption>
-     * oFilterDelegate = {
-     * 		addItem: function() {
-     * 			var oFilterFieldPromise = new Promise(...);
-     * 			return oFilterFieldPromise;
-     * 		}
-     * }
-     * @returns {Object} Object for the chart filter personalization
-     * @public
-     */
-    ChartDelegate.getFilterDelegate = function () {
-        return {
-            /**
-             *
-             * @param {String} sPropertyName The property name
-             * @param {Object} oMDCChart Instance of the chart TODO: Which one? MDC or inner?
-             *
-             * @returns {Promise} Promise that resolves with an instance of a <code>sap.ui.mdc.FilterField</code>.
-             * For more information, see {@link sap.ui.mdc.AggregationBaseDelegate#addItem AggregationBaseDelegate}.
-             */
-            addItem: function (sPropertyName, oMDCChart) {
-                return Promise.resolve(null);
-            }
-        };
-    };
 
     ChartDelegate.exit = function(oMDCChart) {
         if (this._getInnerStructure(oMDCChart)){
@@ -325,13 +315,20 @@ sap.ui.define([
         //var aRolesAvailable = [MDCLib.ChartItemRoleType.axis1, MDCLib.ChartItemRoleType.axis2, MDCLib.ChartItemRoleType.axis3, MDCLib.ChartItemRoleType.category, MDCLib.ChartItemRoleType.category2, MDCLib.ChartItemRoleType.series];
         var oArguments = {panelConfig: oLayoutConfig};
 
-        return Promise.resolve(new ChartItemPanel(oArguments));
+        var oPanel = new ChartItemPanel(oArguments);
+
+        if (oMDCChart.getChartType() === "heatmap"){
+            var MDCRb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+            oPanel.setMessageStrip(new MessageStrip({text: MDCRb.getText("chart.PERSONALIZATION_DIALOG_MEASURE_WARNING"), type:"Warning"}));
+        }
+
+        return Promise.resolve(oPanel);
     };
 
     /**
      * Sets the visibility of the legend
      * This is called by the MDC Chart, do not call it directly!
-     * @param {bool} bVisible true to show legend, false to hide
+     * @param {boolean} bVisible true to show legend, false to hide
      *
      * @experimental
      * @private
@@ -354,7 +351,7 @@ sap.ui.define([
 
     /**
      * Creates a Sorter for given Property
-     * @param {sap.ui.mdc.ChartNew.ItemNew} oMDCItem the MDC Item to create a Sorter for
+     * @param {sap.ui.mdc.Chart.Item} oMDCItem the MDC Item to create a Sorter for
      * @param {object} oSortProperty the sorting information
      */
     ChartDelegate.getSorterForItem = function (oMDCItem, oSortProperty) {
@@ -365,7 +362,7 @@ sap.ui.define([
         if (oMDCItem.getType() === "aggregatable") {
             return new Sorter(this._getAggregatedMeasureNameForMDCItem(oMDCItem), oSortProperty.descending);
         } else if (oMDCItem.getType() === "groupable") {
-            return new Sorter(oSortProperty.name, oSortProperty.descending);
+            return new Sorter(this.getInternalChartNameFromPropertyNameAndKind(oSortProperty.name, "groupable", oMDCItem.getParent()), oSortProperty.descending);
         }
 
     };
@@ -373,14 +370,15 @@ sap.ui.define([
     /**
      * Inserts an MDC Chart Item (in case of sap.chart.Chart a Measure/Dimension) on the inner chart
      * This function is called by MDC Chart on a change of the <code>Items</code> aggregation
-     * @param {sap.ui.mdc.chartNew-ItemNew} oMDCChartItem the MDC CHart Item to insert into the inner chart
+     * @param {sap.ui.mdc.chart-Item} oMDCChartItem the MDC CHart Item to insert into the inner chart
      * @param {int} iIndex the index to insert into
      */
     ChartDelegate.insertItemToInnerChart = function (oMDCChart, oMDCChartItem, iIndex) {
         //TODO: Create Measures/Dimension only when required?
         if (oMDCChartItem.getType() === "groupable") {
 
-            var oDim = this._getChart(oMDCChart).getDimensionByName(oMDCChartItem.getName());
+            var sInnerDimName = this.getInternalChartNameFromPropertyNameAndKind(oMDCChartItem.getName(), "groupable", oMDCChart);
+            var oDim = this._getChart(oMDCChart).getDimensionByName(sInnerDimName);
 
             if (!oDim) {
                 this.createInnerDimension(oMDCChart, oMDCChartItem);
@@ -391,7 +389,7 @@ sap.ui.define([
             }
 
             var aVisibleDimension = this._getChart(oMDCChart).getVisibleDimensions();
-            aVisibleDimension.splice(iIndex, 0, oMDCChartItem.getName()); //Insert Item without deleting existing dimension
+            aVisibleDimension.splice(iIndex, 0, sInnerDimName); //Insert Item without deleting existing dimension
             this._getChart(oMDCChart).setVisibleDimensions(aVisibleDimension);
 
         } else if (oMDCChartItem.getType() === "aggregatable") {
@@ -414,16 +412,18 @@ sap.ui.define([
     /**
      * Removes an Item (in case of sap.chart.Chart a Measure/Dimension) from the inner chart
      * This function is called by MDC Chart on a change of the <code>Items</code> aggregation
-     * @param {sap.ui.mdc.chartNew.ItemNew} oMDCChartItem The Item to remove from the inner chart
+     * @param {sap.ui.mdc.chart.Item} oMDCChartItem The Item to remove from the inner chart
      */
     ChartDelegate.removeItemFromInnerChart = function (oMDCChart, oMDCChartItem) {
-        if (oMDCChartItem.getType() === "groupable" && this._getChart(oMDCChart).getVisibleDimensions().includes(oMDCChartItem.getName())) {
+        if (oMDCChartItem.getType() === "groupable" && this._getChart(oMDCChart).getVisibleDimensions().includes(this.getInternalChartNameFromPropertyNameAndKind(oMDCChartItem.getName(), "groupable", oMDCChart))) {
+            var sInnerDimName = this.getInternalChartNameFromPropertyNameAndKind(oMDCChartItem.getName(), "groupable", oMDCChart);
+
             var aNewVisibleDimensions = this._getChart(oMDCChart).getVisibleDimensions().filter(function (e) {
-                return e !== oMDCChartItem.getName();
+                return e !== sInnerDimName;
             });
 
-            if (oMDCChart.getDelegate().inResultDimensions && oMDCChart.getDelegate().inResultDimensions instanceof Array) {
-                this._getChart(oMDCChart).setInResultDimensions(oMDCChart.getDelegate().inResultDimensions);
+            if (this._getState(oMDCChart).inResultDimensions.length > 0) {
+                this._getChart(oMDCChart).setInResultDimensions(this._getState(oMDCChart).inResultDimensions);
             }
 
             this._getChart(oMDCChart).setVisibleDimensions(aNewVisibleDimensions);
@@ -451,7 +451,7 @@ sap.ui.define([
      * (Does NOT add the MDC CHart Item to the Item aggregation of the MDC Chart)
      * Called by p13n
      * @param {string} sPropertyName the name of the property added
-     * @param {sap.ui.mdc.ChartNew} oMDCChart reference to the MDC Chart to add the property to
+     * @param {sap.ui.mdc.Chart} oMDCChart reference to the MDC Chart to add the property to
      * @returns {Promise} Promise that resolves with new MDC Chart Item as parameter
      */
     ChartDelegate.addItem = function (sPropertyName, oMDCChart, mPropertyBag, sRole) {
@@ -467,6 +467,8 @@ sap.ui.define([
 
     ChartDelegate._createMDCChartItem = function (sPropertyName, oMDCChart, sRole) {
         return this.fetchProperties(oMDCChart).then(function (aProperties) {
+
+            //Uses excact MDC Chart Item id
             var oPropertyInfo = aProperties.find(function (oCurrentPropertyInfo) {
                 return oCurrentPropertyInfo.name === sPropertyName;
             });
@@ -511,10 +513,12 @@ sap.ui.define([
 
             this._loadChart().then(function (aModules) {
 
+                var sVBoxHeight = this._calculateInnerChartHeight(oMDCChart);
+
                 this._setInnerStructure(oMDCChart, new VBox({
                     justifyContent: "Center",
 				    alignItems: "Center",
-                    height: "100%",
+                    height: sVBoxHeight,
                     width: "100%"
                 }));
                 var oText = new Text();
@@ -531,7 +535,7 @@ sap.ui.define([
 
     /**
      * Creates initial content for the chart, while metadata has not been retrieved yet
-     * @param {sap.ui.mdc.chartNew} oMDCChart the MDC Chart
+     * @param {sap.ui.mdc.chart} oMDCChart the MDC Chart
      */
     ChartDelegate.createInitialChartContent = function(oMDCChart) {
         //Not relevant for sap.chart.Chart
@@ -546,6 +550,7 @@ sap.ui.define([
             var aVisibleMeasures = [];
             oMDCChart.getItems().forEach(function (oItem, iIndex) {
 
+                //Uses excact mdc chart item id
                 var oPropertyInfo = aProperties.find(function (oCurrentPropertyInfo) {
                     return oCurrentPropertyInfo.name === oItem.getName();
                 });
@@ -558,7 +563,8 @@ sap.ui.define([
 
                 switch (oItem.getType()) {
                     case "groupable":
-                        aVisibleDimensions.push(oItem.getName());
+                        aVisibleDimensions.push(this.getInternalChartNameFromPropertyNameAndKind(oItem.getName(), "groupable", oMDCChart));
+
                         this._addInnerDimension(oMDCChart, oItem, oPropertyInfo);
                         break;
                     case "aggregatable":
@@ -580,15 +586,14 @@ sap.ui.define([
 
                 if (this._getState(oMDCChart).aInSettings.indexOf(sKey) == -1) {
 
-                    var oPropertyInfo = aProperties.find(function (oCurrentPropertyInfo) {
-                        return oCurrentPropertyInfo.name === sKey;
-                    });
+                    var oPropertyInfo = oMDCChart.getPropertyHelper().getProperty(sKey); //this.getPropertyFromNameAndKind not used as the key is the name of the MDC Chart Item
 
                     var aggregationMethod = oPropertyInfo.aggregationMethod;
                     var propertyPath = oPropertyInfo.propertyPath;
+                    var sName = this.getInternalChartNameFromPropertyNameAndKind(sKey, "aggregatable", oMDCChart);
 
                     var oMeasureSettings = {
-                        name: sKey,
+                        name: sName,
                         label: oPropertyInfo.label,
                         role: "axis1"
                     };
@@ -612,7 +617,7 @@ sap.ui.define([
                 this._getChart(oMDCChart).setVisibleDimensions(aVisibleDimensions);
                 this._getChart(oMDCChart).setVisibleMeasures(aVisibleMeasures);
 
-                var aInResultDimensions = oMDCChart.getDelegate().inResultDimensions;
+                var aInResultDimensions = oMDCChart.getDelegate().inResultDimensions; //TODO: Does this use internal name? If so, change _getPropertyInfosByName  below; Most likely not the case
                 if (aInResultDimensions && aInResultDimensions instanceof Array && aInResultDimensions.length != 0) {
 
                     var aInResultPromises = [];
@@ -620,18 +625,21 @@ sap.ui.define([
                     aInResultDimensions.forEach(function(sInResultDim){
 
                         aInResultPromises.push(this._getPropertyInfosByName(sInResultDim, oMDCChart).then(function(oPropertyInfos){
+                            var sName = this.getInternalChartNameFromPropertyNameAndKind(oPropertyInfos.name, "groupable", oMDCChart);
+
                             var oDim = new Dimension({
-                                name: oPropertyInfos.name,
+                                name: sName,
                                 label: oPropertyInfos.label
                             });
 
+                            this._getState(oMDCChart).inResultDimensions.push(sName);
                             this._getChart(oMDCChart).addDimension(oDim);
                         }.bind(this)));
 
                     }.bind(this));
 
                     Promise.all(aInResultPromises).then(function(){
-                        this._getChart(oMDCChart).setInResultDimensions(oMDCChart.getDelegate().inResultDimensions);
+                        this._getChart(oMDCChart).setInResultDimensions(this._getState(oMDCChart).inResultDimensions);
                     }.bind(this));
 
                 }
@@ -656,6 +664,7 @@ sap.ui.define([
 
             if (oItem.getType === "aggregatable") {
 
+                //Uses excact MDC CHart Item name
                 this._getPropertyInfosByName(oItem.getName(), oItem.getParent()).then(function (oPropertyInfo) {
                     for (var j = 0; j < this._getAdditionalColoringMeasuresForItem(oPropertyInfo); j++) {
 
@@ -693,6 +702,7 @@ sap.ui.define([
      */
     ChartDelegate._addCriticality = function (oItem) {
 
+        //Uses excact MDC Chart item name to idenfiy property
         return this._getPropertyInfosByName(oItem.getName(), oItem.getParent()).then(function (oPropertyInfo) {
 
             if (oPropertyInfo.criticality || (oPropertyInfo.datapoint && oPropertyInfo.datapoint.criticality)){
@@ -716,7 +726,8 @@ sap.ui.define([
                         };
                     }
 
-                    oColorings.Criticality.DimensionValues[oItem.getName()] = mChartCrit;
+                    var sDimName = this.getInternalChartNameFromPropertyNameAndKind(oItem.getName(), "groupable", oItem.getParent());
+                    oColorings.Criticality.DimensionValues[sDimName] = mChartCrit;
 
                 } else {
                     var mCrit = oPropertyInfo.datapoint  && oPropertyInfo.datapoint.criticality ? oPropertyInfo.datapoint.criticality : [];
@@ -725,7 +736,8 @@ sap.ui.define([
                         mChartCrit[sKey] = mCrit[sKey];
                     }
 
-                    oColorings.Criticality.MeasureValues[oItem.getName()] = mChartCrit;
+                    var sMeasureName = this.getInternalChartNameFromPropertyNameAndKind(oItem.getName(), "aggregatable", oItem.getParent());
+                    oColorings.Criticality.MeasureValues[sMeasureName] = mChartCrit;
                 }
 
                 var oState = this._getState(oItem.getParent());
@@ -812,9 +824,7 @@ sap.ui.define([
 
         aVisibleMeasures.forEach(function(sVisibleMeasureName){
             //first draft only with semantic pattern
-            var oPropertyInfo = aProperties.find(function (oCurrentPropertyInfo) {
-                return oCurrentPropertyInfo.name === sVisibleMeasureName;
-            });
+            var oPropertyInfo = this.getPropertyFromNameAndKind(sVisibleMeasureName, "aggregatable", oMDCChart);
 
             if (!oPropertyInfo){
                 return;
@@ -933,7 +943,23 @@ sap.ui.define([
      */
     ChartDelegate.getDrillStack = function (oMDCChart) {
         //TODO: Generify the return values here for other chart frameworks
-        return this._getChart(oMDCChart).getDrillStack();
+        var aDrillStack = [];
+        aDrillStack = Object.assign(aDrillStack, this._getChart(oMDCChart).getDrillStack());
+
+        aDrillStack.forEach(function(oStackEntry) {
+			// loop over nested dimension arrays -> give them the correct name for filtering
+			oStackEntry.dimension = oStackEntry.dimension.map(function(sDimension) {
+                var oProp = this.getPropertyFromNameAndKind(sDimension, "groupable", oMDCChart);
+                if (oProp) {
+                    return oProp.name;
+                } else {
+                    Log.error("MDC Chart Delegate: Couldn't map chart dimension to groupable property: " + sDimension);
+                    return sDimension;
+                }
+			}.bind(this));
+		}.bind(this));
+
+        return aDrillStack;
     };
 
     /**
@@ -966,7 +992,7 @@ sap.ui.define([
      * Determines which MDC Items are Drillable and returns them
      * Used by breadcrumbs
      *
-     * @param {sap.ui.mdc.ChartNew} oMDCChart the MDC Chart to get the Items from
+     * @param {sap.ui.mdc.Chart} oMDCChart the MDC Chart to get the Items from
      * @returns {array} Array of MDC Items which are drillable
      *
      */
@@ -998,6 +1024,9 @@ sap.ui.define([
             isAnalytical: true//,
         }));
 
+        //Initialize empty; will get filled later on
+        this._getState(oMDCChart).inResultDimensions = [];
+
         if (oMDCChart.getHeight()){
             this._getChart(oMDCChart).setHeight(this._calculateInnerChartHeight(oMDCChart));
         }
@@ -1025,8 +1054,8 @@ sap.ui.define([
         }.bind(this));
 
         this._getInnerStructure(oMDCChart).removeAllItems();
-        this._getInnerStructure(oMDCChart).setJustifyContent(sap.m.FlexJustifyContent.Start);
-        this._getInnerStructure(oMDCChart).setAlignItems(sap.m.FlexAlignItems.Stretch);
+        this._getInnerStructure(oMDCChart).setJustifyContent(FlexJustifyContent.Start);
+        this._getInnerStructure(oMDCChart).setAlignItems(FlexAlignItems.Stretch);
         this._getInnerStructure(oMDCChart).addItem(this._getChart(oMDCChart));
 
         oState.dataLoadedCallback = fnCallbackDataLoaded;
@@ -1034,7 +1063,7 @@ sap.ui.define([
         this._setState(oMDCChart, oState);
         var oBindingInfo = this._getBindingInfo(oMDCChart);
         this.updateBindingInfo(oMDCChart, oBindingInfo); //Applies filters
-        this.rebindChart(oMDCChart, oBindingInfo);
+        this.rebind(oMDCChart, oBindingInfo);
     };
 
     ChartDelegate._calculateInnerChartHeight = function(oMDCChart) {
@@ -1066,7 +1095,10 @@ sap.ui.define([
      */
     ChartDelegate.adjustChartHeight = function(oMDCChart){
         if (oMDCChart.getHeight() && this._getChart(oMDCChart)){
-            this._getChart(oMDCChart).setHeight(this._calculateInnerChartHeight(oMDCChart));
+            var sHeight = this._calculateInnerChartHeight(oMDCChart);
+
+            this._getInnerStructure(oMDCChart).setHeight(sHeight);
+            this._getChart(oMDCChart).setHeight(sHeight);
         }
     };
 
@@ -1080,6 +1112,7 @@ sap.ui.define([
 
         this.fetchProperties(oMDCChartItem.getParent()).then(function (aProperties) {
 
+            //Uses MDC Chart Item ID to identify preoperty, not internal chart id
             var oPropertyInfo = aProperties.find(function (oCurrentPropertyInfo) {
                 return oCurrentPropertyInfo.name === oMDCChartItem.getName();
             });
@@ -1094,6 +1127,7 @@ sap.ui.define([
 
         this.fetchProperties(oMDCChartItem.getParent()).then(function (aProperties) {
 
+            //Uses MDC Chart Item ID to identify preoperty, not internal chart id
             var oPropertyInfo = aProperties.find(function (oCurrentPropertyInfo) {
                 return oCurrentPropertyInfo.name === oMDCChartItem.getName();
             });
@@ -1109,7 +1143,7 @@ sap.ui.define([
      */
     ChartDelegate._addInnerDimension = function(oMDCChart, oMDCChartItem, oPropertyInfo) {
         var oDimension = new Dimension({
-            name: oMDCChartItem.getName(),
+            name: this.getInternalChartNameFromPropertyNameAndKind(oMDCChartItem.getName(), "groupable", oMDCChart),
             role: oMDCChartItem.getRole() ? oMDCChartItem.getRole() : "category",
             label: oMDCChartItem.getLabel()
         });
@@ -1133,7 +1167,7 @@ sap.ui.define([
         var propertyPath = oPropertyInfo.propertyPath;
 
         var oMeasureSettings = {
-            name: this._getAggregatedMeasureNameForMDCItem(oMDCChartItem),//"average" + oItem.getName(),
+            name: this._getAggregatedMeasureNameForMDCItem(oMDCChartItem),//aggregationMethod + oItem.getName() under normal circumstances
             label: oMDCChartItem.getLabel(),
             role: oMDCChartItem.getRole() ? oMDCChartItem.getRole() : "axis1"
         };
@@ -1157,10 +1191,21 @@ sap.ui.define([
     /**
      * Checks the binding of the table and rebinds it if required.
      *
-     * @param {sap.ui.mdc.ChartNew} oMDCChart The MDC chart instance
+     * @param {sap.ui.mdc.Chart} oMDCChart The MDC chart instance
+     * @param {object} oBindingInfo The bindingInfo of the chart
+     * @deprecated as of 1.98; use rebind instead
+     */
+         ChartDelegate.rebindChart = function (oMDCChart, oBindingInfo) {
+            this.rebind(oMDCChart, oBindingInfo);
+        };
+
+    /**
+     * Checks the binding of the table and rebinds it if required.
+     *
+     * @param {sap.ui.mdc.Chart} oMDCChart The MDC chart instance
      * @param {object} oBindingInfo The bindingInfo of the chart
      */
-    ChartDelegate.rebindChart = function (oMDCChart, oBindingInfo) {
+    ChartDelegate.rebind = function (oMDCChart, oBindingInfo) {
         if (oMDCChart && oBindingInfo && this._getChart(oMDCChart)) {
             //TODO: bindData sap.chart.Chart specific and therefore needs to be changed to a general API.
             this._addBindingListener(oBindingInfo, "dataReceived", this._getState(oMDCChart).dataLoadedCallback.bind(oMDCChart));
@@ -1196,7 +1241,7 @@ sap.ui.define([
 
     /**
      * Returns whether the inner chart is currently bound
-     * @returns {bool} true if inner chart is bound; false if not
+     * @returns {boolean} true if inner chart is bound; false if not
      */
     ChartDelegate.getInnerChartBound = function (oMDCChart) {
         var oState = this._getState(oMDCChart);
@@ -1215,51 +1260,101 @@ sap.ui.define([
      * @param {Object} oBindingInfo The binding info of the chart
      */
     ChartDelegate.updateBindingInfo = function (oMDCChart, oBindingInfo) {
-        var oFilter = Core.byId(oMDCChart.getFilter());
-        if (oFilter) {
-            var mConditions = oFilter.getConditions();
+        var aFilters = createInnerFilters.call(this, oMDCChart).concat(createOuterFilters.call(this, oMDCChart));
+        addSearchParameter(oMDCChart, oBindingInfo);
+		oBindingInfo.filters = new Filter(aFilters, true);
+    };
 
-            if (mConditions) {
+    function createInnerFilters(oChart) {
+		var bFilterEnabled = oChart.getP13nMode().indexOf("Filter") > -1;
+		var aFilters = [];
 
-                if (!oBindingInfo) {
-                    oBindingInfo = {};
-                }
+		if (bFilterEnabled) {
+			var aChartProperties = oChart.getPropertyHelper().getProperties();
+			var oInnerFilterInfo = FilterUtil.getFilterInfo(this.getTypeUtil(), oChart.getConditions(), aChartProperties);
 
-                var aPropertiesMetadata = oFilter.getPropertyInfoSet ? oFilter.getPropertyInfoSet() : null;
-                var aParameterNames = DelegateUtil.getParameterNames(oFilter);
-                var oFilterInfo = FilterUtil.getFilterInfo(ChartDelegate.getTypeUtil(), mConditions, aPropertiesMetadata, aParameterNames);
-                if (oFilterInfo) {
-                    oBindingInfo.filters = oFilterInfo.filters;
-                }
+			if (oInnerFilterInfo.filters) {
+				aFilters.push(oInnerFilterInfo.filters);
+			}
+		}
 
-                var sParameterPath = DelegateUtil.getParametersInfo(oFilter);
-                if (sParameterPath) {
-                    oBindingInfo.path = sParameterPath;
-                }
-            }
+		return aFilters;
+	}
 
-            // get the basic search
-            var sSearchText = oFilter.getSearch instanceof Function ? oFilter.getSearch() :  "";
-            if (sSearchText) {
+	function createOuterFilters(oChart) {
+		var oFilter = Core.byId(oChart.getFilter());
+		var aFilters = [];
 
-                if (!oBindingInfo) {
-                    oBindingInfo = {};
-                }
+		if (!oFilter) {
+			return aFilters;
+		}
 
-                if (!oBindingInfo.parameters) {
-                    oBindingInfo.parameters = {};
-                }
-                // add basic search parameter as expected by v4.ODataListBinding
-                oBindingInfo.parameters.$search = sSearchText;
-            } else if (oBindingInfo.parameters && oBindingInfo.parameters.$search) {
-                delete oBindingInfo.parameters.$search;
-            }
+		var mConditions = oFilter.getConditions();
+
+		if (mConditions) {
+			var aPropertiesMetadata = oFilter.getPropertyInfoSet ? oFilter.getPropertyInfoSet() : null;
+			var aParameterNames = DelegateUtil.getParameterNames(oFilter);
+			var oOuterFilterInfo = FilterUtil.getFilterInfo(this.getTypeUtil(), mConditions, aPropertiesMetadata, aParameterNames);
+
+			if (oOuterFilterInfo.filters) {
+				aFilters.push(oOuterFilterInfo.filters);
+			}
+		}
+
+		return aFilters;
+	}
 
+	function addSearchParameter(oChart, oBindingInfo) {
+		var oFilter = Core.byId(oChart.getFilter());
+		if (!oFilter) {
+			return;
+		}
+
+		var mConditions = oFilter.getConditions();
+		// get the basic search
+		var sSearchText = oFilter.getSearch instanceof Function ? oFilter.getSearch() :  "";
+
+		if (mConditions) {
+			var sParameterPath = DelegateUtil.getParametersInfo(oFilter, mConditions);
+			if (sParameterPath) {
+				oBindingInfo.path = sParameterPath;
+			}
+		}
+
+        if (!oBindingInfo.parameters) {
+            oBindingInfo.parameters = {};
         }
-    };
+
+		oBindingInfo.parameters["$search"] = sSearchText || undefined;
+	}
 
     ChartDelegate._getAggregatedMeasureNameForMDCItem = function(oMDCItem){
-        return oMDCItem.getName();
+        return this.getInternalChartNameFromPropertyNameAndKind(oMDCItem.getName(), "aggregatable", oMDCItem.getParent());
+    };
+
+    /**
+     * This function returns an id which should be used in the internal chart for the measure/dimension
+     * In the standard case, this is just the id of the property.
+     * If it is necessary to use another id internally inside the chart (e.g. on duplicate property ids) this method can be overwritten.
+     * In this case, <code>getPropertyFromNameAndKind</code> needs to be overwritten aswell.
+     * @param {string} sName ID of the property
+     * @param {string} sKind Kind of the Property (Measure/Dimension)
+     * @param {sap.ui.mdc.Chart} oMDCChart reference to the MDC Chart
+     * @returns {string} internal id for the sap.chart.Chart
+     */
+    ChartDelegate.getInternalChartNameFromPropertyNameAndKind = function(sName, sKind, oMDCChart) {
+        return sName;
+    };
+
+    /**
+     * This maps an id of an internal chart dimension/measure & kind of a property to its coresponding property entry.
+     * @param {string} sName the id of internal chart measure/dimension
+     * @param {string} sKind the kind of the property
+     * @param {sap.ui.mdc.Chart} oMDCChart reference to the MDC Chart
+     * @returns {object} the property object
+     */
+    ChartDelegate.getPropertyFromNameAndKind = function(sName, sKind, oMDCChart) {
+        return oMDCChart.getPropertyHelper().getProperty(sName);
     };
 
     /**
@@ -1322,7 +1417,7 @@ sap.ui.define([
 
     /**
      * Sets tooltips visible/invisible on inner chart
-     * @param {bool}  bFlag true for visible, false for invisible
+     * @param {boolean}  bFlag true for visible, false for invisible
      */
     ChartDelegate.setChartTooltipVisibility = function (oMDCChart, bFlag) {
 
@@ -1375,7 +1470,7 @@ sap.ui.define([
     /**
      * Initializes a new table property helper for V4 analytics with the property extensions merged into the property infos.
      *
-     * @param {sap.ui.mdc.ChartNew} oMDCChart reference to the MDC Chart
+     * @param {sap.ui.mdc.Chart} oMDCChart reference to the MDC Chart
      * @returns {Promise<sap.ui.mdc.table.V4AnalyticsPropertyHelper>} A promise that resolves with the property helper.
      * @private
      * @ui5-restricted sap.ui.mdc
@@ -1384,7 +1479,7 @@ sap.ui.define([
         // TODO: Do this in the DelegateMixin, or provide a function in the base delegate to merge properties and extensions
         return Promise.all([
             this.fetchProperties(oMDCChart),
-            loadModules("sap/ui/mdc/odata/v4/ChartPropertyHelperNew")
+            loadModules("sap/ui/mdc/odata/v4/ChartPropertyHelper")
         ]).then(function (aResult) {
             return Promise.all(aResult.concat(this.fetchPropertyExtensions(oMDCChart, aResult[0])));
         }.bind(this)).then(function (aResult) {
@@ -1414,7 +1509,7 @@ sap.ui.define([
     /**
      * Returns the relevant propery infos based on the metadata used with the MDC Chart instance.
      *
-     * @param {sap.ui.mdc.ChartNew} oMDCChart reference to the MDC Chart
+     * @param {sap.ui.mdc.Chart} oMDCChart reference to the MDC Chart
      * @returns {array} Array of the property infos to be used within MDC Chart
      */
     ChartDelegate.fetchProperties = function (oMDCChart) {
@@ -1488,10 +1583,11 @@ sap.ui.define([
                     }
 
                     if (oPropertyAnnotations["@Org.OData.Aggregation.V1.Aggregatable"]){
-                        aProperties = aProperties.concat(this._createPropertyInfosForAggregatable(sKey, oPropertyAnnotations, oFilterRestrictionsInfo, oSortRestrictionsInfo));
+                        aProperties = aProperties.concat(this._createPropertyInfosForAggregatable(sKey, oPropertyAnnotations, oObj, oFilterRestrictionsInfo, oSortRestrictionsInfo));
                     }
 
                     if (oPropertyAnnotations["@Org.OData.Aggregation.V1.Groupable"]) {
+
                         aProperties.push({
                             name: sKey,
                             propertyPath: sKey,
@@ -1502,6 +1598,7 @@ sap.ui.define([
                             aggregatable: false,
                             maxConditions: ODataMetaModelUtil.isMultiValueFilterExpression(oFilterRestrictionsInfo.propertyInfo[sKey]) ? -1 : 1,
                             sortKey: sKey,
+                            typeConfig: this.getTypeUtil().getTypeConfig(oObj.$Type, null, {}),
                             kind:  "Groupable", //TODO: Rename in type; Only needed for P13n Item Panel
                             availableRoles: this._getLayoutOptionsForType("groupable"), //for p13n
                             role: MDCLib.ChartItemRoleType.category, //standard, normally this should be interpreted from UI.Chart annotation
@@ -1516,7 +1613,7 @@ sap.ui.define([
         }.bind(this));
     };
 
-    ChartDelegate._createPropertyInfosForAggregatable = function(sKey, oPropertyAnnotations, oFilterRestrictionsInfo, oSortRestrictionsInfo) {
+    ChartDelegate._createPropertyInfosForAggregatable = function(sKey, oPropertyAnnotations, oObj, oFilterRestrictionsInfo, oSortRestrictionsInfo) {
         var aProperties = [];
 
         if (oPropertyAnnotations["@Org.OData.Aggregation.V1.SupportedAggregationMethods"]){
@@ -1532,6 +1629,7 @@ sap.ui.define([
                     aggregationMethod: sAggregationMethod,
                     maxConditions: ODataMetaModelUtil.isMultiValueFilterExpression(oFilterRestrictionsInfo.propertyInfo[sKey]) ? -1 : 1,
                     sortKey: oPropertyAnnotations["@Org.OData.Aggregation.V1.RecommendedAggregationMethod"] + sKey,
+                    typeConfig: this.getTypeUtil().getTypeConfig(oObj.$Type, null, {}),
                     kind: "Aggregatable",//Only needed for P13n Item Panel
                     availableRoles: this._getLayoutOptionsForType("aggregatable"), //for p13n
                     role: MDCLib.ChartItemRoleType.axis1,
@@ -1543,6 +1641,7 @@ sap.ui.define([
         return aProperties;
     };
 
+    //Gets internal property infos by excact property name
     ChartDelegate._getPropertyInfosByName = function(sName, oMDCChart){
         return new Promise(function(resolve){
             this.fetchProperties(oMDCChart).then(function(aProperties){