@sapui5/sap.ushell_abap 1.129.0 → 1.130.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/main/js/sap/ushell_abap/.library +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/AppStateAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/ClientSideTargetResolutionAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/CommonDataModelAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/ConfigurationDefaultsAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/ContainerAdapter.js +20 -3
- package/src/main/js/sap/ushell_abap/adapters/abap/FlpLaunchPageAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/LaunchPageAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/MenuAdapter.js +30 -4
- package/src/main/js/sap/ushell_abap/adapters/abap/NavTargetResolutionAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/NavTargetResolutionInternalAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/PageBuildingAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/PagePersistenceAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/PersonalizationAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/PersonalizationV2Adapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/SearchAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/SupportTicketAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/Ui5ComponentLoaderAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/UserInfoAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/hana/ContainerAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.configure.ushell.js +1 -1
- package/src/main/js/sap/ushell_abap/library.js +1 -1
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<library xmlns="http://www.sap.com/sap.ui.library.xsd">
|
|
3
3
|
<name>sap.ushell_abap</name>
|
|
4
4
|
<vendor>SAP SE</vendor>
|
|
5
|
-
<version>1.
|
|
5
|
+
<version>1.130.0</version>
|
|
6
6
|
<copyright>Copyright (c) 2009-2023 SAP SE, All Rights Reserved</copyright>
|
|
7
7
|
<documentation>SAP library: sap.ushell_abap</documentation>
|
|
8
8
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* @fileOverview The Unified Shell's container adapter for the ABAP platform.
|
|
4
4
|
*
|
|
5
|
-
* @version 1.
|
|
5
|
+
* @version 1.130.0
|
|
6
6
|
*/
|
|
7
7
|
sap.ui.define([
|
|
8
8
|
"sap/ui/thirdparty/jquery",
|
|
@@ -398,7 +398,7 @@ sap.ui.define([
|
|
|
398
398
|
"sap.ushell_abap.adapters.abap.ContainerAdapter");
|
|
399
399
|
} else {
|
|
400
400
|
// construct fully qualified logoff URL (potentially adds scheme, authority, origin, sap-client)
|
|
401
|
-
var sUrl = oSystem.adjustUrl(S_LOGOFF_URL);
|
|
401
|
+
var sUrl = this._setUrlLanguage(oSystem.adjustUrl(S_LOGOFF_URL));
|
|
402
402
|
|
|
403
403
|
// always logout via hidden iframe; this avoids implicit XHR re-logon in case the
|
|
404
404
|
// logoff URL triggers a redirect (see BCP 0020079747 0000863255 2015)
|
|
@@ -414,7 +414,7 @@ sap.ui.define([
|
|
|
414
414
|
* @since 1.19.0
|
|
415
415
|
*/
|
|
416
416
|
this.logoutRedirect = function () {
|
|
417
|
-
var sUrl = oSystem.adjustUrl(S_LOGOFF_URL);
|
|
417
|
+
var sUrl = this._setUrlLanguage(oSystem.adjustUrl(S_LOGOFF_URL));
|
|
418
418
|
this._setDocumentLocation(sUrl);
|
|
419
419
|
};
|
|
420
420
|
|
|
@@ -469,6 +469,23 @@ sap.ui.define([
|
|
|
469
469
|
});
|
|
470
470
|
}
|
|
471
471
|
};
|
|
472
|
+
|
|
473
|
+
/**
|
|
474
|
+
* Appends the sap-language parameter if defined
|
|
475
|
+
*
|
|
476
|
+
* This ensures that the logout screen is always in the desired language
|
|
477
|
+
*
|
|
478
|
+
* @param {string} sUrl document location
|
|
479
|
+
* @returns {string} the modified Url
|
|
480
|
+
* @private
|
|
481
|
+
*/
|
|
482
|
+
this._setUrlLanguage = function (sUrl) {
|
|
483
|
+
const sLanguage = this.getUser().getLanguage();
|
|
484
|
+
if (sLanguage) {
|
|
485
|
+
sUrl += (sUrl.indexOf("?") >= 0 ? "&" : "?") + "sap-language=" + sLanguage;
|
|
486
|
+
}
|
|
487
|
+
return sUrl;
|
|
488
|
+
};
|
|
472
489
|
};
|
|
473
490
|
|
|
474
491
|
return ContainerAdapter;
|
|
@@ -5,11 +5,20 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
sap.ui.define([
|
|
8
|
-
"sap/ushell/Config",
|
|
9
8
|
"sap/base/Log",
|
|
9
|
+
"sap/base/util/isPlainObject",
|
|
10
|
+
"sap/ushell/components/pages/controller/PagesAndSpaceId",
|
|
11
|
+
"sap/ushell/Config",
|
|
10
12
|
"sap/ushell/library",
|
|
11
|
-
"sap/ushell/
|
|
12
|
-
], function (
|
|
13
|
+
"sap/ushell/utils"
|
|
14
|
+
], function (
|
|
15
|
+
Log,
|
|
16
|
+
isPlainObject,
|
|
17
|
+
PagesAndSpaceId,
|
|
18
|
+
Config,
|
|
19
|
+
ushellLibrary,
|
|
20
|
+
ushellUtils
|
|
21
|
+
) {
|
|
13
22
|
"use strict";
|
|
14
23
|
|
|
15
24
|
// shortcut for sap.ushell.ContentNodeType
|
|
@@ -286,8 +295,25 @@ sap.ui.define([
|
|
|
286
295
|
if (!oMetatag) {
|
|
287
296
|
return [];
|
|
288
297
|
}
|
|
298
|
+
var sCurrentFormFactor = ushellUtils.getFormFactor();
|
|
289
299
|
var aMetatagMenu = JSON.parse(oMetatag.getAttribute("content"));
|
|
290
|
-
|
|
300
|
+
|
|
301
|
+
return aMetatagMenu
|
|
302
|
+
.filter((oSpace) => {
|
|
303
|
+
if (!isPlainObject(oSpace.visibility)) {
|
|
304
|
+
return true;
|
|
305
|
+
}
|
|
306
|
+
return oSpace.visibility[sCurrentFormFactor];
|
|
307
|
+
})
|
|
308
|
+
.map((oSpace) => {
|
|
309
|
+
oSpace.pages = oSpace.pages.filter((oPage) => {
|
|
310
|
+
if (!isPlainObject(oPage.visibility)) {
|
|
311
|
+
return true;
|
|
312
|
+
}
|
|
313
|
+
return oPage.visibility[sCurrentFormFactor];
|
|
314
|
+
});
|
|
315
|
+
return oSpace;
|
|
316
|
+
});
|
|
291
317
|
};
|
|
292
318
|
|
|
293
319
|
return MenuAdapter;
|