@openui5/sap.ui.integration 1.93.3 → 1.96.2

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

@@ -4,9 +4,17 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(["./BaseContentRenderer"], function (BaseContentRenderer) {
+sap.ui.define([
+	"./BaseContentRenderer",
+	"../library"
+], function (
+	BaseContentRenderer,
+	library
+) {
 	"use strict";
 
+	var AttributesLayoutType = library.AttributesLayoutType;
+
 	/**
 	 * ListContentRenderer renderer.
 	 * @author SAP SE
@@ -48,20 +56,43 @@ sap.ui.define(["./BaseContentRenderer"], function (BaseContentRenderer) {
 
 		var bIsCompact = this.isCompact(oControl),
 			oTemplate = oConfiguration.item,
-			fItemHeight = bIsCompact ? 2 : 2.75; // list item height in "rem"
+			fItemHeight = bIsCompact ? 1 : 1.125, // title height in "rem",
+			fVerticalPadding = bIsCompact ? 1 : 1.625, // vertical padding in "rem"
+			iAttrLength;
+
+		if (oTemplate.icon && !oTemplate.description) {
+			fVerticalPadding = bIsCompact ? 0 : 0.75;
+			fItemHeight = 2;
+		}
+
+		if (oTemplate.description) {
+			fVerticalPadding = 2;
+			fItemHeight += bIsCompact ? 2 : 1.875;
+		}
+
+		if (oTemplate.attributes) {
+			fVerticalPadding = 2.25;
+			iAttrLength = oTemplate.attributes.length / 2;
 
-		if (oTemplate.description || oTemplate.chart) {
-			fItemHeight = 5; // list item height with description or chart in "rem"
+			if (oTemplate.attributesLayoutType === AttributesLayoutType.OneColumn) {
+				iAttrLength = oTemplate.attributes.length;
+			}
+
+			iAttrLength = Math.ceil(iAttrLength);
+			fItemHeight += iAttrLength * 1.5; // attribute row height in "rem"
 		}
 
-		if (oTemplate.description && oTemplate.chart) {
-			fItemHeight = 6; // list item height with description and chart in "rem"
+		if (oTemplate.chart) {
+			fItemHeight += 1; // chart height in "rem"
 		}
 
 		if (oTemplate.actionsStrip) {
-			fItemHeight += bIsCompact ? 2.5 : 3.25; // actions strip height in "rem"
+			fVerticalPadding = 1;
+			fItemHeight += bIsCompact ? 3 : 3.75; // actions strip height in "rem"
 		}
 
+		fItemHeight += fVerticalPadding;
+
 		return fItemHeight;
 	};
 

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.f.NumericHeader
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
@@ -63,7 +63,8 @@ sap.ui.define([
 
 			extend(mSettings, {
 				unitOfMeasurement: mConfiguration.unitOfMeasurement,
-				details: mConfiguration.details
+				details: mConfiguration.details,
+				sideIndicatorsAlignment: mConfiguration.sideIndicatorsAlignment
 			});
 
 			if (mConfiguration.mainIndicator) {
@@ -252,6 +253,12 @@ sap.ui.define([
 		}
 	};
 
+	NumericHeader.prototype.refreshData = function () {
+		if (this._oDataProvider) {
+			this._oDataProvider.triggerDataUpdate();
+		}
+	};
+
 	/**
 	 * @private
 	 * @ui5-restricted

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @experimental

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
@@ -189,8 +189,15 @@ sap.ui.define([
 			disabledPropertyValue: ListType.Inactive
 		});
 
+		var oGroup = this.getConfiguration().group;
+
+		if (oGroup) {
+			this._oSorter = this._getGroupSorter(oGroup);
+		}
+
 		var oBindingInfo = {
-			template: this._oItemTemplate
+			template: this._oItemTemplate,
+			sorter: this._oSorter
 		};
 		this._filterHiddenNavigationItems(oRow, oBindingInfo);
 		this._bindAggregationToControl("items", oTable, oBindingInfo);

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @experimental

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @experimental

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @private
 	 * @since 1.74
@@ -32,11 +32,11 @@ sap.ui.define(["sap/ui/integration/thirdparty/adaptivecards"], function (Adaptiv
 
 		this._numberInputElement.addEventListener("change", function (oEvent) {
 			// the logic for min and max value from the native number input is handled here, since there are no similar properties in the ui5-input web component
-			if (oEvent.target.value > this._max) {
-				oEvent.target.value = this._max;
+			if (oEvent.target.value > this.max) {
+				oEvent.target.value = this.max;
 			}
-			if (oEvent.target.value < this._min) {
-				oEvent.target.value = this._min;
+			if (oEvent.target.value < this.min) {
+				oEvent.target.value = this.min;
 			}
 			this.valueChanged();
 		}.bind(this));
@@ -44,5 +44,12 @@ sap.ui.define(["sap/ui/integration/thirdparty/adaptivecards"], function (Adaptiv
 		return this._numberInputElement;
 
 	};
+
+	Object.defineProperty(UI5InputNumber.prototype, "value", {
+		get: function () {
+			return this._numberInputElement ? this._numberInputElement.value : undefined;
+		}
+	});
+
 	return UI5InputNumber;
 });

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @private
 	 * @since 1.74

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

@@ -100,17 +100,17 @@ sap.ui.define([
 		 * @private
 		 */
 		UI5InputTime.prototype._handleMinMaxProps = function () {
-			this._isMinValid = this._min && this._isValidTime(this._min);
-			this._isMaxValid = this._max && this._isValidTime(this._max);
+			this._isMinValid = this.min && this._isValidTime(this.min);
+			this._isMaxValid = this.max && this._isValidTime(this.max);
 
 			if (this._isMinValid) {
-				this._aMinValue = this._min.split(":");
+				this._aMinValue = this.min.split(":");
 				this._iMinHour = Number(this._aMinValue[0]);
 				this._iMinMinute = Number(this._aMinValue[1]);
 			}
 
 			if (this._isMaxValid) {
-				this._aMaxValue = this._max.split(":");
+				this._aMaxValue = this.max.split(":");
 				this._iMaxHour = Number(this._aMaxValue[0]);
 				this._iMaxMinute = Number(this._aMaxValue[1]);
 			}

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @private
 	 * @since 1.74

package/src/sap/ui/integration/cards/adaptivecards/overwrites/ActionRender.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/integration/thirdparty/adaptivecards"], function (Adaptiv
 		buttonElement.style.display = "flex";
 		buttonElement.style.alignItems = "center";
 		buttonElement.style.justifyContent = "center";
-		var hasTitle = !AdaptiveCards.isNullOrEmpty(this.title);
+		var hasTitle = this.title;
 		var titleElement = document.createElement("div");
 		titleElement.style.overflow = "hidden";
 		titleElement.style.textOverflow = "ellipsis";
@@ -29,7 +29,7 @@ sap.ui.define(["sap/ui/integration/thirdparty/adaptivecards"], function (Adaptiv
 		if (hasTitle) {
 			titleElement.innerText = this.title;
 		}
-		if (AdaptiveCards.isNullOrEmpty(this.iconUrl)) {
+		if (!this.iconUrl) {
 			buttonElement.classList.add("noIcon");
 			buttonElement.appendChild(titleElement);
 		} else {

package/src/sap/ui/integration/cards/{Filter.js → filters/BaseFilter.js}

@@ -10,9 +10,6 @@ sap.ui.define([
 	"sap/ui/core/Icon",
 	"sap/m/HBox",
 	"sap/m/Text",
-	"sap/m/Select",
-	"sap/ui/core/ListItem",
-	"sap/ui/model/json/JSONModel",
 	"sap/ui/integration/model/ObservableModel",
 	"sap/ui/integration/util/LoadingProvider"
 ], function (
@@ -22,16 +19,13 @@ sap.ui.define([
 	Icon,
 	HBox,
 	Text,
-	Select,
-	ListItem,
-	JSONModel,
 	ObservableModel,
 	LoadingProvider
 ) {
 	"use strict";
 
 	/**
-	 * Constructor for a new <code>Filter</code>.
+	 * Constructor for a new <code>BaseFilter</code>.
 	 *
 	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
 	 * @param {object} [mSettings] Initial settings for the new control
@@ -41,16 +35,17 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
-	 * @since 1.84
-	 * @alias sap.ui.integration.cards.Filter
+	 * @since 1.96
+	 * @alias sap.ui.integration.cards.filters.BaseFilter
 	 */
-	var Filter = Control.extend("sap.ui.integration.cards.Filter", {
+	var BaseFilter = Control.extend("sap.ui.integration.cards.filters.BaseFilter", {
 		metadata: {
-
+			"abstract" : true,
+			library: "sap.ui.integration",
 			properties: {
 				/**
 				 * Filter's key as it's defined in the manifest.
@@ -63,23 +58,16 @@ sap.ui.define([
 				config: { type: "object", defaultValue: "null" },
 
 				/**
-				 * The currently selected filter value.
+				 * The value of the filter that can be used in the manifest.
 				 */
-				value: { type: "string", defaultValue: "" }
+				value: { type: "object", defaultValue: null }
 			},
-
 			aggregations: {
-				/**
-				 * The internally used sap.m.Select control instance.
-				 */
-				_select: { type: "sap.m.Select", multiple: false, visibility: "hidden" },
-
 				/**
 				 * The internally used LoadingProvider.
 				 */
 				_loadingProvider: { type: "sap.ui.core.Element", multiple: false, visibility: "hidden" }
 			},
-
 			associations: {
 
 				/**
@@ -89,7 +77,6 @@ sap.ui.define([
 			}
 
 		},
-
 		renderer: {
 			apiVersion: 2,
 			render: function (oRM, oFilter) {
@@ -106,7 +93,7 @@ sap.ui.define([
 				if (oFilter._hasError()) {
 					oRM.renderControl(oFilter._getErrorMessage());
 				} else {
-					oRM.renderControl(oFilter._getSelect());
+					oRM.renderControl(oFilter.getField());
 				}
 
 				oRM.close("div");
@@ -114,7 +101,7 @@ sap.ui.define([
 		}
 	});
 
-	Filter.prototype.init = function () {
+	BaseFilter.prototype.init = function () {
 		this.setAggregation("_loadingProvider", new LoadingProvider());
 
 		this.attachEventOnce("_dataReady", function () {
@@ -122,34 +109,64 @@ sap.ui.define([
 		});
 	};
 
-	Filter.prototype.exit = function () {
+	BaseFilter.prototype.exit = function () {
 		if (this._oDataProvider) {
 			this._oDataProvider.destroy();
 			this._oDataProvider = null;
 		}
 	};
 
-	Filter.prototype.isLoading = function () {
+	BaseFilter.prototype.isLoading = function () {
 		var oLoadingProvider = this.getAggregation("_loadingProvider");
 
 		return !oLoadingProvider.isDataProviderJson() && oLoadingProvider.getLoading();
 	};
 
-	Filter.prototype._getSelect = function () {
-		var oControl = this.getAggregation("_select");
-		if (!oControl) {
-			oControl = this._createSelect();
-			this.setAggregation("_select", oControl);
+	BaseFilter.prototype.getField = function () {
+		return null;
+	};
+
+	/**
+	 * @private
+	 * @ui5-restricted
+	 */
+	BaseFilter.prototype.showLoadingPlaceholders = function () {
+		this.getAggregation("_loadingProvider").setLoading(true);
+	};
+
+	/**
+	 * @private
+	 * @ui5-restricted
+	 */
+	BaseFilter.prototype.hideLoadingPlaceholders = function () {
+		this.getAggregation("_loadingProvider").setLoading(false);
+	};
+
+	BaseFilter.prototype.onDataChanged = function () { };
+
+	BaseFilter.prototype.getValueForModel = function () { };
+
+	BaseFilter.prototype.refreshData = function () {
+		if (this._oDataProvider) {
+			this._oDataProvider.triggerDataUpdate();
 		}
+	};
 
-		return oControl;
+	/**
+	 * Gets the card instance of which this element is part of.
+	 * @ui5-restricted
+	 * @private
+	 * @returns {sap.ui.integration.widgets.Card} The card instance.
+	 */
+	BaseFilter.prototype.getCardInstance = function () {
+		return Core.byId(this.getCard());
 	};
 
-	Filter.prototype._hasError = function () {
+	BaseFilter.prototype._hasError = function () {
 		return !!this._bError;
 	};
 
-	Filter.prototype._getErrorMessage = function () {
+	BaseFilter.prototype._getErrorMessage = function () {
 		var sMessage = "Unable to load the filter.";
 
 		return new HBox({
@@ -162,47 +179,24 @@ sap.ui.define([
 		});
 	};
 
-	Filter.prototype._handleError = function (sLogMessage) {
+	BaseFilter.prototype._handleError = function (sLogMessage) {
 		Log.error(sLogMessage);
 
 		this._bError = true;
 		this.invalidate();
 	};
 
-	Filter.prototype._onDataRequestComplete = function () {
+	BaseFilter.prototype._onDataRequestComplete = function () {
 		this.fireEvent("_dataReady");
 		this.hideLoadingPlaceholders();
 	};
 
-	/**
-	 * @private
-	 * @ui5-restricted
-	 */
-	Filter.prototype.showLoadingPlaceholders = function () {
-		this.getAggregation("_loadingProvider").setLoading(true);
-	};
-
-	/**
-	 * @private
-	 * @ui5-restricted
-	 */
-	Filter.prototype.hideLoadingPlaceholders = function () {
-		this.getAggregation("_loadingProvider").setLoading(false);
-	};
-
-	Filter.prototype._onDataChanged = function () {
-		var oSelect = this._getSelect();
-
-		oSelect.setSelectedKey(this.getValue());
-		this._updateSelected(oSelect.getSelectedItem());
-	};
-
 	/**
 	 * Uses the Card's own DataProvider and the provided oDataConfig object to populate the Filter's data.
 	 * @private
 	 * @param {object} oDataConfig Data configuration
 	 */
-	Filter.prototype._setDataConfiguration = function (oDataConfig) {
+	BaseFilter.prototype._setDataConfiguration = function (oDataConfig) {
 		var oCard = this.getCardInstance(),
 			oModel;
 
@@ -227,7 +221,7 @@ sap.ui.define([
 		}
 
 		oModel.attachEvent("change", function () {
-			this._onDataChanged();
+			this.onDataChanged();
 		}.bind(this));
 
 		this._oDataProvider.attachDataRequested(function () {
@@ -247,71 +241,5 @@ sap.ui.define([
 		this._oDataProvider.triggerDataUpdate();
 	};
 
-	Filter.prototype._updateSelected = function (oSelectedItem) {
-		var oFiltersModel = this.getModel("filters"),
-			sFilterKey = this.getKey();
-
-		oFiltersModel.setProperty("/" + sFilterKey, {
-			"value": oSelectedItem.getKey(),
-			"selectedItem": {
-				"title": oSelectedItem.getText(),
-				"key": oSelectedItem.getKey()
-			}
-		});
-	};
-
-	/**
-	 * Constructs a Select control configured with the Filter's properties.
-	 *
-	 * @private
-	 * @returns {sap.m.Select} configured instance
-	 */
-	Filter.prototype._createSelect = function () {
-		var oSelect = new Select(),
-			sItemTemplateKey,
-			sItemTemplateTitle,
-			sItemsPath = "/",
-			oConfig = this.getConfig();
-
-		oSelect.attachChange(function (oEvent) {
-			var sValue = oEvent.getParameter("selectedItem").getKey();
-			this.setValue(sValue);
-			this._updateSelected(oEvent.getParameter("selectedItem"));
-		}.bind(this));
-
-		if (oConfig && oConfig.item) {
-			sItemsPath = oConfig.item.path || sItemsPath;
-		}
-
-		if (oConfig && oConfig.item && oConfig.item.template) {
-			sItemTemplateKey = oConfig.item.template.key;
-			sItemTemplateTitle = oConfig.item.template.title;
-		}
-
-		if (oConfig && oConfig.items) {
-			sItemTemplateKey = "{key}";
-			sItemTemplateTitle = "{title}";
-			this.setModel(new JSONModel(oConfig.items));
-		}
-
-		oSelect.bindItems({
-			path: sItemsPath,
-			template: new ListItem({ key: sItemTemplateKey, text: sItemTemplateTitle })
-		});
-		oSelect.setSelectedKey(this.getValue());
-
-		return oSelect;
-	};
-
-	/**
-	 * Gets the card instance of which this element is part of.
-	 * @ui5-restricted
-	 * @private
-	 * @returns {sap.ui.integration.widgets.Card} The card instance.
-	 */
-	Filter.prototype.getCardInstance = function () {
-		return Core.byId(this.getCard());
-	};
-
-	return Filter;
+	return BaseFilter;
 });