@sapui5/sap.suite.ui.generic.template 1.143.0 → 1.144.0

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

@@ -240,7 +240,7 @@ sap.ui.define(["sap/ui/base/Object",
 				return oRet;
 			}
 
-			function getDeleteEntityPromise(bIsActiveEntity, bHasActiveEntity, oContext) {
+			function getDeleteEntityPromise(bIsActiveEntity, bHasActiveEntity, oContext, oSibling) {
 				var oRet = new Promise(function(resolve, reject) {
 					var fnHandleSuccess = function() {
 						var sEntitySet = ModelUtil.getEntitySetFromContext(oContext);
@@ -265,11 +265,27 @@ sap.ui.define(["sap/ui/base/Object",
 							reject();
 						}
 					};
-					var oDeletePromise = deleteEntities({
-						pathes: [oContext.getPath()],
+					var fnHandleReject = function() {
+						if (bIsActiveEntity && oSibling) {
+							// Refresh page then we deleted active object + draft
+							// We have 412 response and user decided not to delete active object.
+							// Page need to be refreshed to update OP state according to model
+							var oComponent = oController.getOwnerComponent();
+							oServices.oViewDependencyHelper.setMeToDirty(oComponent);
+						}
+						reject();
+					};
+					var oSettings = {
+						pathes: [],
 						withWarningDialog: true
-					});
-					oDeletePromise.then(fnHandleResponse, reject);
+					};
+					if (bIsActiveEntity && oSibling) {
+						oSettings.pathes.push(oSibling.getPath());
+						oSettings.onlyOneDraftPlusActive = true;
+					}
+					oSettings.pathes.push(oContext.getPath());
+					var oDeletePromise = deleteEntities(oSettings);
+					oDeletePromise.then(fnHandleResponse, fnHandleReject);
 				});
 				return oRet;
 			}
@@ -790,7 +806,7 @@ sap.ui.define(["sap/ui/base/Object",
 								// Cache the error message to avoid duplicate display later
 								MessageUtils.cacheWarningMessage(oErrorReponse.error);
 							}
-						});						
+						});
 						fnShowWarningPopupIfRequired(oParsedResult.aMessagesForUserDecision, fnDone.bind(null, aResponse));
 					};
 					var fnDone = function(aResponses){
@@ -1094,6 +1110,7 @@ sap.ui.define(["sap/ui/base/Object",
 			/* eslint-disable */
 			var handleError = testableHelper.testable(handleError, "handleError");
 			var getActionUtil = testableHelper.testable(getActionUtil, "getActionUtil");
+			var deleteEntities = testableHelper.testable(deleteEntities, "deleteEntities");
 			/* eslint-enable */
 
 			return {

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

@@ -29,7 +29,8 @@ sap.ui.define(["sap/ui/base/Object",
 	"sap/m/VBox",
 	"sap/suite/ui/generic/template/genericUtilities/utils",
 	"sap/ui/core/Element",
-	"sap/ui/generic/app/util/ModelUtil"
+	"sap/ui/generic/app/util/ModelUtil",
+	"sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 ], function(
 	BaseObject,
 	Event,
@@ -62,7 +63,8 @@ sap.ui.define(["sap/ui/base/Object",
 	VBox,
 	genericUtils,
 	Element,
-	ModelUtil
+	ModelUtil,
+	metadataAnalyser
 ) {
 	"use strict";
 
@@ -2688,20 +2690,54 @@ sap.ui.define(["sap/ui/base/Object",
 
 		/**
 		 * This method remove the unsupported columns to get exported like 1/n navigation columns.
-		 * 
+		 *
 		 * @param {Object} oExportEvent - event handler for export.
 		 */
-		function removeUnsupportedExportColumns(oExportEvent) {
-			var aColumns =  oExportEvent.oSource.getTable().getColumns();
-			aColumns.forEach(oColumn => {
-				var aCustomData = oColumn.getCustomData();
-				aCustomData.forEach(oCustomdata => {
-					// Here if any columns custom data marked with "isExportable" key then we are ignoring those columns during export.
-					if (oCustomdata.getKey() === "isExportable") {
-						oExportEvent.mParameters.exportSettings.workbook.columns.splice(oExportEvent.mParameters.exportSettings.workbook.columns.findIndex((oCol) => oCol.columnId === oColumn.sId), 1);
+		function removeUnsupportedColumnsToExport(oExportEvent) {
+			var sEntitySet = oExportEvent.oSource.getEntitySet();
+			var oTable = oExportEvent.oSource.getTable();
+			var isSplitCell = oExportEvent.mParameters.exportSettings.fileType === "PDF" || (oExportEvent.mParameters.exportSettings.fileType === "XLSX" && oExportEvent.mParameters.userExportSettings.splitCells);
+			if (!isSplitCell) {
+				// without split cells
+				for (let i = 0; i < oExportEvent.mParameters.exportSettings.workbook.columns.length;) {
+					var oColumn = oExportEvent.mParameters.exportSettings.workbook.columns[i];
+					if (typeof oColumn.property === "string") {
+						if (metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, oColumn.property)) {
+							oExportEvent.mParameters.exportSettings.workbook.columns.splice(i, 1);
+							continue;
+						}
+					} else {
+						var aProperty = oColumn.property;
+						if (metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, aProperty[0]) || metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, aProperty[1])) {
+							oExportEvent.mParameters.exportSettings.workbook.columns.splice(i, 1);
+							continue;
+						}
 					}
-				});
-			});
+					i++;
+				}
+			} else {
+				// With split cells
+				for (let i = 0; i < oExportEvent.mParameters.exportSettings.workbook.columns.length;) {
+					var oColumn = oExportEvent.mParameters.exportSettings.workbook.columns[i];
+					if (oColumn.columnId && typeof oColumn.property === "string") {
+						// checking for additional column.
+						// in general, additional column don't have column Id.
+						var bHasAdditionalColumns = i < oExportEvent.mParameters.exportSettings.workbook.columns.length - 2 && !oExportEvent.mParameters.exportSettings.workbook.columns[i + 1].columnId;
+						if (bHasAdditionalColumns) {
+							if (metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, oColumn.property) || metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, oExportEvent.mParameters.exportSettings.workbook.columns[i + 1].property)) {
+								oExportEvent.mParameters.exportSettings.workbook.columns.splice(i, 2);
+								continue;
+							}
+						} else {
+							if (metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, oColumn.property)) {
+								oExportEvent.mParameters.exportSettings.workbook.columns.splice(i, 1);
+								continue;
+							}
+						}
+					}
+					i++;
+				}
+			}
 		}
 
 		/**
@@ -2731,7 +2767,7 @@ sap.ui.define(["sap/ui/base/Object",
 				filterSettings: (bIncludeFilterSettings ? aFilterSettings : []),
 				includeFilterSettings: bIncludeFilterSettings
 			};
-			removeUnsupportedExportColumns(oExportEvent);
+			removeUnsupportedColumnsToExport(oExportEvent);
 			//Invoke the extension
 			oController.onBeforeExportTableExtension(oExportParams);
 		}
@@ -2765,6 +2801,20 @@ sap.ui.define(["sap/ui/base/Object",
 			oServices.oApplication.getNavigationHandler().navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, fnHandleError, null, sNavMode);
 		}
 
+		/**
+		 * Provide functionality for QuickView e-mail SmartField
+		 * @param {object} oEvent
+		 */
+		function onSmartFieldPress(oEvent) {
+				var oSmartField = oEvent.getSource();
+				oEvent.getSource()._getComputedMetadata().then(function (oComputedMetaData) {
+					if (oComputedMetaData && oComputedMetaData.property && oComputedMetaData.property.property && oComputedMetaData.property.property['com.sap.vocabularies.Communication.v1.IsEmailAddress'] && oComputedMetaData.property.property['com.sap.vocabularies.Communication.v1.IsEmailAddress'].Bool) {
+						oEvent.preventDefault();
+						fnRenderTeamsContactCollabOptions(oSmartField, oSmartField.getValue());
+					}
+				});
+			}
+
 		/* eslint-disable */
 		var fnBuildSelectionVariantForNavigation = testableHelper.testable(fnBuildSelectionVariantForNavigation, "fnBuildSelectionVariantForNavigation");
 		var fnEvaluateParameters = testableHelper.testable(fnEvaluateParameters, "fnEvaluateParameters");
@@ -2774,6 +2824,8 @@ sap.ui.define(["sap/ui/base/Object",
 		var getDataForDeleteDialog = testableHelper.testable(getDataForDeleteDialog, "getDataForDeleteDialog");
 		var fnNavigateIntentSmartLink = testableHelper.testable(fnNavigateIntentSmartLink, "CommonEventHandlers_fnNavigateIntentSmartLink");
 		var getPaginatorInfo = testableHelper.testable(getPaginatorInfo, "getPaginatorInfo");
+		var fnRenderTeamsContactCollabOptions = testableHelper.testable(fnRenderTeamsContactCollabOptions, "fnRenderTeamsContactCollabOptions");
+		var removeUnsupportedColumnsToExport = testableHelper.testable(removeUnsupportedColumnsToExport, "removeUnsupportedColumnsToExport");
 		/* eslint-enable */
 
 		return {
@@ -2816,6 +2868,7 @@ sap.ui.define(["sap/ui/base/Object",
 			handleSideEffectForField: fnHandleSideEffectForField,
 			onSmartFieldModeToggled: onSmartFieldModeToggled,
 			onRenderTeamsContactCollabOptions: fnRenderTeamsContactCollabOptions,
+			onSmartFieldPress: onSmartFieldPress,
 			hideTableCells: fnHideTableCells,
 			navigateIntentOnNewTab: fnNavigateIntentOnNewTab
 		};

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

@@ -190,6 +190,15 @@ sap.ui.define([
 			var getHandler = function(bEnabled){
 				return bEnabled && oConfiguration.executeAction.bind(null, oFocusInfo, oToolbarControlData, oButton);
 			};
+			/**
+			* Skip if the action is unbound (doesn't require selection), i.e. no sap:action-for annotation is available.
+			* Currently, we just check for any sap:action-for annotation. To be correct, we might need to check whether the action is bound to the entity set of the table, esp.
+			* in case of function imports added to line items used on the object page, but bound to the parent entity set, e.g. a function import to create a child entity.
+			*/
+			var oFunctionImport = oController.getOwnerComponent().getModel().getMetaModel().getODataFunctionImport(oToolbarControlData.Action);
+			if (oFunctionImport && !oFunctionImport["sap:action-for"]) {
+				return;
+			}
 			// Check whether the action should be enabled
 			var oEnablementInfo = oCommonUtils.getToolbarActionEnablementInfo(oToolbarControlData, oFocusInfo.applicableContexts, oSourceControl);
 			// If the "oEnablementInfo" contains "enabledPromise", wait till the promise fulfilled and return the handler

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

@@ -239,10 +239,12 @@ sap.ui.define([
             const mPropertyMap = {};
             const oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(oController.getOwnerComponent().getEntitySet());
             oEntityType.property.forEach((oProperty)=>{
-                mPropertyMap[oProperty.name] = {
-                    description: getLabel(oProperty),
-                    dataType: oProperty.type
-                };   
+                if (isVisible(oProperty)) {
+                    mPropertyMap[oProperty.name] = {
+                        description: getLabel(oProperty),
+                        dataType: oProperty.type
+                    };
+                }
             });
             return mPropertyMap;
         }
@@ -301,14 +303,12 @@ sap.ui.define([
 
             Object.keys(oAiCallResult).forEach((sKey)=>{
                 const oProperty = oEntityType.property.find((oProperty)=>oProperty.name === sKey);
-                const {bIsVisible,bIsEditable} = isEditable(oProperty);
-                if (bIsVisible) {
-                    if (bIsEditable) {
+                    if (isEditable(oProperty)) {
                         updatableFields[sKey] = oAiCallResult[sKey];
                     } else {
                         nonUpdatableFields[sKey] = oAiCallResult[sKey];
                     }
-                }
+
             });
             return {updatableFields,nonUpdatableFields};
         }
@@ -334,16 +334,10 @@ sap.ui.define([
 
         function isEditable(oProperty) {
 
-            const oRes = {
-                bIsVisible: true,
-                bIsEditable: true
-            };
-
             //Check for sap:updatable
             const sUpdatable = oProperty["sap:updatable"];
             if (sUpdatable) {
-                oRes.bIsEditable = (sUpdatable === "false") ? false : true;
-                return oRes;
+               return sUpdatable === "false" ? false : true;
             }
 
             //Check for "com.sap.vocabularies.Common.v1.FieldControl"
@@ -351,35 +345,54 @@ sap.ui.define([
 
             if (oAnnotation && oAnnotation["EnumMember"]) {
                 const enumNumberType = oAnnotation["EnumMember"];
-                oRes.bIsVisible = (enumNumberType === 'com.sap.vocabularies.Common.v1.FieldControlType/Hidden') ? false : true;
-                oRes.bIsEditable = (enumNumberType === 'com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly') ? false : true;
-                return oRes;
+                return enumNumberType === 'com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly' ? false : true;
+            }
+
+
+            //Check for "sap:field-control"
+            const sFieldControl = oProperty["sap:field-control"];
+
+            if (sFieldControl) {
+                const iFieldControlValue = oObjectPageContext.getObject()[sFieldControl];
+                return iFieldControlValue === 1 ? false : true;
+            }
+
+            //If no restriction is present then by default all fields are editable
+            return true;
+        }
+
+        function isVisible(oProperty) {
+
+            //Check for "com.sap.vocabularies.Common.v1.FieldControl"
+            const oAnnotation = oProperty["com.sap.vocabularies.Common.v1.FieldControl"];
+
+            if (oAnnotation && oAnnotation["EnumMember"]) {
+                const enumNumberType = oAnnotation["EnumMember"];
+                return enumNumberType === 'com.sap.vocabularies.Common.v1.FieldControlType/Hidden' ? false : true;
             }
 
             //Check for Hidden annotation i.e com.sap.vocabularies.UI.v1.Hidden
             const oHiddenAnnotation = oProperty["com.sap.vocabularies.UI.v1.Hidden"];
             if (oHiddenAnnotation) {
-                oRes.bIsVisible = false;    // <Annotation Term="UI.Hidden"/>
+                let bIsVisible = false;    // <Annotation Term="UI.Hidden"/>
                 if (oHiddenAnnotation["Bool"]) {
-                    oRes.bIsVisible = (oHiddenAnnotation["Bool"] === "true") ? false : true;
+                    bIsVisible = (oHiddenAnnotation["Bool"] === "true") ? false : true;
                 } else if (oHiddenAnnotation["Path"]) {
-                    oRes.bIsVisible = !oObjectPageContext.getObject()[oHiddenAnnotation["Path"]];
+                    bIsVisible = !oObjectPageContext.getObject()[oHiddenAnnotation["Path"]];
                 }
-                return oRes;
+                return bIsVisible;
             }
-            
+
             //Check for "sap:field-control"
             const sFieldControl = oProperty["sap:field-control"];
 
             if (sFieldControl) {
                 const iFieldControlValue = oObjectPageContext.getObject()[sFieldControl];
-                oRes.bIsVisible = (iFieldControlValue === 0) ? false : true;
-                oRes.bIsEditable = (iFieldControlValue === 1) ? false : true;
-                return oRes;
+                return iFieldControlValue === 0 ? false : true;
             }
 
-            //If no restriction is present then by default all fields are editable
-            return oRes;
+            //If no restriction is present then by default all fields are visible
+            return true;
         }
 
         function resetTransientContext() {
@@ -415,7 +428,13 @@ sap.ui.define([
                     editable: isEditable,
                     enabled: isEditable,
                     contextEditable: isEditable,
-                    change: onSmartFieldChange.bind(this)
+                    change: onSmartFieldChange.bind(this),
+                    editableChanged: (oEvent)=>{
+                        //SmartField changes the editable state of inner controls based on various factors, so to make sure that the editable state remains as per our requirement we are forcing it here
+                        if (oEvent.getParameter("editable") !== isEditable) {
+                            oEvent.getSource().setEditable(isEditable);
+                        }
+                    }
                 });
                 if (isEditable) {
                     aEditableFields.push(oSmartField);

package/src/sap/suite/ui/generic/template/lib/ai/EasyFill/fragments/EasyFillDialog.fragment.xml

@@ -36,6 +36,7 @@ xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
                             text="Easy Fill"
                             type="Default"
                             icon="sap-icon://ai"
+                            fesr:press="fe2:ef:analyzeText"
                             enabled="{easyFillDialogModel>/isEasyFillButtonEnabled}"
                             press="onEasyFillSubmitInputToAI">
                         </Button>
@@ -43,6 +44,7 @@ xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
                             id="EasyFillClearAll"
                             type = "Transparent"
                             press="onEasyFillClearAll"
+                            fesr:press="fe2:ef:clearAll"
                             text="{i18n>EASYFILL_CLEAR_ALL}">
                         </Button>
                     </FlexBox>
@@ -58,8 +60,8 @@ xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
                         <HBox gap="0.5rem" justifyContent = "End" alignItems = "Center" renderType="Bare" class="sapSmartTemplatesObjectPageEasyFillReviewAreaBanner">
                             <Link text="{i18n>AI_LINK_NOTICE_TITLE}" press="onLinkPress"/>
                             <Label text="{i18n>AI_WARNING_TEXT}"/>
-                            <Button icon = "sap-icon://thumb-up" type = "Transparent" fesr:press="fe:ef:thumbsup" enabled="{easyFillDialogModel>/feedbackEnabled}" press="onFeedbackPress"/>
-                            <Button icon = "sap-icon://thumb-down" type="Transparent" fesr:press="fe:ef:thumbsdown" enabled="{easyFillDialogModel>/feedbackEnabled}" press="onFeedbackPress"/>
+                            <Button icon = "sap-icon://thumb-up" type = "Transparent" fesr:press="fe2:ef:thumbsup" enabled="{easyFillDialogModel>/feedbackEnabled}" press="onFeedbackPress"/>
+                            <Button icon = "sap-icon://thumb-down" type="Transparent" fesr:press="fe2:ef:thumbsdown" enabled="{easyFillDialogModel>/feedbackEnabled}" press="onFeedbackPress"/>
                         </HBox>
                         <VBox class="sapSmartTemplatesObjectPageEasyFillReviewAreaSmartFormWrapper" renderType = "Bare" visible="{easyFillDialogModel>/isUpdatableVisible}">
                             <core:Fragment fragmentName="sap.suite.ui.generic.template.lib.ai.EasyFill.fragments.EasyFillUpdatebleSmartForm" type="XML"/>
@@ -73,10 +75,10 @@ xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
             </FlexBox>
         </content>
         <beginButton>
-            <Button text="{i18n>EASY_FILL_CONFIRM}" enabled="{easyFillDialogModel>/isSaveEnabled}" press="onSaveFromEasyFillDialog" type="Emphasized"/>
+            <Button text="{i18n>EASY_FILL_CONFIRM}"  fesr:press="fe2:ef:confirm" enabled="{easyFillDialogModel>/isSaveEnabled}" press="onSaveFromEasyFillDialog" type="Emphasized"/>
         </beginButton>
         <endButton>
-            <Button text="{i18n>CANCEL}" press="onCancelEasyFillDialog"/>
+            <Button text="{i18n>CANCEL}"  press="onCancelEasyFillDialog" fesr:press="fe2:ef:cancel"/>
         </endButton>
    </Dialog>
 </core:FragmentDefinition>

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

@@ -56,61 +56,93 @@ sap.ui.define([
 
             var sEntitySet = oController.getOwnerComponent().getEntitySet();
 
-            var mFilterProperties = {}; // todo : Add the properties from navigation entites
+            var mFilterProperties = {}; // Now also includes 1:1 navigation properties
             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 bIsHidden = false;
-                    var bIsHiddenFilter = false;
-                    var sFilterRestriction = "";
-                    oProperty.extensions && oProperty.extensions.forEach(function(oExtension) {
-                        if (oExtension.name === "value-list" && oExtension.value === "fixed-values") {
-                            sTokenType = "MenuWithCheckBox";
-                            bIsCodeListRequired = true;
-                        }
-                        // Check for hidden annotation
-                        if (oExtension.name === "hidden") {
-                            bIsHidden = oExtension.value === "true";
-                        }
-                        // Check for hidden-filter annotation
-                        if (oExtension.name === "hidden-filter") {
-                            bIsHiddenFilter = oExtension.value === "true";
-                        }
-                        // Check for filter-restriction annotation
-                        if (oExtension.name === "filter-restriction") {
-                            sFilterRestriction = oExtension.value;
-                        }
-                    });
 
-                    // 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";
+            // Helper to add properties to mFilterProperties, with optional prefix
+            function addPropertiesFromEntityType(entityType, prefix) {
+                entityType.property.forEach(function (oProperty) {
+                    var sTokenType = "ValueHelp";
+                    if (filterHelper.isPropertyFilterable(oProperty)) {
+                        var bIsCodeListRequired;
+                        var bIsHidden = false;
+                        var bIsHiddenFilter = false;
+                        var sFilterRestriction = "";
+                        oProperty.extensions && oProperty.extensions.forEach(function(oExtension) {
+                            if (oExtension.name === "value-list" && oExtension.value === "fixed-values") {
+                                sTokenType = "MenuWithCheckBox";
+                                bIsCodeListRequired = true;
+                            }
+                            if (oExtension.name === "hidden") {
+                                bIsHidden = oExtension.value === "true";
+                            }
+                            if (oExtension.name === "hidden-filter") {
+                                bIsHiddenFilter = oExtension.value === "true";
+                            }
+                            if (oExtension.name === "filter-restriction") {
+                                sFilterRestriction = oExtension.value;
+                            }
+                        });
+                        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";
+                        }
+                        var propName = prefix ? prefix + "." + oProperty.name : oProperty.name;
+                        mFilterProperties[propName] = {
+                            name: propName,
+                            dataType: oProperty.type,
+                            defaultValue : [],
+                            filterable: true,
+                            sortable: false,
+                            codeList : bIsCodeListRequired,
+                            type: sTokenType,
+                            unit: oProperty["sap:unit"] || "",
+                            required: oProperty["sap:required-in-filter"] === "true" ? true : false,
+                            hidden: bIsHidden,
+                            hiddenFilter: bIsHiddenFilter,
+                            filterRestriction: sFilterRestriction || undefined
+                        };
                     }
+                });
+            }
 
-                    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" ? true : false,
-                        hidden: bIsHidden,
-                        hiddenFilter: bIsHiddenFilter,
-                        filterRestriction: sFilterRestriction || undefined // Only set if has value
-                    };
-                }
-            });
+            // Add direct properties
+            addPropertiesFromEntityType(oEntityType, "");
+
+            // Add 1:1 navigation properties' properties
+            if (oEntityType.navigationProperty) {
+                oEntityType.navigationProperty.forEach(function(navProp) {
+                    // Try to determine if this is a 1:1 association
+                    // Heuristic: check if navProp["sap:creatable"], ["sap:updatable"], ["sap:deletable"] are true/undefined, and navProp["relationship"] exists
+                    // and multiplicity is 0..1 or 1 (not *). This is a best effort, as OData V2 meta is not always explicit.
+                    var oAssocEnd = null;
+                    var oAssoc = null;
+                    if (oSFBMetaModel && navProp.relationship) {
+                        // Try to get association from meta model
+                        oAssoc = oSFBMetaModel.getODataAssociationEnd && oSFBMetaModel.getODataAssociationEnd(oEntityType, navProp.name);
+                        oAssocEnd = oAssoc;
+                    }
+                    // Fallback: check navProp["to"] and navProp["from"]
+                    var isOneToOne = false;
+                    if (oAssocEnd && oAssocEnd.multiplicity && (oAssocEnd.multiplicity === "0..1" || oAssocEnd.multiplicity === "1")) {
+                        isOneToOne = true;
+                    }
+                    if (isOneToOne) {
+                        // Get the target entity type
+                        var sTargetType = navProp.type || (oAssocEnd && oAssocEnd.type);
+                        if (sTargetType) {
+                            // Remove namespace if present
+                            //var sShortType = sTargetType.split(".").pop();
+                            var oTargetEntityType = oSFBMetaModel.getODataEntityType && oSFBMetaModel.getODataEntityType(sTargetType);
+                            if (oTargetEntityType) {
+                                addPropertiesFromEntityType(oTargetEntityType, navProp.name);
+                            }
+                        }
+                    }
+                });
+            }
 
             oEasyFilterMetadata = {
                 version: 1,
@@ -435,7 +467,7 @@ sap.ui.define([
 			oTemplateUtils.oComponentUtils.getBusyHelper().setBusy(oQueryPromise);
 		}
 
-		function fnTokensChanged(oEvent) {
+                function fnTokensChanged(oEvent) {
 			var oSmartFilterbar = oState.oSmartFilterbar;
 			var oFiltersFromAI = oEvent.getParameter("tokens");
 			var sSmartFilterBarId = oSmartFilterbar.getId();
@@ -456,19 +488,32 @@ sap.ui.define([
 				oSmartFilterBarVariant.customFilters.editState = oVariantDataFromAI.oEditStateFilter;
 			}
 
-            if (oSmartFilterBarVariant.semanticDates) {
-                var { Low: value1, High: value2 } = oVariantDataFromAI.aSelectOptions[0].Ranges[0];
-                var dateData = oSmartFilterBarVariant.semanticDates.Dates[0].Data;
-                dateData.operation = "DATERANGE";
-                dateData.value1 = value1;
-                dateData.value2 = value2 || value1;
+            //checking if the variant of SFB has previous semantic dates and if there are new filter values from easy filter then update the SFB variant
+            if (oSmartFilterBarVariant.semanticDates?.Dates) {
+                oSmartFilterBarVariant.semanticDates.Dates.forEach(function (semanticDate) {
+                    var propertyName = semanticDate.PropertyName;
+
+                    // Find matching property in aSelectOptions
+                    var matchingSelectOption = oVariantDataFromAI.aSelectOptions.find(function (selectOption) {
+                        return selectOption.PropertyName === propertyName;
+                    });
+
+                    // If matching property found and has ranges
+                    if (matchingSelectOption?.Ranges?.length > 0) {
+                        var { Low: value1 = null, High: value2 = null } = matchingSelectOption.Ranges[0];
+                        // Update the semantic date data in the smart filter bar 
+                        var dateData = semanticDate.Data;
+                        dateData.operation = "DATERANGE";
+                        dateData.value1 = value1;
+                        dateData.value2 = value2 || value1; // Use value1 if value2 is null/empty
+                    } 
+                });
             }
 
 			oSmartFilterBarWrapper.setState(oSmartFilterBarVariant);
 			oSmartFilterbar.getSmartVariant() && oSmartFilterbar.getSmartVariant().currentVariantSetModified(true);
 			oSmartFilterbar.search();
 		}
-
 		/**
 		 * Event handler for the EasyFilter control's showValueHelp event.
 		 * Identifies the input field for which the value help is requested and triggers the value help opening from SFB.

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

@@ -368,8 +368,6 @@ RTA_CONFIGURATION_TITLE_FILTER_BAR=\u062A\u0643\u0648\u064A\u0646 \u0634\u0631\u
 
 RTA_CONFIGURATION_TITLE_OBJECT_PAGE=\u062A\u0643\u0648\u064A\u0646 \u0635\u0641\u062D\u0629 \u0627\u0644\u0643\u0627\u0626\u0646
 
-RTA_CONFIGURATION_INFO_MESSAGE=\u0644\u0627 \u064A\u0645\u0643\u0646 \u062A\u0637\u0628\u064A\u0642 \u0628\u0639\u0636 \u0627\u0644\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0625\u0644\u0627 \u0639\u0644\u0649 \u0623\u0646\u0648\u0627\u0639 \u062C\u062F\u0627\u0648\u0644 \u0645\u0639\u064A\u0646\u0629. \u0648\u0644\u0646 \u062A\u0643\u0648\u0646 \u0627\u0644\u062A\u063A\u064A\u064A\u0631\u0627\u062A \u0645\u0631\u0626\u064A\u0629 \u0625\u0644\u0627 \u0628\u0639\u062F \u0625\u0639\u0627\u062F\u0629 \u062A\u062D\u0645\u064A\u0644 \u0627\u0644\u062A\u0637\u0628\u064A\u0642.
-
 RTA_CONFIGURATION_CANCEL=\u0625\u0644\u063A\u0627\u0621
 
 RTA_CONFIGURATION_APPLY=\u062A\u0637\u0628\u064A\u0642

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

@@ -368,8 +368,6 @@ RTA_CONFIGURATION_TITLE_FILTER_BAR=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0
 
 RTA_CONFIGURATION_TITLE_OBJECT_PAGE=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430 \u0437\u0430 \u043E\u0431\u0435\u043A\u0442
 
-RTA_CONFIGURATION_INFO_MESSAGE=\u041D\u044F\u043A\u043E\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0431\u044A\u0434\u0430\u0442 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435 \u0441\u0430\u043C\u043E \u0437\u0430 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438 \u0432\u0438\u0434\u043E\u0432\u0435 \u0442\u0430\u0431\u043B\u0438\u0446\u0438. \u041F\u0440\u043E\u043C\u0435\u043D\u0438\u0442\u0435 \u0449\u0435 \u0431\u044A\u0434\u0430\u0442 \u0432\u0438\u0434\u0438\u043C\u0438 \u0441\u043B\u0435\u0434 \u043F\u043E\u0432\u0442\u043E\u0440\u043D\u043E \u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043D\u0435 \u043D\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435\u0442\u043E.
-
 RTA_CONFIGURATION_CANCEL=\u041E\u0442\u043C\u044F\u043D\u0430
 
 RTA_CONFIGURATION_APPLY=\u041F\u0440\u0438\u043B\u0430\u0433\u0430\u043D\u0435

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

@@ -368,8 +368,6 @@ RTA_CONFIGURATION_TITLE_FILTER_BAR=Configurar la barra de filtres
 
 RTA_CONFIGURATION_TITLE_OBJECT_PAGE=Configurar p\u00E0gina d'objecte
 
-RTA_CONFIGURATION_INFO_MESSAGE=Algunes opcions nom\u00E9s es poden aplicar a determinats tipus de taules. Les modificacions nom\u00E9s seran visibles despr\u00E9s de tornar a carregar l'aplicaci\u00F3.
-
 RTA_CONFIGURATION_CANCEL=Cancel\u00B7lar
 
 RTA_CONFIGURATION_APPLY=Aplicar

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

@@ -368,8 +368,6 @@ RTA_CONFIGURATION_TITLE_FILTER_BAR=Konfiguri\u0161i traku filtera
 
 RTA_CONFIGURATION_TITLE_OBJECT_PAGE=Konfiguri\u0161i stranicu objekta
 
-RTA_CONFIGURATION_INFO_MESSAGE=Neka pode\u0161avanja se mogu primijeniti samo na odre\u0111ene tipove tabela. Promjene \u0107e biti vidljive samo nakon \u0161to se aplikacija ponovo u\u010Dita.
-
 RTA_CONFIGURATION_CANCEL=Odustani
 
 RTA_CONFIGURATION_APPLY=Primijeni

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

@@ -368,8 +368,6 @@ RTA_CONFIGURATION_TITLE_FILTER_BAR=Konfigurovat panel filtrov\u00E1n\u00ED
 
 RTA_CONFIGURATION_TITLE_OBJECT_PAGE=Konfigurovat str\u00E1nku objektu
 
-RTA_CONFIGURATION_INFO_MESSAGE=N\u011Bkter\u00E1 nastaven\u00ED lze pou\u017E\u00EDt pouze pro ur\u010Dit\u00E9 typy tabulek. Zm\u011Bny budou viditeln\u00E9 a\u017E po op\u011Btovn\u00E9m na\u010Dten\u00ED aplikace.
-
 RTA_CONFIGURATION_CANCEL=Zru\u0161it
 
 RTA_CONFIGURATION_APPLY=Pou\u017E\u00EDt

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

@@ -368,8 +368,6 @@ RTA_CONFIGURATION_TITLE_FILTER_BAR=Ffurfweddu Bar Hidlo
 
 RTA_CONFIGURATION_TITLE_OBJECT_PAGE=Ffurfweddu Tudalen Gwrthrych
 
-RTA_CONFIGURATION_INFO_MESSAGE=Gall rhai gosodiadau ond cael eu rhoi ar waith i fathau penodol o dablau. Dim ond ar \u00F4l i'r rhaglen ail-lwytho y bydd y newidiadau ar gael i'w gweld.
-
 RTA_CONFIGURATION_CANCEL=Canslo
 
 RTA_CONFIGURATION_APPLY=Rhoi ar waith