@openui5/sap.ui.integration 1.128.0 → 1.130.0

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

@@ -5,7 +5,7 @@
  */
 sap.ui.define([
 	"./BaseFilter",
-	"sap/m/ComboBox",
+	"sap/ui/integration/controls/ComboBox",
 	"sap/ui/core/ListItem",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/integration/util/BindingResolver",
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.filters.BaseFilter
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -93,7 +93,16 @@ sap.ui.define([
 	 * @override
 	 */
 	ComboBoxFilter.prototype.getValueForModel = function () {
-		const oSelectedItem = this._getComboBox().getSelectedItem();
+		const oComboBox = this._getComboBox();
+		let oSelectedItem = oComboBox.getSelectedItem();
+		const iSelectedIndex = oComboBox.getCustomSelectedIndex();
+
+		if (!oSelectedItem && (iSelectedIndex > -1)) {
+			oSelectedItem = this._getComboBox().getItems()[iSelectedIndex];
+			if (oSelectedItem && !this._getComboBox().getValue()) {
+				oComboBox.setSelectedItem(oSelectedItem);
+			}
+		}
 
 		if (oSelectedItem) {
 			return {
@@ -169,6 +178,19 @@ sap.ui.define([
 		return oStaticConfiguration;
 	};
 
+	/**
+	 * @override
+	 */
+	ComboBoxFilter.prototype.writeValueToConfiguration = function (oConfiguration) {
+		const oValueForModel = this.getValueForModel();
+
+		oConfiguration.value = oValueForModel.value;
+
+		if (oValueForModel.selectedItem) {
+			oConfiguration.selectedKey = oValueForModel.selectedItem.key;
+		}
+	};
+
 	ComboBoxFilter.prototype._getComboBox = function () {
 		let oControl = this.getAggregation("_comboBox");
 		if (!oControl) {
@@ -191,7 +213,8 @@ sap.ui.define([
 		const oComboBox = new ComboBox({
 			placeholder: oConfig.placeholder,
 			showSecondaryValues: true,
-			filterSecondaryValues: true
+			filterSecondaryValues: true,
+			customSelectedIndex: oConfig.selectedIndex
 		});
 
 		let sItemTemplateKey,

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.filters.BaseFilter
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -72,6 +72,16 @@ sap.ui.define([
 		return DateRangeHelper.getValueForModel(this._getDdr());
 	};
 
+	/**
+	 * @override
+	 */
+	DateRangeFilter.prototype.writeValueToConfiguration = function (oConfiguration) {
+		const oValueForModel = this.getValueForModel();
+
+		oConfiguration.value.option = oValueForModel.value.option;
+		oConfiguration.value.values = oValueForModel.value.values;
+	};
+
 	DateRangeFilter.prototype._getDdr = function () {
 		var oControl = this.getAggregation("_ddr");
 		if (!oControl) {

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.filters.BaseFilter
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -82,6 +82,13 @@ sap.ui.define([
 		return oStaticConfiguration;
 	};
 
+	/**
+	 * @override
+	 */
+	SearchFilter.prototype.writeValueToConfiguration = function (oConfiguration) {
+		oConfiguration.value = this.getValueForModel().value;
+	};
+
 	SearchFilter.prototype._getSearchField = function () {
 		var oControl = this.getAggregation("_searchField");
 		if (!oControl) {

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.filters.BaseFilter
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -84,6 +84,10 @@ sap.ui.define([
 	SelectFilter.prototype.getValueForModel = function () {
 		var oSelectedItem = this._getSelect().getSelectedItem();
 
+		if (!oSelectedItem) {
+			oSelectedItem = this._getSelect().getItems()[0];
+		}
+
 		if (oSelectedItem) {
 			return {
 				value: oSelectedItem.getKey(),
@@ -148,6 +152,13 @@ sap.ui.define([
 		return oStaticConfiguration;
 	};
 
+	/**
+	 * @override
+	 */
+	SelectFilter.prototype.writeValueToConfiguration = function (oConfiguration) {
+		oConfiguration.value = this.getValueForModel().value;
+	};
+
 	SelectFilter.prototype._getSelect = function () {
 		var oControl = this.getAggregation("_select");
 		if (!oControl) {

package/src/sap/ui/integration/cards/list/MicrochartsResizeHelper.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.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.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -0,0 +1,47 @@
+/*!
+* OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+*/
+
+sap.ui.define([
+	"sap/m/ComboBox",
+	"sap/m/ComboBoxRenderer"
+], function (
+	MComboBox,
+	MComboBoxRenderer
+) {
+	"use strict";
+
+	/**
+	 * Constructor for a new ComboBox.
+	 *
+	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
+	 * @param {object} [mSettings] Initial settings for the new control
+	 *
+	 * @class
+	 *
+	 * @extends sap.m.ComboBox
+	 *
+	 * @author SAP SE
+	 * @version 1.130.0
+	 *
+	 * @constructor
+	 * @private
+	 * @alias sap.ui.integration.controls.ComboBox
+	 */
+	var ComboBox = MComboBox.extend("sap.ui.integration.controls.ComboBox", {
+		metadata: {
+			library: "sap.ui.integration",
+			properties: {
+				customSelectedIndex: {
+					type: "int",
+					defaultValue: -1
+				}
+			}
+		},
+		renderer: MComboBoxRenderer
+	});
+
+	return ComboBox;
+});

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

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -35,7 +35,6 @@ sap.ui.define([
 
 	var AttributesLayoutType = library.AttributesLayoutType;
 	var ValueState = coreLibrary.ValueState;
-	var EmptyIndicatorMode = mLibrary.EmptyIndicatorMode;
 	var AvatarImageFitType = mLibrary.AvatarImageFitType;
 
 	/**
@@ -49,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -121,6 +120,11 @@ sap.ui.define([
 				 */
 				iconVisible: { type: "boolean", defaultValue: true },
 
+				/**
+				 * Defines whether the info is specified.
+				 */
+				hasInfo: { type: "boolean", defaultValue: false },
+
 				/**
 				 * Defines an additional information text.
 				 */
@@ -328,8 +332,7 @@ sap.ui.define([
 			.setText(this.getInfo())
 			.setState(this.getInfoState())
 			.setShowStateIcon(this.getShowInfoStateIcon())
-			.setIcon(this.getCustomInfoStatusIcon())
-			.setEmptyIndicatorMode(EmptyIndicatorMode.On);
+			.setIcon(this.getCustomInfoStatusIcon());
 
 		return oObjectStatus;
 	};

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

@@ -102,7 +102,7 @@ sap.ui.define([
 
 	ListContentItemRenderer.renderTitle = function(rm, oLI) {
 		var sTitle = oLI.getTitle(),
-			sInfo = oLI.getInfo();
+			bHasInfo = oLI.getHasInfo();
 
 		rm.openStart("div")
 			.class("sapUiIntLCITitleWrapper")
@@ -114,7 +114,7 @@ sap.ui.define([
 			.text(sTitle)
 			.close("div");
 
-		if (sInfo && !oLI.getDescription() && oLI.getInfoVisible()) {
+		if (bHasInfo && !oLI.getDescription() && oLI.getInfoVisible()) {
 			this.renderInfo(rm, oLI);
 		}
 
@@ -123,7 +123,7 @@ sap.ui.define([
 
 	ListContentItemRenderer.renderDescription = function(rm, oLI) {
 		var sDescription = oLI.getDescription(),
-			sInfo = oLI.getInfo();
+			bHasInfo = oLI.getHasInfo();
 
 		rm.openStart("div")
 			.class("sapUiIntLCIDescriptionWrapper")
@@ -135,7 +135,7 @@ sap.ui.define([
 			.text(sDescription)
 			.close("div");
 
-		if (sInfo && oLI.getInfoVisible()) {
+		if (bHasInfo && oLI.getInfoVisible()) {
 			this.renderInfo(rm, oLI);
 		}
 

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

@@ -99,7 +99,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.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.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -5,14 +5,24 @@
 */
 
 sap.ui.define([
+	"sap/m/library",
+	'sap/ui/core/library',
 	"sap/m/ObjectStatus",
 	"sap/m/ObjectStatusRenderer"
 ], function (
+	library,
+	coreLibrary,
 	MObjectStatus,
 	MObjectStatusRenderer
 ) {
 	"use strict";
 
+	// shortcut for sap.m.EmptyIndicator
+	var EmptyIndicatorMode = library.EmptyIndicatorMode;
+
+	// shortcuts for sap.ui.core.ValueState
+	var ValueState = coreLibrary.ValueState;
+
 	/**
 	 * Constructor for a new ObjectStatus.
 	 *
@@ -24,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.m.ObjectStatus
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -41,6 +51,21 @@ sap.ui.define([
 		renderer: MObjectStatusRenderer
 	});
 
+	ObjectStatus.prototype._isEmpty = function() {
+		return this.getEmptyIndicatorMode() === EmptyIndicatorMode.Off &&
+			this._hasNoValue();
+	};
+
+	ObjectStatus.prototype._shouldRenderEmptyIndicator = function() {
+		return this.getEmptyIndicatorMode() === EmptyIndicatorMode.On &&
+			this._hasNoValue();
+	};
+
+	ObjectStatus.prototype._hasNoValue = function() {
+		return !this.getText() &&
+			(!this.getShowStateIcon() || (this.getShowStateIcon() && this.getState() === ValueState.None && !this.getIcon()));
+	};
+
 	ObjectStatus.prototype.onBeforeRendering = function () {
 		if (this.getShowStateIcon()) {
 			if (!this.getIcon()) {

package/src/sap/ui/integration/delegate/Paginator.js

@@ -0,0 +1,287 @@
+/*!
+* OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+*/
+
+sap.ui.define([
+	"sap/base/util/uid",
+	"sap/ui/base/ManagedObject",
+	"sap/ui/integration/util/BindingResolver",
+	"sap/ui/integration/util/openCardDialog",
+	"sap/ui/integration/util/Utils",
+	"sap/m/BusyIndicator"
+], (
+	uid,
+	ManagedObject,
+	BindingResolver,
+	openCardDialog,
+	Utils,
+	BusyIndicator
+) => {
+	"use strict";
+
+	/**
+	 * Constructor for a new Paginator.
+	 *
+	 * @param {string} [sId] ID, generated automatically if no ID is given
+	 * @param {object} [mSettings] Initial settings
+	 *
+	 * @class
+	 *
+	 * @extends sap.ui.base.ManagedObject
+	 *
+	 * @author SAP SE
+	 * @version 1.130.0
+	 *
+	 * @constructor
+	 * @ui5-restricted
+	 * @private
+	 * @alias sap.ui.integration.delegate.Paginator
+	 */
+	const Paginator = ManagedObject.extend("sap.ui.integration.delegate.Paginator", {
+		metadata: {
+			library: "sap.ui.integration",
+			properties: {
+				active: { type: "boolean", defaultValue: false },
+				card: { type: "object" },
+				/**
+				 * Paginator configuration from the manifest
+				 */
+				configuration: { type: "object" },
+				paginatorModel: { type: "object" }
+			}
+		}
+	});
+
+	Paginator.create = function (oSettings) {
+		if (!oSettings) {
+			return null;
+		}
+
+		const oPaginator = new Paginator(oSettings);
+
+		oPaginator._applySettings();
+		oPaginator._updatePaginatorModel();
+
+		return oPaginator;
+	};
+
+	Paginator.prototype.init = function() {
+		this._iPageNumber = 0;
+		this._iPageCount = 0;
+	};
+
+	Paginator.prototype._applySettings = function() {
+		const oConfiguration = this.getConfiguration();
+		const oCard = this.getCard();
+		let iPageSize = oConfiguration.pageSize;
+
+		if (oCard.isSkeleton() && !oConfiguration.totalCount) {
+			// client side pagination for resolved manifest should directly show all items
+			iPageSize = oCard.getModelSizeLimit();
+		}
+
+		let oParent = oCard;
+		const oContent = oCard.getCardContent();
+
+		if (oContent) {
+			oParent = oCard.getCardContent();
+		}
+
+		this._iTotalCount = BindingResolver.resolveValue(oConfiguration.totalCount, oParent);
+		this._iPageSize = BindingResolver.resolveValue(iPageSize, oParent);
+	};
+
+	Paginator.prototype.exit = function () {
+		this._oBusyIndicator?.destroy();
+	};
+
+	Paginator.prototype.openDialog = function() {
+		const oCard = this.getCard();
+
+		openCardDialog(
+			oCard,
+			{
+				manifest: this._createManifest(),
+				baseUrl: oCard.getBaseUrl(),
+				resizable: true,
+				showCloseButton: true
+			},
+			true
+		);
+	};
+
+	Paginator.prototype.isServerSide = function() {
+		return this._iTotalCount > 0;
+	};
+
+	Paginator.prototype.onDataChanged = function(oContent) {
+		if (!oContent.hasData()) {
+			this._iPageCount = 0;
+			this.fireEvent("_ready");
+			return;
+		}
+
+		this._applySettings();
+		const iTotalCount = this._iTotalCount || oContent.getDataLength();
+		this._iPageCount = Math.ceil(iTotalCount / this._iPageSize);
+		this._iPageNumber = Math.min(Math.max(0, this._iPageNumber), this._getLastPageNumber());
+
+		if (!this.getActive()) {
+			this.fireEvent("_ready");
+			return;
+		}
+
+		if (this.isServerSide()) {
+			this._onDataChangedServerSidePagination(oContent, iTotalCount);
+
+			if (this._bInitialLoadComplete) {
+				this.fireEvent("_ready");
+			}
+		} else {
+			this.fireEvent("_ready");
+		}
+	};
+
+	Paginator.prototype.setModelData = function(vData, oModel) {
+		const oCard = this.getCard();
+		const sBindingPath = oCard.getManifestEntry("/sap.card/content/data/path") || oCard.getManifestEntry("/sap.card/data/path") || "/";
+		const oCurrentValue = oModel.getProperty(sBindingPath);
+		const oNewValue = Utils.getNestedPropertyValue(vData, sBindingPath);
+
+		if (oCurrentValue && oNewValue) {
+			oModel.setProperty(sBindingPath, oCurrentValue.concat(oNewValue));
+		} else {
+			oModel.setData(vData);
+		}
+
+		this._loadingMore = false;
+		this.fireEvent("_loadMoreComplete");
+	};
+
+	Paginator.prototype.isLoadingMore = function() {
+		return this._loadingMore;
+	};
+
+	/**
+	 * Goes back to the first page
+	 */
+	Paginator.prototype.reset = function () {
+		this.getPaginatorModel().setData({
+			skip: 0,
+			size: 0,
+			pageIndex: 0
+		});
+
+		this._iPageNumber = 0;
+		this._loadingMore = false;
+	};
+
+	Paginator.prototype.render = function (oRm) {
+		if (this._oBusyIndicator && this.isLoadingMore()) {
+			oRm.renderControl(this._oBusyIndicator);
+		}
+	};
+
+	/**
+	 * @returns {object} Paginator configuration with static values.
+	 */
+	Paginator.prototype.getStaticConfiguration = function () {
+		return {
+			pageCount: this._iPageCount,
+			pageIndex: this._iPageNumber
+		};
+	};
+
+	Paginator.prototype.getPageCount = function() {
+		return this._iPageCount;
+	};
+
+	Paginator.prototype.getPageSize = function() {
+		return this._iPageSize;
+	};
+
+	Paginator.prototype._onDataChangedServerSidePagination = function(oContent, iTotalCount) {
+		const oList = oContent.getInnerList();
+		this._oBusyIndicator = this._oBusyIndicator || new BusyIndicator().addStyleClass("sapUiIntPaginatorBusyIndicator");
+
+		// attempt to load 1 more page initially
+		if (!this._bInitialLoadComplete && oContent.getDataLength() < iTotalCount) {
+			this._loadMore();
+			this.attachEventOnce("_loadMoreComplete", () => {
+				this._bInitialLoadComplete = true;
+			});
+		} else {
+			this._bInitialLoadComplete = true;
+		}
+
+		const onScroll = (e) => {
+			if (this.isLoadingMore()) {
+				return;
+			}
+
+			const LOAD_MORE_THRESHOLD = 300;
+			// approaching the end of the list
+			if (e.target.scrollHeight - e.target.scrollTop - e.target.clientHeight < LOAD_MORE_THRESHOLD && this.getCard().getCardContent().getDataLength() < iTotalCount) {
+				this._loadMore();
+			}
+		};
+
+		const oDelegate = {
+			onAfterRendering: () => {
+				oList.removeEventDelegate(oDelegate);
+
+				const oScrollContainer = oList.getDomRef().closest(".sapFCardContent");
+
+				oScrollContainer.removeEventListener("scroll", onScroll);
+				oScrollContainer.addEventListener("scroll", onScroll);
+
+				// load more items until scrollbar appears
+				if (!this.isLoadingMore() && oContent.hasData() && oScrollContainer.clientHeight >= oScrollContainer.scrollHeight && oContent.getDataLength() < iTotalCount) {
+					this._loadMore();
+				}
+			}
+		};
+
+		oList.addEventDelegate(oDelegate);
+	};
+
+	Paginator.prototype._loadMore = function() {
+		if (!this.isServerSide()) {
+			return;
+		}
+
+		this._loadingMore = true;
+		this.getCard().getCardContent().invalidate();
+		this._iPageNumber = Math.min(this._getLastPageNumber(), this._iPageNumber + 1);
+		this._updatePaginatorModel();
+	};
+
+	Paginator.prototype._updatePaginatorModel = function() {
+		this.getPaginatorModel().setData({
+			skip: this._iPageNumber * this._iPageSize,
+			size: this._iPageSize,
+			pageIndex: this._iPageNumber
+		});
+	};
+
+	Paginator.prototype._getLastPageNumber = function () {
+		return Math.max(0, this._iPageCount - 1);
+	};
+
+	Paginator.prototype._createManifest = function() {
+		const oCard = this.getCard();
+		const oManifest = oCard.getManifestEntry("/");
+
+		oManifest["sap.app"].id = oManifest["sap.app"].id + uid();
+
+		oCard.getAggregation("_filterBar")?._getFilters().forEach((oFilter) => {
+			oFilter.writeValueToConfiguration(oManifest["sap.card"].configuration.filters[oFilter.getKey()]);
+		});
+
+		return oManifest;
+	};
+
+	return Paginator;
+});