@openui5/sap.ui.integration 1.96.2 → 1.97.0

package/src/sap/ui/integration/cards/ObjectContent.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.integration.cards.BaseContent
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @experimental
@@ -171,6 +171,7 @@ sap.ui.define([
 
 	ObjectContent.prototype.setConfiguration = function (oConfiguration) {
 		BaseContent.prototype.setConfiguration.apply(this, arguments);
+		oConfiguration = this.getParsedConfiguration();
 
 		if (!oConfiguration) {
 			return this;
@@ -210,149 +211,162 @@ sap.ui.define([
 			}
 
 			oGroup.items.forEach(function (oItem) {
+				this._createGroupItems(oItem).forEach(oGroupContainer.addItem, oGroupContainer);
+			}, this);
+			oContainer.addContent(oGroupContainer);
+		}, this);
 
-				var vLabel = oItem.label,
-					vValue = oItem.value,
-					oLabel,
-					vVisible,
-					oControl,
-					vHref,
-					aBindingParts = [];
-
-				if (typeof oItem.visible == "string") {
-					vVisible = !Utils.hasFalsyValueAsString(oItem.visible);
-				} else {
-					vVisible = oItem.visible;
-				}
-
-				if (vLabel) {
-					// Checks if the label ends with ":" and if not we just add the ":"
-					vLabel = BindingHelper.formattedProperty(vLabel, function (sValue) {
-						return sValue && sValue[sValue.length - 1] === ":" ? sValue : sValue + ":";
-					});
-					oLabel = new Label({
-						text: vLabel,
-						visible: vVisible
-					}).addStyleClass("sapFCardObjectItemLabel");
-				}
+		this._oActions.attach({
+			area: ActionArea.Content,
+			actions: oConfiguration.actions,
+			control: this
+		});
+	};
 
-				if (vValue && oItem.actions) {
+	ObjectContent.prototype._createGroupItems = function (oItem) {
+		var vLabel = oItem.label,
+			vValue = oItem.value,
+			oLabel,
+			vVisible,
+			oControl,
+			vHref,
+			aBindingParts = [];
+
+		if (typeof oItem.visible == "string") {
+			vVisible = !Utils.hasFalsyValueAsString(oItem.visible);
+		} else {
+			vVisible = oItem.visible;
+		}
+
+		if (vLabel) {
+			// Checks if the label ends with ":" and if not we just add the ":"
+			vLabel = BindingHelper.formattedProperty(vLabel, function (sValue) {
+				return sValue && sValue[sValue.length - 1] === ":" ? sValue : sValue + ":";
+			});
+			oLabel = new Label({
+				text: vLabel,
+				visible: vVisible
+			}).addStyleClass("sapFCardObjectItemLabel");
+		}
+
+		if (vValue && oItem.actions) {
+			oControl = new Link({
+				text: vValue,
+				visible: BindingHelper.reuse(vVisible)
+			});
+
+			if (oLabel) {
+				oControl.addAriaLabelledBy(oLabel);
+			} else {
+				Log.warning("Missing label for Object group item with actions.", null, "sap.ui.integration.widgets.Card");
+			}
+
+			this._oActions.attach({
+				area: ActionArea.ContentItemDetail,
+				actions: oItem.actions,
+				control: this,
+				actionControl: oControl,
+				enabledPropertyName: "enabled"
+			});
+		}
+
+		// deprecated "type" property
+		if (vValue && !oItem.actions && oItem.type) {
+			Log.warning("Usage of Object Group Item property 'type' is deprecated. Use Card Actions for navigation.", null, "sap.ui.integration.widgets.Card");
+
+			switch (oItem.type) {
+				case 'link':
 					oControl = new Link({
+						href: oItem.url || vValue,
 						text: vValue,
+						target: oItem.target || '_blank',
 						visible: BindingHelper.reuse(vVisible)
 					});
-					this._oActions.attach({
-						area: ActionArea.ContentItemDetail,
-						actions: oItem.actions,
-						control: this,
-						actionControl: oControl,
-						enabledPropertyName: "enabled"
-					});
-				}
-
-				if (vValue && !oItem.actions && oItem.type) {
-					Log.warning("Usage of Object Group Item property 'type' is deprecated. Use Card Actions for navigation.", null, "sap.ui.integration.widgets.Card");
-
-					switch (oItem.type) {
-						case 'link':
-							oControl = new Link({
-								href: oItem.url || vValue,
-								text: vValue,
-								target: oItem.target || '_blank',
-								visible: BindingHelper.reuse(vVisible)
-							});
-							break;
-						case 'email':
-							if (oItem.value) {
-								aBindingParts.push(oItem.value);
-							}
-							if (oItem.emailSubject) {
-								aBindingParts.push(oItem.emailSubject);
-							}
-
-							vHref = BindingHelper.formattedProperty(aBindingParts, function (sValue, sEmailSubject) {
-									if (sEmailSubject) {
-										return "mailto:" + sValue + "?subject=" + sEmailSubject;
-									} else {
-										return "mailto:" + sValue;
-									}
-								});
-
-							oControl = new Link({
-								href: vHref,
-								text: vValue,
-								visible: BindingHelper.reuse(vVisible)
-							});
-							break;
-						case 'phone':
-							vHref = BindingHelper.formattedProperty(vValue, function (sValue) {
-								return "tel:" + sValue;
-							});
-							oControl = new Link({
-								href: vHref,
-								text: vValue,
-								visible: BindingHelper.reuse(vVisible)
-							});
-							break;
-						default:
+					break;
+				case 'email':
+					if (oItem.value) {
+						aBindingParts.push(oItem.value);
+					}
+					if (oItem.emailSubject) {
+						aBindingParts.push(oItem.emailSubject);
 					}
-				}
 
-				if (vValue && !oControl) {
-					oControl = new Text({
+					vHref = BindingHelper.formattedProperty(aBindingParts, function (sValue, sEmailSubject) {
+							if (sEmailSubject) {
+								return "mailto:" + sValue + "?subject=" + sEmailSubject;
+							} else {
+								return "mailto:" + sValue;
+							}
+						});
+
+					oControl = new Link({
+						href: vHref,
 						text: vValue,
 						visible: BindingHelper.reuse(vVisible)
 					});
-				}
-
-				if (oControl) {
-					oControl.addStyleClass("sapFCardObjectItemText");
-				}
-
-				if (oItem.icon) {
-					var vSrc = BindingHelper.formattedProperty(oItem.icon.src, function (sValue) {
-						return this._oIconFormatter.formatSrc(sValue);
-					}.bind(this));
-
-					var oAvatar = new Avatar({
-						displaySize: oItem.icon.size || AvatarSize.XS,
-						src: vSrc,
-						initials: oItem.icon.text,
-						displayShape: oItem.icon.shape,
-						tooltip: oItem.icon.alt,
-						backgroundColor: oItem.icon.backgroundColor || (oItem.icon.text ? undefined : AvatarColor.Transparent)
-					}).addStyleClass("sapFCardObjectItemAvatar sapFCardIcon");
-
-					var oVbox = new VBox({
-						renderType: FlexRendertype.Bare,
-						items: [
-							oLabel,
-							oControl
-						]
+					break;
+				case 'phone':
+					vHref = BindingHelper.formattedProperty(vValue, function (sValue) {
+						return "tel:" + sValue;
 					});
-					var oHBox = new HBox({
-						visible: vVisible,
-						renderType: FlexRendertype.Bare,
-						items: [
-							oAvatar,
-							oVbox
-						]
-					}).addStyleClass("sapFCardObjectItemLabel");
-
-					oGroupContainer.addItem(oHBox);
-				} else {
-					oGroupContainer.addItem(oLabel);
-					oGroupContainer.addItem(oControl);
-				}
-			}, this);
-			oContainer.addContent(oGroupContainer);
-		}, this);
+					oControl = new Link({
+						href: vHref,
+						text: vValue,
+						visible: BindingHelper.reuse(vVisible)
+					});
+					break;
+				default:
+			}
+		}
 
-		this._oActions.attach({
-			area: ActionArea.Content,
-			actions: oConfiguration.actions,
-			control: this
-		});
+		if (vValue && !oControl) {
+			oControl = new Text({
+				text: vValue,
+				visible: BindingHelper.reuse(vVisible)
+			});
+		}
+
+		if (oControl) {
+			oControl.addStyleClass("sapFCardObjectItemText");
+		}
+
+		if (oItem.icon) {
+			var oVbox = new VBox({
+				renderType: FlexRendertype.Bare,
+				items: [
+					oLabel,
+					oControl
+				]
+			});
+			var oHBox = new HBox({
+				visible: vVisible,
+				renderType: FlexRendertype.Bare,
+				items: [
+					this._createGroupItemAvatar(oItem.icon),
+					oVbox
+				]
+			}).addStyleClass("sapFCardObjectItemLabel");
+			return [oHBox];
+		} else {
+			return [oLabel, oControl];
+		}
+	};
+
+	ObjectContent.prototype._createGroupItemAvatar = function (oIconConfiguration) {
+		var vSrc = BindingHelper.formattedProperty(oIconConfiguration.src, function (sValue) {
+			return this._oIconFormatter.formatSrc(sValue);
+		}.bind(this));
+
+		var oAvatar = new Avatar({
+			displaySize: oIconConfiguration.size || AvatarSize.XS,
+			src: vSrc,
+			initials: oIconConfiguration.text,
+			displayShape: oIconConfiguration.shape,
+			tooltip: oIconConfiguration.alt,
+			backgroundColor: oIconConfiguration.backgroundColor || (oIconConfiguration.text ? undefined : AvatarColor.Transparent)
+		}).addStyleClass("sapFCardObjectItemAvatar sapFCardIcon");
+
+		return oAvatar;
 	};
 
 	return ObjectContent;

package/src/sap/ui/integration/cards/TableContent.js

@@ -77,7 +77,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseListContent
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private
@@ -120,14 +120,11 @@ sap.ui.define([
 	};
 
 	/**
-	 * Setter for configuring a <code>sap.ui.integration.cards.TableContent</code>.
-	 *
-	 * @public
-	 * @param {Object} oConfiguration Configuration object used to create the internal table.
-	 * @returns {this} Pointer to the control instance to allow method chaining.
+	 * @override
 	 */
 	TableContent.prototype.setConfiguration = function (oConfiguration) {
 		BaseListContent.prototype.setConfiguration.apply(this, arguments);
+		oConfiguration = this.getParsedConfiguration();
 
 		if (!oConfiguration) {
 			return this;
@@ -149,7 +146,7 @@ sap.ui.define([
 	 * Handler for when data is changed.
 	 */
 	TableContent.prototype.onDataChanged = function () {
-		this._checkHiddenNavigationItems(this.getConfiguration().row);
+		this._checkHiddenNavigationItems(this.getParsedConfiguration().row);
 	};
 
 	/**
@@ -189,7 +186,7 @@ sap.ui.define([
 			disabledPropertyValue: ListType.Inactive
 		});
 
-		var oGroup = this.getConfiguration().group;
+		var oGroup = this.getParsedConfiguration().group;
 
 		if (oGroup) {
 			this._oSorter = this._getGroupSorter(oGroup);

package/src/sap/ui/integration/cards/TimelineContent.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseListContent
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @experimental
@@ -117,14 +117,11 @@ sap.ui.define([
 	};
 
 	/**
-	 * Setter for configuring a <code>sap.ui.integration.cards.TimelineContent</code>.
-	 *
-	 * @public
-	 * @param {Object} oConfiguration Configuration object used to create the internal list.
-	 * @returns {this} Pointer to the control instance to allow method chaining.
+	 * @override
 	 */
 	TimelineContent.prototype.setConfiguration = function (oConfiguration) {
 		BaseListContent.prototype.setConfiguration.apply(this, arguments);
+		oConfiguration = this.getParsedConfiguration();
 
 		if (!oConfiguration) {
 			return this;
@@ -146,7 +143,7 @@ sap.ui.define([
 	 * Handler for when data is changed.
 	 */
 	TimelineContent.prototype.onDataChanged = function () {
-		this._checkHiddenNavigationItems(this.getConfiguration().item);
+		this._checkHiddenNavigationItems(this.getParsedConfiguration().item);
 	};
 
 	/**
@@ -158,7 +155,7 @@ sap.ui.define([
 	 */
 	TimelineContent.prototype._setItem = function (mItem) {
 		var mSettings = {
-			userNameClickable : false,
+			userNameClickable: false,
 			title: mItem.title && mItem.title.value,
 			text: mItem.description && mItem.description.value,
 			dateTime: mItem.dateTime && mItem.dateTime.value,
@@ -179,7 +176,8 @@ sap.ui.define([
 			area: ActionArea.ContentItem,
 			actions: mItem.actions,
 			control: this,
-			actionControl: this._oItemTemplate
+			actionControl: this._oTimeLineItemTemplate,
+			eventName: "select"
 		});
 
 		var oBindingInfo = {

package/src/sap/ui/integration/cards/WebPageContent.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @experimental
@@ -105,8 +105,12 @@ sap.ui.define([
 		this._checkSrc();
 	};
 
+	/**
+	 * @override
+	 */
 	WebPageContent.prototype.setConfiguration = function (oConfiguration) {
 		BaseContent.prototype.setConfiguration.apply(this, arguments);
+		oConfiguration = this.getParsedConfiguration();
 
 		//workaround until actions refactor
 		this.fireEvent("_actionContentReady"); // todo

package/src/sap/ui/integration/cards/adaptivecards/elements/UI5InputChoiceSet.js

@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/integration/thirdparty/adaptivecards"], function (Adaptiv
 	 * <code>ui5-select</code>, or container with <code>ui5-radiobutton</code>, or <code>ui5-checkbox</code> web components.
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @since 1.74

package/src/sap/ui/integration/cards/adaptivecards/elements/UI5InputDate.js

@@ -16,7 +16,7 @@ sap.ui.define(["sap/ui/integration/thirdparty/adaptivecards"], function (Adaptiv
 	 * <code>ui5-datepicker</code> web component.
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @since 1.74

package/src/sap/ui/integration/cards/adaptivecards/elements/UI5InputNumber.js

@@ -16,7 +16,7 @@ sap.ui.define(["sap/ui/integration/thirdparty/adaptivecards"], function (Adaptiv
 	 * <code>ui5-input</code> web component with type Number.
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @since 1.74

package/src/sap/ui/integration/cards/adaptivecards/elements/UI5InputText.js

@@ -16,7 +16,7 @@ sap.ui.define(["sap/ui/integration/thirdparty/adaptivecards"], function (Adaptiv
 	 * <code>ui5-input</code> or <code>ui5-textarea<code> UI5 web component.
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @since 1.74

package/src/sap/ui/integration/cards/adaptivecards/elements/UI5InputToggle.js

@@ -16,7 +16,7 @@ sap.ui.define(["sap/ui/integration/thirdparty/adaptivecards"], function (Adaptiv
 	 * <code>ui5-checkbox</code> web component.
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @since 1.74

package/src/sap/ui/integration/cards/filters/BaseFilter.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/cards/filters/DateRangeFilter.js

@@ -23,11 +23,11 @@ sap.ui.define([
 	var MAX_ODATA_DATE = new Date("9999-12-31");
 
 	/**
-	 * @param {string} sOperator sap.m.StandardDynamicDateRangeKeys operator in upper case
-	 * @returns {string} Operator in camel case
+	 * @param {string} sOption sap.m.StandardDynamicDateRangeKeys option in upper case
+	 * @returns {string} Option in camel case
 	 */
-	function operatorToCamelCase(sOperator) {
-		var mOperators = {
+	function optionToCamelCase(sOption) {
+		var mOptions = {
 			"DATE": "date",
 			"TODAY": "today",
 			"YESTERDAY": "yesterday",
@@ -71,7 +71,7 @@ sap.ui.define([
 			"NEXTYEAR": "nextYear"
 		};
 
-		return mOperators[sOperator];
+		return mOptions[sOption];
 	}
 
 	/**
@@ -85,7 +85,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.filters.BaseFilter
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private
@@ -124,8 +124,12 @@ sap.ui.define([
 		var oRangeOData;
 
 		if (oDateRangeValue) {
-			oValue = Object.assign({}, oDateRangeValue);
-			var aDates = DynamicDateUtil.toDates(oValue),
+			oValue = {
+				option: optionToCamelCase(oDateRangeValue.operator),
+				values: oDateRangeValue.values.slice()
+			};
+
+			var aDates = DynamicDateUtil.toDates(oDateRangeValue),
 				dStart = aDates[0].getJSDate ? aDates[0].getJSDate() : aDates[0],
 				dEnd = aDates[1].getJSDate ? aDates[1].getJSDate() : aDates[1];
 
@@ -138,17 +142,15 @@ sap.ui.define([
 				end: dEnd.toISOString()
 			};
 
-			if (oValue.operator === "TO") {
+			if (oDateRangeValue.operator === "TO") {
 				oRange.start = MIN_DATE.toISOString();
 				oRangeOData.start = MIN_ODATA_DATE.toISOString();
 			}
 
-			if (oValue.operator === "FROM") {
+			if (oDateRangeValue.operator === "FROM") {
 				oRange.end = MAX_DATE.toISOString();
 				oRangeOData.end = MAX_ODATA_DATE.toISOString();
 			}
-
-			oValue.operator = operatorToCamelCase(oValue.operator);
 		}
 
 		return {
@@ -179,7 +181,7 @@ sap.ui.define([
 		var oValue;
 
 		if (oConfig.value) {
-			var sOption = oConfig.value.operator.toUpperCase();
+			var sOption = oConfig.value.option.toUpperCase();
 			var aTypes = DynamicDateUtil.getOption(sOption).getValueTypes();
 			oValue = {
 				operator: sOption,

package/src/sap/ui/integration/cards/filters/FilterBarFactory.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/cards/filters/SelectFilter.js

@@ -7,12 +7,14 @@ sap.ui.define([
 	"./BaseFilter",
 	"sap/m/Select",
 	"sap/ui/core/ListItem",
-	"sap/ui/model/json/JSONModel"
+	"sap/ui/model/json/JSONModel",
+	"sap/ui/integration/util/BindingResolver"
 ], function (
 	BaseFilter,
 	Select,
 	ListItem,
-	JSONModel
+	JSONModel,
+	BindingResolver
 ) {
 	"use strict";
 
@@ -27,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.filters.BaseFilter
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private
@@ -94,6 +96,34 @@ sap.ui.define([
 		};
 	};
 
+	/**
+	 * @returns {object} Filter configuration with static items
+	 */
+	SelectFilter.prototype.getStaticConfiguration = function () {
+		var oConfiguration =  this.getConfig();
+		var sPath = "/";
+		var aItems = this.getModel().getProperty(sPath);
+		var aResolvedItems = [];
+
+		if (oConfiguration.item && oConfiguration.item.path) {
+			sPath = oConfiguration.item.path;
+		}
+
+		for (var i = 0; i < aItems.length; i++) {
+			if (sPath === "/") {
+				aResolvedItems.push(BindingResolver.resolveValue(oConfiguration.item, this, sPath + i));
+			} else {
+				aResolvedItems.push(BindingResolver.resolveValue(oConfiguration.item, this, sPath + "/" + i));
+			}
+		}
+
+		var oStaticConfiguration = Object.assign({}, oConfiguration);
+		delete oStaticConfiguration.item;
+		oStaticConfiguration.items = aResolvedItems;
+
+		return oStaticConfiguration;
+	};
+
 	SelectFilter.prototype._getSelect = function () {
 		var oControl = this.getAggregation("_select");
 		if (!oControl) {

package/src/sap/ui/integration/controls/ActionsStrip.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/controls/ActionsToolbar.js

@@ -76,7 +76,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/controls/ListContentItem.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.m.StandardListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/controls/Microchart.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/controls/MicrochartLegend.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private