@sapui5/sap.fe.core 1.111.0 → 1.112.0

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

@@ -1,33 +1,24 @@
 import type * as Edm from "@sap-ux/vocabularies-types/Edm";
-import type {
-	FilterRestrictionsType,
-	NavigationPropertyRestrictionTypes,
-	NavigationRestrictionsType,
-	SearchRestrictionsType
-} from "@sap-ux/vocabularies-types/vocabularies/Capabilities";
+import type { FilterRestrictionsType } from "@sap-ux/vocabularies-types/vocabularies/Capabilities";
 import type { SemanticObjectMappingType, SemanticObjectUnavailableActions } from "@sap-ux/vocabularies-types/vocabularies/Common";
 import { CommonAnnotationTerms } from "@sap-ux/vocabularies-types/vocabularies/Common";
 import type { TextArrangement } from "@sap-ux/vocabularies-types/vocabularies/UI";
-import type ResourceBundle from "sap/base/i18n/ResourceBundle";
 import Log from "sap/base/Log";
 import uniqueSort from "sap/base/util/array/uniqueSort";
 import mergeObjects from "sap/base/util/merge";
 import type AppComponent from "sap/fe/core/AppComponent";
+import type { ComponentData } from "sap/fe/core/AppComponent";
 import ConverterContext from "sap/fe/core/converters/ConverterContext";
-import { IssueCategory, IssueCategoryType, IssueSeverity } from "sap/fe/core/converters/helpers/IssueManager";
 import * as MetaModelConverter from "sap/fe/core/converters/MetaModelConverter";
-import type { CompiledBindingToolkitExpression } from "sap/fe/core/helpers/BindingToolkit";
-import { compileExpression, not, or, pathInModel } from "sap/fe/core/helpers/BindingToolkit";
+import { compileExpression, pathInModel } from "sap/fe/core/helpers/BindingToolkit";
 import type { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import SemanticDateOperators from "sap/fe/core/helpers/SemanticDateOperators";
 import { generate } from "sap/fe/core/helpers/StableIdHelper";
 import type PageController from "sap/fe/core/PageController";
 import type { IShellServices } from "sap/fe/core/services/ShellServicesFactory";
-import Diagnostics from "sap/fe/core/support/Diagnostics";
-import { DefaultTypeForEdmType, isTypeFilterable } from "sap/fe/core/type/EDM";
+import type Diagnostics from "sap/fe/core/support/Diagnostics";
 import TypeUtil from "sap/fe/core/type/TypeUtil";
-import metaModelUtil from "sap/fe/macros/ODataMetaModelUtil";
 import type SelectionVariant from "sap/fe/navigation/SelectionVariant";
 import type { SelectOption, SemanticDateConfiguration } from "sap/fe/navigation/SelectionVariant";
 import type Button from "sap/m/Button";
@@ -39,7 +30,6 @@ import type { AggregationBindingInfo } from "sap/ui/base/ManagedObject";
 import Component from "sap/ui/core/Component";
 import type ComponentContainer from "sap/ui/core/ComponentContainer";
 import type Control from "sap/ui/core/Control";
-import Core from "sap/ui/core/Core";
 import type UI5Element from "sap/ui/core/Element";
 import Fragment from "sap/ui/core/Fragment";
 import type Controller from "sap/ui/core/mvc/Controller";
@@ -48,14 +38,16 @@ import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
 import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
 import Device, { system } from "sap/ui/Device";
 import type ActionToolbarAction from "sap/ui/mdc/actiontoolbar/ActionToolbarAction";
-import type Chart from "sap/ui/mdc/Chart";
+import type { default as Chart, default as MDCChart } from "sap/ui/mdc/Chart";
 import type { ConditionObject } from "sap/ui/mdc/condition/Condition";
 import FilterOperatorUtil from "sap/ui/mdc/condition/FilterOperatorUtil";
 import RangeOperator from "sap/ui/mdc/condition/RangeOperator";
 import type FilterBar from "sap/ui/mdc/FilterBar";
 import type DelegateMixin from "sap/ui/mdc/mixin/DelegateMixin";
 import type Table from "sap/ui/mdc/Table";
+import type MDCTable from "sap/ui/mdc/valuehelp/content/MDCTable";
 import type Context from "sap/ui/model/Context";
+import Filter from "sap/ui/model/Filter";
 import type JSONModel from "sap/ui/model/json/JSONModel";
 import type ODataV4Context from "sap/ui/model/odata/v4/Context";
 import type ODataListBinding from "sap/ui/model/odata/v4/ODataListBinding";
@@ -63,29 +55,29 @@ import type ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
 import type ODataModel from "sap/ui/model/odata/v4/ODataModel";
 import type ObjectPageDynamicHeaderTitle from "sap/uxap/ObjectPageDynamicHeaderTitle";
 import type ObjectPageLayout from "sap/uxap/ObjectPageLayout";
-import type { V4Context } from "types/extension_types";
 import type {
 	ExpandPathType,
-	MetaModelEntitySetAnnotation,
 	MetaModelEntityType,
 	MetaModelEnum,
 	MetaModelNavProperty,
 	MetaModelProperty,
 	MetaModelType
-} from "../../../../../../types/extension_types";
+} from "types/metamodel_types";
 import AnyElement from "./controls/AnyElement";
+import * as MetaModelFunction from "./helpers/MetaModelFunction";
 import { getConditions } from "./templating/FilterHelper";
 
-type InternalResourceBundle = ResourceBundle & {
-	aCustomBundles: InternalResourceBundle[];
-};
-
 type ConditionType = {
 	operator: string;
 	values: Array<unknown> | undefined;
 	validated?: string;
 };
 
+type MyInboxIntent = {
+	semanticObject: string;
+	action: string;
+};
+
 function normalizeSearchTerm(sSearchTerm: string) {
 	if (!sSearchTerm) {
 		return undefined;
@@ -103,47 +95,7 @@ function normalizeSearchTerm(sSearchTerm: string) {
 		}, undefined);
 }
 
-function getPropertyDataType(oNavigationContext: Context) {
-	let sDataType = oNavigationContext.getProperty("$Type");
-	// if $kind exists, it's not a DataField and we have the final type already
-	if (!oNavigationContext.getProperty("$kind")) {
-		switch (sDataType) {
-			case "com.sap.vocabularies.UI.v1.DataFieldForAction":
-			case "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation":
-				sDataType = undefined;
-				break;
-
-			case "com.sap.vocabularies.UI.v1.DataField":
-			case "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":
-			case "com.sap.vocabularies.UI.v1.DataFieldWithUrl":
-			case "com.sap.vocabularies.UI.v1.DataFieldWithIntentBasedNavigation":
-			case "com.sap.vocabularies.UI.v1.DataFieldWithAction":
-				sDataType = oNavigationContext.getProperty("Value/$Path/$Type");
-				break;
-
-			case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation":
-			default:
-				const sAnnotationPath = oNavigationContext.getProperty("Target/$AnnotationPath");
-				if (sAnnotationPath) {
-					if (sAnnotationPath.indexOf("com.sap.vocabularies.Communication.v1.Contact") > -1) {
-						sDataType = oNavigationContext.getProperty("Target/$AnnotationPath/fn/$Path/$Type");
-					} else if (sAnnotationPath.indexOf("com.sap.vocabularies.UI.v1.DataPoint") > -1) {
-						sDataType = oNavigationContext.getProperty("Value/$Path/$Type");
-					} else {
-						// e.g. FieldGroup or Chart
-						sDataType = undefined;
-					}
-				} else {
-					sDataType = undefined;
-				}
-				break;
-		}
-	}
-
-	return sDataType;
-}
-
-async function waitForContextRequested(bindingContext: V4Context) {
+async function waitForContextRequested(bindingContext: ODataV4Context) {
 	const model = bindingContext.getModel();
 	const metaModel = model.getMetaModel();
 	const entityPath = metaModel.getMetaPath(bindingContext.getPath());
@@ -163,190 +115,8 @@ function fnHasTransientContexts(oListBinding: ODataListBinding) {
 	return bHasTransientContexts;
 }
 
-function getSearchRestrictions(sFullPath: string, oMetaModelContext: ODataMetaModel) {
-	let oSearchRestrictions;
-	let oNavigationSearchRestrictions;
-	const navigationText = "$NavigationPropertyBinding";
-	const searchRestrictionsTerm = "@Org.OData.Capabilities.V1.SearchRestrictions";
-	const entityTypePathParts = sFullPath.replaceAll("%2F", "/").split("/").filter(ModelHelper.filterOutNavPropBinding);
-	const entitySetPath = ModelHelper.getEntitySetPath(sFullPath, oMetaModelContext);
-	const entitySetPathParts = entitySetPath.split("/").filter(ModelHelper.filterOutNavPropBinding);
-	const isContainment = oMetaModelContext.getObject(`/${entityTypePathParts.join("/")}/$ContainsTarget`);
-	const containmentNavPath = isContainment && entityTypePathParts[entityTypePathParts.length - 1];
-
-	//LEAST PRIORITY - Search restrictions directly at Entity Set
-	//e.g. FR in "NS.EntityContainer/SalesOrderManage" ContextPath: /SalesOrderManage
-	if (!isContainment) {
-		oSearchRestrictions = oMetaModelContext.getObject(`${entitySetPath}${searchRestrictionsTerm}`) as
-			| MetaModelType<SearchRestrictionsType>
-			| undefined;
-	}
-	if (entityTypePathParts.length > 1) {
-		const navPath = isContainment ? containmentNavPath : entitySetPathParts[entitySetPathParts.length - 1];
-		// In case of containment we take entitySet provided as parent. And in case of normal we would remove the last navigation from entitySetPath.
-		const parentEntitySetPath = isContainment ? entitySetPath : `/${entitySetPathParts.slice(0, -1).join(`/${navigationText}/`)}`;
-
-		//HIGHEST priority - Navigation restrictions
-		//e.g. Parent "/Customer" with NavigationPropertyPath="Set" ContextPath: Customer/Set
-		const oNavigationRestrictions = CommonUtils.getNavigationRestrictions(
-			oMetaModelContext,
-			parentEntitySetPath,
-			navPath.replaceAll("%2F", "/")
-		);
-		oNavigationSearchRestrictions = oNavigationRestrictions && oNavigationRestrictions["SearchRestrictions"];
-	}
-	return oNavigationSearchRestrictions || oSearchRestrictions;
-}
-
-function getNavigationRestrictions(oMetaModelContext: ODataMetaModel, sEntitySetPath: string, sNavigationPath: string) {
-	const oNavigationRestrictions = oMetaModelContext.getObject(`${sEntitySetPath}@Org.OData.Capabilities.V1.NavigationRestrictions`) as
-		| MetaModelType<NavigationRestrictionsType>
-		| undefined;
-	const aRestrictedProperties = oNavigationRestrictions && oNavigationRestrictions.RestrictedProperties;
-	return (
-		aRestrictedProperties &&
-		aRestrictedProperties.find(function (oRestrictedProperty) {
-			return (
-				oRestrictedProperty &&
-				oRestrictedProperty.NavigationProperty &&
-				oRestrictedProperty.NavigationProperty.$NavigationPropertyPath === sNavigationPath
-			);
-		})
-	);
-}
-
-function _isInNonFilterableProperties(metamodelContext: ODataMetaModel, sEntitySetPath: string, sContextPath: string) {
-	let bIsNotFilterable = false;
-	const oAnnotation = metamodelContext.getObject(`${sEntitySetPath}@Org.OData.Capabilities.V1.FilterRestrictions`) as
-		| MetaModelType<FilterRestrictionsType>
-		| undefined;
-	if (oAnnotation && oAnnotation.NonFilterableProperties) {
-		bIsNotFilterable = oAnnotation.NonFilterableProperties.some(function (property) {
-			return (
-				(property as unknown as ExpandPathType<Edm.NavigationPropertyPath>).$NavigationPropertyPath === sContextPath ||
-				property.$PropertyPath === sContextPath
-			);
-		});
-	}
-	return bIsNotFilterable;
-}
-
-function _isCustomAggregate(metamodelContext: ODataMetaModel, sEntitySetPath: string, sContextPath: string) {
-	let bCustomAggregate = false;
-	const bApplySupported = metamodelContext?.getObject(sEntitySetPath + "@Org.OData.Aggregation.V1.ApplySupported") ? true : false;
-	if (bApplySupported) {
-		const oAnnotations = metamodelContext.getObject(`${sEntitySetPath}@`);
-		const oCustomAggreggates = metaModelUtil.getAllCustomAggregates(oAnnotations);
-		const aCustomAggregates = oCustomAggreggates ? Object.keys(oCustomAggreggates) : undefined;
-		if (aCustomAggregates && aCustomAggregates?.indexOf(sContextPath) > -1) {
-			bCustomAggregate = true;
-		}
-	}
-	return bCustomAggregate;
-}
-
-// TODO rework this!
-function _isContextPathFilterable(oModelContext: ODataMetaModel, sEntitySetPath: string, sContexPath: string) {
-	const sFullPath = `${sEntitySetPath}/${sContexPath}`,
-		aESParts = sFullPath.split("/").splice(0, 2),
-		aContext = sFullPath.split("/").splice(2);
-	let bIsNotFilterable = false,
-		sContext = "";
-
-	sEntitySetPath = aESParts.join("/");
-
-	bIsNotFilterable = aContext.some(function (item: string, index: number, array: string[]) {
-		if (sContext.length > 0) {
-			sContext += `/${item}`;
-		} else {
-			sContext = item;
-		}
-		if (index === array.length - 2) {
-			// In case of "/Customer/Set/Property" this is to check navigation restrictions of "Customer" for non-filterable properties in "Set"
-			const oNavigationRestrictions = getNavigationRestrictions(oModelContext, sEntitySetPath, item);
-			const oFilterRestrictions = oNavigationRestrictions && oNavigationRestrictions.FilterRestrictions;
-			const aNonFilterableProperties = oFilterRestrictions && oFilterRestrictions.NonFilterableProperties;
-			const sTargetPropertyPath = array[array.length - 1];
-			if (
-				aNonFilterableProperties &&
-				aNonFilterableProperties.find(function (oPropertyPath) {
-					return oPropertyPath.$PropertyPath === sTargetPropertyPath;
-				})
-			) {
-				return true;
-			}
-		}
-		if (index === array.length - 1) {
-			//last path segment
-			bIsNotFilterable = _isInNonFilterableProperties(oModelContext, sEntitySetPath, sContext);
-		} else if (oModelContext.getObject(`${sEntitySetPath}/$NavigationPropertyBinding/${item}`)) {
-			//check existing context path and initialize it
-			bIsNotFilterable = _isInNonFilterableProperties(oModelContext, sEntitySetPath, sContext);
-			sContext = "";
-			//set the new EntitySet
-			sEntitySetPath = `/${oModelContext.getObject(`${sEntitySetPath}/$NavigationPropertyBinding/${item}`)}`;
-		}
-		return bIsNotFilterable === true;
-	});
-	return bIsNotFilterable;
-}
-
-// TODO check used places and rework this
-function isPropertyFilterable(
-	metaModelContext: ODataMetaModel,
-	sEntitySetPath: string,
-	sProperty: string,
-	bSkipHiddenFilter?: boolean
-): boolean | CompiledBindingToolkitExpression {
-	if (typeof sProperty !== "string") {
-		throw new Error("sProperty parameter must be a string");
-	}
-	let bIsFilterable;
+// there is no navigation in entitySet path and property path
 
-	// Parameters should be rendered as filterfields
-	if (metaModelContext.getObject(`${sEntitySetPath}/@com.sap.vocabularies.Common.v1.ResultContext`)?.valueOf() === true) {
-		return true;
-	}
-
-	const oNavigationContext = metaModelContext.createBindingContext(`${sEntitySetPath}/${sProperty}`) as Context;
-
-	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)));
-		}
-	}
-
-	// there is no navigation in entitySet path and property path
-	bIsFilterable =
-		sEntitySetPath.split("/").length === 2 && sProperty.indexOf("/") < 0
-			? !_isInNonFilterableProperties(metaModelContext, sEntitySetPath, sProperty) &&
-			  !_isCustomAggregate(metaModelContext, sEntitySetPath, sProperty)
-			: !_isContextPathFilterable(metaModelContext, sEntitySetPath, sProperty);
-	// check if type can be used for filtering
-	if (bIsFilterable && oNavigationContext) {
-		const sPropertyDataType = getPropertyDataType(oNavigationContext);
-		if (sPropertyDataType) {
-			bIsFilterable = sPropertyDataType ? isTypeFilterable(sPropertyDataType as keyof typeof DefaultTypeForEdmType) : false;
-		} else {
-			bIsFilterable = false;
-		}
-	}
-
-	return bIsFilterable;
-}
 function getShellServices(oControl: Control | Component): IShellServices {
 	return getAppComponent(oControl).getShellServices();
 }
