@sapui5/sap.suite.ui.generic.template 1.108.30 → 1.108.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.108.30",
+  "version": "1.108.31",
   "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.108.30</version>
+	<version>1.108.31</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -735,11 +735,8 @@ sap.ui.define([
 			}
 
 			// This method is called when editing of an entity has started and the corresponding context is available
-			// aResult can contain both the target context for navigation in edit state and the target key,treenode of the target node or just the target context
-			// bContinueEditing is to navigate to the context directly.
-			//  - bContinueEditing faulty: User has pressed the 'Edit' button (draft and non-draft scenario)
-			//  - bContinueEditing truthy: User has pressed the 'Continue Editing' button (only draft scenario)
-			function fnStartEditing(oResult, bContinueEditing) {
+			// oResult can contain both the target context for navigation in edit state and the target key,treenode of the target node or just the target context
+			function fnStartEditing(oResult) {
 				var oDraft, oContext;
 				if (oResult) {
 					// if oResult contains both the property targetSiblingKey and context/draftAdministrativeData, initialise oContext with value context/draftAdministrativeData
@@ -750,19 +747,41 @@ sap.ui.define([
 					}
 				}
 				var bMoveToTop = !oObjectPage.getUseIconTabBar() && isObjectPageScrolledToTop();
+				var bWasEditable; // only used in the non-draft case
 				if (oDraft) {
 					// navigate to draft
 					// is a kind of cross navigation -> invalidate paginator info
 					oTemplateUtils.oServices.oApplication.invalidatePaginatorInfo();
 					oTemplateUtils.oServices.oApplication.switchToDraft(oDraft, oResult.targetSiblingKey);
-					oTemplateUtils.oServices.oApplication.setNextFocus(fnFocusForEdit.bind(null, bMoveToTop));
 				} else {
 					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 					oTemplatePrivateModel.setProperty("/objectPage/displayMode", 2);
-					fnFocusForEdit(bMoveToTop);
+					var oUIModel = oController.getView().getModel("ui");
+					bWasEditable = oUIModel.getProperty("/editable");
 				}
-				//set Editable independent of the fact that the instance is a draft or not
-				oViewProxy.setEditable(true);
+				oViewProxy.setEditable(true);   //set Editable independent of the fact that the instance is a draft or not
+				// The following logic ensures that the focus will be set correctly in the editable field.
+				// Note that the framework for setting the focus runs at the end of a busy session.
+				// In draft case this busy session will be started automatically as we are navigating to the newly created draft
+				// In non-draft case we start a busy session here which waits until all SmartFields have rendered to the new edit mode (if there is one).
+				// Even if no SmartFields needs to be rendered again a short busy session is created to trigger the focus handling infrastructure.
+				if (!oDraft){
+					var aWaitForSmartFieldsPromise = [];
+					if (!bWasEditable){ // Collect the Promises that are waiting for the SmartFields to be rendered
+						controlHelper.searchInTree(oObjectPage, function(oControl){
+							if (controlHelper.isSmartField(oControl)){
+								if (oControl.getMode() === "edit" && oControl.getBindingContext()){ // Ignore SmartFields which do not have a binding context. We assume that they are templates and not really rendered.
+									var oRenderedPromise = oControl._getNextModeRenderedPromise();
+									aWaitForSmartFieldsPromise.push(oRenderedPromise);
+								}
+								return false;
+							}
+						});
+					}
+					var oBusyHelper = oTemplateUtils.oServices.oApplication.getBusyHelper();
+					oBusyHelper.setBusy(Promise.all(aWaitForSmartFieldsPromise)); // setting the app busy will trigger the setting of focus finally    
+				}
+				oTemplateUtils.oServices.oApplication.setNextFocus(fnFocusForEdit.bind(null, bMoveToTop));				
 			}
 
 			var fnExpiredLockDialog; // declare function already here, to avoid usage before declaration

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

@@ -4,22 +4,22 @@ sap.ui.define([
 
 	/**
 	 * Constructor for SmartVariantManagementWrapper
-	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} vTarget - The SmartVariantManagement control 
+	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} vTarget - The SmartVariantManagement control
 	 * or the Id of control for which this wrapper is created
-	 * @param {object} oController - the controller of the current component 
+	 * @param {object} oController - the controller of the current component
 	 * @param {object} oFactory - the controlStateWrapperFactory
-	 * @param {object} mParams 
-	 * @param mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM 
-	 * (currently also including SFB wrapper - to be removed) 
+	 * @param {object} mParams
+	 * @param mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM
+	 * (currently also including SFB wrapper - to be removed)
 	 * @param mParams.dynamicPageWrapper - dynamicPageWrapper instance handled by SVM
 	 * @returns
 	 */
-	
+
 	function SmartVariantManagementWrapper(vTarget, oController, oFactory, mParams) {
 		// Special handling of SmartFilterBarWrapper for several reasons:
 		// - Suppress selection when restoring a variant. Selection is solely triggered according to information in appState. Otherwise, erroneous selection could be triggered in
 		//		a few situations:
-		//		- Variant marked as execute on select, but no data selected in appState (execute on select marked when saving variant without selecting, or changed after state was 
+		//		- Variant marked as execute on select, but no data selected in appState (execute on select marked when saving variant without selecting, or changed after state was
 		//			stored)
 		//		- Fallback to standard variant in case of dirty variant in state
 		//		- Fallback to standard variant if variant cannot be read (logic of SVM)
@@ -42,11 +42,11 @@ sap.ui.define([
 		// - not available at this point in time, and no corresponding event to attach to available
 		// - provides only those controls with directly connection to SVM implemented (i.e. with wrappers marked with bVMConnection)
 
-		// ensure managed state wrappers do not trigger change event when applying state to them. 
+		// ensure managed state wrappers do not trigger change event when applying state to them.
 		// Todo: rethink, whether this is the right place to do this (or rather when the wrappers get created)
 		mParams.managedControlWrappers = mParams.managedControlWrappers.map(oFactory.getSuppressChangeEventWhenApplyingWrapper);
 
-		// Any change of managed control should also mark variant as modified. However, this is not true for controls with direct connection to SVM (SFB, SmartTable, SmartChart). 
+		// Any change of managed control should also mark variant as modified. However, this is not true for controls with direct connection to SVM (SFB, SmartTable, SmartChart).
 		// For these controls, a real user changes are already handled by the direct connection. On the other hand, these controls also fire their change events, if their state is
 		// changed from SVM (by the same connection) - setting variant dirty here would be wrong.
 		mParams.managedControlWrappers.forEach(function(oWrapper){
@@ -56,18 +56,18 @@ sap.ui.define([
 				});
 			}
 		});
-		
-		
+
+
 
 		function fnSetControl(oControl) {
 			oSmartVariantManagement = oControl;
 			fnResolveControlAssigned(oSmartVariantManagement);
 		}
-		
+
 		var oSmartFilterBarWrapper = mParams.managedControlWrappers.find(function(oWrapper){
 			return oWrapper.setSVMWrapperCallbacks;
 		});
-		
+
 		// provide callbacks needed for SFB wrapper to store/restore extnesion state with variant
 		if (oSmartFilterBarWrapper){
 			oSmartFilterBarWrapper.setSVMWrapperCallbacks({
@@ -94,7 +94,7 @@ sap.ui.define([
 		}
 
 		// Wrapper is intended to set a state to the ui, but not to trigger a selection (which should happen only after all (relevant) parts of ui state is set to the correct state
-		// are set correct. Therefore, setting variant from here should never trigger a selection. 
+		// are set correct. Therefore, setting variant from here should never trigger a selection.
 		function fnSetVariant(sVariantId){
 			if (oSmartFilterBarWrapper){
 				oSmartFilterBarWrapper.suppressSelection(true);
@@ -103,24 +103,28 @@ sap.ui.define([
 			var oControl = oController.getView().byId(sId);
 			if (oControl && oControl.isA("sap.ui.comp.smarttable.SmartTable")) {
 				oControl.attachAfterVariantInitialise(function() {
-					oControl.setCurrentVariantId(sVariantId);
-					oSmartVariantManagement.setModified(false);
+					//set currentVariantId only when sVariantId is not standard (as it might be overriding existing
+					//different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
+					if (sVariantId !== '*standard*' && oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
+						oControl.setCurrentVariantId(sVariantId);
+						oSmartVariantManagement.setModified(false);
+					}
 				});
-			} 
+			}
 			oSmartVariantManagement.setCurrentVariantId(sVariantId);
 			if (oSmartFilterBarWrapper){
 				oSmartFilterBarWrapper.suppressSelection(false);
 			}
 		}
 
-		// Restore state of all managed controls 
+		// Restore state of all managed controls
 		function fnSetManagedControlStates(oState){
-			// Usually, looping through mParams.managedControlWrappers or through oState.managedControlStates should be equivalent, but in exceptional cases, their might be 
-			// differences, if application has changed (changing the controls managed by the SVM - in LR, this could be achieved by changing setting SmartVariantManagement). 
+			// Usually, looping through mParams.managedControlWrappers or through oState.managedControlStates should be equivalent, but in exceptional cases, their might be
+			// differences, if application has changed (changing the controls managed by the SVM - in LR, this could be achieved by changing setting SmartVariantManagement).
 			// mParams.managedControlWrappers reflects current state, while oState.managedControlStates reflects state at the time iAppState was written
 			// - when adding a control (in LR changing setting SmartVariantManagement from false to true), state for that control would not be contained  - calling the wrapper with
 			//		undefined to ensure initial state
-			// - when removing a control, state would be contained that should not be applied here 
+			// - when removing a control, state would be contained that should not be applied here
 			mParams.managedControlWrappers.forEach(function(oWrapper){
 				oWrapper.setState(oState.managedControlStates[oWrapper.getLocalId()]);
 			});
@@ -158,8 +162,8 @@ sap.ui.define([
 					// set (which is achieved by empty string)
 					fnSetVariant("");
 					// Usually restoring the state of any of the managed controls should mark the variant as dirty, but there might be edge cases (state from an old release not containing information for any
-					// managed control now relevant), so to be on the safe side, we set modified=true explicitly. 
-					oSmartVariantManagement.currentVariantSetModified(true); 
+					// managed control now relevant), so to be on the safe side, we set modified=true explicitly.
+					oSmartVariantManagement.currentVariantSetModified(true);
 					fnSetManagedControlStates(oPreliminaryState);
 				} else {
 					fnSetVariant(oPreliminaryState.variantId);
@@ -171,7 +175,7 @@ sap.ui.define([
 							oSmartFilterBarWrapper.setState(oPreliminaryState.managedControlStates[oSmartFilterBarWrapper.getLocalId()]);
 						}
 						if (oPreliminaryState.variantId !== oSmartVariantManagement.getCurrentVariantId()){
-							// variant could not be set because it is not known, i.e. it could be private and URL was shared, or could be deleted after page was bookmarked. In this case, 
+							// variant could not be set because it is not known, i.e. it could be private and URL was shared, or could be deleted after page was bookmarked. In this case,
 							// standard variant is set (by VM). Additionally, it should be marked as modified.
 							oSmartVariantManagement.currentVariantSetModified(true);
 						}
@@ -187,19 +191,19 @@ sap.ui.define([
 			oControlAssignedPromise.then(function() {
 				// state change when user selects a different variant
 				oSmartVariantManagement.attachSelect(fnHandler);
-				
+
 				// when user saves current state as a new variant, this is also a state change (as the variant id is part of the state)
 				// note: Even if new (SFB) variant is marked as execute on select, and currently no data is selected, no need to select data here (and thus also not to collapse header).
-				// This is one of the possible ways to get into a state with a clean variant with execute on select, but no data loaded - see also comment to identify SFB wrapper.  
+				// This is one of the possible ways to get into a state with a clean variant with execute on select, but no data loaded - see also comment to identify SFB wrapper.
 				oSmartVariantManagement.attachAfterSave(fnHandler);
-				
+
 				// any change of a managed control is state change
 				mParams.managedControlWrappers.forEach(function(oWrapper){
 					oWrapper.attachStateChanged(fnHandler);
 				});
 			});
 		}
-		
+
 		return {
 			getState : getState,
 			setState : setState,

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

@@ -856,7 +856,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.108.30
+	 * @version 1.108.31
 	 * @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/i18n/i18n_de.properties

@@ -29,7 +29,7 @@ ST_CHANGES_APPLIED=Ihre \u00C4nderungen wurden \u00FCbernommen.
 
 DATA_LOSS_MESSAGE=Ihre Eintr\u00E4ge gehen beim Verlassen dieser Seite verloren.
 
-DATA_LOSS_GENERAL_MESSAGE=Eint. gehen verloren
+DATA_LOSS_GENERAL_MESSAGE=Ihre Eintr\u00E4ge gehen verloren, wenn Sie fortfahren.
 
 PROCEED=Fortfahren
 

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

@@ -2943,7 +2943,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.108.30
+	 * @version 1.108.31
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

@@ -38,7 +38,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/core/library','sap/fe/placeholder/lib
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.108.30",
+		version: "1.108.31",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {