@sapui5/sap.suite.ui.generic.template 1.151.1 → 1.152.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.151.1",
+  "version": "1.152.1",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.151.1</version>
+	<version>1.152.1</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/SmartVisualFilterBar.js

@@ -13,6 +13,7 @@ sap.ui.define([
 	"sap/m/VBox",
 	"sap/m/Button",
 	"sap/m/Title",
+	"sap/m/Text",
 	"sap/suite/ui/generic/template/AnalyticalListPage/controller/DropDownController",
 	"sap/suite/ui/generic/template/AnalyticalListPage/controller/DynamicDateRangeController",
 	"sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/FilterItemMicroBar",
@@ -49,6 +50,7 @@ sap.ui.define([
 	VBox,
 	Button,
 	Title,
+	Text,
 	DropDownController,
 	DynamicDateRangeController,
 	FilterItemMicroBar,
@@ -854,10 +856,9 @@ sap.ui.define([
 			titleMD.addStyleClass("sapSmartTemplatesAnalyticalListPageRequired");
 		}
 		//second part of the title i.e unit and currency
-		var titleUnitCurr = new Title({
+		var titleUnitCurr = new Text({
 				text: titleObject.titleUnitCurr.length > 1 ? "| " + titleObject.titleUnitCurr : "",
-				titleStyle: SapCoreLibrary.TitleLevel.H6,
-				level: SapCoreLibrary.TitleLevel.Auto,
+				wrapping: false,
 				width: titleObject.titleUnitCurr.length > 1 ? "4.15rem" : "0rem"
 			});
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.151.1"
+			"version": "1.152.1"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/Canvas/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.151.1"
+			"version": "1.152.1"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/Component.js

@@ -59,8 +59,10 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 				var oTemplatePrivate = oComponent.getModel("_templPriv");
 				oTemplatePrivate.setProperty("/listReport", {}); // Note that component properties are not yet available here
             },
-			onActivate: function() {
-				oViewProxy.onComponentActivate();
+			onActivate: function(sBindingPath, bIsComponentCurrentlyActive, bIsBackwards) {
+				if (bIsBackwards) {
+					oViewProxy.onComponentActivate();
+				}
 			},
 			adaptToChildContext: function(sCurrentChildContext) {
 				oViewProxy.adaptToChildContext(sCurrentChildContext);

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_sv.properties

@@ -73,7 +73,7 @@ CANCEL_AND_DISCARD=F\u00F6rkasta utkast?
 
 DISCARD_EDIT=F\u00F6rkasta alla \u00E4ndringar?
 
-DISCARD=F\u00F6rkasta
+DISCARD=Kasta
 
 DELETE=Radera
 

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.151.1"
+			"version": "1.152.1"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/FullscreenPage.fragment.xml

@@ -93,6 +93,9 @@
 						</template:with>
 					</OverflowToolbar>
 				</f:footer>
+				<f:landmarkInfo>
+					<f:DynamicPageAccessibleLandmarkInfo footerRole="ContentInfo"/>
+				</f:landmarkInfo>
 			</f:DynamicPage>
 		</template:with>
 	</template:with>

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.151.1"
+			"version": "1.152.1"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.151.1"
+			"version": "1.152.1"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.151.1"
+		"version": "1.152.1"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartFilterBarWrapper.js

@@ -33,6 +33,8 @@ sap.ui.define([
 		// not yet been called (race condition on second navigation: bAllControlsInitialized=true
 		// causes fnApplyVariantState to run synchronously, triggering afterVariantLoad before the
 		// Promise.all in SmartVariantManagementWrapper resolves and calls setSVMWrapperCallbacks).
+		// Cold-start _CUSTOM restore is also handled there: afterVariantLoad("INIT") fires before
+		// getInitializedPromise() resolves, so modifyStartupExtension always gets the final word.
 		var oSVMWrapperCallbacks = null;
 
 		var oVariantManagementInitializedPromise;
@@ -59,10 +61,9 @@ sap.ui.define([
 				if (oCustomData && oCustomData[dataPropertyNameGeneric]) {
 					oGenericData = oCustomData[dataPropertyNameGeneric];
 				} else {
-					// getCustomFilterData() returns null on cold start (no prior sap-iapp-state) because
-					// setCustomFilterData() is only called from beforeVariantFetch (variant save path),
-					// never during the initial LREP variant load. The _CUSTOM section is present in the
-					// variant content — fall back to reading it via getVariantContent().
+					// getCustomFilterData() returns null when no beforeVariantFetch has run yet for this
+					// variant (e.g. a named variant being switched to for the first time in the session, or cold-start INIT).
+					// The _CUSTOM section is present in the variant content — fall back to reading it via getVariantContent().
 					try {
 						var oSVM = oSmartFilterBar.getSmartVariant();
 						// getCurrentVariantId() converts STANDARDVARIANTKEY to "" which _getVariantById can't look up.

package/src/sap/suite/ui/generic/template/js/AnnotationHelper.js

@@ -924,26 +924,30 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					oDataField = oCollection[i];
 					oResult = null;
 					// if type is DataFieldForAnnotation, then loop over target annotations
-					if (oDataField.RecordType === "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" &&
-						oDataField.Target.AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.FieldGroup") >= 0) {
-						// oDataField = oAnnotationHelper.getDataFieldFromDataFieldForAnnotation(oInterface, oDataField);
-						var oTargetLineItem = oMetaModel.getContext(oInterface.getPath() + "/" + i + "/Target");
-						var sResolvedPath = AnnotationHelperModel.resolvePath(oTargetLineItem);
-						var oDataFieldTarget = oMetaModel.getObject(sResolvedPath);
-
-						if (oDataFieldTarget.Data && oDataFieldTarget.Data.length > 0) {
-							for (var j = 0; j < oDataFieldTarget.Data.length; j++) {
-								oResult = oAnnotationHelper.generateAnnotatedActionCustomData(oDataFieldTarget.Data[j], oFacet, oTabItem, oChartItem);
-								if (oResult) {
-									aButtonsData.push(oResult);
+					try {
+						if (oDataField.RecordType === "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" &&
+							oDataField.Target.AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.FieldGroup") >= 0) {
+							// oDataField = oAnnotationHelper.getDataFieldFromDataFieldForAnnotation(oInterface, oDataField);
+							var oTargetLineItem = oMetaModel.getContext(oInterface.getPath() + "/" + i + "/Target");
+							var sResolvedPath = AnnotationHelperModel.resolvePath(oTargetLineItem);
+							var oDataFieldTarget = oMetaModel.getObject(sResolvedPath);
+
+							if (oDataFieldTarget.Data && oDataFieldTarget.Data.length > 0) {
+								for (var j = 0; j < oDataFieldTarget.Data.length; j++) {
+									oResult = oAnnotationHelper.generateAnnotatedActionCustomData(oDataFieldTarget.Data[j], oFacet, oTabItem, oChartItem);
+									if (oResult) {
+										aButtonsData.push(oResult);
+									}
 								}
 							}
+						} else {
+							oResult = oAnnotationHelper.generateAnnotatedActionCustomData(oDataField, oFacet, oTabItem, oChartItem);
+							if (oResult) {
+								aButtonsData.push(oResult);
+							}
 						}
-					} else {
-						oResult = oAnnotationHelper.generateAnnotatedActionCustomData(oDataField, oFacet, oTabItem, oChartItem);
-						if (oResult) {
-							aButtonsData.push(oResult);
-						}
+					} catch (oError) {
+						oLogger.error("configure - " + JSON.stringify(oDataField));
 					}
 				}
 			}

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -961,7 +961,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.151.1
+	 * @version 1.152.1
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/Application.js

@@ -810,18 +810,6 @@ sap.ui.define(["sap/ui/base/Object",
 				return oTemplateContract.oNavigationControllerProxy.preloadComponent(sRouteName);
 			} 
 		
-			// Returns true when a navigation call will open in a new tab rather than replacing the current app.
-			// sap-ushell-navmode (manifest-level) takes priority; sap-ushell-next-navmode (FLP startup parameter,
-			// system-level) is the fallback — mirroring how NavigationHandler itself determines explace.
-			function fnIsExplaceNavigation(oOutboundParameters) {
-				if (oOutboundParameters && oOutboundParameters["sap-ushell-navmode"] === "explace") {
-					return true;
-				}
-				var oComponentData = oTemplateContract.oAppComponent.getComponentData && oTemplateContract.oAppComponent.getComponentData();
-				var oStartupParams = oComponentData && oComponentData.startupParameters;
-				return !!(oStartupParams && oStartupParams["sap-ushell-next-navmode"] && oStartupParams["sap-ushell-next-navmode"][0] === "explace");
-			}
-
 			oTemplateContract.oApplicationProxy = { // inject own api for AppComponent into the Template Contract. Other classes (NavigationController, BusyHelper) will call these functions accordingly.
 				createDraftSiblingPromise: oContextBookkeeping.createDraftSiblingPromise,
 				getDraftSiblingPromise: oContextBookkeeping.getDraftSiblingPromise,
@@ -928,7 +916,6 @@ sap.ui.define(["sap/ui/base/Object",
 				mustRequireRequestsCanonical: mustRequireRequestsCanonical,
 				getNavigationHandler: getNavigationHandler,
 				navigateExternal: fnNavigateExternal,
-				isExplaceNavigation: fnIsExplaceNavigation,
 				getStatePreservationMode: getStatePreservationMode,
 				setObjectInEditMode: fnSetObjectInEditMode,
 				getObjectInEditMode: fnGetObjectInEditMode,

package/src/sap/suite/ui/generic/template/lib/CommonEventHandlers.js

@@ -722,7 +722,7 @@ sap.ui.define(["sap/ui/base/Object",
 			// null object has to be passed as the fourth argument (i.e. for oInnerAppData) to the navigate method as an indicator that the state should not be overwritten
 			// Explace outbounds must bypass fnNavigateExternal to avoid setting the app busy and consuming the re-entry guard.
 			// getNavigationHandler() returns a ghost stub (no .navigate) when ghostapp=true — guard before calling.
-			if (oServices.oApplication.isExplaceNavigation(oOutbound.parameters)) {
+			if (oOutbound.parameters && oOutbound.parameters["sap-ushell-navmode"] === "explace") {
 				var oNavHandler = oServices.oApplication.getNavigationHandler();
 				if (oNavHandler.navigate) {
 					oNavHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError, null, "explace");
@@ -742,15 +742,7 @@ sap.ui.define(["sap/ui/base/Object",
 			oCommonUtils.removePropertiesFromNavigationContext(oSelectionVariant, oEventSource);
 			oController.adaptNavigationParameterExtension(oSelectionVariant, oObjectInfo);
 			oCommonUtils.setComponentRefreshBehaviour(oOutbound);
-			// SmartLink outbounds have no manifest parameters so sap-ushell-navmode is never set.
-			// System-level sap-ushell-next-navmode can still force a new tab — bypass the re-entry guard in that case.
-			if (oServices.oApplication.isExplaceNavigation()) {
-				if (oNavigationHandler.navigate) {
-					oNavigationHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError, null, "explace");
-				}
-			} else {
-				oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
-			}
+			oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
 		}
 
 		function fnHideTitleArea(oSmLiContent,aContactTitleArea) {
@@ -1123,15 +1115,8 @@ sap.ui.define(["sap/ui/base/Object",
 						// The value "sEntitySet" holds the entity set of an object page or a table.
 						//
 						// Sometimes, the SmartLink is located on a field group which belongs to the child entity set of object page.
-						// So, we try to derive the entity type from the SmartLink's binding context.
+						// So, we have to always derive the entity type from the smart link's binding context.
 						var oEntityType = ModelUtil.getEntityTypeFromContext(oControl.getBindingContext());
-						// CS20260013063140: ModelUtil.getEntityTypeFromContext returns null when the SmartLink
-						// is resolved via SmartLinkDelegate, because the binding context is not yet resolvable
-						// to an entity type at that point.
-						// Fall back to deriving the entity type from the enclosing entity set instead.
-						if (!oEntityType) {
-							oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
-						}
 						var oField = oEntityType.property.find(function (oProperty) { return oProperty.name === sSourceClickedField; });
 						var sTextArrangement = "descriptionAndId";
 						if (oField) { // TODO: Need to provide the correct field Object using the entityType and corresponding association (should be handled by a BLI)
@@ -2739,7 +2724,7 @@ sap.ui.define(["sap/ui/base/Object",
 			oCommonUtils.setComponentRefreshBehaviour(oOutbound);
 			// Explace outbounds must bypass fnNavigateExternal to avoid setting the app busy and consuming the re-entry guard.
 			// getNavigationHandler() returns a ghost stub (no .navigate) when ghostapp=true — guard before calling.
-			if (oServices.oApplication.isExplaceNavigation(oOutbound.parameters)) {
+			if (oOutbound.parameters && oOutbound.parameters["sap-ushell-navmode"] === "explace") {
 				var oNavHandler = oServices.oApplication.getNavigationHandler();
 				if (oNavHandler.navigate) {
 					oNavHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError, null, "explace");

package/src/sap/suite/ui/generic/template/lib/CommonUtils.js

@@ -835,10 +835,10 @@ sap.ui.define(["sap/ui/base/Object",
 
 				setComponentRefreshBehaviour(oOutbound);
 
-				// We now skip setting the app to busy mode when opening a new tab and bypass the re-entry guard (fnNavigateExternal) for explace navigations:
-				// the source app stays alive when a new tab is opened, so without the bypass AppComponent.restore() is never called and the guard is never reset.
-				if (oServices.oApplication.isExplaceNavigation(oOutbound.parameters)) {
-					oNavigationHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, null, null, "explace");
+				// We now  ensure that the 'sap-ushell-navmode' parameter is passed to the NavigationHandler.navigate method
+				// and skip setting the app to busy mode when opening a new tab
+				if (oOutbound.parameters["sap-ushell-navmode"] === "explace") {
+					oNavigationHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, null, null, oOutbound.parameters["sap-ushell-navmode"]);
 				} else {
 					oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, fnHandleError);
 					//null object has to be passed to the NavigationHandler as an

package/src/sap/suite/ui/generic/template/lib/ShareUtils.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkB
 		// Here we have introduced probing as for test scenarios as sap.ushell is not present all the iframe cases
 		var UShellContainer = sap.ui.require("sap/ushell/Container");
 		return UShellContainer ? new Promise(function(fnResolve){
-			UShellContainer.getFLPUrlAsync(true).done(function (sFLPUrl){
+			UShellContainer.getFLPUrlAsync(true).then(function (sFLPUrl){
 				fnResolve(sFLPUrl);
 			});
 		}) : Promise.resolve(document.URL);

package/src/sap/suite/ui/generic/template/lib/ai/EasyFill/EasyFillAIOrchestrator.js

@@ -188,14 +188,9 @@ sap.ui.define([
                         oSplitResult.collectionsWithRejectedNewRows[sFieldName] = sRejectionType;
                     }
 
+                    // All proposed new rows are accepted when creation is allowed
                     var aNewRows = bAllowsCreation ? aRawNewRows : [];
 
-                    // Cap new rows to one per table; flag if the AI proposed more
-                    if (aNewRows.length > 1) {
-                        oSplitResult.attemptedMultipleNewRows = true;
-                        aNewRows = [aNewRows[0]];
-                    }
-
                     var aRowUpdates = aExistingRowUpdates.concat(aNewRows);
 
                     var oValidation = oFieldCollector.isValidSmartTable(oFieldMeta.entitySet, oObjectPage);

package/src/sap/suite/ui/generic/template/lib/ai/EasyFill/EasyFillApplyHandler.js

@@ -1,7 +1,8 @@
 sap.ui.define([
     "sap/suite/ui/generic/template/genericUtilities/FeLogger",
-    "sap/suite/ui/generic/template/genericUtilities/FeError"
-], function(FeLogger, FeError) {
+    "sap/suite/ui/generic/template/genericUtilities/FeError",
+    "sap/suite/ui/generic/template/lib/ai/EasyFill/EasyFillFieldCollector"
+], function(FeLogger, FeError, EasyFillFieldCollector) {
     "use strict";
 
     var sClassName = "lib.ai.EasyFill.EasyFillApplyHandler";
@@ -45,7 +46,8 @@ sap.ui.define([
 
             // Copy each AI-suggested property value from the transient context to the live OP context
             for (var sProp in oTransientObject) {
-                if (sProp !== "__metadata" && mUpdatableLookupMap[sProp]) {
+                if (!Object.prototype.hasOwnProperty.call(oTransientObject, sProp)) { continue; }
+                if (sProp !== "__metadata" && Object.prototype.hasOwnProperty.call(mUpdatableLookupMap, sProp)) {
                     oObjectPageContext.setProperty(sProp, oTransientObject[sProp]);
                     iApplied++;
                 }
@@ -84,7 +86,7 @@ sap.ui.define([
          *
          * @param {object} oTableStagingState - table staging state { mPendingNewRowContexts }
          * @param {object} mCollectionState - collection tracking state (mCollectionProperties)
-         * @returns {object} map of { navProperty: plainValuesObject }
+         * @returns {object} map of { navProperty: plainValuesObject[] }
          */
         extractPendingNewRowValues: function(oTableStagingState, mCollectionState) {
             var mNewRowValues = Object.create(null);
@@ -96,18 +98,20 @@ sap.ui.define([
                 var mCollectionPropertyMap = (mCollectionState && mCollectionState.mCollectionProperties &&
                     mCollectionState.mCollectionProperties[sCollectionName]) || Object.create(null);
 
-                // Extract scalar values set by the user during the preview (first new row only — cap is 1)
-                var oNewContext = aNewContexts[0];
-                var oValues = Object.create(null);
-                Object.keys(mCollectionPropertyMap).forEach(function(sPropName) {
-                    var vValue = oNewContext.getProperty && oNewContext.getProperty(sPropName);
-                    if (vValue !== undefined && vValue !== null && typeof vValue !== "object") {
-                        oValues[sPropName] = vValue;
-                    }
+                // Extract scalar values for ALL new row contexts — multiple row creation is supported
+                var aRowValues = aNewContexts.map(function(oNewContext) {
+                    var oValues = Object.create(null);
+                    Object.keys(mCollectionPropertyMap).forEach(function(sPropName) {
+                        var vValue = oNewContext.getProperty && oNewContext.getProperty(sPropName);
+                        if (vValue !== undefined && vValue !== null && typeof vValue !== "object") {
+                            oValues[sPropName] = vValue;
+                        }
+                    });
+                    return oValues;
                 });
-                mNewRowValues[sCollectionName] = oValues;
-                oLogger.debug("extractPendingNewRowValues: extracted " + Object.keys(oValues).length +
-                    " value(s) for new row in '" + sCollectionName + "'");
+                mNewRowValues[sCollectionName] = aRowValues;
+                oLogger.debug("extractPendingNewRowValues: extracted " + aRowValues.length +
+                    " new row(s) for '" + sCollectionName + "'");
             });
             return mNewRowValues;
         },
@@ -208,7 +212,6 @@ sap.ui.define([
          * @param {function} fnResetTransientContext - EasyFillFormRenderer.resetTransientContext
          */
         resetEasyFill: function(bRemoveTextAreaValue, oDialogModel, oController, mCollectionUpdates, oEasyFillLayoutMode, fnRevertStagedUpdates, fnResetTransientContext) {
-            // Remove dynamically-added table ObjectPageSections from the shared OPL
             var sTableSectionMarker = "easyfillTableSection";
             var oObjectPageLayout = oController.byId("EasyFillObjectPageLayout");
             if (oObjectPageLayout) {
@@ -222,13 +225,9 @@ sap.ui.define([
                 });
             }
 
-            // Revert any staged table row values back to original
             fnRevertStagedUpdates();
-
-            // Reset the transient context (discard all staged scalar AI values)
             fnResetTransientContext();
 
-            // Reset all dialog model properties to their initial state
             oDialogModel.setProperty("/isFormVisible", false);
             oDialogModel.setProperty("/isIllustrationVisible", true);
             oDialogModel.setProperty("/isSaveEnabled", false);
@@ -246,16 +245,13 @@ sap.ui.define([
             oDialogModel.setProperty("/nonUpdatableFields", {});
             oDialogModel.setProperty("/hasNonUpdatableFields", false);
 
-            // Clear the mutable collection updates map in place
             Object.keys(mCollectionUpdates).forEach(function(sKey) {
                 delete mCollectionUpdates[sKey];
             });
 
             if (bRemoveTextAreaValue) {
                 var oTextArea = oController.byId("EasyFillInputTextArea");
-                if (oTextArea) {
-                    oTextArea.setValue("");
-                }
+                if (oTextArea) { oTextArea.setValue(""); }
                 oDialogModel.setProperty("/isEasyFillButtonEnabled", false);
             }
 
@@ -289,30 +285,15 @@ sap.ui.define([
         },
 
         _isEditableProperty: function(oPropertyMeta, oRowObject) {
-            if (!oPropertyMeta) {
-                return false;
-            }
-            var sUpdatable = oPropertyMeta["sap:updatable"];
-            if (sUpdatable) {
-                return sUpdatable !== "false";
-            }
-            var oAnnotation = oPropertyMeta["com.sap.vocabularies.Common.v1.FieldControl"];
-            if (oAnnotation && oAnnotation["EnumMember"]) {
-                return oAnnotation["EnumMember"] !== "com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly";
-            }
-            var sFieldControl = oPropertyMeta["sap:field-control"];
-            if (sFieldControl) {
-                var iFieldControlValue = oRowObject && oRowObject[sFieldControl];
-                return iFieldControlValue !== 1;
-            }
-            return true;
+            return EasyFillFieldCollector.isEditableByContextObject(oPropertyMeta, oRowObject, undefined);
         },
 
         _isSupportedStagedValue: function(vValue) {
-            return vValue === null ||
-                vValue === undefined ||
+            return vValue !== undefined && (
+                vValue === null ||
                 typeof vValue !== "object" ||
-                vValue instanceof Date;
+                vValue instanceof Date
+            );
         },
 
         _areValuesEqual: function(vLeft, vRight) {