@sapui5/sap.fe.core 1.101.0 → 1.103.0

package/src/sap/fe/core/CommonUtils.ts

@@ -1,21 +1,21 @@
-import ResourceBundle from "sap/base/i18n/ResourceBundle";
+import type ResourceBundle from "sap/base/i18n/ResourceBundle";
 import Log from "sap/base/Log";
 import mergeObjects from "sap/base/util/merge";
-import { disconnect, isConnected } from "sap/fe/core/actions/collaboration/ActivitySync";
-import AppComponent from "sap/fe/core/AppComponent";
+import type AppComponent from "sap/fe/core/AppComponent";
 import { IssueCategory, IssueCategoryType, IssueSeverity } from "sap/fe/core/converters/helpers/IssueManager";
-import { bindingExpression, compileBinding, constant, transformRecursively } from "sap/fe/core/helpers/BindingExpression";
+import type { CompiledBindingToolkitExpression } from "sap/fe/core/helpers/BindingToolkit";
+import { compileExpression, constant, not, or, pathInModel, transformRecursively } from "sap/fe/core/helpers/BindingToolkit";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import SemanticDateOperators from "sap/fe/core/helpers/SemanticDateOperators";
+import SemanticKeyHelper from "sap/fe/core/helpers/SemanticKeyHelper";
 import { generate } from "sap/fe/core/helpers/StableIdHelper";
-import library from "sap/fe/core/library";
 import Bar from "sap/m/Bar";
 import Button from "sap/m/Button";
 import Dialog from "sap/m/Dialog";
 import MessageBox from "sap/m/MessageBox";
 import Title from "sap/m/Title";
 import Component from "sap/ui/core/Component";
-import Control from "sap/ui/core/Control";
+import type Control from "sap/ui/core/Control";
 import Core from "sap/ui/core/Core";
 import Fragment from "sap/ui/core/Fragment";
 import View from "sap/ui/core/mvc/View";
@@ -24,16 +24,14 @@ import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
 import { system } from "sap/ui/Device";
 import FilterOperatorUtil from "sap/ui/mdc/condition/FilterOperatorUtil";
 import TypeUtil from "sap/ui/mdc/odata/v4/TypeUtil";
-import Context from "sap/ui/model/Context";
+import type Context from "sap/ui/model/Context";
 import JSONModel from "sap/ui/model/json/JSONModel";
-import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
-import ODataModel from "sap/ui/model/odata/v4/ODataModel";
-import { CoreEx } from "types/extension_types";
-import messageHandling from "./actions/messageHandling";
-import { performAfterDiscardorKeepDraft } from "./controls/DataLossOrDraftDiscard/DataLossOrDraftDiscardHandler";
+import type ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
+import type ODataModel from "sap/ui/model/odata/v4/ODataModel";
+import type { CoreEx } from "types/extension_types";
+import messageHandling from "./controllerextensions/messageHandler/messageHandling";
 import { getConditions } from "./templating/FilterHelper";
 
