@openui5/sap.ui.mdc 1.93.3 → 1.96.1

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

@@ -21,7 +21,8 @@ sap.ui.define([
         "sap/ui/mdc/p13n/subcontroller/ChartItemController",
         "sap/ui/mdc/p13n/subcontroller/SortController",
         "sap/ui/base/ManagedObjectObserver",
-        "sap/ui/mdc/chartNew/DrillBreadcrumbsNew"
+        "sap/ui/mdc/chartNew/DrillBreadcrumbsNew",
+        "sap/ui/mdc/actiontoolbar/ActionToolbarAction"
     ],
     function (
         Core,
@@ -40,7 +41,8 @@ sap.ui.define([
         ChartItemController,
         SortController,
         ManagedObjectObserver,
-        Breadcrumbs
+        Breadcrumbs,
+        ActionToolbarAction
     ) {
         "use strict";
 
@@ -57,7 +59,7 @@ sap.ui.define([
          * @class The Chart control creates a chart based on metadata and the configuration specified.
          * @extends sap.ui.mdc.Control
          * @author SAP SE
-         * @version 1.93.3
+         * @version 1.96.1
          * @constructor
          * @experimental As of version ...
          * @private
@@ -68,6 +70,7 @@ sap.ui.define([
         var Chart = Control.extend("sap.ui.mdc.ChartNew", /** @lends sap.ui.mdc.ChartNew.prototype */ {
             metadata: {
                 library: "sap.ui.mdc",
+                designtime: "sap/ui/mdc/designtime/chart/ChartNew.designtime",
                 interfaces: [
                     "sap.ui.mdc.IxState"
                 ],
@@ -219,7 +222,7 @@ sap.ui.define([
                         type: "sap.ui.core.Control",
                         multiple: true,
                         forwarding: {
-                            idSuffix: "--toolbar",
+                            getter: "_getToolbar",
                             aggregation: "actions"
                         }
                     },
@@ -322,7 +325,7 @@ sap.ui.define([
 
         Chart.prototype.setP13nMode = function(aMode) {
             var aSortedKeys = null;
-            if (aMode && aMode.length > 1){
+            if (aMode && aMode.length >= 1){
                 aSortedKeys = [];
                 var mKeys = aMode.reduce(function(mMap, sKey, iIndex){
                     mMap[sKey] = true;
@@ -365,7 +368,10 @@ sap.ui.define([
             if (aMode && aMode.length > 0) {
                 aMode.forEach(function(sMode){
                     var sKey = sMode;
-                    oRegisterConfig.controller[sKey] = mRegistryOptions[sMode];
+                    var oController = mRegistryOptions[sMode];
+                    if (oController) {
+                        oRegisterConfig.controller[sKey] = oController;
+                    }
                 });
 
                 this.getEngine().registerAdaptation(this, oRegisterConfig);
@@ -383,18 +389,6 @@ sap.ui.define([
          * @ui5-restricted sap.ui.mdc
          */
         Chart.prototype.applySettings = function (mSettings, oScope) {
-			// Note: In the mdc.Chart control metadata, the "action" aggregation
-			// is defined as a forwarded aggregation.
-			// However, the automatic forwarding of aggregations only works when
-			// the target aggregation exists.
-			// So, the actions are removed from the settings argument to prevent
-			// an exception to happen when an aggregation is forwarded to a
-			// target control that has not been created.
-			if (mSettings) {
-				this._aInitialToolbarActions = mSettings.actions;
-				delete mSettings.actions;
-			}
-
             Control.prototype.applySettings.apply(this, arguments);
 
             this.initializedPromise = new Promise(function (resolve, reject) {
@@ -452,7 +446,7 @@ sap.ui.define([
             }.bind(this));
 
             //independent from fetchProperties
-            this._createToolbar();
+            this._getToolbar().createToolbarContent(this);
         };
 
         /**
@@ -486,10 +480,28 @@ sap.ui.define([
 
         };
 
+        Chart.prototype.setHeight = function(iHeight) {
+            try {
+                this.getControlDelegate().adjustChartHeight(this);
+            } catch (oError) {
+                //No need to do anything as correct height will be calculated anyways once inner chart is ready
+            }
+
+            this.setProperty("height", iHeight);
+
+            return this;
+        };
+
         Chart.prototype._createBreadcrumbs = function () {
             this._oBreadcrumbs = new Breadcrumbs(this.getId() + "--breadcrumbs");
             this._oBreadcrumbs.updateDrillBreadcrumbs(this, this.getControlDelegate().getDrillableItems(this));
             this.setAggregation("_breadcrumbs", this._oBreadcrumbs);
+
+            this._oBreadcrumbs.addEventDelegate({
+                onAfterRendering: function() {
+                    this.getControlDelegate().adjustChartHeight(this);
+                }.bind(this)
+            });
         };
 
         /**
@@ -520,6 +532,14 @@ sap.ui.define([
 
         };
 
+        /**
+         * Gets the adaption UI for the p13n dialog
+         * @returns {Prmoise} promise that resolves with UI
+         */
+        Chart.prototype.getAdaptationUI = function () {
+            return this.getControlDelegate().getAdaptionUI(this);
+        };
+
         /**
          * Propagates a change on the "item" aggregation to the inner chart via the delegate
          * The delegate must then update the inner chart accordingly
@@ -527,16 +547,27 @@ sap.ui.define([
          * @param {object} oChange the change object from the ManagedObjectModel observer
          */
         Chart.prototype._propagateItemChangeToInnerChart = function (oChange) {
+
+            if (this._bIsDestroyed){
+                return; //Don't propagate changes when CHart is destroyed
+            }
+
             this.setBusy(true);
             switch (oChange.mutation) {
 
                 case "insert":
-                    var iIndex = this.getItems().indexOf(oChange.child);
+                    var iIndex;
 
-                    this.getControlDelegate().insertItemToInnerChart(oChange.child, iIndex);
+                    if (oChange.child && oChange.child.getType()) {
+                        iIndex = this.getItems().filter(function(oItem){return oItem.getType() === oChange.child.getType();}).indexOf(oChange.child);
+                    } else {
+                        iIndex = this.getItems().indexOf(oChange.child);
+                    }
+
+                    this.getControlDelegate().insertItemToInnerChart(this, oChange.child, iIndex);
                     break;
                 case "remove":
-                    this.getControlDelegate().removeItemFromInnerChart(oChange.child);
+                    this.getControlDelegate().removeItemFromInnerChart(this, oChange.child);
                     break;
                 default:
                     Log.error("Unknown mutation on MDC Chart Item Aggregation. This will not sync to inner chart!");
@@ -570,22 +601,19 @@ sap.ui.define([
 
             this.setBusy(true);
 
-            if (!this.getControlDelegate().getInnerChartBound()) {
+            if (!this.getControlDelegate().getInnerChartBound(this)) {
                 this._createContentfromPropertyInfos();
                 return;
             }
 
-            var oBindingInfo = this.oBindData ? this.oBindData : this.getControlDelegate()._getBindingInfo(this);
+            var oBindingInfo = this.getControlDelegate()._getBindingInfo(this);
 
             if (oBindingInfo) {
                 oBindingInfo.sorter = this._getSorters();
             }
 
             this.getControlDelegate().updateBindingInfo(this, oBindingInfo); //Applies filters
-            //TODO: Temporary workaround, find a solution to handle binding info for inner chart
-            this.getControlDelegate().rebindChart(this, oBindingInfo, this._innerChartDataLoadComplete.bind(this));
-
-            this._updateToolbar();
+            this.getControlDelegate().rebindChart(this, oBindingInfo);
         };
 
         /**
@@ -593,24 +621,17 @@ sap.ui.define([
          *
          * @private
          */
-        Chart.prototype._createToolbar = function () {
-            var toolbar = new ChartToolbar(this.getId() + "--toolbar", {
-                design: "Transparent"
-            });
-
-            toolbar.createToolbarContent(this);
-
-            this.setAggregation("_toolbar", toolbar);
-        };
+        Chart.prototype._getToolbar = function () {
+            if (this.getAggregation("_toolbar")) {
+                return this.getAggregation("_toolbar");
+            } else {
+                var oToolbar = new ChartToolbar(this.getId() + "--toolbar", {
+                    design: "Transparent"
+                });
 
-        /**
-         * Gets initial actions for toolbar as they cannot not be forwarded on init due to sorting issues
-         * @returns {array} intial actions
-         *
-         * @private
-         */
-        Chart.prototype._getInitialToolbarActions = function() {
-            return this._aInitialToolbarActions ? this._aInitialToolbarActions : [];
+                this.setAggregation("_toolbar", oToolbar);
+                return oToolbar;
+            }
         };
 
         /**
@@ -634,7 +655,7 @@ sap.ui.define([
          */
         Chart.prototype._getInnerChart = function () {
             if (this._bInnerChartReady) {
-                return this.getControlDelegate().getInnerChart();
+                return this.getControlDelegate().getInnerChart(this);
             } else {
                 Log.error("Trying to acces inner chart while inner chart is not yet initialized!");
             }
@@ -698,7 +719,7 @@ sap.ui.define([
                 iValue = 10;
             }
 
-            this.getControlDelegate().zoomIn(iValue);
+            this.getControlDelegate().zoomIn(this, iValue);
         };
 
         /**
@@ -714,7 +735,7 @@ sap.ui.define([
                 iValue = 10;
             }
 
-            this.getControlDelegate().zoomOut(iValue);
+            this.getControlDelegate().zoomOut(this, iValue);
         };
 
         /**
@@ -731,11 +752,19 @@ sap.ui.define([
          * @ui5-restricted sap.ui.mdc, sap.fe
          */
         Chart.prototype.getZoomState = function () {
-            return this.getControlDelegate().getZoomState();
+            return this.getControlDelegate().getZoomState(this);
         };
 
         Chart.prototype.getSelectionHandler = function () {
-            return this.getControlDelegate().getInnerChartSelectionHandler();
+            return this.getControlDelegate().getInnerChartSelectionHandler(this);
+        };
+
+        Chart.prototype.getChartTypeLayoutConfig = function() {
+            return this.getControlDelegate().getChartTypeLayoutConfig();
+        };
+
+        Chart.prototype.getAllowedRolesForKinds = function() {
+            return this.getControlDelegate().getAllowedRolesForKinds();
         };
 
         /**
@@ -752,7 +781,7 @@ sap.ui.define([
 
             //Skip if no control delegate; gets propagated by _propagatePropertiesToInnerChart after init
             try {
-                this.getControlDelegate().setLegendVisible(bVisible);
+                this.getControlDelegate().setLegendVisible(this, bVisible);
             } catch (e) {
                 Log.info("Trying to set legend visiblity for Chart before delegate was initialized");
             }
@@ -771,7 +800,7 @@ sap.ui.define([
 
             //Skip if no control delegate; gets propagated by _propagatePropertiesToInnerChart after init
             try {
-                this.getControlDelegate().setChartTooltipVisibility(bValue);
+                this.getControlDelegate().setChartTooltipVisibility(this, bValue);
             } catch (e) {
                 Log.info("Trying to set tooltip visibility before delegate was initialized");
             }
@@ -779,6 +808,12 @@ sap.ui.define([
             return this;
         };
 
+        Chart.prototype.destroy = function() {
+            this._bIsDestroyed = true;
+
+            Control.prototype.destroy.apply(this, arguments);
+        };
+
         /**
          * 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
@@ -790,10 +825,7 @@ sap.ui.define([
         Chart.prototype._showDrillDown = function (oDrillBtn) {
             if (DrillStackHandler) {
 
-                if (!this._oDrillDownPopover) {
-                    DrillStackHandler.createDrillDownPopover(this);
-                }
-
+                DrillStackHandler.createDrillDownPopover(this);
                 return DrillStackHandler.showDrillDownPopover(this, oDrillBtn);
             }
 
@@ -838,7 +870,7 @@ sap.ui.define([
             var mInfo;
 
             try {
-                mInfo = this.getControlDelegate().getChartTypeInfo();
+                mInfo = this.getControlDelegate().getChartTypeInfo(this);
             } catch (error) {
                 //Inner chart is not yet ready
                 if (!mInfo) {
@@ -862,7 +894,7 @@ sap.ui.define([
          * @ui5-restricted Fiori Elements
          */
         Chart.prototype.getAvailableChartTypes = function () {
-            return this.getControlDelegate().getAvailableChartTypes();
+            return this.getControlDelegate().getAvailableChartTypes(this);
         };
 
 
@@ -875,7 +907,7 @@ sap.ui.define([
             this.setProperty("chartType", sChartType);
 
             try {
-                this.getControlDelegate().setChartType(sChartType);
+                this.getControlDelegate().setChartType(this, sChartType);
             } catch (e) {
                 Log.info("Trying to set chart type for Chart before delegate was initialized");
             }
@@ -902,15 +934,14 @@ sap.ui.define([
          *
          * @private
          */
-        //TODO: Pass this as an callback function to the delegate instead of calling it form the delegate directly
-        Chart.prototype._innerChartDataLoadComplete = function () {
+        Chart.prototype._innerChartDataLoadComplete = function (mArguments) {
             this.setBusy(false);
             this._renderOverlay(false);
 
-            this._updateToolbar();
+            this.getControlDelegate().requestToolbarUpdate(this);
 
             this.fireEvent("innerChartLoadedData ", {
-                innerChart: this.getControlDelegate().getInnerChart()
+                innerChart: this.getControlDelegate().getInnerChart(this)
             });
         };
 
@@ -1042,7 +1073,7 @@ sap.ui.define([
 		 * @ui5-restricted Fiori Elements, sap.ui.mdc
 		 */
 		Chart.prototype._onFiltersChanged = function(oEvent) {
-			if (this._bInnerChartReady && this.getControlDelegate() && this.getControlDelegate().getInnerChartBound() && oEvent.getParameter("conditionsBased")) {
+			if (this._bInnerChartReady && this.getControlDelegate() && this.getControlDelegate().getInnerChartBound(this) && oEvent.getParameter("conditionsBased")) {
 				this._renderOverlay(true);
 			}
 		};
@@ -1057,9 +1088,9 @@ sap.ui.define([
 		 */
 		Chart.prototype._renderOverlay = function(bShow) {
 
-			if (this.getControlDelegate().getInnerChart()) {
+			if (this.getControlDelegate().getInnerChart(this)) {
 
-				var $this = this.getControlDelegate().getInnerChart().$(), $overlay = $this.find(".sapUiMdcChartOverlay");
+				var $this = this.getControlDelegate().getInnerChart(this).$(), $overlay = $this.find(".sapUiMdcChartOverlay");
 				if (bShow && $overlay.length === 0) {
 					$overlay = jQuery("<div>").addClass("sapUiOverlay sapUiMdcChartOverlay").css("z-index", "1");
 					$this.append($overlay);
@@ -1069,5 +1100,15 @@ sap.ui.define([
 			}
 		};
 
+        Chart.prototype.addAction = function(oControl) {
+            if (oControl.getMetadata().getName() !== "sap.ui.mdc.actiontoolbar.ActionToolbarAction") {
+                oControl = new ActionToolbarAction(oControl.getId() + "-action", {
+                    action: oControl
+                });
+            }
+
+            return Control.prototype.addAggregation.apply(this, ["actions", oControl]);
+        };
+
         return Chart;
     }, true);

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @alias sap.ui.mdc.Control
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate
@@ -37,9 +37,10 @@ sap.ui.define([
  	 * @borrows sap.ui.mdc.mixin.AdaptationMixin.getInbuiltFilter as getInbuiltFilter
 	 *
 	 * @private
-	 * @experimental
 	 * @since 1.61
-	*/
+	 * @experimental As of version 1.61
+	 * @ui5-restricted sap.ui.mdc
+	 */
 	var Control = CoreControl.extend("sap.ui.mdc.Control", /** @lends sap.ui.mdc.Control.prototype */ {
 		metadata: {
 			library: "sap.ui.mdc",

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

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/Element",  "sap/ui/mdc/mixin/DelegateMixin", "sap/ui/mdc/mixin/AdaptationMixin"
+	"sap/ui/core/Element", "sap/ui/mdc/mixin/DelegateMixin", "sap/ui/mdc/mixin/AdaptationMixin"
 ], function(CoreElement, DelegateMixin, AdaptationMixin) {
 	"use strict";
 
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @alias sap.ui.mdc.Element
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate
@@ -37,9 +37,10 @@ sap.ui.define([
  	 * @borrows sap.ui.mdc.mixin.AdaptationMixin.getInbuiltFilter as getInbuiltFilter
 	 *
 	 * @private
-	 * @experimental
 	 * @since 1.74
-	*/
+	 * @experimental As of version 1.74
+	 * @ui5-restricted sap.ui.mdc
+	 */
 	var Element = CoreElement.extend("sap.ui.mdc.Element", /** @lends sap.ui.mdc.Element.prototype */ {
 		metadata: {
 			library: "sap.ui.mdc",

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

@@ -46,12 +46,12 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Field
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.54.0
 	 * @experimental As of version 1.54
 	 *

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * The metadata information is provided via the {@link sap.ui.mdc.FilterBarDelegate FilterBarDelegate} implementation. This implementation has to be provided by the application.
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @constructor
 	 * @experimental As of version 1.61
 	 * @private
@@ -44,15 +44,6 @@ sap.ui.define([
 					defaultValue: true
 				},
 
-				/**
-				 * Determines whether the Go button is visible in the filter bar.<br>
-				 * <b>Note</b>: If the <code>liveMode</code> property is set to <code>true</code>, it is ignored.
-				 */
-				showGoButton: {
-					type: "boolean",
-					defaultValue: true
-				},
-
 				/**
 				 * Specifies the personalization options for the filter bar.
 				 *

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

@@ -6,11 +6,13 @@
 sap.ui.define([
 	'sap/ui/mdc/field/FieldBase',
 	'sap/ui/mdc/field/FieldBaseRenderer',
-	'sap/base/util/merge'
+	'sap/base/util/merge',
+	'sap/base/util/deepEqual'
 ], function(
 		FieldBase,
 		FieldBaseRenderer,
-		merge
+		merge,
+		deepEqual
 	) {
 	"use strict";
 
@@ -29,12 +31,12 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.FieldBase
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.FilterField
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.48.0
 	 *
 	 * @experimental As of version 1.48
@@ -127,6 +129,28 @@ sap.ui.define([
 
 	};
 
+	FilterField.prototype.setProperty = function(sPropertyName, oValue, bSuppressInvalidate) {
+
+		if (sPropertyName === "conditions" && this._bParseError && deepEqual(this.getConditions(), this.validateProperty(sPropertyName, oValue))) {
+			// in parse error and same Conditions - no update on property - so remove error here
+			// As ConditionModel triggers checkUpdate in forced mode on addCondition, setConditions... also unchanged conditions will be updated
+			// So e.g. if a variant is applied an error will be removed.
+			if (this._oContentFactory.getBoundProperty()) { // single value case
+				this._oManagedObjectModel.checkUpdate(true, true); // async. to reduce updates (additionalValue will follow)
+			} else { // Multi value case - don't update tokens, initialize value
+				var oContent = this._getContent()[0];
+				if (oContent && oContent.setValue) {
+					oContent.setValue(); // TODO: custom controls with different property?
+				}
+				this._removeUIMessage();
+			}
+			this._bParseError = false;
+		}
+
+		return FieldBase.prototype.setProperty.apply(this, arguments);
+
+	};
+
 	FilterField.prototype._fireChange = function(aConditions, bValid, vWrongValue, oPromise) {
 
 		var vValue;

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

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.FieldInfoBase
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Link
@@ -200,7 +200,7 @@ sap.ui.define([
 
 	/**
 	 * Function that is called in the <code>createPopover</code> function of {@link sap.ui.mdc.field.FieldInfoBase}.
-	 * @param {Function} fnGetAutoClosedControl Function returning the <code>Popover</code> control that is created in <code>createPopover</code>
+	 * @param {Function} [fnGetAutoClosedControl] Function returning the <code>Popover</code> control that is created in <code>createPopover</code>
 	 * @returns {sap.ui.mdc.link.Panel} Popover panel which is to be displayed after clicking the link
 	 * @protected
 	 * @ui5-restricted sap.ui.mdc

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.mdc.MultiValueField
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.93.0
 	 *
 	 * @private