@sapui5/sap.fe.core 1.100.0 → 1.102.0

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

@@ -1,19 +1,30 @@
+import Log from "sap/base/Log";
+import CommonUtils from "sap/fe/core/CommonUtils";
+import { BindingExpression, ExpressionOrPrimitive } from "sap/fe/core/helpers/BindingExpression";
+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 { getTextBinding, setEditStyleProperties } from "sap/fe/macros/field/FieldTemplating";
+import { FieldProperties } from "sap/fe/macros/internal/Field.metadata";
+import Button from "sap/m/Button";
 import Dialog from "sap/m/Dialog";
-import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
-import JSONModel from "sap/ui/model/json/JSONModel";
+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 Log from "sap/base/Log";
-import CommonUtils from "sap/fe/core/CommonUtils";
+import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
+import EditMode from "sap/ui/mdc/enum/EditMode";
 import Table from "sap/ui/mdc/Table";
-import ResourceBundle from "sap/base/i18n/ResourceBundle";
-import Button from "sap/m/Button";
-import PageController from "sap/fe/core/PageController";
+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 { convertMetaModelContext, getInvolvedDataModelObjects } from "../converters/MetaModelConverter";
-import { getTextBinding } from "sap/fe/macros/field/FieldTemplating";
-import { getEditableExpression, getRequiredExpression } from "../templating/UIFormatters";
 import { isReadOnlyExpression } from "../templating/FieldControlHelper";
-import { hasValueHelpWithFixedValues } from "sap/fe/core/templating/PropertyHelper";
+import { getEditMode, getRequiredExpression, isCollectionField } from "../templating/UIFormatters";
+import { InternalModelContext } from "./ModelHelper";
 
 /* This class contains helpers to be used for mass edit functionality */
 type TextArrangementInfo = {
@@ -24,20 +35,13 @@ type TextArrangementInfo = {
 	description: string;
 	fullText: string;
 };
-const aValidDataTypes = [
-	"Edm.Boolean",
-	"Edm.Byte",
-	"Edm.Decimal",
-	"Edm.Double",
-	"Edm.Float",
-	"Edm.Guid",
-	"Edm.Int16",
-	"Edm.Int32",
-	"Edm.Int64",
-	"Edm.SByte",
-	"Edm.Single",
-	"Edm.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.
@@ -47,12 +51,12 @@ const MassEditHelper = {
 	 * @param {Array} aValues Array instance where the default data needs to be added
 	 * @returns {Array}
 	 */
-	initLastLevelOfPropertyPath: function(sPath: string, aValues: any) {
+	initLastLevelOfPropertyPath: function (sPath: string, aValues: any /*, transCtx: Context */) {
 		let aFinalPath: any;
 		let index = 0;
 		const aPaths = sPath.split("/");
 		let sFullPath = "";
-		aPaths.forEach(function(sPropertyPath: string) {
+		aPaths.forEach(function (sPropertyPath: string) {
 			if (!aValues[sPropertyPath] && index === 0) {
 				aValues[sPropertyPath] = {};
 				aFinalPath = aValues[sPropertyPath];
@@ -79,8 +83,8 @@ const MassEditHelper = {
 	 * @param {Array} self Instance of the array
 	 * @returns {boolean}
 	 */
-	getUniqueValues: function(sValue: string, index: number, self: any[]) {
-		if (sValue) {
+	getUniqueValues: function (sValue: string, index: number, self: any[]) {
+		if (sValue != undefined && sValue != null) {
 			return self.indexOf(sValue) === index;
 		}
 	},
@@ -93,11 +97,11 @@ const MassEditHelper = {
 	 * @param {object} oValues Object of property values
 	 * @returns {*}
 	 */
-	getValueForMultiLevelPath: function(sDataPropertyPath: string, oValues: any) {
+	getValueForMultiLevelPath: function (sDataPropertyPath: string, oValues: any) {
 		if (sDataPropertyPath && sDataPropertyPath.indexOf("/") > 0) {
 			const aPropertyPaths = sDataPropertyPath.split("/");
 			let Result: any;
-			aPropertyPaths.forEach(function(sPath: string) {
+			aPropertyPaths.forEach(function (sPath: string) {
 				Result = oValues && oValues[sPath] ? oValues[sPath] : Result && Result[sPath];
 			});
 			return Result;
@@ -115,11 +119,11 @@ const MassEditHelper = {
 	 * @param {string} sDataPropertyPath Data property path
 	 * @returns {string}
 	 */
-	getDefaultSelectionPathComboBox: function(aContexts: any[], sDataPropertyPath: string) {
+	getDefaultSelectionPathComboBox: function (aContexts: any[], sDataPropertyPath: string) {
 		if (sDataPropertyPath && aContexts.length > 0) {
 			const oSelectedContext = aContexts,
 				aPropertyValues: any[] = [];
-			oSelectedContext.forEach(function(oContext: any) {
+			oSelectedContext.forEach(function (oContext: any) {
 				const oDataObject = oContext.getObject();
 				const sMultiLevelPathCondition =
 					sDataPropertyPath.indexOf("/") > -1 && oDataObject.hasOwnProperty(sDataPropertyPath.split("/")[0]);
@@ -133,7 +137,7 @@ const MassEditHelper = {
 			} else if (aUniquePropertyValues.length === 0) {
 				return "Empty/" + sDataPropertyPath;
 			} else if (aUniquePropertyValues.length === 1) {
-				return sDataPropertyPath;
+				return sDataPropertyPath + "/" + aUniquePropertyValues[0];
 			}
 		}
 	},
@@ -145,15 +149,65 @@ const MassEditHelper = {
 	 * @param {Array} aContexts Contexts for mass edit
 	 * @returns {boolean}
 	 */
-	getHiddenValueForContexts: function(hiddenValue: any, aContexts: any[]) {
+	getHiddenValueForContexts: function (hiddenValue: any, aContexts: any[]) {
 		if (hiddenValue && hiddenValue.$Path) {
-			return !aContexts.some(function(oSelectedContext: any) {
+			return !aContexts.some(function (oSelectedContext: any) {
 				return oSelectedContext.getObject(hiddenValue.$Path) === false;
 			});
 		}
 		return hiddenValue;
 	},
 
+	getInputType: function (propertyInfo: any, dataFieldConverted: any, oDataModelPath: DataModelObjectPath): string {
+		const editStyleProperties = {} as FieldProperties;
+		let inputType!: string;
+		if (propertyInfo) {
+			setEditStyleProperties(editStyleProperties, dataFieldConverted, oDataModelPath, true);
+			inputType = editStyleProperties?.editStyle || "";
+		}
+		const isValidForMassEdit =
+			inputType &&
+			["DatePicker", "TimePicker", "DateTimePicker", "RatingIndicator"].indexOf(inputType) === -1 &&
+			!isCollectionField(oDataModelPath) &&
+			!hasValueHelpWithFixedValues(propertyInfo);
+
+		return (isValidForMassEdit || "") && inputType;
+	},
+
+	getIsFieldGrp: function (dataFieldConverted: any): boolean {
+		return (
+			dataFieldConverted &&
+			dataFieldConverted.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" &&
+			dataFieldConverted.Target &&
+			dataFieldConverted.Target.value &&
+			dataFieldConverted.Target.value.indexOf("FieldGroup") > -1
+		);
+	},
+
+	/**
+	 * 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
+	 */
+	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.].
 	 *
@@ -162,11 +216,12 @@ const MassEditHelper = {
 	 * @param {Array} aDataArray Array containing data related to the dialog used by both the static and the runtime model
 	 * @returns {object}
 	 */
-	prepareDataForDialog: function(oTable: Table, aContexts: any[], aDataArray: any[]) {
+	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 + "/@"),
+			oEntitySetContext = oMetaModel.getContext(sCurrentEntitySetName),
 			oDataModelObjectPath = getInvolvedDataModelObjects(oEntityTypeContext);
 
 		const oDataFieldModel = new JSONModel();
@@ -175,14 +230,9 @@ const MassEditHelper = {
 		let bValueHelpEnabled;
 		let sUnitPropertyPath;
 		let bValueHelpEnabledForUnit;
-		let bIsImmutable;
-		let bIsComputed;
-		let bChartProperty;
 		let oTextBinding;
-		let bValidDataType;
-		let bInValidInputType;
 
-		aTableFields.forEach(function(oColumnInfo: any) {
+		aTableFields.forEach(function (oColumnInfo: any) {
 			const sDataPropertyPath = oColumnInfo.dataProperty;
 			if (sDataPropertyPath) {
 				let oPropertyInfo = sDataPropertyPath && oMetaModel.getObject(sCurrentEntitySetName + "/" + sDataPropertyPath + "@");
@@ -197,7 +247,10 @@ const MassEditHelper = {
 					(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"]);
+				sLabelText =
+					oColumnInfo.label ||
+					(oPropertyInfo && oPropertyInfo["@com.sap.vocabularies.Common.v1.Label"]) ||
+					oColumnInfo.dataProperty;
 				bValueHelpEnabledForUnit =
 					sUnitPropertyPath &&
 					oMetaModel.getObject(sCurrentEntitySetName + "/" + sUnitPropertyPath + "@") &&
@@ -205,7 +258,7 @@ const MassEditHelper = {
 						"@com.sap.vocabularies.Common.v1.ValueList"
 					];
 				if (oDataModelObjectPath) {
-					oDataModelObjectPath.targetObject = oDataModelObjectPath.targetEntityType.entityProperties.filter(function(
+					oDataModelObjectPath.targetObject = oDataModelObjectPath.targetEntityType.entityProperties.filter(function (
 						oProperty: any
 					) {
 						return oProperty.name === sDataPropertyPath;
@@ -217,54 +270,59 @@ const MassEditHelper = {
 					oDataFieldConverted = convertMetaModelContext(oFieldContext),
 					oPropertyContext = oMetaModel.getContext(sCurrentEntitySetName + "/" + sDataPropertyPath + "@"),
 					oInterface = oPropertyContext && oPropertyContext.getInterface();
-				bIsImmutable =
-					oPropertyContext && oPropertyContext.getProperty() && oPropertyContext.getProperty()["@Org.OData.Core.V1.Immutable"];
-				bIsComputed =
-					oPropertyContext && oPropertyContext.getProperty() && oPropertyContext.getProperty()["@Org.OData.Core.V1.Computed"];
+
+				let oDataModelPath = getInvolvedDataModelObjects(oFieldContext, oEntitySetContext);
+				if (oDataFieldConverted?.Value?.path?.length > 0) {
+					oDataModelPath = enhanceDataModelPath(oDataModelPath, sDataPropertyPath);
+				}
 				const bHiddenField =
 					MassEditHelper.getHiddenValueForContexts(
 						oFieldContext && oFieldContext.getObject()["@com.sap.vocabularies.UI.v1.Hidden"],
 						aContexts
 					) || false;
+				const isImage = oPropertyInfo && oPropertyInfo["@com.sap.vocabularies.UI.v1.IsImageURL"];
+
 				oInterface.context = {
-					getModel: function() {
+					getModel: function () {
 						return oInterface.getModel();
 					},
-					getPath: function() {
+					getPath: function () {
 						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 isReadOnly = isReadOnlyExpression(oPropertyInfo);
-				bChartProperty = oPropertyInfo && oPropertyInfo.term && oPropertyInfo.term === "com.sap.vocabularies.UI.v1.Chart";
-				bValidDataType = oPropertyInfo && aValidDataTypes.indexOf(oPropertyInfo.type) !== -1;
-				bInValidInputType =
-					(oColumnInfo &&
-						oColumnInfo.inputType &&
-						(oColumnInfo.inputType === "sap.m.RatingIndicator" || oColumnInfo.inputType === "sap.ui.mdc.MultiValueField")) ||
-					hasValueHelpWithFixedValues(oPropertyInfo);
-				if (
-					sDataPropertyPath &&
-					!bHiddenField &&
-					!bIsImmutable &&
-					!bIsComputed &&
-					!bChartProperty &&
-					bValidDataType &&
-					!bInValidInputType &&
-					oColumnInfo.inputType &&
-					getEditableExpression(oPropertyInfo, oDataFieldConverted, oDataModelObjectPath) !== "false"
-				) {
+
+				const chartProperty = oPropertyInfo && oPropertyInfo.term && oPropertyInfo.term === "com.sap.vocabularies.UI.v1.Chart";
+				const isAction = !!oDataFieldConverted.Action;
+				const isFieldGrp = MassEditHelper.getIsFieldGrp(oDataFieldConverted);
+
+				if (isImage || bHiddenField || chartProperty || isAction || isFieldGrp) {
+					return;
+				}
+
+				// EditMode and InputType
+				const propertyForFieldControl = oPropertyInfo && oPropertyInfo.Value ? oPropertyInfo.Value : oPropertyInfo;
+				const expBinding = getEditMode(propertyForFieldControl, oDataModelPath, false, false, oDataFieldConverted, true);
+				const editModeValues = Object.keys(EditMode);
+				const editModeIsStatic = !!expBinding && editModeValues.includes(expBinding as EditMode);
+				const editable = !!expBinding && ((editModeIsStatic && expBinding === EditMode.Editable) || !editModeIsStatic);
+
+				if (!editable) {
+					return;
+				}
+
+				const inputType = MassEditHelper.getInputType(oPropertyInfo, oDataFieldConverted, oDataModelPath);
+
+				if (inputType) {
+					const isReadOnly = isReadOnlyExpression(oPropertyInfo);
+					const displayMode = CommonUtils.computeDisplayMode(oPropertyContext.getObject());
 					oResult = {
-						"label": sLabelText + ":",
-						"visible":
-							sDataPropertyPath &&
-							!bHiddenField &&
-							!bIsImmutable &&
-							!bIsComputed &&
-							getEditableExpression(oPropertyInfo, oDataFieldConverted, oDataModelObjectPath),
+						"label": sLabelText,
 						"dataProperty": sDataPropertyPath,
 						"isValueHelpEnabled": bValueHelpEnabled ? bValueHelpEnabled : false,
 						"unitProperty": sUnitPropertyPath ? sUnitPropertyPath : false,
@@ -279,9 +337,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
+						"isPropertyReadOnly": isReadOnly !== undefined ? isReadOnly : false,
+						"inputType": inputType,
+						"editMode": editable ? expBinding : undefined,
+						"unitDataPath": sUnitPropertyPath && "fieldsInfo>/unitData/",
+						"valuesPath": "fieldsInfo>/values/"
 					};
 					aDataArray.push(oResult);
 				}
@@ -291,47 +354,25 @@ const MassEditHelper = {
 		return oDataFieldModel;
 	},
 
-	getInputTypeForColumn: function(oColumn: any) {
-		return (
-			oColumn.getTemplate().getContent &&
-			oColumn.getTemplate().getContent() &&
-			oColumn.getTemplate().getContent().getContentEdit &&
-			oColumn
-				.getTemplate()
-				.getContent()
-				.getContentEdit() &&
-			oColumn
-				.getTemplate()
-				.getContent()
-				.getContentEdit()[0] &&
-			oColumn
-				.getTemplate()
-				.getContent()
-				.getContentEdit()[0]
-				.getMetadata()
-				.getName()
-		);
-	},
-
-	getTableFields: function(oTable: any) {
+	getTableFields: function (oTable: any) {
 		const aColumns = (oTable && oTable.getColumns()) || [];
-		return aColumns.map(function(oColumn: any) {
+		const columnsData = oTable && oTable.getParent().getTableDefinition().columns;
+		return aColumns.map(function (oColumn: any) {
 			const sDataProperty = oColumn && oColumn.getDataProperty(),
 				aRealtedColumnInfo =
-					oTable.data("columns") &&
-					oTable.data("columns").customData.filter(function(oColumnInfo: any) {
+					columnsData &&
+					columnsData.filter(function (oColumnInfo: any) {
 						return oColumnInfo.name === sDataProperty && oColumnInfo.type === "Annotation";
 					});
 			return {
 				"dataProperty": sDataProperty,
 				"label": oColumn.getHeader(),
-				"annotationPath": aRealtedColumnInfo && aRealtedColumnInfo[0] && aRealtedColumnInfo[0].annotationPath,
-				"inputType": MassEditHelper.getInputTypeForColumn(oColumn)
+				"annotationPath": aRealtedColumnInfo && aRealtedColumnInfo[0] && aRealtedColumnInfo[0].annotationPath
 			};
 		});
 	},
 
-	getDefaultTextsForDialog: function(oResourceBundle: any, iSelectedContexts: any, oTable: any) {
+	getDefaultTextsForDialog: function (oResourceBundle: any, iSelectedContexts: any, oTable: any) {
 		// The confirm button text is "Save" for table in Display mode and "Apply" for table in edit mode. This can be later exposed if needed.
 		const bDisplayMode = oTable.data("displayModePropertyBinding") === "true";
 
@@ -343,6 +384,7 @@ const MassEditHelper = {
 			"applyButtonText": bDisplayMode
 				? 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")
 		};
 	},
@@ -353,17 +395,19 @@ const MassEditHelper = {
 	 * @param {string} sInputType InputType of the field
 	 * @returns {string}
 	 */
-	getSuffixForKeepExisiting: function(sInputType: 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 "sap.m.DatePicker":
+			case "DatePicker":
 				sResult = "Dates";
 				break;
-			case "sap.m.CheckBox":
+			case "CheckBox":
 				sResult = "Settings";
 				break;
+			default:
+				sResult = "Values";
 		}
 		return sResult;
 	},
@@ -377,72 +421,190 @@ const MassEditHelper = {
 	 * @param {object} oPropertyInfo Property information
 	 * @param {boolean} bUOMField
 	 */
-	setDefaultValuesToDialog: function(aValues: any[], aContexts: any[], oDefaultValues: any, oPropertyInfo: any, bUOMField?: boolean) {
-		const sPropertyPath = oPropertyInfo.dataProperty,
+	setDefaultValuesToDialog: function (aValues: any, aContexts: 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);
+		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) {
+		const bValueExistsForPropertyPath = aContexts.some(function (oSelectedContext: any) {
 			return oSelectedContext.getObject(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);
+		}
+
+		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) {
-				aValues.unshift({ text: oDefaultValues.clearFieldValue, key: "ClearFieldValue/" + sPropertyPath });
+				const clearEntry = { text: oDefaultValues.clearFieldValue, key: "ClearFieldValue/" + sPropertyPath };
+				aValues.unshift(clearEntry);
+				aValues.defaultOptions.unshift(clearEntry);
 			}
 		} else {
-			aValues.unshift({ text: oDefaultValues.leaveBlankValue, key: "Empty/" + sPropertyPath });
+			const emptyEntry = { text: oDefaultValues.leaveBlankValue, key: "Empty/" + sPropertyPath };
+			aValues.unshift(emptyEntry);
+			aValues.defaultOptions.unshift(emptyEntry);
 		}
-		aValues.unshift({
+		const keepEntry = {
 			text: oDefaultValues.keepExistingPrefix + " " + sSuffixForKeepExisting + " >",
 			key: "Default/" + sPropertyPath
-		});
+		};
+		aValues.unshift(keepEntry);
+		aValues.defaultOptions.unshift(keepEntry);
 	},
 
-	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 + ")";
-				}
+	/**
+	 * 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}
+	 */
+	getTextArrangementInfo: function (
+		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 = value + " (" + descriptionValue + ")";
+					break;
+				case "DescriptionValue":
+					value = selectedContext.getObject(property);
+					descriptionValue = selectedContext.getObject(descriptionPath);
+					fullText = descriptionValue + " (" + 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.
+	 */
+	isEditable: function (any: AnyType): boolean {
+		const binding = any.getBinding("any");
+		const value = (binding as any).getExternalValue();
+		return value === EditMode.Editable;
+	},
+
+	/**
+	 * 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.
+	 */
+	onContextEditableChange: function (oDialogDataModel: JSONModel, dataProperty: string): void {
+		const objectsForVisibility = oDialogDataModel.getProperty("/values/" + dataProperty + "/objectsForVisibility") || [];
+		const editable = objectsForVisibility.some(MassEditHelper.isEditable);
+
+		if (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.
+	 */
+	updateOnContextChange: function (mOToUse: AnyType, oDialogDataModel: JSONModel, dataProperty: string, values: any) {
+		const binding = mOToUse.getBinding("any");
+
+		values.objectsForVisibility = values.objectsForVisibility || [];
+		values.objectsForVisibility.push(mOToUse);
+
+		binding.attachChange(MassEditHelper.onContextEditableChange.bind(null, oDialogDataModel, dataProperty));
+	},
+
+	/**
+	 * 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.
+	 */
+	getBoundObject: function (expBinding: BindingExpression<string> | ExpressionOrPrimitive<string>, context: Context): AnyType {
+		const mOToUse = new Any({ any: expBinding });
+		const model = context.getModel();
+		mOToUse.setModel(model);
+		mOToUse.setBindingContext(context);
+
+		return mOToUse;
+	},
+
+	/**
+	 * 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.
+	 */
+	getFieldVisiblity: function (
+		expBinding: BindingExpression<string> | ExpressionOrPrimitive<string>,
+		oDialogDataModel: JSONModel,
+		dataProperty: string,
+		values: any,
+		context: Context
+	): boolean {
+		const mOToUse = MassEditHelper.getBoundObject(expBinding, context);
+		const isContextEditable = MassEditHelper.isEditable(mOToUse);
+
+		if (!isContextEditable) {
+			MassEditHelper.updateOnContextChange(mOToUse, oDialogDataModel, dataProperty, values);
+		}
+		return isContextEditable;
 	},
 
 	/**
@@ -453,82 +615,124 @@ const MassEditHelper = {
 	 * @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}
 	 */
-	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 = {};
-		let sPropertyName;
-		aDataArray.forEach(function(oData: any) {
+		const oData = {
+			"values": aValues,
+			"unitData": aUnitData,
+			"results": aResults,
+			"readablePropertyData": aReadOnlyFieldInfo,
+			"selectedKey": undefined
+		};
+		const oDialogDataModel = new JSONModel(oData);
+		aDataArray.forEach(function (oData: 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);
+				const aFinalPath = MassEditHelper.initLastLevelOfPropertyPath(oData.dataProperty, aValues /*, dialogContext */);
 				const aPropertyPaths = oData.dataProperty.split("/");
-				let sPropertyKey;
-				for (let i = 0; i < aContexts.length; i++) {
-					const sMultiLevelPathValue = aContexts[i].getObject(oData.dataProperty);
+
+				for (const context of aContexts) {
+					const sMultiLevelPathValue = context.getObject(oData.dataProperty);
 					sPropertyKey = oData.dataProperty + "/" + sMultiLevelPathValue;
 					if (!oDistinctValueMap[sPropertyKey] && aFinalPath[aPropertyPaths[aPropertyPaths.length - 1]]) {
 						oTextInfo = MassEditHelper.getTextArrangementInfo(
 							oData.dataProperty,
-							oData.textBinding,
-							oData.entitySet,
-							aContexts[i]
+							oData.descriptionPath,
+							oData.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: oData.descriptionPath,
+					valuePath: oData.dataProperty,
+					displayMode: oData.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"] || [];
 				}
-				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 = oData.dataProperty + "/" + oDataObject[oData.dataProperty];
+					if (oData.dataProperty && oDataObject[oData.dataProperty] && !oDistinctValueMap[sPropertyKey]) {
+						if (oData.inputType != "CheckBox") {
 							oTextInfo = MassEditHelper.getTextArrangementInfo(
-								oData.unitProperty,
-								oData.textBinding,
-								oData.entitySet,
-								aContexts[i]
+								oData.dataProperty,
+								oData.descriptionPath,
+								oData.display,
+								context
 							);
-							aUnitData[oData.unitProperty].push({
-								"text": (oTextInfo && oTextInfo.fullText) || oDataObject[oData.unitProperty],
-								"key": oData.unitProperty,
+							const entry = {
+								"text": (oTextInfo && oTextInfo.fullText) || oDataObject[oData.dataProperty],
+								"key": sPropertyKey,
 								"textInfo": oTextInfo
-							});
-							oDistinctValueMap[sPropertyName] = oDataObject[oData.unitProperty];
+							};
+							aValues[oData.dataProperty].push(entry);
+							aValues[oData.dataProperty]["selectOptions"].push(entry);
+						}
+						oDistinctValueMap[sPropertyKey] = oDataObject[oData.dataProperty];
+					}
+					if (oData.unitProperty && oDataObject[oData.unitProperty]) {
+						sUnitPropertyName = oData.unitProperty + "/" + oDataObject[oData.unitProperty];
+						if (!oDistinctUnitMap[sUnitPropertyName]) {
+							if (oData.inputType != "CheckBox") {
+								oTextInfo = MassEditHelper.getTextArrangementInfo(
+									oData.unitProperty,
+									oData.descriptionPath,
+									oData.display,
+									context
+								);
+								const unitEntry = {
+									"text": (oTextInfo && oTextInfo.fullText) || oDataObject[oData.unitProperty],
+									"key": sUnitPropertyName,
+									"textInfo": oTextInfo
+								};
+								aUnitData[oData.unitProperty].push(unitEntry);
+								aUnitData[oData.unitProperty]["selectOptions"].push(unitEntry);
+							}
+							oDistinctUnitMap[sUnitPropertyName] = oDataObject[oData.unitProperty];
 						}
 					}
 				}
+				aValues[oData.dataProperty].textInfo = {
+					descriptionPath: oData.descriptionPath,
+					valuePath: oData.dataProperty,
+					displayMode: oData.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]);
 			}
 		});
-		aDataArray.forEach(function(oData: any) {
+		aDataArray.forEach(function (oData: any) {
+			let values: any = {};
 			if (oData.dataProperty.indexOf("/") > -1) {
 				const sMultiLevelPropPathValue = MassEditHelper.getValueForMultiLevelPath(oData.dataProperty, aValues);
 				if (!sMultiLevelPropPathValue) {
@@ -536,18 +740,25 @@ const MassEditHelper = {
 				} else {
 					MassEditHelper.setDefaultValuesToDialog(sMultiLevelPropPathValue, aContexts, oDefaultValues, oData);
 				}
-			} else if (aValues[oData.dataProperty] && aValues[oData.dataProperty].length) {
+				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];
 			}
+
 			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;
 			} else if (
 				(oData.dataProperty && aValues[oData.dataProperty] && !aValues[oData.dataProperty].length) ||
 				(oData.unitProperty && aUnitData[oData.unitProperty] && !aUnitData[oData.unitProperty].length)
 			) {
 				const bClearFieldOrBlankValueExists =
 					aValues[oData.dataProperty] &&
-					aValues[oData.dataProperty].some(function(obj: any) {
+					aValues[oData.dataProperty].some(function (obj: any) {
 						return obj.text === "< Clear Values >" || obj.text === "< Leave Blank >";
 					});
 				if (oData.dataProperty && !bClearFieldOrBlankValueExists) {
@@ -555,14 +766,22 @@ const MassEditHelper = {
 				}
 				const bClearFieldOrBlankUnitValueExists =
 					aUnitData[oData.unitProperty] &&
-					aUnitData[oData.unitProperty].some(function(obj: any) {
+					aUnitData[oData.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 (oData.unitProperty) {
+					if (!bClearFieldOrBlankUnitValueExists) {
+						aUnitData[oData.unitProperty].push({
+							text: oDefaultValues.leaveBlankValue,
+							key: "Empty/" + oData.unitProperty
+						});
+					}
+					aUnitData[oData.unitProperty].textInfo = {};
+					aUnitData[oData.unitProperty].selectedKey = MassEditHelper.getDefaultSelectionPathComboBox(
+						aContexts,
+						oData.unitProperty
+					);
+					aUnitData[oData.unitProperty].inputType = oData.inputType;
 				}
 			}
 			if (oData.isPropertyReadOnly && typeof oData.isPropertyReadOnly === "boolean") {
@@ -582,11 +801,54 @@ const MassEditHelper = {
 					type: "Path"
 				});
 			}
+
+			// Setting visbility of the mass edit field.
+			if (oData.editMode) {
+				values.visible =
+					oData.editMode === EditMode.Editable ||
+					aContexts.some(
+						MassEditHelper.getFieldVisiblity.bind(MassEditHelper, oData.editMode, oDialogDataModel, oData.dataProperty, values)
+					);
+			} else {
+				values.visible = true;
+			}
+			values.selectedKey = MassEditHelper.getDefaultSelectionPathComboBox(aContexts, oData.dataProperty);
+			values.inputType = oData.inputType;
+			values.unitProperty = oData.unitProperty;
 		});
-		const oData = { "values": aValues, "unitData": aUnitData, "results": aResults, "readablePropertyData": aReadOnlyFieldInfo };
-		const oDialogDataModel = new JSONModel(oData);
+
 		return oDialogDataModel;
 	},
+	/**
+	 * Gets transient context for dialog.
+	 *
+	 * @param {Table} table Instance of Table.
+	 * @param {Dialog} dialog Mass Edit Dialog.
+	 * @returns {object} 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.
@@ -596,15 +858,16 @@ const MassEditHelper = {
 	 * @param {object} oController Controller for the view
 	 * @returns {object} Promise returning instance of dialog.
 	 */
-	createDialog: function(oTable: Table, aContexts: any[], oController: PageController) {
+	createDialog: function (oTable: Table, aContexts: any[], oController: PageController) {
 		const sFragmentName = "sap/fe/core/controls/massEdit/MassEditDialog",
 			aDataArray: any[] = [],
-			oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core") as ResourceBundle,
+			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) {
+		return new Promise(function (resolve: (value: any) => void, reject: (reason?: any) => void) {
 			const oFragment = XMLTemplateProcessor.loadTemplate(sFragmentName, "fragment");
 			return Promise.resolve(
 				XMLPreprocessor.process(
@@ -620,27 +883,35 @@ const MassEditHelper = {
 					}
 				)
 			)
-				.then(function(oFragment: any) {
-					return Fragment.load({ definition: oFragment }).then(function(oDialogContent: any) {
+				.then(function (oFragment: any) {
+					return Fragment.load({ definition: oFragment }).then(function (oDialogContent: any) {
+						const DraftStatus = FELibrary.DraftStatus;
 						const oDialog = new Dialog({
 							title: oDefaultValues.massEditTitle,
 							content: [oDialogContent],
+							afterOpen: MassEditHelper.onDialogOpen,
 							beginButton: new Button({
 								text: oDefaultValues.applyButtonText,
 								type: "Emphasized",
-								press: function(oEvent: any) {
+								press: function (oEvent: any) {
+									(oController.getView()?.getBindingContext("internal") as InternalModelContext)?.setProperty(
+										"skipPatchHandlers",
+										true
+									);
 									const oDialog = oEvent.getSource().getParent();
 									const oModel = oDialog.getModel("fieldsInfo");
 									const aResults = oModel.getProperty("/results");
 									const aPropertyReadableInfo = oModel.getProperty("/readablePropertyData");
 									const changePromise: any[] = [];
 									let bReadOnlyField = false;
-
-									aContexts.forEach(function(oSelectedContext: any) {
-										aResults.forEach(function(oResult: any) {
+									let groupId;
+									//let index = 0;
+									let errorValues: any[] = [];
+									aContexts.forEach(function (oSelectedContext: any, idx: number) {
+										aResults.forEach(function (oResult: any) {
 											//TODO - Add save implementation for Value Help.
 											if (aPropertyReadableInfo) {
-												bReadOnlyField = aPropertyReadableInfo.some(function(oPropertyInfo: any) {
+												bReadOnlyField = aPropertyReadableInfo.some(function (oPropertyInfo: any) {
 													if (oResult.keyValue === oPropertyInfo.property) {
 														if (oPropertyInfo.type === "Default") {
 															return oPropertyInfo.value === true;
@@ -657,37 +928,93 @@ const MassEditHelper = {
 													}
 												});
 											}
+											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));
+												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() {
+
+									(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 messageTargets = message.getTargets();
+												if (
+													messageTargets &&
+													messageTargets.length === 1 &&
+													messageTargets[0].length &&
+													message.persistent === true
+												) {
+													let boundTransitionErrorContext = aContexts.find(function (oContext: any) {
+														return message.getTarget().indexOf(oContext.getPath()) !== -1;
+													});
+													boundTransitionErrorContexts.push(boundTransitionErrorContext);
+													message.additionalText = boundTransitionErrorContext
+														? boundTransitionErrorContext.getObject()[subtitleColumn]
+														: undefined;
+												}
+											});
+											if (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 (oDialog.isOpen()) {
 												oDialog.close();
 												oDialog.destroy();
-												return oRes;
-											});
-										})
-										.catch(function(oError: any) {
-											//TODO - Add error handling part for the Dialog
-											Log.error("Mass Edit: Something went wrong in updating entries.", oError);
+												(oController.getView()?.getBindingContext("internal") as InternalModelContext)?.setProperty(
+													"skipPatchHandlers",
+													false
+												);
+											}
 										});
+									});
 								}
 							}),
 							endButton: new Button({
 								text: oDefaultValues.cancelButtonText,
-								press: function(oEvent: any) {
+								press: function (oEvent: any) {
 									const oDialog = oEvent.getSource().getParent();
 									oDialog.close();
 									oDialog.destroy();
 								}
 							})
 						});
+						const model = oTable.getModel();
 						oDialog.setModel(oDialogDataModel, "fieldsInfo");
+						oDialog.setModel(model);
+						oDialog.setBindingContext(dialogContext);
 						resolve(oDialog);
 					});
 				})