@@ -454,6 +224,29 @@ function _getRelatedIntents(
 	}
 }
 
+/**
+ * @description This function fetches the related intents when semantic object and action are passed from feEnvironment.getIntent() only in case of My Inbox integration
+ * @param semanticObjectAndAction This specifies the semantic object and action for fetching the intents
+ * @param oBindingContext This sepcifies the binding context for updating related apps
+ * @param appComponentSOItems This is a list of semantic items used for updating the related apps button
+ * @param aLinks This is an array comprising of related intents
+ */
+
+function _getRelatedIntentsWithSemanticObjectsAndAction(
+	semanticObjectAndAction: MyInboxIntent,
+	oBindingContext: Context,
+	appComponentSOItems: SemanticItem[],
+	aLinks: LinkDefinition[]
+) {
+	if (aLinks.length > 0) {
+		const actions = [semanticObjectAndAction.action];
+		const excludedActions: [] = [];
+		const soMappings: [] = [];
+		const targetParams = { navigationContexts: oBindingContext, semanticObjectMapping: soMappings };
+		_getRelatedAppsMenuItems(aLinks, excludedActions, targetParams, appComponentSOItems, actions);
+	}
+}
+
 type SemanticObjectConfig = {
 	additionalSemanticObjects: Record<string, SemanticObject>;
 };
@@ -468,7 +261,8 @@ async function updateRelateAppsModel(
 	oObjectPageLayout: ObjectPageLayout,
 	aSemKeys: { $PropertyPath: string }[],
 	oMetaModel: ODataMetaModel,
-	oMetaPath: string
+	oMetaPath: string,
+	appComponent: AppComponent
 ): Promise<RelatedAppsConfig[]> {
 	const oShellServiceHelper: IShellServices = getShellServices(oObjectPageLayout);
 	const oParam: Record<string, unknown> = {};
@@ -525,6 +319,21 @@ async function updateRelateAppsModel(
 				);
 			}
 		}
+
+		// appComponentSOItems is updated in case of My Inbox integration when semantic object and action are passed from feEnvironment.getIntent() method
+		// In other cases it remains as an empty list
+		// We concat this list towards the end with aManifestSOItems
+
+		const appComponentSOItems: SemanticItem[] = [];
+		const componentData: ComponentData = appComponent.getComponentData();
+		if (componentData.feEnvironment && componentData.feEnvironment.getIntent()) {
+			const intent: MyInboxIntent = componentData.feEnvironment.getIntent();
+			semanticObjectIntents = await Promise.resolve(
+				_getSOIntents(oShellServiceHelper, oObjectPageLayout, intent.semanticObject, oParam)
+			);
+			_getRelatedIntentsWithSemanticObjectsAndAction(intent, oBindingContext, appComponentSOItems, semanticObjectIntents);
+		}
+
 		const internalModelContext = oObjectPageLayout.getBindingContext("internal") as InternalModelContext;
 		const aLinks = await fnGetParseShellHashAndGetLinks();
 		if (aLinks) {
@@ -551,7 +360,7 @@ async function updateRelateAppsModel(
 				_getRelatedAppsMenuItems(aLinks, aExcludedActions, oTargetParams, aAnnotationsSOItems);
 
 				aManifestSOItems.forEach(function ({ targetSemObject }) {
-					if (aAnnotationsSOItems[0].targetSemObject === targetSemObject) {
+					if (aAnnotationsSOItems[0]?.targetSemObject === targetSemObject) {
 						isSemanticObjectHasSameTargetInManifest = true;
 					}
 				});
@@ -559,15 +368,14 @@ async function updateRelateAppsModel(
 				// remove all actions from current hash application if manifest contains empty allowedActions
 				if (
 					oManifestData.additionalSemanticObjects &&
+					aAnnotationsSOItems[0] &&
 					oManifestData.additionalSemanticObjects[aAnnotationsSOItems[0].targetSemObject] &&
 					oManifestData.additionalSemanticObjects[aAnnotationsSOItems[0].targetSemObject].allowedActions?.length === 0
 				) {
 					isSemanticObjectHasSameTargetInManifest = true;
 				}
-
-				aRelatedAppsMenuItems = isSemanticObjectHasSameTargetInManifest
-					? aManifestSOItems
-					: aManifestSOItems.concat(aAnnotationsSOItems);
+				const soItems = aManifestSOItems.concat(appComponentSOItems);
+				aRelatedAppsMenuItems = isSemanticObjectHasSameTargetInManifest ? soItems : soItems.concat(aAnnotationsSOItems);
 				// If no app in list, related apps button will be hidden
 				internalModelContext.setProperty("relatedApps/visibility", aRelatedAppsMenuItems.length > 0);
 				internalModelContext.setProperty("relatedApps/items", aRelatedAppsMenuItems);
@@ -621,9 +429,9 @@ function _getSemanticObjectAnnotations(oEntityAnnotations: Record<string, unknow
 	return oSemanticObjectAnnotations;
 }
 
-function fnUpdateRelatedAppsDetails(oObjectPageLayout: ObjectPageLayout) {
+function fnUpdateRelatedAppsDetails(oObjectPageLayout: ObjectPageLayout, appComponent: AppComponent) {
 	const oMetaModel = oObjectPageLayout.getModel().getMetaModel() as ODataMetaModel;
-	const oBindingContext = oObjectPageLayout.getBindingContext() as V4Context;
+	const oBindingContext = oObjectPageLayout.getBindingContext() as ODataV4Context;
 	const path = (oBindingContext && oBindingContext.getPath()) || "";
 	const oMetaPath = oMetaModel.getMetaPath(path);
 	// Semantic Key Vocabulary
@@ -636,13 +444,21 @@ function fnUpdateRelatedAppsDetails(oObjectPageLayout: ObjectPageLayout) {
 		oBindingContext
 			.requestObject()
 			.then(async function (requestedObject: Record<string, unknown> | undefined) {
-				return updateRelateAppsModel(oBindingContext, requestedObject, oObjectPageLayout, aSemKeys, oMetaModel, oMetaPath);
+				return CommonUtils.updateRelateAppsModel(
+					oBindingContext,
+					requestedObject,
+					oObjectPageLayout,
+					aSemKeys,
+					oMetaModel,
+					oMetaPath,
+					appComponent
+				);
 			})
 			.catch(function (oError: unknown) {
 				Log.error("Cannot update the related app details", oError as string);
 			});
 	} else {
-		return updateRelateAppsModel(oBindingContext, oEntry, oObjectPageLayout, aSemKeys, oMetaModel, oMetaPath);
+		return CommonUtils.updateRelateAppsModel(oBindingContext, oEntry, oObjectPageLayout, aSemKeys, oMetaModel, oMetaPath, appComponent);
 	}
 }
 
@@ -726,7 +542,7 @@ type UnknownODataObject = {
 function removeSensitiveData(aAttributes: UnknownODataObject[], oMetaModel: ODataMetaModel) {
 	const aOutAttributes = [];
 	for (let i = 0; i < aAttributes.length; i++) {
-		const sEntitySet = aAttributes[i].entitySet,
+		const sEntitySet = aAttributes[i].entitySet!,
 			oAttribute = aAttributes[i].contextData;
 
 		delete oAttribute["@odata.context"];
@@ -860,6 +676,7 @@ function fnUpdateDataFieldForIBNButtonsVisibility(aIBNActions: Control[], oView:
 								}
 							);
 						}
+						return;
 					})
 					.catch(function (oError: unknown) {
 						Log.error("Cannot retrieve the links from the shell service", oError as string);
@@ -881,49 +698,8 @@ function fnUpdateDataFieldForIBNButtonsVisibility(aIBNActions: Control[], oView:
 	}
 }
 
-function getTranslatedText(sFrameworkKey: string, oResourceBundle: ResourceBundle, parameters?: unknown[], sEntitySetName?: string) {
-	let sResourceKey = sFrameworkKey;
-	if (oResourceBundle) {
-		if (sEntitySetName) {
-			// There are console errors logged when making calls to getText for keys that are not defined in the resource bundle
-			// for instance keys which are supposed to be provided by the application, e.g, <key>|<entitySet> to override instance specific text
-			// hence check if text exists (using "hasText") in the resource bundle before calling "getText"
-
-			// "hasText" only checks for the key in the immediate resource bundle and not it's custom bundles
-			// 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 InternalResourceBundle).aCustomBundles,
-				`${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;
-		}
-		return oResourceBundle.getText(sResourceKey, parameters);
-	}
-
-	// do not allow override so get text from the internal bundle directly
-	oResourceBundle = Core.getLibraryResourceBundle("sap.fe.core");
-	return oResourceBundle.getText(sResourceKey, parameters);
-}
-
-function checkIfResourceKeyExists(aCustomBundles: InternalResourceBundle[], sKey: string) {
-	if (aCustomBundles.length) {
-		for (let i = aCustomBundles.length - 1; i >= 0; i--) {
-			const sValue = aCustomBundles[i].hasText(sKey);
-			// text found return true
-			if (sValue) {
-				return true;
-			}
-			checkIfResourceKeyExists(aCustomBundles[i].aCustomBundles, sKey);
-		}
-	}
-	return false;
-}
-
-function getActionPath(actionContext: Context, bReturnOnlyPath: boolean, sActionName?: string, bCheckStaticValue?: boolean) {
-	sActionName = !sActionName ? actionContext.getObject(actionContext.getPath()).toString() : sActionName;
+function getActionPath(actionContext: Context, bReturnOnlyPath: boolean, inActionName?: string, bCheckStaticValue?: boolean) {
+	const sActionName: string = !inActionName ? actionContext.getObject(actionContext.getPath()).toString() : inActionName;
 	let sContextPath = actionContext.getPath().split("/@")[0];
 	const sEntityTypeName = (actionContext.getObject(sContextPath) as MetaModelEntityType).$Type;
 	const sEntityName = getEntitySetName(actionContext.getModel() as ODataMetaModel, sEntityTypeName);
@@ -1010,7 +786,7 @@ export type _RequestedProperty = {
 	sDynamicActionEnabledPath: string;
 };
 async function requestProperty(
-	oSelectedContext: V4Context,
+	oSelectedContext: ODataV4Context,
 	sAction: string,
 	sProperty: string,
 	sDynamicActionEnabledPath: string
@@ -1020,13 +796,13 @@ async function requestProperty(
 			? requestSingletonProperty(sProperty, oSelectedContext.getModel())
 			: _requestObject(sAction, oSelectedContext, sProperty);
 
-	return oPromise.then(async function (vPropertyValue: unknown) {
-		return Promise.resolve({
+	return oPromise.then(function (vPropertyValue: unknown) {
+		return {
 			vPropertyValue: vPropertyValue,
 			oSelectedContext: oSelectedContext,
 			sAction: sAction,
 			sDynamicActionEnabledPath: sDynamicActionEnabledPath
-		});
+		};
 	});
 }
 
@@ -1051,6 +827,7 @@ async function setContextsBasedOnOperationAvailable(
 				});
 				setDynamicActionContexts(oInternalModelContext, aResults[0].sAction, aApplicableContexts, aNotApplicableContexts);
 			}
+			return;
 		})
 		.catch(function (oError: unknown) {
 			Log.trace("Cannot retrieve property value from path", oError as string);
@@ -1331,7 +1108,7 @@ function addSelectOptionsToConditions(
 		aValidOperators: string[],
 		aSemanticDateOperators: string[] = [];
 
-	if (isParameter || CommonUtils.isPropertyFilterable(metaModelContext, sContextPath, sConditionProp, true)) {
+	if (isParameter || MetaModelFunction.isPropertyFilterable(metaModelContext, sContextPath, sConditionProp, true)) {
 		const oPropertyMetadata = oValidProperties[sConditionProp];
 		aSelectOptions = oSelectionVariant.getSelectOption(sSelectOptionProp) as SelectOption[];
 		const settings = getFilterConfigurationSetting(oViewData, sConditionProp);
@@ -1833,156 +1610,6 @@ function addDefaultDisplayCurrency(
 	}
 }
 
-function getNonComputedVisibleFields(metaModelContext: ODataMetaModel, sPath: string, oView?: View) {
-	const aTechnicalKeys = metaModelContext.getObject(`${sPath}/`).$Key;
-	const aNonComputedVisibleFields: unknown[] = [];
-	const aImmutableVisibleFields: unknown[] = [];
-	const oEntityType = metaModelContext.getObject(`${sPath}/`);
-	for (const item in oEntityType) {
-		if (oEntityType[item].$kind && oEntityType[item].$kind === "Property") {
-			const oAnnotations = (metaModelContext.getObject(`${sPath}/${item}@`) || {}) as Record<string, unknown>,
-				bIsKey = aTechnicalKeys.indexOf(item) > -1,
-				bIsImmutable = oAnnotations["@Org.OData.Core.V1.Immutable"],
-				bIsNonComputed = !oAnnotations["@Org.OData.Core.V1.Computed"],
-				bIsVisible = !oAnnotations["@com.sap.vocabularies.UI.v1.Hidden"],
-				bIsComputedDefaultValue = oAnnotations["@Org.OData.Core.V1.ComputedDefaultValue"],
-				bIsKeyComputedDefaultValueWithText =
-					bIsKey && oEntityType[item].$Type === "Edm.Guid"
-						? bIsComputedDefaultValue && oAnnotations["@com.sap.vocabularies.Common.v1.Text"]
-						: false;
-			if (
-				(bIsKeyComputedDefaultValueWithText || (bIsKey && oEntityType[item].$Type !== "Edm.Guid")) &&
-				bIsNonComputed &&
-				bIsVisible
-			) {
-				aNonComputedVisibleFields.push(item);
-			} else if (bIsImmutable && bIsNonComputed && bIsVisible) {
-				aImmutableVisibleFields.push(item);
-			}
-
-			if (!bIsNonComputed && bIsComputedDefaultValue && oView) {
-				const oDiagnostics = getAppComponent(oView).getDiagnostics();
-				const sMessage = "Core.ComputedDefaultValue is ignored as Core.Computed is already set to true";
-				oDiagnostics.addIssue(
-					IssueCategory.Annotation,
-					IssueSeverity.Medium,
-					sMessage,
-					IssueCategoryType,
-					IssueCategoryType?.Annotations?.IgnoredAnnotation
-				);
-			}
-		}
-	}
-	const aRequiredProperties = CommonUtils.getRequiredPropertiesFromInsertRestrictions(sPath, metaModelContext);
-	if (aRequiredProperties.length) {
-		aRequiredProperties.forEach(function (sProperty: string) {
-			const oAnnotations = metaModelContext.getObject(`${sPath}/${sProperty}@`) as Record<string, unknown>,
-				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: string, metaModelContext: ODataMetaModel, bCheckUpdateRestrictions = false) {
-	const aRequiredProperties: string[] = [];
-	let aRequiredPropertiesWithPaths: { $PropertyPath: string }[] = [];
-	const navigationText = "$NavigationPropertyBinding";
-	let oEntitySetAnnotations;
-	if (sPath.endsWith("$")) {
-		// if sPath comes with a $ in the end, removing it as it is of no significance
-		sPath = sPath.replace("/$", "");
-	}
-	const entityTypePathParts = sPath.replaceAll("%2F", "/").split("/").filter(ModelHelper.filterOutNavPropBinding);
-	const entitySetPath = ModelHelper.getEntitySetPath(sPath, metaModelContext);
-	const entitySetPathParts = entitySetPath.split("/").filter(ModelHelper.filterOutNavPropBinding);
-	const isContainment = metaModelContext.getObject(`/${entityTypePathParts.join("/")}/$ContainsTarget`);
-	const containmentNavPath = isContainment && entityTypePathParts[entityTypePathParts.length - 1];
-
-	//Restrictions directly at Entity Set
-	//e.g. FR in "NS.EntityContainer/SalesOrderManage" ContextPath: /SalesOrderManage
-	if (!isContainment) {
-		oEntitySetAnnotations = metaModelContext.getObject(`${entitySetPath}@`);
-	}
-	if (entityTypePathParts.length > 1) {
-		const navPath = isContainment ? containmentNavPath : entitySetPathParts[entitySetPathParts.length - 1];
-		const parentEntitySetPath = isContainment ? entitySetPath : `/${entitySetPathParts.slice(0, -1).join(`/${navigationText}/`)}`;
-		//Navigation restrictions
-		//e.g. Parent "/Customer" with NavigationPropertyPath="Set" ContextPath: Customer/Set
-		const oNavRest = CommonUtils.getNavigationRestrictions(metaModelContext, parentEntitySetPath, navPath.replaceAll("%2F", "/"));
-
-		if (oNavRest !== undefined && CommonUtils.hasRestrictedPropertiesInAnnotations(oNavRest, true, bCheckUpdateRestrictions)) {
-			aRequiredPropertiesWithPaths = bCheckUpdateRestrictions
-				? oNavRest["UpdateRestrictions"]!.RequiredProperties || []
-				: oNavRest["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) {
-		const sProperty = oRequiredProperty.$PropertyPath;
-		aRequiredProperties.push(sProperty);
-	});
-	return aRequiredProperties;
-}
-
-function getRequiredPropertiesFromInsertRestrictions(sPath: string, oMetaModelContext: ODataMetaModel) {
-	return CommonUtils.getRequiredProperties(sPath, oMetaModelContext);
-}
-
-function getRequiredPropertiesFromUpdateRestrictions(sPath: string, oMetaModelContext: ODataMetaModel) {
-	return CommonUtils.getRequiredProperties(sPath, oMetaModelContext, true);
-}
-
-function getRequiredPropertiesFromAnnotations(oAnnotations: MetaModelEntitySetAnnotation, bCheckUpdateRestrictions = false) {
-	if (bCheckUpdateRestrictions) {
-		return oAnnotations["@Org.OData.Capabilities.V1.UpdateRestrictions"]?.RequiredProperties || [];
-	}
-	return oAnnotations["@Org.OData.Capabilities.V1.InsertRestrictions"]?.RequiredProperties || [];
-}
-
-function hasRestrictedPropertiesInAnnotations(
-	oAnnotations: MetaModelType<NavigationPropertyRestrictionTypes> | MetaModelEntitySetAnnotation | undefined,
-	bIsNavigationRestrictions = false,
-	bCheckUpdateRestrictions = false
-) {
-	if (bIsNavigationRestrictions) {
-		const oNavAnnotations = oAnnotations as MetaModelType<NavigationPropertyRestrictionTypes>;
-		if (bCheckUpdateRestrictions) {
-			return oNavAnnotations && oNavAnnotations["UpdateRestrictions"] && oNavAnnotations["UpdateRestrictions"].RequiredProperties
-				? true
-				: false;
-		}
-		return oNavAnnotations && oNavAnnotations["InsertRestrictions"] && oNavAnnotations["InsertRestrictions"].RequiredProperties
-			? true
-			: false;
-	} else if (bCheckUpdateRestrictions) {
-		const oEntityAnnotation = oAnnotations as MetaModelEntitySetAnnotation;
-		return oEntityAnnotation &&
-			oEntityAnnotation["@Org.OData.Capabilities.V1.UpdateRestrictions"] &&
-			oEntityAnnotation["@Org.OData.Capabilities.V1.UpdateRestrictions"].RequiredProperties
-			? true
-			: false;
-	}
-	const oEntityAnnotation = oAnnotations as MetaModelEntitySetAnnotation;
-	return oEntityAnnotation &&
-		oEntityAnnotation["@Org.OData.Capabilities.V1.InsertRestrictions"] &&
-		oEntityAnnotation["@Org.OData.Capabilities.V1.InsertRestrictions"].RequiredProperties
-		? true
-		: false;
-}
-
 type UserDefaultParameter = {
 	$Name: string;
 	getPath?(): string;
@@ -2030,8 +1657,7 @@ async function setUserDefaults(
 				} else if (oStartupParameters[sParameterName]) {
 					oModel.setProperty(sPropertyName, oStartupParameters[sParameterName][0]);
 				} else if (aExtendedParameters.length > 0) {
-					for (const i in aExtendedParameters) {
-						const oExtendedParameter = aExtendedParameters[i];
+					for (const oExtendedParameter of aExtendedParameters) {
 						if (oExtendedParameter.PropertyName === sParameterName) {
 							const oRange = oExtendedParameter.Ranges.length
 								? oExtendedParameter.Ranges[oExtendedParameter.Ranges.length - 1]
@@ -2298,6 +1924,7 @@ async function fnUpdateSemanticTargetsModel(
 				);
 				return oFinalSemanticObjects;
 			}
+			return;
 		})
 		.catch(function (oError: unknown) {
 			Log.error("fnUpdateSemanticTargetsModel: Cannot read links", oError as string);
@@ -2355,9 +1982,9 @@ function fnGetSemanticTargetsFromPageModel(oController: PageController, sPageMod
 			return list;
 		}
 		if (obj instanceof Array) {
-			for (const i in obj) {
-				list = list.concat(_fnfindValuesHelper(obj[i], key, []));
-			}
+			obj.forEach((item) => {
+				list = list.concat(_fnfindValuesHelper(item, key, []));
+			});
 			return list;
 		}
 		if (obj[key]) {
@@ -2530,7 +2157,7 @@ function getFilterRestrictionsByPath(entityPath: string, oContext: ODataMetaMode
 	const entitySetPath = ModelHelper.getEntitySetPath(entityPath, oContext);
 	const entitySetPathParts = entitySetPath.split("/").filter(ModelHelper.filterOutNavPropBinding);
 	const isContainment = oContext.getObject(`${entityTypePath}$ContainsTarget`);
-	const containmentNavPath = isContainment && entityTypePathParts[entityTypePathParts.length - 1];
+	const containmentNavPath = !!isContainment && entityTypePathParts[entityTypePathParts.length - 1];
 
 	//LEAST PRIORITY - Filter restrictions directly at Entity Set
 	//e.g. FR in "NS.EntityContainer/SalesOrderManage" ContextPath: /SalesOrderManage
@@ -2546,7 +2173,7 @@ function getFilterRestrictionsByPath(entityPath: string, oContext: ODataMetaMode
 	}
 
 	if (entityTypePathParts.length > 1) {
-		const navPath = isContainment ? containmentNavPath : entitySetPathParts[entitySetPathParts.length - 1];
+		const navPath = isContainment ? (containmentNavPath as string) : entitySetPathParts[entitySetPathParts.length - 1];
 		// In case of containment we take entitySet provided as parent. And in case of normal we would remove the last navigation from entitySetPath.
 		const parentEntitySetPath = isContainment ? entitySetPath : `/${entitySetPathParts.slice(0, -1).join(`/${navigationText}/`)}`;
 		//THIRD HIGHEST PRIORITY - Reading property path restrictions - Annotation at main entity but directly on navigation property path
@@ -2591,7 +2218,7 @@ function getFilterRestrictionsByPath(entityPath: string, oContext: ODataMetaMode
 
 		//SECOND HIGHEST priority - Navigation restrictions
 		//e.g. Parent "/Customer" with NavigationPropertyPath="Set" ContextPath: Customer/Set
-		const oNavRestrictions = CommonUtils.getNavigationRestrictions(oContext, parentEntitySetPath, navPath.replaceAll("%2F", "/"));
+		const oNavRestrictions = MetaModelFunction.getNavigationRestrictions(oContext, parentEntitySetPath, navPath.replaceAll("%2F", "/"));
 		const oNavFilterRest = oNavRestrictions && (oNavRestrictions["FilterRestrictions"] as MetaModelType<FilterRestrictionsType>);
 		const navResReqProps = getFilterRestrictions(oNavFilterRest, "RequiredProperties") || [];
 		oRet.RequiredProperties = uniqueSort(oRet.RequiredProperties.concat(navResReqProps));
@@ -2660,7 +2287,7 @@ async function templateControlFragment(
 			.then(async function (oFragment: Element): Promise<Element | Control | Control[]> {
 				const oControl = oFragment.firstElementChild;
 				if (!!oOptions.isXML && oControl) {
-					return Promise.resolve(oControl);
+					return oControl;
 				}
 				return Fragment.load({
 					id: oOptions.id,
@@ -2673,7 +2300,7 @@ async function templateControlFragment(
 
 function getSingletonPath(path: string, metaModel: ODataMetaModel): string | undefined {
 	const parts = path.split("/").filter(Boolean),
-		propertyName = parts.pop(),
+		propertyName = parts.pop()!,
 		navigationPath = parts.join("/"),
 		entitySet = navigationPath && metaModel.getObject(`/${navigationPath}`);
 	if (entitySet?.$kind === "Singleton") {
@@ -2722,6 +2349,7 @@ function addEventToBindingInfo(oControl: Control, sEventName: string, fHandler:
 			.then(function () {
 				oBindingInfo = oControl.getControlDelegate()._getChart(oControl).getBindingInfo("data");
 				setBindingInfo();
+				return;
 			})
 			.catch(function (sError: unknown) {
 				Log.error(sError as string);
@@ -2786,14 +2414,118 @@ function _fntranslatedTextFromExpBindingString(expBinding: string, control: Cont
 function isSmallDevice() {
 	return !system.desktop || Device.resize.width <= 320;
 }
+/**
+ * Get filter information for a SelectionVariant annotation.
+ *
+ * @param oControl The table/chart instance
+ * @param selectionVariantPath Relative SelectionVariant annotation path
+ * @param isChart
+ * @returns Information on filters
+ *  filters: array of sap.ui.model.filters
+ * text: Text property of the SelectionVariant
+ * @private
+ * @ui5-restricted
+ */
+interface ISelectionOption {
+	PropertyName: { $PropertyPath: string };
+	Ranges: {
+		[key: string]: {
+			Option: { $EnumMember: String };
+			Low: unknown;
+			High: unknown;
+		};
+	};
+}
+function getFiltersInfoForSV(oControl: Control | MDCChart | MDCTable, selectionVariantPath: string, isChart?: boolean) {
+	const sEntityTypePath = oControl.data("entityType"),
+		oMetaModel = CommonUtils.getAppComponent(oControl as Control).getMetaModel(),
+		mPropertyFilters: Record<string, Filter[]> = {},
+		aFilters = [],
+		aPaths: string[] = [];
+	let sText = "";
+	let oSelectionVariant = oMetaModel.getObject(`${sEntityTypePath}${selectionVariantPath}`);
+	// for chart the structure varies hence read it from main object
+	if (isChart) {
+		oSelectionVariant = oSelectionVariant.SelectionVariant;
+	}
+	if (oSelectionVariant) {
+		sText = oSelectionVariant.Text;
+		(oSelectionVariant.SelectOptions || [])
+			.filter(function (oSelectOption: ISelectionOption) {
+				return oSelectOption && oSelectOption.PropertyName && oSelectOption.PropertyName.$PropertyPath;
+			})
+			.forEach(function (oSelectOption: ISelectionOption) {
+				const sPath = oSelectOption.PropertyName.$PropertyPath;
+				if (!aPaths.includes(sPath)) {
+					aPaths.push(sPath);
+				}
+				for (const j in oSelectOption.Ranges) {
+					const oRange = oSelectOption.Ranges[j];
+					mPropertyFilters[sPath] = (mPropertyFilters[sPath] || []).concat(
+						new Filter(sPath, oRange.Option?.$EnumMember?.split("/").pop() as undefined, oRange.Low, oRange.High)
+					);
+				}
+			});
+
+		for (const sPropertyPath in mPropertyFilters) {
+			aFilters.push(
+				new Filter({
+					filters: mPropertyFilters[sPropertyPath],
+					and: false
+				})
+			);
+		}
+	}
+
+	return {
+		properties: aPaths,
+		filters: aFilters,
+		text: sText
+	};
+}
 
 function getConverterContextForPath(sMetaPath: string, oMetaModel: ODataMetaModel, sEntitySet: string, oDiagnostics: Diagnostics) {
 	const oContext = oMetaModel.createBindingContext(sMetaPath) as ODataV4Context;
 	return ConverterContext?.createConverterContextForMacro(sEntitySet, oContext || oMetaModel, oDiagnostics, mergeObjects, undefined);
 }
 
+/**
+ * This function returns an ID which should be used in the internal chart for the measure or dimension.
+ * For standard cases, this is just the ID of the property.
+ * If it is necessary to use another ID internally inside the chart (e.g. on duplicate property IDs) this method can be overwritten.
+ * In this case, <code>getPropertyFromNameAndKind</code> needs to be overwritten as well.
+ *
+ * @param name ID of the property
+ * @param kind Type of the property (measure or dimension)
+ * @returns Internal ID for the sap.chart.Chart
+ * @private
+ * @ui5-restricted
+ */
+function getInternalChartNameFromPropertyNameAndKind(name: string, kind: string) {
+	return name.replace("_fe_" + kind + "_", "");
+}
+
+/**
+ * This function returns an array of chart properties by remvoing _fe_groupable prefix.
+ *
+ * @param {Array} aFilters Chart filter properties
+ * @returns Chart properties without prefixes
+ * @private
+ * @ui5-restricted
+ */
+interface IFilterProp {
+	sPath: string;
+}
+function getChartPropertiesWithoutPrefixes(aFilters: IFilterProp[]) {
+	aFilters.forEach((element: IFilterProp) => {
+		if (element.sPath && element.sPath.includes("fe_groupable")) {
+			element.sPath = CommonUtils.getInternalChartNameFromPropertyNameAndKind(element.sPath, "groupable");
+		}
+	});
+	return aFilters;
+}
+
 const CommonUtils = {
-	isPropertyFilterable: isPropertyFilterable,
 	isFieldControlPathInapplicable: isFieldControlPathInapplicable,
 	removeSensitiveData: removeSensitiveData,
 	fireButtonPress: fnFireButtonPress,
@@ -2807,7 +2539,6 @@ const CommonUtils = {
 	getContextPathProperties: fnGetContextPathProperties,
 	getParameterInfo: getParameterInfo,
 	updateDataFieldForIBNButtonsVisibility: fnUpdateDataFieldForIBNButtonsVisibility,
-	getTranslatedText: getTranslatedText,
 	getEntitySetName: getEntitySetName,
 	getActionPath: getActionPath,
 	computeDisplayMode: computeDisplayMode,
@@ -2819,7 +2550,6 @@ const CommonUtils = {
 	addExternalStateFiltersToSelectionVariant: addExternalStateFiltersToSelectionVariant,
 	addPageContextToSelectionVariant: addPageContextToSelectionVariant,
 	addDefaultDisplayCurrency: addDefaultDisplayCurrency,
-	getNonComputedVisibleFields: getNonComputedVisibleFields,
 	setUserDefaults: setUserDefaults,
 	getShellServices: getShellServices,
 	getHash: getHash,
@@ -2831,10 +2561,7 @@ const CommonUtils = {
 	getSemanticTargetsFromPageModel: fnGetSemanticTargetsFromPageModel,
 	getSemanticObjectsFromPath: fnGetSemanticObjectsFromPath,
 	updateSemanticTargets: fnUpdateSemanticTargetsModel,
-	getPropertyDataType: getPropertyDataType,
 	waitForContextRequested: waitForContextRequested,
-	getNavigationRestrictions: getNavigationRestrictions,
-	getSearchRestrictions: getSearchRestrictions,
 	getFilterRestrictionsByPath: getFilterRestrictionsByPath,
 	getSpecificAllowedExpression: getSpecificAllowedExpression,
 	getAdditionalParamsForCreate: getAdditionalParamsForCreate,
@@ -2849,12 +2576,6 @@ const CommonUtils = {
 	AllowedExpressionsPrio: ["SingleValue", "MultiValue", "SingleRange", "MultiRange", "SearchExpression", "MultiRangeOrSearchExpression"],
 	normalizeSearchTerm: normalizeSearchTerm,
 	getSingletonPath: getSingletonPath,
-	getRequiredPropertiesFromUpdateRestrictions: getRequiredPropertiesFromUpdateRestrictions,
-	getRequiredPropertiesFromInsertRestrictions: getRequiredPropertiesFromInsertRestrictions,
-	hasRestrictedPropertiesInAnnotations: hasRestrictedPropertiesInAnnotations,
-	getRequiredPropertiesFromAnnotations: getRequiredPropertiesFromAnnotations,
-	getRequiredProperties: getRequiredProperties,
-	checkIfResourceKeyExists: checkIfResourceKeyExists,
 	setContextsBasedOnOperationAvailable: setContextsBasedOnOperationAvailable,
 	setDynamicActionContexts: setDynamicActionContexts,
 	requestProperty: requestProperty,
@@ -2866,7 +2587,9 @@ const CommonUtils = {
 	createSemanticDatesFromConditions: createSemanticDatesFromConditions,
 	updateRelateAppsModel: updateRelateAppsModel,
 	getSemanticObjectAnnotations: _getSemanticObjectAnnotations,
-	isCustomAggregate: _isCustomAggregate,
+	getFiltersInfoForSV: getFiltersInfoForSV,
+	getInternalChartNameFromPropertyNameAndKind: getInternalChartNameFromPropertyNameAndKind,
+	getChartPropertiesWithoutPrefixes: getChartPropertiesWithoutPrefixes,
 	isSmallDevice,
 	getConverterContextForPath
 };