@openui5/sap.ui.integration 1.147.1 → 1.148.0

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

@@ -64,9 +64,6 @@ sap.ui.define([
 	var ListSeparators = mobileLibrary.ListSeparators;
 	var ListType = mobileLibrary.ListType;
 
-	// shortcuts for sap.ui.integration.CardActionArea
-	var ActionArea = library.CardActionArea;
-
 	/**
 	 * Constructor for a new <code>TableContent</code>.
 	 *
@@ -85,7 +82,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseListContent
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @constructor
 	 * @private
@@ -283,15 +280,6 @@ sap.ui.define([
 		return this._getTable().getItems().filter((item) => !item.isA("sap.m.GroupHeaderListItem")).length;
 	};
 
-	/**
-	 * Handler for when data is changed.
-	 */
-	TableContent.prototype.onDataChanged = function () {
-		BaseListContent.prototype.onDataChanged.apply(this, arguments);
-
-		this._checkHiddenNavigationItems(this.getParsedConfiguration().row);
-	};
-
 	/**
 	 * Binds/Sets properties to the inner item template based on the configuration object row template which is already parsed.
 	 * Attaches all required actions.
@@ -324,7 +312,6 @@ sap.ui.define([
 		});
 
 		this._oActions.attach({
-			area: ActionArea.ContentItem,
 			actions: oRow.actions,
 			control: this,
 			actionControl: this._oItemTemplate,
@@ -386,7 +373,6 @@ sap.ui.define([
 
 			if (oRow.actions && Array.isArray(oRow.actions)) {
 				this._oActions.attach({
-					area: ActionArea.ContentItem,
 					actions: oRow.actions,
 					control: this,
 					actionControl: oItem,
@@ -398,9 +384,6 @@ sap.ui.define([
 
 			oTable.addItem(oItem);
 		}.bind(this));
-
-		//workaround until actions refactor
-		this.fireEvent("_actionContentReady");
 	};
 
 	/**
@@ -439,7 +422,6 @@ sap.ui.define([
 				oControl.setTitleActive(true);
 
 				this._oActions.attach({
-					area: ActionArea.ContentItemDetail,
 					actions: oColumn.actions,
 					control: this,
 					actionControl: oControl,
@@ -461,7 +443,6 @@ sap.ui.define([
 			});
 
 			this._oActions.attach({
-				area: ActionArea.ContentItemDetail,
 				actions: oColumn.actions,
 				control: oStatus,
 				enabledPropertyName: "active"
@@ -488,7 +469,6 @@ sap.ui.define([
 			});
 
 			this._oActions.attach({
-				area: ActionArea.ContentItemDetail,
 				actions: oColumn.actions,
 				control: this,
 				actionControl: oControl,

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

@@ -22,9 +22,6 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	// shortcuts for sap.ui.integration.CardActionArea
-	var ActionArea = library.CardActionArea;
-
 	// lazy dependencies, loaded on the first attempt to create TimelineContent
 	var Timeline, TimelineItem;
 
@@ -40,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseListContent
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @constructor
 	 * @private
@@ -163,15 +160,6 @@ sap.ui.define([
 		return this._getTimeline().getContent().length;
 	};
 
-	/**
-	 * Handler for when data is changed.
-	 */
-	TimelineContent.prototype.onDataChanged = function () {
-		BaseListContent.prototype.onDataChanged.apply(this, arguments);
-
-		this._checkHiddenNavigationItems(this.getParsedConfiguration().item);
-	};
-
 	/**
 	 * Binds/Sets properties to the inner item template based on the configuration object item template which is already parsed.
 	 *
@@ -199,7 +187,6 @@ sap.ui.define([
 		this._oTimeLineItemTemplate = new TimelineItem(mSettings);
 
 		this._oActions.attach({
-			area: ActionArea.ContentItem,
 			actions: mItem.actions,
 			control: this,
 			actionControl: this._oTimeLineItemTemplate,

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @constructor
 	 * @private
@@ -160,9 +160,6 @@ sap.ui.define([
 	WebPageContent.prototype.applyConfiguration = function () {
 		const oConfiguration = this.getParsedConfiguration();
 
-		//workaround until actions refactor
-		this.fireEvent("_actionContentReady"); // todo
-
 		if (!oConfiguration) {
 			return;
 		}

package/src/sap/ui/integration/cards/actions/CardActions.js

@@ -7,7 +7,6 @@ sap.ui.define([
 	"sap/ui/integration/library",
 	"sap/base/Log",
 	"sap/ui/dom/detectTextSelection",
-	"sap/ui/base/BindingInfo",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/integration/cards/actions/CustomAction",
 	"sap/ui/integration/cards/actions/DateChangeAction",
@@ -24,7 +23,6 @@ sap.ui.define([
 	library,
 	Log,
 	detectTextSelection,
-	BindingInfo,
 	ManagedObject,
 	CustomAction,
 	DateChangeAction,
@@ -40,16 +38,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	function _getServiceName(vService) {
-		if (vService && typeof vService === "object") {
-			return vService.name;
-		}
-
-		return vService;
-	}
-
-	var ActionArea = library.CardActionArea,
-		CardActionType = library.CardActionType;
+	var CardActionType = library.CardActionType;
 
 	/**
 	 * Constructor for a new <code>CardActions</code>.
@@ -63,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @constructor
 	 * @private
@@ -101,7 +90,6 @@ sap.ui.define([
 	 * Listens for a press event on the provided area control and triggers an action with the provided parameters from the item.
 	 * @private
 	 * @param {object} oConfig Object containing configuration for the action
-	 * @param {sap.ui.integration.CardActionArea} oConfig.area The area that describes what the action will be attached to
 	 * @param {object[]} oConfig.actions Configuration object for the actions on an item
 	 * @param {sap.ui.core.Control} oConfig.control The control that the action will be attached on
 	 * @param {sap.ui.core.Control} [oConfig.actionControl] Optional control that the action will be attached on. If supplied, <code>oConfig.control</code> will not receive the action.
@@ -111,140 +99,72 @@ sap.ui.define([
 	 * @param {string} [oConfig.eventName=press] Name of the event to attach to
 	 */
 	CardActions.prototype.attach = function (oConfig) {
-		var oControl = oConfig.control,
-			sActionArea = oConfig.area;
-
 		oConfig.actionControl = oConfig.actionControl || oConfig.control;
 		oConfig.enabledPropertyValue = oConfig.enabledPropertyValue !== undefined ? oConfig.enabledPropertyValue : true;
 		oConfig.disabledPropertyValue = oConfig.disabledPropertyValue || false;
 		oConfig.eventName = oConfig.eventName || "press";
 
-		if (!oConfig.actions) {
-			// For now firing the event here, after refactor need to think
-			// of a way to sync async navigation setters
-			this._fireActionReady(oControl, sActionArea);
+		if (!oConfig.actions || !oConfig.actions.length) {
+			// No actions defined - disable the control
+			this._setControlDisabled(oConfig);
 
 			return;
 		}
 
 		// For now we allow for only one action of type navigation.
 		var oAction = oConfig.actions[0];
-		if (oAction && oAction.type) { // todo - check if the type is valid
+
+		if (oAction) {
 			oConfig.action = oAction;
-			this._attachAction(oConfig);
 
-		} else {
-			// For now firing the event here, after refactor need to think of a way to sync async navigation setters
-			this._fireActionReady(oControl, sActionArea);
+			if (oAction.type) {
+				// Action has a type - attach the full action logic
+				this._attachAction(oConfig);
+			} else if (oConfig.enabledPropertyName && (oConfig.actionControl.isA("sap.m.Button") || oConfig.actionControl.isA("sap.m.Link"))) {
+				// Action has no type but we have Button/Link - handle the enabled state
+				// This applies to ActionsStrip buttons/links, not list items
+				this._setControlEnabledState(oConfig);
+			}
+		}
+	};
+
+	/**
+	 * Disables the control if the enabledPropertyName is set.
+	 * @param {object} oConfig The action configuration
+	 * @private
+	 */
+	CardActions.prototype._setControlDisabled = function (oConfig) {
+		if (!oConfig.control?.isA("sap.m.Link") && !oConfig.control?.isA("sap.m.Button")) {
+			return;
+		}
+
+		if (oConfig.enabledPropertyName) {
+			// No valid action configuration - disable the control
+			Log.warning("Button disabled: no actions defined");
+			oConfig.actionControl.setProperty(oConfig.enabledPropertyName, oConfig.disabledPropertyValue);
 		}
 	};
 
 	CardActions.prototype._attachAction = function (oConfig) {
 		var oAction = oConfig.action,
-			sActionArea = oConfig.area,
-			oAreaControl = oConfig.control,
 			sEnabledPropertyName = oConfig.enabledPropertyName,
 			bCheckEnabledState = true,
-			bSingleAction = this._isSingleAction(sActionArea),
 			bActionEnabled = true;
 
 		if (sEnabledPropertyName) {
 			bCheckEnabledState = false;
-
-			if (oAction.service && !bSingleAction) {
-				// When there is a service let it handle the "enabled" state.
-				this._setControlEnabledStateUsingService(oConfig);
-			} else {
-				// Or when there is a list item template, handle the "enabled" state with bindProperty + formatter
-				this._setControlEnabledState(oConfig);
-			}
-		}
-
-		if (oAction.service && bSingleAction) {
-			this._getSingleActionEnabledState(oAction, oAreaControl).then(function (bEnabled) {
-				if (bEnabled) {
-					this._attachEventListener(oConfig);
-				}
-
-				this._fireActionReady(oAreaControl, sActionArea);
-			}.bind(this));
-
-			return;
+			// When there is a list item template, handle the "enabled" state with bindProperty + formatter
+			this._setControlEnabledState(oConfig);
 		}
 
 		if (bCheckEnabledState) {
-			// Handle the "enabled" state when there is no service and item template with formatter.
+			// Handle the "enabled" state when there is no item template with formatter.
 			bActionEnabled = oAction.enabled !== false && oAction.enabled !== "false";
 		}
 
 		if (bActionEnabled) {
 			this._attachEventListener(oConfig);
 		}
-
-		this._fireActionReady(oAreaControl, sActionArea);
-	};
-
-	CardActions.prototype._setControlEnabledStateUsingService = function (oConfig) {
-		var oAction = oConfig.action,
-			oAreaControl = oConfig.control,
-			oActionControl = oConfig.actionControl,
-			sEnabledPropertyName = oConfig.enabledPropertyName,
-			vEnabled = oConfig.enabledPropertyValue,
-			vDisabled = oConfig.disabledPropertyValue,
-			oBindingInfo = BindingInfo.parse("{path:''}");
-
-		// Async formatter to set oActionControl's property depending
-		// if the list item context is a correct navigation target (decided by the navigation service).
-		oBindingInfo.formatter = function (vValue) {
-
-			var oBindingContext = this.getBindingContext(),
-				sPath,
-				mParameters;
-
-			if (oBindingContext) {
-				sPath = oBindingContext.getPath();
-			}
-
-			mParameters = BindingResolver.resolveValue(oAction.parameters, oAreaControl, sPath);
-
-			if (vValue.__resolved) {
-				if (!vValue.__enabled || vValue.__enabled === "false") {
-					return vDisabled;
-				}
-
-				return vEnabled;
-			}
-
-			if (!vValue.__promise) {
-				vValue.__promise = true;
-
-				oAreaControl._oServiceManager.getService(_getServiceName(oAction.service))
-					.then(function (oNavigationService) {
-						if (oNavigationService) {
-							oNavigationService
-								.enabled({
-									parameters: mParameters
-								})
-								.then(function (bEnabled) {
-									vValue.__resolved = true;
-									vValue.__enabled = bEnabled;
-									oAreaControl.getModel().checkUpdate(true);
-								})
-								.catch(function () {
-									vValue.__resolved = true;
-									vValue.__enabled = false;
-								});
-						} else {
-							vValue.__resolved = true;
-							vValue.__enabled = false;
-						}
-					});
-			}
-
-			return vDisabled;
-		};
-
-		oActionControl.bindProperty(sEnabledPropertyName, oBindingInfo);
 	};
 
 	/**
@@ -283,47 +203,6 @@ sap.ui.define([
 		}
 	};
 
-	CardActions.prototype._getSingleActionEnabledState = function (oAction, oAreaControl) {
-		var oBindingContext = oAreaControl.getBindingContext(),
-			mParameters,
-			sPath;
-
-		if (oBindingContext) {
-			sPath = oBindingContext.getPath();
-		}
-
-		mParameters = BindingResolver.resolveValue(oAction.parameters, oAreaControl, sPath);
-
-		return new Promise(function (resolve) {
-			oAreaControl._oServiceManager.getService(_getServiceName(oAction.service))
-				.then(function (oNavigationService) {
-					if (oNavigationService) {
-						oNavigationService
-							.enabled({
-								parameters: mParameters
-							})
-							.then(function (bEnabled) {
-								resolve(bEnabled);
-							})
-							.catch(function () {
-								resolve(false);
-							});
-					} else {
-						resolve(false);
-					}
-				})
-				.catch(function () {
-					resolve(false);
-				});
-		});
-	};
-
-	CardActions.prototype._fireActionReady = function (oAreaControl, sActionArea) {
-		var bHeader = sActionArea === ActionArea.Header;
-		var sEventName = bHeader ? "_actionHeaderReady" : "_actionContentReady";
-		oAreaControl.fireEvent(sEventName);
-	};
-
 	CardActions.prototype._resolveBindingPath = function (oEvent) {
 		var oBindingContext = oEvent.getSource().getBindingContext(),
 			sPath;
@@ -337,25 +216,6 @@ sap.ui.define([
 		return sPath;
 	};
 
-	CardActions.prototype._handleServiceAction = function (oEvent, oAction, oAreaControl) {
-		var oSource = oEvent.getSource();
-		var sPath = this._resolveBindingPath(oEvent);
-
-		oAreaControl._oServiceManager.getService(_getServiceName(oAction.service))
-			.then(function (oService) {
-				if (oService) {
-					oService.navigate({ // only for navigation?
-						parameters: BindingResolver.resolveValue(oAction.parameters, oSource, sPath)
-					});
-				}
-			})
-			.catch(function (e) {
-				Log.error("Navigation service unavailable", e);
-			}).finally(function () {
-				this._processAction(oSource, oAction, sPath, oEvent);
-			}.bind(this));
-	};
-
 	CardActions.prototype._attachEventListener = function (oConfig) {
 		var oAction = oConfig.action;
 
@@ -377,11 +237,7 @@ sap.ui.define([
 				}
 			}
 
-			if (oAction.service) {
-				this._handleServiceAction(oEvent, oAction, oConfig.control);
-			} else {
-				this._processAction(oSource, oAction, this._resolveBindingPath(oEvent), oEvent);
-			}
+			this._processAction(oSource, oAction, this._resolveBindingPath(oEvent), oEvent);
 		}.bind(this));
 	};
 
@@ -487,17 +343,6 @@ sap.ui.define([
 		return true;
 	};
 
-	/**
-	 * @param {sap.ui.integration.CardActionArea} sActionArea The area that describes what the action will be attached to
-	 * @returns {boolean} If the action is configured for the header, content, or a detail of an item in the content of the card
-	 */
-	CardActions.prototype._isSingleAction = function (sActionArea) {
-		return [ActionArea.Header,
-			ActionArea.Content,
-			ActionArea.ContentItemDetail,
-			ActionArea.ActionsStrip].indexOf(sActionArea) > -1;
-	};
-
 	CardActions._createHandler = function (mConfig) {
 		var _ActionClass = null;
 		switch (mConfig.action.type) {

package/src/sap/ui/integration/cards/actions/NavigationAction.js

@@ -24,10 +24,6 @@ sap.ui.define([
 	NavigationAction.prototype.execute = function () {
 		var oResolvedConfig = this.getResolvedConfig();
 
-		if (oResolvedConfig.service) {
-			return;
-		}
-
 		var oParameters = this.getParameters(),
 			sUrl,
 			sTarget,

package/src/sap/ui/integration/cards/actions/SubmitAction.js

@@ -48,8 +48,7 @@ sap.ui.define([
 			{
 				request: this._createRequest(oSubmitActionHandler, oData)
 			},
-			undefined,
-			undefined,
+			false,
 			true
 		);
 

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * <code>ui5-select</code>, or container with <code>ui5-radio-button</code>, or <code>ui5-checkbox</code> web components.
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @private
 	 * @since 1.74

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * <code>ui5-datepicker</code> web component.
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @private
 	 * @since 1.74

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * <code>ui5-step-input</code> web component.
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @private
 	 * @since 1.74

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * <code>ui5-input</code> or <code>ui5-textarea<code> UI5 web component.
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @private
 	 * @since 1.74

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * <code>ui5-checkbox</code> web component.
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @private
 	 * @since 1.74

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @constructor
 	 * @private
@@ -267,7 +267,7 @@ sap.ui.define([
 			this._oDataProvider.destroy();
 		}
 
-		this._oDataProvider = oCard.getDataProviderFactory().create(oDataConfig, null, true);
+		this._oDataProvider = oCard.getDataProviderFactory().create(oDataConfig, true);
 
 		if (oDataConfig.name) {
 			oModel = oCard.getModel(oDataConfig.name);

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.filters.BaseFilter
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.filters.BaseFilter
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @constructor
 	 * @private

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.147.1
+	 * @version 1.148.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.147.1
+	 * @version 1.148.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.147.1
+	 * @version 1.148.0
 	 *
 	 * @constructor
 	 * @private

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.147.1
+	 * @version 1.148.0
 	 *
 	 * @constructor
 	 * @private

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.147.1
+	 * @version 1.148.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -46,7 +46,6 @@ sap.ui.define([
 
 	const AriaHasPopup = coreLibrary.aria.HasPopup;
 
-	const ActionArea = library.CardActionArea;
 	const CardActionType = library.CardActionType;
 
 	/**
@@ -60,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.0
 	 *
 	 * @constructor
 	 * @private
@@ -236,7 +235,6 @@ sap.ui.define([
 		}));
 
 		const oActionsConfig = {
-			area: ActionArea.ActionsStrip,
 			control: oItem,
 			actions: oConfig.actions,
 			enabledPropertyName: "enabled"
@@ -244,10 +242,12 @@ sap.ui.define([
 
 		if (this.getDisableItemsInitially()) {
 			oActionsConfig.enabledPropertyValue = false;
-			oItem._mActionsConfig = oActionsConfig;
 			oItem._bIsDisabled = true;
 		}
 
+		// Store config for later use by disableItems/enableItems
+		oItem._mActionsConfig = oActionsConfig;
+
 		if (oConfig.type !== "Label") {
 			this.getCardActions().attach(oActionsConfig);
 		}
@@ -278,11 +278,8 @@ sap.ui.define([
 				if (mActionsConfig?.action) {
 					mActionsConfig.enabledPropertyValue = true;
 					this.getCardActions()._setControlEnabledState(mActionsConfig);
-				} else {
-					oItem.setEnabled(true);
+					delete oItem._bIsDisabled;
 				}
-
-				delete oItem._bIsDisabled;
 			}
 		});
 	};