@sapui5/sap.suite.ui.generic.template 1.124.4 → 1.124.5

package/package.json

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

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

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

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

@@ -1817,23 +1817,25 @@ sap.ui.define([
 
 			// This function is called when a sub-section is getting in view-port
 			function fnSubSectionEntered(oSubSection) {
-				var oSubSectionInfoObj = oTemplateUtils.oInfoObjectHandler.setInformationWithControl(oSubSection); // Assigning the SubSection control to Info Object, in case it is assigned infoObject is returned without doing anything
-				// Check if initialization code is executed for the SubSection. If not initialize the same
-				var sSubSectionId = oSubSection.getId();
-				if (!mSubSectionsInitState[sSubSectionId]) {
-					// Execute Application specific logic which needs to be executed
-					oController.onSubSectionEnteredExtension(oSubSection);
-					mSubSectionsInitState[sSubSectionId] = true;
-				}
-
-				if (oSubSectionInfoObj) { // In case of EditableHeaderFacet Sections & SubSection is created at runtime and there is info object handling
-					oMultipleViewsHandler.subSectionEntered(oSubSectionInfoObj); // Assigning the SubSection control MultipleViewsHandler. In case not relevant method simply returns
-					// The loading strategy of a sub-section might depend on the content of oWaitForState (together with the strategy) and whether or not the sub-section is currently in view-port.
-					// The second condition is fulfilled for sure. Only check the first one.
-					var oStrategy = oSubSectionInfoObj.getLoadingStrategy();
-					var bExecuteNow = checkGlobalWaitState(oStrategy);
-					if (bExecuteNow) {
-						oStrategy.activeHandler(oSubSection, oSubSectionInfoObj);
+				if (oWaitForState && oWaitForState.bRebindCompleted){
+					var oSubSectionInfoObj = oTemplateUtils.oInfoObjectHandler.setInformationWithControl(oSubSection); // Assigning the SubSection control to Info Object, in case it is assigned infoObject is returned without doing anything
+					// Check if initialization code is executed for the SubSection. If not initialize the same
+					var sSubSectionId = oSubSection.getId();
+					if (!mSubSectionsInitState[sSubSectionId]) {
+						// Execute Application specific logic which needs to be executed
+						oController.onSubSectionEnteredExtension(oSubSection);
+						mSubSectionsInitState[sSubSectionId] = true;
+					}
+	
+					if (oSubSectionInfoObj) { // In case of EditableHeaderFacet Sections & SubSection is created at runtime and there is info object handling
+						oMultipleViewsHandler.subSectionEntered(oSubSectionInfoObj); // Assigning the SubSection control MultipleViewsHandler. In case not relevant method simply returns
+						// The loading strategy of a sub-section might depend on the content of oWaitForState (together with the strategy) and whether or not the sub-section is currently in view-port.
+						// The second condition is fulfilled for sure. Only check the first one.
+						var oStrategy = oSubSectionInfoObj.getLoadingStrategy();
+						var bExecuteNow = checkGlobalWaitState(oStrategy);
+						if (bExecuteNow) {
+							oStrategy.activeHandler(oSubSection, oSubSectionInfoObj);
+						}
 					}
 				}
 			}

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

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

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

@@ -460,6 +460,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			var oContextSet = oInterface.getInterface(0);
 			var oModel = oInterface.getInterface(1).getModel();
 			// p13nData for Semantically Connected Columns
+			var sLeadingPropertyForSCColumn = "";
 			var aNavigationPropertiesForSCColumn = [];
 			var aAdditionalPropertiesForSCColumn = [];
 			var aAdditionalSortPropertiesForSCColumn = [];
@@ -509,9 +510,15 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				if (sP13N) {
 					oP13N = JSON.parse(sP13N.replace(/\\/g, ""));
 				}
-				
-				oP13N.leadingProperty && (aAdditionalPropertiesForSCColumn.indexOf(oP13N.leadingProperty) === -1) ? aAdditionalPropertiesForSCColumn.push(oP13N.leadingProperty) : Function.prototype;
-				oP13N.leadingProperty && (aAdditionalSortPropertiesForSCColumn.indexOf(oP13N.leadingProperty) === -1) ? aAdditionalSortPropertiesForSCColumn.push(oP13N.leadingProperty) : Function.prototype;
+
+				// Make the first data field's "leadingProperty" as column's "leadingProperty"
+				// Add the remaining leading properties into "additionalProperty" and "additionalSortingProperty"
+				if (!sLeadingPropertyForSCColumn && oP13N.leadingProperty) {
+					sLeadingPropertyForSCColumn = oP13N.leadingProperty;
+				} else {
+					oP13N.leadingProperty && (aAdditionalPropertiesForSCColumn.indexOf(oP13N.leadingProperty) === -1) ? aAdditionalPropertiesForSCColumn.push(oP13N.leadingProperty) : Function.prototype;
+					oP13N.leadingProperty && (aAdditionalSortPropertiesForSCColumn.indexOf(oP13N.leadingProperty) === -1) ? aAdditionalSortPropertiesForSCColumn.push(oP13N.leadingProperty) : Function.prototype;
+				}	
 				
 				oP13N.navigationProperty && (aNavigationPropertiesForSCColumn.indexOf(oP13N.navigationProperty) === -1) ? aNavigationPropertiesForSCColumn.push(oP13N.navigationProperty) : Function.prototype;
 				// Add "additionalProperty" of current data field to the "additionalProperty" of current column's p13n
@@ -532,6 +539,12 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 			sP13N += '", "filterProperty":"' + "";
 
+			// Add the leading property to "leadingProperty" and "sortProperty" of p13n
+			if (sLeadingPropertyForSCColumn) {
+				sP13N += '", "leadingProperty":"' + sLeadingPropertyForSCColumn;
+				sP13N += '", "sortProperty":"' + sLeadingPropertyForSCColumn;
+			}
+
 			if (aNavigationPropertiesForSCColumn.length > 0) {
 				sP13N += '", "navigationProperty":"' + aNavigationPropertiesForSCColumn.join();
 			}

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

@@ -920,7 +920,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.124.4
+	 * @version 1.124.5
 	 * @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/navigation/NavigationController.js

@@ -2834,13 +2834,44 @@ sap.ui.define(["sap/ui/base/Object",
 				return true;
 			}
 			// Now handle the case of an internal navigation which was not controlled by FE (e.g. browser back, navigation menu, bookmark){
-			var oRouteInfo = oNavigationControllerProxy.oRouter.getRouteInfoByHash(oShellContext.innerAppRoute);
+			var oRouteInfo = fnGetRouteInfoByHash(oNavigationControllerProxy.oRouter, oShellContext.innerAppRoute);
+			if (!oRouteInfo) {
+				return false;
+			}
 			var oTargetIdentity = fnRouteConfigToIdentity(oRouteInfo.name, oRouteInfo.arguments);
 			return oTargetIdentity.treeNode !== oCurrentIdentity.treeNode || oTargetIdentity.keys.some(function(sKey, i){
 				return sKey !== oCurrentIdentity.keys[i];
 			});
 		}
 
+		/**
+		 * From the given app route hash, returns the route information.
+		 * Also takes nested app route hash as input
+		 * @param {sap.m.routing.Router|sap.f.routing.Router} oRouter 
+		 * @param {string} sHash 
+		 * @returns {sap.ui.core.routing.RouteInfo|undefined} An object containing the route <code>name</code> and the <code>arguments</code> 
+		 * 	or <code>undefined</code>
+		 */
+		function fnGetRouteInfoByHash(oRouter, sHash) {
+			// If route info found by the input hash, just return it
+			var oRouteInfo = oRouter.getRouteInfoByHash(sHash);
+			if (oRouteInfo) {
+				return oRouteInfo;
+			}
+			// Nested app route: Split the hash by "&/" and get the hash belongs to inner most app route (last index)
+			// Then, check whether the route info found by inner most hash.
+			var aNestedAppRoutes = sHash.split("&/");
+			var sInnerMostHash = aNestedAppRoutes[aNestedAppRoutes.length - 1];
+			oRouteInfo = oRouter.getRouteInfoByHash(sInnerMostHash);
+			if (oRouteInfo) {
+				return oRouteInfo;
+			}
+			// In case the inner most app route is prefixed with app name, just omit the app name and try to get route info from remaining hash.
+			sInnerMostHash = sInnerMostHash.substring(sInnerMostHash.indexOf("/"));
+			oRouteInfo = oRouter.getRouteInfoByHash(sInnerMostHash);
+			return oRouteInfo;
+		}
+
 		function getEditScopeHeaderNode(oTreeNode){
 			var oMainNode = oTemplateContract.oApplicationProxy.getAncestralNode(oTreeNode, 1);
 			return oMainNode.isDraft ? oMainNode : oTreeNode;                     
@@ -2958,6 +2989,7 @@ sap.ui.define(["sap/ui/base/Object",
 		var fnCreateTemplateComponent = testableHelper.testable(fnCreateTemplateComponent, "createTemplateComponent");
 		var getParsedShellHashFromFLP = testableHelper.testable(getParsedShellHashFromFLP, "getParsedShellHashFromFLP");
 		var fnPreloadComponent = testableHelper.testable(fnPreloadComponent, "preloadComponent");
+		var fnGetRouteInfoByHash = testableHelper.testable(fnGetRouteInfoByHash, "getRouteInfoByHash");
 		
 		// Note: Function createHostView will be added by routingHelper.
 		// Allow to mock this by unit tests
@@ -3055,7 +3087,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.124.4
+	 * @version 1.124.5
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

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