@openui5/sap.ui.mdc 1.97.1 → 1.100.0

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

@@ -5,27 +5,34 @@
  */
 
 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/m/MessageStrip"
+    "sap/ui/mdc/p13n/panels/ChartItemPanel",
+    "sap/m/MessageStrip",
+    "../TypeUtil",
+    "../FilterBarDelegate",
+    "sap/ui/model/Filter",
+    "sap/ui/mdc/odata/v4/ChartPropertyHelper",
+    "sap/ui/thirdparty/jquery"
 ], function (
     V4ChartDelegate,
     loadModules,
     Core,
+    mobileLibrary,
     Text,
     MDCLib,
     ODataMetaModelUtil,
@@ -39,21 +46,28 @@ sap.ui.define([
     ManagedObjectObserver,
     ResizeHandler,
     ChartItemPanel,
-    MessageStrip
+    MessageStrip,
+    V4TypeUtil,
+    V4FilterBarDelegate,
+    Filter,
+    PropertyHelper,
+    jQuery
 ) {
     "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;
@@ -78,6 +92,44 @@ sap.ui.define([
         mStateMap.set(oMDCChart, oState);
     };
 
+    ChartDelegate.getTypeUtil = function() {
+        return V4TypeUtil;
+    };
+
+    ChartDelegate.getFilterDelegate = function() {
+        return V4FilterBarDelegate;
+    };
+
+	/**
+	 * This methods is called during the appliance of the add condition change.
+	 * This intention is to update the propertyInfo property.
+	 *
+	 * @param {string} sPropertyName The name of a property.
+	 * @param {sap.ui.mdc.Control} oControl - the instance of the mdc control
+	 * @param {Object} mPropertyBag Instance of property bag from Flex change API
+	 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+	 */
+    ChartDelegate.addCondition = function(sPropertyName, oControl, mPropertyBag) {
+		//return this.getFilterDelegate().addCondition(sPropertyName, oControl, mPropertyBag);
+        // will be activated, once mdc.Chart has the property propertyInfo.
+        return Promise.resolve();
+    };
+
+	/**
+	 * This methods is called during the appliance of the remove condition change.
+	 * This intention is to update the propertyInfo property.
+	 *
+	 * @param {string} sPropertyName The name of a property.
+	 * @param {sap.ui.mdc.Control} oControl - the instance of the mdc control
+	 * @param {Object} mPropertyBag Instance of property bag from Flex change API
+	 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+	 */
+    ChartDelegate.removeCondition = function(sPropertyName, oControl, mPropertyBag) {
+		//return this.getFilterDelegate().removeCondition(sPropertyName, oControl, mPropertyBag);
+        // will be activated, once mdc.Chart has the property propertyInfo.
+        return Promise.resolve();
+    };
+
     ChartDelegate._deleteState = function(oMDCChart) {
 
         if (this._getState(oMDCChart).vizTooltip) {
@@ -172,36 +224,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)){
@@ -225,7 +247,7 @@ sap.ui.define([
 
     /**
      * Gets the current zooming information for the inner chart
-     * @returns {integer} Current zoom level on the inner chart
+     * @returns {int} Current zoom level on the inner chart
      */
     ChartDelegate.getZoomState = function (oMDCChart) {
 
@@ -308,6 +330,10 @@ sap.ui.define([
 
     ChartDelegate.getAdaptionUI = function(oMDCChart) {
 
+        return Promise.resolve(this._setupAdaptionUI(oMDCChart));
+    };
+
+    ChartDelegate._setupAdaptionUI = function(oMDCChart) {
         var oLayoutConfig = this.getChartTypeLayoutConfig().find(function(it){return it.key === oMDCChart.getChartType();});
 
         //Default case -> everything allowed
@@ -334,13 +360,14 @@ sap.ui.define([
             oPanel.setMessageStrip(new MessageStrip({text: MDCRb.getText("chart.PERSONALIZATION_DIALOG_MEASURE_WARNING"), type:"Warning"}));
         }
 
-        return Promise.resolve(oPanel);
+        return 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 {sap.ui.mdc.Chart} oMDCChart Chart to the set the legend visibility on
+     * @param {boolean} bVisible true to show legend, false to hide
      *
      * @experimental
      * @private
@@ -363,7 +390,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) {
@@ -374,7 +401,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);
         }
 
     };
@@ -382,14 +409,16 @@ 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} oMDCChart the MDC Chart to insert the item into
+     * @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);
@@ -400,7 +429,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") {
@@ -415,24 +444,26 @@ sap.ui.define([
             this._updateColoring(oMDCChart, this._getChart(oMDCChart).getVisibleDimensions(), this._getChart(oMDCChart).getVisibleMeasures());
         }.bind(this));
 
-        this.fetchProperties(oMDCChartItem.getParent()).then(function (aProperties) {
-            this._updateSemanticalPattern(oMDCChart, aProperties);
-        }.bind(this));
+        this._updateSemanticalPattern(oMDCChart);
+
     };
 
     /**
      * 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} oMDCChart the MDC Chart to remove the item from
+     * @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);
@@ -450,9 +481,8 @@ sap.ui.define([
 
         //Update coloring and semantical patterns on Item change
         this._updateColoring(oMDCChart, this._getChart(oMDCChart).getVisibleDimensions(), this._getChart(oMDCChart).getVisibleMeasures());
-        this.fetchProperties(oMDCChartItem.getParent()).then(function (aProperties) {
-            this._updateSemanticalPattern(oMDCChart, aProperties);
-        }.bind(this));
+
+        this._updateSemanticalPattern(oMDCChart);
     };
 
     /**
@@ -460,34 +490,71 @@ 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) {
         if (oMDCChart.getModel) {
             return Promise.resolve(this._createMDCChartItem(sPropertyName, oMDCChart, sRole));
         }
-        return Promise.resolve(null);
     };
 
     ChartDelegate.removeItem = function (oProperty, oMDCChart) {
         return Promise.resolve(true);
     };
 
-    ChartDelegate._createMDCChartItem = function (sPropertyName, oMDCChart, sRole) {
-        return this.fetchProperties(oMDCChart).then(function (aProperties) {
-            var oPropertyInfo = aProperties.find(function (oCurrentPropertyInfo) {
-                return oCurrentPropertyInfo.name === sPropertyName;
+    /**
+     * This will iterate over all items of the MDC Chart to make sure all necessary information is available on them
+     * If something is missing, this method will update the item accordingly
+     * @param {sap.ui.mdc.Chart} oMDCChart the MDC Chart to check the items on
+     * @returns {Promise} resolves once check is complete
+     */
+    ChartDelegate.checkAndUpdateMDCItems = function(oMDCChart) {
+        return new Promise(function(resolve, reject){
+            var aPropPromises = [];
+
+            oMDCChart.getItems().forEach(function(oMDCItem){
+                var bIsComplete = oMDCItem.getName() && oMDCItem.getLabel() && oMDCItem.getType() && oMDCItem.getRole();
+
+                if (!bIsComplete) {
+                    aPropPromises.push(this._getPropertyInfosByName(oMDCItem.getName(), oMDCChart).then(function(oPropertyInfo){
+                        oMDCItem.setLabel(oPropertyInfo.label);
+
+                        if (oPropertyInfo.groupable) {
+                            oMDCItem.setType("groupable");
+                            oMDCItem.setRole(oMDCItem.getRole() ? oMDCItem.getRole() : "category");
+                        } else if (oPropertyInfo.aggregatable) {
+                            oMDCItem.setType("aggregatable");
+                            oMDCItem.setRole(oMDCItem.getRole() ? oMDCItem.getRole() : "axis1");
+                        }
+                    }));
+                }
+            }.bind(this));
+
+            Promise.all(aPropPromises).then(function(){
+                resolve();
             });
+        }.bind(this));
 
+    };
+
+    ChartDelegate._createMDCChartItem = function (sPropertyName, oMDCChart, sRole) {
+
+        return this._getPropertyInfosByName(sPropertyName, oMDCChart).then(function(oPropertyInfo){
             if (!oPropertyInfo) {
                 return null;
             }
 
+            return this._createMDCItemFromProperty(oPropertyInfo, oMDCChart.getId(), sRole);
+
+        }.bind(this));
+
+    };
+
+    ChartDelegate._createMDCItemFromProperty = function(oPropertyInfo, idPrefix, sRole) {
 
-            //TODO: Check for case: both aggegatable and groupable
             if (oPropertyInfo.groupable) {
-                return new MDCChartItem(oMDCChart.getId() + "--GroupableItem--" + oPropertyInfo.name, {
+                return new MDCChartItem(idPrefix + "--GroupableItem--" + oPropertyInfo.name, {
                     name: oPropertyInfo.name,
                     label: oPropertyInfo.label,
                     type: "groupable",
@@ -497,14 +564,15 @@ sap.ui.define([
 
             if (oPropertyInfo.aggregatable) {
 
-                return new MDCChartItem(oMDCChart.getId() + "--AggregatableItem--" + oPropertyInfo.name, {
+                return new MDCChartItem(idPrefix + "--AggregatableItem--" + oPropertyInfo.name, {
                     name: oPropertyInfo.name,
                     label: oPropertyInfo.label,
                     type: "aggregatable",
                     role: sRole ? sRole : "axis1"
                 });
             }
-        });
+
+            return null;
     };
 
     /**
@@ -520,10 +588,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();
@@ -540,117 +610,128 @@ 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
     };
 
     ChartDelegate._createContentFromItems = function (oMDCChart) {
-        //This is done so the user doesn't have to specify property path & aggregation method in the XML
-        this.fetchProperties(oMDCChart).then(function (aProperties) {
+        return new Promise(function(resolve, reject){
+            //This is done so the user doesn't have to specify property path & aggregation method in the XML
             var aColorPromises = [];
+            var aPropPromises = [];
 
             var aVisibleDimensions = [];
             var aVisibleMeasures = [];
             oMDCChart.getItems().forEach(function (oItem, iIndex) {
 
-                var oPropertyInfo = aProperties.find(function (oCurrentPropertyInfo) {
-                    return oCurrentPropertyInfo.name === oItem.getName();
-                });
+                //Uses excact mdc chart item id
+                aPropPromises.push(this._getPropertyInfosByName( oItem.getName(), oMDCChart).then(function(oPropertyInfo){
+                    //Skip a Item if there is no property representing the Item inside the backend
+                    if (!oPropertyInfo){
+                        Log.error("sap.ui.mdc.Chart: Item " + oItem.getName() + " has no property info representing it in the metadata. Make sure the name is correct and the metadata is defined correctly. Skipping the item!");
+                        return;
+                    }
 
-                //Skip a Item if there is no property representing the Item inside the backend
-                if (!oPropertyInfo){
-                    Log.error("sap.ui.mdc.Chart: Item " + oItem.getName() + " has no property info representing it in the metadata. Make sure the name is correct and the metadata is defined correctly. Skipping the item!");
-                    return;
-                }
+                    switch (oItem.getType()) {
+                        case "groupable":
+                            aVisibleDimensions.push(this.getInternalChartNameFromPropertyNameAndKind(oItem.getName(), "groupable", oMDCChart));
 
-                switch (oItem.getType()) {
-                    case "groupable":
-                        aVisibleDimensions.push(oItem.getName());
-                        this._addInnerDimension(oMDCChart, oItem, oPropertyInfo);
-                        break;
-                    case "aggregatable":
+                            this._addInnerDimension(oMDCChart, oItem, oPropertyInfo);
+                            break;
+                        case "aggregatable":
 
-                        //TODO: Alias might be changing after backend request
-                        aVisibleMeasures.push(this._getAggregatedMeasureNameForMDCItem(oItem));
+                            //TODO: Alias might be changing after backend request
+                            aVisibleMeasures.push(this._getAggregatedMeasureNameForMDCItem(oItem));
 
-                        this._addInnerMeasure(oMDCChart, oItem, oPropertyInfo);
-                        break;
+                            this._addInnerMeasure(oMDCChart, oItem, oPropertyInfo);
+                            break;
 
-                    default:
-                        Log.error("MDC Chart Item " + oItem.getId() + " with label " + oItem.getLabel() + " has no known type. Supported typed are: \"groupable\" & \"aggregatable\"");
-                }
+                        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));
+                }.bind(this)));
 
-                aColorPromises.push(this._prepareColoringForItem(oItem));
             }.bind(this));
 
-            this._getState(oMDCChart).aColMeasures.forEach(function(sKey) {
+            Promise.all(aPropPromises).then(function(){
+                this._getState(oMDCChart).aColMeasures.forEach(function(sKey) {
 
-                if (this._getState(oMDCChart).aInSettings.indexOf(sKey) == -1) {
+                    if (this._getState(oMDCChart).aInSettings.indexOf(sKey) == -1) {
 
-                    var oPropertyInfo = aProperties.find(function (oCurrentPropertyInfo) {
-                        return oCurrentPropertyInfo.name === sKey;
-                    });
+                        aColorPromises.push(new Promise(function(resolve, reject){
+                            oMDCChart._getPropertyByNameAsync(sKey).then(function(oPropertyInfo){
+                                var aggregationMethod = oPropertyInfo.aggregationMethod;
+                                var propertyPath = oPropertyInfo.propertyPath;
+                                var sName = this.getInternalChartNameFromPropertyNameAndKind(sKey, "aggregatable", oMDCChart);
 
-                    var aggregationMethod = oPropertyInfo.aggregationMethod;
-                    var propertyPath = oPropertyInfo.propertyPath;
+                                var oMeasureSettings = {
+                                    name: sName,
+                                    label: oPropertyInfo.label,
+                                    role: "axis1"
+                                };
 
-                    var oMeasureSettings = {
-                        name: sKey,
-                        label: oPropertyInfo.label,
-                        role: "axis1"
-                    };
+                                if (aggregationMethod && propertyPath) {
+                                    oMeasureSettings.analyticalInfo = {
+                                        propertyPath: propertyPath,
+                                        "with": aggregationMethod
+                                    };
+                                }
 
-                    if (aggregationMethod && propertyPath) {
-                        oMeasureSettings.analyticalInfo = {
-                            propertyPath: propertyPath,
-                            "with": aggregationMethod
-                        };
+                                var oMeasure = new Measure(oMeasureSettings);
+
+                                aVisibleMeasures.push(oMeasure);
+                                this._getChart(oMDCChart).addMeasure(oMeasure);
+                                resolve();
+                            }); //this.getPropertyFromNameAndKind not used as the key is the name of the MDC Chart Item
+
+                        }));
                     }
 
-                    var oMeasure = new Measure(oMeasureSettings);
+                }.bind(this));
 
-                    aVisibleMeasures.push(oMeasure);
-                    this._getChart(oMDCChart).addMeasure(oMeasure);
-                }
+                Promise.all(aColorPromises).then(function(){
+                    this._getChart(oMDCChart).setVisibleDimensions(aVisibleDimensions);
+                    this._getChart(oMDCChart).setVisibleMeasures(aVisibleMeasures);
 
-            }.bind(this));
+                    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) {
 
-            Promise.all(aColorPromises).then(function(){
-                this._getChart(oMDCChart).setVisibleDimensions(aVisibleDimensions);
-                this._getChart(oMDCChart).setVisibleMeasures(aVisibleMeasures);
+                        var aInResultPromises = [];
 
-                var aInResultDimensions = oMDCChart.getDelegate().inResultDimensions;
-                if (aInResultDimensions && aInResultDimensions instanceof Array && aInResultDimensions.length != 0) {
+                        aInResultDimensions.forEach(function(sInResultDim){
 
-                    var aInResultPromises = [];
+                            aInResultPromises.push(this._getPropertyInfosByName(sInResultDim, oMDCChart).then(function(oPropertyInfos){
+                                var sName = this.getInternalChartNameFromPropertyNameAndKind(oPropertyInfos.name, "groupable", oMDCChart);
 
-                    aInResultDimensions.forEach(function(sInResultDim){
+                                var oDim = new Dimension({
+                                    name: sName,
+                                    label: oPropertyInfos.label
+                                });
 
-                        aInResultPromises.push(this._getPropertyInfosByName(sInResultDim, oMDCChart).then(function(oPropertyInfos){
-                            var oDim = new Dimension({
-                                name: oPropertyInfos.name,
-                                label: oPropertyInfos.label
-                            });
+                                this._getState(oMDCChart).inResultDimensions.push(sName);
+                                this._getChart(oMDCChart).addDimension(oDim);
+                            }.bind(this)));
 
-                            this._getChart(oMDCChart).addDimension(oDim);
-                        }.bind(this)));
+                        }.bind(this));
 
-                    }.bind(this));
+                        Promise.all(aInResultPromises).then(function(){
+                            this._getChart(oMDCChart).setInResultDimensions(this._getState(oMDCChart).inResultDimensions);
+                        }.bind(this));
 
-                    Promise.all(aInResultPromises).then(function(){
-                        this._getChart(oMDCChart).setInResultDimensions(oMDCChart.getDelegate().inResultDimensions);
-                    }.bind(this));
+                    }
 
-                }
+                    this._updateColoring(oMDCChart, aVisibleDimensions, aVisibleMeasures);
+                    this._updateSemanticalPattern(oMDCChart);
 
-                this._updateColoring(oMDCChart, aVisibleDimensions, aVisibleMeasures);
-                this._updateSemanticalPattern(oMDCChart, aProperties);
+                    resolve();
+                }.bind(this));
             }.bind(this));
 
         }.bind(this));
-
     };
 
     ChartDelegate.getInnerChart = function (oMDCChart) {
@@ -665,6 +746,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++) {
 
@@ -702,6 +784,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)){
@@ -725,7 +808,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 : [];
@@ -734,7 +818,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());
@@ -749,7 +834,7 @@ sap.ui.define([
 
     /**
      * Updates the coloring on the inner chart
-     * @param {sap.chart.Chart} oChart inner chart
+     * @param {sap.chart.Chart} oMDCChart inner chart
      * @param {array} aVisibleDimensions visible dimensions for inner chart
      * @param {array} aVisibleMeasures visible measures for inner chart
      *
@@ -807,23 +892,20 @@ sap.ui.define([
     /**
      * Updates the semantical pattern for given measures
      *
-     * @param {sap.chart.Chart} oChart the inner chart
-     * @param {array} aVisibleMeasures array containing the visible measures on the inner chart
-     * @param {*} mDataPoints data points of the inner chart
+     * @param {sap.chart.Chart} oMDCChart the inner chart
+     * @param {*} aProperties // TODO what is this parameter used for?
      *
      * @experimental
      * @private
      * @ui5-restricted Fiori Elements, sap.ui.mdc
      */
-    ChartDelegate._updateSemanticalPattern = function (oMDCChart, aProperties) {
+    ChartDelegate._updateSemanticalPattern = function (oMDCChart) {
 
         var aVisibleMeasures = this._getChart(oMDCChart).getVisibleMeasures();
 
         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;
@@ -942,7 +1024,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;
     };
 
     /**
@@ -952,30 +1050,38 @@ sap.ui.define([
      */
     ChartDelegate.getSortedDimensions = function (oMDCChart) {
         return new Promise(function (resolve, reject) {
-            this.fetchProperties(oMDCChart).then(function (aProperties) {
 
-                var aDimensions = aProperties.filter(function (oItem) {
-                    return oItem.groupable; //Groupable means "Dimension" for sap.chart.Chart
-                });
+            if (oMDCChart.isPropertyHelperFinal()){
+                resolve(this._sortPropertyDimensions(oMDCChart.getPropertyHelper().getProperties()));
+            } else {
+                oMDCChart.finalizePropertyHelper().then(function(){
+                    resolve(this._sortPropertyDimensions(oMDCChart.getPropertyHelper().getProperties()));
+                }.bind(this));
+            }
+        }.bind(this));
+    };
 
-                if (aDimensions) {
-                    aDimensions.sort(function (a, b) {
-                        if (a.label && b.label) {
-                            return a.label.localeCompare(b.label);
-                        }
-                    });
-                }
+    ChartDelegate._sortPropertyDimensions = function(aProperties) {
+        var aDimensions = aProperties.filter(function (oItem) {
+            return oItem.groupable; //Groupable means "Dimension" for sap.chart.Chart
+        });
 
-                resolve(aDimensions);
+        if (aDimensions) {
+            aDimensions.sort(function (a, b) {
+                if (a.label && b.label) {
+                    return a.label.localeCompare(b.label);
+                }
             });
-        }.bind(this));
+        }
+
+        return aDimensions;
     };
 
     /**
      * 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
      *
      */
@@ -989,6 +1095,7 @@ sap.ui.define([
     /**
      * Sets the chart type of the inner chart
      * Is called by MDC Chart when <code>chartType</code> property is updated
+     * @param {sap.ui.mdc.Chart} oMDCChart the MDC Chart to set the chart type for
      * @param {string} sChartType the new chart type
      */
     ChartDelegate.setChartType = function (oMDCChart, sChartType) {
@@ -1000,50 +1107,60 @@ sap.ui.define([
      */
     ChartDelegate.createInnerChartContent = function (oMDCChart, fnCallbackDataLoaded) {
 
-        this._setChart(oMDCChart, new Chart({
-            id: oMDCChart.getId() + "--innerChart",
-            chartType: "column",
-            width: "100%",
-            isAnalytical: true//,
-        }));
+        return new Promise(function(resolve,reject){
+            this._setChart(oMDCChart, new Chart({
+                id: oMDCChart.getId() + "--innerChart",
+                chartType: "column",
+                width: "100%",
+                isAnalytical: true//,
+            }));
 
-        if (oMDCChart.getHeight()){
-            this._getChart(oMDCChart).setHeight(this._calculateInnerChartHeight(oMDCChart));
-        }
+            //Initialize empty; will get filled later on
+            this._getState(oMDCChart).inResultDimensions = [];
 
-        //Set height correctly again if chart changes
-        ResizeHandler.register(oMDCChart, function(){
-            this.adjustChartHeight(oMDCChart);
-        }.bind(this));
-
-        var oState = this._getState(oMDCChart);
-        oState.aColMeasures = [];
-        oState.aInSettings = [];
-        this._setState(oMDCChart, oState);
-
-        //Create initial content during pre-processing
-        this._createContentFromItems(oMDCChart);
-
-        //Since zoom information is not yet available for sap.chart.Chart after data load is complete, do it on renderComplete instead
-        //This is a workaround which is hopefully not needed in other chart libraries
-        this._getChart(oMDCChart).attachRenderComplete(function () {
-            if (this._getState(oMDCChart).toolbarUpdateRequested){
-                oMDCChart._updateToolbar();
-                this._getState(oMDCChart).toolbarUpdateRequested = false;
+            if (oMDCChart.getHeight()){
+                this._getChart(oMDCChart).setHeight(this._calculateInnerChartHeight(oMDCChart));
             }
-        }.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).addItem(this._getChart(oMDCChart));
+            //Set height correctly again if chart changes
+            ResizeHandler.register(oMDCChart, function(){
+                this.adjustChartHeight(oMDCChart);
+            }.bind(this));
+
+            var oState = this._getState(oMDCChart);
+            oState.aColMeasures = [];
+            oState.aInSettings = [];
+            this._setState(oMDCChart, oState);
+
+            //Create initial content during pre-processing
+            this._createContentFromItems(oMDCChart).then(function(){
+                //Since zoom information is not yet available for sap.chart.Chart after data load is complete, do it on renderComplete instead
+                //This is a workaround which is hopefully not needed in other chart libraries
+                this._getChart(oMDCChart).attachRenderComplete(function () {
+                    if (this._getState(oMDCChart).toolbarUpdateRequested){
+                        oMDCChart._updateToolbar();
+                        this._getState(oMDCChart).toolbarUpdateRequested = false;
+                    }
+                }.bind(this));
+
+                this._getInnerStructure(oMDCChart).removeAllItems();
+                this._getInnerStructure(oMDCChart).setJustifyContent(FlexJustifyContent.Start);
+                this._getInnerStructure(oMDCChart).setAlignItems(FlexAlignItems.Stretch);
+                this._getInnerStructure(oMDCChart).addItem(this._getChart(oMDCChart));
+
+                oState.dataLoadedCallback = fnCallbackDataLoaded;
+
+                this._setState(oMDCChart, oState);
+                var oBindingInfo = this._getBindingInfo(oMDCChart);
+                this.updateBindingInfo(oMDCChart, oBindingInfo); //Applies filters
+                this.rebind(oMDCChart, oBindingInfo);
+
+                resolve();
+            }.bind(this));
+
 
-        oState.dataLoadedCallback = fnCallbackDataLoaded;
+        }.bind(this));
 
-        this._setState(oMDCChart, oState);
-        var oBindingInfo = this._getBindingInfo(oMDCChart);
-        this.updateBindingInfo(oMDCChart, oBindingInfo); //Applies filters
-        this.rebindChart(oMDCChart, oBindingInfo);
     };
 
     ChartDelegate._calculateInnerChartHeight = function(oMDCChart) {
@@ -1075,7 +1192,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);
         }
     };
 
@@ -1087,30 +1207,18 @@ sap.ui.define([
         //TODO: Check for Hierachy and Time
         //TODO: Check for role annotation
 
-        this.fetchProperties(oMDCChartItem.getParent()).then(function (aProperties) {
-
-            var oPropertyInfo = aProperties.find(function (oCurrentPropertyInfo) {
-                return oCurrentPropertyInfo.name === oMDCChartItem.getName();
-            });
-
-            this._addInnerDimension(oMDCChart, oMDCChartItem, oPropertyInfo);
-
+        this._getPropertyInfosByName(oMDCChartItem.getName(), oMDCChart).then(function(oPropInfo){
+            this._addInnerDimension(oMDCChart, oMDCChartItem, oPropInfo);
         }.bind(this));
 
+
     };
 
     ChartDelegate.createInnerMeasure = function (oMDCChart, oMDCChartItem) {
 
-        this.fetchProperties(oMDCChartItem.getParent()).then(function (aProperties) {
-
-            var oPropertyInfo = aProperties.find(function (oCurrentPropertyInfo) {
-                return oCurrentPropertyInfo.name === oMDCChartItem.getName();
-            });
-
-            this._addInnerMeasure(oMDCChart, oMDCChartItem, oPropertyInfo);
-
+        this._getPropertyInfosByName(oMDCChartItem.getName(), oMDCChart).then(function(oPropInfo){
+            this._addInnerMeasure(oMDCChart, oMDCChartItem, oPropInfo);
         }.bind(this));
-
     };
 
     /**
@@ -1118,7 +1226,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()
         });
@@ -1126,7 +1234,7 @@ sap.ui.define([
         if (oPropertyInfo.textProperty){
             oDimension.setTextProperty(oPropertyInfo.textProperty);
             if (oPropertyInfo.textFormatter){
-                oDimension.setTextFormatter(oPropertyInfo.textFormatter);
+                oDimension.setTextFormatter(this._formatText.bind(oPropertyInfo));
             }
             oDimension.setDisplayText(true);
         }
@@ -1142,7 +1250,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"
         };
@@ -1166,10 +1274,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) {
+         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.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));
@@ -1205,7 +1324,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);
@@ -1224,89 +1343,104 @@ 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 returns the layout options for a specific type of Item (measure/dimension,groupable/aggregatable)
-     * It is used by p13n to determine which layout options to show in the p13n panel
-     * @param {string} sType the type for which the layout options are requested
+     * 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._getLayoutOptionsForType = function(sType){
-        var MDCRb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
-		var oAvailableRoles = {
-		    groupable: [
-				{
-					key: MDCLib.ChartItemRoleType.category,
-					text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_CATEGORY')
-				}, {
-					key: MDCLib.ChartItemRoleType.category2,
-					text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_CATEGORY2')
-				}, {
-					key: MDCLib.ChartItemRoleType.series,
-					text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_SERIES')
-				}
-			],
-			aggregatable: [
-				{
-					key: MDCLib.ChartItemRoleType.axis1,
-					text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_AXIS1')
-				}, {
-					key: MDCLib.ChartItemRoleType.axis2,
-					text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_AXIS2')
-				}, {
-					key: MDCLib.ChartItemRoleType.axis3,
-					text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_AXIS3')
-				}
-			]
-		};
-		return oAvailableRoles[sType];
+    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);
     };
 
+
     /**
      * Adds an item to the inner chart (measure/dimension)
      */
@@ -1331,7 +1465,8 @@ sap.ui.define([
 
     /**
      * Sets tooltips visible/invisible on inner chart
-     * @param {bool}  bFlag true for visible, false for invisible
+     * @param {sap.ui.mdc.Chart} oMDCChart the MDC Chart
+     * @param {boolean}  bFlag true for visible, false for invisible
      */
     ChartDelegate.setChartTooltipVisibility = function (oMDCChart, bFlag) {
 
@@ -1382,51 +1517,32 @@ 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
-     * @returns {Promise<sap.ui.mdc.table.V4AnalyticsPropertyHelper>} A promise that resolves with the property helper.
-     * @private
-     * @ui5-restricted sap.ui.mdc
+     * Returns the propertyHelper used for the chart delegate
+     * @returns {Promise} Promise with the property helper reference
      */
-    ChartDelegate.initPropertyHelper = function (oMDCChart) {
-        // 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")
-        ]).then(function (aResult) {
-            return Promise.all(aResult.concat(this.fetchPropertyExtensions(oMDCChart, aResult[0])));
-        }.bind(this)).then(function (aResult) {
-            var aProperties = aResult[0];
-            var PropertyHelper = aResult[1][0];
-            var mExtensions = aResult[2];
-            var iMatchingExtensions = 0;
-            var aPropertiesWithExtension = [];
-
-            for (var i = 0; i < aProperties.length; i++) {
-                aPropertiesWithExtension.push(Object.assign({}, aProperties[i], {
-                    extension: mExtensions[aProperties[i].name] || {}
-                }));
-
-                if (aProperties[i].name in mExtensions) {
-                    iMatchingExtensions++;
-                }
-            }
-
-            if (iMatchingExtensions !== Object.keys(mExtensions).length) {
-                throw new Error("At least one property extension does not point to an existing property");
-            }
+    ChartDelegate.getPropertyHelperClass = function () {
+        return PropertyHelper;
+    };
 
-            return new PropertyHelper(aPropertiesWithExtension, oMDCChart);
-        });
+    /**
+     * This allows formatting for axis labels of the inner sap.chart.Chart.
+     * Note: As the inner chart has no association to the propertyInfo, "this" will be bound to the propertyInfo object when calling this method
+     * @param {string} sKey the key of the dimension
+     * @param {string} SDesc the description provided by the metadata
+     * @returns {string} the label which should be shown on the chart axis
+     */
+    ChartDelegate._formatText = function(sKey, SDesc) {
+        return sKey;
     };
+
     /**
      * 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) {
+
         var oModel = this._getModel(oMDCChart);
         var pCreatePropertyInfos;
 
@@ -1436,10 +1552,10 @@ sap.ui.define([
                     resolver: resolve
                 }, onModelContextChange, this);
             }.bind(this)).then(function (oModel) {
-                return this._createPropertyInfos(oMDCChart, oModel);
+                return this._createPropertyInfos(oMDCChart.getDelegate().payload, oModel);
             }.bind(this));
         } else {
-            pCreatePropertyInfos = this._createPropertyInfos(oMDCChart, oModel);
+            pCreatePropertyInfos = this._createPropertyInfos(oMDCChart.getDelegate().payload, oModel);
         }
 
         return pCreatePropertyInfos.then(function (aProperties) {
@@ -1460,10 +1576,10 @@ sap.ui.define([
         }
     }
 
-    ChartDelegate._createPropertyInfos = function (oMDCChart, oModel) {
-        var oMetadataInfo = oMDCChart.getDelegate().payload;
+    ChartDelegate._createPropertyInfos = function (oDelegatePayload, oModel) {
+        //var oMetadataInfo = oMDCChart.getDelegate().payload;
         var aProperties = [];
-        var sEntitySetPath = "/" + oMetadataInfo.collectionName;
+        var sEntitySetPath = "/" + oDelegatePayload.collectionName;
         var oMetaModel = oModel.getMetaModel();
 
         return Promise.all([
@@ -1497,10 +1613,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,
@@ -1511,12 +1628,13 @@ sap.ui.define([
                             aggregatable: false,
                             maxConditions: ODataMetaModelUtil.isMultiValueFilterExpression(oFilterRestrictionsInfo.propertyInfo[sKey]) ? -1 : 1,
                             sortKey: sKey,
-                            kind:  "Groupable", //TODO: Rename in type; Only needed for P13n Item Panel
-                            availableRoles: this._getLayoutOptionsForType("groupable"), //for p13n
+                            dataType: oObj.$Type,
+                            //formatOptions: null,
+                            //constraints: {},
                             role: MDCLib.ChartItemRoleType.category, //standard, normally this should be interpreted from UI.Chart annotation
                             criticality: null ,//To be implemented by FE
                             textProperty: oPropertyAnnotations["@com.sap.vocabularies.Common.v1.Text"] ? oPropertyAnnotations["@com.sap.vocabularies.Common.v1.Text"].$Path  : null //To be implemented by FE
-                            //textFormatter: function(){} -> can be used to provide a custom formatter for the textProperty
+                            //textFormatter: string-> can be used to provide a custom formatter for the textProperty
                         });
                     }
                 }
@@ -1525,7 +1643,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"]){
@@ -1540,28 +1658,18 @@ sap.ui.define([
                     aggregatable: oPropertyAnnotations["@Org.OData.Aggregation.V1.Aggregatable"],
                     aggregationMethod: sAggregationMethod,
                     maxConditions: ODataMetaModelUtil.isMultiValueFilterExpression(oFilterRestrictionsInfo.propertyInfo[sKey]) ? -1 : 1,
-                    sortKey: oPropertyAnnotations["@Org.OData.Aggregation.V1.RecommendedAggregationMethod"] + sKey,
-                    kind: "Aggregatable",//Only needed for P13n Item Panel
-                    availableRoles: this._getLayoutOptionsForType("aggregatable"), //for p13n
-                    role: MDCLib.ChartItemRoleType.axis1,
+                    dataType: oObj.$Type,
                     datapoint: null //To be implemented by FE
                 });
-            }.bind(this));
+            });
         }
 
         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){
-                var oPropertyInfo = aProperties.find(function (oCurrentPropertyInfo) {
-                    return oCurrentPropertyInfo.name === sName;
-                });
-
-                resolve(oPropertyInfo);
-            });
-        }.bind(this));
+        return oMDCChart._getPropertyByNameAsync(sName);
     };