@openui5/sap.ui.mdc 1.93.3 → 1.96.1

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

@@ -98,7 +98,8 @@ sap.ui.define(['sap/ui/mdc/BaseDelegate', 'sap/ui/core/library'], function (Base
 
 			return {
 				validation: sValidation,
-				message: "Please provide a meaningful message here."
+				/* Please provide a meaningful message here. */
+				message: undefined
 			};
 		}
 

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

@@ -25,7 +25,9 @@ sap.ui.define([
 	"sap/m/Text",
 	"sap/ui/mdc/p13n/subcontroller/ChartItemController",
 	"sap/ui/mdc/p13n/subcontroller/SortController",
-	'sap/ui/events/KeyCodes'
+	"sap/ui/events/KeyCodes",
+	"sap/ui/mdc/actiontoolbar/ActionToolbarAction",
+	'sap/ui/mdc/p13n/panels/ChartItemPanelNew'
 ],
 	function (
 		Core,
@@ -48,7 +50,9 @@ sap.ui.define([
 		Text,
 		ChartItemController,
 		SortController,
-		KeyCodes
+		KeyCodes,
+		ActionToolbarAction,
+		ChartItemPanel
 	) {
 		"use strict";
 
@@ -57,11 +61,9 @@ sap.ui.define([
 			DrillStackHandler,
 			ChartTypeButton,
 			MeasureItemClass,
-			VizTooltip,
-			FILTER_INTERFACE = "sap.ui.mdc.IFilter";
+			VizTooltip;
 
 		/**
-		 /**
 		 * Constructor for a new Chart.
 		 *
 		 * @param {string} [sId] id for the new control, generated automatically if no id is given
@@ -69,7 +71,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 1.61
 		 * @private
@@ -192,7 +194,7 @@ sap.ui.define([
 					 */
 					_colorings: {
 						type: "object",
-						visibility: "_hidden",
+						visibility: "hidden",
 						byValue: true
 					},
 
@@ -267,25 +269,29 @@ sap.ui.define([
 						type: "sap.ui.core.Control",
 						multiple: true,
 						forwarding: {
-							idSuffix: "--toolbar",
+							getter: "_getToolbar",
 							aggregation: "actions"
 						}
 					},
 					_chart: {
 						type: "sap.chart.Chart",
-						multiple: false
+						multiple: false,
+						visibility: "hidden"
 					},
 					_toolbar: {
 						type: "sap.ui.mdc.ActionToolbar",
-						multiple: false
+						multiple: false,
+						visibility: "hidden"
 					},
 					_breadcrumbs: {
 						type: "sap.m.Breadcrumbs",
-						multiple: false
+						multiple: false,
+						visibility: "hidden"
 					},
 					_noDataStruct: {
 						type: "sap.m.VBox",
-						multiple: false
+						multiple: false,
+						visibility: "hidden"
 					},
 					selectionDetailsActions: {
 						type: "sap.ui.mdc.chart.SelectionDetailsActions",
@@ -300,11 +306,14 @@ sap.ui.define([
 					* @since 1.78
 				 	*/
 					filter: {
-						type: FILTER_INTERFACE,
+						type: "sap.ui.mdc.IFilter",
 						multiple: false
 					}
 				},
 				events: {
+					/**
+					 * This event is fired when a SelectionDetailsAction is pressed.
+					 */
 					selectionDetailsActionPressed: {
 						parameters: {
 
@@ -333,6 +342,9 @@ sap.ui.define([
 							}
 						}
 					},
+					/**
+					 * This event is fired when the selection in the inner chart changes.
+					 */
                     dataPointsSelected:{
 					    parameters: {
                             /**
@@ -350,6 +362,7 @@ sap.ui.define([
 		var _onSelectionMode = function(vValue) {
 
 			if (!this.oChartPromise) {
+				this._bNeedSelectionModeSet = true;
 				return;
 			}
 
@@ -442,7 +455,10 @@ sap.ui.define([
 			// target control that has not been created.
 			if (mSettings) {
 				aActions = mSettings.actions;
-				delete mSettings.actions;
+			}
+
+			if (!this._oToolbarHandler) {
+				this._oToolbarHandler = new ToolbarHandler();
 			}
 
 			var oManagedObj = Control.prototype.applySettings.apply(this, arguments);
@@ -477,7 +493,7 @@ sap.ui.define([
 				this._mStoredActions = aActions;
 
 				//Toolbar needs settings to be applied before creation to read properties like header/title
-				ToolbarHandler.createToolbar(this, aActions, true);
+				this._oToolbarHandler.createToolbar(this, aActions, true);
 				this._createTempNoData();
 			}
 
@@ -485,6 +501,14 @@ sap.ui.define([
 
 		};
 
+		Chart.prototype._getToolbar = function(){
+			if (!this.getAggregation("_toolbar")){
+				this._oToolbarHandler.createToolbar(this);
+			}
+
+			return this.getAggregation("_toolbar");
+		};
+
 		/**
 		 * Create a temporary NoData structure in case inner chart is not created yet.
 		 * @private
@@ -561,10 +585,14 @@ sap.ui.define([
 
 			.then(function createDrillBreadcrumbs(oInnerChart) {
 
+				if (!this._oToolbarHandler) {
+					this._oToolbarHandler = new ToolbarHandler();
+				}
+
 				if (this.getAutoBindOnInit()){
-					ToolbarHandler.createToolbar(this, aActions);
+					this._oToolbarHandler.createToolbar(this, aActions);
 				} else {
-					ToolbarHandler.updateToolbar(this);
+					this._oToolbarHandler.updateToolbar(this);
 				}
 
 				this._createDrillBreadcrumbs();
@@ -583,7 +611,7 @@ sap.ui.define([
 
 			}.bind(this));
 
-			if (!mSettings || mSettings.selectionMode === undefined) {
+			if (!mSettings || mSettings.selectionMode === undefined || this._bNeedSelectionModeSet) {
 				_onSelectionMode.apply(this);
 			}
 
@@ -598,9 +626,10 @@ sap.ui.define([
 		/**
 		 * Calls the Delegates to bind the aggregation onto the inner chart
 		 *
-		 * @param {string} sName name of the aggregation
-		 * @param oBindingInfo binding info for the aggregation
-		 * @param sSearchText search text (optional)
+		 * @param {string} sName Name of a public aggregation to bind
+		 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo binding info for the aggregation
+		 * @param {string} [sSearchText] search text (optional)
+		 * @returns {this} Returns <code>this</code> to allow method chaining
 		 *
 		 * @experimental
 		 * @private
@@ -627,7 +656,7 @@ sap.ui.define([
 		};
 
 		Chart.prototype._onDataLoadComplete = function(mEventParams) {
-			if (mEventParams.mParameters.reason === "change" && !mEventParams.mParameters.detailedReason) {
+			if ((mEventParams.mParameters.reason === "change" || mEventParams.mParameters.reason === "filter" ) && !mEventParams.mParameters.detailedReason) {
 				this.setBusy(false);
 			}
 		};
@@ -919,6 +948,11 @@ sap.ui.define([
 			this.oChartPromise = null;
 			this._oSelectionHandlerPromise = null;
 
+			if (this._oToolbarHandler) {
+				this._oToolbarHandler.destroy();
+				this._oToolbarHandler = null;
+			}
+
 			var oChart = this.getAggregation("_chart");
 
 			if (oChart) {
@@ -1744,6 +1778,55 @@ sap.ui.define([
 			}
 		};
 
+		/**
+		 * This function is used by P13n to determine which chart type supports which layout options.
+		 * There might be chart tyoes which do not support certain layout options (i.e. "Axis3").
+		 * Layout config is defined as followed:
+		 * {
+		 *  key: string //identifier for the chart type
+		 *  allowedLayoutOptions : [] //array containing allowed layout options as string
+		 * }
+		 *
+		 * @returns {array}
+		 */
+		Chart.prototype.getChartTypeLayoutConfig = function() {
+
+			if (this._aChartTypeLayout) {
+				return this._aChartTypeLayout;
+			}
+
+			var MDCRb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+
+			var aStandardSetup = [
+				{kind: "Dimension", availableRoles:[{key: MDCLib.ChartItemRoleType.category, text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_CATEGORY')}, {key: MDCLib.ChartItemRoleType.series, text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_SERIES')}]},
+				{kind: "Measure", availableRoles: [{key: MDCLib.ChartItemRoleType.axis1, text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_AXIS1')}]}
+			];
+
+
+			this._aChartTypeLayout = [
+				{key: "column", allowedLayoutOptions: [MDCLib.ChartItemRoleType.axis1, MDCLib.ChartItemRoleType.category, MDCLib.ChartItemRoleType.series], templateConfig: aStandardSetup},
+				{key: "bar", allowedLayoutOptions:  [MDCLib.ChartItemRoleType.axis1, MDCLib.ChartItemRoleType.category, MDCLib.ChartItemRoleType.series], templateConfig: aStandardSetup},
+				{key: "dual_column", allowedLayoutOptions:  [MDCLib.ChartItemRoleType.axis1, MDCLib.ChartItemRoleType.axis2, MDCLib.ChartItemRoleType.category, MDCLib.ChartItemRoleType.series], templateConfig: aStandardSetup}
+			];
+			return this._aChartTypeLayout;
+		};
+
+		Chart.prototype.getAdaptationUI = function() {
+
+			var oLayoutConfig = this.getChartTypeLayoutConfig().find(function(it){return it.key === this.getChartType();}.bind(this));
+
+			var oArguments = {panelConfig: oLayoutConfig};
+
+			return Promise.resolve(new ChartItemPanel(oArguments));
+		};
+
+		Chart.prototype.getAllowedRolesForKinds = function() {
+			return [
+				{kind: "Measure", allowedRoles: this._getLayoutOptionsForType("aggregatable")},
+				{kind: "Dimension", allowedRoles: this._getLayoutOptionsForType("groupable")}
+			];
+		};
+
 		Chart.prototype.onkeydown = function(oEvent) {
 			if (oEvent.isMarked()) {
 				return;
@@ -1763,5 +1846,50 @@ 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]);
+		};
+    /**
+     * 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
+     */
+	 Chart.prototype._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];
+    };
+
 		return Chart;
 	}, true);

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

@@ -224,6 +224,21 @@ sap.ui.define([
     ChartDelegate.getChartTypeInfo = function () {
     };
 
+    /**
+     * This function is used by P13n to determine which chart type supports which layout options.
+     * There might be chart tyoes which do not support certain layout options (i.e. "Axis3").
+     * Layout config is defined as followed:
+     * {
+     *  key: string //identifier for the chart type
+     *  allowedLayoutOptions : [] //array containing allowed layout options as string
+     * }
+     *
+     * @returns {array}
+     */
+    ChartDelegate.getChartTypeLayoutConfig = function() {
+
+    };
+
     /**
      * Gets the available chart types for the current state of the inner chart.
      *