@openui5/sap.ui.mdc 1.98.0 → 1.101.0

package/THIRDPARTY.txt

@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.7
+Component: URI.js, version: 1.19.10
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -400,7 +400,7 @@ Contained in: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperato
 
 Library: sap.ui.webc.common:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -411,7 +411,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
-Component: lit-html, version: 1.4.1
+Component: lit-html, version: 2.0.1
 Copyright: Google LLC
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -420,7 +420,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/lit-html/
 
 Library: sap.ui.webc.fiori:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -429,7 +429,7 @@ Contained in: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/thirdparty/*.*
 
 Library: sap.ui.webc.main:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -450,7 +450,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.1.34
+Component: SAP Theming Base Content, version: 11.1.38
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.mdc",
-  "version": "1.98.0",
+  "version": "1.101.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.101.0",
+    "@openui5/sap.ui.core": "1.101.0",
+    "@openui5/sap.ui.layout": "1.101.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.101.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.101.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,10 +19,13 @@ 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/mdc/p13n/subcontroller/ChartTypeController",
         "sap/ui/base/ManagedObjectObserver",
         "sap/ui/mdc/chart/DrillBreadcrumbs",
-        "sap/ui/mdc/actiontoolbar/ActionToolbarAction"
+        "sap/ui/mdc/actiontoolbar/ActionToolbarAction",
+        "sap/ui/thirdparty/jquery"
     ],
     function (
         Core,
@@ -39,10 +42,13 @@ sap.ui.define([
         FilterIntegrationMixin,
         ManagedObjectModel,
         ChartItemController,
+        FilterController,
         SortController,
+        ChartTypeController,
         ManagedObjectObserver,
         Breadcrumbs,
-        ActionToolbarAction
+        ActionToolbarAction,
+        jQuery
     ) {
         "use strict";
 
@@ -56,7 +62,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.101.0
          * @constructor
          * @experimental As of version ...
          * @private
@@ -71,6 +77,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,11 +133,12 @@ sap.ui.define([
                      * @since 1.88
                      */
                     p13nMode: {
-                        type: "sap.ui.mdc.ChartP13nMode[]"
+                        type: "sap.ui.mdc.ChartP13nMode[]",
+                        defaultValue: []
                     },
 
                     /**
-                     * Set chart's legend properties.
+                     * Enables the legend of the chart.
                      *
                      * @since 1.88
                      */
