@openui5/sap.ui.mdc 1.113.0 → 1.115.0

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

@@ -25,7 +25,8 @@ sap.ui.define([
         "sap/ui/events/KeyCodes",
         "sap/ui/mdc/util/InfoBar",
         "sap/ui/core/format/ListFormat",
-        "sap/ui/mdc/enum/ProcessingStrategy"
+        "sap/ui/mdc/enums/ProcessingStrategy",
+        "sap/ui/mdc/enums/ChartP13nMode"
     ],
     function (
         Core,
@@ -48,7 +49,8 @@ sap.ui.define([
         KeyCodes,
         InfoBar,
         ListFormat,
-        ProcessingStrategy
+        ProcessingStrategy,
+        ChartP13nMode
     ) {
         "use strict";
 
@@ -61,19 +63,18 @@ sap.ui.define([
          * @param {string} [sId] ID for the new control, generated automatically if no id is given
          * @param {object} [mSettings] Initial settings for the new control
          *
-         * @class The Chart control creates a chart based on metadata and the configuration specified.
+         * @class The <code>Chart</code> control creates a chart based on metadata and the configuration specified.<br>
+         * <b>Note:</b> The inner chart needs to be assigned <code>ChartDelegate</code>.
          * @extends sap.ui.mdc.Control
          * @author SAP SE
-         * @version 1.113.0
+         * @version 1.115.0
          * @constructor
          *
-         * @experimental As of version 1.88
-         * @private
-         * @ui5-restricted sap.fe
-         * @MDC_PUBLIC_CANDIDATE
+         * @public
          *
          * @since 1.88
          * @alias sap.ui.mdc.Chart
+         * @experimental As of version 1.88
          */
         var Chart = Control.extend("sap.ui.mdc.Chart", /** @lends sap.ui.mdc.Chart.prototype */ {
             metadata: {
@@ -118,7 +119,7 @@ sap.ui.define([
                     },
 
                     /**
-                     * Specifies header text that is shown in chart
+                     * Specifies header text that is shown in the chart.
                      */
                     header: {
                         type: "string",
@@ -132,7 +133,7 @@ sap.ui.define([
                      */
                     noDataText: {
                         type: "string",
-                        defaultValue: "No data" //TODO WHy do we have a not translated default value?
+                        defaultValue: "No data"
                     },
 
                     /**
@@ -142,12 +143,13 @@ sap.ui.define([
                      * @since 1.88
                      */
                     p13nMode: {
-                        type: "sap.ui.mdc.ChartP13nMode[]",
+                        type: "sap.ui.mdc.enums.ChartP13nMode[]",
                         defaultValue: []
                     },
 
                     /**
                      * Enables the legend of the chart.
+                     * <b>Note:</b> The setter calls <code>setLegendVisible</code> of the delegate class.
                      *
                      * @since 1.88
                      */
@@ -158,18 +160,18 @@ sap.ui.define([
                     },
 
                     /**
-                     * Specifies which actions should not be available in the chart's toolbar.
+                     * Specifies which actions must not be available in the chart's toolbar.
                      *
                      * @since 1.88
                      */
                     ignoreToolbarActions: {
-                        type: "sap.ui.mdc.ChartToolbarActionType[]",
+                        type: "sap.ui.mdc.enums.ChartToolbarActionType[]",
                         defaultValue: []
                     },
 
                     //TODO: Do we really need this? Should be avoided.
                     /**
-                     * The minimal width
+                     * Defines the minimum width.
                      */
                     minWidth: {
                         type: "sap.ui.core.CSSSize",
@@ -180,7 +182,7 @@ sap.ui.define([
 
                     //TODO: Do we really need this? Should be avoided.
                     /**
-                     * The minimal height
+                     * Defines the minimum height.
                      */
                     minHeight: {
                         type: "sap.ui.core.CSSSize",
@@ -190,9 +192,9 @@ sap.ui.define([
                     },
 
                     /**
-                     * Defines the sort conditions.
+                     * Defines the sort conditions.<br>
                      *
-                     * <b>Note:</b> This property is exclusively used for handling flexibility changes. Do not use it for anything else.
+                     * <b>Note:</b> This property is exclusively used for handling SAPUI5 flexibility changes. Do not use it for anything else.
                      *
                      * @since 1.88
                      */
@@ -201,9 +203,9 @@ sap.ui.define([
                     },
 
                     /**
-                     * Defines the filter conditions.
-                     *
-                     * <b>Note:</b> This property is exclusively used for handling flexibility changes. Do not use it for anything else.
+                     * Defines the filter conditions.<br>
+				     * <b>Note:</b> This property must not be bound.<br>
+                     * <b>Note:</b> This property is exclusively used for handling SAPUI5 flexibility changes. Do not use it for anything else.
                      *
                      * @since 1.99
                      */
@@ -213,7 +215,7 @@ sap.ui.define([
                     },
 
                     /**
-                     * Controls the visibility of the chart tooltip. If set to <code>true</code>, a call of the delegate.setChartTooltipVisibility will be triggered and can be used to make the Char tooltip visible.
+                     * Controls the visibility of the chart tooltip. If set to <code>true</code>, a call of the <code>delegate.setChartTooltipVisibility</code> will be triggered and can be used to make the <code>Chart</code> tooltip visible.
                      *
                      * @since 1.88
                      */
@@ -224,7 +226,7 @@ sap.ui.define([
                     },
 
                     /**
-                     * If set to <code>true</code>, the chart is automatically bound after initialization.
+                     * If set to <code>true</code>, the chart is automatically bound after initialization.<br>
                      * If set to <code>false</code>, the chart is bound after the first call to <code>rebind</code>.
                      */
                     autoBindOnInit: {
@@ -253,18 +255,20 @@ sap.ui.define([
 
                     /**
                      * Specifies the chart metadata.<br>
-                     * <b>Note</b>: This property must not be bound.<br>
-                     * <b>Note</b>: This property is used exclusively for SAPUI5 flexibility/sap.fe. Do not use it otherwise.
+                     * <b>Note:</b> This property must not be bound.<br>
+                     * <b>Note:</b> This property is exclusively used for handling SAPUI5 flexibility changes. Do not use it otherwise.<br>
+                     *
+                     * <b>Note</b>: For more information about the supported inner elements, see {@link sap.ui.mdc.chart.PropertyInfo PropertyInfo}.
                      *
                      * @since 1.99
                      */
                     propertyInfo: {
-                        type: "object",
+                        type: "object", //TODO this should be an object[], but when I change this the TwFb does not start
                         defaultValue: []
                     },
 
                     /**
-                    * Semantic level of the header.
+                    * Semantic level of the header.<br>
                     * For more information, see {@link sap.m.Title#setLevel}.
                     *
                     * @since 1.104
@@ -297,8 +301,8 @@ sap.ui.define([
                         multiple: true
                     },
                     /**
-                     * This aggregation describes actions that are added to the chart toolbar.
-                     * See {@link sap.ui.mdc.actiontoolbar.ActionToolbarAction} for more information.
+                     * This aggregation describes actions that are added to the chart toolbar.<br>
+                     * For more information, see {@link sap.ui.mdc.actiontoolbar.ActionToolbarAction}.
                      */
                     actions: {
                         type: "sap.ui.core.Control",
@@ -308,6 +312,14 @@ sap.ui.define([
                             aggregation: "actions"
                         }
                     },
+                    /**
+                     * Feeds details actions for data point selection in the mdc chart.<br>
+                     * For more information, see {@link sap.ui.mdc.chart.SelectionDetailsActions SelectionDetailsActions}.
+                     */
+                    selectionDetailsActions: {
+                        type: "sap.ui.mdc.chart.SelectionDetailsActions",
+                        multiple: false
+                    },
                     _toolbar: {
                         type: "sap.ui.mdc.chart.ChartToolbar",
                         multiple: false,
@@ -323,10 +335,6 @@ sap.ui.define([
                         multiple: false,
                         visibility: "hidden"
                     },
-                    selectionDetailsActions: {
-                        type: "sap.ui.mdc.chart.SelectionDetailsActions",
-                        multiple: false
-                    },
                     _infoToolbar: {
                         type: "sap.ui.mdc.util.InfoBar",
                         multiple: false,
@@ -340,13 +348,12 @@ sap.ui.define([
                         multiple: false
                     },
                     /**
-                     * Defines the custom visualization if there is no data available.
-                     * <b>Note:</b> If both a <code>noDataText</code> property and a <code>noData</code> aggregation are provided, the <code>noData</code> aggregation takes priority.
+                     * Defines the custom visualization if there is no data available.<br>
+                     * This control will be displayed on top of the chart when no data is visible inside the chart.<br>
+                     * <b>Note:</b> If both a <code>noDataText</code> property and a <code>noData</code> aggregation are provided, the <code>noData</code> aggregation takes priority.<br>
                      * If the <code>noData</code> aggregation is undefined or set to null, the <code>noDataText</code> property is used instead.
+                     *
                      * @since 1.107
-                     * @experimental
-                    * @private
-                    * @ui5-restricted sap.ui.mdc, sap-fe
                      */
                     noData: {
                         type: "sap.ui.core.Control",
@@ -367,7 +374,7 @@ sap.ui.define([
                 },
                 events: {
                     /**
-                     * This event is fired when a SelectionDetailsAction is pressed.
+                     * This event is fired when a <code>SelectionDetailsAction</code> is pressed.
                      */
                     selectionDetailsActionPressed: {
                         parameters: {
@@ -382,7 +389,7 @@ sap.ui.define([
                             /**
                              * If the action is pressed on one of the {@link sap.m.SelectionDetailsItem items}, the parameter contains the
                              * {@link sap.ui.model.Context context} of the pressed {@link sap.m.SelectionDetailsItem item}. If a custom action or action
-                             * group of the SelectionDetails popover is pressed, this parameter contains all {@link sap.ui.model.Context contexts} of the
+                             * group of the <code>SelectionDetails</code> popover is pressed, this parameter contains all {@link sap.ui.model.Context contexts} of the
                              * {@link sap.m.SelectionDetailsItem items}.
                              */
                             itemContexts: {
@@ -407,60 +414,95 @@ sap.ui.define([
 
         FilterIntegrationMixin.call(Chart.prototype);
 
+	/**
+	 * An object literal describing a data property in the context of a {@link sap.ui.mdc.Chart}.
+	 *
+	 * When specifying the <code>PropertyInfo</code> objects in the {@link sap.ui.mdc.Chart#getPropertyInfo propertyInfo} property, the following
+	 * attributes need to be specified:
+	 * <ul>
+	 *   <li><code>label</code></li>
+	 *   <li><code>propertyPath</code></li>
+	 * </ul>
+	 *
+	 * @typedef {object} sap.ui.mdc.chart.PropertyInfo
+	 * @property {string} propertyPath
+	 *   The path to the property in the back end
+	 * @property {string} [name]
+	 *   The identifier of the property
+	 * @property {string} label
+	 *   The label of the identifier
+	 * @property {string} [tooltip]
+	 *   The tooltip of the identifier
+	 * @property {string} datatype
+	 *   The name of the type of the property
+	 * @property {object} [constraints]
+	 *   Defines constraints for the data type of the property
+	 * @property {object} [formatOptions]
+	 *   Defines formatting options for the data type of the property
+	 * @property {boolean} [required = false]
+	 *   Defines if the filter is mandatory
+	 * @property {int} maxConditions
+	 *   Defines if the filter supports multiple values <code>-1</code> or single values <code>1</code>
+	 * @property {boolean} groupable
+	 * 	Defines whether the property is groupable and is selectable as a dimension in the chart
+	 * @property {boolean} aggregatable
+	 *  Defines whether the property is aggregatable and is selectable as a measure in the chart
+	 * @property {string} aggregationMethod
+	 * 	The aggregation method used if the property is aggregatable
+	 * @property {string} role
+	 * 	Defines the role that the property visualizes inside the chart
+	 * @property {object} [datapoint]
+	 * 	Implementation-specific object containing information about the data point
+	 * @property {object} [criticality]
+	 *  Implementation-specific object containing information about the criticality
+	 * @property {string} [textProperty]
+	 * 	The text property used for the dimension
+	 *
+	 * @public
+	 */
+
+
         /**
          * Initialises the MDC Chart
          *
-         * @experimental
          * @private
-         * @ui5-restricted sap.ui.mdc
          */
         Chart.prototype.init = function () {
             this._oManagedObjectModel = new ManagedObjectModel(this);
             this.setModel(this._oManagedObjectModel, "$mdcChart");
-            this._bNewP13n = true;//TODO: remove with migration
             Control.prototype.init.apply(this, arguments);
 
             this._setupPropertyInfoStore("propertyInfo");
             this._setPropertyHelperClass(PropertyHelper);
         };
 
-        /**
-         * Defines which personalization options are available in the chart.
-         * Valid options are: "Item", "Sort", "Type".
-         * @param {array} aMode String array containing the p13n options that are available
-         * @returns {sap.ui.mdc.Chart} Reference to <code>this</code> for method chaining
-         *
-         * @experimental
-         * @private
-         * @ui5-restricted sap.fe
-         */
-        Chart.prototype.setP13nMode = function(aMode) {
+        Chart.prototype.setP13nMode = function(aModes) {
             var aSortedKeys = null;
-            if (aMode && aMode.length >= 1){
+            if (aModes && aModes.length >= 1){
                 aSortedKeys = [];
-                var mKeys = aMode.reduce(function(mMap, sKey, iIndex){
+                var mKeys = aModes.reduce(function(mMap, sKey, iIndex){
                     mMap[sKey] = true;
                     return mMap;
                 }, {});
 
                 //as the p13nMode has no strict order we need to ensure the order of tabs here
                 if (mKeys.Item) {
-                    aSortedKeys.push("Item");
+                    aSortedKeys.push(ChartP13nMode.Item);
                 }
                 if (mKeys.Sort) {
-                    aSortedKeys.push("Sort");
+                    aSortedKeys.push(ChartP13nMode.Sort);
                 }
                 if (mKeys.Filter) {
-                    aSortedKeys.push("Filter");
+                    aSortedKeys.push(ChartP13nMode.Filter);
                 }
                 if (mKeys.Type) {
                     this._typeBtnActive = true;
-                    aSortedKeys.push("Type");
+                    aSortedKeys.push(ChartP13nMode.Type);
                 } else {
                     this._typeBtnActive = false;
                 }
             } else {
-                aSortedKeys = aMode;
+                aSortedKeys = aModes;
             }
 
             this.setProperty("p13nMode", aSortedKeys, true);
@@ -510,13 +552,12 @@ sap.ui.define([
         };
 
         /**
-         * Getter for <code>filterConditions</code> set in the personalization settings.
-         * @returns {array} Filters set in the chart
+         * Getter for <code>Conditions</code> set in the personalization settings.
+         * @returns {object} Filters set in the chart
          *
-         * @experimental
-         * @private
-         * @ui5-restricted sap.fe
+         * @public
          */
+        // Part of sap.ui.mdc.IFilterSource
         Chart.prototype.getConditions = function() {
             //may only return conditions if the inner FilterBar has already been initialized
             return this.getInbuiltFilter() ? this.getInbuiltFilter().getConditions() : [];
@@ -533,9 +574,7 @@ sap.ui.define([
          *
          * @param {*} mSettings settings to apply
          *
-         * @experimental
          * @private
-         * @ui5-restricted sap.ui.mdc
          */
         Chart.prototype.applySettings = function (mSettings, oScope) {
             this._setPropertyHelperClass(PropertyHelper);
@@ -551,18 +590,9 @@ sap.ui.define([
                 this._fnRejectInnerChartBound = reject;
             }.bind(this));
 
-            //load required modules before init of inner controls
-            var pLoadDelegate = this._loadDelegate().then(function(oDelegate){
-                return oDelegate;
-            }).then(function(oDelegate){
-                return this.initControlDelegate(oDelegate);
-            }.bind(this)).catch(function (error) {
-                this._fnRejectInitialized(error);
-            }.bind(this));
+            var pLoadDelegate = this.initControlDelegate();
 
-            var aInitPromises = [
-                pLoadDelegate
-            ];
+            var aInitPromises = [ pLoadDelegate ];
 
             if (this.isFilteringEnabled()) {
                 aInitPromises.push(this.retrieveInbuiltFilter());
@@ -570,7 +600,9 @@ sap.ui.define([
 
             //TODO: Refactor this so we use awaitPropertyHelper
             Promise.all(aInitPromises).then(function(){
-                this._initInnerControls();
+                if (!this.isDestroyed()) {
+                    this._initInnerControls();
+                }
             }.bind(this));
 
         };
@@ -710,7 +742,7 @@ sap.ui.define([
         };
 
         Chart.prototype._createBreadcrumbs = function () {
-            if (!this._oBreadcrumbs){
+            if (!this._oBreadcrumbs && !this._bIsDestroyed) {
                 this._oBreadcrumbs = new Breadcrumbs(this.getId() + "--breadcrumbs");
                 this._oBreadcrumbs.updateDrillBreadcrumbs(this, this.getControlDelegate().getDrillableItems(this));
                 this.setAggregation("_breadcrumbs", this._oBreadcrumbs);
@@ -738,9 +770,7 @@ sap.ui.define([
          * Gets whether filtering is enabled in the personalization dialog.
          * @returns {boolean} <code>true</code> if filtering enabled, <code>false</code> if otherwise
          *
-         * @experimental
          * @private
-         * @ui5-restricted sap.fe
          */
         Chart.prototype.isFilteringEnabled = function () {
             return this.getP13nMode().indexOf("Filter") > -1;
@@ -751,7 +781,6 @@ sap.ui.define([
          * <b>Note:</b> This is only used for  personalization, do not use it otherwise.
          * @returns {Promise} <code>Promise</code> that resolves with the adaptation panel control
          *
-         * @experimental
          * @private
          * @ui5-restricted sap.ui.mdc
          */
@@ -802,7 +831,7 @@ sap.ui.define([
         };
 
         /**
-         * Rebinds the inner chart instance by calling oDelegate.rebindChart
+         * Rebinds the inner chart instance by calling oDelegate.rebind
          */
         Chart.prototype._rebind = function () {
 
@@ -825,10 +854,16 @@ sap.ui.define([
                 return;
             }
 
-            var oBindingInfo = this.getControlDelegate()._getBindingInfo(this);
-
-            this.getControlDelegate().updateBindingInfo(this, oBindingInfo); //Applies filters
-            this.getControlDelegate().rebind(this, oBindingInfo);
+            var oChartDelegate = this.getControlDelegate();
+            var oBindingInfo;
+            if (oChartDelegate._getBindingInfo) {
+                oBindingInfo = oChartDelegate._getBindingInfo(this);
+                Log.warning("mdc Chart", "calling the private delegate._getBindingInfo. Please make the function public!");
+            } else {
+                oBindingInfo = oChartDelegate.getBindingInfo(this);
+            }
+            oChartDelegate.updateBindingInfo(this, oBindingInfo); //Applies filters
+            oChartDelegate.rebind(this, oBindingInfo);
         };
 
         /**
@@ -882,7 +917,6 @@ sap.ui.define([
          * The inner chart is not bound yet. Use <code>innerChartBound</code> for it.
          * @returns {Promise} <code>Promise</code> that resolves once MDC chart is initialized. Contains reference to MDC chart
          *
-         * @experimental
          * @private
          * @ui5-restricted sap.ui.mdc, sap.fe
          */
@@ -894,7 +928,6 @@ sap.ui.define([
          * Can be used to check whether the inner chart is initialized and bound.
          * @returns {Promise} Promise that resolves once MDC chart is bound
          *
-         * @experimental
          * @private
          * @ui5-restricted sap.ui.mdc, sap.fe
          */
@@ -904,34 +937,22 @@ sap.ui.define([
 
         /**
          * Zooms in the inner chart.
-         * @param {int} iValue how much steps should be zoomed in
          *
-         * @experimental
          * @private
-         * @ui5-restricted sap.ui.mdc, sap.fe
+         * @ui5-restricted sap.ui.mdc
          */
-        Chart.prototype.zoomIn = function (iValue) {
-            if (!iValue) {
-                iValue = 10;
-            }
-
-            this.getControlDelegate().zoomIn(this, iValue);
+        Chart.prototype.zoomIn = function () {
+            this.getControlDelegate().zoomIn(this);
         };
 
         /**
          * Zooms out the inner chart.
-         * @param {int} iValue how much steps should be zoomed out
          *
-         * @experimental
          * @private
-         * @ui5-restricted sap.ui.mdc, sap.fe
+         * @ui5-restricted sap.ui.mdc
          */
-        Chart.prototype.zoomOut = function (iValue) {
-            if (iValue) {
-                iValue = 10;
-            }
-
-            this.getControlDelegate().zoomOut(this, iValue);
+        Chart.prototype.zoomOut = function () {
+            this.getControlDelegate().zoomOut(this);
         };
 
         /**
@@ -939,13 +960,12 @@ sap.ui.define([
          * {
          *   "enabled":true,
          *   "currentZoomLevel":0.16
-         *   }
+         * }
          *
          * @returns {Object} current Zoom Information
          *
-         * @experimental
          * @private
-         * @ui5-restricted sap.ui.mdc, sap.fe
+         * @ui5-restricted sap.ui.mdc
          */
         Chart.prototype.getZoomState = function () {
             return this.getControlDelegate().getZoomState(this);
@@ -955,9 +975,7 @@ sap.ui.define([
          * Retrieves the selection handler of the inner chart.
          * @returns {object} Selection handler of the inner chart
          *
-         * @experimental
-         * @private
-         * @ui5-restricted sap.ui.mdc, sap.fe
+         * @public
          */
         Chart.prototype.getSelectionHandler = function () {
             return this.getControlDelegate().getInnerChartSelectionHandler(this);
@@ -966,11 +984,10 @@ sap.ui.define([
         /**
          * Retrieves the chart type layout configuration.
          * <b>Note:</b> This is only used inside personalization.
+         *
          * @returns {object} Layout configuration
          *
-         * @experimental
-         * @private
-         * @ui5-restricted sap.ui.mdc
+         * @public
          */
         Chart.prototype.getChartTypeLayoutConfig = function() {
             return this.getControlDelegate().getChartTypeLayoutConfig();
@@ -979,26 +996,17 @@ sap.ui.define([
         /**
          * Retrieves the allowed chart roles for the chart types.
          * <b>Note:</b> This is only used inside the personalization.
+         *
          * @returns {object} Allowed roles
          *
-         * @experimental
          * @private
          * @ui5-restricted sap.ui.mdc
          */
+        //TODO is this function used?
         Chart.prototype.getAllowedRolesForKinds = function() {
             return this.getControlDelegate().getAllowedRolesForKinds();
         };
 
-        /**
-         * Sets the visibility of the legend.
-         * Calls <code>setLegendVisible</code> on the delegate.
-         * @param {boolean} bVisible <code>true</code> to show legend, <code>false</code> to hide
-         * @returns {sap.ui.mdc.Chart} Reference to <code>this</code> for method chaining
-         *
-         * @experimental
-         * @private
-         * @ui5-restricted sap.fe, sap.ui.mdc
-         */
         Chart.prototype.setLegendVisible = function (bVisible) {
             this.setProperty("legendVisible", bVisible);
 
@@ -1013,11 +1021,6 @@ sap.ui.define([
             return this;
         };
 
-        /**
-         * Sets the ShowChartTooltip Property
-         * @param {boolean} bValue true for visible; false for invisible
-         * @returns {sap.ui.mdc.Chart} the MDC chart
-         */
         Chart.prototype.setShowChartTooltip = function (bValue) {
             this.setProperty("showChartTooltip", bValue);
 
@@ -1038,13 +1041,12 @@ sap.ui.define([
         };
 
         /**
-         * shows the drill-down popover for selection a dimension to drill down to.
+         * Shows the drill-down popover for selection a dimension to drill down to.
+         *
          * @param {sap.m.Button} oDrillBtn reference to the drill down button for loacation of the popover
          * @returns {Promise} show dril stack promise
          *
-         * @experimental
          * @private
-         * @ui5-restricted sap.ui.mdc
          */
         Chart.prototype._showDrillDown = function (oDrillBtn) {
             if (!this.oDrillPopover) {
@@ -1098,9 +1100,8 @@ sap.ui.define([
          *
          * @returns {object} object containing information about the chart type
          *
-         * @experimental
          * @private
-         * @ui5-restricted sap.fe
+         * @ui5-restricted sap.ui.mdc, sap.fe
          *
          */
         Chart.prototype.getChartTypeInfo = function () {
@@ -1130,9 +1131,7 @@ sap.ui.define([
          *
          * @returns {array} Array containing the available chart types
          *
-         * @experimental
          * @private
-         * @ui5-restricted sap.fe
          */
         Chart.prototype.getAvailableChartTypes = function () {
             return this.getControlDelegate().getAvailableChartTypes(this);
@@ -1142,7 +1141,7 @@ sap.ui.define([
         /**
          * Sets the MDC chart to a specific chart type
          * @param {string} sChartType the name of the new chart type
-         * @returns {sap.ui.mdc.chart} reference to <code>this</code> for method chaining
+         * @returns {sap.ui.mdc.Chart} reference to <code>this</code> in order to allow method chaining
          */
         Chart.prototype.setChartType = function (sChartType) {
             this.setProperty("chartType", sChartType);
@@ -1156,16 +1155,6 @@ sap.ui.define([
             return this;
         };
 
-        /**
-         * Sets a new noData control for the chart.
-         * This control will be displayed on top of the chart when no data is visible inside the chart.
-         * @param {sap.ui.core.Control} oControl control to show
-         * @returns {sap.ui.mdc.Chart} reference to <code>this</code> for method chaining
-         *
-         * @experimental
-         * @private
-         * @ui5-restricted sap.fe
-         */
         Chart.prototype.setNoData = function(oControl) {
             this.setAggregation("noData", oControl);
 
@@ -1174,7 +1163,7 @@ sap.ui.define([
             } catch (err) {
                 //This fails when the delegate instance is not yet available.
                 //It is not a problem as the delegate will use getNoData() on init of the chart, thus using the correct noData struct.
-                //This error merely happens as the setter is calle don init of the MDC CHart from framework side.
+                //This error primerely happens as the setter is called on init of the Chart from framework side.
             }
 
             return this;
@@ -1192,9 +1181,7 @@ sap.ui.define([
          * Gets the managed object model.
          * @returns {sap.ui.model.base.ManagedObjectModel} the managed object model
          *
-         * @experimental
          * @private
-         * @ui5-restricted sap.ui.mdc
          */
         Chart.prototype.getManagedObjectModel = function () {
             return this._oManagedObjectModel;
@@ -1228,13 +1215,12 @@ sap.ui.define([
         };
 
         /**
-         * Fetches the current state of the chart (as a JSON)
+         * Fetches the current state of the chart (as a JSON)<br>
          * Needed for P13n to fetch current state
          *
-         * @experimental
-         * @private
          * @returns {Object} Current state of the chart
-         * @ui5-restricted sap.ui.mdc
+         *
+         * @private
          */
         Chart.prototype.getCurrentState = function () {
             var oState = {};
@@ -1272,7 +1258,7 @@ sap.ui.define([
             var aProperties = [];
             this.getItems().forEach(function (oItem) {
                 aProperties.push({
-                    name: oItem.getName(),
+                    name: oItem.getPropertyKey(),
                     role: oItem.getRole()
                 });
 
@@ -1314,14 +1300,12 @@ sap.ui.define([
         };
 
         /**
-         * Callback for when filters changed
+         * Callback for when filters changed<br>
          * Activates the overlay on the MDC chart
          *
          * @param oEvent filter changed event
          *
-         * @experimental
          * @private
-         * @ui5-restricted sap.fe, sap.ui.mdc
          */
 		Chart.prototype._onFiltersChanged = function(oEvent) {
 			if (this._bInnerChartReady && this.getControlDelegate() && this.getControlDelegate().getInnerChartBound(this) && oEvent.getParameter("conditionsBased")) {
@@ -1364,11 +1348,10 @@ sap.ui.define([
 
         /**
          * Adds/Removes the overlay shown above the inner chart.
+         *
          * @param {boolean} bShow true to show overlay, false to hide
          *
-         * @experimental
          * @private
-         * @ui5-restricted sap.fe, sap.ui.mdc
          */
 		Chart.prototype._renderOverlay = function(bShow) {
 			try {
@@ -1380,16 +1363,6 @@ sap.ui.define([
             }
 		};
 
-        /**
-         * Adds an action to the <code>actions</code> aggregation of the chart.
-         * If the given control is not of type {@link sap.ui.mdc.actiontoolbar.ActionToolbarAction}, a container is created for the control before passing it on to the {@link sap.ui.mdc.ActionToolbar}.
-         * @param {sap.ui.core.Control} oControl to add to the aggregation
-         * @return {sap.ui.mdc.Chart} Reference to <code>this</code> for method chaining.
-         *
-         * @experimental
-         * @private
-         * @ui5-restricted sap.ui.mdc, sap.fe
-         */
         Chart.prototype.addAction = function(oControl) {
             if (oControl.getMetadata().getName() !== "sap.ui.mdc.actiontoolbar.ActionToolbarAction") {
                 oControl = new ActionToolbarAction(oControl.getId() + "-action", {
@@ -1400,11 +1373,6 @@ sap.ui.define([
             return Control.prototype.addAggregation.apply(this, ["actions", oControl]);
         };
 
-        /**
-         * Specifies the header level for the title of the chart.
-         * @param {sap.ui.core.TitleLevel} sHeaderLevel Header level
-         * @returns {sap.ui.mdc.Chart} Reference to <code>this</code> in order to allow method chaining
-         */
         Chart.prototype.setHeaderLevel = function(sHeaderLevel) {
             if (this.getAggregation("_toolbar")) {
                 this.getAggregation("_toolbar")._setHeaderLevel(sHeaderLevel);