@openui5/sap.ui.mdc 1.96.5 → 1.99.0

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

@@ -14,26 +14,28 @@ sap.ui.define([
 	"use strict";
 
 	/**
-	 * Base delegate class for sap.ui.mdc.Table.<br>
-	 * <b>Note:</b> The class is experimental and the API/behavior is not finalized and hence this should not be used for productive usage.
+	 * Base delegate for {@link sap.ui.mdc.Table}.
 	 *
 	 * @author SAP SE
-	 * @private
+	 * @namespace
+	 * @alias module:sap/ui/mdc/TableDelegate
+	 * @extends module:sap/ui/mdc/AggregationBaseDelegate
 	 * @experimental
 	 * @since 1.60
-	 * @alias sap.ui.mdc.TableDelegate
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * MDC_PUBLIC_CANDIDATE
 	 */
 	var TableDelegate = Object.assign({}, AggregationBaseDelegate);
 
 	/**
-	 * Provides hook to update the binding info object that is used to bind the table to the model.
+	 * Provides a hook to update the binding info object that is used to bind the table to the model.
 	 *
-	 * @param {sap.ui.mdc.Table} oMDCTable The MDC table instance
-	 * @param {object} oDelegatePayload The delegate payload
+	 * @param {sap.ui.mdc.Table} oMDCTable Instance of the MDC table
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model
 	 * @protected
 	 */
-	TableDelegate.updateBindingInfo = function(oMDCTable, oDelegatePayload, oBindingInfo) {
+	TableDelegate.updateBindingInfo = function(oMDCTable, oBindingInfo) {
 		oBindingInfo.parameters = {};
 
 		if (oMDCTable._oMessageFilter) {
@@ -47,15 +49,16 @@ sap.ui.define([
 	/**
 	 * Updates the row binding of the table.
 	 *
-	 * The default implementation rebinds the table but model-specific subclasses must call dedicated binding methods to update the binding instead of using {@link #rebindTable}.
+	 * The default implementation rebinds the table, but model-specific subclasses must call dedicated binding methods to update the binding instead
+	 * of using {@link #rebind}.
 	 *
-	 * @param {sap.ui.mdc.Table} oMDCTable The MDC table instance
+	 * @param {sap.ui.mdc.Table} oMDCTable Instance of the table
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model
 	 * @param {sap.ui.model.ListBinding} [oBinding] The binding instance of the table
 	 * @protected
 	 */
 	TableDelegate.updateBinding = function(oMDCTable, oBindingInfo, oBinding) {
-		this.rebindTable(oMDCTable, oBindingInfo);
+		this.rebind(oMDCTable, oBindingInfo);
 	};
 
 	TableDelegate.validateState = function(oControl, oState, sKey) {
@@ -73,20 +76,20 @@ sap.ui.define([
 	/**
 	 * Rebinds the table.
 	 *
-	 * @param {sap.ui.mdc.Table} oMDCTable The MDC table instance
+	 * @param {sap.ui.mdc.Table} oMDCTable Instance of the MDC table
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model
 	 * @protected
 	 */
-	TableDelegate.rebindTable = function(oMDCTable, oBindingInfo) {
+	TableDelegate.rebind = function (oMDCTable, oBindingInfo) {
 		if (oMDCTable._oTable) {
 			oMDCTable._oTable.bindRows(oBindingInfo);
 		}
 	};
 
 	/**
-	 * 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.
+	 * Returns the filter delegate of the table that provides basic filter functionality, such as adding filter fields.
+	 * <b>Note:</b> The functionality provided in this delegate acts as a subset of a <code>FilterBarDelegate</code> to enable the table for inbuilt
+	 * filtering.
 	 *
 	 * @example <caption>Example usage of <code>getFilterDelegate</code></caption>
 	 * oFilterDelegate = {
@@ -105,7 +108,7 @@ sap.ui.define([
 			 *
 			 * @param {string} sPropertyName The property name
 			 * @param {sap.ui.mdc.Table} oTable Instance of the table
-			 * @returns {Promise<sap.ui.mdc.FilterField>} Promise that resolves with an instance of a <code>sap.ui.mdc.FilterField</code>.
+			 * @returns {Promise<sap.ui.mdc.FilterField>} <code>Promise</code> that resolves with an instance of a <code>sap.ui.mdc.FilterField</code>.
 			 * @see sap.ui.mdc.AggregationBaseDelegate#addItem
 			 */
 			addItem: function(sPropertyName, oTable) {
@@ -114,5 +117,32 @@ sap.ui.define([
 		};
 	};
 
+	/**
+	 * Returns the feature set for exporting data in the MDC Table.
+	 *
+	 * @returns {Promise} Export capabilities with specific features
+	 * @protected
+	 */
+	TableDelegate.fetchExportCapabilities = function() {
+		var oExportCapabilities = {
+			"XLSX": {} // default
+		};
+
+		// This is a temporary approach for testing purposes
+		if (new URL(window.location.href).search.indexOf("sap-ui-xx-enablePDFExport=true") > -1) {
+			oExportCapabilities["PDF"] = {
+				DocumentDescriptionReference: "../../../../default/iwbep/common/0001/$metadata",
+				DocumentDescriptionCollection: "MyDocumentDescriptions",
+				ArchiveFormat: true,
+				Signature: true,
+				CoverPage: true,
+				FitToPage: false,
+				ResultSizeDefault: 5000,
+				ResultSizeMaximum: 20000
+			};
+		}
+		return Promise.resolve(oExportCapabilities);
+	};
+
 	return TableDelegate;
 });

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

@@ -69,13 +69,14 @@ sap.ui.define([
 	 * @class Element for the <code>FieldHelp</code> association in the <code>FieldBase</code> controls.
 	 * @extends sap.ui.mdc.Element
 	 * @implements sap.ui.core.PopupInterface
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
-	 * @since 1.91.0
+	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.ValueHelp
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -327,7 +328,16 @@ sap.ui.define([
 	 * belongs to, not by the application.
 	 *
 	 * @param {sap.ui.core.Control} oControl Control to which the <code>FieldHelp</code> element is connected to
-	 * @param {object} oConfig Configuration object that holds needed data of the connected control
+	 * @param {object} [oConfig] Configuration object that holds required data of the connected control
+	 * @param {int} [oConfig.maxConditions=-1] Maximum number of allowed conditions
+	 * @param {sap.ui.model.Type} [oConfig.dataType] Type of the key (required for condition panel)
+	 * @param {string[]} [oConfig.operators] Possible operators to be used in the condition
+	 * @param {sap.ui.mdc.enum.FieldDisplay} [oConfig.display] Defines whether the value and/or description of the field is shown and in what order
+	 * @param {object} [oConfig.delegate] Field delegate to handle model-specific logic (required for condition panel)
+	 * @param {object} [oConfig.delegateName] Field delegate name to handle model-specific logic (required for condition panel)
+	 * @param {object} [oConfig.payload] Payload of the field delegate (required for condition panel)
+	 * @param {string} [oConfig.conditionModelName] Name of the <code>ConditionModel</code>, if bound to one (required if used for {@link sap.ui.mdc.FilterField FilterField})
+	 * @param {string} [oConfig.defaultOperatorName] Name of the default <code>Operator</code> (required if used for {@link sap.ui.mdc.FilterField FilterField})
 	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldBase
@@ -358,9 +368,10 @@ sap.ui.define([
 		var oTypeahead = this.getTypeahead();
 		var oDialog = this.getDialog();
 
-		if (oTypeahead && oTypeahead.isOpen()) {
+		// check for opening too as focus move sometimes to valuehelp before handleOpened finished
+		if (oTypeahead && (oTypeahead.isOpen() || oTypeahead.isOpening())) {
 			return oTypeahead.getDomRef();
-		} else if (oDialog && oDialog.isOpen()) {
+		} else if (oDialog && (oDialog.isOpen() || oDialog.isOpening())) {
 			return oDialog.getDomRef();
 		}
 
@@ -444,6 +455,11 @@ sap.ui.define([
 	ValueHelp.prototype.open = function(bTypeahead) {
 		var oContainer = bTypeahead ? this.getTypeahead() : _getValueHelpContainer.call(this);
 
+		var oOtherContainer = bTypeahead ? this.getDialog() : this.getTypeahead();
+		if (oOtherContainer && oContainer !== oOtherContainer && (oOtherContainer.isOpen() || oOtherContainer.isOpening())) {
+			oOtherContainer.close(); 	// TODO: Check container to be fully closed via promise
+		}
+
 		if (oContainer && !oContainer.isOpen() && !oContainer.isOpening()) {
 			this._removePromise("delegateContent" + "--" + oContainer.getId());
 			oContainer.open(this._retrieveDelegateContent(oContainer, true));
@@ -542,7 +558,16 @@ sap.ui.define([
 	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	ValueHelp.prototype.skipOpening = function() { // ? Use close based logic instead?
-		this.close();
+		var oTypeahead = this.getTypeahead();
+		var oDialog = this.getDialog();
+
+		if (oTypeahead && oTypeahead.isOpening()) {
+			oTypeahead.close();
+		}
+
+		if (oDialog && oDialog.isOpening()) {
+			oDialog.close();
+		}
 	};
 
 	/**
@@ -579,7 +604,14 @@ sap.ui.define([
 	 */
 	ValueHelp.prototype.isTypeaheadSupported = function() { // always return promise ?
 
-		return Promise.resolve(!!this.getTypeahead()); // TODO: need to check for search supported or should TypeAhead not be added at all if search is not supported?
+		var oTypeahead = this.getTypeahead();
+		if (oTypeahead) {
+			return this._retrieveDelegateContent(oTypeahead).then(function () {
+				return !!oTypeahead && oTypeahead.isTypeaheadSupported(); // as might depend on binding in content
+			});
+		} else {
+			return Promise.resolve(false);
+		}
 
 	};
 
@@ -739,11 +771,13 @@ sap.ui.define([
 
 						return oTypeahead.getItemForValue(oConfig).then(function(oItem) {
 							_cleanupParameterBinding.call(this, aInBindings);
-							if (oItem.inParameters) {
-								oItem.inParameters = _mapParametersToField.call(this, oItem.inParameters, this.getInParameters());
-							}
-							if (oItem.outParameters) {
-								oItem.outParameters = _mapParametersToField.call(this, oItem.outParameters, this.getOutParameters());
+							if (oItem) {
+								if (oItem.inParameters) {
+									oItem.inParameters = _mapParametersToField.call(this, oItem.inParameters, this.getInParameters());
+								}
+								if (oItem.outParameters) {
+									oItem.outParameters = _mapParametersToField.call(this, oItem.outParameters, this.getOutParameters());
+								}
 							}
 							return oItem;
 						}.bind(this));
@@ -892,7 +926,7 @@ sap.ui.define([
 
 	ValueHelp.prototype.getMaxConditions = function() { // ?
 		var oConfig = this.getProperty("_config");
-		return oConfig && oConfig.maxConditions;
+		return (oConfig && oConfig.maxConditions) || -1;
 	};
 
 	ValueHelp.prototype.getDisplay = function() { // ? currently necessary to determine how to render the tokens in valuehelp
@@ -1098,14 +1132,16 @@ sap.ui.define([
 			if (!vValue && bInitialValueFilterEmpty) {
 				oCondition = Condition.createCondition("Empty", []);
 				oCondition.isEmpty = false; // no explicit check needed
-			} else {
+			} else if (vValue !== null) {
 				// TODO: way to provide description on InParameter
 				// validated to let FilterField determine description if visible on FilterBar.
 				// Also to show it as selected on table in FieldHelp of FilterField.
 				oCondition = Condition.createItemCondition(vValue);
 				oCondition.validated = ConditionValidated.Validated;
 			}
-			oInConditions[sFilterPath].push(oCondition);
+			if (oCondition) {
+				oInConditions[sFilterPath].push(oCondition);
+			}
 		}
 
 		this.setProperty("_inConditions", oInConditions, true);

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

@@ -77,6 +77,26 @@ sap.ui.define([
 		return Promise.resolve();
 	};
 
+	/**
+	 * Changes the search string.
+	 *
+	 * If <code>$search</code> is used, depending on which back-end service is used, the search string might need to be escaped.
+	 *
+	 * @param {object} oPayload Payload for delegate
+	 * @param {boolean} bTypeahead <code>true</code> if the search is called for a type-ahead
+	 * @param {string} sSearch Search string
+	 * @returns {string} Search string to use
+	 * @since 1.97.0
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+	 ValueHelpDelegate.adjustSearch = function(oPayload, bTypeahead, sSearch) {
+
+		return sSearch;
+
+	};
+
 	/**
 	 * Executes a filter in a <code>ListBinding</code>.
 	 *

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

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

package/src/sap/ui/mdc/{chartNew/ChartSelectionDetailsNew.js → chart/ChartSelectionDetails.js}

@@ -11,7 +11,7 @@ sap.ui.define([
         "sap/m/SelectionDetailsItem",
         "sap/m/SelectionDetailsItemLine",
         "sap/m/SelectionDetailsRenderer",
-        "./SelectionDetailsActionsNew"
+        "./SelectionDetailsActions"
     ],
     function (
         Core,
@@ -26,24 +26,24 @@ sap.ui.define([
 
         /**
          /**
-         * Constructor for a new ChartSelectionDetailsNew.
+         * Constructor for a new ChartSelectionDetails.
          *
          * @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 ChartSelectionDetailsNew control creates a sap.m.SelectionDetails popover based on metadata and the configuration specified.
+         * @class The ChartSelectionDetails control creates a sap.m.SelectionDetails popover based on metadata and the configuration specified.
          * @extends sap.m.SelectionDetails
          * @author SAP SE
-         * @version 1.96.5
+         * @version 1.99.0
          * @constructor
          * @experimental As of version ...
          * @private
          * @ui5-restricted sap.fe
          * @MDC_PUBLIC_CANDIDATE
          * @since 1.88
-         * @alias sap.ui.mdc.chartNew.ChartSelectionDetailsNew
+         * @alias sap.ui.mdc.chart.ChartSelectionDetails
          * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
          */
-        var ChartSelectionDetails = SelectionDetails.extend("sap.ui.mdc.chartNew.ChartSelectionDetailsNew", /** @lends sap.ui.mdc.chartNew.ChartSelectionDetailsNew.prototype */ {
+        var ChartSelectionDetails = SelectionDetails.extend("sap.ui.mdc.chart.ChartSelectionDetails", /** @lends sap.ui.mdc.chart.ChartSelectionDetails.prototype */ {
             metadata: {
                 library: "sap.ui.mdc",
                 interfaces: [
@@ -110,7 +110,7 @@ sap.ui.define([
         ChartSelectionDetails.prototype._hasNavigationTargets = function(aData) {
             return false;
         };
-        //TODO: Consider implementation and handling within ChartToolbarNew like the update of actions as well
+        //TODO: Consider implementation and handling within ChartToolbar like the update of actions as well
         ChartSelectionDetails.prototype._attachEvents = function() {
             // Attach to navigation event of selectionDetails
             // for semantic object navigation
@@ -145,4 +145,4 @@ sap.ui.define([
         };
 
         return ChartSelectionDetails;
-    }, true);
+    });

package/src/sap/ui/mdc/{chartNew/ChartToolbarNew.js → chart/ChartToolbar.js}

@@ -13,9 +13,10 @@ sap.ui.define([
         "sap/m/OverflowToolbarToggleButton",
         "sap/m/Title",
         "sap/ui/mdc/library",
-        "sap/ui/mdc/chartNew/ChartTypeButtonNew",
+        "sap/ui/mdc/chart/ChartTypeButton",
         "sap/ui/mdc/chart/ChartSettings",
-        "./ChartSelectionDetailsNew"
+        "./ChartSelectionDetails",
+        "sap/m/ToolbarSeparator"
     ],
     function (
         Core,
@@ -28,28 +29,29 @@ sap.ui.define([
         MDCLib,
         ChartTypeButton,
         ChartSettings,
-        ChartSelectionDetailsNew
+        ChartSelectionDetails,
+        ToolbarSeparator
     ) {
         "use strict";
 
         /**
          /**
-         * Constructor for a new ChartToolbarNew.
+         * Constructor for a new ChartToolbar.
          *
          * @param {string} [sId] id for the new control, generated automatically if no id is given
          * @param {object} [mSettings] initial settings for the new control
-         * @class The ChartToolbarNew control creates a sap.m.OverflowToolbar based on metadata and the configuration specified.
+         * @class The ChartToolbar control creates a sap.m.OverflowToolbar based on metadata and the configuration specified.
          * @extends sap.m.OverflowToolbar
          * @author SAP SE
-         * @version 1.96.5
+         * @version 1.99.0
          * @constructor
          * @experimental As of version ...
          * @private
          * @since 1.88
-         * @alias sap.ui.mdc.chartNew.ChartToolbarNew
+         * @alias sap.ui.mdc.chart.ChartToolbar
          * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
          */
-        var ChartToolbar = ActionToolbar.extend("sap.ui.mdc.chartNew.ChartToolbarNew", /** @lends sap.ui.mdc.chartNew.ChartToolbarNew.prototype */ {
+        var ChartToolbar = ActionToolbar.extend("sap.ui.mdc.chart.ChartToolbar", /** @lends sap.ui.mdc.chart.ChartToolbar.prototype */ {
             metadata: {
                 library: "sap.ui.mdc",
                 interfaces: [],
@@ -76,7 +78,8 @@ sap.ui.define([
         };
 
         ChartToolbar.prototype.createToolbarContent = function (oMDCChart) {
-            this.setEnabled(false);
+            //Keep track of chart buttons to enable them later on
+            this._chartInternalButtonsToEnable = [];
 
             /**add beginning**/
             var title = new Title(oMDCChart.getId() + "-title", {
@@ -84,8 +87,13 @@ sap.ui.define([
             });
             this.addBegin(title);
 
+            /** variant management */
+            if (oMDCChart.getVariant()){
+                this.addVariantManagement(oMDCChart.getVariant());
+            }
+
             /**add end **/
-            this._oChartSelectionDetails = new ChartSelectionDetailsNew(oMDCChart.getId() + "-selectionDetails", {});
+            this._oChartSelectionDetails = new ChartSelectionDetails(oMDCChart.getId() + "-selectionDetails", {});
             this._oChartSelectionDetails.attachBeforeOpen(function (oEvent) {
                 this._updateSelectionDetailsActions(oMDCChart);
             }.bind(this));
@@ -100,11 +108,13 @@ sap.ui.define([
                     icon: "sap-icon://drill-down",
                     tooltip: MDCRb.getText("chart.CHART_DRILLDOWN_TITLE"),
 					text: MDCRb.getText("chart.CHART_DRILLDOWN_TITLE"),
+                    enabled: false,
                     press: function (oEvent) {
                         oMDCChart._showDrillDown(this._oDrillDownBtn);
                     }.bind(this)
                 });
                 this.addEnd(this._oDrillDownBtn);
+                this._chartInternalButtonsToEnable.push(this._oDrillDownBtn);
             }
 
             if (!oMDCChart.getIgnoreToolbarActions().length || oMDCChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.Legend) < 0) {
@@ -113,10 +123,11 @@ sap.ui.define([
                     text: MDCRb.getText("chart.LEGENDBTN_TEXT"),
                     tooltip: MDCRb.getText("chart.LEGENDBTN_TOOLTIP"),
                     icon: "sap-icon://legend",
-                    pressed: "{$mdcChart>/legendVisible}"
-
+                    pressed: "{$mdcChart>/legendVisible}",
+                    enabled: false
                 });
                 this.addEnd(this._oLegendBtn);
+                this._chartInternalButtonsToEnable.push(this._oLegendBtn);
             }
 
             if (!oMDCChart.getIgnoreToolbarActions().length || oMDCChart.getIgnoreToolbarActions().indexOf(MDCLib.ChartToolbarActionType.ZoomInOut)) {
@@ -124,6 +135,7 @@ sap.ui.define([
                     icon: "sap-icon://zoom-in",
                     tooltip: MDCRb.getText("chart.TOOLBAR_ZOOM_IN"),
                     text: MDCRb.getText("chart.TOOLBAR_ZOOM_IN"),
+                    enabled: false,
                     press: function onZoomOutButtonPressed(oControlEvent) {
                         oMDCChart.zoomIn();
                         this.toggleZoomButtons(oMDCChart);
@@ -134,6 +146,7 @@ sap.ui.define([
                     icon: "sap-icon://zoom-out",
                     tooltip: MDCRb.getText("chart.TOOLBAR_ZOOM_OUT"),
                     text: MDCRb.getText("chart.TOOLBAR_ZOOM_OUT"),
+                    enabled: false,
                     press: function onZoomOutButtonPressed(oControlEvent) {
                         oMDCChart.zoomOut();
                         this.toggleZoomButtons(oMDCChart);
@@ -141,6 +154,7 @@ sap.ui.define([
                 });
                 this.addEnd(this.oZoomInButton);
                 this.addEnd(this.oZoomOutButton);
+                //Enabled via toggleZoomButtons()
             }
 
             if (aP13nMode.indexOf("Sort") > -1 || aP13nMode.indexOf("Item") > -1) {
@@ -148,16 +162,33 @@ sap.ui.define([
                     icon: "sap-icon://action-settings",//TODO the right icon for P13n chart dialog
                     tooltip: MDCRb.getText('chart.PERSONALIZATION_DIALOG_TITLE'),
 					text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_TITLE'),
+                    enabled: false,
                     press: function (oEvent) {
                         oMDCChart.getEngine().uimanager.show(oMDCChart, oMDCChart.getP13nMode());
                     }
                 });
                 this.addEnd(this._oSettingsBtn);
+                this._chartInternalButtonsToEnable.push(this._oSettingsBtn);
             }
 
             if (oMDCChart._getTypeBtnActive()) {
                 this._oChartTypeBtn = new ChartTypeButton(oMDCChart);
+                this._oChartTypeBtn.setEnabled(false);
                 this.addEnd(this._oChartTypeBtn);
+                this._chartInternalButtonsToEnable.push(this._oChartTypeBtn);
+            }
+
+        };
+
+        ChartToolbar.prototype.addVariantManagement = function(oVariantManagement) {
+
+            if (oVariantManagement){
+                if (this._oVariantManagement) {
+                    this.removeBetween(this._oVariantManagement);
+                }
+
+                this._oVariantManagement = oVariantManagement;
+                this.addBetween(this._oVariantManagement);
             }
 
         };
@@ -180,6 +211,11 @@ sap.ui.define([
 
             if (!this._toolbarInitialUpdated) {
                 this.setEnabled(true);
+
+                this._chartInternalButtonsToEnable.forEach(function(oBtn){
+                    oBtn.setEnabled(true);
+                });
+
                 this._toolbarInitialUpdated = true;
             }
 
@@ -246,4 +282,4 @@ sap.ui.define([
 
         };
         return ChartToolbar;
-    }, true);
+    });