@openui5/sap.ui.mdc 1.98.0 → 1.99.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.mdc",
-  "version": "1.98.0",
+  "version": "1.99.0",
   "description": "OpenUI5 UI Library sap.ui.mdc",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,8 +14,8 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.98.0",
-    "@openui5/sap.ui.core": "1.98.0",
-    "@openui5/sap.ui.layout": "1.98.0"
+    "@openui5/sap.m": "1.99.0",
+    "@openui5/sap.ui.core": "1.99.0",
+    "@openui5/sap.ui.layout": "1.99.0"
   }
 }

package/src/sap/ui/mdc/.library

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.98.0</version>
+	<version>1.99.0</version>
 
 	<documentation>UI5 library: sap.ui.mdc</documentation>
 

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

@@ -7,15 +7,18 @@
 sap.ui.define([
 	"sap/m/OverflowToolbar",
 	"sap/m/OverflowToolbarRenderer",
-	"sap/m/OverflowToolbarPriority",
 	"sap/m/ToolbarSpacer",
 	"sap/m/ToolbarSeparator",
+	"sap/m/library",
 	"sap/ui/mdc/enum/ActionToolbarActionAlignment",
 	"sap/ui/mdc/p13n/subcontroller/ActionToolbarController",
 	"sap/ui/mdc/p13n/Engine"
-], function(OverflowToolbar, OverflowToolbarRenderer, OverflowToolbarPriority, ToolbarSpacer, ToolbarSeparator, ActionToolbarActionAlignment, ActionToolbarController, Engine) {
+], function(OverflowToolbar, OverflowToolbarRenderer, ToolbarSpacer, ToolbarSeparator, mobileLibrary, ActionToolbarActionAlignment, ActionToolbarController, Engine) {
 	"use strict";
 
+	// shortcut for sap.m.OverflowToolbarPriority
+	var OverflowToolbarPriority = mobileLibrary.OverflowToolbarPriority;
+
 	/**
 	 * Constructor for a new ActionToolbar.<br>
 	 * <b>Note:</b><br>
@@ -28,7 +31,7 @@ sap.ui.define([
 	 * @class The column for the metadata driven table, that hold the template to be shown when the rows has data.
 	 * @extends sap.m.OverflowToolbar
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 * @constructor
 	 * @private
 	 * @since 1.58

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

@@ -43,7 +43,7 @@ sap.ui.define(['sap/ui/mdc/BaseDelegate', 'sap/ui/core/library'], function (Base
 		/**
 		 * Creates an instance of the implementing MDC Control's default aggregation.
 		 *
-		 * @param {String} sPropertyName The name of the property info object/JSON
+		 * @param {string} sPropertyName The name of the property info object/JSON
 		 * @param {Object<sap.ui.mdc.Control>} oControl Instance of a MDC Control
 		 * @param {Object} [mPropertyBag] Instance of property bag from SAPUI5 flexibility change API
 		 * <b>Note:</b>

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

@@ -19,6 +19,7 @@ sap.ui.define([
         "sap/ui/mdc/mixin/FilterIntegrationMixin",
         "sap/ui/model/base/ManagedObjectModel",
         "sap/ui/mdc/p13n/subcontroller/ChartItemController",
+        "sap/ui/mdc/p13n/subcontroller/FilterController",
         "sap/ui/mdc/p13n/subcontroller/SortController",
         "sap/ui/base/ManagedObjectObserver",
         "sap/ui/mdc/chart/DrillBreadcrumbs",
@@ -39,6 +40,7 @@ sap.ui.define([
         FilterIntegrationMixin,
         ManagedObjectModel,
         ChartItemController,
+        FilterController,
         SortController,
         ManagedObjectObserver,
         Breadcrumbs,
@@ -56,7 +58,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.98.0
+         * @version 1.99.0
          * @constructor
          * @experimental As of version ...
          * @private
@@ -71,6 +73,7 @@ sap.ui.define([
                 library: "sap.ui.mdc",
                 designtime: "sap/ui/mdc/designtime/chart/Chart.designtime",
                 interfaces: [
+                    "sap.ui.mdc.IFilterSource",
                     "sap.ui.mdc.IxState"
                 ],
                 defaultAggregation: "items",
@@ -126,7 +129,8 @@ sap.ui.define([
                      * @since 1.88
                      */
                     p13nMode: {
-                        type: "sap.ui.mdc.ChartP13nMode[]"
+                        type: "sap.ui.mdc.ChartP13nMode[]",
+                        defaultValue: []
                     },
 
                     /**
@@ -178,6 +182,16 @@ sap.ui.define([
                     sortConditions: {
                         type: "object"
                     },
+                    /**
+                     * Defines the filter conditions.
+                     *
+                     * <b>Note:</b> This property is exclusively used for handling flexibility changes. Do not use it for anything else.
+                     *
+                     * @since 1.99
+                     */
+                     filterConditions: {
+                        type: "object"
+                    },
                     /**
                      * Controls the visibility of the chart tooltip. If set to <code>true </code>, an instance of sap.viz.ui5.controls.VizTooltip will
                      * be created and shown when hovering over a data point.
@@ -243,6 +257,13 @@ sap.ui.define([
                     selectionDetailsActions: {
                         type: "sap.ui.mdc.chart.SelectionDetailsActions",
                         multiple: false
+                    },
+                    /**
+                     * <code>VariantManagement<code> control for the chart.
+                     */
+                    variant: {
+                        type: "sap.ui.fl.variants.VariantManagement",
+                        multiple: false
                     }
                 },
                 associations: {
@@ -340,6 +361,9 @@ sap.ui.define([
                 if (mKeys.Sort) {
                     aSortedKeys.push("Sort");
                 }
+                if (mKeys.Filter) {
+                    aSortedKeys.push("Filter");
+                }
                 if (mKeys.Type) {
                     this._typeBtnActive = true;
                 } else {
@@ -363,7 +387,8 @@ sap.ui.define([
 
             var mRegistryOptions = {
                 Item: ChartItemController,
-                Sort: SortController
+                Sort: SortController,
+                Filter: FilterController
             };
 
             if (aMode && aMode.length > 0) {
@@ -380,6 +405,33 @@ sap.ui.define([
 
         };
 
+
+        Chart.prototype.isFilteringEnabled = function() {
+            return this.getP13nMode().indexOf("Filter") > -1;
+        };
+
+        Chart.prototype.setFilterConditions = function(mConditions) {
+            this.setProperty("filterConditions", mConditions, true);
+
+            var oP13nFilter = this.getInbuiltFilter();
+            if (oP13nFilter) {
+                oP13nFilter.setFilterConditions(mConditions);
+            }
+
+            return this;
+        };
+
+        Chart.prototype.getConditions = function() {
+            //may only return conditions if the inner FilterBar has already been initialized
+            return this.getInbuiltFilter() ? this.getInbuiltFilter().getConditions() : [];
+        };
+
+        Chart.prototype._registerInnerFilter = function(oFilter) {
+            oFilter.attachSearch(function() {
+                this._rebind();
+            }, this);
+        };
+
         /**
          * Applies given settings onto the MDC Chart, loads the delegate and initializes the MDC Chart
          *
@@ -403,18 +455,25 @@ sap.ui.define([
             }.bind(this));
 
             //load required modules before init of inner controls
-            this._loadDelegate().then(function (oDelegate) {
-                this.initControlDelegate(oDelegate).then(function () {
-                    this._initInnerControls();
-
-
-                }.bind(this)).catch(function (error) {
-                    this._fnRejectInitialized(error);
-                }.bind(this));
+            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 aInitPromises = [
+                pLoadDelegate
+            ];
+
+            if (this.isFilteringEnabled()) {
+                aInitPromises.push(this.retrieveInbuiltFilter());
+            }
+
+            Promise.all(aInitPromises).then(function(){
+                this._initInnerControls();
+            }.bind(this));
 
         };
 
@@ -530,7 +589,7 @@ sap.ui.define([
          * @ui5-restricted Fiori Elements
          */
         Chart.prototype.isFilteringEnabled = function () {
-
+            return this.getP13nMode().indexOf("Filter") > -1;
         };
 
         /**
@@ -824,24 +883,33 @@ sap.ui.define([
          * @ui5-restricted sap.ui.mdc
          */
         Chart.prototype._showDrillDown = function (oDrillBtn) {
-            if (DrillStackHandler) {
-
-                DrillStackHandler.createDrillDownPopover(this);
-                return DrillStackHandler.showDrillDownPopover(this, oDrillBtn);
-            }
+            if (!this.oDrillPopover) {
+                if (DrillStackHandler) {
+                    this.oDrillPopover = DrillStackHandler.createDrillDownPopover(this);
+                    this.oDrillPopover.attachAfterClose(function(){
+                        delete this.oDrillPopover;
+                    }.bind(this));
+
+                    return DrillStackHandler.showDrillDownPopover(this, oDrillBtn);
+                }
 
-            return new Promise(function (resolve, reject) {
-                sap.ui.require([
-                    "sap/ui/mdc/chart/DrillStackHandler"
-                ], function (DrillStackHandlerLoaded) {
-                    DrillStackHandler = DrillStackHandlerLoaded;
-                    DrillStackHandler.createDrillDownPopover(this);
-                    DrillStackHandler.showDrillDownPopover(this, oDrillBtn)
-                        .then(function (oDrillDownPopover) {
-                            resolve(oDrillDownPopover);
-                        });
+                return new Promise(function (resolve, reject) {
+                    sap.ui.require([
+                        "sap/ui/mdc/chart/DrillStackHandler"
+                    ], function (DrillStackHandlerLoaded) {
+                        DrillStackHandler = DrillStackHandlerLoaded;
+                        this.oDrillPopover = DrillStackHandler.createDrillDownPopover(this);
+                        this.oDrillPopover.attachAfterClose(function(){
+                            delete this.oDrillPopover;
+                        }.bind(this));
+
+                        DrillStackHandler.showDrillDownPopover(this, oDrillBtn)
+                            .then(function (oDrillDownPopover) {
+                                resolve(oDrillDownPopover);
+                            });
+                    }.bind(this));
                 }.bind(this));
-            }.bind(this));
+            }
         };
 
         /**
@@ -967,6 +1035,10 @@ sap.ui.define([
                 if (aP13nMode.indexOf("Sort") > -1) {
                     oState.sorters = this._getSortedProperties();
                 }
+
+                if (aP13nMode.indexOf("Filter") > -1) {
+                    oState.filter = this.getFilterConditions();
+                }
             }
 
             return oState;
@@ -1079,6 +1151,18 @@ sap.ui.define([
 			}
 		};
 
+        Chart.prototype.setVariant = function(oControl) {
+            this.setAggregation("variant", oControl);
+
+            //Only add VM directly when Toolbar already exists; otherwise VM will be added during init of toolbar
+            if (this.getAggregation("_toolbar")){
+                this.getAggregation("_toolbar").addVariantManagement(oControl);
+            }
+
+
+            return this;
+        };
+
         /**
 		 * Adds/Removes the overlay shown above the inner chart
 		 * @param {boolean} bShow true to show overlay, false to hide

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

@@ -54,8 +54,8 @@ sap.ui.define([
 
 
     /**
-     * @typedef {Object} ZoomState
-     * @property {bool} enabled <code>true</code> if zooming is enabled
+     * @typedef {object} ZoomState
+     * @property {boolean} enabled <code>true</code> if zooming is enabled
      * @property {number} currentZoomLevel Current zoom level of the chart in percent (between 0 and 1)
      */
     /**
@@ -70,9 +70,9 @@ sap.ui.define([
     };
 
     /**
-     * @typedef {Object} SelectionDetails
+     * @typedef {object} SelectionDetails
      * @property {string} eventId  ID of the selection event
-     * @property {sap.core.Control} reference Reference to inner chart
+     * @property {sap.ui.core.Control} reference Reference to inner chart
      */
     /**
      ** Returns the event handler for <code>chartSelectionDetails</code> as an object.
@@ -89,7 +89,7 @@ sap.ui.define([
     /**
      * Sets the visibility of the legend.
      * <b>Note:</b> This function is called by the MDC chart only. You must not call it directly but use {@link sap.ui.mdc.Chart#setLegendVisible LegendVisible} instead.
-     * @param {bool} bVisible <code>true</code> to show legend, <code>false</code> to hide
+     * @param {boolean} bVisible <code>true</code> to show legend, <code>false</code> to hide
      *
      * @experimental
      * @private
@@ -206,11 +206,11 @@ sap.ui.define([
     };
 
     /**
-     * @typedef {Object} ChartTypeObject
+     * @typedef {object} ChartTypeObject
      * @property {string} key Unique key of the chart type
      * @property {string} icon URI for the icon for the current chart type
      * @property {string} text Name of the current chart type
-     * @property {bool} selected Whether the chart type is the one currently used
+     * @property {boolean} selected Whether the chart type is the one currently used
      */
     /**
      * Returns the current chart type.
@@ -346,7 +346,7 @@ sap.ui.define([
 
     /**
      * Returns the information whether the inner chart is currently bound.
-     * @returns {bool} <code>true</code> if inner chart is bound; <code>false</code> if not
+     * @returns {boolean} <code>true</code> if inner chart is bound; <code>false</code> if not
      *
      * @experimental
      * @private
@@ -371,7 +371,7 @@ sap.ui.define([
     /**
      * Sets tooltips to visible/invisible for the inner chart.
      * <b>Note:</b> This function is called by the MDC chart only. You must not call it directly but use {@link sap.ui.mdc.Chart#setShowChartTooltip setShowChartTooltip} instead.
-     * @param {bool}  bFlag <code>true</code> for visible, <code>false</code> for invisible
+     * @param {boolean}  bFlag <code>true</code> for visible, <code>false</code> for invisible
      *
      * @experimental
      * @private

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

@@ -28,7 +28,7 @@ sap.ui.define(['./library'],
          * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
          *
          * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer
-         * @param {sap.ui.core.Control} oInnerChart An object representation of the control that should be rendered
+         * @param {sap.ui.mdc.Chart} oInnerChart An object representation of the control that should be rendered
          */
         ChartRenderer.render = function(oRm, oMDCChart) {
                 oRm.openStart("div", oMDCChart);

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.98.0
+	 * @version 1.99.0
 	 * @alias sap.ui.mdc.Control
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 * @alias sap.ui.mdc.Element
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate

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

@@ -46,12 +46,12 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Field
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 * @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.98.0
+	 * @version 1.99.0
 	 * @constructor
 	 * @experimental As of version 1.61
 	 * @private

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

@@ -31,12 +31,12 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.FieldBase
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.FilterField
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 * @since 1.48.0
 	 *
 	 * @experimental As of version 1.48

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.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Link
@@ -261,6 +261,24 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	Link.prototype.checkDirectNavigation = function() {
+		var oLinkItemsPromise = this.retrieveLinkItems();
+		var oAdditionalContentPromise = this.retrieveAdditionalContent();
+		return Promise.all([oLinkItemsPromise, oAdditionalContentPromise]).then(function(values) {
+			var aLinkItems = values[0];
+			var aAdditionalContent = values[1];
+
+			this._setConvertedLinkItems(aLinkItems);
+			var aMLinkItems = this._getInternalModel().getProperty("/linkItems");
+
+			if (aMLinkItems.length === 1 && !aAdditionalContent.length) {
+				Panel.navigate(aMLinkItems[0].href);
+				return Promise.resolve(true);
+			}
+			return Promise.resolve(false);
+		}.bind(this));
+	};
+
 	/**
 	 * @private
 	 * @param {sap.ui.mdc.link.LinkItem[]} aLinkItems The given <code>LinkItem</code> objects
@@ -312,7 +330,7 @@ sap.ui.define([
 	 * @private
 	 * @param {sap.ui.fl.Utils} Utils Flexibility utility class
 	 * @param {sap.ui.fl.apply.api.FlexRuntimeInfoAPI} FlexRuntimeInfoAPI Flexibility runtime info API
-	 * @returns {String} Generated ID of the panel
+	 * @returns {string} Generated ID of the panel
 	 */
 	Link.prototype._createPanelId = function(Utils, FlexRuntimeInfoAPI) {
 		var oField;

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

@@ -32,8 +32,8 @@ sap.ui.define(['sap/ui/mdc/BaseDelegate'], function(BaseDelegate) {
 			return Promise.resolve(null);
 		},
 		/**
-		 * @typedef {Object} sap.ui.mdc.LinkDelegate.LinkType
-		 * @property {Number} type 0 (Text) | 1 (Direct Link) | 2 (Popup)
+		 * @typedef {object} sap.ui.mdc.LinkDelegate.LinkType
+		 * @property {number} type 0 (Text) | 1 (Direct Link) | 2 (Popup)
 		 * If <code>oLinkType.type</code> is 0, the link is rendered as a text.
 		 * If <code>oLinkType.type</code> is 1, the link is rendered as a link. When pressed the link triggers a direct navigation instead.
 		 * If <code>oLinkType.type</code> is 2, the link is rendered as a link and opens a popover (default).

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.98.0
+	 * @version 1.99.0
 	 * @since 1.93.0
 	 *
 	 * @private
@@ -325,7 +325,7 @@ sap.ui.define([
 	 * use the <code>items</code> aggregation instead.
 	 *
 	 * @param {object[]} aConditions Conditions to be set
-	 * @returns {sap.ui.mdc.Field} Reference to <code>this</code> to allow method chaining
+	 * @returns {sap.ui.mdc.MultiValueField} Reference to <code>this</code> to allow method chaining
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
@@ -358,7 +358,7 @@ sap.ui.define([
 	 * In this case the value of the <code>dataType</code> property is ignored.
 	 *
 	 * @param {string} sDataType DataType to be set
-	 * @returns {sap.ui.mdc.Field} Reference to <code>this</code> to allow method chaining
+	 * @returns {sap.ui.mdc.MultiValueField} Reference to <code>this</code> to allow method chaining
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
@@ -375,7 +375,7 @@ sap.ui.define([
 	 * In this case the values of the <code>dataType</code> property and the <code>dataTypeConstraints</code> property are ignored.
 	 *
 	 * @param {string} oDataTypeConstraints Constraints to be set
-	 * @returns {sap.ui.mdc.Field} Reference to <code>this</code> to allow method chaining
+	 * @returns {sap.ui.mdc.MultiValueField} Reference to <code>this</code> to allow method chaining
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
@@ -392,7 +392,7 @@ sap.ui.define([
 	 * In this case the values of the <code>dataType</code> property and the <code>dataTypeFormatOptions</code> property are ignored.
 	 *
 	 * @param {string} oDataTypeFormatOptions Format options to be set
-	 * @returns {sap.ui.mdc.Field} Reference to <code>this</code> to allow method chaining
+	 * @returns {sap.ui.mdc.MultiValueField} Reference to <code>this</code> to allow method chaining
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
@@ -402,6 +402,20 @@ sap.ui.define([
 	 * @function
 	 */
 
-	return Field;
+	/**
+	 * Sets a new value for property <code>multipleLines</code>.
+	 *
+	 * @param {boolean} [bMultipleLines=false] New value for property <code>multipleLines</code>
+	 * @returns {sap.ui.mdc.MultiValueField} Reference to <code>this</code> to allow method chaining
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @deprecated This property is not supported for multi-value fields.
+	 * @ui5-not-supported
+	 * @name sap.ui.mdc.MultiValueField#setMultipleLines
+	 * @function
+	 */
+
+	 return Field;
 
 });