@@ -179,8 +187,18 @@ sap.ui.define([
                         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.
+                     * 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",
+                        defaultValue: {}
+                    },
+                    /**
+                     * Controls the visibility of the chart tooltip. If set to <code>true</code>, an instance of {@link sap.viz.ui5.controls.VizTooltip} is created and shown when hovering over a data point.
                      *
                      * @since 1.88
                      */
@@ -190,7 +208,8 @@ sap.ui.define([
                         defaultValue: true
                     },
                     /**
-                     * Binds the chart automatically after the initial creation of the chart
+                     * If set to <code>true</code>, the chart is automatically bound after initialization.
+                     * If set to <code>false</code>, the chart is bound after the first call to <code>rebind</code>.
                      */
                     autoBindOnInit: {
                         type: "boolean",
@@ -199,7 +218,7 @@ sap.ui.define([
                     },
 
                     /**
-                     * Specifies the type of chart to be created by the SmartChart control.
+                     * Specifies the type of chart to be created by the <code>Chart</code> control.
                      */
                     chartType: {
                         type: "string",
@@ -210,6 +229,17 @@ sap.ui.define([
                         type: "boolean",
                         group: "Misc",
                         defaultValue: true
+                    },
+                    /**
+                     * Specifies the filter metadata.<br>
+                     * <b>Note</b>: This property must not be bound.<br>
+                     * <b>Note</b>: This property is used exclusively for SAPUI5 flexibility/ Fiori Elements. Do not use it otherwise.
+                     *
+                     * @since 1.99
+                     */
+                    propertyInfo: {
+                        type: "object",
+                        defaultValue: []
                     }
                 },
                 aggregations: {
@@ -243,6 +273,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: {
@@ -322,6 +359,9 @@ sap.ui.define([
             this.setModel(this._oManagedObjectModel, "$mdcChart");
             this._bNewP13n = true;//TODO: remove with migration
             Control.prototype.init.apply(this, arguments);
+
+            this._setupPropertyInfoStore("propertyInfo");
+            this._setPropertyHelperClass(PropertyHelper);
         };
 
         Chart.prototype.setP13nMode = function(aMode) {
@@ -340,8 +380,12 @@ sap.ui.define([
                 if (mKeys.Sort) {
                     aSortedKeys.push("Sort");
                 }
+                if (mKeys.Filter) {
+                    aSortedKeys.push("Filter");
+                }
                 if (mKeys.Type) {
                     this._typeBtnActive = true;
+                    aSortedKeys.push("Type");
                 } else {
                     this._typeBtnActive = false;
                 }
@@ -363,7 +407,9 @@ sap.ui.define([
 
             var mRegistryOptions = {
                 Item: ChartItemController,
-                Sort: SortController
+                Sort: SortController,
+                Filter: FilterController,
+                Type: ChartTypeController
             };
 
             if (aMode && aMode.length > 0) {
@@ -380,6 +426,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
          *
@@ -390,6 +463,7 @@ sap.ui.define([
          * @ui5-restricted sap.ui.mdc
          */
         Chart.prototype.applySettings = function (mSettings, oScope) {
+            this._setPropertyHelperClass(PropertyHelper);
             Control.prototype.applySettings.apply(this, arguments);
 
             this.initializedPromise = new Promise(function (resolve, reject) {
@@ -403,18 +477,26 @@ 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());
+            }
+
+            //TODO: Refactor this so we use awaitPropertyHelper
+            Promise.all(aInitPromises).then(function(){
+                this._initInnerControls();
+            }.bind(this));
 
         };
 
@@ -423,6 +505,7 @@ sap.ui.define([
          * Inner chart is initialized via the delegate
          */
         Chart.prototype._initInnerControls = function () {
+
             this.getControlDelegate().initializeInnerChart(this).then(function (oInnerChart) {
 
                 this.setBusyIndicatorDelay(0);
@@ -432,16 +515,14 @@ sap.ui.define([
 
                 if (this.getAutoBindOnInit()) {
                     this.setBusy(true);
-                    this._createContentfromPropertyInfos();
+                    this._createContentfromPropertyInfos(oInnerChart);
                 }
 
                 this.setAggregation("_innerChart", oInnerChart);
-
                 this._bInnerChartReady = true;
-
                 this._fnResolveInitialized();
-                // eslint-disable-next-line no-empty
                 this.invalidate();
+
             }.bind(this)).catch(function (error) {
                 this._fnRejectInitialized(error);
             }.bind(this));
@@ -458,27 +539,27 @@ sap.ui.define([
          *
          * Is called during init when autoBindOnInit = "true", if "false" then this is called by _rebind()
          */
-        Chart.prototype._createContentfromPropertyInfos = function () {
-            this.initPropertyHelper(PropertyHelper).then(function () {
-                //Create content on inner chart instance
-                this.getControlDelegate().createInnerChartContent(this, this._innerChartDataLoadComplete.bind(this));
-
-                this._createBreadcrumbs();
-                //From now on, listen to changes on Items Aggregation and sync them with inner chart
-                this._oObserver = new ManagedObjectObserver(this._propagateItemChangeToInnerChart.bind(this));
-                this._oObserver.observe(this, {
-                    aggregations: [
-                        "items"
-                    ]
-                });
-
-                //Sync MDC Chart properties with inner chart
-                this._propagatePropertiesToInnerChart();
-
-                this._fnResolveInnerChartBound();
+        Chart.prototype._createContentfromPropertyInfos = function (oInnerChart) {
 
+            //Make sure all MDC Items have the necessary information to create a chart
+            this.getControlDelegate().checkAndUpdateMDCItems(this).then(function(){
+                //Create content on inner chart instance
+                this.getControlDelegate().createInnerChartContent(this, this._innerChartDataLoadComplete.bind(this)).then(function(){
+                    this._createBreadcrumbs();
+                    //From now on, listen to changes on Items Aggregation and sync them with inner chart
+                    this._oObserver = new ManagedObjectObserver(this._propagateItemChangeToInnerChart.bind(this));
+                    this._oObserver.observe(this, {
+                        aggregations: [
+                            "items"
+                        ]
+                    });
+
+                    //Sync MDC Chart properties with inner chart
+                    this._propagatePropertiesToInnerChart();
+
+                    this._fnResolveInnerChartBound();
+                }.bind(this));
             }.bind(this));
-
         };
 
         Chart.prototype.setHeight = function(iHeight) {
@@ -530,7 +611,7 @@ sap.ui.define([
          * @ui5-restricted Fiori Elements
          */
         Chart.prototype.isFilteringEnabled = function () {
-
+            return this.getP13nMode().indexOf("Filter") > -1;
         };
 
         /**
@@ -609,10 +690,6 @@ sap.ui.define([
 
             var oBindingInfo = this.getControlDelegate()._getBindingInfo(this);
 
-            if (oBindingInfo) {
-                oBindingInfo.sorter = this._getSorters();
-            }
-
             this.getControlDelegate().updateBindingInfo(this, oBindingInfo); //Applies filters
             this.getControlDelegate().rebind(this, oBindingInfo);
         };
@@ -824,24 +901,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 +1053,14 @@ sap.ui.define([
                 if (aP13nMode.indexOf("Sort") > -1) {
                     oState.sorters = this._getSortedProperties();
                 }
+
+                if (aP13nMode.indexOf("Filter") > -1) {
+                    oState.filter = this.getFilterConditions();
+                }
+
+                if (aP13nMode.indexOf("Type") > -1) {
+                    oState.chartType = this.getChartType();
+                }
             }
 
             return oState;
@@ -1002,46 +1096,6 @@ sap.ui.define([
             return this.getSortConditions() ? this.getSortConditions().sorters : [];
         };
 
-        /**
-         * Returns sorters available for the data
-         *
-         * @returns {array} Array containing available sorters
-         *
-         * @experimental
-         * @private
-         * @ui5-restricted sap.ui.mdc
-         */
-        Chart.prototype._getSorters = function () {
-            var aSorters;
-            var aSorterProperties = this.getSortConditions() ? this.getSortConditions().sorters : [];
-
-            aSorterProperties.forEach(function (oSortProp) {
-
-                var oMDCItem = this.getItems().find(function (oProp) {
-                    return oProp.getName() === oSortProp.name;
-                });
-
-                //Ignore not visible Items
-                if (!oMDCItem) {
-                    return;
-                }
-
-                //TODO: Check for inResultDimensions
-                var oSorter = this.getControlDelegate().getSorterForItem(oMDCItem, oSortProp);
-
-                if (aSorters) {
-                    aSorters.push(oSorter);
-                } else {
-                    aSorters = [
-                        oSorter
-                    ];//[] has special meaning in sorting
-                }
-            }.bind(this));
-
-            return aSorters;
-
-        };
-
         /**
          * Returns the fetched properties from the delegate
          *
@@ -1063,6 +1117,24 @@ sap.ui.define([
             return !!this._typeBtnActive;
         };
 
+        /**
+         * Sets the <code>noDataText</code> property.
+         * <code>noDataText</code> is displayed if the chart has no data to show.
+         * @param {string} sText New value for <code>noDataText</code>
+         * @returns {sap.ui.mdc.Chart} Reference to the <code>Chart</code>
+         */
+        Chart.prototype.setNoDataText = function(sText) {
+            this.setProperty("noDataText", sText);
+
+            try {
+                this.getControlDelegate().setNoDataText(this, sText);
+            } catch (error) {
+                //Nothing to do here as this is done during init
+            }
+
+            return this;
+        };
+
         /**
 		 * Callback for when fuilters changed
 		 * Activates the overlay on the MDC Chart
@@ -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