@sapui5/sap.suite.ui.generic.template 1.130.2 → 1.130.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.130.2",
+  "version": "1.130.4",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.130.2</version>
+	<version>1.130.4</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/controller/ControllerImplementation.js

@@ -1050,7 +1050,11 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 							oState.oIappStateHandler.fnStoreCurrentAppStateAndAdjustURL();
 						},
 						onAfterApplyTableVariant: function() {
-							oState.oIappStateHandler.fnStoreCurrentAppStateAndAdjustURL();
+							// Wait until the previous invocation of storing the app state is completed.
+							// Then, proceed with storing the current app state.
+							setTimeout(function () {
+								oState.oIappStateHandler.fnStoreCurrentAppStateAndAdjustURL();
+							}, 0);
 						},
 						onAfterChartVariantSave: function(ev) {
 							oState.oIappStateHandler.fnStoreCurrentAppStateAndAdjustURL();

package/src/sap/suite/ui/generic/template/AnalyticalListPage/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.130.2"
+			"version": "1.130.4"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/Canvas/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.130.2"
+			"version": "1.130.4"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/controller/ControllerImplementation.js

@@ -547,13 +547,6 @@ sap.ui.define([
 					oState.oMultiEditHandler = new MultiEditHandler(oState, oController, oTemplateUtils);
 					oState.oInsightsHandler = new InsightsHandler(oState, oController, oTemplateUtils);
 
-					oTemplateUtils.oServices.oFioriAIHandler && oTemplateUtils.oServices.oFioriAIHandler.getFioriAIEnabledPromise().then(function() {
-						oState.oEasyFilterBarHandler = new EasyFilterBarHandler(oState, oController, oTemplateUtils);
-						oState.oEasyFilterBarHandler.initialiseEasyFilterBar();
-					});
-
-
-
 					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 
 					oTemplatePrivateModel.setProperty("/listReport/aMissingNavProperties", false);
@@ -696,25 +689,25 @@ sap.ui.define([
 
 					onSmartFilterBarInitialized: function () {
 						oState.oIappStateHandler.onSmartFilterBarInitialized();
-						oTemplateUtils.oServices.oFioriAIHandler && oTemplateUtils.oServices.oFioriAIHandler.getFioriAIEnabledPromise().then(function() {
-							// oEasyFilterBarHandler is already initialized in the controller onInit
-							// Prepare the metadats upfront so that it is not triggered for each search
-							oState.oEasyFilterBarHandler && oState.oEasyFilterBarHandler.getEasyFilterSearchMetadata();
-							oState.oSmartFilterbar.attachFilterChange(function(oEvent) {
-								oState.oEasyFilterBarHandler.onFilterChange(oEvent);
+						// After the SFB is initialized, FE sets default values from different sources. So initialising the EasyFilterBar after the SFB and FE init appState is initialized.
+						oTemplateUtils.oServices.oFioriAIHandler && oTemplateUtils.oServices.oFioriAIHandler.getFioriAIEnabledPromise("EasyFilter").then(function() {
+							oState.oIappStateHandler.onFEStartupInitialized().then(function() {
+								oState.oEasyFilterBarHandler = new EasyFilterBarHandler(oState, oController, oTemplateUtils);
+								oState.oEasyFilterBarHandler.initialiseEasyFilterBar();
+								oState.oSmartFilterbar.attachFilterChange(function(oEvent) {
+									oState.oEasyFilterBarHandler.onFilterChange(oEvent);
+								});
 							});
 						});
 					},
 					onAfterSFBVariantLoad: function (oEvent) {
 						oState.oIappStateHandler.onAfterSFBVariantLoad(oEvent);
+						oState.oEasyFilterBarHandler && oState.oEasyFilterBarHandler.handleVariantLoad(oEvent);
 					},
 					onSmartListDataReceived: function (oEvent) {
 						var oSmartList = oEvent.getSource();
 						fnOnDataReceived(oSmartList);
 					},
-					onEasyFilterExecuteSearch: function(oEvent) {
-						oState.oEasyFilterBarHandler.onExecuteSearch(oEvent);
-					},
 					onEasyFilterClearFilters: function(oEvent) {
 						oState.oEasyFilterBarHandler.onClearFilters(oEvent);
 					},
@@ -738,6 +731,9 @@ sap.ui.define([
 						var oTempModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 						if (oTempModel.getProperty("/listReport/filterMode") === "easyFilter") {
 							oSmartFilterbar.setVisible(false);
+							var  oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+							oTemplatePrivateModel.setProperty("/listReport/firstSelection", true);
+							oTemplatePrivateModel.setProperty("/generic/bDataAreShownInTable", false);
 						} else {
 							oSmartFilterbar.setVisible(true);
 						}

package/src/sap/suite/ui/generic/template/ListReport/controller/IappStateHandler.js

@@ -64,6 +64,11 @@ sap.ui.define([
 			onSmartFilterBarInitialized = fnResolve;
 		});
 
+		// Resolve this only after the FE initializes all the filter values from different sources
+		var onFEStartupInitializedResolver;
+		var onFEStartupInitializedPromise = new Promise(function(fnResolve) {
+			onFEStartupInitializedResolver = fnResolve;
+		});
 		// *** setup wrappers for control states (start)
 
 
@@ -805,7 +810,11 @@ sap.ui.define([
 				// Remark: in case of an appState key in the URL, that could not be analyzed, we should NOT call navigationHandler to parse. In this case, we get an empty object
 				// (in contrast to undefined when there's no appstate key)
 
-				return oSmartFilterBarInitializedPromise.then(fnParseUrlAndApplyAppState); // return promise to inform controller, when startup is finished
+				return oSmartFilterBarInitializedPromise.then(function() {
+					var oStartupFinishedPromise = fnParseUrlAndApplyAppState();
+					oStartupFinishedPromise.then(onFEStartupInitializedResolver);
+					return oStartupFinishedPromise; // return promise to inform controller, when startup is finished
+				});
 			}
 
 			var sNavType;
@@ -824,6 +833,8 @@ sap.ui.define([
 			oSmartFilterBarInitializedPromise.then(function(){
 				// fallback to navType initial, if appState is given in URL, but could not be analyzed => oState is an empty Object
 				fnAdaptToAppState(oAppData, {} /* URLparameter are irrelevant if restoring from iAppState */, sNavType);
+				// Once the FE is initialized, the promise is resolved so that the SFB contains the updated list of filters
+				onFEStartupInitializedResolver();
 			});
 			return oSmartFilterBarInitializedPromise; // to inform controller, when startup is finished
 		}
@@ -1075,6 +1086,10 @@ sap.ui.define([
 			oDataLoadedWrapper.setState(!!bShouldDataBeLoaded);
 		}
 
+		function onFEStartupInitialized(){
+			return onFEStartupInitializedPromise;
+		}
+
 		return {
 			areDataShownInTable: areDataShownInTable,
 			setDataShownInTable: fnSetDataShownInTable,
@@ -1085,7 +1100,8 @@ sap.ui.define([
 			onAfterSFBVariantLoad: onAfterSFBVariantLoad,
 			applyState: applyState,
 			getCurrentAppState: getCurrentAppState, // separation of concerns - only provide state, statePreserver responsible for storing it
-			setFiltersUsingUIState : fnSetFiltersUsingUIState
+			setFiltersUsingUIState : fnSetFiltersUsingUIState,
+			onFEStartupInitialized : onFEStartupInitialized
 		};
 	}
 

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n.properties

@@ -160,14 +160,11 @@ ST_CREATE_WITH_FILTERS=Create with filters
 #------------Easy filter related text-----------------------
 # All the easy filter and filter mode related texts are defined here
 
-# XTIT,30: Title of the Filter modes in List Report
-ST_EASY_FILTER_TITLE=Filter Mode :
-
 # XBUT: Manual filter segmented button text
 ST_MANUAL_FILTER=Classic
 
 # XBUT: Easy filter segmented button text
-ST_EASY_FILTER=SAP Business AI
+ST_EASY_FILTER=Easy filter
 
 #------------End of: Easy filter related text-----------------------
 

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.130.2"
+			"version": "1.130.4"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -2410,7 +2410,7 @@ sap.ui.define([
 					},
 
 					onSummarize: function () {
-						oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.summarize({view: oController.getView()});
+						oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.summarize.summarize({view: oController.getView()});
 					},
 
 					onEdit: function (oEvent) {

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.130.2"
+			"version": "1.130.4"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.130.2"
+			"version": "1.130.4"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.130.2"
+		"version": "1.130.4"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -1,11 +1,6 @@
 <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
-            text="{i18n>ST_EASY_FILTER_PROMPT_INFO}"
-            showIcon="true"
-            showCloseButton="true"
-            class="sapUiSmallMarginBottom"/>
          <feControls:EasyFilterBarContainer id="template::easyFilterContainer"
 			showValueHelp="._templateEventHandlers.onEasyFilterShowValueHelp"
 			queryChanged="._templateEventHandlers.onEasyFilterQueryChanged"
@@ -13,7 +8,6 @@
 			beforeQueryProcessing="._templateEventHandlers.onEasyFilterBeforeQueryProcessing"
 			afterQueryProcessing="._templateEventHandlers.onEasyFilterAfterQueryProcessing"
 			clearFilters="._templateEventHandlers.onEasyFilterClearFilters"
-			executeSearch="._templateEventHandlers.onEasyFilterExecuteSearch"
 		/>
     </VBox>
 </core:FragmentDefinition>

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

@@ -2,7 +2,7 @@
 	xmlns:sfo="sap.ui.comp.smartform" xmlns:smartMultiInput="sap.ui.comp.smartmultiinput" xmlns:layoutData="sap.ui.layout" xmlns:fe="sap.suite.ui.generic.template.genericUtilities"
 	xmlns:custom="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
-	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper', StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
+	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper', StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper', SideEffectUtil: 'sap/suite/ui/generic/template/lib/SideEffectUtil'}">
 
 	<!-- @classdesc @name: Name: sap.suite.ui.generic.template.fragments.SmartFormDataField.fragment.xml
 		@description: This fragment contains label value pairs for the smart form
@@ -35,7 +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="SideEffects" value="{parts: [{path: 'entitySet>'}, {path: 'dataField>'}, {path: 'contact>fn/Path'}], formatter: 'SideEffectUtil.getPropsForLinkFields'}"/>
 								<core:CustomData key="Location" value="Section" />
 								<core:CustomData key="contactDetails" value="{= ${path: 'contact>', formatter: 'AH.getCustomDataForContactPopup'}}"/>
 							</fe:customData>
@@ -121,7 +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="SideEffects" value="{parts: [{path: 'entitySet>'}, {path: 'dataField>'}], formatter: 'SideEffectUtil.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/filterHelper.js

@@ -5,8 +5,9 @@ sap.ui.define([
 	"sap/m/DynamicDateUtil",
 	"sap/suite/ui/generic/template/genericUtilities/metadataAnalyser",
 	"sap/base/i18n/date/CalendarType",
-	"sap/suite/ui/generic/template/genericUtilities/testableHelper"
-], function (FilterOperator, DateFormat, encodeURL, DynamicDateUtil, metadataAnalyser, CalendarType, testableHelper) {
+	"sap/suite/ui/generic/template/genericUtilities/testableHelper",
+	"sap/ui/model/Filter"
+], function (FilterOperator, DateFormat, encodeURL, DynamicDateUtil, metadataAnalyser, CalendarType, testableHelper,Filter) {
     "use strict";
 
 	function getInfoForFilters(aFilters, getFilterInfoForPropertyFilters, bAnd){
@@ -260,6 +261,71 @@ sap.ui.define([
 		};
 	}
 
+/**
+	 * function wraps the table level filters into single filter object
+	 * This is done to follow the same format as SFB and chart filters 
+	 * returns the updated aFilters
+	 * @param {Array} aFilters - It contains all the filters applied (in SFB , chart or table level filters)
+	 * @returns {Array} - returns array containing all the filters applied including the table filters wrapped as single filter object similar to SFB and chart filters
+	 */
+
+	function fnNormaliseControlFilters(aFilters) {
+		var aTableFilters = [];
+
+		var aChartAndSFBFilters = [];
+
+		aFilters.forEach((oFilter) => {
+			if (oFilter.aFilters) {
+				aChartAndSFBFilters.push(oFilter);
+			} else {
+				aTableFilters.push(oFilter);
+			}
+		});
+
+		if (aTableFilters && aTableFilters.length > 1) {
+			//Grouping the table level filters based on sPath
+			var aGroupedTableFilters = aTableFilters.reduce(
+				(aGroupedFilters, oCurrentfilter) => {
+					var path = oCurrentfilter.sPath;
+
+					if (!aGroupedFilters[path]) {
+						aGroupedFilters[path] = [];
+					}
+
+					aGroupedFilters[path].push(oCurrentfilter);
+
+					return aGroupedFilters;
+				},
+				{}
+			);
+
+			// Convert grouped table filters into nested filter groups
+
+			var aTableFilterGroups = Object.keys(aGroupedTableFilters).map(
+				(sPath) => {
+					return new Filter({
+						filters: aGroupedTableFilters[sPath],
+
+						and: false // OR logic within each group
+					});
+				}
+			);
+
+			// Forming a single top-level table filter
+
+			aTableFilters = new Filter({
+				filters: aTableFilterGroups,
+
+				and: true // AND logic for combining everything
+			});
+
+			// combining filters from chart , SFB , and table
+			aChartAndSFBFilters.push(aTableFilters);
+			return aChartAndSFBFilters;
+		}
+
+		return aFilters;
+	}
 	/**
      * Function returns filter params for service url
      * @param {object} sEntityTypeName
@@ -274,6 +340,7 @@ sap.ui.define([
 			oFilterData: oFilterData,
 			bIsStatic: false
 		};
+		aApplicationFilters = fnNormaliseControlFilters(aApplicationFilters);
 		// Here oParams.bIsStrict will change if SFB have custom semantic-date filter.
 		var sFilterParams = "$filter=" + getFilterString(aApplicationFilters, getFilterInfoForPropertyFilters.bind(null, oParams));
 		sFilterParams = oParams.bIsStatic ? "" : sFilterParams;
@@ -281,6 +348,7 @@ sap.ui.define([
 	}
 	testableHelper.testableStatic(getFilterInfoForPropertyFilters, "filterHelper_getFilterInfoForPropertyFilters");
 	testableHelper.testableStatic(getFilterString, "filterHelper_getFilterString");
+	testableHelper.testableStatic(fnNormaliseControlFilters, "filterHelper_fnNormaliseControlFilters");
     return {
 		getFilterParams: getFilterParams
     };

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

@@ -28,6 +28,20 @@ sap.ui.define([
 			return null;
 			};
 		}
+		/**
+		 * PolyFill for Promise.withResolvers
+		 */
+		if (!Promise.withResolvers) {
+			Promise.withResolvers = function() {
+			var resolvers = {};
+			var promise = new Promise(function(resolve, reject) {
+				resolvers.resolve = resolve;
+				resolvers.reject = reject;
+			});
+			Object.assign(promise, resolvers);
+			return promise;
+			};
+		}
 		/**
 		* PolyFill for nextSiblingElement
 		*/

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

@@ -11,10 +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
+	"sap/base/util/isEmptyObject",
+	"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, SideEffectUtil) {
+	SapMLibrary, SapCoreLibrary, metadataAnalyser, ManagedObject, isEmptyObject) {
 	"use strict";
 
 	// shortcut for sap.ui.core.ValueState
@@ -384,9 +384,6 @@ 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';

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

@@ -938,7 +938,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.130.2
+	 * @version 1.130.4
 	 * @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/CRUDHelper.js

@@ -216,7 +216,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 						]);
 				var sEdit =  oResourceObject.getText("Edit");
 				var sCancel =  oResourceObject.getText("CANCEL");
-					MessageBox.warning(sWarningText, {
+				MessageBox.warning(sWarningText, {
 					title: oResourceObject.getText("ST_UNSAVED_CHANGES_TITLE"),
 					actions: [sEdit, sCancel],
 					emphasizedAction: sEdit,
@@ -224,7 +224,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 						if (sAction === sEdit) {
 							resolve();
 						} else if (sAction === sCancel) {
-							if (bOpenInEditMode) {
+							if (bOpenInEditMode && oViewProxy && oViewProxy.navigateUp) {
 								oViewProxy.navigateUp();
 							}
 						}
@@ -368,7 +368,9 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 												});
 												oApplication.getBusyHelper().setBusy(oUnsavedChangesEditPromise, true);
 											};
-											var editRejection = Function.prototype;
+											var editRejection = reject({
+												cancelled: true
+											});
 											var unSavedChangesDialogPromise = fnUnsavedChangesDialog(undefined, oResponse.DraftAdministrativeData,oCommonUtils, oViewProxy, bOpenInEditMode);
 											unSavedChangesDialogPromise.then(editConfirmation,editRejection);
 										}

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

@@ -1663,6 +1663,10 @@ sap.ui.define(["sap/ui/base/Object",
 					if (oError.lockedByUser) {
 						var sLockText = oCommonUtils.getText("ST_GENERIC_DRAFT_LOCKED_BY_USER", [" ", oError.lockedByUser]);
 						MessageBox.error(sLockText);
+					} else if (oError.cancelled) {
+						if (oViewProxy && oViewProxy.navigateUp){
+							oViewProxy.navigateUp();
+						}
 					} else {
 						MessageUtils.handleError(MessageUtils.operations.editEntity, oController, oServices, oError);
 						if (oViewProxy && oViewProxy.navigateUp){

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

@@ -126,13 +126,17 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 					var oTreeNode = oTemplateContract.mEntityTree[sEntitySet];
 					if (oTreeNode && !oTreeNode.noOData){
 						if (aKeysFromIdentity){
+							// Get the root context's info for the current draft context
+							oRootContextInfo = getRootContextInfo(oTreeNode, aKeysFromIdentity);
+							// If the current context is a draft, register context info for the active sibling as well
 							if (oContextInfo.bIsDraft){
 								var aActiveKeys = [];
 								var oActiveFoundPromise = oTemplateContract.oApplicationProxy.fillSiblingKeyPromise(oTreeNode, aKeysFromIdentity, aActiveKeys);
 								oActiveFoundPromise.then(function(oReplaceNode){
 									var sReplacePath = oReplaceNode.getPath(3, aActiveKeys);
-									if (!mPath2ContextData[sReplacePath]){
-										mPath2ContextData[sReplacePath] = {
+									var oActiveContextData = mPath2ContextData[sReplacePath];
+									if (!oActiveContextData){
+										oActiveContextData = {
 											oContextInfo: {
 												bIsDraft: false,
 												bIsDraftSupported: true,
@@ -142,30 +146,18 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 											},
 											aKeysFromIdentity: aActiveKeys
 										};
+										// Finally add the active context data to the cache
+										mPath2ContextData[sReplacePath] = oActiveContextData;
+									}
+
+									// Fill rootContextInfo for the active context's data
+									if (!oActiveContextData.oRootContextInfo) {
+										oActiveContextData.oRootContextInfo = getRootContextInfo(oReplaceNode, aActiveKeys);
+										// Add the active context's data to root context info's children
+										oActiveContextData.oRootContextInfo.childContexts[sReplacePath] = oActiveContextData;
 									}
 								});	
 							}
-							if (oTreeNode && !oTreeNode.noOData){
-								var oMainObjectNode = oTemplateContract.oApplicationProxy.getAncestralNode(oTreeNode, 1);
-								var oActiveDraftInfoForDraftRoot = mActiveDraftRoots[oMainObjectNode.entitySet];
-								if (!oActiveDraftInfoForDraftRoot){
-									oActiveDraftInfoForDraftRoot = {
-										treeNode: oMainObjectNode,
-										draftRoots: Object.create(null)
-									};
-									mActiveDraftRoots[oMainObjectNode.entitySet] = oActiveDraftInfoForDraftRoot;
-								}
-								var sRootKey = aKeysFromIdentity[1];
-								oRootContextInfo = oActiveDraftInfoForDraftRoot[sRootKey];
-								if (!oRootContextInfo){
-									oRootContextInfo = {
-										treeNode: oMainObjectNode,
-										key: sRootKey,
-										childContexts: Object.create(null)
-									};
-									oActiveDraftInfoForDraftRoot[sRootKey] = oRootContextInfo;
-								}
-							}
 						}
 						var oModel = oContext.getModel();
 						var oMetaModel = oModel.getMetaModel();
@@ -201,6 +193,30 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 				return oContextInfo;
 			}
 
+			// Gets the root context's info for the given tree node
+			function getRootContextInfo(oTreeNode, aKeysFromIdentity) {
+				var oMainObjectNode = oTemplateContract.oApplicationProxy.getAncestralNode(oTreeNode, 1);
+				var oActiveDraftInfoForDraftRoot = mActiveDraftRoots[oMainObjectNode.entitySet];
+				if (!oActiveDraftInfoForDraftRoot){
+					oActiveDraftInfoForDraftRoot = {
+						treeNode: oMainObjectNode,
+						draftRoots: Object.create(null)
+					};
+					mActiveDraftRoots[oMainObjectNode.entitySet] = oActiveDraftInfoForDraftRoot;
+				}
+				var sRootKey = aKeysFromIdentity[1];
+				var oRootContextInfo = oActiveDraftInfoForDraftRoot[sRootKey];
+				if (!oRootContextInfo){
+					oRootContextInfo = {
+						treeNode: oMainObjectNode,
+						key: sRootKey,
+						childContexts: Object.create(null)
+					};
+					oActiveDraftInfoForDraftRoot[sRootKey] = oRootContextInfo;
+				}
+				return oRootContextInfo;
+			}
+
 			function getPathOfLastShownDraftRoot() {
 				for (var i = aPathOfLastShownDraftRoots.length - 1; i >= 0; i--) {
 					var oContext = mPath2ContextData[aPathOfLastShownDraftRoots[i]].oContext;

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

@@ -138,11 +138,14 @@ sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 	 * Returns the EntitySet name, EntityType name, PropertyName for a given link field
 	 * @param {sap.ui.model.odata.ODataMetaModel.EntitySet} oEntitySet
 	 * @param {object} oTarget
+	 * @param {string} sFieldName
 	 */
-	function fnGetPropsForLinkFields (oEntitySet, oTarget) {
-		var sLinkProperty = oTarget && oTarget.Value && oTarget.Value.Path;
-		if (!sLinkProperty) {
-			return null;
+	function fnGetPropsForLinkFields (oEntitySet, oTarget, sFieldName) {
+		var sLinkProperty;
+		if (oTarget && oTarget.Value && oTarget.Value.Path){
+			sLinkProperty = oTarget.Value.Path;
+		} else {
+			sLinkProperty = oTarget.Target.AnnotationPath.split("/")[0] + "/" + sFieldName;
 		}
 		var oCustomData = {
 			"sEntitySetName": oEntitySet.name,
@@ -174,6 +177,7 @@ sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 				return;
 			}
 
+			var oControl = oLink;
 			var oEntityType = oMetaModel.getODataEntityType(sEntityTypeName);
 			var oEntitySet = oMetaModel.getODataEntitySet(sEntitySetName);
 			var oProperty = metadataAnalyser.getPropertyMetadata(oMetaModel, sEntityTypeName, sLinkProperty);
@@ -186,9 +190,20 @@ sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 				}
 			};
 
-			//The method SharedUtil.applyFieldGroupIDs takes in the control and its metadata, reads the Side Effect annotations configured for it 
-			//and assigns the fieldGroupID accordingly.
-			SharedUtil.applyFieldGroupIDs(oLink, oMetaData);
+			if (sLinkProperty.includes("/")){
+				while (!oControl.isA("sap.ui.comp.smartform.Group")) {
+					oControl = oControl.getParent();
+				}
+				//The method SharedUtil.applyFieldGroupIDs takes in the control and its metadata
+				//It then reads the Side Effect annotations configured for it, calculates fieldGroupIds and assigns them to the field
+				
+				//For navigation path link fields, we pass the oLink's parent Group control's binding context when calculating the fieldGroupIds
+				//This makes sure the calculated fieldGroupIds are consistent with the other source fields
+				SharedUtil.applyFieldGroupIDs(oLink, oMetaData, null, oControl.getBindingContext());
+			} else {
+				//For non navigation path link fields, we just pass the oLink along with its metadata
+				SharedUtil.applyFieldGroupIDs(oLink, oMetaData);
+			}
 		}
 	}
 

package/src/sap/suite/ui/generic/template/lib/ai/EasyFilterBarHandler.js

@@ -2,8 +2,9 @@ sap.ui.define([
     "sap/ui/base/Object",
     "sap/base/util/extend",
     "sap/suite/ui/generic/template/lib/filterHelper",
-    "sap/suite/ui/generic/template/genericUtilities/FeLogger"
-], function(BaseObject, extend, filterHelper, FeLogger) {
+    "sap/suite/ui/generic/template/genericUtilities/FeLogger",
+    "sap/ui/model/FilterOperator"
+], function(BaseObject, extend, filterHelper, FeLogger, FilterOperator) {
     'use strict';
 
     /*
@@ -28,25 +29,19 @@ sap.ui.define([
          * @returns A promise which returns the prepared metadata
          */
         function fnGetEasyFilterSearchMetadata() {
-            if (oEasyFilterMetadata) {
-                return Promise.resolve(oEasyFilterMetadata);
-            } else {
+            // In a few cases the SFB is not properly initialized and the metadata available is not complete
+            // In such cases the metadata is prepared after the SFB is initialized
+            // if (oEasyFilterMetadata) {
+            //     return Promise.resolve(oEasyFilterMetadata);
+            // } else {
                 return new Promise(function(fnResolve) {
-                    // In case the smart filter bar is already initialized then do not use "attachInitialized" as this event will never get triggered again
-                    if (oState.oSmartFilterbar.isInitialised()) {
+                    oState.oIappStateHandler.onFEStartupInitialized().then(function() {
                         fnPrepareSearchMetadata().then(function(oMetadata){
-                                fnResolve(oMetadata);
-                            }
-                        );
-                    } else {
-                        oState.oSmartFilterbar.attachInitialized(function() {
-                            fnPrepareSearchMetadata().then(function(oMetadata) {
-                                fnResolve(oMetadata);
-                            });
-                        },this);
-                    }
+                            fnResolve(oMetadata);
+                        });
+                    });
                 });
-            }
+            //}
         }
         /**
          * This method prepares the metadata for each filterable field from the smart filter bar
@@ -56,34 +51,48 @@ sap.ui.define([
         function fnPrepareSearchMetadata()  {
 
             var aPromise = [];
+            var oEditStateFilterItem;
+            var oDefaultValuesForEasyFilter = {};
             var oOwnerFilterControl = oState.oSmartFilterbar;
             var oSFBModel = oOwnerFilterControl.getModel();
             var oSFBMetaModel = oSFBModel.getMetaModel();
-            var oEditStateFilterItem;
+
             var sEntitySet = oController.getOwnerComponent().getEntitySet();
-            var sTokenType = "ValueHelp"; // Other values are "Calendar" | "Time" | "MenuWithCheckBox"
 
             var mFilterProperties = {}; // todo : Add the properties from navigation entites
             var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sEntitySet);
             oEntityType.property.map(function (oProperty) {
+                var sTokenType = "ValueHelp"; // Other values are "Calendar" | "Time" | "MenuWithCheckBox" | "MenuWithSingleSelect"
                 if (filterHelper.isPropertyFilterable(oProperty)) {
-                    var bIsCodeListRequired = "";
+
+                    var bIsCodeListRequired;
                     oProperty.extensions && oProperty.extensions.forEach(function(oExtension) {
                         if (oExtension.name === "value-list" && oExtension.value === "fixed-values") {
                             sTokenType = "MenuWithCheckBox";
                             bIsCodeListRequired = true;
                         }
                     });
+
+                    // Calculate the token type based on the property type and display format
+                    // It will be better if this is done at the control level
+                    if ((oProperty.type === "Edm.DateTime" && oProperty["sap:display-format"] === "Date") ||
+                    (oProperty.type === "Edm.String" && oProperty["com.sap.vocabularies.Common.v1.IsCalendarDate"] && oProperty["com.sap.vocabularies.Common.v1.IsCalendarDate"].Bool === "true")) {
+                        sTokenType = "Calendar";
+                    } else if (oProperty.type === "Edm.DateTimeOffset") {
+                        sTokenType = "Time";
+                    }
+
                     mFilterProperties[oProperty.name] = {
                         name: oProperty.name,
                         //label: oProperty.label,  Name is added from the filter item control
                         dataType: oProperty.type,
+                        defaultValue : [], // Fill values from FLP user defaults , SV or other sources
                         filterable: true,
                         sortable: false,
                         codeList : bIsCodeListRequired,
                         type: sTokenType,
                         unit: oProperty["sap:unit"] || "",
-                        required: oProperty["sap:required-in-filter"] ? true : false
+                        required: oProperty["sap:required-in-filter"] === "true" ? true : false
                     };
                 }
             });
@@ -93,12 +102,54 @@ sap.ui.define([
                 entitySet: sEntitySet,
                 fields : []
             };
-
+            oDefaultValuesForEasyFilter = oOwnerFilterControl.getFilterData() || {};
             oOwnerFilterControl.getAllFilterItems().forEach(function (oFilterItem) {
                 //check if the filter item from the filter control is a property of the entity type , if then push it to the easy filter metadata
                 // todo : Add the properties from navigation entites
                 var oFilterItemForQuery = mFilterProperties[oFilterItem.getName()];
                 if (oFilterItemForQuery) {
+                    var oDefaultFilterValue = oDefaultValuesForEasyFilter[oFilterItem.getName()];
+                    if (oDefaultFilterValue) {
+                        var aValues = [];
+                        // oDefaultFilterValue can have ranges or items or low or single value directly
+                        if (oDefaultFilterValue.ranges  && oDefaultFilterValue.ranges.length > 0) {
+                            aValues = oDefaultFilterValue.ranges.map(function(oRange) {
+                                if (oRange.exclude === false) {
+                                    if (oRange.operation === "BT") {
+                                        return {
+                                            operator: FilterOperator.BT,
+                                            selectedValues: [{ value1: oRange.value1, value2: oRange.value2 }]
+                                        };
+                                    } else {
+                                        return {
+                                            operator: oRange.operation,
+                                            selectedValues: [oRange.value1]
+                                        };
+                                    }
+                               } else {
+                                    return {
+                                        operator: FilterOperator.NE,
+                                        selectedValues: [oRange.value1]
+                                    };
+                                }
+                            });
+                        } else if (oDefaultFilterValue.items && oDefaultFilterValue.items.length > 0) { // unrestricted/multi-value
+                            oDefaultFilterValue.items.forEach(function(oItem) {
+                                aValues.push({
+                                    operator: FilterOperator.EQ,
+                                    selectedValues: [oItem.key]
+                                });
+                            });
+                        } else if (oDefaultFilterValue) { // In cases where the default value is coming from the FLP user defaults and does not have ranges and the value is a single value
+                            aValues = [
+                                {
+                                    operator: FilterOperator.EQ,
+                                    selectedValues: [oDefaultFilterValue]
+                                }
+                            ];
+                        }
+                        oFilterItemForQuery.defaultValue = aValues;
+                    }
                     oFilterItemForQuery.label = oFilterItem.getLabel();
                     // codeList is set to true for fixed value list and codelist is fetched
                     if (oFilterItemForQuery.codeList) {
@@ -128,7 +179,6 @@ sap.ui.define([
              if (oTemplateUtils.oComponentUtils.isDraftEnabled()) {
                 var oEditStateControl = oController.byId("editStateFilter");
                 if (oEditStateControl) {
-                    sTokenType = "MenuWithCheckBox";
                     var oEditingStatusCodeList = oEditStateControl.getItems().map(function(oItem) {
                         return {
                             value : oItem.getKey(),
@@ -142,7 +192,7 @@ sap.ui.define([
                         filterable: true,
                         required: false,
                         sortable: false,
-                        type: sTokenType,
+                        type: "MenuWithSingleSelect",
                         codeList : oEditingStatusCodeList
                     };
                     oEasyFilterMetadata.fields.push(oEditStateFilterMetadata);
@@ -308,17 +358,12 @@ sap.ui.define([
             var sEntitySet = oController.getOwnerComponent().getEntitySet();
             oEasyFilterMetadataPromise.then((oEasyFilterMetadata) => {
                 oEasyFilter.setContextPath(sEntitySet);
-                oEasyFilter.setAppId(oController.getOwnerComponent().getAppComponent().getManifestEntry("sap.app")).id;
+                oEasyFilter.setAppId(oController.getOwnerComponent().getAppComponent().getManifestEntry("sap.app").id);
                 oEasyFilter.setFilterBarMetadata(oEasyFilterMetadata.fields);
                 oEasyFilter.easyfilter = oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.EasyFilter;
             });
         }
 
-        function fnExecuteSearch(oEvent) {
-			var oSmartFilterbar = oState.oSmartFilterbar;
-			oSmartFilterbar.search();
-		}
-
 		function fnClearFilters(oEvent) {
 			var oSmartFilterbar = oState.oSmartFilterbar;
             oSmartFilterbar.search();
@@ -430,19 +475,35 @@ sap.ui.define([
             }
         }
 
+        /**
+         *
+         * This method is called when the variant is loaded in SFB
+         * Always set the filterMode to classic when the variant is loaded as the variant filters are not supported in the EasyFilter
+         * */
+        function fnHandleVariantLoad(oEvent) {
+            var oTempModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+            // 'context' is undefined or null when the user switches variant , in this case switch to classic mode
+            // other values are "CANCEL" , "RESET" , "SET_VM_ID" , "DATA_SUITE" , "INIT" , "KEY_USER" etc : Do not switch filter mode in these cases
+            if (!oEvent.getParameter("context") && oTempModel.getProperty("/listReport/filterMode") !== "classic") {
+                var oSmartFilterbar = oState.oSmartFilterbar;
+                oTempModel.setProperty("/listReport/filterMode", "classic");
+                oSmartFilterbar.setVisible(true);
+            }
+        }
+
         return {
             getEasyFilterBar : fnGetEasyFilterBar,
             initialiseEasyFilterBar : fnInitialiseEasyFilterBar,
             getSFBVariantData : fnGetSFBVariantData,
             getEasyFilterSearchMetadata : fnGetEasyFilterSearchMetadata,
-			onExecuteSearch: fnExecuteSearch,
 			onClearFilters: fnClearFilters,
 			onAfterQueryProcessing: fnAfterQueryProcessing,
 			onBeforeQueryProcessing: fnBeforeQueryProcessing,
             onQueryChanged : fnQueryChanged,
 			onTokensChanged: fnTokensChanged,
 			onShowValueHelp: fnShowValueHelp,
-            onFilterChange : fnOnFilterChange
+            onFilterChange : fnOnFilterChange,
+            handleVariantLoad : fnHandleVariantLoad
         };
     }
 

package/src/sap/suite/ui/generic/template/lib/ai/FioriAIHandler.js

@@ -2,10 +2,16 @@ sap.ui.define([
     "sap/ui/base/Object",
     "sap/base/util/extend",
     "sap/ui/core/Lib",
-    "sap/suite/ui/generic/template/genericUtilities/FeLogger"
+    "sap/suite/ui/generic/template/genericUtilities/FeLogger",
+    "sap/suite/ui/generic/template/genericUtilities/polyFill"
 ], function(BaseObject, extend, Lib, FeLogger) {
     'use strict';
-    var sAIIntent = "#IntelligentPrompt-summarize"; // For now the intent is common for all the AI scenarios
+    // List of AI capabilities that are available in the template
+    var aAIIntentMaster = [
+        { name : "summarize", intent : "#IntelligentPrompt-summarize", importURL : "ux/eng/fioriai/reuse/library", localProperty : "isSummarizationEnabled", oEnabledPromise : Promise.withResolvers() },
+        { name : "EasyFilter", intent :  "#IntelligentPrompt-filter", importURL : "ux/eng/fioriai/reuse/easyfilter/EasyFilter", localProperty : "isEasyFilterEnabled", oEnabledPromise : Promise.withResolvers() },
+        { name : "ErrorExplanation", intent : "#IntelligentPrompt-explain", importURL : "ux/eng/fioriai/reuse/errorexplanation/ErrorExplanation", localProperty : "isErrorExplanationEnabled", oEnabledPromise : Promise.withResolvers() }
+    ];
     var sFioriAILibrary = "ux.eng.fioriai.reuse";
     var UShellContainer = sap.ui.require("sap/ushell/Container");
     var oLogger = new FeLogger("lib.ai.FioriAIHandler").getLogger();
@@ -16,52 +22,42 @@ sap.ui.define([
 
     function getMethods(oTemplateContract) {
         
-        var fnResolveInit = null;
-        var fnRejectInit = null;
-        var oFioriAILoaderPromise = new Promise(function(fnResolve, fnReject) {
-            fnResolveInit = fnResolve;
-            fnRejectInit = fnReject;
-        });
-
         /**
          * This method is used to load the Fiori AI library and make the available AI capabilities to the template contract
          */
         function fnLoadAILibrary() {
             var that = this;
             UShellContainer && UShellContainer.getServiceAsync("Navigation").then(function(oNavigationService) {
-                oNavigationService.resolveIntent(sAIIntent).then(function(sUrl) {
-                    Lib.load({name: sFioriAILibrary, url: sUrl}).then(function() {
-                        // To-Do : load the summarize from reuse/summary
-                        sap.ui.require(["ux/eng/fioriai/reuse/library",
-                            "ux/eng/fioriai/reuse/easyfilter/EasyFilter",
-                            "ux/eng/fioriai/reuse/errorexplanation/ErrorExplanation"
-                        ], function(fioriaiLib, EasyFilter, ErrorExplanation) {
-                            that.fioriaiLib.summarize = fioriaiLib.summarize;
-                            that.fioriaiLib.EasyFilter = EasyFilter;
-                            that.fioriaiLib.ErrorExplanation = ErrorExplanation;
-
-                            that.isFioriAIEnabled = true;
-                            // Each AI capability will be enabled separately. Currently there is no separation for beta , but in future it will be
-                            oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/fioriAI/isSummarizationEnabled", !!sUrl);
-                            // isEasyFilterEnabled property controls the visibility of the filter bar switch from which the easyfilter can be accessed
-                            oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/fioriAI/isEasyFilterEnabled", !!sUrl);
-                            oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/fioriAI/isErrorExplanationEnabled", !!sUrl);
-                            fnResolveInit();
+                aAIIntentMaster.forEach(function(oAIIntent) {
+                    oNavigationService.resolveIntent(oAIIntent.intent).then(function(sURL) {
+                        Lib.load({name: sFioriAILibrary , url : sURL }).then(function() {
+                            sap.ui.require([oAIIntent.importURL
+                            ], function(fioriaiLibImport) {
+                                oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/fioriAI/" + oAIIntent.localProperty , true);
+                                that.fioriaiLib[oAIIntent.name] = fioriaiLibImport;
+                                oAIIntent.oEnabledPromise.resolve();
+                            });
                         });
+                    }, function() {
+                        oLogger.warning(oAIIntent.intent + " capability not enabled on this tenant");
+                        oAIIntent.oEnabledPromise.reject();
                     });
-                }).catch(function() {
-                    oLogger.warning("No intelligent capability enabled on the tenant");
-                    fnRejectInit();
                 });
-            }, fnRejectInit);
+            }).catch(function() {
+                oLogger.warning("No Navigation service enabled on the tenant");
+            });
         }
 
         /**
-         * 
+         * @param {*} sAIIntentName The name of the AI intent
          * @returns Promise which resolves to true if the AI is enabled
          */
-        function fnGetFioriAIEnabledPromise() {
-            return this.isFioriAIEnabled ? Promise.resolve() : oFioriAILoaderPromise;
+        function fnGetFioriAIEnabledPromise(sAIIntentName) {
+            var oAIIntent;
+            oAIIntent = aAIIntentMaster.find(function(oAIIntent) {
+                return oAIIntent.name === sAIIntentName;
+            });
+            return oAIIntent.oEnabledPromise.promise;
         }
 
         return {
@@ -77,7 +73,6 @@ sap.ui.define([
                 EasyFilter: null,
                 ErrorExplanation: null
             };
-            this.isFioriAIEnabled = false;
 			extend(this, getMethods(oTemplateContract));
 		}
     });

package/src/sap/suite/ui/generic/template/lib/i18n/i18n.properties

@@ -304,20 +304,6 @@ ST_CARD_CREATION_FAILURE_REASON_SEMANTIC_DATE_FILTERS=Card creation isn\u2019t p
 #XMSG: Info text
 ST_CARD_NAVIGATION_FAILURE_INFO=Direct navigation to the object details isn’t possible from this insights card.
 
-
-#------------Easy filter related text-----------------------
-
-# YMSG, 200: Message shown when the user switches to Easy filter mode
-ST_EASY_FILTER_PROMPT_INFO=The Prompt-based filtering will create completely new filter criteria. Generated content may not always be accurate. Consider verifying it.
-
-# YMSG, 100: Placeholder text for the Easy Filter input field
-ST_EASY_FILTER_INPUT_PLACEHOLDER=Enter your query in natural language to filter the list
-
-# XBUT, 20: Text for the Go button in Easy Filter mode
-ST_EASY_FILTER_GO_BUTTON_TEXT=Go
-
-#------------End of: Easy filter related text-----------------------
-
 ST_AI_EE_BUTTON_LABEL=Generate Explanation
 
 #---Final block: texts to be redefined by the application ----------------------------------------------

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -2325,35 +2325,48 @@ sap.ui.define(["sap/ui/base/Object",
 		
 
 		var mRoutesToHostViews = Object.create(null);
-		function fnPrepareHostView(oTreeNode, isComponentPreloaded, bOnlyComponent){
-			if (oTreeNode.createComponent) {
-				if (bOnlyComponent || oTemplateContract.oAppComponent.isDestroyed()) {
-					return Promise.resolve();
-				}
-				oTreeNode.createComponent();
-				delete oTreeNode.createComponent;
+		function fnPrepareHostView(oTreeNode, isComponentPreloaded, bOnlyComponent) {
+			if (oTemplateContract.oAppComponent.isDestroyed()) {
 				return Promise.resolve();
 			}
-			if (mRoutesToHostViews[oTreeNode.sRouteName] || oTemplateContract.oAppComponent.isDestroyed()){
-				return Promise.resolve();
+
+			// Return oHostViewPromise from the routes cache if it exists
+			if (mRoutesToHostViews[oTreeNode.sRouteName]) {
+				return mRoutesToHostViews[oTreeNode.sRouteName].then(function(oHostView) {
+					// if createComponent is available in oTreeNode, call the function and remove from oTreeNode
+					if (oTreeNode.createComponent) {
+						if (bOnlyComponent || oTemplateContract.oAppComponent.isDestroyed()) {
+							return Promise.resolve();
+						}
+						oTreeNode.createComponent();
+						delete oTreeNode.createComponent;
+						return Promise.resolve();
+					}
+					return oHostView;
+				});
 			}
-			
+
 			oLogger.debug("Prepare host view for route " + oTreeNode.sRouteName);
+
             var oHostViewPromise = oNavigationControllerProxy.createHostView();
+			// Store the oHostViewPromise in the routes cache
+			mRoutesToHostViews[oTreeNode.sRouteName] = oHostViewPromise;
+
             var oViews = oNavigationControllerProxy.oRouter.getViews();
 			// Temporarily add the oHostViewPromise to the view cache
             oViews.setView(oTreeNode.sRouteName, oHostViewPromise);
 
             return oHostViewPromise.then(function(oHostView) {
-				//Update the view cache with the actual view
+				// Update the view cache with the actual view
 				oViews.setView(oTreeNode.sRouteName, oHostView);
-                mRoutesToHostViews[oTreeNode.sRouteName] = oHostView;
+
 				var oComponentContainer = oHostView.byId("host");
 				if (bOnlyComponent) {
 					oTreeNode.createComponent = fnCreateTemplateComponent.bind(null, oComponentContainer, oTreeNode.sRouteName, isComponentPreloaded);
 				} else {
 					fnCreateTemplateComponent(oComponentContainer, oTreeNode.sRouteName, isComponentPreloaded); 
 				}
+				return oHostView;
 			});
 		}
 
@@ -3067,6 +3080,7 @@ sap.ui.define(["sap/ui/base/Object",
 		/* eslint-disable */
 		var fnCreateTemplateComponent = testableHelper.testable(fnCreateTemplateComponent, "createTemplateComponent");
 		var getParsedShellHashFromFLP = testableHelper.testable(getParsedShellHashFromFLP, "getParsedShellHashFromFLP");
+		var fnPrepareHostView = testableHelper.testable(fnPrepareHostView, "prepareHostView");
 		var fnPreloadComponent = testableHelper.testable(fnPreloadComponent, "preloadComponent");
 		var fnGetRouteInfoByHash = testableHelper.testable(fnGetRouteInfoByHash, "getRouteInfoByHash");
 		var fnGetIsStateChange = testableHelper.testable(fnGetIsStateChange, "getIsStateChange");
@@ -3167,7 +3181,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.130.2
+	 * @version 1.130.4
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

@@ -64,7 +64,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.130.2",
+		version: "1.130.4",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {