@sapui5/sap.fe.core 1.102.0 → 1.103.0

package/src/sap/fe/core/helpers/MassEditHelper.ts

@@ -1,12 +1,29 @@
 import Log from "sap/base/Log";
 import CommonUtils from "sap/fe/core/CommonUtils";
-import { BindingExpression, ExpressionOrPrimitive } from "sap/fe/core/helpers/BindingExpression";
+import {
+	BindingToolkitExpression,
+	CompiledBindingToolkitExpression,
+	compileExpression,
+	constant,
+	ifElse,
+	not,
+	or,
+	pathInModel
+} from "sap/fe/core/helpers/BindingToolkit";
 import FELibrary from "sap/fe/core/library";
-import PageController from "sap/fe/core/PageController";
-import { DataModelObjectPath, enhanceDataModelPath } from "sap/fe/core/templating/DataModelPathHelper";
-import { hasValueHelpWithFixedValues } from "sap/fe/core/templating/PropertyHelper";
+import type PageController from "sap/fe/core/PageController";
+import type { DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
+import { enhanceDataModelPath } from "sap/fe/core/templating/DataModelPathHelper";
+import {
+	getAssociatedUnitProperty,
+	getAssociatedUnitPropertyPath,
+	hasCurrency,
+	hasUnit,
+	hasValueHelp,
+	hasValueHelpWithFixedValues
+} from "sap/fe/core/templating/PropertyHelper";
 import { getTextBinding, setEditStyleProperties } from "sap/fe/macros/field/FieldTemplating";
-import { FieldProperties } from "sap/fe/macros/internal/Field.metadata";
+import type { FieldProperties } from "sap/fe/macros/internal/Field.metadata";
 import Button from "sap/m/Button";
 import Dialog from "sap/m/Dialog";
 import MessageToast from "sap/m/MessageToast";
@@ -15,16 +32,17 @@ import Fragment from "sap/ui/core/Fragment";
 import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
 import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
 import EditMode from "sap/ui/mdc/enum/EditMode";
-import Table from "sap/ui/mdc/Table";
+import type Table from "sap/ui/mdc/Table";
 import JSONModel from "sap/ui/model/json/JSONModel";
-import Context from "sap/ui/model/odata/v4/Context";
-import ODataListBinding from "sap/ui/model/odata/v4/ODataListBinding";
-import { CoreEx } from "types/extension_types";
-import Any, { AnyType } from "../controls/Any";
+import type Context from "sap/ui/model/odata/v4/Context";
+import type ODataListBinding from "sap/ui/model/odata/v4/ODataListBinding";
+import type { CoreEx } from "types/extension_types";
+import type { AnyType } from "../controls/Any";
+import Any from "../controls/Any";
 import { convertMetaModelContext, getInvolvedDataModelObjects } from "../converters/MetaModelConverter";
 import { isReadOnlyExpression } from "../templating/FieldControlHelper";
 import { getEditMode, getRequiredExpression, isCollectionField } from "../templating/UIFormatters";
-import { InternalModelContext } from "./ModelHelper";
+import type { InternalModelContext } from "./ModelHelper";
 
 /* This class contains helpers to be used for mass edit functionality */
 type TextArrangementInfo = {
@@ -47,9 +65,9 @@ const MassEditHelper = {
 	 * Initializes the value at final or deepest level path with a blank array.
 	 * Return an empty array pointing to the final or deepest level path.
 	 *
-	 * @param {string} sPath Property path
-	 * @param {Array} aValues Array instance where the default data needs to be added
-	 * @returns {Array}
+	 * @param sPath Property path
+	 * @param aValues Array instance where the default data needs to be added
+	 * @returns The final path
 	 */
 	initLastLevelOfPropertyPath: function (sPath: string, aValues: any /*, transCtx: Context */) {
 		let aFinalPath: any;
@@ -63,7 +81,7 @@ const MassEditHelper = {
 				sFullPath = sFullPath + sPropertyPath;
 				index++;
 			} else if (!aFinalPath[sPropertyPath]) {
-				sFullPath = sFullPath + "/" + sPropertyPath;
+				sFullPath = `${sFullPath}/${sPropertyPath}`;
 				if (sFullPath !== sPath) {
 					aFinalPath[sPropertyPath] = {};
 					aFinalPath = aFinalPath[sPropertyPath];
@@ -78,10 +96,10 @@ const MassEditHelper = {
 	/**
 	 * Method to get unique values for given array values.
 	 *
-	 * @param {string} sValue Property value
-	 * @param {number} index Index of the property value
-	 * @param {Array} self Instance of the array
-	 * @returns {boolean}
+	 * @param sValue Property value
+	 * @param index Index of the property value
+	 * @param self Instance of the array
+	 * @returns The unique value
 	 */
 	getUniqueValues: function (sValue: string, index: number, self: any[]) {
 		if (sValue != undefined && sValue != null) {
@@ -93,9 +111,9 @@ const MassEditHelper = {
 	 * Gets the property value for a multi-level path (for example: _Materials/Material_Details gets the value of Material_Details under _Materials Object).
 	 * Returns the propertyValue, which can be of any type (string, number, etc..).
 	 *
-	 * @param {string} sDataPropertyPath Property path
-	 * @param {object} oValues Object of property values
-	 * @returns {*}
+	 * @param sDataPropertyPath Property path
+	 * @param oValues Object of property values
+	 * @returns The property value
 	 */
 	getValueForMultiLevelPath: function (sDataPropertyPath: string, oValues: any) {
 		if (sDataPropertyPath && sDataPropertyPath.indexOf("/") > 0) {
@@ -115,9 +133,9 @@ const MassEditHelper = {
 	 * => If propertyValue for all selected contexts is empty, then < Leave Blank > is preselected.
 	 *
 	 *
-	 * @param {Array} aContexts Contexts for mass edit
-	 * @param {string} sDataPropertyPath Data property path
-	 * @returns {string}
+	 * @param aContexts Contexts for mass edit
+	 * @param sDataPropertyPath Data property path
+	 * @returns The key path
 	 */
 	getDefaultSelectionPathComboBox: function (aContexts: any[], sDataPropertyPath: string) {
 		if (sDataPropertyPath && aContexts.length > 0) {
@@ -133,11 +151,11 @@ const MassEditHelper = {
 			});
 			const aUniquePropertyValues = aPropertyValues.filter(MassEditHelper.getUniqueValues);
 			if (aUniquePropertyValues.length > 1) {
-				return "Default/" + sDataPropertyPath;
+				return `Default/${sDataPropertyPath}`;
 			} else if (aUniquePropertyValues.length === 0) {
-				return "Empty/" + sDataPropertyPath;
+				return `Empty/${sDataPropertyPath}`;
 			} else if (aUniquePropertyValues.length === 1) {
-				return sDataPropertyPath + "/" + aUniquePropertyValues[0];
+				return `${sDataPropertyPath}/${aUniquePropertyValues[0]}`;
 			}
 		}
 	},
@@ -145,9 +163,9 @@ const MassEditHelper = {
 	/**
 	 * Checks hidden annotation value [both static and path based] for table's selected context.
 	 *
-	 * @param {*} hiddenValue Hidden annotation value / path for field
-	 * @param {Array} aContexts Contexts for mass edit
-	 * @returns {boolean}
+	 * @param hiddenValue Hidden annotation value / path for field
+	 * @param aContexts Contexts for mass edit
+	 * @returns The hidden annotation value
 	 */
 	getHiddenValueForContexts: function (hiddenValue: any, aContexts: any[]) {
 		if (hiddenValue && hiddenValue.$Path) {
@@ -187,10 +205,10 @@ const MassEditHelper = {
 	/**
 	 * Get text path for the mass edit field.
 	 *
-	 * @param {string} property Property path
-	 * @param {any} textBinding Text Binding Info
-	 * @param {string} displayMode Display mode
-	 * @returns {string | undefined} Text Property Path if it exists
+	 * @param property Property path
+	 * @param textBinding Text Binding Info
+	 * @param displayMode Display mode
+	 * @returns Text Property Path if it exists
 	 */
 	getTextPath: function (property: string, textBinding: any, displayMode: string): string | undefined {
 		let descriptionPath;
@@ -211,16 +229,16 @@ const MassEditHelper = {
 	/**
 	 * Initializes a JSON Model for properties of dialog fields [label, visiblity, dataproperty, etc.].
 	 *
-	 * @param {object} oTable Instance of Table
-	 * @param {Array} aContexts Contexts for mass edit
-	 * @param {Array} aDataArray Array containing data related to the dialog used by both the static and the runtime model
-	 * @returns {object}
+	 * @param oTable Instance of Table
+	 * @param aContexts Contexts for mass edit
+	 * @param aDataArray Array containing data related to the dialog used by both the static and the runtime model
+	 * @returns The model
 	 */
 	prepareDataForDialog: function (oTable: Table, aContexts: any[], aDataArray: any[]) {
 		const oMetaModel = oTable && (oTable.getModel().getMetaModel() as any),
 			sCurrentEntitySetName = oTable.data("metaPath"),
 			aTableFields = MassEditHelper.getTableFields(oTable),
-			oEntityTypeContext = oMetaModel.getContext(sCurrentEntitySetName + "/@"),
+			oEntityTypeContext = oMetaModel.getContext(`${sCurrentEntitySetName}/@`),
 			oEntitySetContext = oMetaModel.getContext(sCurrentEntitySetName),
 			oDataModelObjectPath = getInvolvedDataModelObjects(oEntityTypeContext);
 
@@ -235,28 +253,12 @@ const MassEditHelper = {
 		aTableFields.forEach(function (oColumnInfo: any) {
 			const sDataPropertyPath = oColumnInfo.dataProperty;
 			if (sDataPropertyPath) {
-				let oPropertyInfo = sDataPropertyPath && oMetaModel.getObject(sCurrentEntitySetName + "/" + sDataPropertyPath + "@");
-				bValueHelpEnabled =
-					sDataPropertyPath &&
-					oMetaModel.getObject(sCurrentEntitySetName + "/" + sDataPropertyPath + "@") &&
-					oMetaModel.getObject(sCurrentEntitySetName + "/" + sDataPropertyPath + "@")[
-						"@com.sap.vocabularies.Common.v1.ValueList"
-					];
-				sUnitPropertyPath =
-					(oPropertyInfo && oPropertyInfo["@Org.OData.Measures.V1.Unit"] && oPropertyInfo["@Org.OData.Measures.V1.Unit"].$Path) ||
-					(oPropertyInfo &&
-						oPropertyInfo["@Org.OData.Measures.V1.ISOCurrency"] &&
-						oPropertyInfo["@Org.OData.Measures.V1.ISOCurrency"].$Path);
+				let oPropertyInfo = sDataPropertyPath && oMetaModel.getObject(`${sCurrentEntitySetName}/${sDataPropertyPath}@`);
 				sLabelText =
 					oColumnInfo.label ||
 					(oPropertyInfo && oPropertyInfo["@com.sap.vocabularies.Common.v1.Label"]) ||
 					oColumnInfo.dataProperty;
-				bValueHelpEnabledForUnit =
-					sUnitPropertyPath &&
-					oMetaModel.getObject(sCurrentEntitySetName + "/" + sUnitPropertyPath + "@") &&
-					oMetaModel.getObject(sCurrentEntitySetName + "/" + sUnitPropertyPath + "@")[
-						"@com.sap.vocabularies.Common.v1.ValueList"
-					];
+
 				if (oDataModelObjectPath) {
 					oDataModelObjectPath.targetObject = oDataModelObjectPath.targetEntityType.entityProperties.filter(function (
 						oProperty: any
@@ -268,7 +270,7 @@ const MassEditHelper = {
 				oTextBinding = getTextBinding(oDataModelObjectPath, {}, true) || {};
 				const oFieldContext = oMetaModel.getContext(oColumnInfo.annotationPath),
 					oDataFieldConverted = convertMetaModelContext(oFieldContext),
-					oPropertyContext = oMetaModel.getContext(sCurrentEntitySetName + "/" + sDataPropertyPath + "@"),
+					oPropertyContext = oMetaModel.getContext(`${sCurrentEntitySetName}/${sDataPropertyPath}@`),
 					oInterface = oPropertyContext && oPropertyContext.getInterface();
 
 				let oDataModelPath = getInvolvedDataModelObjects(oFieldContext, oEntitySetContext);
@@ -287,7 +289,7 @@ const MassEditHelper = {
 						return oInterface.getModel();
 					},
 					getPath: function () {
-						return sCurrentEntitySetName + "/" + sDataPropertyPath;
+						return `${sCurrentEntitySetName}/${sDataPropertyPath}`;
 					}
 				};
 				oPropertyInfo =
@@ -305,9 +307,16 @@ const MassEditHelper = {
 					return;
 				}
 
+				// ValueHelp properties
+				bValueHelpEnabled = hasValueHelp(oPropertyInfo);
+				sUnitPropertyPath =
+					((hasCurrency(oPropertyInfo) || hasUnit(oPropertyInfo)) && getAssociatedUnitPropertyPath(oPropertyInfo)) || "";
+				const unitPropertyInfo = sUnitPropertyPath && getAssociatedUnitProperty(oPropertyInfo);
+				bValueHelpEnabledForUnit = unitPropertyInfo && hasValueHelp(unitPropertyInfo);
+
 				// EditMode and InputType
 				const propertyForFieldControl = oPropertyInfo && oPropertyInfo.Value ? oPropertyInfo.Value : oPropertyInfo;
-				const expBinding = getEditMode(propertyForFieldControl, oDataModelPath, false, false, oDataFieldConverted, true);
+				const expBinding = getEditMode(propertyForFieldControl, oDataModelPath, false, false, oDataFieldConverted, constant(true));
 				const editModeValues = Object.keys(EditMode);
 				const editModeIsStatic = !!expBinding && editModeValues.includes(expBinding as EditMode);
 				const editable = !!expBinding && ((editModeIsStatic && expBinding === EditMode.Editable) || !editModeIsStatic);
@@ -325,10 +334,11 @@ const MassEditHelper = {
 						"label": sLabelText,
 						"dataProperty": sDataPropertyPath,
 						"isValueHelpEnabled": bValueHelpEnabled ? bValueHelpEnabled : false,
-						"unitProperty": sUnitPropertyPath ? sUnitPropertyPath : false,
-						"isValueHelpEnabledForUnit": bValueHelpEnabledForUnit ? bValueHelpEnabledForUnit : false,
-						"propertyPathForValueHelp": sCurrentEntitySetName + "/" + sDataPropertyPath,
-						"propertyPathForValueHelpUnit": sCurrentEntitySetName + "/" + sUnitPropertyPath,
+						"unitProperty": sUnitPropertyPath && !sDataPropertyPath.includes("/") ? sUnitPropertyPath : false,
+						"isValueHelpEnabledForUnit":
+							bValueHelpEnabledForUnit && !sUnitPropertyPath.includes("/") ? bValueHelpEnabledForUnit : false,
+						"propertyPathForValueHelp": `${sCurrentEntitySetName}/${sDataPropertyPath}`,
+						"propertyPathForValueHelpUnit": sUnitPropertyPath && `${sCurrentEntitySetName}/${sUnitPropertyPath}`,
 						"isFieldRequired": getRequiredExpression(oPropertyInfo, oDataFieldConverted, true),
 						"defaultSelectionPath": sDataPropertyPath
 							? MassEditHelper.getDefaultSelectionPathComboBox(aContexts, sDataPropertyPath)
@@ -385,53 +395,55 @@ const MassEditHelper = {
 				? oResourceBundle.getText("C_MASS_EDIT_SAVE_BUTTON_TEXT")
 				: oResourceBundle.getText("C_MASS_EDIT_APPLY_BUTTON_TEXT"),
 			"useValueHelpValue": "< Use Value Help >",
-			"cancelButtonText": oResourceBundle.getText("C_MASS_EDIT_CANCEL_BUTTON_TEXT")
+			"cancelButtonText": oResourceBundle.getText("C_MASS_EDIT_CANCEL_BUTTON_TEXT"),
+			"noFields": oResourceBundle.getText("C_MASS_EDIT_NO_EDITABLE_FIELDS"),
+			"okButtonText": oResourceBundle.getText("C_COMMON_DIALOG_OK")
 		};
 	},
 
 	/**
 	 * Adds a suffix to the 'keep existing' property of the comboBox.
 	 *
-	 * @param {string} sInputType InputType of the field
-	 * @returns {string}
+	 * @param sInputType InputType of the field
+	 * @returns The modified string
 	 */
-	getSuffixForKeepExisiting: function (sInputType: string) {
-		let sResult = "Values";
+	// getSuffixForKeepExisiting: function (sInputType: string) {
+	// 	let sResult = "Values";
 
-		switch (sInputType) {
-			//TODO - Add for other control types as well (Radio Button, Email, Input, MDC Fields, Image etc.)
-			case "DatePicker":
-				sResult = "Dates";
-				break;
-			case "CheckBox":
-				sResult = "Settings";
-				break;
-			default:
-				sResult = "Values";
-		}
-		return sResult;
-	},
+	// 	switch (sInputType) {
+	// 		//TODO - Add for other control types as well (Radio Button, Email, Input, MDC Fields, Image etc.)
+	// 		case "DatePicker":
+	// 			sResult = "Dates";
+	// 			break;
+	// 		case "CheckBox":
+	// 			sResult = "Settings";
+	// 			break;
+	// 		default:
+	// 			sResult = "Values";
+	// 	}
+	// 	return sResult;
+	// },
 
 	/**
 	 * Adds default values to the model [Keep Existing Values, Leave Blank].
 	 *
-	 * @param {Array} aValues Array instance where the default data needs to be added
-	 * @param {Array} aContexts Contexts for mass edit
-	 * @param {object} oDefaultValues Default values from Application Manifest
-	 * @param {object} oPropertyInfo Property information
-	 * @param {boolean} bUOMField
+	 * @param aValues Array instance where the default data needs to be added
+	 * @param oDefaultValues Default values from Application Manifest
+	 * @param oPropertyInfo Property information
+	 * @param bUOMField
 	 */
-	setDefaultValuesToDialog: function (aValues: any, aContexts: any[], oDefaultValues: any, oPropertyInfo: any, bUOMField?: boolean) {
+	setDefaultValuesToDialog: function (aValues: any, oDefaultValues: any, oPropertyInfo: any, bUOMField?: boolean) {
 		const sPropertyPath = bUOMField ? oPropertyInfo.unitProperty : oPropertyInfo.dataProperty,
 			sInputType = oPropertyInfo.inputType,
 			bPropertyRequired = oPropertyInfo.isFieldRequired;
-		const sSuffixForKeepExisting = MassEditHelper.getSuffixForKeepExisiting(sInputType);
+		// const sSuffixForKeepExisting = MassEditHelper.getSuffixForKeepExisiting(sInputType);
+		const sSuffixForKeepExisting = "Values";
 		aValues.defaultOptions = aValues.defaultOptions || [];
-		//TODO - Add <<Use Value Help or control implmentation>> and related key by checking if value help is enabled for property or Unit.
-		//TODO - Add option Apply to Empty Fields only for Both Value Help and controls.
-		const bValueExistsForPropertyPath = aContexts.some(function (oSelectedContext: any) {
-			return oSelectedContext.getObject(sPropertyPath);
-		});
+		const selectOptionsExist = aValues.selectOptions && aValues.selectOptions.length > 0;
+		const keepEntry = {
+			text: `${oDefaultValues.keepExistingPrefix} ${sSuffixForKeepExisting} >`,
+			key: `Default/${sPropertyPath}`
+		};
 
 		if (sInputType === "CheckBox") {
 			const falseEntry = { text: "No", key: `${sPropertyPath}/false`, textInfo: { value: false } };
@@ -440,41 +452,38 @@ const MassEditHelper = {
 			aValues.defaultOptions.unshift(falseEntry);
 			aValues.unshift(truthyEntry);
 			aValues.defaultOptions.unshift(truthyEntry);
-		}
-
-		if (oPropertyInfo.isValueHelpEnabled || (oPropertyInfo.isValueHelpEnabledForUnit && bUOMField)) {
-			const vhdEntry = { text: oDefaultValues.useValueHelpValue, key: "UseValueHelpValue/" + sPropertyPath };
-			aValues.unshift(vhdEntry);
-			aValues.defaultOptions.unshift(vhdEntry);
-		}
-
-		if (bValueExistsForPropertyPath) {
-			if (bPropertyRequired !== "true" && !bUOMField) {
-				const clearEntry = { text: oDefaultValues.clearFieldValue, key: "ClearFieldValue/" + sPropertyPath };
-				aValues.unshift(clearEntry);
-				aValues.defaultOptions.unshift(clearEntry);
-			}
+			aValues.unshift(keepEntry);
+			aValues.defaultOptions.unshift(keepEntry);
 		} else {
-			const emptyEntry = { text: oDefaultValues.leaveBlankValue, key: "Empty/" + sPropertyPath };
-			aValues.unshift(emptyEntry);
-			aValues.defaultOptions.unshift(emptyEntry);
+			if (oPropertyInfo.isValueHelpEnabled || (oPropertyInfo.isValueHelpEnabledForUnit && bUOMField)) {
+				const vhdEntry = { text: oDefaultValues.useValueHelpValue, key: `UseValueHelpValue/${sPropertyPath}` };
+				aValues.unshift(vhdEntry);
+				aValues.defaultOptions.unshift(vhdEntry);
+			}
+			if (selectOptionsExist) {
+				if (bPropertyRequired !== "true" && !bUOMField) {
+					const clearEntry = { text: oDefaultValues.clearFieldValue, key: `ClearFieldValue/${sPropertyPath}` };
+					aValues.unshift(clearEntry);
+					aValues.defaultOptions.unshift(clearEntry);
+				}
+				aValues.unshift(keepEntry);
+				aValues.defaultOptions.unshift(keepEntry);
+			} else {
+				const emptyEntry = { text: oDefaultValues.leaveBlankValue, key: `Default/${sPropertyPath}` };
+				aValues.unshift(emptyEntry);
+				aValues.defaultOptions.unshift(emptyEntry);
+			}
 		}
-		const keepEntry = {
-			text: oDefaultValues.keepExistingPrefix + " " + sSuffixForKeepExisting + " >",
-			key: "Default/" + sPropertyPath
-		};
-		aValues.unshift(keepEntry);
-		aValues.defaultOptions.unshift(keepEntry);
 	},
 
 	/**
 	 * Get text arrangement info for a context property.
 	 *
-	 * @param {string} property Property Path
-	 * @param {string} descriptionPath Path to text association of the property
-	 * @param {string} displayMode Display mode of the property and text association
-	 * @param {Context} selectedContext Context to find the full text
-	 * @returns {TextArrangementInfo}
+	 * @param property Property Path
+	 * @param descriptionPath Path to text association of the property
+	 * @param displayMode Display mode of the property and text association
+	 * @param selectedContext Context to find the full text
+	 * @returns The text arrangement
 	 */
 	getTextArrangementInfo: function (
 		property: string,
@@ -488,25 +497,25 @@ const MassEditHelper = {
 		if (descriptionPath && property) {
 			switch (displayMode) {
 				case "Description":
-					descriptionValue = selectedContext.getObject(descriptionPath);
+					descriptionValue = selectedContext.getObject(descriptionPath) || "";
 					fullText = descriptionValue;
 					break;
 				case "Value":
-					value = selectedContext.getObject(property);
+					value = selectedContext.getObject(property) || "";
 					fullText = value;
 					break;
 				case "ValueDescription":
-					value = selectedContext.getObject(property);
-					descriptionValue = selectedContext.getObject(descriptionPath);
-					fullText = value + " (" + descriptionValue + ")";
+					value = selectedContext.getObject(property) || "";
+					descriptionValue = selectedContext.getObject(descriptionPath) || "";
+					fullText = descriptionValue ? `${value} (${descriptionValue})` : value;
 					break;
 				case "DescriptionValue":
-					value = selectedContext.getObject(property);
-					descriptionValue = selectedContext.getObject(descriptionPath);
-					fullText = descriptionValue + " (" + value + ")";
+					value = selectedContext.getObject(property) || "";
+					descriptionValue = selectedContext.getObject(descriptionPath) || "";
+					fullText = descriptionValue ? `${descriptionValue} (${value})` : value;
 					break;
 				default:
-					Log.info("Display Property not applicable: " + property);
+					Log.info(`Display Property not applicable: ${property}`);
 					break;
 			}
 		}
@@ -524,8 +533,8 @@ const MassEditHelper = {
 	/**
 	 * Return the visibility valuue for the ManagedObject Any.
 	 *
-	 * @param {AnyType} any The ManagedObject Any to be used to calculate the visible value of the binding.
-	 * @returns {boolean} Returns true if the mass edit field is editable.
+	 * @param any The ManagedObject Any to be used to calculate the visible value of the binding.
+	 * @returns Returns true if the mass edit field is editable.
 	 */
 	isEditable: function (any: AnyType): boolean {
 		const binding = any.getBinding("any");
@@ -536,25 +545,25 @@ const MassEditHelper = {
 	/**
 	 * Calculate and update the visibility of mass edit field on change of the ManagedObject Any binding.
 	 *
-	 * @param {JSONModel} oDialogDataModel Model to be used runtime.
-	 * @param {string} dataProperty Field name.
+	 * @param oDialogDataModel Model to be used runtime.
+	 * @param dataProperty Field name.
 	 */
 	onContextEditableChange: function (oDialogDataModel: JSONModel, dataProperty: string): void {
-		const objectsForVisibility = oDialogDataModel.getProperty("/values/" + dataProperty + "/objectsForVisibility") || [];
+		const objectsForVisibility = oDialogDataModel.getProperty(`/values/${dataProperty}/objectsForVisibility`) || [];
 		const editable = objectsForVisibility.some(MassEditHelper.isEditable);
 
 		if (editable) {
-			oDialogDataModel.setProperty("/values/" + dataProperty + "/visible", editable);
+			oDialogDataModel.setProperty(`/values/${dataProperty}/visible`, editable);
 		}
 	},
 
 	/**
 	 * Update Managed Object Any for visibility of the mass edit fields.
 	 *
-	 * @param {AnyType} mOToUse The ManagedObject Any to be used to calculate the visible value of the binding.
-	 * @param {JSONModel} oDialogDataModel Model to be used runtime.
-	 * @param {string} dataProperty Field name.
-	 * @param {any} values Values of the field.
+	 * @param mOToUse The ManagedObject Any to be used to calculate the visible value of the binding.
+	 * @param oDialogDataModel Model to be used runtime.
+	 * @param dataProperty Field name.
+	 * @param values Values of the field.
 	 */
 	updateOnContextChange: function (mOToUse: AnyType, oDialogDataModel: JSONModel, dataProperty: string, values: any) {
 		const binding = mOToUse.getBinding("any");
@@ -568,11 +577,11 @@ const MassEditHelper = {
 	/**
 	 * Get bound object to calculate the visibility of contexts.
 	 *
-	 * @param {BindingExpression<boolean> | ExpressionOrPrimitive<boolean>} expBinding Binding String object.
-	 * @param {object} context Context the binding value.
-	 * @returns {AnyType} The ManagedObject Any to be used to calculate the visible value of the binding.
+	 * @param expBinding Binding String object.
+	 * @param context Context the binding value.
+	 * @returns The ManagedObject Any to be used to calculate the visible value of the binding.
 	 */
-	getBoundObject: function (expBinding: BindingExpression<string> | ExpressionOrPrimitive<string>, context: Context): AnyType {
+	getBoundObject: function (expBinding: CompiledBindingToolkitExpression, context: Context): AnyType {
 		const mOToUse = new Any({ any: expBinding });
 		const model = context.getModel();
 		mOToUse.setModel(model);
@@ -584,15 +593,15 @@ const MassEditHelper = {
 	/**
 	 * Get the visibility of the field.
 	 *
-	 * @param {BindingExpression<boolean> | ExpressionOrPrimitive<boolean>} expBinding Binding String object.
-	 * @param {JSONModel} oDialogDataModel Model to be used runtime.
-	 * @param {string} dataProperty Field name.
-	 * @param {any} values Values of the field.
-	 * @param {object} context Context the binding value.
-	 * @returns {boolean} Returns true if the mass edit field is editable.
+	 * @param expBinding Binding String object.
+	 * @param oDialogDataModel Model to be used runtime.
+	 * @param dataProperty Field name.
+	 * @param values Values of the field.
+	 * @param context Context the binding value.
+	 * @returns Returns true if the mass edit field is editable.
 	 */
 	getFieldVisiblity: function (
-		expBinding: BindingExpression<string> | ExpressionOrPrimitive<string>,
+		expBinding: CompiledBindingToolkitExpression,
 		oDialogDataModel: JSONModel,
 		dataProperty: string,
 		values: any,
@@ -612,11 +621,11 @@ const MassEditHelper = {
 	 * => The model consists of values shown in the comboBox of the dialog (Leave Blank, Keep Existing Values, or any property value for the selected context, etc.)
 	 * => The model will capture runtime changes in the results property (the value entered in the comboBox).
 	 *
-	 * @param {Array} aContexts Contexts for mass edit
-	 * @param {Array} aDataArray Array containing data related to the dialog used by both the static and the runtime model
-	 * @param {object} oDefaultValues Default values from i18n
-	 * @param {Context} dialogContext Transient context for mass edit dialog.
-	 * @returns {object}
+	 * @param aContexts Contexts for mass edit
+	 * @param aDataArray Array containing data related to the dialog used by both the static and the runtime model
+	 * @param oDefaultValues Default values from i18n
+	 * @param dialogContext Transient context for mass edit dialog.
+	 * @returns The runtime model
 	 */
 	setRuntimeModelOnDialog: function (aContexts: any[], aDataArray: any[], oDefaultValues: any, dialogContext: Context) {
 		const aValues: any[] = [];
@@ -628,27 +637,28 @@ const MassEditHelper = {
 			"unitData": aUnitData,
 			"results": aResults,
 			"readablePropertyData": aReadOnlyFieldInfo,
-			"selectedKey": undefined
+			"selectedKey": undefined,
+			"noFields": oDefaultValues.noFields
 		};
 		const oDialogDataModel = new JSONModel(oData);
-		aDataArray.forEach(function (oData: any) {
+		aDataArray.forEach(function (oInData: any) {
 			let oTextInfo;
 			let sPropertyKey;
 			let sUnitPropertyName;
 			const oDistinctValueMap: any = {};
 			const oDistinctUnitMap: any = {};
-			if (oData.dataProperty && oData.dataProperty.indexOf("/") > -1) {
-				const aFinalPath = MassEditHelper.initLastLevelOfPropertyPath(oData.dataProperty, aValues /*, dialogContext */);
-				const aPropertyPaths = oData.dataProperty.split("/");
+			if (oInData.dataProperty && oInData.dataProperty.indexOf("/") > -1) {
+				const aFinalPath = MassEditHelper.initLastLevelOfPropertyPath(oInData.dataProperty, aValues /*, dialogContext */);
+				const aPropertyPaths = oInData.dataProperty.split("/");
 
 				for (const context of aContexts) {
-					const sMultiLevelPathValue = context.getObject(oData.dataProperty);
-					sPropertyKey = oData.dataProperty + "/" + sMultiLevelPathValue;
+					const sMultiLevelPathValue = context.getObject(oInData.dataProperty);
+					sPropertyKey = `${oInData.dataProperty}/${sMultiLevelPathValue}`;
 					if (!oDistinctValueMap[sPropertyKey] && aFinalPath[aPropertyPaths[aPropertyPaths.length - 1]]) {
 						oTextInfo = MassEditHelper.getTextArrangementInfo(
-							oData.dataProperty,
-							oData.descriptionPath,
-							oData.display,
+							oInData.dataProperty,
+							oInData.descriptionPath,
+							oInData.display,
 							context
 						);
 						aFinalPath[aPropertyPaths[aPropertyPaths.length - 1]].push({
@@ -664,157 +674,166 @@ const MassEditHelper = {
 				// }
 
 				aFinalPath[aPropertyPaths[aPropertyPaths.length - 1]].textInfo = {
-					descriptionPath: oData.descriptionPath,
-					valuePath: oData.dataProperty,
-					displayMode: oData.display
+					descriptionPath: oInData.descriptionPath,
+					valuePath: oInData.dataProperty,
+					displayMode: oInData.display
 				};
 			} else {
-				aValues[oData.dataProperty] = aValues[oData.dataProperty] || [];
-				aValues[oData.dataProperty]["selectOptions"] = aValues[oData.dataProperty]["selectOptions"] || [];
-				if (oData.unitProperty) {
-					aUnitData[oData.unitProperty] = aUnitData[oData.unitProperty] || [];
-					aUnitData[oData.unitProperty]["selectOptions"] = aUnitData[oData.unitProperty]["selectOptions"] || [];
+				aValues[oInData.dataProperty] = aValues[oInData.dataProperty] || [];
+				aValues[oInData.dataProperty]["selectOptions"] = aValues[oInData.dataProperty]["selectOptions"] || [];
+				if (oInData.unitProperty) {
+					aUnitData[oInData.unitProperty] = aUnitData[oInData.unitProperty] || [];
+					aUnitData[oInData.unitProperty]["selectOptions"] = aUnitData[oInData.unitProperty]["selectOptions"] || [];
 				}
 				for (const context of aContexts) {
 					const oDataObject = context.getObject();
-					sPropertyKey = oData.dataProperty + "/" + oDataObject[oData.dataProperty];
-					if (oData.dataProperty && oDataObject[oData.dataProperty] && !oDistinctValueMap[sPropertyKey]) {
-						if (oData.inputType != "CheckBox") {
+					sPropertyKey = `${oInData.dataProperty}/${oDataObject[oInData.dataProperty]}`;
+					if (oInData.dataProperty && oDataObject[oInData.dataProperty] && !oDistinctValueMap[sPropertyKey]) {
+						if (oInData.inputType != "CheckBox") {
 							oTextInfo = MassEditHelper.getTextArrangementInfo(
-								oData.dataProperty,
-								oData.descriptionPath,
-								oData.display,
+								oInData.dataProperty,
+								oInData.descriptionPath,
+								oInData.display,
 								context
 							);
 							const entry = {
-								"text": (oTextInfo && oTextInfo.fullText) || oDataObject[oData.dataProperty],
+								"text": (oTextInfo && oTextInfo.fullText) || oDataObject[oInData.dataProperty],
 								"key": sPropertyKey,
 								"textInfo": oTextInfo
 							};
-							aValues[oData.dataProperty].push(entry);
-							aValues[oData.dataProperty]["selectOptions"].push(entry);
+							aValues[oInData.dataProperty].push(entry);
+							aValues[oInData.dataProperty]["selectOptions"].push(entry);
 						}
-						oDistinctValueMap[sPropertyKey] = oDataObject[oData.dataProperty];
+						oDistinctValueMap[sPropertyKey] = oDataObject[oInData.dataProperty];
 					}
-					if (oData.unitProperty && oDataObject[oData.unitProperty]) {
-						sUnitPropertyName = oData.unitProperty + "/" + oDataObject[oData.unitProperty];
+					if (oInData.unitProperty && oDataObject[oInData.unitProperty]) {
+						sUnitPropertyName = `${oInData.unitProperty}/${oDataObject[oInData.unitProperty]}`;
 						if (!oDistinctUnitMap[sUnitPropertyName]) {
-							if (oData.inputType != "CheckBox") {
+							if (oInData.inputType != "CheckBox") {
 								oTextInfo = MassEditHelper.getTextArrangementInfo(
-									oData.unitProperty,
-									oData.descriptionPath,
-									oData.display,
+									oInData.unitProperty,
+									oInData.descriptionPath,
+									oInData.display,
 									context
 								);
 								const unitEntry = {
-									"text": (oTextInfo && oTextInfo.fullText) || oDataObject[oData.unitProperty],
+									"text": (oTextInfo && oTextInfo.fullText) || oDataObject[oInData.unitProperty],
 									"key": sUnitPropertyName,
 									"textInfo": oTextInfo
 								};
-								aUnitData[oData.unitProperty].push(unitEntry);
-								aUnitData[oData.unitProperty]["selectOptions"].push(unitEntry);
+								aUnitData[oInData.unitProperty].push(unitEntry);
+								aUnitData[oInData.unitProperty]["selectOptions"].push(unitEntry);
 							}
-							oDistinctUnitMap[sUnitPropertyName] = oDataObject[oData.unitProperty];
+							oDistinctUnitMap[sUnitPropertyName] = oDataObject[oInData.unitProperty];
 						}
 					}
 				}
-				aValues[oData.dataProperty].textInfo = {
-					descriptionPath: oData.descriptionPath,
-					valuePath: oData.dataProperty,
-					displayMode: oData.display
+				aValues[oInData.dataProperty].textInfo = {
+					descriptionPath: oInData.descriptionPath,
+					valuePath: oInData.dataProperty,
+					displayMode: oInData.display
 				};
-			}
-			if (Object.keys(oDistinctValueMap).length === 1) {
-				dialogContext.setProperty(oData.dataProperty, sPropertyKey && oDistinctValueMap[sPropertyKey]);
-			}
-			if (Object.keys(oDistinctUnitMap).length === 1) {
-				dialogContext.setProperty(oData.unitProperty, sUnitPropertyName && oDistinctUnitMap[sUnitPropertyName]);
+				if (Object.keys(oDistinctValueMap).length === 1) {
+					dialogContext.setProperty(oInData.dataProperty, sPropertyKey && oDistinctValueMap[sPropertyKey]);
+				}
+				if (Object.keys(oDistinctUnitMap).length === 1) {
+					dialogContext.setProperty(oInData.unitProperty, sUnitPropertyName && oDistinctUnitMap[sUnitPropertyName]);
+				}
 			}
 		});
-		aDataArray.forEach(function (oData: any) {
+		aDataArray.forEach(function (oInData: any) {
 			let values: any = {};
-			if (oData.dataProperty.indexOf("/") > -1) {
-				const sMultiLevelPropPathValue = MassEditHelper.getValueForMultiLevelPath(oData.dataProperty, aValues);
+			if (oInData.dataProperty.indexOf("/") > -1) {
+				const sMultiLevelPropPathValue = MassEditHelper.getValueForMultiLevelPath(oInData.dataProperty, aValues);
 				if (!sMultiLevelPropPathValue) {
-					sMultiLevelPropPathValue.push({ text: oDefaultValues.leaveBlankValue, key: "Empty/" + oData.dataProperty });
+					sMultiLevelPropPathValue.push({ text: oDefaultValues.leaveBlankValue, key: `Empty/${oInData.dataProperty}` });
 				} else {
-					MassEditHelper.setDefaultValuesToDialog(sMultiLevelPropPathValue, aContexts, oDefaultValues, oData);
+					MassEditHelper.setDefaultValuesToDialog(sMultiLevelPropPathValue, oDefaultValues, oInData);
 				}
 				values = sMultiLevelPropPathValue;
-			} else if (aValues[oData.dataProperty]) {
-				aValues[oData.dataProperty] = aValues[oData.dataProperty] || [];
-				MassEditHelper.setDefaultValuesToDialog(aValues[oData.dataProperty], aContexts, oDefaultValues, oData);
-				values = aValues[oData.dataProperty];
+			} else if (aValues[oInData.dataProperty]) {
+				aValues[oInData.dataProperty] = aValues[oInData.dataProperty] || [];
+				MassEditHelper.setDefaultValuesToDialog(aValues[oInData.dataProperty], oDefaultValues, oInData);
+				values = aValues[oInData.dataProperty];
 			}
 
-			if (aUnitData[oData.unitProperty] && aUnitData[oData.unitProperty].length) {
-				MassEditHelper.setDefaultValuesToDialog(aUnitData[oData.unitProperty], aContexts, oDefaultValues, oData, true);
-				aUnitData[oData.unitProperty].textInfo = {};
-				aUnitData[oData.unitProperty].selectedKey = MassEditHelper.getDefaultSelectionPathComboBox(aContexts, oData.unitProperty);
-				aUnitData[oData.unitProperty].inputType = oData.inputType;
+			if (aUnitData[oInData.unitProperty] && aUnitData[oInData.unitProperty].length) {
+				MassEditHelper.setDefaultValuesToDialog(aUnitData[oInData.unitProperty], oDefaultValues, oInData, true);
+				aUnitData[oInData.unitProperty].textInfo = {};
+				aUnitData[oInData.unitProperty].selectedKey = MassEditHelper.getDefaultSelectionPathComboBox(
+					aContexts,
+					oInData.unitProperty
+				);
+				aUnitData[oInData.unitProperty].inputType = oInData.inputType;
 			} else if (
-				(oData.dataProperty && aValues[oData.dataProperty] && !aValues[oData.dataProperty].length) ||
-				(oData.unitProperty && aUnitData[oData.unitProperty] && !aUnitData[oData.unitProperty].length)
+				(oInData.dataProperty && aValues[oInData.dataProperty] && !aValues[oInData.dataProperty].length) ||
+				(oInData.unitProperty && aUnitData[oInData.unitProperty] && !aUnitData[oInData.unitProperty].length)
 			) {
 				const bClearFieldOrBlankValueExists =
-					aValues[oData.dataProperty] &&
-					aValues[oData.dataProperty].some(function (obj: any) {
+					aValues[oInData.dataProperty] &&
+					aValues[oInData.dataProperty].some(function (obj: any) {
 						return obj.text === "< Clear Values >" || obj.text === "< Leave Blank >";
 					});
-				if (oData.dataProperty && !bClearFieldOrBlankValueExists) {
-					aValues[oData.dataProperty].push({ text: oDefaultValues.leaveBlankValue, key: "Empty/" + oData.dataProperty });
+				if (oInData.dataProperty && !bClearFieldOrBlankValueExists) {
+					aValues[oInData.dataProperty].push({ text: oDefaultValues.leaveBlankValue, key: `Empty/${oInData.dataProperty}` });
 				}
 				const bClearFieldOrBlankUnitValueExists =
-					aUnitData[oData.unitProperty] &&
-					aUnitData[oData.unitProperty].some(function (obj: any) {
+					aUnitData[oInData.unitProperty] &&
+					aUnitData[oInData.unitProperty].some(function (obj: any) {
 						return obj.text === "< Clear Values >" || obj.text === "< Leave Blank >";
 					});
-				if (oData.unitProperty) {
+				if (oInData.unitProperty) {
 					if (!bClearFieldOrBlankUnitValueExists) {
-						aUnitData[oData.unitProperty].push({
+						aUnitData[oInData.unitProperty].push({
 							text: oDefaultValues.leaveBlankValue,
-							key: "Empty/" + oData.unitProperty
+							key: `Empty/${oInData.unitProperty}`
 						});
 					}
-					aUnitData[oData.unitProperty].textInfo = {};
-					aUnitData[oData.unitProperty].selectedKey = MassEditHelper.getDefaultSelectionPathComboBox(
+					aUnitData[oInData.unitProperty].textInfo = {};
+					aUnitData[oInData.unitProperty].selectedKey = MassEditHelper.getDefaultSelectionPathComboBox(
 						aContexts,
-						oData.unitProperty
+						oInData.unitProperty
 					);
-					aUnitData[oData.unitProperty].inputType = oData.inputType;
+					aUnitData[oInData.unitProperty].inputType = oInData.inputType;
 				}
 			}
-			if (oData.isPropertyReadOnly && typeof oData.isPropertyReadOnly === "boolean") {
-				aReadOnlyFieldInfo.push({ "property": oData.dataProperty, value: oData.isPropertyReadOnly, type: "Default" });
+			if (oInData.isPropertyReadOnly && typeof oInData.isPropertyReadOnly === "boolean") {
+				aReadOnlyFieldInfo.push({ "property": oInData.dataProperty, value: oInData.isPropertyReadOnly, type: "Default" });
 			} else if (
-				oData.isPropertyReadOnly &&
-				oData.isPropertyReadOnly.operands &&
-				oData.isPropertyReadOnly.operands[0] &&
-				oData.isPropertyReadOnly.operands[0].operand1 &&
-				oData.isPropertyReadOnly.operands[0].operand2
+				oInData.isPropertyReadOnly &&
+				oInData.isPropertyReadOnly.operands &&
+				oInData.isPropertyReadOnly.operands[0] &&
+				oInData.isPropertyReadOnly.operands[0].operand1 &&
+				oInData.isPropertyReadOnly.operands[0].operand2
 			) {
 				// This needs to be refactored in accordance with the ReadOnlyExpression change
 				aReadOnlyFieldInfo.push({
-					"property": oData.dataProperty,
-					propertyPath: oData.isPropertyReadOnly.operands[0].operand1.path,
-					propertyValue: oData.isPropertyReadOnly.operands[0].operand2.value,
+					"property": oInData.dataProperty,
+					propertyPath: oInData.isPropertyReadOnly.operands[0].operand1.path,
+					propertyValue: oInData.isPropertyReadOnly.operands[0].operand2.value,
 					type: "Path"
 				});
 			}
 
 			// Setting visbility of the mass edit field.
-			if (oData.editMode) {
+			if (oInData.editMode) {
 				values.visible =
-					oData.editMode === EditMode.Editable ||
+					oInData.editMode === EditMode.Editable ||
 					aContexts.some(
-						MassEditHelper.getFieldVisiblity.bind(MassEditHelper, oData.editMode, oDialogDataModel, oData.dataProperty, values)
+						MassEditHelper.getFieldVisiblity.bind(
+							MassEditHelper,
+							oInData.editMode,
+							oDialogDataModel,
+							oInData.dataProperty,
+							values
+						)
 					);
 			} else {
 				values.visible = true;
 			}
-			values.selectedKey = MassEditHelper.getDefaultSelectionPathComboBox(aContexts, oData.dataProperty);
-			values.inputType = oData.inputType;
-			values.unitProperty = oData.unitProperty;
+			values.selectedKey = MassEditHelper.getDefaultSelectionPathComboBox(aContexts, oInData.dataProperty);
+			values.inputType = oInData.inputType;
+			values.unitProperty = oInData.unitProperty;
 		});
 
 		return oDialogDataModel;
@@ -822,9 +841,9 @@ const MassEditHelper = {
 	/**
 	 * Gets transient context for dialog.
 	 *
-	 * @param {Table} table Instance of Table.
-	 * @param {Dialog} dialog Mass Edit Dialog.
-	 * @returns {object} Promise returning instance of dialog.
+	 * @param table Instance of Table.
+	 * @param dialog Mass Edit Dialog.
+	 * @returns Promise returning instance of dialog.
 	 */
 	getDialogContext: function (table: Table, dialog?: Dialog): Context {
 		let transCtx: Context = (dialog && dialog.getBindingContext()) as Context;
@@ -853,10 +872,10 @@ const MassEditHelper = {
 	/**
 	 * Create the mass edit dialog.
 	 *
-	 * @param {object} oTable Instance of Table
-	 * @param {Array} aContexts Contexts for mass edit
-	 * @param {object} oController Controller for the view
-	 * @returns {object} Promise returning instance of dialog.
+	 * @param oTable Instance of Table
+	 * @param aContexts Contexts for mass edit
+	 * @param oController Controller for the view
+	 * @returns Promise returning instance of dialog.
 	 */
 	createDialog: function (oTable: Table, aContexts: any[], oController: PageController) {
 		const sFragmentName = "sap/fe/core/controls/massEdit/MassEditDialog",
@@ -883,30 +902,31 @@ const MassEditHelper = {
 					}
 				)
 			)
-				.then(function (oFragment: any) {
-					return Fragment.load({ definition: oFragment }).then(function (oDialogContent: any) {
+				.then(function (oCreatedFragment: any) {
+					return Fragment.load({ definition: oCreatedFragment }).then(function (oDialogContent: any) {
 						const DraftStatus = FELibrary.DraftStatus;
 						const oDialog = new Dialog({
+							resizable: true,
 							title: oDefaultValues.massEditTitle,
 							content: [oDialogContent],
 							afterOpen: MassEditHelper.onDialogOpen,
 							beginButton: new Button({
-								text: oDefaultValues.applyButtonText,
+								text: MassEditHelper.helpers.getExpBindingForApplyButtonTxt(oDefaultValues, oDataFieldModel.getObject("/")),
 								type: "Emphasized",
 								press: function (oEvent: any) {
 									(oController.getView()?.getBindingContext("internal") as InternalModelContext)?.setProperty(
 										"skipPatchHandlers",
 										true
 									);
-									const oDialog = oEvent.getSource().getParent();
-									const oModel = oDialog.getModel("fieldsInfo");
+									const oInDialog = oEvent.getSource().getParent();
+									const oModel = oInDialog.getModel("fieldsInfo");
 									const aResults = oModel.getProperty("/results");
 									const aPropertyReadableInfo = oModel.getProperty("/readablePropertyData");
 									const changePromise: any[] = [];
 									let bReadOnlyField = false;
 									let groupId;
 									//let index = 0;
-									let errorValues: any[] = [];
+									const errorValues: any[] = [];
 									aContexts.forEach(function (oSelectedContext: any, idx: number) {
 										aResults.forEach(function (oResult: any) {
 											//TODO - Add save implementation for Value Help.
@@ -928,7 +948,7 @@ const MassEditHelper = {
 													}
 												});
 											}
-											groupId = "$auto." + idx;
+											groupId = `$auto.${idx}`;
 											//index += 1;
 											oController._editFlow.setDraftStatus(DraftStatus.Saving);
 											//let promiseCount = 0;
@@ -948,14 +968,15 @@ const MassEditHelper = {
 										});
 									});
 
+									// eslint-disable-next-line promise/catch-or-return
 									(Promise as any).allSettled(changePromise).then(function () {
 										const oListBinding = oTable.getRowBinding();
 										const oExtensionAPI = oController && (oController.getExtensionAPI() as any);
 										return oExtensionAPI.refresh(oListBinding.getPath()).then(function () {
-											let subtitleColumn = CommonUtils.getMessageColumn(oTable);
-											let messages = sap.ui.getCore().getMessageManager().getMessageModel().getData();
-											let boundTransitionErrorContexts = [] as any;
-											messages.forEach(function (message: any, idx: any) {
+											const subtitleColumn = CommonUtils.getMessageColumn(oTable);
+											const messages = sap.ui.getCore().getMessageManager().getMessageModel().getData();
+											const boundTransitionErrorContexts = [] as any;
+											messages.forEach(function (message: any) {
 												const messageTargets = message.getTargets();
 												if (
 													messageTargets &&
@@ -963,7 +984,7 @@ const MassEditHelper = {
 													messageTargets[0].length &&
 													message.persistent === true
 												) {
-													let boundTransitionErrorContext = aContexts.find(function (oContext: any) {
+													const boundTransitionErrorContext = aContexts.find(function (oContext: any) {
 														return message.getTarget().indexOf(oContext.getPath()) !== -1;
 													});
 													boundTransitionErrorContexts.push(boundTransitionErrorContext);
@@ -972,27 +993,29 @@ const MassEditHelper = {
 														: undefined;
 												}
 											});
-											if (boundTransitionErrorContexts.length === 0 && errorValues.length === 0) {
+											if (
+												aResults.length > 0 &&
+												boundTransitionErrorContexts.length === 0 &&
+												errorValues.length === 0
+											) {
 												oController._editFlow.setDraftStatus(DraftStatus.Saved);
 												const successToast = oResourceBundle.getText("C_MASS_EDIT_SUCCESS_TOAST");
 												MessageToast.show(successToast);
-											} else {
-												if (
-													errorValues.length + boundTransitionErrorContexts.length <
-													(oTable as any).getSelectedContexts().length
-												) {
-													oController._editFlow.setDraftStatus(DraftStatus.Saved);
-												} else if (
-													errorValues.length + boundTransitionErrorContexts.length ===
-													(oTable as any).getSelectedContexts().length
-												) {
-													oController._editFlow.setDraftStatus(DraftStatus.Clear);
-												}
+											} else if (
+												errorValues.length + boundTransitionErrorContexts.length <
+												(oTable as any).getSelectedContexts().length
+											) {
+												oController._editFlow.setDraftStatus(DraftStatus.Saved);
+											} else if (
+												errorValues.length + boundTransitionErrorContexts.length ===
+												(oTable as any).getSelectedContexts().length
+											) {
+												oController._editFlow.setDraftStatus(DraftStatus.Clear);
 											}
 											oController._editFlow.getMessageHandler().showMessages();
-											if (oDialog.isOpen()) {
-												oDialog.close();
-												oDialog.destroy();
+											if (oInDialog.isOpen()) {
+												oInDialog.close();
+												oInDialog.destroy();
 												(oController.getView()?.getBindingContext("internal") as InternalModelContext)?.setProperty(
 													"skipPatchHandlers",
 													false
@@ -1004,10 +1027,11 @@ const MassEditHelper = {
 							}),
 							endButton: new Button({
 								text: oDefaultValues.cancelButtonText,
+								visible: MassEditHelper.helpers.hasEditableFieldsBinding(oDataFieldModel.getObject("/"), true) as any,
 								press: function (oEvent: any) {
-									const oDialog = oEvent.getSource().getParent();
-									oDialog.close();
-									oDialog.destroy();
+									const oInDialog = oEvent.getSource().getParent();
+									oInDialog.close();
+									oInDialog.destroy();
 								}
 							})
 						});
@@ -1020,6 +1044,30 @@ const MassEditHelper = {
 				})
 				.catch(reject);
 		});
+	},
+
+	helpers: {
+		getBindingExpForHasEditableFields: (fields: any, editable: boolean) => {
+			const totalExp = fields.reduce(
+				(expression: any, field: any) =>
+					or(
+						expression,
+						pathInModel("/values/" + field.dataProperty + "/visible", "fieldsInfo") as BindingToolkitExpression<boolean>
+					),
+				constant(false)
+			);
+			return editable ? totalExp : not(totalExp);
+		},
+
+		getExpBindingForApplyButtonTxt: (defaultValues: any, fields: boolean) => {
+			const editableExp = MassEditHelper.helpers.getBindingExpForHasEditableFields(fields, true);
+			const totalExp = ifElse(editableExp, constant(defaultValues.applyButtonText), constant(defaultValues.okButtonText));
+			return compileExpression(totalExp);
+		},
+
+		hasEditableFieldsBinding: (fields: any, editable: boolean) => {
+			return compileExpression(MassEditHelper.helpers.getBindingExpForHasEditableFields(fields, editable));
+		}
 	}
 };