@sapui5/sap.fe.core 1.101.0 → 1.103.0

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

@@ -1,26 +1,48 @@
 import Log from "sap/base/Log";
 import CommonUtils from "sap/fe/core/CommonUtils";
-import { BindingExpression, ExpressionOrPrimitive } from "sap/fe/core/helpers/BindingExpression";
-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 { FieldProperties } from "sap/fe/macros/field/FieldProperties";
+import {
+	BindingToolkitExpression,
+	CompiledBindingToolkitExpression,
+	compileExpression,
+	constant,
+	ifElse,
+	not,
+	or,
+	pathInModel
+} from "sap/fe/core/helpers/BindingToolkit";
+import FELibrary from "sap/fe/core/library";
+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 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";
 import Core from "sap/ui/core/Core";
 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 { 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 type { InternalModelContext } from "./ModelHelper";
 
 /* This class contains helpers to be used for mass edit functionality */
 type TextArrangementInfo = {
@@ -32,16 +54,22 @@ type TextArrangementInfo = {
 	fullText: string;
 };
 
+type BindingInfo = {
+	path?: string;
+	model?: string | object;
+	parameters?: Array<BindingInfo>;
+};
+
 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) {
+	initLastLevelOfPropertyPath: function (sPath: string, aValues: any /*, transCtx: Context */) {
 		let aFinalPath: any;
 		let index = 0;
 		const aPaths = sPath.split("/");
@@ -53,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];
@@ -68,13 +96,13 @@ 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) {
+		if (sValue != undefined && sValue != null) {
 			return self.indexOf(sValue) === index;
 		}
 	},
@@ -83,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) {
@@ -105,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) {
@@ -123,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;
+				return `${sDataPropertyPath}/${aUniquePropertyValues[0]}`;
 			}
 		}
 	},
@@ -135,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) {
@@ -174,19 +202,43 @@ const MassEditHelper = {
 		);
 	},
 
+	/**
+	 * Get text path for the mass edit field.
+	 *
+	 * @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;
+		if (textBinding && (textBinding.path || (textBinding.parameters && textBinding.parameters.length)) && property) {
+			if (textBinding.path && displayMode === "Description") {
+				descriptionPath = textBinding.path;
+			} else if (textBinding.parameters) {
+				textBinding.parameters.forEach(function (props: BindingInfo) {
+					if (props.path && props.path !== property) {
+						descriptionPath = props.path;
+					}
+				});
+			}
+		}
+		return descriptionPath;
+	},
+
 	/**
 	 * 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);
 
@@ -201,25 +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);
-				sLabelText = oColumnInfo.label || (oPropertyInfo && oPropertyInfo["@com.sap.vocabularies.Common.v1.Label"]);
-				bValueHelpEnabledForUnit =
-					sUnitPropertyPath &&
-					oMetaModel.getObject(sCurrentEntitySetName + "/" + sUnitPropertyPath + "@") &&
-					oMetaModel.getObject(sCurrentEntitySetName + "/" + sUnitPropertyPath + "@")[
-						"@com.sap.vocabularies.Common.v1.ValueList"
-					];
+				let oPropertyInfo = sDataPropertyPath && oMetaModel.getObject(`${sCurrentEntitySetName}/${sDataPropertyPath}@`);
+				sLabelText =
+					oColumnInfo.label ||
+					(oPropertyInfo && oPropertyInfo["@com.sap.vocabularies.Common.v1.Label"]) ||
+					oColumnInfo.dataProperty;
+
 				if (oDataModelObjectPath) {
 					oDataModelObjectPath.targetObject = oDataModelObjectPath.targetEntityType.entityProperties.filter(function (
 						oProperty: any
@@ -231,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);
@@ -250,12 +289,14 @@ const MassEditHelper = {
 						return oInterface.getModel();
 					},
 					getPath: function () {
-						return sCurrentEntitySetName + "/" + sDataPropertyPath;
+						return `${sCurrentEntitySetName}/${sDataPropertyPath}`;
 					}
 				};
 				oPropertyInfo =
-					(oDataFieldConverted && oDataFieldConverted.Value && oDataFieldConverted.Value.$target) ||
-					(oDataFieldConverted && oDataFieldConverted.Target && oDataFieldConverted.Target.$target);
+					oDataFieldConverted._type === "Property"
+						? oDataFieldConverted
+						: (oDataFieldConverted && oDataFieldConverted.Value && oDataFieldConverted.Value.$target) ||
+						  (oDataFieldConverted && oDataFieldConverted.Target && oDataFieldConverted.Target.$target);
 				// Datafield is not included in the FieldControl calculation, needs to be implemented
 
 				const chartProperty = oPropertyInfo && oPropertyInfo.term && oPropertyInfo.term === "com.sap.vocabularies.UI.v1.Chart";
@@ -266,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);
@@ -281,15 +329,16 @@ const MassEditHelper = {
 
 				if (inputType) {
 					const isReadOnly = isReadOnlyExpression(oPropertyInfo);
-
+					const displayMode = CommonUtils.computeDisplayMode(oPropertyContext.getObject());
 					oResult = {
-						"label": sLabelText + ":",
+						"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)
@@ -298,11 +347,14 @@ const MassEditHelper = {
 							? MassEditHelper.getDefaultSelectionPathComboBox(aContexts, sUnitPropertyPath)
 							: false,
 						"entitySet": sCurrentEntitySetName,
-						"textBinding": oTextBinding,
+						"display": displayMode,
+						"descriptionPath": MassEditHelper.getTextPath(sDataPropertyPath, oTextBinding, displayMode),
 						"nullable": oPropertyInfo.nullable !== undefined ? oPropertyInfo.nullable : true,
 						"isPropertyReadOnly": isReadOnly !== undefined ? isReadOnly : false,
 						"inputType": inputType,
-						"editMode": editable ? expBinding : undefined
+						"editMode": editable ? expBinding : undefined,
+						"unitDataPath": sUnitPropertyPath && "fieldsInfo>/unitData/",
+						"valuesPath": "fieldsInfo>/values/"
 					};
 					aDataArray.push(oResult);
 				}
@@ -342,113 +394,147 @@ const MassEditHelper = {
 			"applyButtonText": bDisplayMode
 				? oResourceBundle.getText("C_MASS_EDIT_SAVE_BUTTON_TEXT")
 				: oResourceBundle.getText("C_MASS_EDIT_APPLY_BUTTON_TEXT"),
-			"cancelButtonText": oResourceBundle.getText("C_MASS_EDIT_CANCEL_BUTTON_TEXT")
+			"useValueHelpValue": "< Use Value Help >",
+			"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";
-
-		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;
-		}
-		return sResult;
-	},
+	// 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;
+	// },
 
 	/**
 	 * 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);
-		//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);
-		});
-		if (bValueExistsForPropertyPath) {
-			if (bPropertyRequired !== "true" && !bUOMField) {
-				aValues.unshift({ text: oDefaultValues.clearFieldValue, key: "ClearFieldValue/" + sPropertyPath });
-			}
+		// const sSuffixForKeepExisting = MassEditHelper.getSuffixForKeepExisiting(sInputType);
+		const sSuffixForKeepExisting = "Values";
+		aValues.defaultOptions = aValues.defaultOptions || [];
+		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 } };
+			const truthyEntry = { text: "Yes", key: `${sPropertyPath}/true`, textInfo: { value: true } };
+			aValues.unshift(falseEntry);
+			aValues.defaultOptions.unshift(falseEntry);
+			aValues.unshift(truthyEntry);
+			aValues.defaultOptions.unshift(truthyEntry);
+			aValues.unshift(keepEntry);
+			aValues.defaultOptions.unshift(keepEntry);
 		} else {
-			aValues.unshift({ text: oDefaultValues.leaveBlankValue, key: "Empty/" + sPropertyPath });
+			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);
+			}
 		}
-		aValues.unshift({
-			text: oDefaultValues.keepExistingPrefix + " " + sSuffixForKeepExisting + " >",
-			key: "Default/" + sPropertyPath
-		});
 	},
 
+	/**
+	 * Get text arrangement info for a context property.
+	 *
+	 * @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 (
-		sProperty: any,
-		oTextBinding: any,
-		sCurrentEntitySet: any,
-		oSelectedContext: any
-	): TextArrangementInfo | undefined {
-		const oMetaModel = oSelectedContext.getModel().getMetaModel();
-		const sDisplayMode = CommonUtils.computeDisplayMode(oMetaModel.getObject(sCurrentEntitySet + "/" + sProperty + "@"));
-		let sDescriptionPath, sValue, sDescriptionValue, sFullText;
-		if (oTextBinding && (oTextBinding.path || (oTextBinding.parameters && oTextBinding.parameters.length)) && sProperty) {
-			if (oTextBinding.path) {
-				if (sDisplayMode === "Description") {
-					sValue = oSelectedContext.getObject(sProperty);
-					sDescriptionValue = oSelectedContext.getObject(oTextBinding.path);
-					sFullText = sDescriptionValue;
-				} else if (sDisplayMode === "Value") {
-					sValue = oSelectedContext.getObject(sProperty);
-					sFullText = sValue;
-				}
-			} else if (oTextBinding.parameters) {
-				oTextBinding.parameters.forEach(function (oProps: any) {
-					if (oProps.path && oProps.path !== sProperty) {
-						sDescriptionPath = oProps.path;
-					}
-				});
-				sValue = oSelectedContext.getObject(sProperty);
-				sDescriptionValue = oSelectedContext.getObject(sDescriptionPath);
-				if (sDisplayMode === "ValueDescription" && sValue && sDescriptionValue) {
-					sFullText = sValue + " (" + sDescriptionValue + ")";
-				} else if (sDisplayMode === "DescriptionValue" && sDescriptionValue && sValue) {
-					sFullText = sDescriptionValue + " (" + sValue + ")";
-				}
+		property: string,
+		descriptionPath: string,
+		displayMode: string,
+		selectedContext: Context
+	): TextArrangementInfo {
+		let value = selectedContext.getObject(property),
+			descriptionValue,
+			fullText;
+		if (descriptionPath && property) {
+			switch (displayMode) {
+				case "Description":
+					descriptionValue = selectedContext.getObject(descriptionPath) || "";
+					fullText = descriptionValue;
+					break;
+				case "Value":
+					value = selectedContext.getObject(property) || "";
+					fullText = value;
+					break;
+				case "ValueDescription":
+					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 ? `${descriptionValue} (${value})` : value;
+					break;
+				default:
+					Log.info(`Display Property not applicable: ${property}`);
+					break;
 			}
-			return {
-				"textArrangement": sDisplayMode,
-				"valuePath": sProperty,
-				"descriptionPath": sDescriptionPath,
-				"value": sValue,
-				"description": sDescriptionValue,
-				"fullText": sFullText
-			};
 		}
-		return undefined;
+
+		return {
+			"textArrangement": displayMode,
+			"valuePath": property,
+			"descriptionPath": descriptionPath,
+			"value": value,
+			"description": descriptionValue,
+			"fullText": fullText
+		};
 	},
 
 	/**
 	 * 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");
@@ -459,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");
@@ -491,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);
@@ -507,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,
@@ -535,165 +621,261 @@ 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
-	 * @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) {
+	setRuntimeModelOnDialog: function (aContexts: any[], aDataArray: any[], oDefaultValues: any, dialogContext: Context) {
 		const aValues: any[] = [];
 		const aUnitData: any[] = [];
 		const aResults: any[] = [];
 		const aReadOnlyFieldInfo: any[] = [];
-		const oDistinctValueMap: any = {};
-		const oData = { "values": aValues, "unitData": aUnitData, "results": aResults, "readablePropertyData": aReadOnlyFieldInfo };
+		const oData = {
+			"values": aValues,
+			"unitData": aUnitData,
+			"results": aResults,
+			"readablePropertyData": aReadOnlyFieldInfo,
+			"selectedKey": undefined,
+			"noFields": oDefaultValues.noFields
+		};
 		const oDialogDataModel = new JSONModel(oData);
-		let sPropertyName;
-		aDataArray.forEach(function (oData: any) {
+		aDataArray.forEach(function (oInData: any) {
 			let oTextInfo;
-			if (oData.dataProperty && oData.dataProperty.indexOf("/") > -1) {
-				const aFinalPath = MassEditHelper.initLastLevelOfPropertyPath(oData.dataProperty, aValues);
-				const aPropertyPaths = oData.dataProperty.split("/");
-				let sPropertyKey;
-				for (let i = 0; i < aContexts.length; i++) {
-					const sMultiLevelPathValue = aContexts[i].getObject(oData.dataProperty);
-					sPropertyKey = oData.dataProperty + "/" + sMultiLevelPathValue;
+			let sPropertyKey;
+			let sUnitPropertyName;
+			const oDistinctValueMap: any = {};
+			const oDistinctUnitMap: any = {};
+			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(oInData.dataProperty);
+					sPropertyKey = `${oInData.dataProperty}/${sMultiLevelPathValue}`;
 					if (!oDistinctValueMap[sPropertyKey] && aFinalPath[aPropertyPaths[aPropertyPaths.length - 1]]) {
 						oTextInfo = MassEditHelper.getTextArrangementInfo(
-							oData.dataProperty,
-							oData.textBinding,
-							oData.entitySet,
-							aContexts[i]
+							oInData.dataProperty,
+							oInData.descriptionPath,
+							oInData.display,
+							context
 						);
 						aFinalPath[aPropertyPaths[aPropertyPaths.length - 1]].push({
 							"text": (oTextInfo && oTextInfo.fullText) || sMultiLevelPathValue,
-							"key": oData.dataProperty,
+							"key": sPropertyKey,
 							"textInfo": oTextInfo
 						});
 						oDistinctValueMap[sPropertyKey] = sMultiLevelPathValue;
 					}
 				}
+				// if (Object.keys(oDistinctValueMap).length === 1) {
+				// 	dialogContext.setProperty(oData.dataProperty, sPropertyKey && oDistinctValueMap[sPropertyKey]);
+				// }
+
+				aFinalPath[aPropertyPaths[aPropertyPaths.length - 1]].textInfo = {
+					descriptionPath: oInData.descriptionPath,
+					valuePath: oInData.dataProperty,
+					displayMode: oInData.display
+				};
 			} else {
-				aValues[oData.dataProperty] = aValues[oData.dataProperty] || [];
-				if (oData.unitProperty) {
-					aUnitData[oData.unitProperty] = aUnitData[oData.unitProperty] || [];
+				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 (let i = 0; i < aContexts.length; i++) {
-					const oDataObject = aContexts[i].getObject();
-					sPropertyName = oData.dataProperty + "/" + oDataObject[oData.dataProperty];
-					if (oData.dataProperty && oDataObject[oData.dataProperty] && !oDistinctValueMap[sPropertyName]) {
-						oTextInfo = MassEditHelper.getTextArrangementInfo(
-							oData.dataProperty,
-							oData.textBinding,
-							oData.entitySet,
-							aContexts[i]
-						);
-						aValues[oData.dataProperty].push({
-							"text": (oTextInfo && oTextInfo.fullText) || oDataObject[oData.dataProperty],
-							"key": oData.dataProperty,
-							"textInfo": oTextInfo
-						});
-						oDistinctValueMap[sPropertyName] = oDataObject[oData.dataProperty];
-					}
-					if (oData.unitProperty && oDataObject[oData.unitProperty]) {
-						sPropertyName = oData.unitProperty + "/" + oDataObject[oData.unitProperty];
-						if (!oDistinctValueMap[sPropertyName]) {
+				for (const context of aContexts) {
+					const oDataObject = context.getObject();
+					sPropertyKey = `${oInData.dataProperty}/${oDataObject[oInData.dataProperty]}`;
+					if (oInData.dataProperty && oDataObject[oInData.dataProperty] && !oDistinctValueMap[sPropertyKey]) {
+						if (oInData.inputType != "CheckBox") {
 							oTextInfo = MassEditHelper.getTextArrangementInfo(
-								oData.unitProperty,
-								oData.textBinding,
-								oData.entitySet,
-								aContexts[i]
+								oInData.dataProperty,
+								oInData.descriptionPath,
+								oInData.display,
+								context
 							);
-							aUnitData[oData.unitProperty].push({
-								"text": (oTextInfo && oTextInfo.fullText) || oDataObject[oData.unitProperty],
-								"key": oData.unitProperty,
+							const entry = {
+								"text": (oTextInfo && oTextInfo.fullText) || oDataObject[oInData.dataProperty],
+								"key": sPropertyKey,
 								"textInfo": oTextInfo
-							});
-							oDistinctValueMap[sPropertyName] = oDataObject[oData.unitProperty];
+							};
+							aValues[oInData.dataProperty].push(entry);
+							aValues[oInData.dataProperty]["selectOptions"].push(entry);
+						}
+						oDistinctValueMap[sPropertyKey] = oDataObject[oInData.dataProperty];
+					}
+					if (oInData.unitProperty && oDataObject[oInData.unitProperty]) {
+						sUnitPropertyName = `${oInData.unitProperty}/${oDataObject[oInData.unitProperty]}`;
+						if (!oDistinctUnitMap[sUnitPropertyName]) {
+							if (oInData.inputType != "CheckBox") {
+								oTextInfo = MassEditHelper.getTextArrangementInfo(
+									oInData.unitProperty,
+									oInData.descriptionPath,
+									oInData.display,
+									context
+								);
+								const unitEntry = {
+									"text": (oTextInfo && oTextInfo.fullText) || oDataObject[oInData.unitProperty],
+									"key": sUnitPropertyName,
+									"textInfo": oTextInfo
+								};
+								aUnitData[oInData.unitProperty].push(unitEntry);
+								aUnitData[oInData.unitProperty]["selectOptions"].push(unitEntry);
+							}
+							oDistinctUnitMap[sUnitPropertyName] = oDataObject[oInData.unitProperty];
 						}
 					}
 				}
+				aValues[oInData.dataProperty].textInfo = {
+					descriptionPath: oInData.descriptionPath,
+					valuePath: oInData.dataProperty,
+					displayMode: oInData.display
+				};
+				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) {
-			let values: any;
-			if (oData.dataProperty.indexOf("/") > -1) {
-				const sMultiLevelPropPathValue = MassEditHelper.getValueForMultiLevelPath(oData.dataProperty, aValues);
+		aDataArray.forEach(function (oInData: any) {
+			let values: any = {};
+			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].length) {
-				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);
+
+			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 && !bClearFieldOrBlankUnitValueExists) {
-					aUnitData[oData.unitProperty].push({
-						text: oDefaultValues.leaveBlankValue,
-						key: "Empty/" + oData.unitProperty
-					});
+				if (oInData.unitProperty) {
+					if (!bClearFieldOrBlankUnitValueExists) {
+						aUnitData[oInData.unitProperty].push({
+							text: oDefaultValues.leaveBlankValue,
+							key: `Empty/${oInData.unitProperty}`
+						});
+					}
+					aUnitData[oInData.unitProperty].textInfo = {};
+					aUnitData[oInData.unitProperty].selectedKey = MassEditHelper.getDefaultSelectionPathComboBox(
+						aContexts,
+						oInData.unitProperty
+					);
+					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, oInData.dataProperty);
+			values.inputType = oInData.inputType;
+			values.unitProperty = oInData.unitProperty;
 		});
+
 		return oDialogDataModel;
 	},
+	/**
+	 * Gets transient context for 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;
+
+		if (!transCtx) {
+			const model = table.getModel();
+			const listBinding = table.getRowBinding();
+			const transientListBinding = model.bindList(listBinding.getPath(), listBinding.getContext(), [], [], {
+				$$updateGroupId: "submitLater"
+			}) as ODataListBinding;
+			(transientListBinding as any).refreshInternal = function () {
+				/* */
+			};
+			transCtx = transientListBinding.create({}, true);
+		}
+
+		return transCtx;
+	},
+
+	onDialogOpen: function (event: any): void {
+		const source = event.getSource();
+		const fieldsInfoModel = source.getModel("fieldsInfo");
+		fieldsInfoModel.setProperty("/isOpen", true);
+	},
 
 	/**
 	 * 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",
@@ -701,7 +883,8 @@ const MassEditHelper = {
 			oResourceBundle = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core"),
 			oDefaultValues = MassEditHelper.getDefaultTextsForDialog(oResourceBundle, aContexts.length, oTable),
 			oDataFieldModel = MassEditHelper.prepareDataForDialog(oTable, aContexts, aDataArray),
-			oDialogDataModel = MassEditHelper.setRuntimeModelOnDialog(aContexts, aDataArray, oDefaultValues);
+			dialogContext = MassEditHelper.getDialogContext(oTable),
+			oDialogDataModel = MassEditHelper.setRuntimeModelOnDialog(aContexts, aDataArray, oDefaultValues, dialogContext);
 
 		return new Promise(function (resolve: (value: any) => void, reject: (reason?: any) => void) {
 			const oFragment = XMLTemplateProcessor.loadTemplate(sFragmentName, "fragment");
@@ -719,24 +902,32 @@ 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) {
-									const oDialog = oEvent.getSource().getParent();
-									const oModel = oDialog.getModel("fieldsInfo");
+									(oController.getView()?.getBindingContext("internal") as InternalModelContext)?.setProperty(
+										"skipPatchHandlers",
+										true
+									);
+									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;
-									aContexts.forEach(function (oSelectedContext: any) {
+									//let index = 0;
+									const errorValues: any[] = [];
+									aContexts.forEach(function (oSelectedContext: any, idx: number) {
 										aResults.forEach(function (oResult: any) {
 											//TODO - Add save implementation for Value Help.
 											if (aPropertyReadableInfo) {
@@ -757,46 +948,126 @@ const MassEditHelper = {
 													}
 												});
 											}
-											groupId = "$auto." + index;
-											index += 1;
+											groupId = `$auto.${idx}`;
+											//index += 1;
+											oController._editFlow.setDraftStatus(DraftStatus.Saving);
+											//let promiseCount = 0;
 											if (oResult.keyValue && oResult.value !== "Default" && !bReadOnlyField) {
-												changePromise.push(oSelectedContext.setProperty(oResult.keyValue, oResult.value, groupId));
+												changePromise.push(
+													oSelectedContext
+														.setProperty(oResult.keyValue, oResult.value, groupId)
+														.then(function () {
+															return oSelectedContext;
+														})
+														.catch(function (oError: any) {
+															errorValues.push(oSelectedContext.getObject());
+															Log.error("Mass Edit: Something went wrong in updating entries.", oError);
+														})
+												);
 											}
 										});
 									});
-									return Promise.all(changePromise)
-										.then(function (oRes: any[]) {
-											const oListBinding = oTable.getRowBinding(),
-												oExtensionAPI = oController && (oController.getExtensionAPI() as any);
-											return oExtensionAPI.refresh(oListBinding.getPath()).then(function () {
-												oDialog.close();
-												oDialog.destroy();
-												return oRes;
+
+									// 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 () {
+											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 &&
+													messageTargets.length === 1 &&
+													messageTargets[0].length &&
+													message.persistent === true
+												) {
+													const boundTransitionErrorContext = aContexts.find(function (oContext: any) {
+														return message.getTarget().indexOf(oContext.getPath()) !== -1;
+													});
+													boundTransitionErrorContexts.push(boundTransitionErrorContext);
+													message.additionalText = boundTransitionErrorContext
+														? boundTransitionErrorContext.getObject()[subtitleColumn]
+														: undefined;
+												}
 											});
-										})
-										.catch(function (oError: any) {
-											//TODO - Add error handling part for the Dialog
-											oDialog.close();
-											oDialog.destroy();
-											Log.error("Mass Edit: Something went wrong in updating entries.", oError);
+											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);
+											}
+											oController._editFlow.getMessageHandler().showMessages();
+											if (oInDialog.isOpen()) {
+												oInDialog.close();
+												oInDialog.destroy();
+												(oController.getView()?.getBindingContext("internal") as InternalModelContext)?.setProperty(
+													"skipPatchHandlers",
+													false
+												);
+											}
 										});
+									});
 								}
 							}),
 							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();
 								}
 							})
 						});
+						const model = oTable.getModel();
 						oDialog.setModel(oDialogDataModel, "fieldsInfo");
+						oDialog.setModel(model);
+						oDialog.setBindingContext(dialogContext);
 						resolve(oDialog);
 					});
 				})
 				.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));
+		}
 	}
 };