-const ProgrammingModel = library.ProgrammingModel;
 const aValidTypes = [
 	"Edm.Boolean",
 	"Edm.Byte",
@@ -64,7 +62,7 @@ function normalizeSearchTerm(sSearchTerm: string) {
 		.split(/\s+/)
 		.reduce(function (sNormalized: string | undefined, sCurrentWord: string) {
 			if (sCurrentWord !== "") {
-				sNormalized = (sNormalized ? sNormalized + " " : "") + '"' + sCurrentWord + '"';
+				sNormalized = `${sNormalized ? `${sNormalized} ` : ""}"${sCurrentWord}"`;
 			}
 			return sNormalized;
 		}, undefined);
@@ -128,12 +126,12 @@ function getSearchRestrictions(sFullPath: any, oMetaModel: any) {
 		if (oNavigationRestrictions && oNavigationRestrictions["SearchRestrictions"]) {
 			return oNavigationRestrictions["SearchRestrictions"];
 		}
-		sPath = sPath + "/$NavigationPropertyBinding/" + aNavigationParts[i];
+		sPath = `${sPath}/$NavigationPropertyBinding/${aNavigationParts[i]}`;
 	}
-	return oMetaModel.getObject(sFullPath + "@Org.OData.Capabilities.V1.SearchRestrictions");
+	return oMetaModel.getObject(`${sFullPath}@Org.OData.Capabilities.V1.SearchRestrictions`);
 }
 function getNavigationRestrictions(oModel: any, sEntitySetPath: any, sNavigationPath: any) {
-	const oNavigationRestrictions = oModel.getObject(sEntitySetPath + "@Org.OData.Capabilities.V1.NavigationRestrictions");
+	const oNavigationRestrictions = oModel.getObject(`${sEntitySetPath}@Org.OData.Capabilities.V1.NavigationRestrictions`);
 	const aRestrictedProperties = oNavigationRestrictions && oNavigationRestrictions.RestrictedProperties;
 	return (
 		aRestrictedProperties &&
@@ -148,7 +146,7 @@ function getNavigationRestrictions(oModel: any, sEntitySetPath: any, sNavigation
 }
 function _isInNonFilterableProperties(oModel: any, sEntitySetPath: any, sContextPath: any) {
 	let bIsNotFilterable = false;
-	const oAnnotation = oModel.getObject(sEntitySetPath + "@Org.OData.Capabilities.V1.FilterRestrictions");
+	const oAnnotation = oModel.getObject(`${sEntitySetPath}@Org.OData.Capabilities.V1.FilterRestrictions`);
 	if (oAnnotation && oAnnotation.NonFilterableProperties) {
 		bIsNotFilterable = oAnnotation.NonFilterableProperties.some(function (property: any) {
 			return property.$NavigationPropertyPath === sContextPath || property.$PropertyPath === sContextPath;
@@ -158,7 +156,7 @@ function _isInNonFilterableProperties(oModel: any, sEntitySetPath: any, sContext
 }
 // TODO rework this!
 function _isContextPathFilterable(oModel: any, sEntitySetPath: any, sContexPath: any) {
-	const sFullPath = sEntitySetPath + "/" + sContexPath,
+	const sFullPath = `${sEntitySetPath}/${sContexPath}`,
 		aESParts = sFullPath.split("/").splice(0, 2),
 		aContext = sFullPath.split("/").splice(2);
 	let bIsNotFilterable = false,
@@ -168,7 +166,7 @@ function _isContextPathFilterable(oModel: any, sEntitySetPath: any, sContexPath:
 
 	bIsNotFilterable = aContext.some(function (item: string, index: number, array: string[]) {
 		if (sContext.length > 0) {
-			sContext += "/" + item;
+			sContext += `/${item}`;
 		} else {
 			sContext = item;
 		}
@@ -190,37 +188,53 @@ function _isContextPathFilterable(oModel: any, sEntitySetPath: any, sContexPath:
 		if (index === array.length - 1) {
 			//last path segment
 			bIsNotFilterable = _isInNonFilterableProperties(oModel, sEntitySetPath, sContext);
-		} else if (oModel.getObject(sEntitySetPath + "/$NavigationPropertyBinding/" + item)) {
+		} else if (oModel.getObject(`${sEntitySetPath}/$NavigationPropertyBinding/${item}`)) {
 			//check existing context path and initialize it
 			bIsNotFilterable = _isInNonFilterableProperties(oModel, sEntitySetPath, sContext);
 			sContext = "";
 			//set the new EntitySet
-			sEntitySetPath = "/" + oModel.getObject(sEntitySetPath + "/$NavigationPropertyBinding/" + item);
+			sEntitySetPath = `/${oModel.getObject(`${sEntitySetPath}/$NavigationPropertyBinding/${item}`)}`;
 		}
 		return bIsNotFilterable === true;
 	});
 	return bIsNotFilterable;
 }
 // TODO check used places and rework this
-function isPropertyFilterable(oModel: ODataMetaModel, sEntitySetPath: string, sProperty: string, bSkipHiddenFilter: boolean) {
+function isPropertyFilterable(
+	oModel: ODataMetaModel,
+	sEntitySetPath: string,
+	sProperty: string,
+	bSkipHiddenFilter?: boolean
+): boolean | CompiledBindingToolkitExpression {
 	if (typeof sProperty !== "string") {
 		throw new Error("sProperty parameter must be a string");
 	}
 	let bIsFilterable;
 
 	// Parameters should be rendered as filterfields
-	if (oModel.getObject(sEntitySetPath + "/@com.sap.vocabularies.Common.v1.ResultContext") === true) {
+	if (oModel.getObject(`${sEntitySetPath}/@com.sap.vocabularies.Common.v1.ResultContext`) === true) {
 		return true;
 	}
 
-	const oNavigationContext = oModel.createBindingContext(sEntitySetPath + "/" + sProperty) as Context;
+	const oNavigationContext = oModel.createBindingContext(`${sEntitySetPath}/${sProperty}`) as Context;
 
-	if (oNavigationContext.getProperty("@com.sap.vocabularies.UI.v1.Hidden") === true) {
-		return false;
-	}
-
-	if (!bSkipHiddenFilter && oNavigationContext.getProperty("@com.sap.vocabularies.UI.v1.HiddenFilter")) {
-		return false;
+	if (!bSkipHiddenFilter) {
+		if (
+			oNavigationContext.getProperty("@com.sap.vocabularies.UI.v1.Hidden") === true ||
+			oNavigationContext.getProperty("@com.sap.vocabularies.UI.v1.HiddenFilter") === true
+		) {
+			return false;
+		}
+		const sHiddenPath = oNavigationContext.getProperty("@com.sap.vocabularies.UI.v1.Hidden/$Path");
+		const sHiddenFilterPath = oNavigationContext.getProperty("@com.sap.vocabularies.UI.v1.HiddenFilter/$Path");
+
+		if (sHiddenPath && sHiddenFilterPath) {
+			return compileExpression(not(or(pathInModel(sHiddenPath), pathInModel(sHiddenFilterPath))));
+		} else if (sHiddenPath) {
+			return compileExpression(not(pathInModel(sHiddenPath)));
+		} else if (sHiddenFilterPath) {
+			return compileExpression(not(pathInModel(sHiddenFilterPath)));
+		}
 	}
 
 	if (sEntitySetPath.split("/").length === 2 && sProperty.indexOf("/") < 0) {
@@ -334,7 +348,7 @@ function updateRelateAppsModel(
 			}
 		} else {
 			// fallback to Technical Keys if no Semantic Key is present
-			const aTechnicalKeys = oMetaModel.getObject(oMetaPath + "/$Type/$Key");
+			const aTechnicalKeys = oMetaModel.getObject(`${oMetaPath}/$Type/$Key`);
 			for (const key in aTechnicalKeys) {
 				const sObjKey = aTechnicalKeys[key];
 				if (!oParam[sObjKey]) {
@@ -353,7 +367,7 @@ function updateRelateAppsModel(
 			_getSOIntents(oObjectPageLayout, aManifestSOKeys[key], oParam)
 				.then(
 					_getRelatedIntents.bind(
-						this as any,
+						this,
 						oManifestData.additionalSemanticObjects[aManifestSOKeys[key]],
 						oBindingContext,
 						aManifestSOItems
@@ -377,8 +391,8 @@ function updateRelateAppsModel(
 			if (aLinks && aLinks.length > 0) {
 				const oTargetParams: any = {};
 				const aAnnotationsSOItems: any[] = [];
-				const sEntitySetPath = oMetaPath + "@";
-				const sEntityTypePath = oMetaPath + "/@";
+				const sEntitySetPath = `${oMetaPath}@`;
+				const sEntityTypePath = `${oMetaPath}/@`;
 				const oEntitySetAnnotations = oMetaModel.getObject(sEntitySetPath);
 				oSemanticObjectAnnotations = _getSemanticObjectAnnotations(oEntitySetAnnotations, sCurrentSemObj);
 				if (!oSemanticObjectAnnotations.bHasEntitySetSO) {
@@ -420,8 +434,8 @@ function _getSemanticObjectAnnotations(oEntityAnnotations: any, sCurrentSemObj:
 
 			if (key.indexOf("#") > -1) {
 				sQualifier = key.split("#")[1];
-				sAnnotationMappingTerm = sAnnotationMappingTerm + "#" + sQualifier;
-				sAnnotationActionTerm = sAnnotationActionTerm + "#" + sQualifier;
+				sAnnotationMappingTerm = `${sAnnotationMappingTerm}#${sQualifier}`;
+				sAnnotationActionTerm = `${sAnnotationActionTerm}#${sQualifier}`;
 			}
 
 			oSemanticObjectAnnotations.aMappings = oSemanticObjectAnnotations.aMappings.concat(oEntityAnnotations[sAnnotationMappingTerm]);
@@ -440,7 +454,7 @@ function fnUpdateRelatedAppsDetails(oObjectPageLayout: any) {
 	const oPath = oBindingContext && oBindingContext.getPath();
 	const oMetaPath = oMetaModel.getMetaPath(oPath);
 	// Semantic Key Vocabulary
-	const sSemanticKeyVocabulary = oMetaPath + "/" + "@com.sap.vocabularies.Common.v1.SemanticKey";
+	const sSemanticKeyVocabulary = `${oMetaPath}/` + `@com.sap.vocabularies.Common.v1.SemanticKey`;
 	//Semantic Keys
 	const aSemKeys = oMetaModel.getObject(sSemanticKeyVocabulary);
 	// Unavailable Actions
@@ -448,8 +462,8 @@ function fnUpdateRelatedAppsDetails(oObjectPageLayout: any) {
 	if (!oEntry) {
 		oBindingContext
 			.requestObject()
-			.then(function (oEntry: any) {
-				return updateRelateAppsModel(oBindingContext, oEntry, oObjectPageLayout, aSemKeys, oMetaModel, oMetaPath);
+			.then(function (requestedObject: any) {
+				return updateRelateAppsModel(oBindingContext, requestedObject, oObjectPageLayout, aSemKeys, oMetaModel, oMetaPath);
 			})
 			.catch(function (oError: any) {
 				Log.error("Cannot update the related app details", oError);
@@ -495,87 +509,7 @@ function getTargetView(oControl: any) {
 	}
 	return oControl;
 }
-/**
- * @param fnProcessFunction
- * @param fnCancelFunction
- * @param oContext
- * @param oController
- * @param bSkipBindingToView
- */
-function fnProcessDataLossOrDraftDiscardConfirmation(
-	fnProcessFunction: any,
-	fnCancelFunction: any,
-	oContext: any,
-	oController: any,
-	bSkipBindingToView?: boolean
-) {
-	const oModel = oContext.getModel();
-	let _bIsModified = false;
-	const draftDataContext = oModel.bindContext(oContext.getPath() + "/DraftAdministrativeData").getBoundContext();
-
-	const collaborationConnected = isConnected(oController.getView());
-	const processFunctionForDrafts = !collaborationConnected
-		? fnProcessFunction
-		: function (...args: any[]) {
-				disconnect(oController.getView());
-				fnProcessFunction.apply(null, ...args);
-		  };
-
-	if (
-		oContext &&
-		oContext.getObject() &&
-		(!oContext.getObject().DraftAdministrativeData || oContext.getObject().IsActiveEntity === true)
-	) {
-		fnProcessFunction();
-	} else {
-		draftDataContext
-			.requestObject()
-			.then(function (draftAdminData: any) {
-				if (draftAdminData) {
-					_bIsModified = !(draftAdminData.CreationDateTime === draftAdminData.LastChangeDateTime);
-					if (_bIsModified) {
-						performAfterDiscardorKeepDraft(processFunctionForDrafts, fnCancelFunction, oController, bSkipBindingToView);
-					} else {
-						processFunctionForDrafts();
-					}
-				} else {
-					fnProcessFunction();
-				}
-			})
-			.catch(function (oError: any) {
-				Log.error("Cannot retrieve draftDataContext information", oError);
-			});
-	}
-}
-function fnProcessDataLossConfirmation(fnProcess: Function, oControl: any, programmingModel: string) {
-	const bUIEditable = oControl.getModel("ui").getProperty("/isEditable"),
-		oResourceBundle = (Core as CoreEx).getLibraryResourceBundle("sap.fe.templates"),
-		sWarningMsg = oResourceBundle && oResourceBundle.getText("T_COMMON_UTILS_NAVIGATION_AWAY_MSG"),
-		sConfirmButtonTxt = oResourceBundle && oResourceBundle.getText("T_COMMON_UTILS_NAVIGATION_AWAY_CONFIRM_BUTTON"),
-		sCancelButtonTxt = oResourceBundle && oResourceBundle.getText("T_COMMON_UTILS_NAVIGATION_AWAY_CANCEL_BUTTON");
-
-	if (programmingModel === ProgrammingModel.Sticky && bUIEditable) {
-		return MessageBox.warning(sWarningMsg, {
-			actions: [sConfirmButtonTxt, sCancelButtonTxt],
-			onClose: function (sAction: any) {
-				if (sAction === sConfirmButtonTxt) {
-					const oInternalModel = oControl && oControl.getModel("internal");
 
-					Log.info("Navigation confirmed.");
-					if (oInternalModel) {
-						oInternalModel.setProperty("/sessionOn", false);
-					} else {
-						Log.warning("Local UIModel couldn't be found.");
-					}
-					fnProcess();
-				} else {
-					Log.info("Navigation rejected.");
-				}
-			}
-		});
-	}
-	return fnProcess();
-}
 function isFieldControlPathInapplicable(sFieldControlPath: string, oAttribute: any) {
 	let bInapplicable = false;
 	const aParts = sFieldControlPath.split("/");
@@ -601,7 +535,7 @@ function removeSensitiveData(aAttributes: any[], oMetaModel: ODataMetaModel) {
 		const aProperties = Object.keys(oAttribute);
 		for (let j = 0; j < aProperties.length; j++) {
 			const sProp = aProperties[j],
-				aPropertyAnnotations = oMetaModel.getObject("/" + sEntitySet + "/" + sProp + "@");
+				aPropertyAnnotations = oMetaModel.getObject(`/${sEntitySet}/${sProp}@`);
 			if (aPropertyAnnotations) {
 				if (
 					aPropertyAnnotations["@com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive"] ||
@@ -633,7 +567,7 @@ function _fnCheckIsMatch(oObject: any, oKeysToCheck: any) {
 	return true;
 }
 function fnGetContextPathProperties(oMetaModel: ODataMetaModel, sContextPath: string, oFilter?: object) {
-	const oEntityType = oMetaModel.getObject(sContextPath + "/") || {},
+	const oEntityType = oMetaModel.getObject(`${sContextPath}/`) || {},
 		oProperties: any = {};
 
 	for (const sKey in oEntityType) {
@@ -651,7 +585,7 @@ function fnGetContextPathProperties(oMetaModel: ODataMetaModel, sContextPath: st
 function fnGetMandatoryFilterFields(oMetaModel: ODataMetaModel, sContextPath: string) {
 	let aMandatoryFilterFields;
 	if (oMetaModel && sContextPath) {
-		aMandatoryFilterFields = oMetaModel.getObject(sContextPath + "@Org.OData.Capabilities.V1.FilterRestrictions/RequiredProperties");
+		aMandatoryFilterFields = oMetaModel.getObject(`${sContextPath}@Org.OData.Capabilities.V1.FilterRestrictions/RequiredProperties`);
 	}
 	return aMandatoryFilterFields;
 }
@@ -728,12 +662,12 @@ function getTranslatedText(sFrameworkKey: string, oResourceBundle: ResourceBundl
 			// hence we need to do this recurrsively to check if the key exists in any of the bundles the forms the FE resource bundle
 			const bResourceKeyExists = _checkIfResourceKeyExists(
 				(oResourceBundle as any).aCustomBundles,
-				sFrameworkKey + "|" + sEntitySetName
+				`${sFrameworkKey}|${sEntitySetName}`
 			);
 
 			// if resource key with entity set name for instance specific text overriding is provided by the application
 			// then use the same key otherwise use the Framework key
-			sResourceKey = bResourceKeyExists ? sFrameworkKey + "|" + sEntitySetName : sFrameworkKey;
+			sResourceKey = bResourceKeyExists ? `${sFrameworkKey}|${sEntitySetName}` : sFrameworkKey;
 		}
 		return oResourceBundle.getText(sResourceKey, oParams);
 	}
@@ -761,18 +695,18 @@ function getActionPath(oAction: any, bReturnOnlyPath: boolean, sActionName?: str
 	const sEntityTypeName = oAction.getObject(sContextPath).$Type;
 	const sEntityName = getEntitySetName(oAction.getModel(), sEntityTypeName);
 	if (sEntityName) {
-		sContextPath = "/" + sEntityName;
+		sContextPath = `/${sEntityName}`;
 	}
 	if (bCheckStaticValue) {
-		return oAction.getObject(sContextPath + "/" + sActionName + "@Org.OData.Core.V1.OperationAvailable");
+		return oAction.getObject(`${sContextPath}/${sActionName}@Org.OData.Core.V1.OperationAvailable`);
 	}
 	if (bReturnOnlyPath) {
-		return sContextPath + "/" + sActionName;
+		return `${sContextPath}/${sActionName}`;
 	} else {
 		return {
 			sContextPath: sContextPath,
-			sProperty: oAction.getObject(sContextPath + "/" + sActionName + "@Org.OData.Core.V1.OperationAvailable/$Path"),
-			sBindingParameter: oAction.getObject(sContextPath + "/" + sActionName + "/@$ui5.overload/0/$Parameter/0/$Name")
+			sProperty: oAction.getObject(`${sContextPath}/${sActionName}@Org.OData.Core.V1.OperationAvailable/$Path`),
+			sBindingParameter: oAction.getObject(`${sContextPath}/${sActionName}/@$ui5.overload/0/$Parameter/0/$Name`)
 		};
 	}
 }
@@ -807,7 +741,7 @@ function computeDisplayMode(oPropertyAnnotations: any, oCollectionAnnotations?:
 }
 function _getEntityType(oContext: any) {
 	const oMetaModel = oContext.getModel().getMetaModel();
-	return oMetaModel.getObject(oMetaModel.getMetaPath(oContext.getPath()) + "/$Type");
+	return oMetaModel.getObject(`${oMetaModel.getMetaPath(oContext.getPath())}/$Type`);
 }
 function _requestObject(sAction: any, oSelectedContext: any, sProperty: any) {
 	let oContext = oSelectedContext;
@@ -876,16 +810,16 @@ function _setContextsBasedOnOperationAvailable(oInternalModelContext: any, aRequ
  * @param aNotApplicable
  */
 function _setDynamicActionContexts(oInternalModelContext: any, sAction: any, aApplicable: any, aNotApplicable: any) {
-	const sDynamicActionPathPrefix = oInternalModelContext.getPath() + "/dynamicActions/" + sAction,
+	const sDynamicActionPathPrefix = `${oInternalModelContext.getPath()}/dynamicActions/${sAction}`,
 		oInternalModel = oInternalModelContext.getModel();
-	oInternalModel.setProperty(sDynamicActionPathPrefix + "/aApplicable", aApplicable);
-	oInternalModel.setProperty(sDynamicActionPathPrefix + "/aNotApplicable", aNotApplicable);
+	oInternalModel.setProperty(`${sDynamicActionPathPrefix}/aApplicable`, aApplicable);
+	oInternalModel.setProperty(`${sDynamicActionPathPrefix}/aNotApplicable`, aNotApplicable);
 }
 function setActionEnablement(oInternalModelContext: any, oActionOperationAvailableMap: any, aSelectedContexts: any) {
 	const aPromises = [];
 	for (const sAction in oActionOperationAvailableMap) {
 		// Reset all properties before computation
-		oInternalModelContext.setProperty("dynamicActions/" + sAction, {
+		oInternalModelContext.setProperty(`dynamicActions/${sAction}`, {
 			bEnabled: false,
 			aApplicable: [],
 			aNotApplicable: []
@@ -896,7 +830,7 @@ function setActionEnablement(oInternalModelContext: any, oActionOperationAvailab
 		const aApplicable = [],
 			aNotApplicable = [],
 			sProperty = oActionOperationAvailableMap[sAction],
-			sDynamicActionEnabledPath = oInternalModelContext.getPath() + "/dynamicActions/" + sAction + "/bEnabled";
+			sDynamicActionEnabledPath = `${oInternalModelContext.getPath()}/dynamicActions/${sAction}/bEnabled`;
 
 		if (typeof sProperty === "object" && sProperty !== null && sProperty !== undefined) {
 			for (let i = 0; i < aSelectedContexts.length; i++) {
@@ -905,14 +839,14 @@ function setActionEnablement(oInternalModelContext: any, oActionOperationAvailab
 					const oContextData = oSelectedContext.getObject();
 					const oTransformedBinding = transformRecursively(
 						sProperty,
-						"Binding",
+						"PathInModel",
 						// eslint-disable-next-line no-loop-func
 						function (oBindingExpression: any) {
 							return constant(oContextData[oBindingExpression.path]);
 						},
 						true
 					);
-					const sResult = compileBinding(oTransformedBinding);
+					const sResult = compileExpression(oTransformedBinding);
 					if (sResult === "true") {
 						oInternalModelContext.getModel().setProperty(sDynamicActionEnabledPath, true);
 						aApplicable.push(oSelectedContext);
@@ -928,7 +862,7 @@ function setActionEnablement(oInternalModelContext: any, oActionOperationAvailab
 				const oSelectedContext = aSelectedContexts[i];
 				if (oSelectedContext) {
 					const oContextData = oSelectedContext.getObject();
-					if (sProperty === null && !!oContextData["#" + sAction]) {
+					if (sProperty === null && !!oContextData[`#${sAction}`]) {
 						//look for action advertisement if present and its value is not null
 						oInternalModelContext.getModel().setProperty(sDynamicActionEnabledPath, true);
 						break;
@@ -951,7 +885,7 @@ function setActionEnablement(oInternalModelContext: any, oActionOperationAvailab
 function setObjectMappings(sSemanticObject: string, oParams: any, aSemanticObjectMappings: any) {
 	aSemanticObjectMappings.forEach(function (oItem: any) {
 		if (sSemanticObject === oItem.semanticObject) {
-			var oMappings = oItem.items;
+			const oMappings = oItem.items;
 			for (let i = 0; i < oMappings.length; i++) {
 				const sLocalProperty = oMappings[i].key;
 				const sSemanticObjectProperty = oMappings[i].value;
@@ -1023,7 +957,7 @@ function getOperatorsForProperty(
 	let aSemanticDateOps: any[] = [];
 	const oSettings = typeof sSettings === "string" ? JSON.parse(sSettings).customData : sSettings;
 
-	if (oContext.getObject(sEntitySetPath + "/@com.sap.vocabularies.Common.v1.ResultContext") === true) {
+	if (oContext.getObject(`${sEntitySetPath}/@com.sap.vocabularies.Common.v1.ResultContext`) === true) {
 		return aEqualsOps.toString();
 	}
 
@@ -1032,7 +966,7 @@ function getOperatorsForProperty(
 	} else {
 		aSemanticDateOps = SemanticDateOperators.getSemanticDateOperations();
 	}
-	let aSingleRangeDateTimeOps = aSemanticDateOps.filter(function (sOperator) {
+	const aSingleRangeDateTimeOps = aSemanticDateOps.filter(function (sOperator) {
 		return sOperator !== "DATE" && sOperator !== "DATERANGE" && sOperator !== "FROM" && sOperator !== "TO";
 	});
 	// Get the default Operators for this Property Type
@@ -1059,15 +993,20 @@ function getOperatorsForProperty(
 				sRestrictions = _getRestrictions(aDefaultOperators, aEqualsOps);
 				break;
 			case "SingleRange":
-				const aExpressionOps = bSemanticDateRange
-					? sType === "Edm.Date"
-						? aSemanticDateOps
-						: sType === "Edm.DateTimeOffset"
-						? aSingleRangeDateTimeOps.concat(aBasicDateTimeOps)
-						: aSingleRangeOps
-					: sType === "Edm.DateTimeOffset"
-					? aSingleRangeDTBasicOps
-					: aSingleRangeOps;
+				let aExpressionOps;
+				if (bSemanticDateRange) {
+					if (sType === "Edm.Date") {
+						aExpressionOps = aSemanticDateOps;
+					} else if (sType === "Edm.DateTimeOffset") {
+						aExpressionOps = aSingleRangeDateTimeOps.concat(aBasicDateTimeOps);
+					} else {
+						aExpressionOps = aSingleRangeOps;
+					}
+				} else if (sType === "Edm.DateTimeOffset") {
+					aExpressionOps = aSingleRangeDTBasicOps;
+				} else {
+					aExpressionOps = aSingleRangeOps;
+				}
 				const sOperators = _getRestrictions(aDefaultOperators, aExpressionOps);
 				sRestrictions = sOperators ? sOperators : "";
 				break;
@@ -1099,7 +1038,7 @@ function getOperatorsForProperty(
 }
 function getParameterInfo(oMetaModel: any, sContextPath: any) {
 	const sParameterContextPath = sContextPath.substring(0, sContextPath.lastIndexOf("/"));
-	const bResultContext = oMetaModel.getObject(sParameterContextPath + "/@com.sap.vocabularies.Common.v1.ResultContext");
+	const bResultContext = oMetaModel.getObject(`${sParameterContextPath}/@com.sap.vocabularies.Common.v1.ResultContext`);
 	const oParameterInfo: any = {};
 	if (bResultContext && sParameterContextPath !== sContextPath) {
 		oParameterInfo.contextPath = sParameterContextPath;
@@ -1177,24 +1116,24 @@ function addSelectionVariantToConditions(oSelectionVariant: any, oConditions: ob
 		const aMetadataParameters = Object.keys(oValidParameterProperties);
 		aMetadataParameters.forEach(function (sMetadataParameter: string) {
 			let sSelectOptionName;
-			if (aSelectOptionsPropertyNames.includes("$Parameter." + sMetadataParameter)) {
-				sSelectOptionName = "$Parameter." + sMetadataParameter;
+			if (aSelectOptionsPropertyNames.includes(`$Parameter.${sMetadataParameter}`)) {
+				sSelectOptionName = `$Parameter.${sMetadataParameter}`;
 			} else if (aSelectOptionsPropertyNames.includes(sMetadataParameter)) {
 				sSelectOptionName = sMetadataParameter;
 			} else if (
 				sMetadataParameter.startsWith("P_") &&
-				aSelectOptionsPropertyNames.includes("$Parameter." + sMetadataParameter.slice(2, sMetadataParameter.length))
+				aSelectOptionsPropertyNames.includes(`$Parameter.${sMetadataParameter.slice(2, sMetadataParameter.length)}`)
 			) {
-				sSelectOptionName = "$Parameter." + sMetadataParameter.slice(2, sMetadataParameter.length);
+				sSelectOptionName = `$Parameter.${sMetadataParameter.slice(2, sMetadataParameter.length)}`;
 			} else if (
 				sMetadataParameter.startsWith("P_") &&
 				aSelectOptionsPropertyNames.includes(sMetadataParameter.slice(2, sMetadataParameter.length))
 			) {
 				sSelectOptionName = sMetadataParameter.slice(2, sMetadataParameter.length);
-			} else if (aSelectOptionsPropertyNames.includes("$Parameter.P_" + sMetadataParameter)) {
-				sSelectOptionName = "$Parameter.P_" + sMetadataParameter;
-			} else if (aSelectOptionsPropertyNames.includes("P_" + sMetadataParameter)) {
-				sSelectOptionName = "P_" + sMetadataParameter;
+			} else if (aSelectOptionsPropertyNames.includes(`$Parameter.P_${sMetadataParameter}`)) {
+				sSelectOptionName = `$Parameter.P_${sMetadataParameter}`;
+			} else if (aSelectOptionsPropertyNames.includes(`P_${sMetadataParameter}`)) {
+				sSelectOptionName = `P_${sMetadataParameter}`;
 			}
 
 			if (sSelectOptionName) {
@@ -1221,8 +1160,8 @@ function addSelectionVariantToConditions(oSelectionVariant: any, oConditions: ob
 			aSelectOptionsPropertyNames.includes(sMetadataProperty.slice(2, sMetadataProperty.length))
 		) {
 			sSelectOptionName = sMetadataProperty.slice(2, sMetadataProperty.length);
-		} else if (aSelectOptionsPropertyNames.includes("P_" + sMetadataProperty)) {
-			sSelectOptionName = "P_" + sMetadataProperty;
+		} else if (aSelectOptionsPropertyNames.includes(`P_${sMetadataProperty}`)) {
+			sSelectOptionName = `P_${sMetadataProperty}`;
 		}
 		if (sSelectOptionName) {
 			addSelectOptionsToConditions(
@@ -1241,9 +1180,9 @@ function addSelectionVariantToConditions(oSelectionVariant: any, oConditions: ob
 
 	aSelectOptionsPropertyNames.forEach(function (sSelectOption: any) {
 		if (sSelectOption.indexOf(".") > 0 && !sSelectOption.includes("$Parameter")) {
-			const sFullContextPath = ("/" + sSelectOption.replaceAll(".", "/")).startsWith(sContextPath)
-				? "/" + sSelectOption.replaceAll(".", "/")
-				: sContextPath + "/" + sSelectOption.replaceAll(".", "/"); // check if the full path, eg SalesOrderManage._Item.Material exists in the metamodel
+			const sFullContextPath = `/${sSelectOption.replaceAll(".", "/")}`.startsWith(sContextPath)
+				? `/${sSelectOption.replaceAll(".", "/")}`
+				: `${sContextPath}/${sSelectOption.replaceAll(".", "/")}`; // check if the full path, eg SalesOrderManage._Item.Material exists in the metamodel
 			if (oMetaModel.getObject(sFullContextPath.replace("P_", ""))) {
 				_createConditionsForNavProperties(
 					sFullContextPath,
@@ -1276,20 +1215,20 @@ function _createConditionsForNavProperties(
 ) {
 	let aNavObjectNames = sSelectOption.split(".");
 	// Eg: "SalesOrderManage._Item._Material.Material" or "_Item.Material"
-	if (("/" + sSelectOption.replaceAll(".", "/")).startsWith(sMainEntitySetPath)) {
-		const sFullPath = (("/" + sSelectOption) as any).replaceAll(".", "/"),
-			sNavPath = sFullPath.replace(sMainEntitySetPath + "/", "");
+	if (`/${sSelectOption.replaceAll(".", "/")}`.startsWith(sMainEntitySetPath)) {
+		const sFullPath = (`/${sSelectOption}` as any).replaceAll(".", "/"),
+			sNavPath = sFullPath.replace(`${sMainEntitySetPath}/`, "");
 		aNavObjectNames = sNavPath.split("/");
 	}
 	let sConditionPath = "";
 	const sPropertyName = aNavObjectNames[aNavObjectNames.length - 1]; // Material from SalesOrderManage._Item.Material
 	for (let i = 0; i < aNavObjectNames.length - 1; i++) {
-		if (oMetaModel.getObject(sMainEntitySetPath + "/" + aNavObjectNames[i].replace("P_", "")).$isCollection) {
-			sConditionPath = sConditionPath + aNavObjectNames[i] + "*/"; // _Item*/ in case of 1:n cardinality
+		if (oMetaModel.getObject(`${sMainEntitySetPath}/${aNavObjectNames[i].replace("P_", "")}`).$isCollection) {
+			sConditionPath = `${sConditionPath + aNavObjectNames[i]}*/`; // _Item*/ in case of 1:n cardinality
 		} else {
-			sConditionPath = sConditionPath + aNavObjectNames[i] + "/"; // _Item/ in case of 1:1 cardinality
+			sConditionPath = `${sConditionPath + aNavObjectNames[i]}/`; // _Item/ in case of 1:1 cardinality
 		}
-		sMainEntitySetPath = sMainEntitySetPath + "/" + aNavObjectNames[i];
+		sMainEntitySetPath = `${sMainEntitySetPath}/${aNavObjectNames[i]}`;
 	}
 	const sNavPropertyPath = sFullContextPath.slice(0, sFullContextPath.lastIndexOf("/")),
 		oValidProperties = CommonUtils.getContextPathProperties(oMetaModel, sNavPropertyPath),
@@ -1299,12 +1238,11 @@ function _createConditionsForNavProperties(
 		sSelectOptionName = sPropertyName;
 	} else if (sPropertyName.startsWith("P_") && oValidProperties[sPropertyName.replace("P_", "")]) {
 		sSelectOptionName = sPropertyName.replace("P_", "");
-	} else if (oValidProperties["P_" + sPropertyName] && aSelectOptionsPropertyNames.includes("P_" + sPropertyName)) {
-		sSelectOptionName = "P_" + sPropertyName;
+	} else if (oValidProperties[`P_${sPropertyName}`] && aSelectOptionsPropertyNames.includes(`P_${sPropertyName}`)) {
+		sSelectOptionName = `P_${sPropertyName}`;
 	}
 	if (sPropertyName.startsWith("P_") && oConditions[sConditionPath + sSelectOptionName]) {
 		// if there is no SalesOrderManage._Item.Material yet in the oConditions
-		return;
 	} else if (!sPropertyName.startsWith("P_") && oConditions[sConditionPath + sSelectOptionName]) {
 		delete oConditions[sConditionPath + sSelectOptionName];
 		addSelectOptionsToConditions(
@@ -1358,7 +1296,7 @@ function addExternalStateFiltersToSelectionVariant(oSelectionVariant: any, mFilt
 				break;
 			case "EndsWith":
 				oSelectOptionState.option = "CP";
-				oSelectOptionState.low = "*" + oSelectOptionState.low;
+				oSelectOptionState.low = `*${oSelectOptionState.low}`;
 				break;
 			case "BT":
 			case "LE":
@@ -1394,7 +1332,7 @@ function addExternalStateFiltersToSelectionVariant(oSelectionVariant: any, mFilt
 				break;
 			case "NotEndsWith":
 				oSelectOptionState.option = "CP";
-				oSelectOptionState.low = "*" + oSelectOptionState.low;
+				oSelectOptionState.low = `*${oSelectOptionState.low}`;
 				oSelectOptionState.sign = "E";
 				break;
 			case "NotEmpty":
@@ -1418,29 +1356,29 @@ function addExternalStateFiltersToSelectionVariant(oSelectionVariant: any, mFilt
 				oSelectOptionState.sign = "E";
 				break;
 			default:
-				Log.warning(sOperator + " is not supported. " + sFilter + " could not be added to the navigation context");
+				Log.warning(`${sOperator} is not supported. ${sFilter} could not be added to the navigation context`);
 		}
 		return oSelectOptionState;
 	};
 	const oFilterConditions = mFilters.filterConditions;
 	const oFiltersWithoutConflict = mFilters.filterConditionsWithoutConflict ? mFilters.filterConditionsWithoutConflict : {};
 	const oTablePropertiesWithoutConflict = oTargetInfo.propertiesWithoutConflict ? oTargetInfo.propertiesWithoutConflict : {};
-	const addFiltersToSelectionVariant = function (oSelectionVariant: any, sFilterName: any, sPath?: any) {
+	const addFiltersToSelectionVariant = function (selectionVariant: any, sFilterName: any, sPath?: any) {
 		const aFilters = oFilterConditions[sFilterName];
 		for (const item in aFilters) {
 			const oFilter = aFilters[item];
 			sLow = (oFilter.values[0] && oFilter.values[0].toString()) || "";
 			sHigh = (oFilter.values[1] && oFilter.values[1].toString()) || null;
 			if (oFilter.operator === "TODAY" || oFilter.operator === "DATE") {
-				const aFilter = oFilterInfo[0].aFilters.filter(function (oFilter: any) {
-					return oFilter.sPath === sFilterName;
+				const aFilter = oFilterInfo[0].aFilters.filter(function (filter: any) {
+					return filter.sPath === sFilterName;
 				});
 				sLow = aFilter[0].oValue1 || "";
 				sHigh = null;
 			}
 			const oSelectOptionValues = fnGetSignAndOption(oFilter.operator, sLow, sHigh);
 			if (oSelectOptionValues.option) {
-				oSelectionVariant.addSelectOption(
+				selectionVariant.addSelectOption(
 					sPath ? sPath : sFilterName,
 					oSelectOptionValues.sign,
 					oSelectOptionValues.option,
@@ -1503,12 +1441,13 @@ function addDefaultDisplayCurrency(aMandatoryFilterFields: any[], oSelectionVari
 	}
 }
 function getNonComputedVisibleFields(oMetaModel: ODataMetaModel, sPath: any, oView?: any) {
-	const aTechnicalKeys = oMetaModel.getObject(sPath + "/").$Key;
-	const aNonComputedVisibleFields = [];
-	const oEntityType = oMetaModel.getObject(sPath + "/");
+	const aTechnicalKeys = oMetaModel.getObject(`${sPath}/`).$Key;
+	const aNonComputedVisibleFields: any = [];
+	const aImmutableVisibleFields: any = [];
+	const oEntityType = oMetaModel.getObject(`${sPath}/`);
 	for (const item in oEntityType) {
 		if (oEntityType[item].$kind && oEntityType[item].$kind === "Property") {
-			const oAnnotations = oMetaModel.getObject(sPath + "/" + item + "@") || {},
+			const oAnnotations = oMetaModel.getObject(`${sPath}/${item}@`) || {},
 				bIsKey = aTechnicalKeys.indexOf(item) > -1,
 				bIsImmutable = oAnnotations["@Org.OData.Core.V1.Immutable"],
 				bIsNonComputed = !oAnnotations["@Org.OData.Core.V1.Computed"],
@@ -1519,11 +1458,13 @@ function getNonComputedVisibleFields(oMetaModel: ODataMetaModel, sPath: any, oVi
 						? bIsComputedDefaultValue && oAnnotations["@com.sap.vocabularies.Common.v1.Text"]
 						: false;
 			if (
-				(bIsImmutable || bIsKeyComputedDefaultValueWithText || (bIsKey && oEntityType[item].$Type !== "Edm.Guid")) &&
+				(bIsKeyComputedDefaultValueWithText || (bIsKey && oEntityType[item].$Type !== "Edm.Guid")) &&
 				bIsNonComputed &&
 				bIsVisible
 			) {
 				aNonComputedVisibleFields.push(item);
+			} else if (bIsImmutable && bIsNonComputed && bIsVisible) {
+				aImmutableVisibleFields.push(item);
 			}
 
 			if (!bIsNonComputed && bIsComputedDefaultValue && oView) {
@@ -1539,8 +1480,95 @@ function getNonComputedVisibleFields(oMetaModel: ODataMetaModel, sPath: any, oVi
 			}
 		}
 	}
-	return aNonComputedVisibleFields;
+	const aRequiredProperties = CommonUtils.getRequiredPropertiesFromInsertRestrictions(sPath, oMetaModel);
+	if (aRequiredProperties.length) {
+		aRequiredProperties.forEach(function (sProperty: any) {
+			const oAnnotations = oMetaModel.getObject(`${sPath}/${sProperty}@`),
+				bIsVisible = !oAnnotations || !oAnnotations["@com.sap.vocabularies.UI.v1.Hidden"];
+			if (bIsVisible && aNonComputedVisibleFields.indexOf(sProperty) === -1 && aImmutableVisibleFields.indexOf(sProperty) === -1) {
+				aNonComputedVisibleFields.push(sProperty);
+			}
+		});
+	}
+	return aNonComputedVisibleFields.concat(aImmutableVisibleFields);
 }
+
+function getRequiredProperties(sPath: any, oMetaModel: any, bCheckUpdateRestrictions: boolean = false) {
+	const aPathParts = sPath.split("/");
+	const aRequiredProperties: any = [];
+	let aRequiredPropertiesWithPaths: any = [];
+	let oEntitySetAnnotations = oMetaModel.getObject(`${sPath}@`);
+	if (aPathParts.length > 2) {
+		const sNavigationPath = aPathParts[aPathParts.length - 1];
+		aPathParts.splice(-1, 1); // removing NavigationProperty from the end.
+		const sParentEntitySetPath = aPathParts.join("/");
+		const oNavigationRestrictions = CommonUtils.getNavigationRestrictions(oMetaModel, sParentEntitySetPath, sNavigationPath);
+		oEntitySetAnnotations = oMetaModel.getObject(`${sParentEntitySetPath}/$NavigationPropertyBinding/${sNavigationPath}@`);
+		if (CommonUtils.hasRestrictedPropertiesInAnnotations(oNavigationRestrictions, true, bCheckUpdateRestrictions)) {
+			aRequiredPropertiesWithPaths = bCheckUpdateRestrictions
+				? oNavigationRestrictions["UpdateRestrictions"].RequiredProperties
+				: oNavigationRestrictions["InsertRestrictions"].RequiredProperties;
+		}
+		if (
+			(!aRequiredPropertiesWithPaths || !aRequiredPropertiesWithPaths.length) &&
+			CommonUtils.hasRestrictedPropertiesInAnnotations(oEntitySetAnnotations, false, bCheckUpdateRestrictions)
+		) {
+			aRequiredPropertiesWithPaths = CommonUtils.getRequiredPropertiesFromAnnotations(
+				oEntitySetAnnotations,
+				bCheckUpdateRestrictions
+			);
+		}
+	} else if (CommonUtils.hasRestrictedPropertiesInAnnotations(oEntitySetAnnotations, false, bCheckUpdateRestrictions)) {
+		aRequiredPropertiesWithPaths = CommonUtils.getRequiredPropertiesFromAnnotations(oEntitySetAnnotations, bCheckUpdateRestrictions);
+	}
+	aRequiredPropertiesWithPaths.forEach(function (oRequiredProperty: any) {
+		const sProperty = oRequiredProperty["$PropertyPath"];
+		aRequiredProperties.push(sProperty);
+	});
+	return aRequiredProperties;
+}
+
+function getRequiredPropertiesFromInsertRestrictions(sPath: any, oMetaModel: any) {
+	return CommonUtils.getRequiredProperties(sPath, oMetaModel);
+}
+
+function getRequiredPropertiesFromUpdateRestrictions(sPath: any, oMetaModel: any) {
+	return CommonUtils.getRequiredProperties(sPath, oMetaModel, true);
+}
+
+function getRequiredPropertiesFromAnnotations(oAnnotations: any, bCheckUpdateRestrictions: boolean = false) {
+	if (bCheckUpdateRestrictions) {
+		return oAnnotations["@Org.OData.Capabilities.V1.UpdateRestrictions"].RequiredProperties;
+	}
+	return oAnnotations["@Org.OData.Capabilities.V1.InsertRestrictions"].RequiredProperties;
+}
+
+function hasRestrictedPropertiesInAnnotations(
+	oAnnotations: any,
+	bIsNavigationRestrictions: boolean = false,
+	bCheckUpdateRestrictions: boolean = false
+) {
+	if (bIsNavigationRestrictions) {
+		if (bCheckUpdateRestrictions) {
+			return oAnnotations && oAnnotations["UpdateRestrictions"] && oAnnotations["UpdateRestrictions"].RequiredProperties
+				? true
+				: false;
+		}
+		return oAnnotations && oAnnotations["InsertRestrictions"] && oAnnotations["InsertRestrictions"].RequiredProperties ? true : false;
+	} else if (bCheckUpdateRestrictions) {
+		return oAnnotations &&
+			oAnnotations["@Org.OData.Capabilities.V1.UpdateRestrictions"] &&
+			oAnnotations["@Org.OData.Capabilities.V1.UpdateRestrictions"].RequiredProperties
+			? true
+			: false;
+	}
+	return oAnnotations &&
+		oAnnotations["@Org.OData.Capabilities.V1.InsertRestrictions"] &&
+		oAnnotations["@Org.OData.Capabilities.V1.InsertRestrictions"].RequiredProperties
+		? true
+		: false;
+}
+
 function setUserDefaults(
 	oAppComponent: AppComponent,
 	aParameters: any[],
@@ -1556,7 +1584,7 @@ function setUserDefaults(
 		if (!oShellServices.hasUShell()) {
 			aParameters.forEach(function (oParameter: any) {
 				const sPropertyName = bIsAction
-					? "/" + oParameter.$Name
+					? `/${oParameter.$Name}`
 					: oParameter.getPath().slice(oParameter.getPath().lastIndexOf("/") + 1);
 				const sParameterName = bIsAction ? sPropertyName.slice(1) : sPropertyName;
 				if (oActionDefaultValues && bIsCreate) {
@@ -1574,7 +1602,7 @@ function setUserDefaults(
 				aExtendedParameters = (oData.selectionVariant && oData.selectionVariant.SelectOptions) || [];
 			aParameters.forEach(function (oParameter: any) {
 				const sPropertyName = bIsAction
-					? "/" + oParameter.$Name
+					? `/${oParameter.$Name}`
 					: oParameter.getPath().slice(oParameter.getPath().lastIndexOf("/") + 1);
 				const sParameterName = bIsAction ? sPropertyName.slice(1) : sPropertyName;
 				if (oActionDefaultValues && bIsCreate) {
@@ -1587,7 +1615,9 @@ function setUserDefaults(
 					for (const i in aExtendedParameters) {
 						const oExtendedParameter = aExtendedParameters[i];
 						if (oExtendedParameter.PropertyName === sParameterName) {
-							const oRange = oExtendedParameter.Ranges.length ? oExtendedParameter.Ranges[0] : undefined;
+							const oRange = oExtendedParameter.Ranges.length
+								? oExtendedParameter.Ranges[oExtendedParameter.Ranges.length - 1]
+								: undefined;
 							if (oRange && oRange.Sign === "I" && oRange.Option === "EQ") {
 								oModel.setProperty(sPropertyName, oRange.Low); // high is ignored when Option=EQ
 							}
@@ -1678,7 +1708,7 @@ function getHeaderFacetItemConfigForExternalNavigation(oViewData: any, oCrossNav
 						semanticObjectMapping: aSemanticObjectMapping
 					};
 				} else {
-					Log.error("Cross navigation outbound is configured without semantic object and action for " + sOutbound);
+					Log.error(`Cross navigation outbound is configured without semantic object and action for ${sOutbound}`);
 				}
 			}
 		}
@@ -1706,9 +1736,9 @@ function setSemanticObjectMappings(oSelectionVariant: any, vMappings: object) {
 }
 function fnGetSemanticObjectsFromPath(oMetaModel: any, sPath: any) {
 	return new Promise(function (resolve: (value: any) => void) {
-		const sSemanticObject = oMetaModel.getObject(sPath + "@com.sap.vocabularies.Common.v1.SemanticObject");
+		const sSemanticObject = oMetaModel.getObject(`${sPath}@com.sap.vocabularies.Common.v1.SemanticObject`);
 		const aSemanticObjectUnavailableActions = oMetaModel.getObject(
-			sPath + "@com.sap.vocabularies.Common.v1.SemanticObjectUnavailableActions"
+			`${sPath}@com.sap.vocabularies.Common.v1.SemanticObjectUnavailableActions`
 		);
 		const aSemanticObjectForGetLinks = [{ semanticObject: sSemanticObject }];
 		const oSemanticObject = {
@@ -1886,7 +1916,7 @@ function fnGetSemanticTargetsFromPageModel(oController: any, sPageModel: string)
 							element.semanticObject.semanticObject &&
 							typeof element.semanticObject.semanticObject === "object"
 						) {
-							sSemObjExpression = compileBinding(bindingExpression(element.semanticObject.semanticObject.$Path));
+							sSemObjExpression = compileExpression(pathInModel(element.semanticObject.semanticObject.$Path));
 							element.semanticObject.semanticObject = sSemObjExpression;
 							element.semanticObjectForGetLinks[0].semanticObject = sSemObjExpression;
 							return true;
@@ -1952,7 +1982,7 @@ function getFilterRestrictions(oFilterRestrictionsAnnotation: any, sRestriction:
 function getFilterRestrictionsByPath(sEntitySetPath: any, oMetaModel: any) {
 	const oRet: any = {},
 		FilterRestrictions = CommonUtils.FilterRestrictions,
-		oFilterRestrictions = sEntitySetPath ? oMetaModel.getObject(sEntitySetPath + "@Org.OData.Capabilities.V1.FilterRestrictions") : {};
+		oFilterRestrictions = sEntitySetPath ? oMetaModel.getObject(`${sEntitySetPath}@Org.OData.Capabilities.V1.FilterRestrictions`) : {};
 	oRet[FilterRestrictions.REQUIRED_PROPERTIES] = getFilterRestrictions(oFilterRestrictions, FilterRestrictions.REQUIRED_PROPERTIES) || [];
 	oRet[FilterRestrictions.NON_FILTERABLE_PROPERTIES] =
 		getFilterRestrictions(oFilterRestrictions, FilterRestrictions.NON_FILTERABLE_PROPERTIES) || [];
@@ -2018,10 +2048,10 @@ function getSingletonPath(path: string, metaModel: ODataMetaModel): string | und
 	const parts = path.split("/").filter(Boolean),
 		propertyName = parts.pop(),
 		navigationPath = parts.join("/"),
-		entitySet = navigationPath && metaModel.getObject("/" + navigationPath);
+		entitySet = navigationPath && metaModel.getObject(`/${navigationPath}`);
 	if (entitySet?.$kind === "Singleton") {
 		const singletonName = parts[parts.length - 1];
-		return "/" + singletonName + "/" + propertyName;
+		return `/${singletonName}/${propertyName}`;
 	}
 	return undefined;
 }
@@ -2083,10 +2113,10 @@ function loadMacroLibrary() {
 function fnOnStrictHandlingFailed(sGroupId: string, actionName: string, oModel: ODataModel, aMessages: any[]) {
 	const localI18nRef = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core"),
 		sActionName = actionName,
-		sCancelButtonTxt = localI18nRef.getText("CANCEL");
+		sCancelButtonTxt = localI18nRef.getText("C_COMMON_DIALOG_CANCEL");
 	if (aMessages.length === 1) {
-		const sMessage = aMessages[0].message + "\n" + localI18nRef.getText("PROCEED");
-		const dialogPromise = new Promise(function (resolve) {
+		const sMessage = `${aMessages[0].message}\n${localI18nRef.getText("PROCEED")}`;
+		return new Promise(function (resolve) {
 			MessageBox.warning(sMessage, {
 				title: localI18nRef.getText("WARNING"),
 				actions: [sActionName, sCancelButtonTxt],
@@ -2101,7 +2131,6 @@ function fnOnStrictHandlingFailed(sGroupId: string, actionName: string, oModel:
 				}
 			});
 		});
-		return dialogPromise;
 	}
 	return new Promise(function (resolve) {
 		const oMessageDialogModel = new JSONModel();
@@ -2144,6 +2173,67 @@ function fnOnStrictHandlingFailed(sGroupId: string, actionName: string, oModel:
 	});
 }
 
+function getMessageColumn(oControl: any): string {
+	if (!oControl || oControl.isA("sap.ui.core.mvc.XMLView")) {
+		return "";
+	}
+	const headerInfoTitlePath = oControl.getParent().getTableDefinition().headerInfoTitle;
+	const oMetaModel = oControl && oControl.getModel().getMetaModel(),
+		sCurrentEntitySetName = oControl.data("metaPath");
+	const aTechnicalKeys = oMetaModel.getObject(`${sCurrentEntitySetName}/$Type/$Key`);
+	const aFilteredTechnicalKeys: string[] = [];
+
+	aTechnicalKeys.forEach(function (technicalKey: string) {
+		if (technicalKey !== "IsActiveEntity") {
+			aFilteredTechnicalKeys.push(technicalKey);
+		}
+	});
+	const semanticKeyColumns = oControl.getParent().getTableDefinition().semanticKeys;
+
+	const aVisibleColumns: any = [];
+	const aTableColumns = oControl.getColumns();
+	aTableColumns.forEach(function (oColumn: any) {
+		const columnPathSplit = oColumn.getId().split("::");
+		aVisibleColumns.push(columnPathSplit[columnPathSplit.length - 1]);
+	});
+	let subtitleColumn: string = ""; //set the corressponding subtitle column
+	if (headerInfoTitlePath !== undefined && aVisibleColumns.indexOf(headerInfoTitlePath) !== -1) {
+		subtitleColumn = headerInfoTitlePath;
+	} else if (
+		semanticKeyColumns !== undefined &&
+		semanticKeyColumns.length === 1 &&
+		aVisibleColumns.indexOf(semanticKeyColumns[0]) !== -1
+	) {
+		subtitleColumn = semanticKeyColumns[0];
+	}
+	// set correct context to correct message in message model
+	else if (aFilteredTechnicalKeys !== undefined && aFilteredTechnicalKeys.length === 1) {
+		subtitleColumn = aFilteredTechnicalKeys[0];
+	}
+	return subtitleColumn;
+}
+
+function getKeys(oMetaModel: any, sPath: string, sEntitySetName: string): string {
+	const sMetaPath = oMetaModel.getMetaPath(sPath);
+	const aTechnicalKeys = oMetaModel.getObject(`${sMetaPath}/$Type/$Key`);
+	let sKey: string = "";
+	const semanticKey = SemanticKeyHelper.getSemanticKeys(oMetaModel, sEntitySetName);
+	if (semanticKey !== undefined && semanticKey.length === 1) {
+		sKey = semanticKey[0].$PropertyPath;
+	} else if (aTechnicalKeys) {
+		const aFilteredTechnicalKeys: string[] = [];
+		aTechnicalKeys.forEach(function (technicalKey: string) {
+			if (technicalKey !== "IsActiveEntity") {
+				aFilteredTechnicalKeys.push(technicalKey);
+			}
+		});
+		if (aFilteredTechnicalKeys !== undefined && aFilteredTechnicalKeys.length === 1) {
+			sKey = aFilteredTechnicalKeys[0];
+		}
+	}
+	return sKey;
+}
+
 function getMessageStripText(
 	view: any,
 	aIgnoredLabels: any,
@@ -2165,19 +2255,15 @@ function getMessageStripText(
 		} else if (aIgnoredLabels.length === 1 && bIsDraftSupported) {
 			sText = oResourceBundle.getText("C_MULTIVIZ_CHART_IGNORED_FILTER_DRAFT_DATA");
 		} else {
-			const sResource =
-				"C_LR_MULTIVIZ_CHART_" +
-				(aIgnoredLabels.length === 1 ? "SINGLE" : "MULTI") +
-				"_IGNORED_FILTER_" +
-				(system.desktop ? "LARGE" : "SMALL");
+			const sResource = `C_LR_MULTIVIZ_CHART_${aIgnoredLabels.length === 1 ? "SINGLE" : "MULTI"}_IGNORED_FILTER_${
+				system.desktop ? "LARGE" : "SMALL"
+			}`;
 			sText = oResourceBundle.getText(sResource, [aIgnoredLabels.join(", ")]);
 		}
 	} else {
-		const sResource =
-				"C_LR_MULTITABLES_" +
-				(aIgnoredLabels.length === 1 ? "SINGLE" : "MULTI") +
-				"_IGNORED_FILTER_" +
-				(system.desktop ? "LARGE" : "SMALL"),
+		const sResource = `C_LR_MULTITABLES_${aIgnoredLabels.length === 1 ? "SINGLE" : "MULTI"}_IGNORED_FILTER_${
+				system.desktop ? "LARGE" : "SMALL"
+			}`,
 			sLocalizedTableTitle = fnGetLocalizedText(sTabTitle, oFilterBar);
 		sText = oResourceBundle.getText(sResource, [aIgnoredLabels.join(", "), sLocalizedTableTitle]);
 	}
@@ -2194,7 +2280,6 @@ const CommonUtils = {
 	updateRelatedAppsDetails: fnUpdateRelatedAppsDetails,
 	resolveStringtoBoolean: fnResolveStringtoBoolean,
 	getAppComponent: getAppComponent,
-	processDataLossConfirmation: fnProcessDataLossConfirmation,
 	getMandatoryFilterFields: fnGetMandatoryFilterFields,
 	getContextPathProperties: fnGetContextPathProperties,
 	getParameterInfo: getParameterInfo,
@@ -2238,11 +2323,17 @@ const CommonUtils = {
 		ALLOWED_EXPRESSIONS: "FilterAllowedExpressions"
 	},
 	AllowedExpressionsPrio: ["SingleValue", "MultiValue", "SingleRange", "MultiRange", "SearchExpression", "MultiRangeOrSearchExpression"],
-	fnProcessDataLossOrDraftDiscardConfirmation: fnProcessDataLossOrDraftDiscardConfirmation,
 	normalizeSearchTerm: normalizeSearchTerm,
 	fnOnStrictHandlingFailed: fnOnStrictHandlingFailed,
 	getSingletonPath: getSingletonPath,
-	getMessageStripText: getMessageStripText
+	getMessageStripText: getMessageStripText,
+	getMessageColumn: getMessageColumn,
+	getRequiredPropertiesFromUpdateRestrictions: getRequiredPropertiesFromUpdateRestrictions,
+	getRequiredPropertiesFromInsertRestrictions: getRequiredPropertiesFromInsertRestrictions,
+	hasRestrictedPropertiesInAnnotations: hasRestrictedPropertiesInAnnotations,
+	getRequiredPropertiesFromAnnotations: getRequiredPropertiesFromAnnotations,
+	getRequiredProperties: getRequiredProperties,
+	getKeys: getKeys
 };
 
 export default CommonUtils;