@sapui5/sap.suite.ui.generic.template 1.120.43 → 1.120.45

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.120.43"
+			"version": "1.120.45"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_de.properties

@@ -17,9 +17,9 @@ DRAFT_VERSION=Entwurf
 
 SAVE=Sichern
 
-SAVE_AND_EDIT=Sichern und Bearbeiten
+SAVE_AND_EDIT=Sichern und bearbeiten
 
-SAVE_AND_NEXT=Sichern und Weiter
+SAVE_AND_NEXT=Sichern und weiter
 
 VALIDATE_DRAFT=Validieren
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_id.properties

@@ -57,7 +57,7 @@ MSG_SUBTITLE_ROW_HIDDEN_COLUMN_HIDDEN=Baris (Sembunyi)\: {0}, Kolom (Sembunyi)\:
 
 CONTACT_INFO=Informasi Kontak
 
-CONTACT_JOB_TITLE=Judul Pekerjaan
+CONTACT_JOB_TITLE=Jabatan Pekerjaan
 
 CONTACT_DEPARTMENT=Departemen
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_pt.properties

@@ -17,7 +17,7 @@ DRAFT_VERSION=Esbo\u00E7o
 
 SAVE=Salvar
 
-SAVE_AND_EDIT=Salvar e editar
+SAVE_AND_EDIT=Gravar e editar
 
 SAVE_AND_NEXT=Gravar e seguinte
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_uk.properties

@@ -19,7 +19,7 @@ SAVE=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438
 
 SAVE_AND_EDIT=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0456 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438
 
-SAVE_AND_NEXT=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0456 \u043F\u0440\u043E\u0434\u043E\u0432\u0436\u0438\u0442\u0438
+SAVE_AND_NEXT=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0442\u0430 \u0434\u0430\u043B\u0456
 
 VALIDATE_DRAFT=\u041F\u0435\u0440\u0435\u0432\u0456\u0440\u0438\u0442\u0438
 

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

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.120.43"
+			"version": "1.120.45"
 		},
 		"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.120.43"
+			"version": "1.120.45"
 		},
 		"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.120.43"
