@sapui5/sap.suite.ui.generic.template 1.120.47 → 1.120.49

package/package.json

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

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

@@ -55,7 +55,7 @@ VISUAL_FILTER_MEASURES=Medida por
 
 VISUAL_FILTER_CHART_TYPES=Tipos de gr\u00E1fico
 
-VISUAL_FILTER_CHART_TYPE_BAR=Gr\u00E1fico de barra
+VISUAL_FILTER_CHART_TYPE_BAR=Gr\u00E1fico de barras
 
 VISUAL_FILTER_CHART_TYPE_Line=Gr\u00E1fico de linha
 

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.120.47"
+			"version": "1.120.49"
 		},
 		"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.120.47"
+			"version": "1.120.49"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

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

@@ -108,7 +108,7 @@ sap.ui.define([
                 aCollection.sort(function (oFirstData, oSecondData) {
                     var iFirstDataImportance = getImportance(oFirstData);
                     var iSecondDataImportance = getImportance(oSecondData);
-                    return iFirstDataImportance < iSecondDataImportance ? -1 : 1;
+                    return iFirstDataImportance < iSecondDataImportance ? -1 : iFirstDataImportance > iSecondDataImportance ? 1 : 0;
                 });
             }
 

package/src/sap/suite/ui/generic/template/ListReport/controller/IappStateHandler.js

@@ -478,16 +478,15 @@ sap.ui.define([
 			// setCurrentVariantId which triggers SFB's filterChange event. oDataLoadedWrapper
 			// is attached to filterChange and resets bDataAreShownInTable to false — overwriting
 			// the value that was correctly restored from iAppState. Re-applying it explicitly
-			// after the microtask ensures the saved value wins after all synchronous activity
-			// settles, without depending on the full SVM async promise chain which may not
-			// resolve in test environments (OPA).
+			// after all wrapper promises settle ensures the saved value wins after all async
+			// activity completes (including SmartVariantManagementWrapper waiting for control
+			// initialization on cold start, e.g. tile click after browser refresh).
 			var bDataLoaded = oAppData.controlStates && oAppData.controlStates["$dataLoaded"];
-			fnAdaptOtherControlsToAppState(oAppData.controlStates);
-			Promise.resolve().then(function() {
+			fnAdaptOtherControlsToAppState(oAppData.controlStates).then(function() {
 				oDataLoadedWrapper.setState(bDataLoaded);
 				if (areDataShownInTable() && Object.keys(oState.oSmartFilterbar.verifySearchAllowed()).length === 0) {
-				// fnAdaptOtherControlsToAppState only (synchronously) sets the state including the information whether data should be loaded and search is allowed,- if this is the case, the actual loading
-				// (which happens asynchronous of course) still needs to be triggered
+				// fnAdaptOtherControlsToAppState sets the state including the information whether data should be loaded and search is allowed.
+				// Now that all wrappers (including SVM) have finished applying state, trigger the actual data loading.
 				loadData();
 				} else {
 					// hide placeholder already here, if no data is to be loaded - in case data is loaded, it will be hidden in data received event
@@ -817,12 +816,15 @@ sap.ui.define([
 		}
 
 		function fnAdaptOtherControlsToAppState(mControlsStates) {
+			var aPromises = [];
 			// adapt controls according to current implementation
 			// Information in state could actually differ (if state originates from old release, change in FE or app layer). Additional information in state should be ignored,
 			// missing information should lead to set initial state (which wrappers should do if called with undefined)
 			aControlStateWrappers.forEach(function (oWrapper) {
-				oWrapper.setState(mControlsStates[oWrapper.getLocalId()]);
+				var vResult = oWrapper.setState(mControlsStates[oWrapper.getLocalId()]);
+				aPromises.push(Promise.resolve(vResult));
 			});
+			return Promise.all(aPromises);
 		}
 
 		/**

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

@@ -66,7 +66,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.120.47"
+			"version": "1.120.49"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

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

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

@@ -631,6 +631,7 @@ sap.ui.define([
 
 		function restore(){
 			oTemplateContract.oBusyHelper.setBusyReason("exiting", false);
+			oTemplateContract.oApplicationProxy.resetExternalNavigation();
 			for (var sComponentId in oTemplateContract.componentRegistry){
 				var oRegistryEntry = oTemplateContract.componentRegistry[sComponentId];
 				if (oRegistryEntry.methods.onRestore) {
@@ -926,6 +927,7 @@ sap.ui.define([
 		var fnNormalizePagesMapToArray = testableHelper.testable(fnNormalizePagesMapToArray, "fnNormalizePagesMapToArray");
 		getConfig = testableHelper.testable(getConfig, "getConfig");
 		testableHelper.testable(setLeaveAppPromise, "AppComponent_setLeaveAppPromise");
+		testableHelper.testable(restore, "AppComponent_restore");
 		/* eslint-enable */
 
 		return oMethods;
@@ -939,7 +941,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.47
+	 * @version 1.120.49
 	 * @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/Application.js

@@ -84,6 +84,11 @@ sap.ui.define(["sap/ui/base/Object",
 		 */
 		function getMethods(oTemplateContract) {
 
+			// Set on first fnNavigateExternal call; blocks re-entry until reset. NavigationHandler.navigate() calls fnOnError
+			// on all failure paths and does not call it on the success path (app is leaving). The two valid reset points are
+			// therefore fnOnErrorWrapper (navigation failed) and AppComponent.restore() (FLP re-activated this app).
+			var bExternalNavigationTriggered = false;
+
 			var oFocusHelper = new FocusHelper(oTemplateContract);
 			var oContextBookkeeping = new ContextBookkeeping(oTemplateContract);
 			var mEntitySetToETagInfo = Object.create(null); // maps the name of the entity sets which have been already checked for eTag
@@ -673,8 +678,13 @@ sap.ui.define(["sap/ui/base/Object",
 				if (oCurrentNavigationHandler === GHOSTNAVIGATIONHANDLER){
 					return;
 				}
+				if (bExternalNavigationTriggered){
+					return;
+				}
+				bExternalNavigationTriggered = true;
 				oTemplateContract.oNavigationControllerProxy.leave();
-				var fnOnErrorWrapper = function(){
+				var fnOnErrorWrapper = function () {
+					bExternalNavigationTriggered = false;
 					oFocusHelper.setNextFocus(Function.prototype); // Do not change focus in case exiting the application fails
 					oTemplateContract.oBusyHelper.setBusyReason("exiting", false);  // in error case we are not navigating away         
 					if (fnOnError){
@@ -835,7 +845,10 @@ sap.ui.define(["sap/ui/base/Object",
 				removeTransientMessages: fnRemoveTransientMessages,
 				getTransientMessages: getTransientMessages,
 				setNextFocus: oFocusHelper.setNextFocus,
-				setStates: setStates
+				setStates: setStates,
+				resetExternalNavigation: function() {
+					bExternalNavigationTriggered = false;
+				}
 			};
 
 			return {

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

@@ -712,7 +712,16 @@ 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
-			oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			// 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 (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");
+				}
+			} else {
+				oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			}
 		}
 
 		function fnNavigateIntentSmartLink(oOutbound, oEventSource) {
@@ -2498,7 +2507,16 @@ sap.ui.define(["sap/ui/base/Object",
 			var oSelectionVariant = fnBuildSelectionVariantForNavigation(oOutbound, [], oContext);
 			oController.adaptNavigationParameterExtension(oSelectionVariant, oOutbound);
 			oCommonUtils.setComponentRefreshBehaviour(oOutbound);
-			oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			// 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 (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");
+				}
+			} else {
+				oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			}
 		}
 
 		function onSmartFieldInitialise(oEvent,sViewId){

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

@@ -811,7 +811,8 @@ sap.ui.define(["sap/ui/base/Object",
 					// oResponse is never going to have the value for oDatafield.name in the encoded format, hence the transformation into encodedURI.
 					// It may happen that the oResponse[oDatafield.name] contains some special characters (for ex: space) but in a decoded manner.
 					// but the route for Context Navigation requires the route string in the encoded way.
-					var sEncodedFieldValueFromODataResponse = encodeURIComponent(oResponse[oDatafield.name]);
+					var sFieldValueFromODataResponse = oResponse[oDatafield.name];
+					var sEncodedFieldValueFromODataResponse = encodeURIComponent(sFieldValueFromODataResponse);
 					switch (oDatafield.type) {
 						case "Edm.Guid":
 							if (oResponse.DraftAdministrativeData && oResponse.DraftAdministrativeData.DraftIsCreatedByMe) {
@@ -838,6 +839,10 @@ sap.ui.define(["sap/ui/base/Object",
 							var sFormattedvalue = ODataUtils.formatValue(sEncodedFieldValueFromODataResponse, oDatafield.type);
 							sRoute += sKeySeparator + oDatafield.name + "=" + sFormattedvalue;
 							break;
+						case "Edm.DateTime":
+							var sFormattedvalue = ODataUtils.formatValue(sFieldValueFromODataResponse, oDatafield.type);
+							sRoute += sKeySeparator + oDatafield.name + "=" + encodeURIComponent(sFormattedvalue);
+							break;
 						default:
 							if (typeof sEncodedFieldValueFromODataResponse === "string") {
 								sRoute += sKeySeparator + oDatafield.name + "=" + "'" + sEncodedFieldValueFromODataResponse + "'";

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

@@ -1,4 +1,5 @@
-sap.ui.define(["sap/ui/base/Object",
+sap.ui.define([
+	"sap/ui/base/Object",
 	"sap/ui/model/base/ManagedObjectModel",
 	"sap/suite/ui/generic/template/genericUtilities/controlHelper",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
@@ -9,8 +10,9 @@ sap.ui.define(["sap/ui/base/Object",
 	"sap/base/util/isEmptyObject",
 	"sap/suite/ui/generic/template/genericUtilities/FeError",
 	"sap/base/util/UriParameters",
+	"sap/suite/ui/generic/template/lib/ViewCreationHelper",
 	"sap/suite/ui/generic/template/lib/CommandComponentUtils"
-	], function(BaseObject, ManagedObjectModel, controlHelper, FeLogger, oDataModelHelper, CRUDActionHandler, StatePreserver, extend, isEmptyObject, FeError, UriParameters,
+	], function(BaseObject, ManagedObjectModel, controlHelper, FeLogger, oDataModelHelper, CRUDActionHandler, StatePreserver, extend, isEmptyObject, FeError, UriParameters, ViewCreationHelper,
 		CommandComponentUtils) {
 	"use strict";
 	var	sClassName = "lib.ComponentUtils";
@@ -474,80 +476,98 @@ sap.ui.define(["sap/ui/base/Object",
 				if (oComponentRegistryEntry.routingSpec && oComponentRegistryEntry.routingSpec.noOData){
 					fnPageDataLoadedOnNavigation(null, bAreKeysDifferent);
 				}
-				return;
+				return Promise.resolve();
+			}
+			var oViewReadyPromise = Promise.resolve();
+			if (oComponentRegistryEntry.oController) {
+				var oView = oComponentRegistryEntry.oController.getView();
+				if (oView && oView.isDestroyed()) {
+					// View creation of a specific component use to happen only once in the lifecycle of the component. 
+					// View is expected to be alive for the lifecycle of the template component. In some edge cases where 
+					// the same application variant is used as a target application & the source application has Keep-Alive 
+					// as true the source application, aggregated components & their corresponding views are not destroyed. 
+					// When target application is started and component is being created FE checks for the view with ID & if 
+					// exist it is destroyed. This means the Source App & component is active but its view will be destroyed. 
+					// Now if user navigates back to the source application & opens the same view again. To handle this
+					// scenario, FE checks for such situation and re-creates the view here.
+					oViewReadyPromise = ViewCreationHelper.initializeViewCreation(oComponentRegistryEntry);
+					oComponent.onBeforeRendering(oComponentRegistryEntry);
+				}
 			}
 			var oComponentContainer = oComponent.getComponentContainer();
 			if (!oComponentContainer){
-				return;
+				return Promise.resolve();
 			}
-			var oUIModel = oComponent.getModel("ui");
-			var bIsNonDraftCreate = !!oComponentRegistryEntry.nonDraftCreateContext;
-			if (bIsNonDraftCreate) {
-				var oBindingContext = oComponentContainer.getBindingContext();
-				if (oBindingContext === oComponentRegistryEntry.nonDraftCreateContext){
-					return; // page is already in correct state
-				}
-				oUIModel.setProperty("/enabled", true);
-				oUIModel.setProperty("/editable", true);
-				oUIModel.setProperty("/createMode", true);
-				fnUnbind(); // unbind if bound to another context or an element binding
-				if (fnHeaderDataAvailableResolve){
-					fnHeaderDataAvailableResolve(oComponentRegistryEntry.nonDraftCreateContext);
-					fnHeaderDataAvailableResolve = null;
+			return oViewReadyPromise.then(function() {
+				var oUIModel = oComponent.getModel("ui");
+				var bIsNonDraftCreate = !!oComponentRegistryEntry.nonDraftCreateContext;
+				if (bIsNonDraftCreate) {
+					var oBindingContext = oComponentContainer.getBindingContext();
+					if (oBindingContext === oComponentRegistryEntry.nonDraftCreateContext){
+						return; // page is already in correct state
+					}
+					oUIModel.setProperty("/enabled", true);
+					oUIModel.setProperty("/editable", true);
+					oUIModel.setProperty("/createMode", true);
+					fnUnbind(); // unbind if bound to another context or an element binding
+					if (fnHeaderDataAvailableResolve){
+						fnHeaderDataAvailableResolve(oComponentRegistryEntry.nonDraftCreateContext);
+						fnHeaderDataAvailableResolve = null;
+					} else {
+						oHeaderDataAvailablePromise = Promise.resolve(oComponentRegistryEntry.nonDraftCreateContext);
+					}
+					fnPreparePageDataLoaded();
+					if (oComponentRegistryEntry.methods.beforeRebind) {
+						oComponentRegistryEntry.methods.beforeRebind(oHeaderDataAvailablePromise);
+					}
+					oComponentContainer.setBindingContext(oComponentRegistryEntry.nonDraftCreateContext);
+					Promise.all([oComponentRegistryEntry.oViewRenderedPromise, oComponentRegistryEntry.viewRegistered]).then(fnCallPathUnchangedReuseCallbacks.bind(null, true, false));
+					if (oComponentRegistryEntry.methods.afterRebind) {
+						oComponentRegistryEntry.methods.afterRebind();
+					}			
 				} else {
-					oHeaderDataAvailablePromise = Promise.resolve(oComponentRegistryEntry.nonDraftCreateContext);
-				}
-				fnPreparePageDataLoaded();
-				if (oComponentRegistryEntry.methods.beforeRebind) {
-					oComponentRegistryEntry.methods.beforeRebind(oHeaderDataAvailablePromise);
-				}
-				oComponentContainer.setBindingContext(oComponentRegistryEntry.nonDraftCreateContext);
-				Promise.all([oComponentRegistryEntry.oViewRenderedPromise, oComponentRegistryEntry.viewRegistered]).then(fnCallPathUnchangedReuseCallbacks.bind(null, true, false));
-				if (oComponentRegistryEntry.methods.afterRebind) {
-					oComponentRegistryEntry.methods.afterRebind();
-				}			
-			} else {
-				var oElementBinding = oComponentContainer.getElementBinding();
-				if (oElementBinding){
-					if (sLogicalBindingPath === sBindingPath) {
-						/*
-						* component is already bound to this object - no rebound to avoid that 1:1, 1:N and expands are read
-						* again
-						*/
-						if (oElementBinding.isSuspended()) {
-							oElementBinding.resume();
-							fnAdaptToContext();
-						}
-						if (bIsDataLoading){
-							fnStartBusy();
-						}
-						oComponentRegistryEntry.oApplication.getBusyHelper().getUnbusy().then(fnCallPathUnchangedReuseCallbacks.bind(null, bAreKeysDifferent, false));
-						if (!bIsComponentCurrentlyActive){
-							fnPreparePageDataLoaded();
-						}
-						if (!bIsComponentCurrentlyActive && !isDraftEnabled()){ // in non-draft case: even if this object has been left in edit mode we now return to display mode, since the changes have already been discarded
-							var bEditFlowOfRoot = oComponentRegistryEntry.oApplication.getEditFlowOfRoot();
-							if (bEditFlowOfRoot === "direct") {
-								oUIModel.setProperty("/editable", true);
-							} else {
-								oUIModel.setProperty("/editable", false);
+					var oElementBinding = oComponentContainer.getElementBinding();
+					if (oElementBinding){
+						if (sLogicalBindingPath === sBindingPath) {
+							/*
+							* component is already bound to this object - no rebound to avoid that 1:1, 1:N and expands are read
+							* again
+							*/
+							if (oElementBinding.isSuspended()) {
+								oElementBinding.resume();
+								fnAdaptToContext();
 							}
+							if (bIsDataLoading){
+								fnStartBusy();
+							}
+							oComponentRegistryEntry.oApplication.getBusyHelper().getUnbusy().then(fnCallPathUnchangedReuseCallbacks.bind(null, bAreKeysDifferent, false));
+							if (!bIsComponentCurrentlyActive){
+								fnPreparePageDataLoaded();
+							}
+							if (!bIsComponentCurrentlyActive && !isDraftEnabled()){ // in non-draft case: even if this object has been left in edit mode we now return to display mode, since the changes have already been discarded
+								var bEditFlowOfRoot = oComponentRegistryEntry.oApplication.getEditFlowOfRoot();
+								if (bEditFlowOfRoot === "direct") {
+									oUIModel.setProperty("/editable", true);
+								} else {
+									oUIModel.setProperty("/editable", false);
+								}
+							}
+							oUIModel.setProperty("/enabled", true);
+							return;
+						} else if (!bIsComponentCurrentlyActive){
+							fnUnbind();
 						}
-						oUIModel.setProperty("/enabled", true);
-						return;
-					} else if (!bIsComponentCurrentlyActive){
-						fnUnbind();
 					}
+					// the following properties will be adapted by the change event of the binding
+					oUIModel.setProperty("/enabled", false);
+					oUIModel.setProperty("/editable", false);
+					oUIModel.setProperty("/createMode", false);
+					// and read the header data if necessary
+					fnRebindHeaderData(sBindingPath);
+
+					fnPreparePageDataLoaded();
 				}
-				// the following properties will be adapted by the change event of the binding
-				oUIModel.setProperty("/enabled", false);
-				oUIModel.setProperty("/editable", false);
-				oUIModel.setProperty("/createMode", false);
-				// and read the header data if necessary
-				fnRebindHeaderData(sBindingPath);
-
-				fnPreparePageDataLoaded();
-			}
+			});
 		}
 
 		// This method can be called in two scenarios:

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

@@ -6,24 +6,43 @@
 //   Note that this method cannot be used by any other class.
 // - getExtensionAPIPromise provides access to the instance of the extensionAPI suitable for a certain control
 
-sap.ui.define(["sap/ui/core/mvc/ControllerExtension",
-		"sap/ui/core/mvc/OverrideExecution",
-		"sap/ui/core/mvc/View",
-		"sap/ui/model/base/ManagedObjectModel",
-		"sap/suite/ui/generic/template/lib/TemplateViewController",
-		"sap/suite/ui/generic/template/lib/TemplateComponent",
-		"sap/suite/ui/generic/template/lib/CRUDManager",
-		"sap/suite/ui/generic/template/lib/CommonUtils",
-		"sap/suite/ui/generic/template/lib/ComponentUtils",
-		"sap/suite/ui/generic/template/lib/CommonEventHandlers",
-		"sap/suite/ui/generic/template/genericUtilities/testableHelper",
-		"sap/suite/ui/generic/template/support/lib/CommonMethods",
-		"sap/suite/ui/generic/template/genericUtilities/FeLogger",
-		"sap/base/util/deepExtend",
-		"sap/suite/ui/generic/template/lib/presentationControl/PresentationControlHandlerFactory",
-		"sap/suite/ui/generic/template/lib/info/InfoObjectHandler"
-], function(ControllerExtension, OverrideExecution, View, ManagedObjectModel, TemplateViewController, TemplateComponent, CRUDManager, CommonUtils,
-			ComponentUtils, CommonEventHandlers, testableHelper, CommonMethods, FeLogger, deepExtend, PresentationControlHandlerFactory, InfoObjectHandler) {
+sap.ui.define([
+	"sap/ui/core/mvc/ControllerExtension",
+	"sap/ui/core/mvc/OverrideExecution",
+	"sap/ui/core/mvc/View",
+	"sap/ui/model/base/ManagedObjectModel",
+	"sap/suite/ui/generic/template/lib/TemplateViewController",
+	"sap/suite/ui/generic/template/lib/TemplateComponent",
+	"sap/suite/ui/generic/template/lib/CRUDManager",
+	"sap/suite/ui/generic/template/lib/CommonUtils",
+	"sap/suite/ui/generic/template/lib/ComponentUtils",
+	"sap/suite/ui/generic/template/lib/CommonEventHandlers",
+	"sap/suite/ui/generic/template/genericUtilities/testableHelper",
+	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
+	"sap/base/util/deepExtend",
+	"sap/suite/ui/generic/template/lib/presentationControl/PresentationControlHandlerFactory",
+	"sap/suite/ui/generic/template/lib/info/InfoObjectHandler",
+	"sap/m/IllustratedMessageType",
+	"sap/suite/ui/generic/template/lib/ViewCreationHelper"
+], function(
+	ControllerExtension,
+	OverrideExecution,
+	View,
+	ManagedObjectModel,
+	TemplateViewController,
+	TemplateComponent,
+	CRUDManager,
+	CommonUtils,
+	ComponentUtils,
+	CommonEventHandlers,
+	testableHelper,
+	FeLogger,
+	deepExtend,
+	PresentationControlHandlerFactory,
+	InfoObjectHandler,
+	IllustratedMessageType,
+	ViewCreationHelper
+) {
 			"use strict";
 	        var oLogger = new FeLogger("lib.TemplateAssembler").getLogger();
 
@@ -376,28 +395,8 @@ sap.ui.define(["sap/ui/core/mvc/ControllerExtension",
 						var oComponentRegistryEntry = oComponentData.registryEntry;
 						var oAppRegistryEntry = getAppRegistryEntry(oComponentRegistryEntry.oAppComponent);
 						var oTemplateContract = oAppRegistryEntry.oTemplateContract;
-						var oTreeNode = oAppRegistryEntry.oTemplateContract.mRoutingTree[oComponentRegistryEntry.route];						
-						oComponentRegistryEntry.viewRegistered = new Promise(function(fnResolve, fnReject) {
-							// Note: oError is faulty in regular situations
-							oComponentRegistryEntry.fnViewRegisteredResolve = function(oError){
-								if (oError){
-									oComponentRegistryEntry.fnViewRegisteredResolve = Function.prototype;
-									fnReject(oError);
-								} else {
-									delete oComponentRegistryEntry.fnViewRegisteredResolve;
-									fnResolve();
-								}
-							};
-						});
-						oComponentRegistryEntry.oViewRenderedPromise = new Promise(function(fnResolve) {
-							oComponentRegistryEntry.fnViewRenderdResolve = fnResolve;
-						});
-						oComponentRegistryEntry.oViewRenderedPromise.then(function () {
-							// Application status needs to be handled here to support use cases where Diagnostics Tool gets loaded after the app itself.
-							CommonMethods.setApplicationStatus(CommonMethods.mApplicationStatus.RENDERED);
-							// When view rendering has finished, publish global event "GetData" at channel "elements".
-							CommonMethods.publishEvent("elements", "ViewRendered", {});
-						});
+						var oTreeNode = oAppRegistryEntry.oTemplateContract.mRoutingTree[oComponentRegistryEntry.route];
+						ViewCreationHelper.initializeViewCreation(oComponentRegistryEntry);
 						oComponentRegistryEntry.componentName = sComponentNameFull;
 						oComponentRegistryEntry.oComponent = this;
 						oComponentRegistryEntry.aKeys = [];

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

@@ -0,0 +1,39 @@
+sap.ui.define([
+    "sap/suite/ui/generic/template/support/lib/CommonMethods"
+], function(CommonMethods) {
+    "use strict";
+
+    // This class contain methods which plays role in view creation of Template Component.
+    return {
+        initializeViewCreation: function(oComponentRegistryEntry) {
+            // Set the creation view started flag to false, to indicate that the view creation has not started yet.
+            oComponentRegistryEntry.createViewStarted = false;
+
+            // Create a promise for the view registration. This promise will be resolved when the view is registered.
+            oComponentRegistryEntry.viewRegistered = new Promise(function(fnResolve, fnReject) {
+                // Note: oError is faulty in regular situations
+                oComponentRegistryEntry.fnViewRegisteredResolve = function(oError){
+                    if (oError){
+                        oComponentRegistryEntry.fnViewRegisteredResolve = Function.prototype;
+                        fnReject(oError);
+                    } else {
+                        delete oComponentRegistryEntry.fnViewRegisteredResolve;
+                        fnResolve();
+                    }
+                };
+            });
+
+            // Create a promise for the view rendering. This promise will be resolved when the view is rendered.
+            oComponentRegistryEntry.oViewRenderedPromise = new Promise(function(fnResolve) {
+                oComponentRegistryEntry.fnViewRenderdResolve = fnResolve;
+                // Application status needs to be handled here to support use cases where Diagnostics Tool gets loaded after the app itself.
+                CommonMethods.setApplicationStatus(CommonMethods.mApplicationStatus.RENDERED);
+                // When view rendering has finished, publish global event "GetData" at channel "elements".
+                CommonMethods.publishEvent("elements", "ViewRendered", {});
+            });
+
+            // Returns view registered promise as the view creation is completed and process can continue.
+            return oComponentRegistryEntry.viewRegistered;
+        }
+    };
+});

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_sl.properties

@@ -176,7 +176,7 @@ ST_GENERIC_ERROR_NAVIGATION_PROPERTY_NOT_CORRECT=Lastnost navigacije {0} v pripo
 
 ST_GENERIC_FCL_FULLSCREEN=Celotni ekran
 
-ST_GENERIC_FCL_EXIT_FULLSCREEN=Izhod iz modusa celotnega ekrana
+ST_GENERIC_FCL_EXIT_FULLSCREEN=Izhod iz celozaslonskega na\u010Dina
 
 ST_GENERIC_FCL_CLOSE_COLUMN=Zapri
 

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

@@ -2149,38 +2149,46 @@ sap.ui.define(["sap/ui/base/Object",
 				oRegistryEntry.sCurrentBindingPath = sBindingPath;
 				var fnActivate = function() {
 					// Bind the model for the page itself and all its ancestors (up to level 1)
-					oRegistryEntry.utils.bindComponent(oRegistryEntry.sCurrentBindingPath, bIsComponentCurrentlyActive);
-					if (sComponentId === oCurrentIdentity.treeNode.componentId){
-						var mAncestors = Object.create(null); // Collect all ancestor routes
-						mAncestors.root = true;
-						for (var oTreeNode = oCurrentIdentity.treeNode; oTreeNode.level > 0; oTreeNode = oTemplateContract.mRoutingTree[oTreeNode.parentRoute]){
-							mAncestors[oTreeNode.sRouteName] = true;
-							oTreeNode.bindElement(oTemplateContract.oNavigationHost, null, true);
-							// Temporary solution (AncestorFeature)
-							if (oTreeNode.contextTargets){
-								for (var i = 0; i < oTreeNode.contextTargets.length; i++){
-									var oContextTarget = oTreeNode.contextTargets[i];
-									oTreeNode.bindElement(oContextTarget, null, false);
+					var bindComponentPromise = oRegistryEntry.utils.bindComponent(oRegistryEntry.sCurrentBindingPath, bIsComponentCurrentlyActive);
+					bindComponentPromise.then(function(){
+						if (sComponentId === oCurrentIdentity.treeNode.componentId){
+							var mAncestors = Object.create(null); // Collect all ancestor routes
+							mAncestors.root = true;
+							for (var oTreeNode = oCurrentIdentity.treeNode; oTreeNode.level > 0; oTreeNode = oTemplateContract.mRoutingTree[oTreeNode.parentRoute]){
+								mAncestors[oTreeNode.sRouteName] = true;
+								oTreeNode.bindElement(oTemplateContract.oNavigationHost, null, true);
+								// Temporary solution (AncestorFeature)
+								if (oTreeNode.contextTargets){
+									for (var i = 0; i < oTreeNode.contextTargets.length; i++){
+										var oContextTarget = oTreeNode.contextTargets[i];
+										// Link control used for BreadCrumbs is bound to the context of the ancestor node as the description is fetched from 
+										// the ancestor object. Unfortunately, the OP where the link is on the OP & its context is propagated, even specific call 
+										// to set the context of ancestor node is not respected as the model find a context which is already bound. Hence, we need 
+										// to break the propagation of current object context before setting the context of ancestor node.
+										oContextTarget.setBindingContext(null);
+										oTreeNode.bindElement(oContextTarget, null, false);
+									}
 								}
 							}
-						}
-						// Now we have done the binding of the tree node specific model for all ancestors of the current page.
-						// Unbind the tree node specific models for all other pages, as they might use outdated binding pathes.
-						for (var sRouteName in oTemplateContract.mRoutingTree) {
-							if (!mAncestors[sRouteName]) {
-								var oOtherTreeNode = oTemplateContract.mRoutingTree[sRouteName];
-								oOtherTreeNode.unbindElement(oTemplateContract.oNavigationHost, true);                         
-								// Temporary solution (AncestorFeature)
-								if (oOtherTreeNode.contextTargets) {
-									oOtherTreeNode.contextTargets.forEach(oOtherTreeNode.unbindElement);
+							// Now we have done the binding of the tree node specific model for all ancestors of the current page.
+							// Unbind the tree node specific models for all other pages, as they might use outdated binding pathes.
+							for (var sRouteName in oTemplateContract.mRoutingTree) {
+								if (!mAncestors[sRouteName]) {
+									var oOtherTreeNode = oTemplateContract.mRoutingTree[sRouteName];
+									oOtherTreeNode.unbindElement(oTemplateContract.oNavigationHost, true);
+									// Temporary solution (AncestorFeature)
+									if (oOtherTreeNode.contextTargets) {
+										oOtherTreeNode.contextTargets.forEach(oOtherTreeNode.unbindElement);
+									}
 								}
 							}
 						}
-					}
-					oRegistryEntry.utils.refreshBinding();
-					oRegistryEntry.oStatePreserverPromise.then(function(oStatePreserver){
-						oStatePreserver.applyAppState(sBindingPath, bIsComponentCurrentlyActive);
+						oRegistryEntry.utils.refreshBinding();
+						oRegistryEntry.oStatePreserverPromise.then(function(oStatePreserver){
+							oStatePreserver.applyAppState(sBindingPath, bIsComponentCurrentlyActive);
+						});
 					});
+					
 					return (oRegistryEntry.methods.onActivate || Function.prototype)(sBindingPath, bIsComponentCurrentlyActive);
 				};
 				// If view is not registered yet ( == oComponentRegistryEntry.fnViewRegisteredResolve still available) perform fnActivate asyncronously, otherwise synchronosly
@@ -3094,7 +3102,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.47
+	 * @version 1.120.49
 	 * @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.47",
+		version: "1.120.49",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {