@sapui5/sap.suite.ui.generic.template 1.129.0 → 1.130.1

package/src/sap/suite/ui/generic/template/designtime/utils/designtimeUtils.js

@@ -0,0 +1,395 @@
+/*!
+* SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+*/
+
+sap.ui.define([
+	"sap/base/util/ObjectPath",
+	"sap/suite/ui/generic/template/genericUtilities/testableHelper"
+], function (ObjectPath, testableHelper) {
+	"use strict";
+	/**
+	 * Creates the adaptation dialog content based on the provided settings, property values, and unchanged data.
+	 * It dynamically generates UI controls based on the type of each setting and binds them to the provided data.
+	 *
+	 * @param {Settings[]} aDialogContent - An array of Settings objects that define the structure and data for the dialog content.
+	 * @param {Object} propertyValues - An object containing the current values of the properties to be edited.
+	 * @param {Object} unchangedData - An object containing the original values of the properties before any changes.
+	 * @returns {Promise<sap.m.List>} A promise that resolves to a sap.m.List containing the generated dialog content.
+	 */
+
+
+	const SettingScope = {
+		Page: "Page",
+		Control: "Control",
+		Application: "Application"
+	};
+
+	const ChangeType = {
+		ChangePageConfiguration: "appdescr_ui_generic_app_changePageConfiguration",
+		AddNewObjectPage: "appdescr_ui_generic_app_addNewObjectPage"
+	};
+
+	function fnCreateAdaptionDialogContent(aDialogContent, propertyValues, unchangedData) {
+		return new Promise(function (resolve, reject) {
+			sap.ui.require([
+				"sap/ui/model/json/JSONModel",
+				"sap/m/InputListItem",
+				"sap/m/List",
+				"sap/m/MultiInput",
+				"sap/m/Input",
+				"sap/m/CheckBox",
+				"sap/ui/core/Item",
+				"sap/m/Select",
+				"sap/m/Token"
+			], function (JSONModel, InputListItem, List, MultiInput, Input, CheckBox, Item, Select, Token) {
+				const settingsModel = new JSONModel();
+				settingsModel.setData(aDialogContent);
+
+				const list = new List();
+				list.setModel(settingsModel);
+
+				const listItem = new InputListItem({ label: "{label}" });
+
+				listItem.bindAggregation("content", {
+					path: "control",
+					factory: function (sId, oContext) {
+						const type = oContext.getProperty("type");
+						const id = oContext.getProperty("id");
+
+						switch (type) {
+							case "string":
+								if (oContext.getProperty("enum")) {
+									const item = new Item({ text: "{name}", key: "{id}" });
+									const select = new Select({
+										selectedItem: "{value}",
+										change: function (event) {
+											propertyValues[this.data("id")] = event.getParameter("selectedItem").getKey();
+										},
+										enabled: {
+											path: "disabled",
+											formatter: function (disabled) {
+												return !disabled;
+											}
+										}
+									}).data("id", id);
+
+									select.bindItems({ path: "enum", template: item });
+									select.setSelectedKey(unchangedData[id]);
+									return select;
+								} else {
+									return new Input({
+										value: "{value}",
+										change: function (event) {
+											propertyValues[this.data("id")] = event.getParameter("value");
+										}
+									}).data("id", id);
+								}
+							case "string[]":
+								const oMultiInput = new MultiInput({
+									width: "70%",
+									showValueHelp: false,
+									showClearIcon: true,
+									tokens: (propertyValues[id] || []).map(function (navigationProperty) {
+										return new Token({ text: navigationProperty, key: navigationProperty });
+									}),
+									tokenUpdate: function (event) {
+										const array = propertyValues[this.data("id")];
+										if (event.getParameter("addedTokens").length > 0) {
+											array.push(event.getParameter("addedTokens")[0].getKey());
+										} else if (event.getParameter("removedTokens").length > 0) {
+											const index = array.indexOf(event.getParameter("removedTokens")[0].getKey());
+											if (index !== -1) { array.splice(index, 1); }
+										}
+									}
+								}).data("id", id);
+								oMultiInput.addValidator(function (args) {
+									return new Token({ key: args.text, text: args.text });
+								});
+								return oMultiInput;
+							case "number":
+								return new Input({
+									value: "{value}",
+									type: "Number",
+									change: function (event) {
+										propertyValues[this.data("id")] = parseFloat(event.getParameter("value"));
+									}
+								}).data("id", id);
+							case "boolean":
+								return new CheckBox({
+									selected: "{value}",
+									select: function (event) {
+										propertyValues[this.data("id")] = event.getParameter("selected");
+									}
+								}).data("id", id);
+							case "booleanOrString":
+								const booleanOrStringItem = new Item({ text: "{name}", key: "{id}" });
+								const booleanOrStringSelect = new Select({
+									selectedItem: "{value}",
+									change: function (event) {
+										let value = event.getParameter("selectedItem").getKey();
+										if (value.toLowerCase() === "false" || value.toLowerCase() === "true") {
+											value = JSON.parse(value);
+										}
+										propertyValues[this.data("id")] = value;
+									}
+								}).data("id", id);
+
+								booleanOrStringSelect.bindItems({ path: "enum", template: booleanOrStringItem });
+								booleanOrStringSelect.setSelectedKey(unchangedData[id]);
+								return booleanOrStringSelect;
+							case "json":
+								return new Input({
+									value: "{value}",
+									change: function (event) {
+										try {
+											propertyValues[this.data("id")] = JSON.parse(event.getParameter("value"));
+										} catch (e) {
+											// Handle JSON parse error
+										}
+									}
+								}).data("id", id);
+							default:
+								// unsupported type
+								return null;
+						}
+					}
+				});
+
+				list.bindItems({ path: "/", template: listItem });
+				resolve(list);
+			});
+		});
+	}
+
+	function getComponent(oElement) {
+		let oComponent = oElement;
+		while (oComponent && !oComponent.getRootControl) {
+			oComponent = oComponent.getParent();
+		}
+		return oComponent;
+	}
+	/**
+	 * @typedef {Object} PathParameters
+	 * @property {string} sScope - The scope of the manifest setting.
+	 * @property {ChangeType} sChangeType - Desciptor change type.
+	 */
+
+	/**
+	 * Generates settings for the designtime based on the provided runtime settings and manifest settings data.
+	 * It maps each manifest setting to a structured format that includes labels, tooltips, and controls,
+	 * which are then used to create the adaptation dialog content.
+	 *
+	 * @param {Object} mRuntimeSettings - An object containing the current runtime settings.
+	 * @param {Array<Object>} aManifestSettingsData - An array of objects representing the manifest settings data.
+	 * @returns {Array<Object>} An array of Settings objects, which can then be used to create the adaptation dialog content.
+	 *
+	 * @typedef {Object} Settings
+	 * @property {string} label - The name of the setting.
+	 * @property {string} tooltip - The description of the setting.
+	 * @property {Array<Control>} control - An array of Control objects.
+	 *
+	 * @typedef {Object} Control
+	 * @property {string} type - The type of the control (e.g., "string", "number").
+	 * @property {Array<string>} [enum] - The enumeration values for the control, if applicable.
+	 * @property {*} value - The current value of the control from mRuntimeSettings.
+	 * @property {string} id - The unique identifier of the control.
+	 * @property {boolean} [disabled] - An optional flag indicating if the control is disabled.
+	 */
+	function getSettings(mRuntimeSettings, aManifestSettingsData) {
+		return aManifestSettingsData.map(function (oManifestSetting) {
+			/**
+			 * @type {Settings}
+			 */
+			const oSettingData = {
+				label: oManifestSetting.name,
+				tooltip: oManifestSetting.description,
+				control: []
+			};
+
+			/**
+			 * @type {Control}
+			 */
+			const oControlData = {
+				type: oManifestSetting.type,
+				"enum": oManifestSetting.enums,
+				value: mRuntimeSettings[oManifestSetting.id],
+				id: oManifestSetting.id
+			};
+
+			oSettingData.control.push(oControlData);
+			return oSettingData;
+		});
+	}
+
+	/**
+	 * Convert change into a structure required by the flexibility tools.
+	 *
+	 * @param {Object} oComponent - The control for which the change should be created
+	 * @param {string} propertyPath - The property path
+	 * @param {string|string[]|boolean|number|object|undefined} propertyChanges - The property changes
+	 * @param {string} sChangeType - Descriptor change type
+	 * @param {boolean} bIsGlobalChange - The flag to indicate if the change is for global scope
+	 * @returns {Object} The change structure used by flexibility tools
+	 */
+	let getChangeStructure = function (oComponent, propertyPath, propertyChanges, sChangeType = ChangeType.ChangePageConfiguration, bIsGlobalChange = false) {
+		const oAppComponent = oComponent.getAppComponent();
+		return {
+			appComponent: oAppComponent,
+			selector: oAppComponent,
+			changeSpecificData: {
+				appDescriptorChangeType: sChangeType,
+				content: {
+					parameters: {
+						parentPage: {
+							component: bIsGlobalChange ? "sap.suite.ui.generic.template" : oComponent.getMetadata().getComponentName(),
+							entitySet: !bIsGlobalChange ? oComponent.getEntitySet() : undefined
+						},
+						entityPropertyChange: {
+							propertyPath: propertyPath,
+							operation: "UPSERT",
+							propertyValue: propertyChanges
+						}
+					}
+				}
+			}
+		};
+	};
+
+	async function fnOpenAdaptionDialog(items, propertyValues, unchangedData, title, size) {
+		const list = await fnCreateAdaptionDialogContent(items, propertyValues, unchangedData);
+		return new Promise(function (resolve, reject) {
+			sap.ui.require([
+				"sap/m/Dialog",
+				"sap/m/Button",
+				"sap/m/MessageStrip"
+			], function (Dialog, Button, MessageStrip) {
+				const informationText = new MessageStrip({
+					type: "Information",
+					text: "Changes made in this dialog may not directly result in visible changes in the application, because some settings don’t work in combination with others."
+				});
+				const dialog = new Dialog({
+					title: title,
+					contentWidth: size ? size.width : "550px",
+					contentHeight: size ? size.height : "300px",
+					content: [informationText, list],
+					buttons: [
+						new Button({
+							text: "Close",
+							press: function () {
+								dialog.close();
+								reject();
+							}
+						}),
+						new Button({
+							text: "Apply",
+							press: function () {
+								dialog.close();
+								resolve(propertyValues);
+							}
+						})
+					]
+				});
+				dialog.open();
+			});
+		});
+	}
+
+	/**
+	 * Retrieves the changed property values.
+	 * @param {Array} designtimeSettings - The array of designtime settings.
+	 * @param {Object} unchangedData - The unchanged data.
+	 * @param {Object} propertyValues - The property values.
+	 * @param {PathParameters} mPathParameters - The path parameters.
+	 * @returns {Object} - The changed property values.
+	 */
+	let getChangedPropertyValues = function (designtimeSettings, unchangedData, propertyValues, mPathParameters) {
+		const propertyChanges = {};
+		designtimeSettings.forEach(function (setting) {
+			if (
+				(typeof unchangedData[setting.id] !== "object" && unchangedData[setting.id] !== propertyValues[setting.id]) ||
+				(typeof unchangedData[setting.id] === "object" && JSON.stringify(unchangedData[setting.id]) !== JSON.stringify(propertyValues[setting.id]))
+			) {
+				const propertyChangeKey = setting.getPath ? setting.getPath(mPathParameters) : setting.id;
+				propertyChanges[propertyChangeKey] = {
+					value: propertyValues[setting.id],
+					bIsGlobalChange: !!setting.bSupportsGlobalScope && mPathParameters.sScope === SettingScope.Application
+				};
+			}
+		});
+		return propertyChanges;
+	};
+
+	let getChanges = function (mChanges, oComponent, sChangeType) {
+		const aChanges = [];
+		const oSingleChange = {};
+		for (const [propertyPath, oPropertyChange] of Object.entries(mChanges)) {
+			oSingleChange[propertyPath] = oPropertyChange.value;
+			aChanges.push(getChangeStructure(oComponent, propertyPath, oPropertyChange.value, sChangeType, oPropertyChange.bIsGlobalChange));
+		}
+		return aChanges;
+	};
+
+	/**
+	 * Extracts the changes.
+	 * @param {Object} mPropertyValues - The property values.
+	 * @param {Object} mUnchangedData - The unchanged data.
+	 * @param {Array} aDesigntimeSettings - The array of designtime settings.
+	 * @param {Object} oComponent - The component.
+	 * @param {PathParameters} mPathParameters - The path parameters.
+	 * @returns {Array} - The changes.
+	 */
+
+	function fnExtractChanges(mPropertyValues, mUnchangedData, aDesigntimeSettings, oComponent, mPathParameters) {
+		const mChanges = getChangedPropertyValues(aDesigntimeSettings, mUnchangedData, mPropertyValues, mPathParameters);
+		return getChanges(mChanges, oComponent, mPathParameters.sChangeType);
+	}
+
+	function getLocalId(oElement) {
+		const oComponent = getComponent(oElement);
+		return oComponent.getRootControl().getLocalId(oElement.getId());
+	}
+
+	/**
+	 * Retrieves the supported global manifest settings for the given app component.
+	 *
+	 * @param {object} oAppComponent - The app component.
+	 * @returns {object} - The supported global manifest settings.
+	 */
+	function getSupportedGlobalManifestSettings(oAppComponent) {
+		const oManifest = oAppComponent.getManifest();
+		const oSettings = oManifest["sap.ui.generic.app"]["settings"];
+
+		const aSupportedGlobalManifestSettingKeys = ["tableSettings.createMode", "statePreservationMode", "flexibleColumnLayout", "inBoundParameters"];
+
+		const oSupportedGlobalManifestSettings = {};
+
+		aSupportedGlobalManifestSettingKeys.forEach(function (sKey) {
+			const sValue = ObjectPath.get(sKey, oSettings);
+			if (sValue) {
+				ObjectPath.set(sKey, sValue, oSupportedGlobalManifestSettings);
+			}
+		});
+		return oSupportedGlobalManifestSettings;
+	}
+
+
+	// Add the functions to the testableHelper for testing which are not exported
+	getChangedPropertyValues = testableHelper.testableStatic(getChangedPropertyValues, "getChangedPropertyValues");
+	getChanges = testableHelper.testableStatic(getChanges, "getChanges");
+	getChangeStructure = testableHelper.testableStatic(getChangeStructure, "getChangeStructure");
+
+	return {
+		openAdaptionDialog: fnOpenAdaptionDialog,
+		getSettings,
+		extractChanges: fnExtractChanges,
+		getComponent,
+		createAdaptionDialogContent: fnCreateAdaptionDialogContent,
+		getLocalId,
+		SettingScope,
+		ChangeType,
+		getSupportedGlobalManifestSettings
+	};
+});

package/src/sap/suite/ui/generic/template/fragments/EasyFilter.fragment.xml

@@ -1,24 +1,19 @@
-<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
+<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:feControls="sap.fe.controls.easyFilter">
+    <!-- to check how to use a common model property instead of listReport/filterMode  which is specific to LR-->
     <VBox  visible="{= ${_templPriv>/listReport/filterMode} === 'easyFilter'}">
-        <MessageStrip
+         <MessageStrip
             text="{i18n>ST_EASY_FILTER_PROMPT_INFO}"
             showIcon="true"
             showCloseButton="true"
             class="sapUiSmallMarginBottom"/>
-        <FlexBox renderType="Bare">
-            <Input id="easyFilter"
-            width="100%" class="sapUiSmallMarginEnd"
-            placeholder="{i18n>ST_EASY_FILTER_INPUT_PLACEHOLDER}"
-            change="._templateEventHandlers.onEasyFilterChange"
-            showClearIcon="true"
-            maxLength="100"
-            submit="._templateEventHandlers.onEasyFilterEnterPress">
-            </Input>
-            <Button text="{i18n>ST_EASY_FILTER_GO_BUTTON_TEXT}"
-                    type="Emphasized"
-                    icon="sap-icon://ai"
-                    press="._templateEventHandlers.onEasyFilterGoButtonPress">
-            </Button>
-        </FlexBox>
+         <feControls:EasyFilterBarContainer id="template::easyFilterContainer"
+			showValueHelp="._templateEventHandlers.onEasyFilterShowValueHelp"
+			queryChanged="._templateEventHandlers.onEasyFilterQueryChanged"
+			tokensChanged="._templateEventHandlers.onEasyFilterTokensChanged"
+			beforeQueryProcessing="._templateEventHandlers.onEasyFilterBeforeQueryProcessing"
+			afterQueryProcessing="._templateEventHandlers.onEasyFilterAfterQueryProcessing"
+			clearFilters="._templateEventHandlers.onEasyFilterClearFilters"
+			executeSearch="._templateEventHandlers.onEasyFilterExecuteSearch"
+		/>
     </VBox>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/fragments/MessagePage.controller.js

@@ -5,6 +5,22 @@ sap.ui.define([
 	
 	// Controller of the EmptyPage view
 	return Controller.extend("sap.suite.ui.generic.template.fragments.MessagePage", {
+		onInit: function() {
+			this.oView = this.getView();
+		},
+		onBeforeRendering: function () {
+			// Note: The additional content array may contain any control like Button, Text etc.
+			// That can't be handled dynamically in the template file (MessagePage.view.xml) as we don't know the control type.
+			// Hence, kept the logic of adding additional controls in the controller file.
+			var oIllustratedMessage = this.oView.byId("messagePage");
+			var aAdditionalContent = this.oView.getModel("_templPrivGlobal").getProperty("/generic/messagePage/additionalContent");
+			// If additional content found on the model, add them to the illustrated message (message page)
+			if (aAdditionalContent && Array.isArray(aAdditionalContent)) {
+				aAdditionalContent.forEach(function (oControl) {
+					oIllustratedMessage.addAdditionalContent(oControl);
+				});
+			}
+		},
 		navButtonPress: function() {
 			window.history.back();
 		}

package/src/sap/suite/ui/generic/template/fragments/MessagePopover.fragment.xml

@@ -2,10 +2,24 @@
 		xmlns="sap.m"
 		xmlns:core="sap.ui.core">
 	<MessagePopover groupItems="true" items="{msg>/}" activeTitlePress="titlePressed" beforeOpen="beforeOpen" afterClose="afterClose" >
-		<MessageItem description="{msg>description}" type="{msg>type}" title="{msg>message}"
+		<MessageItem  description="{msg>description}" type="{msg>type}"  title="{msg>message}"
 					subtitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'msg>additionalText'}, {path: 'helper>/isPopoverOpen'}, {path: 'helper>/heartBeat'}], formatter: '.getSubtitle'}"
 					longtextUrl="{msg>descriptionUrl}"
+					markupDescription="true"
 					activeTitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'helper>/isPopoverOpen'}], formatter: '.isPositionable'}"
-					groupName="{= ${helper>/messageToGroupName}[${msg>id}] }"/>
+					groupName="{= ${helper>/messageToGroupName}[${msg>id}] }">
+					<Link
+						text="{i18n>ST_AI_EE_BUTTON_LABEL}"
+						icon="sap-icon://ai"
+						visible="{helper>/isAIErrorExplanationEnabled}"
+						press="generateErrorExplanation">
+						<customData>
+							<core:CustomData key="message" value="{msg>message}" />
+							<core:CustomData key="description" value="{msg>description}" />
+							<core:CustomData key="descriptionUrl" value="{msg>descriptionUrl}" />
+							<core:CustomData key="code" value="{msg>code}" />
+						</customData>
+					</Link>
+		</MessageItem>
 	</MessagePopover>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/fragments/SmartFormDataField.fragment.xml

@@ -35,6 +35,7 @@
 							visible="{path: 'dataField>', formatter: 'AH.getVisibiltyBasedOnImportanceAndHidden'}"
 							binding="{path: 'dataField>Target'}, formatter: 'AH.getNavigationPathWithExpand'}">
 							<fe:customData>
+								<core:CustomData key="SideEffects" value="{parts: [{path: 'entitySet>'}, {path: 'dataField>'}], formatter: 'AH.getPropsForLinkFields'}"/>
 								<core:CustomData key="Location" value="Section" />
 								<core:CustomData key="contactDetails" value="{= ${path: 'contact>', formatter: 'AH.getCustomDataForContactPopup'}}"/>
 							</fe:customData>
@@ -120,6 +121,7 @@
 							press="._templateEventHandlers.onDataFieldWithIntentBasedNavigation"
 							wrapping="true">
 							<fe:customData>
+								<core:CustomData key="SideEffects" value="{parts: [{path: 'entitySet>'}, {path: 'dataField>'}], formatter: 'AH.getPropsForLinkFields'}"/>
 								<core:CustomData key="SemanticObject" value="{path: 'dataField>SemanticObject', formatter: 'AHModel.format'}" />
 								<core:CustomData key="Action" value="{path: 'dataField>Action', formatter: 'AHModel.format'}" />
 							</fe:customData>

package/src/sap/suite/ui/generic/template/genericUtilities/Link.js

@@ -1,6 +1,10 @@
 /* FE specific implementation of a Link that preserves whitespaces */
-sap.ui.define(["sap/m/Link", "sap/m/LinkRenderer", "sap/base/strings/whitespaceReplacer"
-], function (Link, LinkRenderer, whitespaceReplacer){
+sap.ui.define([
+	"sap/m/Link", 
+	"sap/m/LinkRenderer", 
+	"sap/base/strings/whitespaceReplacer", 
+	"sap/suite/ui/generic/template/lib/SideEffectUtil"
+], function (Link, LinkRenderer, whitespaceReplacer, SideEffectUtil){
 	"use strict";
 
 	var FELink = Link.extend("sap.suite.ui.generic.template.genericUtilities.Link", {
@@ -12,6 +16,9 @@ sap.ui.define(["sap/m/Link", "sap/m/LinkRenderer", "sap/base/strings/whitespaceR
 		},
 		renderer: function(oRM, oControl){
 			LinkRenderer.render(oRM, oControl);
+		},
+		onAfterRendering : function() {
+			SideEffectUtil.assignFieldGroupIdsToLinkField(this);
 		}
 	});
 	

package/src/sap/suite/ui/generic/template/js/AnnotationHelper.js

@@ -11,9 +11,10 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	"sap/ui/core/library",
 	"sap/suite/ui/generic/template/genericUtilities/metadataAnalyser",
 	"sap/ui/base/ManagedObject",
+	"sap/suite/ui/generic/template/lib/SideEffectUtil",
 	"sap/suite/ui/generic/template/js/RuntimeFormatters" // just to make sure that it is loaded
 ], function (AnnotationHelperModel, AnnotationHelperModelBasics, SmartField, FeLogger, formatMessage, deepExtend, StableIdHelper, utils, Device,
-	SapMLibrary, SapCoreLibrary, metadataAnalyser, ManagedObject) {
+	SapMLibrary, SapCoreLibrary, metadataAnalyser, ManagedObject, SideEffectUtil) {
 	"use strict";
 
 	// shortcut for sap.ui.core.ValueState
@@ -383,7 +384,9 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		getCustomDataForContactPopup: function (oContactDetails) {
 			return ((JSON.stringify(oContactDetails)).replace(/\}/g, "\\}").replace(/\{/g, "\\{")); //check bindingParser.escape
 		},
-
+		getPropsForLinkFields: function(oEntitySet, oTarget) {
+			return SideEffectUtil.getPropsForLinkFields(oEntitySet, oTarget);
+		},
 		checkIsEmailAddress: function (oInterface, sEntityType, oDataField) {
 			var oMetaModel = oInterface.getInterface(1).getModel();
 			var sPath = oInterface.getInterface(1).getPath() + '/Value';
@@ -3322,7 +3325,8 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		// To build criticality for the action buttons based on the criticality annotation
 		// Both path and enum values are considered
 		buildExpressionForButtonCriticality: function(oDataPoint) {
-				var sFormatCriticalityExpression = SapMLibrary.ButtonType.Default;
+				var bIsDetermining = oDataPoint.Determining;
+                var sFormatCriticalityExpression = bIsDetermining ? SapMLibrary.ButtonType.Default : SapMLibrary.ButtonType.Ghost ;
 				var sExpressionTemplate;
 				var oCriticalityProperty = oDataPoint.Criticality;
 				if (oCriticalityProperty) {
@@ -3340,7 +3344,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					}
 				} else {
 					// Any other cases are not valid, the default value of 'Default' will be returned
-					oLogger.warning("Case not supported, returning the default sap.m.ButtonType.Default");
+					oLogger.warning("Case not supported, returning the default" + sFormatCriticalityExpression);
 				}
 
 				return sFormatCriticalityExpression;

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -57,6 +57,7 @@ sap.ui.define([
 	"sap/ui/VersionInfo",
 	"sap/m/IllustratedMessageType",
 	"sap/suite/ui/generic/template/lib/ai/FioriAIHandler",
+	"sap/suite/ui/generic/template/lib/RetryAfterHandler",
 	"sap/suite/ui/generic/template/js/RuntimeFormatters"  // just to make sure that this class is loaded
 ], function(
 	extend,
@@ -93,7 +94,9 @@ sap.ui.define([
 	JouleContextProvider,
 	ServiceFactoryRegistry,
 	VersionInfo,
-	IllustratedMessageType, FioriAIHandler) {
+	IllustratedMessageType, 
+	FioriAIHandler,
+	RetryAfterHandler) {
 	"use strict";
 	var	sClassName = "lib.AppComponent";
 
@@ -292,7 +295,8 @@ sap.ui.define([
 					// Check FioriAI servce is enabled
 					"fioriAI": {
 						isSummarizationEnabled : false,
-						isEasyFilterEnabled : false
+						isEasyFilterEnabled : false,
+						isErrorExplanationEnabled : false
 					}
 			});
 			oAppComponent.setModel(oTemplateContract.oTemplatePrivateGlobalModel, "_templPrivGlobal");
@@ -499,6 +503,9 @@ sap.ui.define([
 				}
 			});
 			setLeaveAppPromise();
+			var oRetryAfterHandler = new RetryAfterHandler(oTemplateContract, oAppComponent);
+			oRetryAfterHandler.registerRetryAfterHandler();
+			
 			oLogger.info("Init done for AppComponent " + sAppComponentId);
 		}
 
@@ -931,7 +938,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/CommonEventHandlers.js

@@ -2692,47 +2692,6 @@ sap.ui.define(["sap/ui/base/Object",
 			oController.onBeforeExportTableExtension(oExportParams);
 		}
 
-		/**
-		 * This method is called when the user interacts with EasyFilter field (Enter on the input field or Go button press).
-		 * The AI easy filter is triggered and the result filters are applied to the SmartFilterBar.
-		 * @param {object} oEasyFilterInputField - The EasyFilter input field which has the value entered by the user
-		 * @param {object} oState - oState of the component
-		 */
-		function fnHandleEasyFilterChange(oEasyFilterInputField, oState) {
-
-			var oSmartFilterbar = oState.oSmartFilterbar;
-			FESRHelper.setSemanticStepname(oEasyFilterInputField, "press", "fe2:ai:search");
-			var oAIFilterQueryHandlerPromise = oState.oEasyFilterBarHandler.triggerEasyFilterQuery(oEasyFilterInputField, oSmartFilterbar);
-
-			oAIFilterQueryHandlerPromise.then(function(oFiltersFromAI) {
-
-				var sSmartFilterBarId = oSmartFilterbar.getId();
-				var oSmartFilterBarWrapper = oCommonUtils.getControlStateWrapperById(sSmartFilterBarId, "SmartFilterBar");
-				var oSmartFilterBarVariant = oSmartFilterBarWrapper.getState();
-				var oVariantDataFromAI = oState.oEasyFilterBarHandler.getSFBVariantData(oFiltersFromAI);
-
-				// restore the custom filters to the initial state for now
-				// To check if other objects in oSmartFilterBarVariant needs to be modified
-				var aAppExtension = Object.keys(oSmartFilterBarVariant.customFilters.appExtension);
-				if ( aAppExtension.length > 0 ) {
-					aAppExtension.forEach(function(sKey) {
-						oSmartFilterBarVariant.customFilters.appExtension[sKey] = "";
-					});
-				}
-				oSmartFilterBarVariant.selectOptions = oVariantDataFromAI.aSelectOptions;
-				if (oComponentUtils.isDraftEnabled()) {
-					oSmartFilterBarVariant.customFilters.editState = oVariantDataFromAI.oEditStateFilter;
-				}
-
-				oSmartFilterBarWrapper.setState(oSmartFilterBarVariant);
-				oSmartFilterbar.getSmartVariant() && oSmartFilterbar.getSmartVariant().currentVariantSetModified(true);
-				oSmartFilterbar.search();
-			}, function(oError) {
-				oLogger.error("Error occurred while applying the AI filters", oError);
-			});
-			oComponentUtils.getBusyHelper().setBusy(oAIFilterQueryHandlerPromise);
-		}
-
 		/**
 		 * Performs intent based navigation and opens the given line item context in a new tab.
 		 * 
@@ -2814,7 +2773,6 @@ sap.ui.define(["sap/ui/base/Object",
 			onSmartFieldModeToggled: onSmartFieldModeToggled,
 			onRenderTeamsContactCollabOptions: fnRenderTeamsContactCollabOptions,
 			hideTableCells: fnHideTableCells,
-			onEasyFilterChange: fnHandleEasyFilterChange,
 			navigateIntentOnNewTab: fnNavigateIntentOnNewTab
 		};
 	}