+		"version": "1.120.45"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -155,7 +155,7 @@ sap.ui.define([
 			oPreliminaryState = oState;
 
 			// Wait for all managed controls to be initialized before applying state
-			oAllControlsInitializedPromise.then(function() {
+			return oAllControlsInitializedPromise.then(function() {
 				bIsApplyingVariant = true;
 				if (!oPreliminaryState) {
 					// if no state is provided set default variant (not modified)

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

@@ -939,7 +939,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.43
+	 * @version 1.120.45
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	return UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

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

@@ -333,67 +333,105 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 		}
 
 		/*
-		Allows direct edit on the entires on the list, unlike the method 'edit'above, this method first edit the entry with preserveChanges as true
-		If the response indicates an unsaved change or locked record, a corresponding dialog is shown to proceed or cancel with the edit.
-		*/
-		function directEdit(oTransactionController, sEntitySet, sBindingPath, oModel, oApplication, oCommonUtils, oViewDependencyHelper, oViewProxy, bOpenInEditMode){
+		 * Initiates editing of a list entry directly (without navigating to the object page first).
+		 * Unlike the 'edit' method above, the first editEntity call uses preserveChanges=true.
+		 * If the backend responds with a 409 (conflict) the DraftAdministrativeData is read to
+		 * distinguish between a locked record and a record with unsaved changes by another user.
+		 * A corresponding dialog is shown to let the user decide how to proceed.
+		 *
+		 * @param {object}  oTransactionController  - transaction controller providing editEntity
+		 * @param {string}  sEntitySet              - name of the entity set
+		 * @param {object}  oBindingContext          - UI5 Context of the row being edited;
+		 *                                            the OData model and binding path are derived
+		 *                                            from it via .getModel() / .getPath()
+		 * @param {object}  oApplication            - application proxy (busy helper, component utils, …)
+		 * @param {string}  sAppId                  - ID of the AppComponent; used as the localStorage cache
+		 *                                            key for the content-id batch optimisation
+		 * @param {object}  oCommonUtils             - common utilities (getText, …)
+		 * @param {object}  oViewDependencyHelper    - used to mark the root page as dirty
+		 * @param {object}  oViewProxy               - used for navigateUp on cancellation
+		 * @param {boolean} bOpenInEditMode          - whether the page was opened directly in edit mode
+		 */
+		function directEdit(oTransactionController, sEntitySet, oBindingContext, oApplication, sAppId, oCommonUtils, oViewDependencyHelper, oViewProxy, bOpenInEditMode){
 			var oDraftContext = oTransactionController.getDraftController().getDraftContext();
-			var oPromise = new Promise(function(resolve,reject) {
-				oModel.createBindingContext(sBindingPath, null, null, function(oBindingContext){
-					if (oDraftContext.isDraftEnabled(sEntitySet)) {
-						oTransactionController.editEntity(oBindingContext, true).then(function(oResponse) {
-							oBindingContext.getModel().invalidateEntry(oBindingContext);
-							oViewDependencyHelper.setRootPageToDirty();
-							resolve({
-								context: oResponse.context
-							});
-						}, function(oResponse) {
-							if (oResponse && oResponse.response && oResponse.response.statusCode === "409") {
-								//remove transient message associated with rc 409 in order to prevent message pop-up
-								oApplication.removeTransientMessages();
-								fnReadDraftAdministrativeData(oModel, sBindingPath, oApplication.getBusyHelper()).then(
-									function(oResponse) {
-										if (oResponse.DraftAdministrativeData.InProcessByUser) {
-											reject({
-												lockedByUser: oResponse.DraftAdministrativeData.InProcessByUserDescription || oResponse.DraftAdministrativeData.InProcessByUser
-											});
-										} else { //unsaved changes
-											var editConfirmation = function(){
-											var oUnsavedChangesEditPromise = oTransactionController.editEntity(oBindingContext, false).then(function(oResponse){
-													oBindingContext.getModel().invalidateEntry(oBindingContext);
-													oViewDependencyHelper.setRootPageToDirty();
-													resolve({
-														context: oResponse.context
-													});
-												});
-												oApplication.getBusyHelper().setBusy(oUnsavedChangesEditPromise, true);
-											};
-											var editRejection = reject({
-												cancelled: true
-											});
-											var unSavedChangesDialogPromise = fnUnsavedChangesDialog(undefined, oResponse.DraftAdministrativeData,oCommonUtils, oViewProxy, bOpenInEditMode);
-											unSavedChangesDialogPromise.then(editConfirmation,editRejection);
-										}
-									},
-									function(oResponse) {
-										// DraftAdminData read failed
+
+			if (!oDraftContext.isDraftEnabled(sEntitySet)) {
+				return Promise.resolve({ context: oBindingContext });
+			}
+
+			var oModel = oBindingContext.getModel();
+			// Fetch sRootExpand for the content-id batch optimisation.
+			// getRootExpand is intentionally not provided: directEdit is always invoked from
+			// the List Report before the Object Page is active, so getRootExpand is not yet
+			// available. CacheHelper falls back to the localStorage cache, which is still
+			// much faster than fetching expands in a separate backend request.
+			var oInfoForContentIdPromise = CacheHelper.getInfoForContentIdPromise(sEntitySet, oModel, sAppId);
+
+			var oRet = oInfoForContentIdPromise.then(function(oInfoObject) {
+				var sRootExpand = oInfoObject.contentIdRequestPossible ? oInfoObject.parametersForContentIdRequest.sRootExpand : null;
+
+				return new Promise(function(resolve, reject) {
+					var oFirstEditPromise = oTransactionController.editEntity(oBindingContext, true, sRootExpand);
+					// Track the busy state against the individual network request so the busy
+					// indicator remains active for exactly as long as the request is in flight.
+					oApplication.getBusyHelper().setBusy(oFirstEditPromise, true);
+					oFirstEditPromise.then(function(oResponse) {
+						oModel.invalidateEntry(oBindingContext);
+						oViewDependencyHelper.setRootPageToDirty();
+						resolve({ context: oResponse.context });
+					}, function(oResponse) {
+						if (oResponse && oResponse.response && oResponse.response.statusCode === "409") {
+							//remove transient message associated with rc 409 in order to prevent message pop-up
+							oApplication.removeTransientMessages();
+							fnReadDraftAdministrativeData(oModel, oBindingContext.getPath(), oApplication.getBusyHelper()).then(
+								function(oResponse) {
+									if (oResponse.DraftAdministrativeData.InProcessByUser) {
 										reject({
-											draftAdminReadResponse: oResponse
+											lockedByUser: oResponse.DraftAdministrativeData.InProcessByUserDescription || oResponse.DraftAdministrativeData.InProcessByUser
 										});
-									});
-									oApplication.getBusyHelper().setBusy(oPromise, true);
-							} else {
-								reject(oResponse);
-							}
-						});
-				} else {
-					return resolve({
-						context: oBindingContext
+									} else { //unsaved changes
+										var editConfirmation = function() {
+											// Re-run editEntity without preserveChanges so the
+											// unsaved changes of another user are overwritten.
+											var oUnsavedChangesEditPromise = oTransactionController.editEntity(oBindingContext, false, sRootExpand).then(function(oResponse) {
+												oModel.invalidateEntry(oBindingContext);
+												oViewDependencyHelper.setRootPageToDirty();
+												resolve({ context: oResponse.context });
+											});
+											oApplication.getBusyHelper().setBusy(oUnsavedChangesEditPromise, true);
+										};
+										// editRejection is passed as the rejection handler of Promise.then(),
+										// so it must be a function reference; calling reject() inline here
+										// would execute it immediately instead of on dialog cancellation.
+										var editRejection = function() { reject({ cancelled: true }); };
+										var unSavedChangesDialogPromise = fnUnsavedChangesDialog(undefined, oResponse.DraftAdministrativeData, oCommonUtils, oViewProxy, bOpenInEditMode);
+										unSavedChangesDialogPromise.then(editConfirmation, editRejection);
+									}
+								},
+								function(oResponse) {
+									// DraftAdminData read failed
+									reject({ draftAdminReadResponse: oResponse });
+								}
+							);
+						} else {
+							reject(oResponse);
+						}
 					});
-				}
 				});
 			});
-			return oPromise;
+
+			// Ensure the active context is registered in ContextBookkeeping before the edit
+			// resolves. This caches the draft sibling path so subsequent navigation can use
+			// the cached value without an additional /SiblingEntity request.
+			// editingStarted() notifies all listeners (e.g. the message button helper) that
+			// the editing phase has begun for this context.
+			var bContextRegistered = oApplication.checkContextData(oBindingContext);
+			if (!bContextRegistered) {
+				oApplication.registerContext(oBindingContext, 1, sEntitySet);
+			}
+			oApplication.editingStarted(oBindingContext, oRet);
+
+			return oRet;
 		}
 
 		function deleteEntity(oDraftController, fnExecuteDelete, oApplicationProxy, oContext, bIsActiveEntity, sActionType){

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

@@ -1585,7 +1585,10 @@ sap.ui.define(["sap/ui/base/Object",
 			var bOpenInEditMode = !!oComponent.getEditFlow && oComponent.getEditFlow() === "direct";
 			if (bOpenInEditMode){
 				var sEntitySet = oTable.getEntitySet();
-				var oEditPromise = CRUDHelper.directEdit(oServices.oTransactionController, sEntitySet, oBindingContext.sPath, oBindingContext.getModel(), oServices.oApplication, oCommonUtils, oServices.oViewDependencyHelper, oViewProxy, bOpenInEditMode);
+				// oBindingContext is passed directly; the OData model and binding path are resolved inside directEdit.
+				// sAppId is derived here because oController is not accessible inside CRUDHelper.
+				var sAppId = oComponent.getAppComponent().getId();
+				var oEditPromise = CRUDHelper.directEdit(oServices.oTransactionController, sEntitySet, oBindingContext, oServices.oApplication, sAppId, oCommonUtils, oServices.oViewDependencyHelper, oViewProxy, bOpenInEditMode);
 				oEditPromise.then(function(oResult){
 					oCommonUtils.navigateFromListItem(oResult.context, bReplace, bOpenInEditMode);
 				}, function(oError){

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -3094,7 +3094,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.120.43
+	 * @version 1.120.45
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

@@ -60,7 +60,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.120.43",
+		version: "1.120.45",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {