@sapui5/sap.fe.core 1.96.0 → 1.97.0

package/src/sap/fe/core/messagebundle_sk.properties

@@ -86,14 +86,22 @@ T_MESSAGE_GROUP_TITLE_TABLE_DENOMINATOR=Tabu\u013Eka
 
 T_MESSAGE_BUTTON_SAPFE_MESSAGE_GROUP_LAST_ACTION=Posledn\u00E1 akcia
 
+T_MESSAGE_ITEM_SUBTITLE_CREATION_ROW_INDICATOR=<Nov\u00E9>
+
 T_MESSAGE_ITEM_SUBTITLE_INDICATOR_UNKNOWN=Nezn\u00E1me
 
+T_COLUMN_INDICATOR_IN_TABLE_DEFINITION=Skryt\u00E9
+
 T_MESSAGE_ITEM_SUBTITLE=Riadok\: {0}, st\u013Apec\: {1}
 
 C_COMMON_SAPFE_ERROR=Chyba
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE=Spr\u00E1vy
 
+C_MESSAGE_HANDLING_SAPFE_503_TITLE=Sorry, this service is temporarily unavailable.
+
+C_MESSAGE_HANDLING_SAPFE_503_Description=Please try {0}.
+
 C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_TITLE_ERROR=Chyba
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_WARNING=Upozornenie
@@ -221,6 +229,8 @@ C_DRAFT_EDIT_STATE_DRAFT_LOCKED_FILTER=Blokovan\u00E9 in\u00FDm pou\u017E\u00EDv
 
 C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=Neulo\u017Een\u00E9 zmeny in\u00E9ho pou\u017E\u00EDvate\u013Ea
 
+C_DRAFT_EDIT_STATE_DRAFT_ALL_HIDING_DRAFTS_FILTER=V\u0161etko (potla\u010Denie n\u00E1vrhov)
+
 T_COMMON_SAPFE_ACTION_SHARE=Zdie\u013Eanie
 
 

package/src/sap/fe/core/messagebundle_sl.properties

@@ -86,14 +86,22 @@ T_MESSAGE_GROUP_TITLE_TABLE_DENOMINATOR=Tabela
 
 T_MESSAGE_BUTTON_SAPFE_MESSAGE_GROUP_LAST_ACTION=Zadnja akcija
 
+T_MESSAGE_ITEM_SUBTITLE_CREATION_ROW_INDICATOR=<Novo>
+
 T_MESSAGE_ITEM_SUBTITLE_INDICATOR_UNKNOWN=Neznano
 
+T_COLUMN_INDICATOR_IN_TABLE_DEFINITION=Skrito
+
 T_MESSAGE_ITEM_SUBTITLE=Vrstica\: {0}, stolpec\: {1}
 
 C_COMMON_SAPFE_ERROR=Napaka
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE=Sporo\u010Dila
 
+C_MESSAGE_HANDLING_SAPFE_503_TITLE=Sorry, this service is temporarily unavailable.
+
+C_MESSAGE_HANDLING_SAPFE_503_Description=Please try {0}.
+
 C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_TITLE_ERROR=Napaka
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_WARNING=Opozorilo
@@ -221,6 +229,8 @@ C_DRAFT_EDIT_STATE_DRAFT_LOCKED_FILTER=Blokira drug uporabnik
 
 C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=Neshranjene spremembe drugega uporabnika
 
+C_DRAFT_EDIT_STATE_DRAFT_ALL_HIDING_DRAFTS_FILTER=Vse (skrivanje osnutkov)
+
 T_COMMON_SAPFE_ACTION_SHARE=Delitev
 
 

package/src/sap/fe/core/messagebundle_sv.properties

@@ -86,14 +86,22 @@ T_MESSAGE_GROUP_TITLE_TABLE_DENOMINATOR=Tabell
 
 T_MESSAGE_BUTTON_SAPFE_MESSAGE_GROUP_LAST_ACTION=Senaste \u00E5tg\u00E4rd
 
+T_MESSAGE_ITEM_SUBTITLE_CREATION_ROW_INDICATOR=<Ny>
+
 T_MESSAGE_ITEM_SUBTITLE_INDICATOR_UNKNOWN=Ok\u00E4nd
 
+T_COLUMN_INDICATOR_IN_TABLE_DEFINITION=Dold
+
 T_MESSAGE_ITEM_SUBTITLE=Rad\: {0}, kolumn\: {1}
 
 C_COMMON_SAPFE_ERROR=Fel
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE=Meddelanden
 
+C_MESSAGE_HANDLING_SAPFE_503_TITLE=Sorry, this service is temporarily unavailable.
+
+C_MESSAGE_HANDLING_SAPFE_503_Description=Please try {0}.
+
 C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_TITLE_ERROR=Fel
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_WARNING=Varning
@@ -221,6 +229,8 @@ C_DRAFT_EDIT_STATE_DRAFT_LOCKED_FILTER=Sp\u00E4rras av en annan anv\u00E4ndare
 
 C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=Ej sparade \u00E4ndringar av en annan anv\u00E4ndare
 
+C_DRAFT_EDIT_STATE_DRAFT_ALL_HIDING_DRAFTS_FILTER=Alla (d\u00F6ljer utkast)
+
 T_COMMON_SAPFE_ACTION_SHARE=Dela
 
 

package/src/sap/fe/core/messagebundle_th.properties

@@ -86,14 +86,22 @@ T_MESSAGE_GROUP_TITLE_TABLE_DENOMINATOR=\u0E15\u0E32\u0E23\u0E32\u0E07
 
 T_MESSAGE_BUTTON_SAPFE_MESSAGE_GROUP_LAST_ACTION=\u0E01\u0E32\u0E23\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E25\u0E48\u0E32\u0E2A\u0E38\u0E14
 
+T_MESSAGE_ITEM_SUBTITLE_CREATION_ROW_INDICATOR=<\u0E43\u0E2B\u0E21\u0E48>
+
 T_MESSAGE_ITEM_SUBTITLE_INDICATOR_UNKNOWN=\u0E44\u0E21\u0E48\u0E23\u0E39\u0E49\u0E08\u0E31\u0E01
 
+T_COLUMN_INDICATOR_IN_TABLE_DEFINITION=\u0E0B\u0E48\u0E2D\u0E19\u0E2D\u0E22\u0E39\u0E48
+
 T_MESSAGE_ITEM_SUBTITLE=\u0E41\u0E16\u0E27\: {0}, \u0E04\u0E2D\u0E25\u0E31\u0E21\u0E19\u0E4C\: {1}
 
 C_COMMON_SAPFE_ERROR=\u0E02\u0E49\u0E2D\u0E1C\u0E34\u0E14\u0E1E\u0E25\u0E32\u0E14
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE=\u0E02\u0E49\u0E2D\u0E04\u0E27\u0E32\u0E21
 
+C_MESSAGE_HANDLING_SAPFE_503_TITLE=Sorry, this service is temporarily unavailable.
+
+C_MESSAGE_HANDLING_SAPFE_503_Description=Please try {0}.
+
 C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_TITLE_ERROR=\u0E02\u0E49\u0E2D\u0E1C\u0E34\u0E14\u0E1E\u0E25\u0E32\u0E14
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_WARNING=\u0E04\u0E33\u0E40\u0E15\u0E37\u0E2D\u0E19
@@ -221,6 +229,8 @@ C_DRAFT_EDIT_STATE_DRAFT_LOCKED_FILTER=\u0E16\u0E39\u0E01\u0E25\u0E47\u0E2D\u0E0
 
 C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=\u0E01\u0E32\u0E23\u0E40\u0E1B\u0E25\u0E35\u0E48\u0E22\u0E19\u0E41\u0E1B\u0E25\u0E07\u0E42\u0E14\u0E22\u0E1C\u0E39\u0E49\u0E43\u0E0A\u0E49\u0E2D\u0E37\u0E48\u0E19\u0E17\u0E35\u0E48\u0E22\u0E31\u0E07\u0E44\u0E21\u0E48\u0E40\u0E01\u0E47\u0E1A\u0E1A\u0E31\u0E19\u0E17\u0E36\u0E01
 
+C_DRAFT_EDIT_STATE_DRAFT_ALL_HIDING_DRAFTS_FILTER=\u0E17\u0E31\u0E49\u0E07\u0E2B\u0E21\u0E14 (\u0E0B\u0E48\u0E2D\u0E19\u0E41\u0E1A\u0E1A\u0E23\u0E48\u0E32\u0E07)
+
 T_COMMON_SAPFE_ACTION_SHARE=\u0E41\u0E0A\u0E23\u0E4C
 
 

package/src/sap/fe/core/messagebundle_tr.properties

@@ -86,14 +86,22 @@ T_MESSAGE_GROUP_TITLE_TABLE_DENOMINATOR=Tablo
 
 T_MESSAGE_BUTTON_SAPFE_MESSAGE_GROUP_LAST_ACTION=Son i\u015Flem
 
+T_MESSAGE_ITEM_SUBTITLE_CREATION_ROW_INDICATOR=<Yeni>
+
 T_MESSAGE_ITEM_SUBTITLE_INDICATOR_UNKNOWN=Bilinmiyor
 
+T_COLUMN_INDICATOR_IN_TABLE_DEFINITION=Gizli
+
 T_MESSAGE_ITEM_SUBTITLE=Sat\u0131r\: {0}, S\u00FCtun\: {1}
 
 C_COMMON_SAPFE_ERROR=Hata
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE=\u0130letiler
 
+C_MESSAGE_HANDLING_SAPFE_503_TITLE=Sorry, this service is temporarily unavailable.
+
+C_MESSAGE_HANDLING_SAPFE_503_Description=Please try {0}.
+
 C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_TITLE_ERROR=Hata
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_WARNING=Uyar\u0131
@@ -221,6 +229,8 @@ C_DRAFT_EDIT_STATE_DRAFT_LOCKED_FILTER=Ba\u015Fka kullan\u0131c\u0131 taraf\u013
 
 C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=Ba\u015Fka kullan\u0131c\u0131 trfn.kaydedilmeyen de\u011Fi\u015Fiklikler
 
+C_DRAFT_EDIT_STATE_DRAFT_ALL_HIDING_DRAFTS_FILTER=T\u00FCm\u00FC (taslaklar gizleniyor)
+
 T_COMMON_SAPFE_ACTION_SHARE=Payla\u015F
 
 

package/src/sap/fe/core/messagebundle_uk.properties

@@ -86,14 +86,22 @@ T_MESSAGE_GROUP_TITLE_TABLE_DENOMINATOR=\u0422\u0430\u0431\u043B\u0438\u0446\u04
 
 T_MESSAGE_BUTTON_SAPFE_MESSAGE_GROUP_LAST_ACTION=\u041E\u0441\u0442\u0430\u043D\u043D\u044F \u043E\u043F\u0435\u0440\u0430\u0446\u0456\u044F
 
+T_MESSAGE_ITEM_SUBTITLE_CREATION_ROW_INDICATOR=<\u041D\u043E\u0432\u0435>
+
 T_MESSAGE_ITEM_SUBTITLE_INDICATOR_UNKNOWN=\u041D\u0435\u0432\u0456\u0434\u043E\u043C\u043E
 
+T_COLUMN_INDICATOR_IN_TABLE_DEFINITION=\u041F\u0440\u0438\u0445\u043E\u0432\u0430\u043D\u043E
+
 T_MESSAGE_ITEM_SUBTITLE=\u0420\u044F\u0434\u043E\u043A\: {0}, \u0441\u0442\u043E\u0432\u043F\u0447\u0438\u043A\: {1}
 
 C_COMMON_SAPFE_ERROR=\u041F\u043E\u043C\u0438\u043B\u043A\u0430
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE=\u041F\u043E\u0432\u0456\u0434\u043E\u043C\u043B\u0435\u043D\u043D\u044F
 
+C_MESSAGE_HANDLING_SAPFE_503_TITLE=Sorry, this service is temporarily unavailable.
+
+C_MESSAGE_HANDLING_SAPFE_503_Description=Please try {0}.
+
 C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_TITLE_ERROR=\u041F\u043E\u043C\u0438\u043B\u043A\u0430
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_WARNING=\u0417\u0430\u0441\u0442\u0435\u0440\u0435\u0436\u0435\u043D\u043D\u044F
@@ -221,6 +229,8 @@ C_DRAFT_EDIT_STATE_DRAFT_LOCKED_FILTER=\u0417\u0430\u0431\u043B\u043E\u043A\u043
 
 C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=\u041D\u0435\u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043D\u0456 \u0437\u043C\u0456\u043D\u0438 \u0456\u043D\u0448\u043E\u0433\u043E \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430
 
+C_DRAFT_EDIT_STATE_DRAFT_ALL_HIDING_DRAFTS_FILTER=\u0412\u0441\u0435 (\u043F\u0440\u0438\u0445\u043E\u0432\u0430\u043D\u043D\u044F \u0447\u0435\u0440\u043D\u0435\u0442\u043E\u043A)
+
 T_COMMON_SAPFE_ACTION_SHARE=\u0412\u0438\u043A\u043E\u0440.\u0441\u043F\u0456\u043B\u044C\u043D\u043E
 
 

package/src/sap/fe/core/messagebundle_vi.properties

@@ -86,14 +86,22 @@ T_MESSAGE_GROUP_TITLE_TABLE_DENOMINATOR=Ba\u0309ng
 
 T_MESSAGE_BUTTON_SAPFE_MESSAGE_GROUP_LAST_ACTION=Thao ta\u0301c cu\u00F4\u0301i
 
+T_MESSAGE_ITEM_SUBTITLE_CREATION_ROW_INDICATOR=<M\u01A1\u0301i>
+
 T_MESSAGE_ITEM_SUBTITLE_INDICATOR_UNKNOWN=Ch\u01B0a bi\u00EA\u0301t
 
+T_COLUMN_INDICATOR_IN_TABLE_DEFINITION=\u00C2\u0309n
+
 T_MESSAGE_ITEM_SUBTITLE=Ha\u0300ng\: {0}, C\u00F4\u0323t \: {1}
 
 C_COMMON_SAPFE_ERROR=L\u1ED7i
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE=Th\u00F4ng ba\u0301o
 
+C_MESSAGE_HANDLING_SAPFE_503_TITLE=Sorry, this service is temporarily unavailable.
+
+C_MESSAGE_HANDLING_SAPFE_503_Description=Please try {0}.
+
 C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_TITLE_ERROR=L\u00F4\u0303i
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_WARNING=Ca\u0309nh ba\u0301o
@@ -221,6 +229,8 @@ C_DRAFT_EDIT_STATE_DRAFT_LOCKED_FILTER=Bi\u0323 kho\u0301a b\u01A1\u0309i ng\u01
 
 C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=Ca\u0301c thay \u0111\u00F4\u0309i ch\u01B0a l\u01B0u b\u01A1\u0309i ng\u01B0\u01A1\u0300i du\u0300ng kha\u0301c
 
+C_DRAFT_EDIT_STATE_DRAFT_ALL_HIDING_DRAFTS_FILTER=T\u00E2\u0301t ca\u0309 (Ba\u0309n tha\u0309o \u00E2\u0309n)
+
 T_COMMON_SAPFE_ACTION_SHARE=Chia se\u0309
 
 

package/src/sap/fe/core/messagebundle_zh_CN.properties

@@ -86,14 +86,22 @@ T_MESSAGE_GROUP_TITLE_TABLE_DENOMINATOR=\u8868
 
 T_MESSAGE_BUTTON_SAPFE_MESSAGE_GROUP_LAST_ACTION=\u4E0A\u6B21\u64CD\u4F5C
 
+T_MESSAGE_ITEM_SUBTITLE_CREATION_ROW_INDICATOR=<\u65B0>
+
 T_MESSAGE_ITEM_SUBTITLE_INDICATOR_UNKNOWN=\u672A\u77E5
 
+T_COLUMN_INDICATOR_IN_TABLE_DEFINITION=\u5DF2\u9690\u85CF
+
 T_MESSAGE_ITEM_SUBTITLE=\u884C\uFF1A{0}\uFF0C\u5217\uFF1A{1}
 
 C_COMMON_SAPFE_ERROR=\u9519\u8BEF
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE=\u6D88\u606F
 
+C_MESSAGE_HANDLING_SAPFE_503_TITLE=Sorry, this service is temporarily unavailable.
+
+C_MESSAGE_HANDLING_SAPFE_503_Description=Please try {0}.
+
 C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_TITLE_ERROR=\u9519\u8BEF
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_WARNING=\u8B66\u544A
@@ -221,6 +229,8 @@ C_DRAFT_EDIT_STATE_DRAFT_LOCKED_FILTER=\u5DF2\u7531\u53E6\u4E00\u7528\u6237\u950
 
 C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=\u53E6\u4E00\u7528\u6237\u672A\u4FDD\u5B58\u7684\u66F4\u6539
 
+C_DRAFT_EDIT_STATE_DRAFT_ALL_HIDING_DRAFTS_FILTER=\u5168\u90E8\uFF08\u9690\u85CF\u8349\u7A3F\uFF09
+
 T_COMMON_SAPFE_ACTION_SHARE=\u5171\u4EAB
 
 

package/src/sap/fe/core/messagebundle_zh_TW.properties

@@ -86,14 +86,22 @@ T_MESSAGE_GROUP_TITLE_TABLE_DENOMINATOR=\u8868\u683C
 
 T_MESSAGE_BUTTON_SAPFE_MESSAGE_GROUP_LAST_ACTION=\u6700\u5F8C\u52D5\u4F5C
 
+T_MESSAGE_ITEM_SUBTITLE_CREATION_ROW_INDICATOR=<\u65B0>
+
 T_MESSAGE_ITEM_SUBTITLE_INDICATOR_UNKNOWN=\u672A\u77E5
 
+T_COLUMN_INDICATOR_IN_TABLE_DEFINITION=\u5DF2\u96B1\u85CF
+
 T_MESSAGE_ITEM_SUBTITLE=\u5217\uFF1A{0}\u3001\u6B04\uFF1A{1}
 
 C_COMMON_SAPFE_ERROR=\u932F\u8AA4
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE=\u8A0A\u606F
 
+C_MESSAGE_HANDLING_SAPFE_503_TITLE=Sorry, this service is temporarily unavailable.
+
+C_MESSAGE_HANDLING_SAPFE_503_Description=Please try {0}.
+
 C_COMMON_SAPFE_ERROR_MESSAGES_PAGE_TITLE_ERROR=\u932F\u8AA4
 
 C_MESSAGE_HANDLING_SAPFE_ERROR_MESSAGES_PAGE_TITLE_WARNING=\u8B66\u544A
@@ -221,6 +229,8 @@ C_DRAFT_EDIT_STATE_DRAFT_LOCKED_FILTER=\u5176\u4ED6\u4F7F\u7528\u8005\u5DF2\u939
 
 C_DRAFT_EDIT_STATE_DRAFT_UNSAVED_CHANGES_FILTER=\u5176\u4ED6\u4F7F\u7528\u8005\u672A\u5132\u5B58\u7684\u66F4\u6539\u5167\u5BB9
 
+C_DRAFT_EDIT_STATE_DRAFT_ALL_HIDING_DRAFTS_FILTER=\u6240\u6709 (\u96B1\u85CF\u8349\u7A3F)
+
 T_COMMON_SAPFE_ACTION_SHARE=\u5171\u7528
 
 

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

@@ -425,7 +425,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
@@ -485,10 +486,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);
 
@@ -531,7 +529,7 @@ sap.ui.define(
 						}.bind(this)
 					);
 				}
-				return this.oRouterProxy.navToHash(sTargetPath, false, mParameters.noPreservationCache);
+				return this.oRouterProxy.navToHash(sTargetPath, false, mParameters.noPreservationCache, mParameters.bForceFocus);
 			},
 
 			/**
@@ -857,6 +855,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;
@@ -870,19 +893,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/src/sap/fe/core/services/TemplatedViewServiceFactory.js

@@ -81,7 +81,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/src/sap/fe/core/templating/EntitySetHelper.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,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkVudGl0eVNldEhlbHBlci50cyJdLCJuYW1lcyI6WyJpc0VudGl0eVNldCIsImRhdGFPYmplY3QiLCJoYXNPd25Qcm9wZXJ0eSIsIl90eXBlIiwiZ2V0RmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyIsImVudGl0eVNldCIsImFubm90YXRpb25zIiwiQ2FwYWJpbGl0aWVzIiwiRmlsdGVyUmVzdHJpY3Rpb25zIiwiRmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyIsImdldE5vblNvcnRhYmxlUHJvcGVydGllc1Jlc3RyaWN0aW9ucyIsIm5vblNvcnRhYmxlUHJvcGVydGllcyIsIlNvcnRSZXN0cmljdGlvbnMiLCJTb3J0YWJsZSIsInB1c2giLCJlbnRpdHlUeXBlIiwiZW50aXR5UHJvcGVydGllcyIsIm1hcCIsInByb3BlcnR5IiwibmFtZSIsIk5vblNvcnRhYmxlUHJvcGVydGllcyIsInZhbHVlIiwiTmF2aWdhdGlvblJlc3RyaWN0aW9ucyIsIlJlc3RyaWN0ZWRQcm9wZXJ0aWVzIiwiZm9yRWFjaCIsIm5hdmlnYXRpb25SZXN0cmljdGlvbiIsIm5hdmlnYXRpb25Qcm9wZXJ0eSIsIm5hdmlnYXRpb25Qcm9wZXJ0aWVzIiwiZmlsdGVyIiwiTmF2aWdhdGlvblByb3BlcnR5IiwidGFyZ2V0VHlwZSIsIm5vblNvcnRhYmxlTmF2aWdhdGlvblByb3BlcnRpZXMiLCJpc1N0aWNreVNlc3Npb25TdXBwb3J0ZWQiLCJTZXNzaW9uIiwiU3RpY2t5U2Vzc2lvblN1cHBvcnRlZCJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ08sTUFBTUEsV0FBVyxHQUFHLFVBQVNDLFVBQVQsRUFBbUQ7QUFDN0UsV0FBT0EsVUFBVSxJQUFJQSxVQUFVLENBQUNDLGNBQVgsQ0FBMEIsT0FBMUIsQ0FBZCxJQUFvREQsVUFBVSxDQUFDRSxLQUFYLEtBQXFCLFdBQWhGO0FBQ0EsR0FGTTs7OztBQUlBLE1BQU1DLCtCQUErQixHQUFHLFVB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QUF4QixrRkFBdUVSLEtBQXZFLElBQStFLEdBQS9FLEdBQXFGSCxRQUFRLENBQUNHLEtBQWxHO0FBQUEsU0FEK0IsQ0FBeEM7O0FBR0EsWUFBSVUsK0JBQUosRUFBcUM7QUFBQTs7QUFDcEMsb0NBQUFwQixxQkFBcUIsRUFBQ0csSUFBdEIsa0RBQThCaUIsK0JBQTlCO0FBQ0E7QUFDRDtBQUNELEtBckJEO0FBc0JBLFdBQU9wQixxQkFBUDtBQUNBLEdBbENNOzs7O0FBb0NBLE1BQU1xQix3QkFBd0IsR0FBRyxVQUFTM0IsU0FBVCxFQUF3QztBQUFBOztBQUMvRSxXQUFPLENBQUMsNkJBQUNBLFNBQVMsQ0FBQ0MsV0FBVixDQUFzQjJCLE9BQXZCLG9EQUFDLHdCQUErQkMsc0JBQWhDLENBQVI7QUFDQSxHQUZNIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBFbnRpdHlTZXQgfSBmcm9tIFwiQHNhcC11eC9hbm5vdGF0aW9uLWNvbnZlcnRlclwiO1xuaW1wb3J0IHsgTmF2aWdhdGlvblByb3BlcnR5UGF0aCB9IGZyb20gXCJAc2FwLXV4L3ZvY2FidWxhcmllcy10eXBlc1wiO1xuXG5leHBvcnQgY29uc3QgaXNFbnRpdHlTZXQgPSBmdW5jdGlvbihkYXRhT2JqZWN0OiBhbnkpOiBkYXRhT2JqZWN0IGlzIEVudGl0eVNldCB7XG5cdHJldHVybiBkYXRhT2JqZWN0ICYmIGRhdGFPYmplY3QuaGFzT3duUHJvcGVydHkoXCJfdHlwZVwiKSAmJiBkYXRhT2JqZWN0Ll90eXBlID09PSBcIkVudGl0eVNldFwiO1xufTtcblxuZXhwb3J0IGNvbnN0IGdldEZpbHRlckV4cHJlc3Npb25SZXN0cmljdGlvbnMgPSBmdW5jdGlvbihlbnRpdHlTZXQ6IEVudGl0eVNldCkge1xuXHRyZXR1cm4gZW50aXR5U2V0LmFubm90YXRpb25zPy5DYXBhYmlsaXRpZXM/LkZpbHRlclJlc3RyaWN0aW9ucz8uRmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyB8fCBbXTtcbn07XG5cbi8qKlxuICogUmVhZHMgYWxsIFNvcnRSZXN0cmljdGlvbnMgb2YgdGhlIG1haW4gZW50aXR5IGFuZCB0aGUgKGZpcnN0IGxldmVsKSBuYXZpZ2F0aW9uIHJlc3RyaWN0aW9ucy5cbiAqIFRoaXMgZG9lcyBub3Qgd29yayBmb3IgbW9yZSB0aGFuIG9uZSBsZXZlbCBvZiBuYXZpZ2F0aW9uLlxuICpcbiAqIEBwYXJhbSB7RW50aXR5U2V0fSBlbnRpdHlTZXQgRW50aXR5IHNldCB0byBiZSBhbmFseXplZFxuICogQHJldHVybnMge3N0cmluZ1tdfSBBcnJheSBjb250YWluaW5nIHRoZSBwcm9wZXJ0eSBuYW1lcyBvZiBhbGwgbm9uLXNvcnRhYmxlIHByb3BlcnRpZXNcbiAqL1xuZXhwb3J0IGNvbnN0IGdldE5vblNvcnRhYmxlUHJvcGVydGllc1Jlc3RyaWN0aW9ucyA9IGZ1bmN0aW9uKGVudGl0eVNldDogRW50aXR5U2V0IHwgdW5kZWZpbmVkKTogc3RyaW5nW10ge1xuXHRsZXQgbm9uU29ydGFibGVQcm9wZXJ0aWVzID0gW107XG5cdC8vIENoZWNrIGFubm90YXRpb25zIGZvciBtYWluIGVudGl0eVxuXHRpZiAoZW50aXR5U2V0Py5hbm5vdGF0aW9ucz8uQ2FwYWJpbGl0aWVzPy5Tb3J0UmVzdHJpY3Rpb25zPy5Tb3J0YWJsZSA9PT0gZmFsc2UpIHtcblx0XHQvLyBhZGQgYWxsIHByb3BlcnRpZXMgb2YgdGhlIGVudGl0eSB0byB0aGUgbm9uU29ydGFibGVQcm9wZXJ0aWVzXG5cdFx0bm9uU29ydGFibGVQcm9wZXJ0aWVzLnB1c2goLi4uZW50aXR5U2V0LmVudGl0eVR5cGUuZW50aXR5UHJvcGVydGllcy5tYXAocHJvcGVydHkgPT4gcHJvcGVydHkubmFtZSkpO1xuXHR9IGVsc2Uge1xuXHRcdG5vblNvcnRhYmxlUHJvcGVydGllcyA9XG5cdFx0XHRlbnRpdHlTZXQ/LmFubm90YXRpb25zPy5DYXBhYmlsaXRpZXM/LlNvcnRSZXN0cmljdGlvbnM/Lk5vblNvcnRhYmxlUHJvcGVydGllcz8ubWFwKHByb3BlcnR5ID0+IHByb3BlcnR5LnZhbHVlKSB8fCBbXTtcblx0fVxuXHQvLyBDaGVjayBmb3IgZXZlcnkgbmF2aWdhdGlvblJlc3RyaWN0aW9uIGlmIGl0IGhhcyBzb3J0UmVzdHJpY3Rpb25zXG5cdGVudGl0eVNldD8uYW5ub3RhdGlvbnM/LkNhcGFiaWxpdGllcz8uTmF2aWdhdGlvblJlc3RyaWN0aW9ucz8uUmVzdHJpY3RlZFByb3BlcnRpZXM/LmZvckVhY2gobmF2aWdhdGlvblJlc3RyaWN0aW9uID0+IHtcblx0XHRpZiAobmF2aWdhdGlvblJlc3RyaWN0aW9uPy5Tb3J0UmVzdHJpY3Rpb25zPy5Tb3J0YWJsZSA9PT0gZmFsc2UpIHtcblx0XHRcdC8vIGZpbmQgY29ycmVjdCBuYXZpZ2F0aW9uIHByb3BlcnR5XG5cdFx0XHRjb25zdCBuYXZpZ2F0aW9uUHJvcGVydHkgPSBlbnRpdHlTZXQ/LmVudGl0eVR5cGU/Lm5hdmlnYXRpb25Qcm9wZXJ0aWVzPy5maWx0ZXIoXG5cdFx0XHRcdG5hdmlnYXRpb25Qcm9wZXJ0eSA9PlxuXHRcdFx0XHRcdG5hdmlnYXRpb25Qcm9wZXJ0eS5uYW1lID09IChuYXZpZ2F0aW9uUmVzdHJpY3Rpb24/Lk5hdmlnYXRpb25Qcm9wZXJ0eSBhcyBOYXZpZ2F0aW9uUHJvcGVydHlQYXRoKT8udmFsdWVcblx0XHRcdCk7XG5cdFx0XHRpZiAobmF2aWdhdGlvblByb3BlcnR5WzBdKSB7XG5cdFx0XHRcdC8vIGFkZCBhbGwgcHJvcGVydGllcyBvZiB0aGUgbmF2aWdhdGlvbiBwcm9wZXJ0eSB0byB0aGUgbm9uU29ydGFibGVQcm9wZXJ0aWVzXG5cdFx0XHRcdG5vblNvcnRhYmxlUHJvcGVydGllcy5wdXNoKFxuXHRcdFx0XHRcdC4uLm5hdmlnYXRpb25Qcm9wZXJ0eVswXS50YXJnZXRUeXBlPy5lbnRpdHlQcm9wZXJ0aWVzLm1hcChwcm9wZXJ0eSA9PiBuYXZpZ2F0aW9uUHJvcGVydHlbMF0ubmFtZSArIFwiL1wiICsgcHJvcGVydHkubmFtZSlcblx0XHRcdFx0KTtcblx0XHRcdH1cblx0XHR9IGVsc2Uge1xuXHRcdFx0Y29uc3Qgbm9uU29ydGFibGVOYXZpZ2F0aW9uUHJvcGVydGllcyA9IG5hdmlnYXRpb25SZXN0cmljdGlvbj8uU29ydFJlc3RyaWN0aW9ucz8uTm9uU29ydGFibGVQcm9wZXJ0aWVzPy5tYXAoXG5cdFx0XHRcdHByb3BlcnR5ID0+IChuYXZpZ2F0aW9uUmVzdHJpY3Rpb24/Lk5hdmlnYXRpb25Qcm9wZXJ0eSBhcyBOYXZpZ2F0aW9uUHJvcGVydHlQYXRoKT8udmFsdWUgKyBcIi9cIiArIHByb3BlcnR5LnZhbHVlXG5cdFx0XHQpO1xuXHRcdFx0aWYgKG5vblNvcnRhYmxlTmF2aWdhdGlvblByb3BlcnRpZXMpIHtcblx0XHRcdFx0bm9uU29ydGFibGVQcm9wZXJ0aWVzLnB1c2goLi4ubm9uU29ydGFibGVOYXZpZ2F0aW9uUHJvcGVydGllcyk7XG5cdFx0XHR9XG5cdFx0fVxuXHR9KTtcblx0cmV0dXJuIG5vblNvcnRhYmxlUHJvcGVydGllcztcbn07XG5cbmV4cG9ydCBjb25zdCBpc1N0aWNreVNlc3Npb25TdXBwb3J0ZWQgPSBmdW5jdGlvbihlbnRpdHlTZXQ6IEVudGl0eVNldCk6IGJvb2xlYW4ge1xuXHRyZXR1cm4gISFlbnRpdHlTZXQuYW5ub3RhdGlvbnMuU2Vzc2lvbj8uU3RpY2t5U2Vzc2lvblN1cHBvcnRlZDtcbn07XG4iXX0=

package/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 {