@sap/open.fe 1.96.0 → 1.97.0

package/packages/sap.fe.core/src/sap/fe/core/services/RoutingServiceFactory-dbg.js

@@ -426,7 +426,8 @@ sap.ui.define(
 			 * @param {boolean} [mParameters.bPersistOPScroll] The bPersistOPScroll will be used for scrolling to first tab
 			 * @param {number} [mParameters.updateFCLLevel] `+1` if we add a column in FCL, `-1` to remove a column, 0 to stay on the same column
 			 * @param {boolean} [mParameters.noPreservationCache] Do navigation without taking into account the preserved cache mechanism
-			 * @param {boolean} [mParameters.bRecreateContext] Force re-creation of the context instaed of using the one passed as parameter
+			 * @param {boolean} [mParameters.bRecreateContext] Force re-creation of the context instead of using the one passed as parameter
+			 * @param {boolean} [mParameters.bForceFocus] Forces focus selection after navigation
 			 * @param {object} [oViewData] View data
 			 * @param {object} [oCurrentTargetInfo] The target information from which the navigation is triggered
 			 * @returns {Promise} Promise which is resolved once the navigation is triggered
@@ -486,10 +487,7 @@ sap.ui.define(
 						mEventParameters.routeInformation = this._getRouteInformation(this.sCurrentRouteName);
 						mEventParameters.routePattern = this.sCurrentRoutePattern;
 						mEventParameters.views = this.aCurrentViews;
-
-						// Store a fake focus information for the current hash, so that the logic to find the first editable / clickable
-						// element in the OP gets triggered
-						this.oRouterProxy.storeFocusForHash(0, null, this.oRouterProxy.getHash());
+						this.oRouterProxy.setFocusForced(mParameters.bForceFocus);
 
 						this._fireRouteMatchEvents(mEventParameters);
 
@@ -532,7 +530,7 @@ sap.ui.define(
 						}.bind(this)
 					);
 				}
-				return this.oRouterProxy.navToHash(sTargetPath, false, mParameters.noPreservationCache);
+				return this.oRouterProxy.navToHash(sTargetPath, false, mParameters.noPreservationCache, mParameters.bForceFocus);
 			},
 
 			/**
@@ -858,6 +856,31 @@ sap.ui.define(
 					});
 			},
 
+			_requestObjectsFromParameters: function(oStartUpParameters, aExternallyNavigablePages) {
+				var that = this;
+
+				// Load the respective objects for all object pages found in aExternallyNavigablePages
+				var aContextPromises = aExternallyNavigablePages.map(function(oPage) {
+					var oCompleteFilter, oListBind;
+					if (oPage.isSemanticKeyNavigation) {
+						oCompleteFilter = that._createFilter(oPage.draft, oPage.semanticKeys, oStartUpParameters);
+					} else {
+						oCompleteFilter = that._createFilter(oPage.draft, oPage.technicalKeys, oStartUpParameters);
+					}
+					// only request a minimum of fields to boost backend performance since this is only used to check if an object exists
+					oListBind = that.oModel.bindList(oPage.contextPath, undefined, undefined, oCompleteFilter, {
+						"$select": oPage.isSemanticKeyNavigation
+							? oPage.semanticKeys.map(function(key) {
+									return key.$PropertyPath;
+							  })
+							: oPage.technicalKeys
+					});
+					return oListBind.requestContexts(0, 2);
+				});
+
+				return Promise.all(aContextPromises);
+			},
+
 			_manageDeeplinkStartup: function(oStartUpParameters) {
 				var that = this,
 					aExternallyNavigablePages;
@@ -871,19 +894,7 @@ sap.ui.define(
 
 						aExternallyNavigablePages = that._findTargetPagesFromStartupParams(oLevelOfObjectPages, oStartUpParameters);
 
-						// Load the respective objects for all object pages found in the previous step
-						var aContextPromises = aExternallyNavigablePages.map(function(oPage) {
-							var oCompleteFilter, oListBind;
-							if (oPage.isSemanticKeyNavigation) {
-								oCompleteFilter = that._createFilter(oPage.draft, oPage.semanticKeys, oStartUpParameters);
-							} else {
-								oCompleteFilter = that._createFilter(oPage.draft, oPage.technicalKeys, oStartUpParameters);
-							}
-							oListBind = that.oModel.bindList(oPage.contextPath, undefined, undefined, oCompleteFilter);
-							return oListBind.requestContexts(0, 2);
-						});
-
-						return Promise.all(aContextPromises);
+						return that._requestObjectsFromParameters(oStartUpParameters, aExternallyNavigablePages);
 					})
 					.then(function(aValues) {
 						if (aValues.length) {

package/packages/sap.fe.core/src/sap/fe/core/services/RoutingServiceFactory.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/core/service/Service","sap/ui/core/service/ServiceFactory","sap/ui/core/Component","sap/ui/base/BindingParser","sap/fe/core/helpers/SemanticKeyHelper","sap/ui/model/Filter","sap/ui/model/FilterOperator","sap/base/Log","sap/ui/base/EventProvider","sap/fe/core/BusyLocker","sap/fe/core/helpers/ModelHelper","sap/fe/core/helpers/EditState","sap/fe/core/actions/messageHandling","sap/fe/core/controllerextensions/Placeholder"],function(S,c,C,B,d,F,e,L,E,f,M,g,h,P){"use strict";var R=E.extend("sap.fe.core.services.RoutingServiceEventing",{metadata:{events:{"routeMatched":{},"afterRouteMatched":{}}}});var k=S.extend("sap.fe.core.services.RoutingService",{init:function(){var t=this;var o=this.getContext();if(o.scopeType==="component"){this.oAppComponent=o.scopeObject;this.oModel=this.oAppComponent.getModel();this.oMetaModel=this.oModel.getMetaModel();this.oRouter=this.oAppComponent.getRouter();this.oRouterProxy=this.oAppComponent.getRouterProxy();this.eventProvider=new R();var r=this.oAppComponent.getManifestEntry("/sap.ui5/routing");var a=this.oAppComponent.getManifestEntry("/sap.ui5/rootView");this._parseRoutingConfiguration(r,a);var A=this.oAppComponent.getManifestEntry("/sap.app");this.outbounds=A&&A.crossNavigation&&A.crossNavigation.outbounds;}this.initPromise=Promise.resolve(t);},exit:function(){this.oRouter.detachRouteMatched(this._fnOnRouteMatched);this.eventProvider.fireEvent("routeMatched",{});this.eventProvider.destroy();},_parseRoutingConfiguration:function(r,o){var t=this,j=o&&o.viewName==="sap.fe.templates.RootContainer.view.Fcl";this._mTargets={};Object.keys(r.targets).forEach(function(T){t._mTargets[T]=Object.assign({targetName:T},r.targets[T]);if(t._mTargets[T].contextPattern!==undefined){t._mTargets[T].viewLevel=t._getViewLevelFromPattern(t._mTargets[T].contextPattern,0);}});this._mRoutes={};for(var s in r.routes){var l=r.routes[s],m=Array.isArray(l.target)?l.target:[l.target],n=Array.isArray(r.routes)?l.name:s,p=l.pattern;if(p.length<8||p.indexOf(":?query:")!==p.length-8){L.error("Pattern for route "+n+" doesn't end with ':?query:' : "+p);}var q=t._getViewLevelFromPattern(p,0);t._mRoutes[n]={name:n,pattern:p,targets:m,routeLevel:q};for(var i=0;i<m.length;i++){var u=t._mTargets[m[i]].parent;if(u){m.push(u);}}if(!j){if(t._mTargets[m[0]].viewLevel===undefined||t._mTargets[m[0]].viewLevel<q){t._mTargets[m[0]].viewLevel=q;}t._mTargets[m[0]].FCLLevel=-1;}else if(m.length===1&&t._mTargets[m[0]].controlAggregation!=="beginColumnPages"){t._mTargets[m[0]].FCLLevel=3;}else{m.forEach(function(T){switch(t._mTargets[T].controlAggregation){case"beginColumnPages":t._mTargets[T].FCLLevel=0;break;case"midColumnPages":t._mTargets[T].FCLLevel=1;break;default:t._mTargets[T].FCLLevel=2;}});}}Object.keys(t._mTargets).forEach(function(T){while(t._mTargets[T].parent){var u=t._mTargets[T].parent;t._mTargets[u].viewLevel=t._mTargets[u].viewLevel||t._mTargets[T].viewLevel;t._mTargets[u].contextPattern=t._mTargets[u].contextPattern||t._mTargets[T].contextPattern;t._mTargets[u].FCLLevel=t._mTargets[u].FCLLevel||t._mTargets[T].FCLLevel;t._mTargets[u].controlAggregation=t._mTargets[u].controlAggregation||t._mTargets[T].controlAggregation;T=u;}});var v=[],w=[],D;for(var N in t._mRoutes){var x=t._mRoutes[N].routeLevel;if(x===0){v.push(N);}else if(x===1){w.push(N);}}if(v.length===1){D=v[0];}else if(w.length===1){D=w[0];}if(D){var y=t._mRoutes[D].targets.slice(-1)[0];t.sContextPath="";if(t._mTargets[y].options&&t._mTargets[y].options.settings){var z=t._mTargets[y].options.settings;t.sContextPath=z.contextPath||"/"+z.entitySet;}if(!t.sContextPath){L.error("Cannot determine default contextPath: contextPath or entitySet missing in default target: "+y);}}else{L.error("Cannot determine default contextPath: no default route found.");}Object.keys(t._mTargets).map(function(T){return t._mTargets[T];}).sort(function(a,b){return a.viewLevel<b.viewLevel?-1:1;}).forEach(function(a){if(a.options){var b=a.options.settings;var A=b.contextPath||(b.entitySet?"/"+b.entitySet:"");if(!b.fullContextPath&&A){if(a.viewLevel===0||a.viewLevel===undefined){b.fullContextPath="/";}else{b.fullContextPath=A+"/";}}Object.keys(b.navigation||{}).forEach(function(G){var H=t._mRoutes[b.navigation[G].detail.route];if(H&&H.targets){H.targets.forEach(function(T){if(t._mTargets[T].options&&t._mTargets[T].options.settings&&!t._mTargets[T].options.settings.fullContextPath){var I;if(G.startsWith("/")){I=G;}else{I=b.fullContextPath+G;}t._mTargets[T].options.settings.fullContextPath=I+"/";}});}});}});},_getViewLevelFromPattern:function(p,v){p=p.replace(":?query:","");var r=new RegExp("/[^/]*$");if(p&&p[0]!=="/"&&p[0]!=="?"){p="/"+p;}if(p.length){p=p.replace(r,"");if(this.oRouter.match(p)||p===""){return this._getViewLevelFromPattern(p,++v);}else{return this._getViewLevelFromPattern(p,v);}}else{return v;}},_getRouteInformation:function(r){return this._mRoutes[r];},_getTargetInformation:function(t){return this._mTargets[t];},_getComponentId:function(o,s){if(s.indexOf(o+"---")===0){return s.substr(o.length+3);}return s;},getTargetInformationFor:function(o){var t=this._getComponentId(o._sOwnerId,o.getId());var a=this;var s=null;Object.keys(this._mTargets).forEach(function(T){if(a._mTargets[T].id===t||a._mTargets[T].viewId===t){s=T;}});return this._getTargetInformation(s);},getLastSemanticMapping:function(){return this.oLastSemanticMapping;},setLastSemanticMapping:function(m){this.oLastSemanticMapping=m;},navigateTo:function(o,r,p,b){var t;if(!p){t=Promise.resolve(d.getSemanticPath(o));}else{t=this.prepareParameters(p,r,o).then(function(m){return this.oRouter.getURL(r,m);}.bind(this));}return t.then(function(T){this.oRouterProxy.navToHash(T,b);}.bind(this));},prepareParameters:function(p,t,o){var a;try{var s=o.getPath();var b=s.split("/");var A=Object.keys(p).map(function(j){var l=p[j];var m=B.complexParser(l);var n=m.parts||[m];var r=n.map(function(q){var u=q.path.split("../");var v=b.slice(0,b.length-u.length+1);v.push(u[u.length-1]);return o.requestProperty(v.join("/"));});return Promise.all(r).then(function(q){var v=m.formatter?m.formatter.apply(this,q):q.join("");return{key:j,value:v};}.bind(this));}.bind(this));a=Promise.all(A).then(function(j){var l={};j.forEach(function(r){l[r.key]=r.value;});return l;});}catch(i){L.error("Could not parse the parameters for the navigation to route "+t);a=Promise.resolve(undefined);}return a;},_fireRouteMatchEvents:function(p){this.eventProvider.fireEvent("routeMatched",p);this.eventProvider.fireEvent("afterRouteMatched",p);g.cleanProcessedEditState();},navigateToContext:function(o,p,v,a){var t,r;if(p.targetPath&&v&&v.navigation){var b=v.navigation[p.targetPath].detail;t=b.route;if(b.parameters){r=this.prepareParameters(b.parameters,t,o);}}var T=this._getPathFromContext(o,p);if(T.length===0&&this.bExitOnNavigateBackToRoot){return this.oRouterProxy.exitFromApp();}if(p.asyncContext||p.bDeferredContext){T+="(...)";}var l=this._calculateLayout(T,p);if(l){T+="?layout="+l;}var n={oAsyncContext:p.asyncContext,bDeferredContext:p.bDeferredContext,bTargetEditable:p.editable,bPersistOPScroll:p.bPersistOPScroll,useContext:p.updateFCLLevel===-1||p.bRecreateContext?undefined:o,bDraftNavigation:p.bDraftNavigation,bShowPlaceholder:p.showPlaceholder!==undefined?p.showPlaceholder:true};if(p.checkNoHashChange){var s=this.oRouterProxy.getHash().replace(/[&?]{1}sap-iapp-state=[A-Z0-9]+/,"");if(T===s){var m=this.oRouter.getRouteInfoByHash(this.oRouterProxy.getHash());m.navigationInfo=n;m.routeInformation=this._getRouteInformation(this.sCurrentRouteName);m.routePattern=this.sCurrentRoutePattern;m.views=this.aCurrentViews;this.oRouterProxy.storeFocusForHash(0,null,this.oRouterProxy.getHash());this._fireRouteMatchEvents(m);return Promise.resolve();}}if(p.transient&&p.editable==true&&T.indexOf("(...)")===-1){if(T.indexOf("?")>-1){T+="&i-action=create";}else{T+="?i-action=create";}}if(a&&a.name==="sap.fe.templates.ListReport"){var i=this.oRouter.getRouteInfoByHash(T);if(i){var j=this._getRouteInformation(i.name);if(j&&j.targets&&j.targets.length>0){var q=j.targets[j.targets.length-1];var u=this._getTargetInformation(q);if(u&&u.name==="sap.fe.templates.ObjectPage"){h.removeUnboundTransitionMessages();}}}}this.navigationInfoQueue.push(n);if(t&&r){return r.then(function(w){this.oRouter.navTo(t,w);return Promise.resolve();}.bind(this));}return this.oRouterProxy.navToHash(T,false,p.noPreservationCache);},isCurrentStateImpactedBy:function(o){var p=o.getPath();if(this.oRouterProxy.isCurrentStateImpactedBy(p)){return true;}else if(/^[^\(\)]+\([^\(\)]+\)$/.test(p)){var s;if(this.oLastSemanticMapping&&this.oLastSemanticMapping.technicalPath===p){s=this.oLastSemanticMapping.semanticPath;}else{s=d.getSemanticPath(o);}return s!=p?this.oRouterProxy.isCurrentStateImpactedBy(s):false;}else{return false;}},_findPathToNavigate:function(p){var r=new RegExp("/[^/]*$");p=p.replace(r,"");if(this.oRouter.match(p)||p===""){return p;}else{return this._findPathToNavigate(p);}},_checkContextForSemanticPath:function(o){var p=o.getPath();if(!/^\/[^\(]+\([^\)]+\)$/.test(p)){return false;}var m=o.getModel().getMetaModel(),s=m.getMetaContext(o.getPath()).getObject("@sapui.name");if(!d.getSemanticKeys(m,s)){return false;}return M.isDraftSupported(m,p);},_getPathFromContext:function(o,p){var s;if(o.isA("sap.ui.model.odata.v4.ODataListBinding")&&o.isRelative()){s=o.getHeaderContext().getPath();}else{s=o.getPath();}if(p.updateFCLLevel===-1){s=this._findPathToNavigate(s);if(this.oLastSemanticMapping&&this.oLastSemanticMapping.technicalPath===s){s=this.oLastSemanticMapping.semanticPath;}}else if(this._checkContextForSemanticPath(o)){var a=d.getSemanticPath(o,true);if(!a){this.setLastSemanticMapping(undefined);}else if(a!==s){this.setLastSemanticMapping({technicalPath:s,semanticPath:a});s=a;}}if(s[0]==="/"){s=s.substring(1);}return s;},_calculateLayout:function(p,m){var a=m.FCLLevel;if(m.updateFCLLevel){a+=m.updateFCLLevel;if(a<0){a=0;}}return this.oAppComponent.getRootViewController().calculateLayout(a,p,m.sLayout);},_beforeRouteMatched:function(o){var p=new P().isPlaceholderEnabled();if(!p){var r=this.oAppComponent.getRootControl();f.lock(r);}},_onRouteMatched:function(o){var a=this.oAppComponent.getAppStateHandler(),r=this.oAppComponent.getRootControl(),t=this;var p=new P().isPlaceholderEnabled();if(f.isLocked(r)&&!p){f.unlock(r);}var m=o.getParameters();if(this.navigationInfoQueue.length){m.navigationInfo=this.navigationInfoQueue[0];this.navigationInfoQueue=this.navigationInfoQueue.slice(1);}else{m.navigationInfo={};}if(a.checkIfRouteChangedByIApp()){m.navigationInfo.bReasonIsIappState=true;a.resetRouteChangedByIApp();}this.sCurrentRouteName=o.getParameter("name");this.sCurrentRoutePattern=o.getParameters().config.pattern;this.aCurrentViews=o.getParameter("views");m.routeInformation=this._getRouteInformation(this.sCurrentRouteName);m.routePattern=this.sCurrentRoutePattern;this._fireRouteMatchEvents(m);if(!history.state||history.state.feLevel===undefined){this.oRouterProxy.restoreHistory().then(function(){t.oRouterProxy.resolveRouteMatch();}).catch(function(b){L.error("Error while restoring history",b);});}else{this.oRouterProxy.resolveRouteMatch();}},attachRouteMatched:function(D,a,l){this.eventProvider.attachEvent("routeMatched",D,a,l);},detachRouteMatched:function(a,l){this.eventProvider.detachEvent("routeMatched",a,l);},attachAfterRouteMatched:function(D,a,l){this.eventProvider.attachEvent("afterRouteMatched",D,a,l);},detachAfterRouteMatched:function(a,l){this.eventProvider.detachEvent("afterRouteMatched",a,l);},getRouteFromHash:function(r,a){var H=r.getHashChanger().hash;var o=r.getRouteInfoByHash(H);return a.getMetadata().getManifestEntry("/sap.ui5/routing/routes").filter(function(b){return b.name===o.name;})[0];},getTargetsFromRoute:function(r,a){var t=r.target;var b=this;if(typeof t==="string"){return[this._mTargets[t]];}else{var T=[];t.forEach(function(s){T.push(b._mTargets[s]);});return T;}},initializeRouting:function(){var t=this;this._fnOnRouteMatched=this._onRouteMatched.bind(this);this.oRouter.attachRouteMatched(this._fnOnRouteMatched);var p=new P().isPlaceholderEnabled();if(!p){this.oRouter.attachBeforeRouteMatched(this._beforeRouteMatched.bind(this));}this.navigationInfoQueue=[];g.resetEditState();this.bExitOnNavigateBackToRoot=!this.oRouter.match("");var i=t.oRouter.getHashChanger().getHash().indexOf("sap-iapp-state")!==-1;var a=t.oAppComponent.getStartupParameters().then(function(s){var H=s!==undefined&&Object.keys(s).length!==0;if(!i&&H){var b=t.oRouter.getHashChanger().getHash();if(s.preferredMode&&s.preferredMode[0].indexOf("create")!==-1&&!b){return t._managePreferredModeCreateStartup(s);}else{return t._manageDeeplinkStartup(s);}}}).catch(function(o){L.error("Error during routing initialization",o);});return a;},getDefaultCreateHash:function(s){var a=this.getContextPath(),D=s&&s.preferredMode?s.preferredMode[0]:"create",H;D=D.indexOf(":")!==-1&&D.length>D.indexOf(":")+1?D.substr(0,D.indexOf(":")):"create";H=a.substring(1)+"(...)?i-action="+D;if(this.oRouter.getRouteInfoByHash(H)){return H;}else{throw new Error("No route match for creating a new "+a.substring(1));}},_managePreferredModeCreateStartup:function(s){var t=this;return this.oMetaModel.requestObject(this.getContextPath()+"@").then(function(o){var m,b=true;if(o["@com.sap.vocabularies.Common.v1.DraftRoot"]&&o["@com.sap.vocabularies.Common.v1.DraftRoot"]["NewAction"]){m=t.getContextPath()+"@com.sap.vocabularies.Common.v1.DraftRoot/NewAction@Org.OData.Core.V1.OperationAvailable";}else if(o["@com.sap.vocabularies.Session.v1.StickySessionSupported"]&&o["@com.sap.vocabularies.Session.v1.StickySessionSupported"]["NewAction"]){m=t.getContextPath()+"@com.sap.vocabularies.Session.v1.StickySessionSupported/NewAction@Org.OData.Core.V1.OperationAvailable";}if(m){var n=t.oMetaModel.getObject(m);if(n===false){b=false;}}else{var i=o["@Org.OData.Capabilities.V1.InsertRestrictions"];if(i&&i.Insertable===false){b=false;}}if(b){var p=t.getDefaultCreateHash(s);t.oRouter.getHashChanger().replaceHash(p);t.bExitOnNavigateBackToRoot=true;}}).catch(function(){L.error("Cannot fetch the Annotations");});},_manageDeeplinkStartup:function(s){var t=this,a;return this.oMetaModel.requestObject("/$EntityContainer/").then(function(){var l=t._getNavigablePages(t.oAppComponent.getManifest()["sap.ui5"].routing);a=t._findTargetPagesFromStartupParams(l,s);var b=a.map(function(p){var o,i;if(p.isSemanticKeyNavigation){o=t._createFilter(p.draft,p.semanticKeys,s);}else{o=t._createFilter(p.draft,p.technicalKeys,s);}i=t.oModel.bindList(p.contextPath,undefined,undefined,o);return i.requestContexts(0,2);});return Promise.all(b);}).then(function(v){if(v.length){var b=[];v.forEach(function(i){if(i.length===1){b.push(i[0]);}});if(b.length===v.length&&!t.oRouter.getHashChanger().getHash()){var H=t._buildStartupHash(a,b);if(H){t.oRouter.getHashChanger().replaceHash(H);}}}}).catch(function(b){L.info("Could not find results for list bind: "+b);});},_getNavigablePages:function(r){var a=r.routes,t=r.targets,p={};for(var i=0;i<a.length;i++){var o={},s=a[i].pattern,T=a[i].target,l=s.split("/").length-1;o["pattern"]=s;if(s===":?query:"||s===""){continue;}if(l===1&&s.split("/")[l]===":?query:"){l=0;}o["level"]=l;if(Array.isArray(T)){o["target"]=T[T.length-1];}else{o["target"]=T;}if(t[o.target].options&&t[o.target].options.settings){o["allowDeepLinking"]=t[o.target].options.settings.allowDeepLinking;var b=t[o.target].options.settings.contextPath||(t[o.target].options.settings.entitySet&&"/"+t[o.target].options.settings.entitySet);o["contextPath"]=b;}if(!o["allowDeepLinking"]&&o["level"]!==0){continue;}else if(!p[o.level]){p[o.level]=[];}p[o.level].push(o);}return p;},_findTargetPagesFromStartupParams:function(p,s){var l=0,r=[],b=true;while(b&&l in p){var o=p[l];b=false;for(var i=0;i<o.length;++i){var O=o[i];if(!O.contextPath&&O.level===0){O.contextPath=this.getContextPath();}if(!O.contextPath){continue;}O.entityType=this.oMetaModel.getObject("/$EntityContainer"+O.contextPath+"/");O.draft=this.oMetaModel.getObject("/$EntityContainer"+O.contextPath+"@com.sap.vocabularies.Common.v1.DraftRoot")||this.oMetaModel.getObject("/$EntityContainer"+O.contextPath+"@com.sap.vocabularies.Common.v1.DraftNode");O.technicalKeys=O.entityType["$Key"];O.semanticKeys=this.oMetaModel.getObject("/$EntityContainer"+O.contextPath+"/@com.sap.vocabularies.Common.v1.SemanticKey");if(this._checkForKeys(O.semanticKeys,s)){O.isSemanticKeyNavigation=true;r.push(O);b=true;break;}else if(O.level===0&&this._checkForKeys(O.technicalKeys,s)){O.isSemanticKeyNavigation=false;r.push(O);b=true;break;}}++l;}return r;},_createFilter:function(D,K,s){var a=[],b=M.isFilteringCaseSensitive(this.oMetaModel);for(var j=0;j<K.length;j++){var p=K[j].$PropertyPath;if(!p){p=K[j];if(p==="IsActiveEntity"){D=false;}}var v=s[p][0];if(v){a.push(new F({path:p,operator:e.EQ,value1:v,caseSensitive:b}));}else{return undefined;}}if(D){var o=new F({filters:[new F("IsActiveEntity","EQ",false),new F("SiblingEntity/IsActiveEntity","EQ",null)],and:false});a.push(o);}var i=new F(a,true);return i;},_checkForKeys:function(K,p){if(K&&K.length){for(var j=0;j<K.length;j++){var s=K[j].$PropertyPath;if(!s){s=K[j];}var a=p[s];if(!a||(a&&a.length>1)){return false;}}return true;}return false;},_buildStartupHash:function(r,a){var H;if(a.length===1){var t=a[0].getPath(),s=d.getSemanticPath(a[0]);if(s!==t){this.setLastSemanticMapping({technicalPath:t,semanticPath:s});}H=s.substring(1);}else if(a.length>1){var p=r[r.length-1].pattern.split("/");H=p.map(function(b,i){var K=b.split("(")[0];var v=a[i].getPath().split("(")[1];return K+"("+v;}).join("/");}return H;},getOutbounds:function(){return this.outbounds;},getContextPath:function(){return this.sContextPath;}});return c.extend("sap.fe.core.services.RoutingServiceFactory",{createInstance:function(s){var r=new k(s);return r.initPromise;}});},true);
+sap.ui.define(["sap/ui/core/service/Service","sap/ui/core/service/ServiceFactory","sap/ui/core/Component","sap/ui/base/BindingParser","sap/fe/core/helpers/SemanticKeyHelper","sap/ui/model/Filter","sap/ui/model/FilterOperator","sap/base/Log","sap/ui/base/EventProvider","sap/fe/core/BusyLocker","sap/fe/core/helpers/ModelHelper","sap/fe/core/helpers/EditState","sap/fe/core/actions/messageHandling","sap/fe/core/controllerextensions/Placeholder"],function(S,c,C,B,d,F,e,L,E,f,M,g,h,P){"use strict";var R=E.extend("sap.fe.core.services.RoutingServiceEventing",{metadata:{events:{"routeMatched":{},"afterRouteMatched":{}}}});var k=S.extend("sap.fe.core.services.RoutingService",{init:function(){var t=this;var o=this.getContext();if(o.scopeType==="component"){this.oAppComponent=o.scopeObject;this.oModel=this.oAppComponent.getModel();this.oMetaModel=this.oModel.getMetaModel();this.oRouter=this.oAppComponent.getRouter();this.oRouterProxy=this.oAppComponent.getRouterProxy();this.eventProvider=new R();var r=this.oAppComponent.getManifestEntry("/sap.ui5/routing");var a=this.oAppComponent.getManifestEntry("/sap.ui5/rootView");this._parseRoutingConfiguration(r,a);var A=this.oAppComponent.getManifestEntry("/sap.app");this.outbounds=A&&A.crossNavigation&&A.crossNavigation.outbounds;}this.initPromise=Promise.resolve(t);},exit:function(){this.oRouter.detachRouteMatched(this._fnOnRouteMatched);this.eventProvider.fireEvent("routeMatched",{});this.eventProvider.destroy();},_parseRoutingConfiguration:function(r,o){var t=this,j=o&&o.viewName==="sap.fe.templates.RootContainer.view.Fcl";this._mTargets={};Object.keys(r.targets).forEach(function(T){t._mTargets[T]=Object.assign({targetName:T},r.targets[T]);if(t._mTargets[T].contextPattern!==undefined){t._mTargets[T].viewLevel=t._getViewLevelFromPattern(t._mTargets[T].contextPattern,0);}});this._mRoutes={};for(var s in r.routes){var l=r.routes[s],m=Array.isArray(l.target)?l.target:[l.target],n=Array.isArray(r.routes)?l.name:s,p=l.pattern;if(p.length<8||p.indexOf(":?query:")!==p.length-8){L.error("Pattern for route "+n+" doesn't end with ':?query:' : "+p);}var q=t._getViewLevelFromPattern(p,0);t._mRoutes[n]={name:n,pattern:p,targets:m,routeLevel:q};for(var i=0;i<m.length;i++){var u=t._mTargets[m[i]].parent;if(u){m.push(u);}}if(!j){if(t._mTargets[m[0]].viewLevel===undefined||t._mTargets[m[0]].viewLevel<q){t._mTargets[m[0]].viewLevel=q;}t._mTargets[m[0]].FCLLevel=-1;}else if(m.length===1&&t._mTargets[m[0]].controlAggregation!=="beginColumnPages"){t._mTargets[m[0]].FCLLevel=3;}else{m.forEach(function(T){switch(t._mTargets[T].controlAggregation){case"beginColumnPages":t._mTargets[T].FCLLevel=0;break;case"midColumnPages":t._mTargets[T].FCLLevel=1;break;default:t._mTargets[T].FCLLevel=2;}});}}Object.keys(t._mTargets).forEach(function(T){while(t._mTargets[T].parent){var u=t._mTargets[T].parent;t._mTargets[u].viewLevel=t._mTargets[u].viewLevel||t._mTargets[T].viewLevel;t._mTargets[u].contextPattern=t._mTargets[u].contextPattern||t._mTargets[T].contextPattern;t._mTargets[u].FCLLevel=t._mTargets[u].FCLLevel||t._mTargets[T].FCLLevel;t._mTargets[u].controlAggregation=t._mTargets[u].controlAggregation||t._mTargets[T].controlAggregation;T=u;}});var v=[],w=[],D;for(var N in t._mRoutes){var x=t._mRoutes[N].routeLevel;if(x===0){v.push(N);}else if(x===1){w.push(N);}}if(v.length===1){D=v[0];}else if(w.length===1){D=w[0];}if(D){var y=t._mRoutes[D].targets.slice(-1)[0];t.sContextPath="";if(t._mTargets[y].options&&t._mTargets[y].options.settings){var z=t._mTargets[y].options.settings;t.sContextPath=z.contextPath||"/"+z.entitySet;}if(!t.sContextPath){L.error("Cannot determine default contextPath: contextPath or entitySet missing in default target: "+y);}}else{L.error("Cannot determine default contextPath: no default route found.");}Object.keys(t._mTargets).map(function(T){return t._mTargets[T];}).sort(function(a,b){return a.viewLevel<b.viewLevel?-1:1;}).forEach(function(a){if(a.options){var b=a.options.settings;var A=b.contextPath||(b.entitySet?"/"+b.entitySet:"");if(!b.fullContextPath&&A){if(a.viewLevel===0||a.viewLevel===undefined){b.fullContextPath="/";}else{b.fullContextPath=A+"/";}}Object.keys(b.navigation||{}).forEach(function(G){var H=t._mRoutes[b.navigation[G].detail.route];if(H&&H.targets){H.targets.forEach(function(T){if(t._mTargets[T].options&&t._mTargets[T].options.settings&&!t._mTargets[T].options.settings.fullContextPath){var I;if(G.startsWith("/")){I=G;}else{I=b.fullContextPath+G;}t._mTargets[T].options.settings.fullContextPath=I+"/";}});}});}});},_getViewLevelFromPattern:function(p,v){p=p.replace(":?query:","");var r=new RegExp("/[^/]*$");if(p&&p[0]!=="/"&&p[0]!=="?"){p="/"+p;}if(p.length){p=p.replace(r,"");if(this.oRouter.match(p)||p===""){return this._getViewLevelFromPattern(p,++v);}else{return this._getViewLevelFromPattern(p,v);}}else{return v;}},_getRouteInformation:function(r){return this._mRoutes[r];},_getTargetInformation:function(t){return this._mTargets[t];},_getComponentId:function(o,s){if(s.indexOf(o+"---")===0){return s.substr(o.length+3);}return s;},getTargetInformationFor:function(o){var t=this._getComponentId(o._sOwnerId,o.getId());var a=this;var s=null;Object.keys(this._mTargets).forEach(function(T){if(a._mTargets[T].id===t||a._mTargets[T].viewId===t){s=T;}});return this._getTargetInformation(s);},getLastSemanticMapping:function(){return this.oLastSemanticMapping;},setLastSemanticMapping:function(m){this.oLastSemanticMapping=m;},navigateTo:function(o,r,p,b){var t;if(!p){t=Promise.resolve(d.getSemanticPath(o));}else{t=this.prepareParameters(p,r,o).then(function(m){return this.oRouter.getURL(r,m);}.bind(this));}return t.then(function(T){this.oRouterProxy.navToHash(T,b);}.bind(this));},prepareParameters:function(p,t,o){var a;try{var s=o.getPath();var b=s.split("/");var A=Object.keys(p).map(function(j){var l=p[j];var m=B.complexParser(l);var n=m.parts||[m];var r=n.map(function(q){var u=q.path.split("../");var v=b.slice(0,b.length-u.length+1);v.push(u[u.length-1]);return o.requestProperty(v.join("/"));});return Promise.all(r).then(function(q){var v=m.formatter?m.formatter.apply(this,q):q.join("");return{key:j,value:v};}.bind(this));}.bind(this));a=Promise.all(A).then(function(j){var l={};j.forEach(function(r){l[r.key]=r.value;});return l;});}catch(i){L.error("Could not parse the parameters for the navigation to route "+t);a=Promise.resolve(undefined);}return a;},_fireRouteMatchEvents:function(p){this.eventProvider.fireEvent("routeMatched",p);this.eventProvider.fireEvent("afterRouteMatched",p);g.cleanProcessedEditState();},navigateToContext:function(o,p,v,a){var t,r;if(p.targetPath&&v&&v.navigation){var b=v.navigation[p.targetPath].detail;t=b.route;if(b.parameters){r=this.prepareParameters(b.parameters,t,o);}}var T=this._getPathFromContext(o,p);if(T.length===0&&this.bExitOnNavigateBackToRoot){return this.oRouterProxy.exitFromApp();}if(p.asyncContext||p.bDeferredContext){T+="(...)";}var l=this._calculateLayout(T,p);if(l){T+="?layout="+l;}var n={oAsyncContext:p.asyncContext,bDeferredContext:p.bDeferredContext,bTargetEditable:p.editable,bPersistOPScroll:p.bPersistOPScroll,useContext:p.updateFCLLevel===-1||p.bRecreateContext?undefined:o,bDraftNavigation:p.bDraftNavigation,bShowPlaceholder:p.showPlaceholder!==undefined?p.showPlaceholder:true};if(p.checkNoHashChange){var s=this.oRouterProxy.getHash().replace(/[&?]{1}sap-iapp-state=[A-Z0-9]+/,"");if(T===s){var m=this.oRouter.getRouteInfoByHash(this.oRouterProxy.getHash());m.navigationInfo=n;m.routeInformation=this._getRouteInformation(this.sCurrentRouteName);m.routePattern=this.sCurrentRoutePattern;m.views=this.aCurrentViews;this.oRouterProxy.setFocusForced(p.bForceFocus);this._fireRouteMatchEvents(m);return Promise.resolve();}}if(p.transient&&p.editable==true&&T.indexOf("(...)")===-1){if(T.indexOf("?")>-1){T+="&i-action=create";}else{T+="?i-action=create";}}if(a&&a.name==="sap.fe.templates.ListReport"){var i=this.oRouter.getRouteInfoByHash(T);if(i){var j=this._getRouteInformation(i.name);if(j&&j.targets&&j.targets.length>0){var q=j.targets[j.targets.length-1];var u=this._getTargetInformation(q);if(u&&u.name==="sap.fe.templates.ObjectPage"){h.removeUnboundTransitionMessages();}}}}this.navigationInfoQueue.push(n);if(t&&r){return r.then(function(w){this.oRouter.navTo(t,w);return Promise.resolve();}.bind(this));}return this.oRouterProxy.navToHash(T,false,p.noPreservationCache,p.bForceFocus);},isCurrentStateImpactedBy:function(o){var p=o.getPath();if(this.oRouterProxy.isCurrentStateImpactedBy(p)){return true;}else if(/^[^\(\)]+\([^\(\)]+\)$/.test(p)){var s;if(this.oLastSemanticMapping&&this.oLastSemanticMapping.technicalPath===p){s=this.oLastSemanticMapping.semanticPath;}else{s=d.getSemanticPath(o);}return s!=p?this.oRouterProxy.isCurrentStateImpactedBy(s):false;}else{return false;}},_findPathToNavigate:function(p){var r=new RegExp("/[^/]*$");p=p.replace(r,"");if(this.oRouter.match(p)||p===""){return p;}else{return this._findPathToNavigate(p);}},_checkContextForSemanticPath:function(o){var p=o.getPath();if(!/^\/[^\(]+\([^\)]+\)$/.test(p)){return false;}var m=o.getModel().getMetaModel(),s=m.getMetaContext(o.getPath()).getObject("@sapui.name");if(!d.getSemanticKeys(m,s)){return false;}return M.isDraftSupported(m,p);},_getPathFromContext:function(o,p){var s;if(o.isA("sap.ui.model.odata.v4.ODataListBinding")&&o.isRelative()){s=o.getHeaderContext().getPath();}else{s=o.getPath();}if(p.updateFCLLevel===-1){s=this._findPathToNavigate(s);if(this.oLastSemanticMapping&&this.oLastSemanticMapping.technicalPath===s){s=this.oLastSemanticMapping.semanticPath;}}else if(this._checkContextForSemanticPath(o)){var a=d.getSemanticPath(o,true);if(!a){this.setLastSemanticMapping(undefined);}else if(a!==s){this.setLastSemanticMapping({technicalPath:s,semanticPath:a});s=a;}}if(s[0]==="/"){s=s.substring(1);}return s;},_calculateLayout:function(p,m){var a=m.FCLLevel;if(m.updateFCLLevel){a+=m.updateFCLLevel;if(a<0){a=0;}}return this.oAppComponent.getRootViewController().calculateLayout(a,p,m.sLayout);},_beforeRouteMatched:function(o){var p=new P().isPlaceholderEnabled();if(!p){var r=this.oAppComponent.getRootControl();f.lock(r);}},_onRouteMatched:function(o){var a=this.oAppComponent.getAppStateHandler(),r=this.oAppComponent.getRootControl(),t=this;var p=new P().isPlaceholderEnabled();if(f.isLocked(r)&&!p){f.unlock(r);}var m=o.getParameters();if(this.navigationInfoQueue.length){m.navigationInfo=this.navigationInfoQueue[0];this.navigationInfoQueue=this.navigationInfoQueue.slice(1);}else{m.navigationInfo={};}if(a.checkIfRouteChangedByIApp()){m.navigationInfo.bReasonIsIappState=true;a.resetRouteChangedByIApp();}this.sCurrentRouteName=o.getParameter("name");this.sCurrentRoutePattern=o.getParameters().config.pattern;this.aCurrentViews=o.getParameter("views");m.routeInformation=this._getRouteInformation(this.sCurrentRouteName);m.routePattern=this.sCurrentRoutePattern;this._fireRouteMatchEvents(m);if(!history.state||history.state.feLevel===undefined){this.oRouterProxy.restoreHistory().then(function(){t.oRouterProxy.resolveRouteMatch();}).catch(function(b){L.error("Error while restoring history",b);});}else{this.oRouterProxy.resolveRouteMatch();}},attachRouteMatched:function(D,a,l){this.eventProvider.attachEvent("routeMatched",D,a,l);},detachRouteMatched:function(a,l){this.eventProvider.detachEvent("routeMatched",a,l);},attachAfterRouteMatched:function(D,a,l){this.eventProvider.attachEvent("afterRouteMatched",D,a,l);},detachAfterRouteMatched:function(a,l){this.eventProvider.detachEvent("afterRouteMatched",a,l);},getRouteFromHash:function(r,a){var H=r.getHashChanger().hash;var o=r.getRouteInfoByHash(H);return a.getMetadata().getManifestEntry("/sap.ui5/routing/routes").filter(function(b){return b.name===o.name;})[0];},getTargetsFromRoute:function(r,a){var t=r.target;var b=this;if(typeof t==="string"){return[this._mTargets[t]];}else{var T=[];t.forEach(function(s){T.push(b._mTargets[s]);});return T;}},initializeRouting:function(){var t=this;this._fnOnRouteMatched=this._onRouteMatched.bind(this);this.oRouter.attachRouteMatched(this._fnOnRouteMatched);var p=new P().isPlaceholderEnabled();if(!p){this.oRouter.attachBeforeRouteMatched(this._beforeRouteMatched.bind(this));}this.navigationInfoQueue=[];g.resetEditState();this.bExitOnNavigateBackToRoot=!this.oRouter.match("");var i=t.oRouter.getHashChanger().getHash().indexOf("sap-iapp-state")!==-1;var a=t.oAppComponent.getStartupParameters().then(function(s){var H=s!==undefined&&Object.keys(s).length!==0;if(!i&&H){var b=t.oRouter.getHashChanger().getHash();if(s.preferredMode&&s.preferredMode[0].indexOf("create")!==-1&&!b){return t._managePreferredModeCreateStartup(s);}else{return t._manageDeeplinkStartup(s);}}}).catch(function(o){L.error("Error during routing initialization",o);});return a;},getDefaultCreateHash:function(s){var a=this.getContextPath(),D=s&&s.preferredMode?s.preferredMode[0]:"create",H;D=D.indexOf(":")!==-1&&D.length>D.indexOf(":")+1?D.substr(0,D.indexOf(":")):"create";H=a.substring(1)+"(...)?i-action="+D;if(this.oRouter.getRouteInfoByHash(H)){return H;}else{throw new Error("No route match for creating a new "+a.substring(1));}},_managePreferredModeCreateStartup:function(s){var t=this;return this.oMetaModel.requestObject(this.getContextPath()+"@").then(function(o){var m,b=true;if(o["@com.sap.vocabularies.Common.v1.DraftRoot"]&&o["@com.sap.vocabularies.Common.v1.DraftRoot"]["NewAction"]){m=t.getContextPath()+"@com.sap.vocabularies.Common.v1.DraftRoot/NewAction@Org.OData.Core.V1.OperationAvailable";}else if(o["@com.sap.vocabularies.Session.v1.StickySessionSupported"]&&o["@com.sap.vocabularies.Session.v1.StickySessionSupported"]["NewAction"]){m=t.getContextPath()+"@com.sap.vocabularies.Session.v1.StickySessionSupported/NewAction@Org.OData.Core.V1.OperationAvailable";}if(m){var n=t.oMetaModel.getObject(m);if(n===false){b=false;}}else{var i=o["@Org.OData.Capabilities.V1.InsertRestrictions"];if(i&&i.Insertable===false){b=false;}}if(b){var p=t.getDefaultCreateHash(s);t.oRouter.getHashChanger().replaceHash(p);t.bExitOnNavigateBackToRoot=true;}}).catch(function(){L.error("Cannot fetch the Annotations");});},_requestObjectsFromParameters:function(s,a){var t=this;var b=a.map(function(p){var o,l;if(p.isSemanticKeyNavigation){o=t._createFilter(p.draft,p.semanticKeys,s);}else{o=t._createFilter(p.draft,p.technicalKeys,s);}l=t.oModel.bindList(p.contextPath,undefined,undefined,o,{"$select":p.isSemanticKeyNavigation?p.semanticKeys.map(function(i){return i.$PropertyPath;}):p.technicalKeys});return l.requestContexts(0,2);});return Promise.all(b);},_manageDeeplinkStartup:function(s){var t=this,a;return this.oMetaModel.requestObject("/$EntityContainer/").then(function(){var l=t._getNavigablePages(t.oAppComponent.getManifest()["sap.ui5"].routing);a=t._findTargetPagesFromStartupParams(l,s);return t._requestObjectsFromParameters(s,a);}).then(function(v){if(v.length){var b=[];v.forEach(function(i){if(i.length===1){b.push(i[0]);}});if(b.length===v.length&&!t.oRouter.getHashChanger().getHash()){var H=t._buildStartupHash(a,b);if(H){t.oRouter.getHashChanger().replaceHash(H);}}}}).catch(function(b){L.info("Could not find results for list bind: "+b);});},_getNavigablePages:function(r){var a=r.routes,t=r.targets,p={};for(var i=0;i<a.length;i++){var o={},s=a[i].pattern,T=a[i].target,l=s.split("/").length-1;o["pattern"]=s;if(s===":?query:"||s===""){continue;}if(l===1&&s.split("/")[l]===":?query:"){l=0;}o["level"]=l;if(Array.isArray(T)){o["target"]=T[T.length-1];}else{o["target"]=T;}if(t[o.target].options&&t[o.target].options.settings){o["allowDeepLinking"]=t[o.target].options.settings.allowDeepLinking;var b=t[o.target].options.settings.contextPath||(t[o.target].options.settings.entitySet&&"/"+t[o.target].options.settings.entitySet);o["contextPath"]=b;}if(!o["allowDeepLinking"]&&o["level"]!==0){continue;}else if(!p[o.level]){p[o.level]=[];}p[o.level].push(o);}return p;},_findTargetPagesFromStartupParams:function(p,s){var l=0,r=[],b=true;while(b&&l in p){var o=p[l];b=false;for(var i=0;i<o.length;++i){var O=o[i];if(!O.contextPath&&O.level===0){O.contextPath=this.getContextPath();}if(!O.contextPath){continue;}O.entityType=this.oMetaModel.getObject("/$EntityContainer"+O.contextPath+"/");O.draft=this.oMetaModel.getObject("/$EntityContainer"+O.contextPath+"@com.sap.vocabularies.Common.v1.DraftRoot")||this.oMetaModel.getObject("/$EntityContainer"+O.contextPath+"@com.sap.vocabularies.Common.v1.DraftNode");O.technicalKeys=O.entityType["$Key"];O.semanticKeys=this.oMetaModel.getObject("/$EntityContainer"+O.contextPath+"/@com.sap.vocabularies.Common.v1.SemanticKey");if(this._checkForKeys(O.semanticKeys,s)){O.isSemanticKeyNavigation=true;r.push(O);b=true;break;}else if(O.level===0&&this._checkForKeys(O.technicalKeys,s)){O.isSemanticKeyNavigation=false;r.push(O);b=true;break;}}++l;}return r;},_createFilter:function(D,K,s){var a=[],b=M.isFilteringCaseSensitive(this.oMetaModel);for(var j=0;j<K.length;j++){var p=K[j].$PropertyPath;if(!p){p=K[j];if(p==="IsActiveEntity"){D=false;}}var v=s[p][0];if(v){a.push(new F({path:p,operator:e.EQ,value1:v,caseSensitive:b}));}else{return undefined;}}if(D){var o=new F({filters:[new F("IsActiveEntity","EQ",false),new F("SiblingEntity/IsActiveEntity","EQ",null)],and:false});a.push(o);}var i=new F(a,true);return i;},_checkForKeys:function(K,p){if(K&&K.length){for(var j=0;j<K.length;j++){var s=K[j].$PropertyPath;if(!s){s=K[j];}var a=p[s];if(!a||(a&&a.length>1)){return false;}}return true;}return false;},_buildStartupHash:function(r,a){var H;if(a.length===1){var t=a[0].getPath(),s=d.getSemanticPath(a[0]);if(s!==t){this.setLastSemanticMapping({technicalPath:t,semanticPath:s});}H=s.substring(1);}else if(a.length>1){var p=r[r.length-1].pattern.split("/");H=p.map(function(b,i){var K=b.split("(")[0];var v=a[i].getPath().split("(")[1];return K+"("+v;}).join("/");}return H;},getOutbounds:function(){return this.outbounds;},getContextPath:function(){return this.sContextPath;}});return c.extend("sap.fe.core.services.RoutingServiceFactory",{createInstance:function(s){var r=new k(s);return r.initPromise;}});},true);

package/packages/sap.fe.core/src/sap/fe/core/services/TemplatedViewServiceFactory-dbg.js

@@ -82,7 +82,7 @@ sap.ui.define(
 							scopeType: "component",
 							scopeObject: oComponent,
 							settings: {
-								bundles: ["sap.fe.core.messagebundle", "sap.fe.templates.messagebundle"],
+								bundles: ["sap.fe.core.messagebundle", "sap.fe.macros.messagebundle", "sap.fe.templates.messagebundle"],
 								enhanceI18n: aEnhanceI18n,
 								modelName: "sap.fe.i18n"
 							}

package/packages/sap.fe.core/src/sap/fe/core/services/TemplatedViewServiceFactory.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/core/service/Service","sap/ui/core/service/ServiceFactory","sap/ui/core/service/ServiceFactoryRegistry","sap/ui/model/base/ManagedObjectModel","sap/ui/model/resource/ResourceModel","sap/ui/core/mvc/View","sap/ui/core/Component","sap/ui/model/json/JSONModel","sap/base/Log","sap/fe/core/TemplateModel","sap/fe/core/helpers/DynamicAnnotationPathHelper","sap/ui/core/cache/CacheManager","sap/ui/VersionInfo","sap/ui/Device"],function(S,a,b,M,R,V,C,J,L,T,D,c,d,e){"use strict";var f=S.extend("sap.fe.core.services.TemplatedViewService",{initPromise:null,init:function(){var t=this;var g=[];var o=this.getContext();var h=o.scopeObject;var A=C.getOwnerComponentFor(h);var m=A.getMetaModel();var j=A.getMetadata().getComponentName()+"::"+A.getLocalId(h.getId());var E=h.getEnhanceI18n()||[];var k;if(E){k=A.getMetadata().getComponentName();for(var i=0;i<E.length;i++){var r=A.getModel(E[i]);if(r&&r.isA("sap.ui.model.resource.ResourceModel")){E[i]=r;}else{E[i]=k+"."+E[i].replace(".properties","");}}}var l=A.getMetadata().getName()+"_"+j+"_"+sap.ui.getCore().getConfiguration().getLanguageTag();g.push(b.get("sap.fe.core.services.ResourceModelService").createInstance({scopeType:"component",scopeObject:h,settings:{bundles:["sap.fe.core.messagebundle","sap.fe.templates.messagebundle"],enhanceI18n:E,modelName:"sap.fe.i18n"}}).then(function(n){t.oResourceModelService=n;return n.getResourceModel();}));g.push(b.get("sap.fe.core.services.CacheHandlerService").createInstance({settings:{metaModel:m,appComponent:A,component:h}}).then(function(n){t.oCacheHandlerService=n;return n.validateCacheKey(l);}));g.push(d.load().then(function(I){var n="";if(!I.libraries){n=sap.ui.buildinfo.buildtime;}else{I.libraries.forEach(function(q){n+=q.buildTimestamp;});}return n;}).catch(function(){return"<NOVALUE>";}));var p="";this.initPromise=Promise.all(g).then(function(n){var q=n[1];var v=n[2];var u=A.getShellServices();var w=A.getSideEffectsService();w.initializeSideEffects(A.getEnvironmentCapabilities().getCapabilities());p=q+"-"+v+"-"+j+"-"+u.instanceType+"-pageModel";return Promise.all(n.concat([t._getCachedModel(p)]));}).then(function(n){var r=n[0];var q=n[1];var P=n[3];return new Promise(function(u){sap.ui.require(["sap/fe/core/converters/TemplateConverter","sap/fe/core/converters/MetaModelConverter"],function(v,w){u(t.createView(r,j,q,p,P,v,w));});});}).then(function(n){var q=b.get("sap.fe.core.services.CacheHandlerService").getInstance(m);q.invalidateIfNeeded(n,l);});},_getCachedModel:function(g){if(sap.ui.getCore().getConfiguration().getViewCache()){return c.get(g);}return undefined;},_setCachedModel:function(g,o){if(sap.ui.getCore().getConfiguration().getViewCache()){c.set(g,o);}return undefined;},refreshView:function(o){var t=this;var r=o.getRootControl();if(r){r.destroy();}else if(t.oView){t.oView.destroy();}return t.createView(t.resourceModel,t.stableId,"","",undefined,t.TemplateConverter,t.MetaModelConverter).then(function(){o.oContainer.invalidate();}).catch(function(E){o.oContainer.invalidate();L.error(E);});},createView:function(r,g,h,p,P,i,j){var t=this;t.resourceModel=r;t.stableId=g;t.TemplateConverter=i;t.MetaModelConverter=j;var o=this.getContext(),m=o.settings,k=m.converterType,l=o.scopeObject,A=C.getOwnerComponentFor(l),F=A.getRoutingService().getTargetInformationFor(l).options.settings.fullContextPath,n=A.getMetaModel(),q=A.getManifest(),u=new J(sap.ui.Device).setDefaultBindingMode("OneWay"),v=new J(q),E=false,w,x,y,z;this.oFactory=o.factory;function B(){var H=F.split("/");var I=H.reduce(function(K,N){if(N===""){return K;}if(K===""){K="/"+N;}else{var O=n.getObject(K+"/$NavigationPropertyBinding/"+N);if(O&&Object.keys(O).length>0){K+="/$NavigationPropertyBinding";}K+="/"+N;}return K;},"");var y={type:"XML",preprocessors:{xml:{bindingContexts:{entitySet:I?n.createBindingContext(I):null,fullContextPath:F?n.createBindingContext(F):null,contextPath:F?n.createBindingContext(F):null,converterContext:w.createBindingContext("/",null,{noResolve:true}),viewData:z?x.createBindingContext("/"):null},models:{entitySet:n,fullContextPath:n,contextPath:n,"sap.fe.i18n":r,metaModel:n,"device":u,manifest:v,converterContext:w,viewData:x},appComponent:A}},id:g,viewName:m.viewName||l.getViewName(),viewData:z,cache:{keys:[h]},models:{"sap.fe.i18n":r},height:"100%"};return y;}function G(H){L.error(H.message,H);y.viewName=m.errorViewName||"sap.fe.core.services.view.TemplatingErrorPage";y.preprocessors.xml.models["error"]=new J(H);return l.runAsOwner(function(){return V.create(y).then(function(I){t.oView=I;t.oView.setModel(new M(t.oView),"$view");l.setAggregation("rootControl",t.oView);return h;});});}return A.getService("routingService").then(function(H){var I=H.getTargetInformationFor(l);var O=q["sap.app"]&&q["sap.app"].crossNavigation&&q["sap.app"].crossNavigation.outbounds;var N=l.getNavigation()||{};Object.keys(N).forEach(function(Q){var U=N[Q];var W;if(U.detail&&U.detail.outbound&&O[U.detail.outbound]){W=O[U.detail.outbound];U.detail.outboundDetail={semanticObject:W.semanticObject,action:W.action,parameters:W.parameters};}if(U.create&&U.create.outbound&&O[U.create.outbound]){W=O[U.create.outbound];U.create.outboundDetail={semanticObject:W.semanticObject,action:W.action,parameters:W.parameters};}});z={navigation:N,viewLevel:I.viewLevel,stableId:g,contentDensities:q["sap.ui5"].contentDensities,resourceBundle:r.__bundle,fullContextPath:F,isDesktop:e.system.desktop};if(l.getViewData){Object.assign(z,l.getViewData());}var K=A.getShellServices();z.converterType=k;z.shellContentDensity=K.getContentDensity();x=new J(z);if(z&&z.controlConfiguration){Object.keys(z.controlConfiguration).forEach(function(Q){if(Q.indexOf("[")!==-1){var U=D.resolveDynamicExpression(Q,n);z.controlConfiguration[U]=z.controlConfiguration[Q];}});}j.convertTypes(n,A.getEnvironmentCapabilities().getCapabilities());w=new T(function(){try{if(!!P){return P;}else{var Q=A.getDiagnostics();var U=Q.getIssues().length;var W=i.convertPage(k,n,z,Q,F,A.getEnvironmentCapabilities().getCapabilities());var X=Q.getIssues();var Y=X.slice(U);if(Y.length>0){L.warning("Some issues have been detected in your project, please check the UI5 support assistant rule for sap.fe.core");}t._setCachedModel(p,W);return W;}}catch(Z){L.error(Z,Z);return{};}},n);if(!E){y=B();l.setModel(w,"_pageModel");return l.runAsOwner(function(){return V.create(y).catch(G).then(function(Q){t.oView=Q;t.oView.setModel(new M(t.oView),"$view");t.oView.setModel(x,"viewData");l.setAggregation("rootControl",t.oView);return h;}).catch(L.error);});}}).catch(function(H){L.error(H.message,H);throw new Error("Error while creating view : "+H);});},getView:function(){return this.oView;},exit:function(){this.oResourceModelService&&this.oResourceModelService.destroy();this.oCacheHandlerService&&this.oCacheHandlerService.destroy();this.oFactory.removeGlobalInstance();}});var s=a.extend("sap.fe.core.services.TemplatedViewServiceFactory",{_oInstanceRegistry:{},iCreatingViews:0,createInstance:function(o){s.prototype.iCreatingViews++;var t=new f(Object.assign({factory:this},o));return t.initPromise.then(function(){s.prototype.iCreatingViews--;return t;});},removeGlobalInstance:function(){this._oInstanceRegistry={};}});s.getNumberOfViewsInCreationState=function(){return s.prototype.iCreatingViews;};return s;},true);
+sap.ui.define(["sap/ui/core/service/Service","sap/ui/core/service/ServiceFactory","sap/ui/core/service/ServiceFactoryRegistry","sap/ui/model/base/ManagedObjectModel","sap/ui/model/resource/ResourceModel","sap/ui/core/mvc/View","sap/ui/core/Component","sap/ui/model/json/JSONModel","sap/base/Log","sap/fe/core/TemplateModel","sap/fe/core/helpers/DynamicAnnotationPathHelper","sap/ui/core/cache/CacheManager","sap/ui/VersionInfo","sap/ui/Device"],function(S,a,b,M,R,V,C,J,L,T,D,c,d,e){"use strict";var f=S.extend("sap.fe.core.services.TemplatedViewService",{initPromise:null,init:function(){var t=this;var g=[];var o=this.getContext();var h=o.scopeObject;var A=C.getOwnerComponentFor(h);var m=A.getMetaModel();var j=A.getMetadata().getComponentName()+"::"+A.getLocalId(h.getId());var E=h.getEnhanceI18n()||[];var k;if(E){k=A.getMetadata().getComponentName();for(var i=0;i<E.length;i++){var r=A.getModel(E[i]);if(r&&r.isA("sap.ui.model.resource.ResourceModel")){E[i]=r;}else{E[i]=k+"."+E[i].replace(".properties","");}}}var l=A.getMetadata().getName()+"_"+j+"_"+sap.ui.getCore().getConfiguration().getLanguageTag();g.push(b.get("sap.fe.core.services.ResourceModelService").createInstance({scopeType:"component",scopeObject:h,settings:{bundles:["sap.fe.core.messagebundle","sap.fe.macros.messagebundle","sap.fe.templates.messagebundle"],enhanceI18n:E,modelName:"sap.fe.i18n"}}).then(function(n){t.oResourceModelService=n;return n.getResourceModel();}));g.push(b.get("sap.fe.core.services.CacheHandlerService").createInstance({settings:{metaModel:m,appComponent:A,component:h}}).then(function(n){t.oCacheHandlerService=n;return n.validateCacheKey(l);}));g.push(d.load().then(function(I){var n="";if(!I.libraries){n=sap.ui.buildinfo.buildtime;}else{I.libraries.forEach(function(q){n+=q.buildTimestamp;});}return n;}).catch(function(){return"<NOVALUE>";}));var p="";this.initPromise=Promise.all(g).then(function(n){var q=n[1];var v=n[2];var u=A.getShellServices();var w=A.getSideEffectsService();w.initializeSideEffects(A.getEnvironmentCapabilities().getCapabilities());p=q+"-"+v+"-"+j+"-"+u.instanceType+"-pageModel";return Promise.all(n.concat([t._getCachedModel(p)]));}).then(function(n){var r=n[0];var q=n[1];var P=n[3];return new Promise(function(u){sap.ui.require(["sap/fe/core/converters/TemplateConverter","sap/fe/core/converters/MetaModelConverter"],function(v,w){u(t.createView(r,j,q,p,P,v,w));});});}).then(function(n){var q=b.get("sap.fe.core.services.CacheHandlerService").getInstance(m);q.invalidateIfNeeded(n,l);});},_getCachedModel:function(g){if(sap.ui.getCore().getConfiguration().getViewCache()){return c.get(g);}return undefined;},_setCachedModel:function(g,o){if(sap.ui.getCore().getConfiguration().getViewCache()){c.set(g,o);}return undefined;},refreshView:function(o){var t=this;var r=o.getRootControl();if(r){r.destroy();}else if(t.oView){t.oView.destroy();}return t.createView(t.resourceModel,t.stableId,"","",undefined,t.TemplateConverter,t.MetaModelConverter).then(function(){o.oContainer.invalidate();}).catch(function(E){o.oContainer.invalidate();L.error(E);});},createView:function(r,g,h,p,P,i,j){var t=this;t.resourceModel=r;t.stableId=g;t.TemplateConverter=i;t.MetaModelConverter=j;var o=this.getContext(),m=o.settings,k=m.converterType,l=o.scopeObject,A=C.getOwnerComponentFor(l),F=A.getRoutingService().getTargetInformationFor(l).options.settings.fullContextPath,n=A.getMetaModel(),q=A.getManifest(),u=new J(sap.ui.Device).setDefaultBindingMode("OneWay"),v=new J(q),E=false,w,x,y,z;this.oFactory=o.factory;function B(){var H=F.split("/");var I=H.reduce(function(K,N){if(N===""){return K;}if(K===""){K="/"+N;}else{var O=n.getObject(K+"/$NavigationPropertyBinding/"+N);if(O&&Object.keys(O).length>0){K+="/$NavigationPropertyBinding";}K+="/"+N;}return K;},"");var y={type:"XML",preprocessors:{xml:{bindingContexts:{entitySet:I?n.createBindingContext(I):null,fullContextPath:F?n.createBindingContext(F):null,contextPath:F?n.createBindingContext(F):null,converterContext:w.createBindingContext("/",null,{noResolve:true}),viewData:z?x.createBindingContext("/"):null},models:{entitySet:n,fullContextPath:n,contextPath:n,"sap.fe.i18n":r,metaModel:n,"device":u,manifest:v,converterContext:w,viewData:x},appComponent:A}},id:g,viewName:m.viewName||l.getViewName(),viewData:z,cache:{keys:[h]},models:{"sap.fe.i18n":r},height:"100%"};return y;}function G(H){L.error(H.message,H);y.viewName=m.errorViewName||"sap.fe.core.services.view.TemplatingErrorPage";y.preprocessors.xml.models["error"]=new J(H);return l.runAsOwner(function(){return V.create(y).then(function(I){t.oView=I;t.oView.setModel(new M(t.oView),"$view");l.setAggregation("rootControl",t.oView);return h;});});}return A.getService("routingService").then(function(H){var I=H.getTargetInformationFor(l);var O=q["sap.app"]&&q["sap.app"].crossNavigation&&q["sap.app"].crossNavigation.outbounds;var N=l.getNavigation()||{};Object.keys(N).forEach(function(Q){var U=N[Q];var W;if(U.detail&&U.detail.outbound&&O[U.detail.outbound]){W=O[U.detail.outbound];U.detail.outboundDetail={semanticObject:W.semanticObject,action:W.action,parameters:W.parameters};}if(U.create&&U.create.outbound&&O[U.create.outbound]){W=O[U.create.outbound];U.create.outboundDetail={semanticObject:W.semanticObject,action:W.action,parameters:W.parameters};}});z={navigation:N,viewLevel:I.viewLevel,stableId:g,contentDensities:q["sap.ui5"].contentDensities,resourceBundle:r.__bundle,fullContextPath:F,isDesktop:e.system.desktop};if(l.getViewData){Object.assign(z,l.getViewData());}var K=A.getShellServices();z.converterType=k;z.shellContentDensity=K.getContentDensity();x=new J(z);if(z&&z.controlConfiguration){Object.keys(z.controlConfiguration).forEach(function(Q){if(Q.indexOf("[")!==-1){var U=D.resolveDynamicExpression(Q,n);z.controlConfiguration[U]=z.controlConfiguration[Q];}});}j.convertTypes(n,A.getEnvironmentCapabilities().getCapabilities());w=new T(function(){try{if(!!P){return P;}else{var Q=A.getDiagnostics();var U=Q.getIssues().length;var W=i.convertPage(k,n,z,Q,F,A.getEnvironmentCapabilities().getCapabilities());var X=Q.getIssues();var Y=X.slice(U);if(Y.length>0){L.warning("Some issues have been detected in your project, please check the UI5 support assistant rule for sap.fe.core");}t._setCachedModel(p,W);return W;}}catch(Z){L.error(Z,Z);return{};}},n);if(!E){y=B();l.setModel(w,"_pageModel");return l.runAsOwner(function(){return V.create(y).catch(G).then(function(Q){t.oView=Q;t.oView.setModel(new M(t.oView),"$view");t.oView.setModel(x,"viewData");l.setAggregation("rootControl",t.oView);return h;}).catch(L.error);});}}).catch(function(H){L.error(H.message,H);throw new Error("Error while creating view : "+H);});},getView:function(){return this.oView;},exit:function(){this.oResourceModelService&&this.oResourceModelService.destroy();this.oCacheHandlerService&&this.oCacheHandlerService.destroy();this.oFactory.removeGlobalInstance();}});var s=a.extend("sap.fe.core.services.TemplatedViewServiceFactory",{_oInstanceRegistry:{},iCreatingViews:0,createInstance:function(o){s.prototype.iCreatingViews++;var t=new f(Object.assign({factory:this},o));return t.initPromise.then(function(){s.prototype.iCreatingViews--;return t;});},removeGlobalInstance:function(){this._oInstanceRegistry={};}});s.getNumberOfViewsInCreationState=function(){return s.prototype.iCreatingViews;};return s;},true);

package/packages/sap.fe.core/src/sap/fe/core/templating/EntitySetHelper-dbg.js

@@ -7,6 +7,18 @@ sap.ui.define([], function () {
 
   var _exports = {};
 
+  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+  function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
   var isEntitySet = function (dataObject) {
     return dataObject && dataObject.hasOwnProperty("_type") && dataObject._type === "EntitySet";
   };
@@ -18,26 +30,87 @@ sap.ui.define([], function () {
 
     return ((_entitySet$annotation = entitySet.annotations) === null || _entitySet$annotation === void 0 ? void 0 : (_entitySet$annotation2 = _entitySet$annotation.Capabilities) === null || _entitySet$annotation2 === void 0 ? void 0 : (_entitySet$annotation3 = _entitySet$annotation2.FilterRestrictions) === null || _entitySet$annotation3 === void 0 ? void 0 : _entitySet$annotation3.FilterExpressionRestrictions) || [];
   };
+  /**
+   * Reads all SortRestrictions of the main entity and the (first level) navigation restrictions.
+   * This does not work for more than one level of navigation.
+   *
+   * @param {EntitySet} entitySet Entity set to be analyzed
+   * @returns {string[]} Array containing the property names of all non-sortable properties
+   */
+
 
   _exports.getFilterExpressionRestrictions = getFilterExpressionRestrictions;
 
   var getNonSortablePropertiesRestrictions = function (entitySet) {
-    var _entitySet$annotation4, _entitySet$annotation5, _entitySet$annotation6, _entitySet$annotation7, _entitySet$annotation8;
+    var _entitySet$annotation4, _entitySet$annotation5, _entitySet$annotation6, _entitySet$annotation11, _entitySet$annotation12, _entitySet$annotation13, _entitySet$annotation14;
+
+    var nonSortableProperties = []; // Check annotations for main entity
+
+    if ((entitySet === null || entitySet === void 0 ? void 0 : (_entitySet$annotation4 = entitySet.annotations) === null || _entitySet$annotation4 === void 0 ? void 0 : (_entitySet$annotation5 = _entitySet$annotation4.Capabilities) === null || _entitySet$annotation5 === void 0 ? void 0 : (_entitySet$annotation6 = _entitySet$annotation5.SortRestrictions) === null || _entitySet$annotation6 === void 0 ? void 0 : _entitySet$annotation6.Sortable) === false) {
+      var _nonSortablePropertie;
+
+      // add all properties of the entity to the nonSortableProperties
+      (_nonSortablePropertie = nonSortableProperties).push.apply(_nonSortablePropertie, _toConsumableArray(entitySet.entityType.entityProperties.map(function (property) {
+        return property.name;
+      })));
+    } else {
+      var _entitySet$annotation7, _entitySet$annotation8, _entitySet$annotation9, _entitySet$annotation10;
+
+      nonSortableProperties = (entitySet === null || entitySet === void 0 ? void 0 : (_entitySet$annotation7 = entitySet.annotations) === null || _entitySet$annotation7 === void 0 ? void 0 : (_entitySet$annotation8 = _entitySet$annotation7.Capabilities) === null || _entitySet$annotation8 === void 0 ? void 0 : (_entitySet$annotation9 = _entitySet$annotation8.SortRestrictions) === null || _entitySet$annotation9 === void 0 ? void 0 : (_entitySet$annotation10 = _entitySet$annotation9.NonSortableProperties) === null || _entitySet$annotation10 === void 0 ? void 0 : _entitySet$annotation10.map(function (property) {
+        return property.value;
+      })) || [];
+    } // Check for every navigationRestriction if it has sortRestrictions
+
+
+    entitySet === null || entitySet === void 0 ? void 0 : (_entitySet$annotation11 = entitySet.annotations) === null || _entitySet$annotation11 === void 0 ? void 0 : (_entitySet$annotation12 = _entitySet$annotation11.Capabilities) === null || _entitySet$annotation12 === void 0 ? void 0 : (_entitySet$annotation13 = _entitySet$annotation12.NavigationRestrictions) === null || _entitySet$annotation13 === void 0 ? void 0 : (_entitySet$annotation14 = _entitySet$annotation13.RestrictedProperties) === null || _entitySet$annotation14 === void 0 ? void 0 : _entitySet$annotation14.forEach(function (navigationRestriction) {
+      var _navigationRestrictio;
+
+      if ((navigationRestriction === null || navigationRestriction === void 0 ? void 0 : (_navigationRestrictio = navigationRestriction.SortRestrictions) === null || _navigationRestrictio === void 0 ? void 0 : _navigationRestrictio.Sortable) === false) {
+        var _entitySet$entityType, _entitySet$entityType2;
+
+        // find correct navigation property
+        var navigationProperty = entitySet === null || entitySet === void 0 ? void 0 : (_entitySet$entityType = entitySet.entityType) === null || _entitySet$entityType === void 0 ? void 0 : (_entitySet$entityType2 = _entitySet$entityType.navigationProperties) === null || _entitySet$entityType2 === void 0 ? void 0 : _entitySet$entityType2.filter(function (navigationProperty) {
+          var _navigationRestrictio2;
+
+          return navigationProperty.name == (navigationRestriction === null || navigationRestriction === void 0 ? void 0 : (_navigationRestrictio2 = navigationRestriction.NavigationProperty) === null || _navigationRestrictio2 === void 0 ? void 0 : _navigationRestrictio2.value);
+        });
+
+        if (navigationProperty[0]) {
+          var _nonSortablePropertie2, _navigationProperty$;
+
+          // add all properties of the navigation property to the nonSortableProperties
+          (_nonSortablePropertie2 = nonSortableProperties).push.apply(_nonSortablePropertie2, _toConsumableArray((_navigationProperty$ = navigationProperty[0].targetType) === null || _navigationProperty$ === void 0 ? void 0 : _navigationProperty$.entityProperties.map(function (property) {
+            return navigationProperty[0].name + "/" + property.name;
+          })));
+        }
+      } else {
+        var _navigationRestrictio3, _navigationRestrictio4;
+
+        var nonSortableNavigationProperties = navigationRestriction === null || navigationRestriction === void 0 ? void 0 : (_navigationRestrictio3 = navigationRestriction.SortRestrictions) === null || _navigationRestrictio3 === void 0 ? void 0 : (_navigationRestrictio4 = _navigationRestrictio3.NonSortableProperties) === null || _navigationRestrictio4 === void 0 ? void 0 : _navigationRestrictio4.map(function (property) {
+          var _navigationRestrictio5;
+
+          return (navigationRestriction === null || navigationRestriction === void 0 ? void 0 : (_navigationRestrictio5 = navigationRestriction.NavigationProperty) === null || _navigationRestrictio5 === void 0 ? void 0 : _navigationRestrictio5.value) + "/" + property.value;
+        });
+
+        if (nonSortableNavigationProperties) {
+          var _nonSortablePropertie3;
 
-    return (_entitySet$annotation4 = entitySet === null || entitySet === void 0 ? void 0 : (_entitySet$annotation5 = entitySet.annotations) === null || _entitySet$annotation5 === void 0 ? void 0 : (_entitySet$annotation6 = _entitySet$annotation5.Capabilities) === null || _entitySet$annotation6 === void 0 ? void 0 : (_entitySet$annotation7 = _entitySet$annotation6.SortRestrictions) === null || _entitySet$annotation7 === void 0 ? void 0 : (_entitySet$annotation8 = _entitySet$annotation7.NonSortableProperties) === null || _entitySet$annotation8 === void 0 ? void 0 : _entitySet$annotation8.map(function (property) {
-      return property.value;
-    })) !== null && _entitySet$annotation4 !== void 0 ? _entitySet$annotation4 : [];
+          (_nonSortablePropertie3 = nonSortableProperties).push.apply(_nonSortablePropertie3, _toConsumableArray(nonSortableNavigationProperties));
+        }
+      }
+    });
+    return nonSortableProperties;
   };
 
   _exports.getNonSortablePropertiesRestrictions = getNonSortablePropertiesRestrictions;
 
   var isStickySessionSupported = function (entitySet) {
-    var _entitySet$annotation9;
+    var _entitySet$annotation15;
 
-    return !!((_entitySet$annotation9 = entitySet.annotations.Session) !== null && _entitySet$annotation9 !== void 0 && _entitySet$annotation9.StickySessionSupported);
+    return !!((_entitySet$annotation15 = entitySet.annotations.Session) !== null && _entitySet$annotation15 !== void 0 && _entitySet$annotation15.StickySessionSupported);
   };
 
   _exports.isStickySessionSupported = isStickySessionSupported;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkVudGl0eVNldEhlbHBlci50cyJdLCJuYW1lcyI6WyJpc0VudGl0eVNldCIsImRhdGFPYmplY3QiLCJoYXNPd25Qcm9wZXJ0eSIsIl90eXBlIiwiZ2V0RmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyIsImVudGl0eVNldCIsImFubm90YXRpb25zIiwiQ2FwYWJpbGl0aWVzIiwiRmlsdGVyUmVzdHJpY3Rpb25zIiwiRmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyIsImdldE5vblNvcnRhYmxlUHJvcGVydGllc1Jlc3RyaWN0aW9ucyIsIlNvcnRSZXN0cmljdGlvbnMiLCJOb25Tb3J0YWJsZVByb3BlcnRpZXMiLCJtYXAiLCJwcm9wZXJ0eSIsInZhbHVlIiwiaXNTdGlja3lTZXNzaW9uU3VwcG9ydGVkIiwiU2Vzc2lvbiIsIlN0aWNreVNlc3Npb25TdXBwb3J0ZWQiXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7OztBQUFPLE1BQU1BLFdBQVcsR0FBRyxVQUFTQyxVQUFULEVBQW1EO0FBQzdFLFdBQU9BLFVBQVUsSUFBSUEsVUFBVSxDQUFDQyxjQUFYLENBQTBCLE9BQTFCLENBQWQsSUFBb0RELFVBQVUsQ0FBQ0UsS0FBWCxLQUFxQixXQUFoRjtBQUNBLEdBRk07Ozs7QUFJQSxNQUFNQywrQkFBK0IsR0FBRyxVQUFTQyxTQUFULEVBQStCO0FBQUE7O0FBQzdFLFdBQU8sMEJBQUFBLFNBQVMsQ0FBQ0MsV0FBViwwR0FBdUJDLFlBQXZCLDRHQUFxQ0Msa0JBQXJDLGtGQUF5REMsNEJBQXpELEtBQXlGLEVBQWhHO0FBQ0EsR0FGTTs7OztBQUlBLE1BQU1DLG9DQUFvQyxHQUFHLFVBQVNMLFNBQVQsRUFBMkM7QUFBQTs7QUFDOUYscUNBQU9BLFNBQVAsYUFBT0EsU0FBUCxpREFBT0EsU0FBUyxDQUFFQyxXQUFsQixxRkFBTyx1QkFBd0JDLFlBQS9CLHFGQUFPLHVCQUFzQ0ksZ0JBQTdDLHFGQUFPLHVCQUF3REMscUJBQS9ELDJEQUFPLHVCQUErRUMsR0FBL0UsQ0FBbUYsVUFBQUMsUUFBUTtBQUFBLGFBQUlBLFFBQVEsQ0FBQ0MsS0FBYjtBQUFBLEtBQTNGLENBQVAsMkVBQXlILEVBQXpIO0FBQ0EsR0FGTTs7OztBQUlBLE1BQU1DLHdCQUF3QixHQUFHLFVBQVNYLFNBQVQsRUFBd0M7QUFBQTs7QUFDL0UsV0FBTyxDQUFDLDRCQUFDQSxTQUFTLENBQUNDLFdBQVYsQ0FBc0JXLE9BQXZCLG1EQUFDLHVCQUErQkMsc0JBQWhDLENBQVI7QUFDQSxHQUZNIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBFbnRpdHlTZXQgfSBmcm9tIFwiQHNhcC11eC9hbm5vdGF0aW9uLWNvbnZlcnRlclwiO1xuXG5leHBvcnQgY29uc3QgaXNFbnRpdHlTZXQgPSBmdW5jdGlvbihkYXRhT2JqZWN0OiBhbnkpOiBkYXRhT2JqZWN0IGlzIEVudGl0eVNldCB7XG5cdHJldHVybiBkYXRhT2JqZWN0ICYmIGRhdGFPYmplY3QuaGFzT3duUHJvcGVydHkoXCJfdHlwZVwiKSAmJiBkYXRhT2JqZWN0Ll90eXBlID09PSBcIkVudGl0eVNldFwiO1xufTtcblxuZXhwb3J0IGNvbnN0IGdldEZpbHRlckV4cHJlc3Npb25SZXN0cmljdGlvbnMgPSBmdW5jdGlvbihlbnRpdHlTZXQ6IEVudGl0eVNldCkge1xuXHRyZXR1cm4gZW50aXR5U2V0LmFubm90YXRpb25zPy5DYXBhYmlsaXRpZXM/LkZpbHRlclJlc3RyaWN0aW9ucz8uRmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyB8fCBbXTtcbn07XG5cbmV4cG9ydCBjb25zdCBnZXROb25Tb3J0YWJsZVByb3BlcnRpZXNSZXN0cmljdGlvbnMgPSBmdW5jdGlvbihlbnRpdHlTZXQ6IEVudGl0eVNldCB8IHVuZGVmaW5lZCkge1xuXHRyZXR1cm4gZW50aXR5U2V0Py5hbm5vdGF0aW9ucz8uQ2FwYWJpbGl0aWVzPy5Tb3J0UmVzdHJpY3Rpb25zPy5Ob25Tb3J0YWJsZVByb3BlcnRpZXM/Lm1hcChwcm9wZXJ0eSA9PiBwcm9wZXJ0eS52YWx1ZSkgPz8gW107XG59O1xuXG5leHBvcnQgY29uc3QgaXNTdGlja3lTZXNzaW9uU3VwcG9ydGVkID0gZnVuY3Rpb24oZW50aXR5U2V0OiBFbnRpdHlTZXQpOiBib29sZWFuIHtcblx0cmV0dXJuICEhZW50aXR5U2V0LmFubm90YXRpb25zLlNlc3Npb24/LlN0aWNreVNlc3Npb25TdXBwb3J0ZWQ7XG59O1xuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkVudGl0eVNldEhlbHBlci50cyJdLCJuYW1lcyI6WyJpc0VudGl0eVNldCIsImRhdGFPYmplY3QiLCJoYXNPd25Qcm9wZXJ0eSIsIl90eXBlIiwiZ2V0RmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyIsImVudGl0eVNldCIsImFubm90YXRpb25zIiwiQ2FwYWJpbGl0aWVzIiwiRmlsdGVyUmVzdHJpY3Rpb25zIiwiRmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyIsImdldE5vblNvcnRhYmxlUHJvcGVydGllc1Jlc3RyaWN0aW9ucyIsIm5vblNvcnRhYmxlUHJvcGVydGllcyIsIlNvcnRSZXN0cmljdGlvbnMiLCJTb3J0YWJsZSIsInB1c2giLCJlbnRpdHlUeXBlIiwiZW50aXR5UHJvcGVydGllcyIsIm1hcCIsInByb3BlcnR5IiwibmFtZSIsIk5vblNvcnRhYmxlUHJvcGVydGllcyIsInZhbHVlIiwiTmF2aWdhdGlvblJlc3RyaWN0aW9ucyIsIlJlc3RyaWN0ZWRQcm9wZXJ0aWVzIiwiZm9yRWFjaCIsIm5hdmlnYXRpb25SZXN0cmljdGlvbiIsIm5hdmlnYXRpb25Qcm9wZXJ0eSIsIm5hdmlnYXRpb25Qcm9wZXJ0aWVzIiwiZmlsdGVyIiwiTmF2aWdhdGlvblByb3BlcnR5IiwidGFyZ2V0VHlwZSIsIm5vblNvcnRhYmxlTmF2aWdhdGlvblByb3BlcnRpZXMiLCJpc1N0aWNreVNlc3Npb25TdXBwb3J0ZWQiLCJTZXNzaW9uIiwiU3RpY2t5U2Vzc2lvblN1cHBvcnRlZCJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ08sTUFBTUEsV0FBVyxHQUFHLFVBQVNDLFVBQVQsRUFBbUQ7QUFDN0UsV0FBT0EsVUFBVSxJQUFJQSxVQUFVLENBQUNDLGNBQVgsQ0FBMEIsT0FBMUIsQ0FBZCxJQUFvREQsVUFBVSxDQUFDRSxLQUFYLEtBQXFCLFdBQWhGO0FBQ0EsR0FGTTs7OztBQUlBLE1BQU1DLCtCQUErQixHQUFHLFVBQVNDLFNBQVQsRUFBK0I7QUFBQTs7QUFDN0UsV0FBTywwQkFBQUEsU0FBUyxDQUFDQyxXQUFWLDBHQUF1QkMsWUFBdkIsNEdBQXFDQyxrQkFBckMsa0ZBQXlEQyw0QkFBekQsS0FBeUYsRUFBaEc7QUFDQSxHQUZNO0FBSVA7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7Ozs7O0FBQ08sTUFBTUMsb0NBQW9DLEdBQUcsVUFBU0wsU0FBVCxFQUFxRDtBQUFBOztBQUN4RyxRQUFJTSxxQkFBcUIsR0FBRyxFQUE1QixDQUR3RyxDQUV4Rzs7QUFDQSxRQUFJLENBQUFOLFNBQVMsU0FBVCxJQUFBQSxTQUFTLFdBQVQsc0NBQUFBLFNBQVMsQ0FBRUMsV0FBWCw0R0FBd0JDLFlBQXhCLDRHQUFzQ0ssZ0JBQXRDLGtGQUF3REMsUUFBeEQsTUFBcUUsS0FBekUsRUFBZ0Y7QUFBQTs7QUFDL0U7QUFDQSwrQkFBQUYscUJBQXFCLEVBQUNHLElBQXRCLGlEQUE4QlQsU0FBUyxDQUFDVSxVQUFWLENBQXFCQyxnQkFBckIsQ0FBc0NDLEdBQXRDLENBQTBDLFVBQUFDLFFBQVE7QUFBQSxlQUFJQSxRQUFRLENBQUNDLElBQWI7QUFBQSxPQUFsRCxDQUE5QjtBQUNBLEtBSEQsTUFHTztBQUFBOztBQUNOUixNQUFBQSxxQkFBcUIsR0FDcEIsQ0FBQU4sU0FBUyxTQUFULElBQUFBLFNBQVMsV0FBVCxzQ0FBQUEsU0FBUyxDQUFFQyxXQUFYLDRHQUF3QkMsWUFBeEIsNEdBQXNDSyxnQkFBdEMsNkdBQXdEUSxxQkFBeEQsb0ZBQStFSCxHQUEvRSxDQUFtRixVQUFBQyxRQUFRO0FBQUEsZUFBSUEsUUFBUSxDQUFDRyxLQUFiO0FBQUEsT0FBM0YsTUFBa0gsRUFEbkg7QUFFQSxLQVR1RyxDQVV4Rzs7O0FBQ0FoQixJQUFBQSxTQUFTLFNBQVQsSUFBQUEsU0FBUyxXQUFULHVDQUFBQSxTQUFTLENBQUVDLFdBQVgsK0dBQXdCQyxZQUF4QiwrR0FBc0NlLHNCQUF0QywrR0FBOERDLG9CQUE5RCxvRkFBb0ZDLE9BQXBGLENBQTRGLFVBQUFDLHFCQUFxQixFQUFJO0FBQUE7O0FBQ3BILFVBQUksQ0FBQUEscUJBQXFCLFNBQXJCLElBQUFBLHFCQUFxQixXQUFyQixxQ0FBQUEscUJBQXFCLENBQUViLGdCQUF2QixnRkFBeUNDLFFBQXpDLE1BQXNELEtBQTFELEVBQWlFO0FBQUE7O0FBQ2hFO0FBQ0EsWUFBTWEsa0JBQWtCLEdBQUdyQixTQUFILGFBQUdBLFNBQUgsZ0RBQUdBLFNBQVMsQ0FBRVUsVUFBZCxvRkFBRyxzQkFBdUJZLG9CQUExQiwyREFBRyx1QkFBNkNDLE1BQTdDLENBQzFCLFVBQUFGLGtCQUFrQjtBQUFBOztBQUFBLGlCQUNqQkEsa0JBQWtCLENBQUNQLElBQW5CLEtBQTRCTSxxQkFBNUIsYUFBNEJBLHFCQUE1QixpREFBNEJBLHFCQUFxQixDQUFFSSxrQkFBbkQsMkRBQTJCLHVCQUF1RVIsS0FBbEcsQ0FEaUI7QUFBQSxTQURRLENBQTNCOztBQUlBLFlBQUlLLGtCQUFrQixDQUFDLENBQUQsQ0FBdEIsRUFBMkI7QUFBQTs7QUFDMUI7QUFDQSxvQ0FBQWYscUJBQXFCLEVBQUNHLElBQXRCLDBFQUNJWSxrQkFBa0IsQ0FBQyxDQUFELENBQWxCLENBQXNCSSxVQUQxQix5REFDSSxxQkFBa0NkLGdCQUFsQyxDQUFtREMsR0FBbkQsQ0FBdUQsVUFBQUMsUUFBUTtBQUFBLG1CQUFJUSxrQkFBa0IsQ0FBQyxDQUFELENBQWxCLENBQXNCUCxJQUF0QixHQUE2QixHQUE3QixHQUFtQ0QsUUFBUSxDQUFDQyxJQUFoRDtBQUFBLFdBQS9ELENBREo7QUFHQTtBQUNELE9BWkQsTUFZTztBQUFBOztBQUNOLFlBQU1ZLCtCQUErQixHQUFHTixxQkFBSCxhQUFHQSxxQkFBSCxpREFBR0EscUJBQXFCLENBQUViLGdCQUExQixxRkFBRyx1QkFBeUNRLHFCQUE1QywyREFBRyx1QkFBZ0VILEdBQWhFLENBQ3ZDLFVBQUFDLFFBQVE7QUFBQTs7QUFBQSxpQkFBSSxDQUFDTyxxQkFBRCxhQUFDQSxxQkFBRCxpREFBQ0EscUJBQXFCLENBQUVJLGtCQUF4QixrRkFBdUVSLEtBQXZFLElBQStFLEdBQS9FLEdBQXFGSCxRQUFRLENBQUNHLEtBQWxHO0FBQUEsU0FEK0IsQ0FBeEM7O0FBR0EsWUFBSVUsK0JBQUosRUFBcUM7QUFBQTs7QUFDcEMsb0NBQUFwQixxQkFBcUIsRUFBQ0csSUFBdEIsa0RBQThCaUIsK0JBQTlCO0FBQ0E7QUFDRDtBQUNELEtBckJEO0FBc0JBLFdBQU9wQixxQkFBUDtBQUNBLEdBbENNOzs7O0FBb0NBLE1BQU1xQix3QkFBd0IsR0FBRyxVQUFTM0IsU0FBVCxFQUF3QztBQUFBOztBQUMvRSxXQUFPLENBQUMsNkJBQUNBLFNBQVMsQ0FBQ0MsV0FBVixDQUFzQjJCLE9BQXZCLG9EQUFDLHdCQUErQkMsc0JBQWhDLENBQVI7QUFDQSxHQUZNIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBFbnRpdHlTZXQgfSBmcm9tIFwiQHNhcC11eC9hbm5vdGF0aW9uLWNvbnZlcnRlclwiO1xuaW1wb3J0IHsgTmF2aWdhdGlvblByb3BlcnR5UGF0aCB9IGZyb20gXCJAc2FwLXV4L3ZvY2FidWxhcmllcy10eXBlc1wiO1xuXG5leHBvcnQgY29uc3QgaXNFbnRpdHlTZXQgPSBmdW5jdGlvbihkYXRhT2JqZWN0OiBhbnkpOiBkYXRhT2JqZWN0IGlzIEVudGl0eVNldCB7XG5cdHJldHVybiBkYXRhT2JqZWN0ICYmIGRhdGFPYmplY3QuaGFzT3duUHJvcGVydHkoXCJfdHlwZVwiKSAmJiBkYXRhT2JqZWN0Ll90eXBlID09PSBcIkVudGl0eVNldFwiO1xufTtcblxuZXhwb3J0IGNvbnN0IGdldEZpbHRlckV4cHJlc3Npb25SZXN0cmljdGlvbnMgPSBmdW5jdGlvbihlbnRpdHlTZXQ6IEVudGl0eVNldCkge1xuXHRyZXR1cm4gZW50aXR5U2V0LmFubm90YXRpb25zPy5DYXBhYmlsaXRpZXM/LkZpbHRlclJlc3RyaWN0aW9ucz8uRmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyB8fCBbXTtcbn07XG5cbi8qKlxuICogUmVhZHMgYWxsIFNvcnRSZXN0cmljdGlvbnMgb2YgdGhlIG1haW4gZW50aXR5IGFuZCB0aGUgKGZpcnN0IGxldmVsKSBuYXZpZ2F0aW9uIHJlc3RyaWN0aW9ucy5cbiAqIFRoaXMgZG9lcyBub3Qgd29yayBmb3IgbW9yZSB0aGFuIG9uZSBsZXZlbCBvZiBuYXZpZ2F0aW9uLlxuICpcbiAqIEBwYXJhbSB7RW50aXR5U2V0fSBlbnRpdHlTZXQgRW50aXR5IHNldCB0byBiZSBhbmFseXplZFxuICogQHJldHVybnMge3N0cmluZ1tdfSBBcnJheSBjb250YWluaW5nIHRoZSBwcm9wZXJ0eSBuYW1lcyBvZiBhbGwgbm9uLXNvcnRhYmxlIHByb3BlcnRpZXNcbiAqL1xuZXhwb3J0IGNvbnN0IGdldE5vblNvcnRhYmxlUHJvcGVydGllc1Jlc3RyaWN0aW9ucyA9IGZ1bmN0aW9uKGVudGl0eVNldDogRW50aXR5U2V0IHwgdW5kZWZpbmVkKTogc3RyaW5nW10ge1xuXHRsZXQgbm9uU29ydGFibGVQcm9wZXJ0aWVzID0gW107XG5cdC8vIENoZWNrIGFubm90YXRpb25zIGZvciBtYWluIGVudGl0eVxuXHRpZiAoZW50aXR5U2V0Py5hbm5vdGF0aW9ucz8uQ2FwYWJpbGl0aWVzPy5Tb3J0UmVzdHJpY3Rpb25zPy5Tb3J0YWJsZSA9PT0gZmFsc2UpIHtcblx0XHQvLyBhZGQgYWxsIHByb3BlcnRpZXMgb2YgdGhlIGVudGl0eSB0byB0aGUgbm9uU29ydGFibGVQcm9wZXJ0aWVzXG5cdFx0bm9uU29ydGFibGVQcm9wZXJ0aWVzLnB1c2goLi4uZW50aXR5U2V0LmVudGl0eVR5cGUuZW50aXR5UHJvcGVydGllcy5tYXAocHJvcGVydHkgPT4gcHJvcGVydHkubmFtZSkpO1xuXHR9IGVsc2Uge1xuXHRcdG5vblNvcnRhYmxlUHJvcGVydGllcyA9XG5cdFx0XHRlbnRpdHlTZXQ/LmFubm90YXRpb25zPy5DYXBhYmlsaXRpZXM/LlNvcnRSZXN0cmljdGlvbnM/Lk5vblNvcnRhYmxlUHJvcGVydGllcz8ubWFwKHByb3BlcnR5ID0+IHByb3BlcnR5LnZhbHVlKSB8fCBbXTtcblx0fVxuXHQvLyBDaGVjayBmb3IgZXZlcnkgbmF2aWdhdGlvblJlc3RyaWN0aW9uIGlmIGl0IGhhcyBzb3J0UmVzdHJpY3Rpb25zXG5cdGVudGl0eVNldD8uYW5ub3RhdGlvbnM/LkNhcGFiaWxpdGllcz8uTmF2aWdhdGlvblJlc3RyaWN0aW9ucz8uUmVzdHJpY3RlZFByb3BlcnRpZXM/LmZvckVhY2gobmF2aWdhdGlvblJlc3RyaWN0aW9uID0+IHtcblx0XHRpZiAobmF2aWdhdGlvblJlc3RyaWN0aW9uPy5Tb3J0UmVzdHJpY3Rpb25zPy5Tb3J0YWJsZSA9PT0gZmFsc2UpIHtcblx0XHRcdC8vIGZpbmQgY29ycmVjdCBuYXZpZ2F0aW9uIHByb3BlcnR5XG5cdFx0XHRjb25zdCBuYXZpZ2F0aW9uUHJvcGVydHkgPSBlbnRpdHlTZXQ/LmVudGl0eVR5cGU/Lm5hdmlnYXRpb25Qcm9wZXJ0aWVzPy5maWx0ZXIoXG5cdFx0XHRcdG5hdmlnYXRpb25Qcm9wZXJ0eSA9PlxuXHRcdFx0XHRcdG5hdmlnYXRpb25Qcm9wZXJ0eS5uYW1lID09IChuYXZpZ2F0aW9uUmVzdHJpY3Rpb24/Lk5hdmlnYXRpb25Qcm9wZXJ0eSBhcyBOYXZpZ2F0aW9uUHJvcGVydHlQYXRoKT8udmFsdWVcblx0XHRcdCk7XG5cdFx0XHRpZiAobmF2aWdhdGlvblByb3BlcnR5WzBdKSB7XG5cdFx0XHRcdC8vIGFkZCBhbGwgcHJvcGVydGllcyBvZiB0aGUgbmF2aWdhdGlvbiBwcm9wZXJ0eSB0byB0aGUgbm9uU29ydGFibGVQcm9wZXJ0aWVzXG5cdFx0XHRcdG5vblNvcnRhYmxlUHJvcGVydGllcy5wdXNoKFxuXHRcdFx0XHRcdC4uLm5hdmlnYXRpb25Qcm9wZXJ0eVswXS50YXJnZXRUeXBlPy5lbnRpdHlQcm9wZXJ0aWVzLm1hcChwcm9wZXJ0eSA9PiBuYXZpZ2F0aW9uUHJvcGVydHlbMF0ubmFtZSArIFwiL1wiICsgcHJvcGVydHkubmFtZSlcblx0XHRcdFx0KTtcblx0XHRcdH1cblx0XHR9IGVsc2Uge1xuXHRcdFx0Y29uc3Qgbm9uU29ydGFibGVOYXZpZ2F0aW9uUHJvcGVydGllcyA9IG5hdmlnYXRpb25SZXN0cmljdGlvbj8uU29ydFJlc3RyaWN0aW9ucz8uTm9uU29ydGFibGVQcm9wZXJ0aWVzPy5tYXAoXG5cdFx0XHRcdHByb3BlcnR5ID0+IChuYXZpZ2F0aW9uUmVzdHJpY3Rpb24/Lk5hdmlnYXRpb25Qcm9wZXJ0eSBhcyBOYXZpZ2F0aW9uUHJvcGVydHlQYXRoKT8udmFsdWUgKyBcIi9cIiArIHByb3BlcnR5LnZhbHVlXG5cdFx0XHQpO1xuXHRcdFx0aWYgKG5vblNvcnRhYmxlTmF2aWdhdGlvblByb3BlcnRpZXMpIHtcblx0XHRcdFx0bm9uU29ydGFibGVQcm9wZXJ0aWVzLnB1c2goLi4ubm9uU29ydGFibGVOYXZpZ2F0aW9uUHJvcGVydGllcyk7XG5cdFx0XHR9XG5cdFx0fVxuXHR9KTtcblx0cmV0dXJuIG5vblNvcnRhYmxlUHJvcGVydGllcztcbn07XG5cbmV4cG9ydCBjb25zdCBpc1N0aWNreVNlc3Npb25TdXBwb3J0ZWQgPSBmdW5jdGlvbihlbnRpdHlTZXQ6IEVudGl0eVNldCk6IGJvb2xlYW4ge1xuXHRyZXR1cm4gISFlbnRpdHlTZXQuYW5ub3RhdGlvbnMuU2Vzc2lvbj8uU3RpY2t5U2Vzc2lvblN1cHBvcnRlZDtcbn07XG4iXX0=

package/packages/sap.fe.core/src/sap/fe/core/templating/EntitySetHelper.js

@@ -2,4 +2,4 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define([],function(){"use strict";var _={};var i=function(d){return d&&d.hasOwnProperty("_type")&&d._type==="EntitySet";};_.isEntitySet=i;var g=function(e){var c,d,f;return((c=e.annotations)===null||c===void 0?void 0:(d=c.Capabilities)===null||d===void 0?void 0:(f=d.FilterRestrictions)===null||f===void 0?void 0:f.FilterExpressionRestrictions)||[];};_.getFilterExpressionRestrictions=g;var a=function(e){var c,d,f,h,j;return(c=e===null||e===void 0?void 0:(d=e.annotations)===null||d===void 0?void 0:(f=d.Capabilities)===null||f===void 0?void 0:(h=f.SortRestrictions)===null||h===void 0?void 0:(j=h.NonSortableProperties)===null||j===void 0?void 0:j.map(function(p){return p.value;}))!==null&&c!==void 0?c:[];};_.getNonSortablePropertiesRestrictions=a;var b=function(e){var c;return!!((c=e.annotations.Session)!==null&&c!==void 0&&c.StickySessionSupported);};_.isStickySessionSupported=b;return _;},false);
+sap.ui.define([],function(){"use strict";var _={};function a(i){return e(i)||d(i)||c(i)||b();}function b(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");}function c(o,m){if(!o)return;if(typeof o==="string")return f(o,m);var n=Object.prototype.toString.call(o).slice(8,-1);if(n==="Object"&&o.constructor)n=o.constructor.name;if(n==="Map"||n==="Set")return Array.from(o);if(n==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return f(o,m);}function d(i){if(typeof Symbol!=="undefined"&&i[Symbol.iterator]!=null||i["@@iterator"]!=null)return Array.from(i);}function e(i){if(Array.isArray(i))return f(i);}function f(l,m){if(m==null||m>l.length)m=l.length;for(var i=0,n=new Array(m);i<m;i++){n[i]=l[i];}return n;}var g=function(i){return i&&i.hasOwnProperty("_type")&&i._type==="EntitySet";};_.isEntitySet=g;var h=function(i){var l,m,n;return((l=i.annotations)===null||l===void 0?void 0:(m=l.Capabilities)===null||m===void 0?void 0:(n=m.FilterRestrictions)===null||n===void 0?void 0:n.FilterExpressionRestrictions)||[];};_.getFilterExpressionRestrictions=h;var j=function(i){var l,m,n,o,p,q,r;var s=[];if((i===null||i===void 0?void 0:(l=i.annotations)===null||l===void 0?void 0:(m=l.Capabilities)===null||m===void 0?void 0:(n=m.SortRestrictions)===null||n===void 0?void 0:n.Sortable)===false){var t;(t=s).push.apply(t,a(i.entityType.entityProperties.map(function(y){return y.name;})));}else{var u,v,w,x;s=(i===null||i===void 0?void 0:(u=i.annotations)===null||u===void 0?void 0:(v=u.Capabilities)===null||v===void 0?void 0:(w=v.SortRestrictions)===null||w===void 0?void 0:(x=w.NonSortableProperties)===null||x===void 0?void 0:x.map(function(y){return y.value;}))||[];}i===null||i===void 0?void 0:(o=i.annotations)===null||o===void 0?void 0:(p=o.Capabilities)===null||p===void 0?void 0:(q=p.NavigationRestrictions)===null||q===void 0?void 0:(r=q.RestrictedProperties)===null||r===void 0?void 0:r.forEach(function(y){var z;if((y===null||y===void 0?void 0:(z=y.SortRestrictions)===null||z===void 0?void 0:z.Sortable)===false){var A,B;var C=i===null||i===void 0?void 0:(A=i.entityType)===null||A===void 0?void 0:(B=A.navigationProperties)===null||B===void 0?void 0:B.filter(function(C){var J;return C.name==(y===null||y===void 0?void 0:(J=y.NavigationProperty)===null||J===void 0?void 0:J.value);});if(C[0]){var D,E;(D=s).push.apply(D,a((E=C[0].targetType)===null||E===void 0?void 0:E.entityProperties.map(function(J){return C[0].name+"/"+J.name;})));}}else{var F,G;var H=y===null||y===void 0?void 0:(F=y.SortRestrictions)===null||F===void 0?void 0:(G=F.NonSortableProperties)===null||G===void 0?void 0:G.map(function(J){var K;return(y===null||y===void 0?void 0:(K=y.NavigationProperty)===null||K===void 0?void 0:K.value)+"/"+J.value;});if(H){var I;(I=s).push.apply(I,a(H));}}});return s;};_.getNonSortablePropertiesRestrictions=j;var k=function(i){var l;return!!((l=i.annotations.Session)!==null&&l!==void 0&&l.StickySessionSupported);};_.isStickySessionSupported=k;return _;},false);

package/packages/sap.fe.core/src/sap/fe/core/templating/EntitySetHelper.ts

@@ -1,4 +1,5 @@
 import { EntitySet } from "@sap-ux/annotation-converter";
+import { NavigationPropertyPath } from "@sap-ux/vocabularies-types";
 
 export const isEntitySet = function(dataObject: any): dataObject is EntitySet {
 	return dataObject && dataObject.hasOwnProperty("_type") && dataObject._type === "EntitySet";
@@ -8,8 +9,47 @@ export const getFilterExpressionRestrictions = function(entitySet: EntitySet) {
 	return entitySet.annotations?.Capabilities?.FilterRestrictions?.FilterExpressionRestrictions || [];
 };
 
-export const getNonSortablePropertiesRestrictions = function(entitySet: EntitySet | undefined) {
-	return entitySet?.annotations?.Capabilities?.SortRestrictions?.NonSortableProperties?.map(property => property.value) ?? [];
+/**
+ * Reads all SortRestrictions of the main entity and the (first level) navigation restrictions.
+ * This does not work for more than one level of navigation.
+ *
+ * @param {EntitySet} entitySet Entity set to be analyzed
+ * @returns {string[]} Array containing the property names of all non-sortable properties
+ */
+export const getNonSortablePropertiesRestrictions = function(entitySet: EntitySet | undefined): string[] {
+	let nonSortableProperties = [];
+	// Check annotations for main entity
+	if (entitySet?.annotations?.Capabilities?.SortRestrictions?.Sortable === false) {
+		// add all properties of the entity to the nonSortableProperties
+		nonSortableProperties.push(...entitySet.entityType.entityProperties.map(property => property.name));
+	} else {
+		nonSortableProperties =
+			entitySet?.annotations?.Capabilities?.SortRestrictions?.NonSortableProperties?.map(property => property.value) || [];
+	}
+	// Check for every navigationRestriction if it has sortRestrictions
+	entitySet?.annotations?.Capabilities?.NavigationRestrictions?.RestrictedProperties?.forEach(navigationRestriction => {
+		if (navigationRestriction?.SortRestrictions?.Sortable === false) {
+			// find correct navigation property
+			const navigationProperty = entitySet?.entityType?.navigationProperties?.filter(
+				navigationProperty =>
+					navigationProperty.name == (navigationRestriction?.NavigationProperty as NavigationPropertyPath)?.value
+			);
+			if (navigationProperty[0]) {
+				// add all properties of the navigation property to the nonSortableProperties
+				nonSortableProperties.push(
+					...navigationProperty[0].targetType?.entityProperties.map(property => navigationProperty[0].name + "/" + property.name)
+				);
+			}
+		} else {
+			const nonSortableNavigationProperties = navigationRestriction?.SortRestrictions?.NonSortableProperties?.map(
+				property => (navigationRestriction?.NavigationProperty as NavigationPropertyPath)?.value + "/" + property.value
+			);
+			if (nonSortableNavigationProperties) {
+				nonSortableProperties.push(...nonSortableNavigationProperties);
+			}
+		}
+	});
+	return nonSortableProperties;
 };
 
 export const isStickySessionSupported = function(entitySet: EntitySet): boolean {