@sapui5/sap.ushell_abap 1.108.2 → 1.109.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/ConfigurationDefaultsAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/ContainerAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/LaunchPageAdapter.js +5 -5
- package/src/main/js/sap/ushell_abap/adapters/abap/NavTargetResolutionAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/adapters/abap/PageBuildingAdapter.js +2 -2
- package/src/main/js/sap/ushell_abap/adapters/abap/PagePersistenceAdapter.js +7 -6
- package/src/main/js/sap/ushell_abap/adapters/abap/PersonalizationAdapter.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/hana/ContainerAdapter.js +1 -1
- package/src/main/js/sap/ushell_abap/bootstrap/evo/XhrLogonEventHandler.js +16 -22
- package/src/main/js/sap/ushell_abap/bootstrap/evo/abap-def-loader.js +7 -7
- package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.bootstrap.utils.js +2 -29
- package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.configure.ushell.js +1 -1
- package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.load.launchpad.js +7 -12
- package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.request.pageset.js +3 -1
- package/src/main/js/sap/ushell_abap/bootstrap/evo/boottask.js +12 -10
- package/src/main/js/sap/ushell_abap/library.js +2 -2
- package/src/main/js/sap/ushell_abap/pbServices/ui2/Catalog.js +5 -3
- package/src/main/js/sap/ushell_abap/pbServices/ui2/Chip.js +3 -2
- package/src/main/js/sap/ushell_abap/pbServices/ui2/ODataWrapper.js +8 -6
- package/ui5.yaml +1 -0
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/ABAP_ICON_GREEN_LIGHT.png +0 -0
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/ABAP_ICON_LIGHT_OUT.png +0 -0
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/ABAP_ICON_RED_LIGHT.png +0 -0
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/ABAP_ICON_YELLOW_LIGHT.png +0 -0
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/AppInfraOnSapNetWeaverSupportPlugin.css +0 -17
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/AppInfraOnSapNetWeaverSupportPlugin.js +0 -290
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin.properties +0 -34
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_ar.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_bg.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_ca.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_cs.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_cy.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_da.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_de.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_el.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_en.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_en_GB.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_en_US_sappsd.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_en_US_saprigi.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_en_US_saptrc.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_es.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_es_MX.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_et.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_fi.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_fr.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_fr_CA.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_hi.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_hr.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_hu.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_id.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_it.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_iw.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_ja.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_kk.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_ko.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_lt.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_lv.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_ms.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_nl.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_no.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_pl.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_pt.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_pt_PT.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_ro.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_ru.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_sh.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_sk.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_sl.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_sv.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_th.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_tr.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_uk.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_vi.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_zh_CN.properties +0 -21
- package/src/main/js/sap/ushell_abap/support/plugins/app-infra/i18n/AppInfraOnSapNetWeaverSupportPlugin_zh_TW.properties +0 -21
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.109.0</version>
|
|
6
6
|
<copyright>Copyright (c) 2009-2022 SAP SE, All Rights Reserved</copyright>
|
|
7
7
|
<documentation>SAP library: sap.ushell_abap</documentation>
|
|
8
8
|
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* @fileOverview The Unified Shell's page building adapter for the ABAP platform.
|
|
5
5
|
*
|
|
6
6
|
* @deprecated since 1.100
|
|
7
|
-
* @version 1.
|
|
7
|
+
* @version 1.109.0
|
|
8
8
|
*/
|
|
9
9
|
sap.ui.define([
|
|
10
10
|
"sap/ui/thirdparty/URI",
|
|
@@ -113,7 +113,7 @@ sap.ui.define([
|
|
|
113
113
|
} catch (ex) {
|
|
114
114
|
// log errors, but do not fail
|
|
115
115
|
Log.error(sMessage + ": " + (ex.message || ex), ex.stack, sCOMPONENT);
|
|
116
|
-
return new
|
|
116
|
+
return new StaticTile({
|
|
117
117
|
icon: "sap-icon://error",
|
|
118
118
|
info: "",
|
|
119
119
|
infoState: "Critical",
|
|
@@ -2673,7 +2673,7 @@ sap.ui.define([
|
|
|
2673
2673
|
// Needs further investigation - don't implement cache for now
|
|
2674
2674
|
if (oCatalogTile.isStub()) {
|
|
2675
2675
|
Log.warning("CHIP (instance) is just a stub!", oCatalogTile.toString(true), sCOMPONENT);
|
|
2676
|
-
return new
|
|
2676
|
+
return new StaticTile({ // TODO remove as soon as RT has a own // TODO: pending dependency migration
|
|
2677
2677
|
icon: "sap-icon://hide",
|
|
2678
2678
|
info: "",
|
|
2679
2679
|
infoState: "Critical",
|
|
@@ -2687,7 +2687,7 @@ sap.ui.define([
|
|
|
2687
2687
|
if (oPreviewContract) {
|
|
2688
2688
|
oPreviewContract.setEnabled(true);
|
|
2689
2689
|
} else {
|
|
2690
|
-
return new
|
|
2690
|
+
return new StaticTile({ // TODO remove as soon as RT has a own // TODO: pending dependency migration
|
|
2691
2691
|
title: sTitle,
|
|
2692
2692
|
subtitle: "",
|
|
2693
2693
|
info: "",
|
|
@@ -3028,7 +3028,7 @@ sap.ui.define([
|
|
|
3028
3028
|
* includeManifest: true
|
|
3029
3029
|
* }
|
|
3030
3030
|
* },
|
|
3031
|
-
* url: "#
|
|
3031
|
+
* url: "#NewsFeed-displayNewsList",
|
|
3032
3032
|
* title: "My Title",
|
|
3033
3033
|
* icon: "sap-icon://world",
|
|
3034
3034
|
* subtitle: "My Subtitle",
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
4
|
* @fileOverview The Unified Shell's page building adapter for the ABAP platform.
|
|
5
|
-
* @version 1.
|
|
5
|
+
* @version 1.109.0
|
|
6
6
|
*/
|
|
7
7
|
sap.ui.define([
|
|
8
8
|
"sap/base/util/ObjectPath",
|
|
@@ -124,7 +124,7 @@ sap.ui.define([
|
|
|
124
124
|
var ServiceModule;
|
|
125
125
|
if (!(ServiceModule = sap.ui.require(sModulePath))) {
|
|
126
126
|
Log.error("FLP PageBuildingAdapter: remote catalog service " + sModulePath + " must be loaded before use.");
|
|
127
|
-
ServiceModule = sap.ui.requireSync(sModulePath);
|
|
127
|
+
ServiceModule = sap.ui.requireSync(sModulePath); // LEGACY API (deprecated)
|
|
128
128
|
}
|
|
129
129
|
oFactory.addRemoteCatalogService(sBaseUrl, new ServiceModule());
|
|
130
130
|
});
|
|
@@ -2,15 +2,16 @@
|
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
4
|
* @fileOverview PagePersistenceAdapter for the ABAP platform.
|
|
5
|
-
* @version 1.
|
|
5
|
+
* @version 1.109.0
|
|
6
6
|
*/
|
|
7
7
|
sap.ui.define([
|
|
8
8
|
"sap/base/util/ObjectPath",
|
|
9
9
|
"sap/ushell/utils/HttpClient",
|
|
10
10
|
"sap/ushell/resources",
|
|
11
11
|
"sap/ushell/utils/chipsUtils",
|
|
12
|
-
"sap/ushell/Config"
|
|
13
|
-
|
|
12
|
+
"sap/ushell/Config",
|
|
13
|
+
"sap/ui/core/Configuration"
|
|
14
|
+
], function (ObjectPath, HttpClient, resources, chipsUtils, Config, Configuration) {
|
|
14
15
|
|
|
15
16
|
"use strict";
|
|
16
17
|
|
|
@@ -21,7 +22,7 @@ sap.ui.define([
|
|
|
21
22
|
*
|
|
22
23
|
* @returns {string} the service url.
|
|
23
24
|
*/
|
|
24
|
-
function getServiceUrl() {
|
|
25
|
+
function getServiceUrl () {
|
|
25
26
|
var oServiceConfig = (window["sap-ushell-config"].services && window["sap-ushell-config"].services.PagePersistence) || {};
|
|
26
27
|
return (ObjectPath.get("config.serviceUrl", oServiceConfig.adapter) || "").replace(/\/?$/, "/");
|
|
27
28
|
}
|
|
@@ -100,7 +101,7 @@ sap.ui.define([
|
|
|
100
101
|
"Cache-Control": "no-cache, no-store, must-revalidate",
|
|
101
102
|
Pragma: "no-cache",
|
|
102
103
|
Expires: "0",
|
|
103
|
-
"Accept-Language":
|
|
104
|
+
"Accept-Language": Configuration.getLanguage() || "",
|
|
104
105
|
Accept: "application/json, text/plain"
|
|
105
106
|
};
|
|
106
107
|
var sSAPLogonLanguage = sap.ushell.Container.getUser().getLanguage();
|
|
@@ -142,7 +143,7 @@ sap.ui.define([
|
|
|
142
143
|
"Cache-Control": "no-cache, no-store, must-revalidate",
|
|
143
144
|
Pragma: "no-cache",
|
|
144
145
|
Expires: "0",
|
|
145
|
-
"Accept-Language":
|
|
146
|
+
"Accept-Language": Configuration.getLanguage() || "",
|
|
146
147
|
Accept: "application/json, text/plain",
|
|
147
148
|
"content-type": "multipart/mixed; boundary=batch_bd56-ff53-571c"
|
|
148
149
|
};
|
|
@@ -186,8 +186,8 @@ sap.ui.define([
|
|
|
186
186
|
* @param {function} fnFallbackIfUi5NotLoaded a fallback function which is executed if UI5 not yet loaded
|
|
187
187
|
*/
|
|
188
188
|
XhrLogonEventHandler.prototype._showErrorAndReload = function (oTitleText, oMessageText, fnReload, fnFallbackIfUi5NotLoaded) {
|
|
189
|
-
var sTitle
|
|
190
|
-
|
|
189
|
+
var sTitle;
|
|
190
|
+
var sMessage;
|
|
191
191
|
|
|
192
192
|
// We have to avoid that the modules are loaded by an additional XHR request here, because this would block the synchronous call
|
|
193
193
|
// as we are in the middle of the logon process. Therefore, we first check if the modules are already declared;
|
|
@@ -195,8 +195,11 @@ sap.ui.define([
|
|
|
195
195
|
// this is also the reason why we hard-code the sap.m.MessageBox here - using the Message service would be the better way,
|
|
196
196
|
// but this might trigger module loading as well normally, the 2 required modules should be part of the fiori-lib preload package,
|
|
197
197
|
// so the fallback should not occur under normal circumstances
|
|
198
|
-
if (sap
|
|
199
|
-
|
|
198
|
+
if (sap.ui.require("sap/ui/core/Core") && sap.ui.require("sap/m/MessageBox")) {
|
|
199
|
+
var MessageBox = sap.ui.require("sap/m/MessageBox");
|
|
200
|
+
var Action = MessageBox.Action;
|
|
201
|
+
var Icon = MessageBox.Icon;
|
|
202
|
+
|
|
200
203
|
if (sap.ui.require("sap/ushell/resources")) {
|
|
201
204
|
sTitle = this._getText(oTitleText);
|
|
202
205
|
sMessage = this._getText(oMessageText);
|
|
@@ -209,27 +212,18 @@ sap.ui.define([
|
|
|
209
212
|
// In case a 'show' call of the busy indicator with a delay is triggered, we need to stop that with a respective 'hide' call.
|
|
210
213
|
// As the FLP gets reloaded afterwards, we do not need to apply the old logic of 'show' again.
|
|
211
214
|
if (sap.ui.require("sap/ui/core/BusyIndicator")) {
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
}
|
|
218
|
-
|
|
219
|
-
if (sap && sap.ca && sap.ca.ui && sap.ca.ui.utils && sap.ca.ui.utils.busydialog) { // TODO: pending dependency migration
|
|
220
|
-
// workaround to avoid that clicking on the reload popup is blocked by a busy dialog from sap.ca;
|
|
221
|
-
// this is not a general solution
|
|
222
|
-
if (typeof sap.ca.ui.utils.busydialog.releaseBusyDialog === "function") {
|
|
223
|
-
for (var i = 0; i < 200; ++i) {
|
|
224
|
-
sap.ca.ui.utils.busydialog.releaseBusyDialog();
|
|
225
|
-
}
|
|
215
|
+
var BusyIndicator = sap.ui.require("sap/ui/core/BusyIndicator");
|
|
216
|
+
if (typeof BusyIndicator.show === "function" &&
|
|
217
|
+
typeof BusyIndicator.hide === "function") {
|
|
218
|
+
BusyIndicator.hide();
|
|
219
|
+
BusyIndicator.show = function () { };
|
|
226
220
|
}
|
|
227
221
|
}
|
|
228
222
|
|
|
229
|
-
|
|
230
|
-
icon:
|
|
223
|
+
MessageBox.show(sMessage, {
|
|
224
|
+
icon: Icon.ERROR,
|
|
231
225
|
title: sTitle,
|
|
232
|
-
actions: [
|
|
226
|
+
actions: [Action.OK],
|
|
233
227
|
onClose: fnReload.bind(this)
|
|
234
228
|
});
|
|
235
229
|
} else {
|
|
@@ -241,7 +235,7 @@ sap.ui.define([
|
|
|
241
235
|
/**
|
|
242
236
|
* Helper method to get a translated text with fallback to a hard-coded one.
|
|
243
237
|
*
|
|
244
|
-
* @param {object} oText text key and default
|
|
238
|
+
* @param {object} oText text key and default textq
|
|
245
239
|
* @return {string} the translated text if the key exists or the provided fallback text
|
|
246
240
|
*/
|
|
247
241
|
XhrLogonEventHandler.prototype._getText = function (oText) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
|
|
2
|
-
var sAsyncLoader = document.getElementById("sap-ui-bootstrap").getAttribute("data-sap-ui-async");
|
|
3
|
-
if (sAsyncLoader && sAsyncLoader.toLowerCase() === "true") {
|
|
4
|
-
sap.ui.require(["sap/ushell_abap/bootstrap/evo/abap-def"]);
|
|
5
|
-
} else {
|
|
6
|
-
sap.ui.requireSync("sap/ushell_abap/bootstrap/evo/abap-def");
|
|
7
|
-
}
|
|
1
|
+
// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
|
|
2
|
+
var sAsyncLoader = document.getElementById("sap-ui-bootstrap").getAttribute("data-sap-ui-async");
|
|
3
|
+
if (sAsyncLoader && sAsyncLoader.toLowerCase() === "true") {
|
|
4
|
+
sap.ui.require(["sap/ushell_abap/bootstrap/evo/abap-def"]);
|
|
5
|
+
} else {
|
|
6
|
+
sap.ui.requireSync("sap/ushell_abap/bootstrap/evo/abap-def"); // LEGACY API (deprecated)
|
|
7
|
+
}
|
|
@@ -1,15 +1,11 @@
|
|
|
1
1
|
// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
|
|
2
2
|
//TODO should be replaced by sap/ushell/utils
|
|
3
3
|
sap.ui.define([
|
|
4
|
-
"sap/ushell/utils",
|
|
5
4
|
"sap/base/util/ObjectPath",
|
|
6
|
-
"sap/ushell_abap/pbServices/ui2/Utils"
|
|
7
|
-
"sap/base/Log"
|
|
5
|
+
"sap/ushell_abap/pbServices/ui2/Utils"
|
|
8
6
|
], function (
|
|
9
|
-
oUshellUtils,
|
|
10
7
|
ObjectPath,
|
|
11
|
-
Utils
|
|
12
|
-
Log
|
|
8
|
+
Utils
|
|
13
9
|
) {
|
|
14
10
|
"use strict";
|
|
15
11
|
|
|
@@ -102,29 +98,6 @@ sap.ui.define([
|
|
|
102
98
|
return "";
|
|
103
99
|
};
|
|
104
100
|
|
|
105
|
-
/**
|
|
106
|
-
* Checks if the sap-statistics setting as query parameter or via local storage, as
|
|
107
|
-
* UI5 does it in some cases.
|
|
108
|
-
* @param {String} sQueryToTest String to test. By default, take the window.location.search
|
|
109
|
-
* @returns {Boolean} true if the sap-statistics is set as query parameter or via local storage
|
|
110
|
-
* @private
|
|
111
|
-
*/
|
|
112
|
-
utils.isSapStatisticsSet = function (sQueryToTest) {
|
|
113
|
-
var sWindowLocationSearch = sQueryToTest || window.location.search,
|
|
114
|
-
bSapStatistics = /sap-statistics=(true|x|X)/.test(sWindowLocationSearch);
|
|
115
|
-
try {
|
|
116
|
-
// UI5's config cannot be used here, so check local storage
|
|
117
|
-
bSapStatistics = bSapStatistics || (oUshellUtils.getLocalStorageItem("sap-ui-statistics") === "X");
|
|
118
|
-
} catch (e) {
|
|
119
|
-
Log.warning(
|
|
120
|
-
"failed to read sap-statistics setting from local storage",
|
|
121
|
-
null,
|
|
122
|
-
"sap.ushell_abap.bootstrap"
|
|
123
|
-
);
|
|
124
|
-
}
|
|
125
|
-
return bSapStatistics; // needed for tests only
|
|
126
|
-
};
|
|
127
|
-
|
|
128
101
|
/**
|
|
129
102
|
* Merge the object oConfigToMerge into oMutatedConfig according to
|
|
130
103
|
* sap-ushell-config merge rules Note that the JSON serialized content of
|
|
@@ -3,6 +3,7 @@ sap.ui.define([
|
|
|
3
3
|
"sap/base/util/UriParameters",
|
|
4
4
|
"sap/base/Log",
|
|
5
5
|
"./boottask",
|
|
6
|
+
"sap/ui/core/Configuration",
|
|
6
7
|
"sap/ushell_abap/pbServices/ui2/contracts/bag",
|
|
7
8
|
"sap/ushell_abap/pbServices/ui2/contracts/configuration",
|
|
8
9
|
"sap/ushell_abap/pbServices/ui2/contracts/configurationUi",
|
|
@@ -17,7 +18,8 @@ sap.ui.define([
|
|
|
17
18
|
], function (
|
|
18
19
|
UriParameters,
|
|
19
20
|
Log,
|
|
20
|
-
Boottask
|
|
21
|
+
Boottask,
|
|
22
|
+
Configuration
|
|
21
23
|
/*
|
|
22
24
|
ui2ContractsBag,
|
|
23
25
|
ui2Configuration,
|
|
@@ -33,16 +35,14 @@ sap.ui.define([
|
|
|
33
35
|
*/
|
|
34
36
|
) {
|
|
35
37
|
"use strict";
|
|
36
|
-
|
|
37
38
|
return function () {
|
|
38
39
|
// check if framing control of ui5 should be active (meta tag set)
|
|
39
|
-
var oFramingControl = window["sap-ushell-framing-control"]
|
|
40
|
-
|
|
41
|
-
|
|
40
|
+
var oFramingControl = window["sap-ushell-framing-control"];
|
|
41
|
+
var oUriParameters = UriParameters.fromQuery(window.location.search);
|
|
42
|
+
var terminationKey = oUriParameters.get("SAPSessionCmd") || oUriParameters.get("sap-sessioncmd");
|
|
42
43
|
|
|
43
44
|
if (oFramingControl && oFramingControl.verifyUi5ProtectionActive) {
|
|
44
|
-
|
|
45
|
-
sUi5FrameOptions = (typeof oUI5Configuration.getFrameOptions === "function") && oUI5Configuration.getFrameOptions();
|
|
45
|
+
var sUi5FrameOptions = (typeof Configuration.getFrameOptions === "function") && Configuration.getFrameOptions();
|
|
46
46
|
if (sUi5FrameOptions === "trusted" || sUi5FrameOptions === "deny") {
|
|
47
47
|
// ui5 protection active, so we can unlock
|
|
48
48
|
oFramingControl.unlock();
|
|
@@ -56,9 +56,6 @@ sap.ui.define([
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
// check if this is a DSM terminate session (which comes from EP)
|
|
59
|
-
var oUriParameters = UriParameters.fromQuery(window.location.search),
|
|
60
|
-
terminationKey = oUriParameters.get("SAPSessionCmd") || oUriParameters.get("sap-sessioncmd");
|
|
61
|
-
|
|
62
59
|
if (terminationKey === "USR_LOGOFF") {
|
|
63
60
|
// DSM notification for user log off - call the Container logoff API
|
|
64
61
|
sap.ushell.Container.logout();
|
|
@@ -67,7 +64,6 @@ sap.ui.define([
|
|
|
67
64
|
// DSM notification for user aborted
|
|
68
65
|
return;
|
|
69
66
|
}
|
|
70
|
-
|
|
71
67
|
sap.ui.require(["sap/ushell/iconfonts"], function (IconFonts) {
|
|
72
68
|
window.sap.ushell.Container.createRenderer("fiori2", true).then(
|
|
73
69
|
function (oContent) {
|
|
@@ -76,7 +72,6 @@ sap.ui.define([
|
|
|
76
72
|
);
|
|
77
73
|
IconFonts.registerFiori2IconFont();
|
|
78
74
|
});
|
|
79
|
-
|
|
80
75
|
Boottask.afterBootstrap();
|
|
81
76
|
};
|
|
82
77
|
});
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
sap.ui.define([
|
|
4
4
|
"./abap.bootstrap.utils",
|
|
5
|
+
"sap/ushell/bootstrap/common/common.util",
|
|
5
6
|
"sap/ui/thirdparty/jquery",
|
|
6
7
|
"sap/ushell_abap/pbServices/ui2/Utils",
|
|
7
8
|
"sap/base/Log"
|
|
8
9
|
], function (
|
|
9
10
|
oAbapUtils,
|
|
11
|
+
BootstrapUtils,
|
|
10
12
|
jQuery,
|
|
11
13
|
Utils,
|
|
12
14
|
Log
|
|
@@ -24,7 +26,7 @@ sap.ui.define([
|
|
|
24
26
|
S_PAGE_SETS_FALLBACK_URL_RELATIVE = "PageSets('%2FUI2%2FFiori2LaunchpadHome')";
|
|
25
27
|
|
|
26
28
|
// Check (only once for this file) if sap-statistics is set in query parameter or local storage
|
|
27
|
-
var bSapStatistics =
|
|
29
|
+
var bSapStatistics = BootstrapUtils.isSapStatisticsSet();
|
|
28
30
|
|
|
29
31
|
function requestPageSet (oStartupResult) {
|
|
30
32
|
var sPageSetServiceUrl = getAndAdjustPageSetServiceURL(oStartupResult),
|
|
@@ -213,9 +213,9 @@ function (
|
|
|
213
213
|
* @private
|
|
214
214
|
*/
|
|
215
215
|
function setSapui5Settings (oSettings, oCurrencyFormats, sTimeZoneIana) {
|
|
216
|
-
var
|
|
217
|
-
|
|
218
|
-
|
|
216
|
+
var oConfiguration = sap.ui.require("sap/ui/core/Configuration");
|
|
217
|
+
var oFormatSettings = oConfiguration.getFormatSettings();
|
|
218
|
+
|
|
219
219
|
Log.debug("setSapui5Settings()", JSON.stringify(oSettings),
|
|
220
220
|
"sap.ushell_abap.bootstrap.abap");
|
|
221
221
|
if (oSettings.language) {
|
|
@@ -431,10 +431,12 @@ function (
|
|
|
431
431
|
* @private
|
|
432
432
|
*/
|
|
433
433
|
function processTheme (oStartupTheme, sSystemThemeRoot) {
|
|
434
|
-
var oUrlTheme
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
434
|
+
var oUrlTheme;
|
|
435
|
+
var oHtmlTheme = {};
|
|
436
|
+
var oBootTheme;
|
|
437
|
+
var sUrlTheme = getSapThemeUrlParameter();
|
|
438
|
+
var oCore = sap.ui.require("sap/ui/core/Core");
|
|
439
|
+
|
|
438
440
|
|
|
439
441
|
if (sUrlTheme && isThemeSafe(sUrlTheme)) {
|
|
440
442
|
// URL = prio 1
|
|
@@ -445,7 +447,7 @@ function (
|
|
|
445
447
|
// theme is loaded by UI5
|
|
446
448
|
//The theme root should be set fot the custom theme. For the sap theme the root is calculated by core.
|
|
447
449
|
if (oBootTheme.root) {
|
|
448
|
-
|
|
450
|
+
oCore.setThemeRoot(oBootTheme.theme, oBootTheme.root.replace(/\/?$/, "/UI5/"));
|
|
449
451
|
}
|
|
450
452
|
} else if (oStartupTheme) {
|
|
451
453
|
// startup theme = prio 2
|
|
@@ -454,9 +456,9 @@ function (
|
|
|
454
456
|
null, "sap.ushell_abap.bootstrap");
|
|
455
457
|
|
|
456
458
|
if (oBootTheme.root) {
|
|
457
|
-
|
|
459
|
+
oCore.applyTheme(oBootTheme.theme, oBootTheme.root + "/UI5/");
|
|
458
460
|
} else {
|
|
459
|
-
|
|
461
|
+
oCore.applyTheme(oBootTheme.theme);
|
|
460
462
|
}
|
|
461
463
|
} else {
|
|
462
464
|
// html file theme = prio 3
|
|
@@ -16,13 +16,13 @@ sap.ui.define([
|
|
|
16
16
|
* @namespace
|
|
17
17
|
* @name sap.ushell_abap
|
|
18
18
|
* @author SAP SE
|
|
19
|
-
* @version 1.
|
|
19
|
+
* @version 1.109.0
|
|
20
20
|
* @private
|
|
21
21
|
* @ui5-restricted
|
|
22
22
|
*/
|
|
23
23
|
var ushellAbapLib = sap.ui.getCore().initLibrary({
|
|
24
24
|
name: "sap.ushell_abap",
|
|
25
|
-
version: "1.
|
|
25
|
+
version: "1.109.0",
|
|
26
26
|
dependencies: ["sap.ui.core", "sap.m"],
|
|
27
27
|
noLibraryCSS: true,
|
|
28
28
|
extensions: {
|
|
@@ -9,12 +9,14 @@ sap.ui.define([
|
|
|
9
9
|
"sap/ushell_abap/pbServices/ui2/Error",
|
|
10
10
|
"sap/ushell_abap/pbServices/ui2/Utils",
|
|
11
11
|
"sap/base/Log",
|
|
12
|
-
"sap/ui/thirdparty/jquery"
|
|
12
|
+
"sap/ui/thirdparty/jquery",
|
|
13
|
+
"sap/ui/core/Core"
|
|
13
14
|
], function (
|
|
14
15
|
SrvcError,
|
|
15
16
|
Utils,
|
|
16
17
|
Log,
|
|
17
|
-
jQuery
|
|
18
|
+
jQuery,
|
|
19
|
+
Core
|
|
18
20
|
) {
|
|
19
21
|
"use strict";
|
|
20
22
|
|
|
@@ -343,7 +345,7 @@ sap.ui.define([
|
|
|
343
345
|
"$1;o=" + sSystem + "$2");
|
|
344
346
|
}
|
|
345
347
|
|
|
346
|
-
|
|
348
|
+
Core.getEventBus().publish("sap.ushell.Container", "addRemoteSystemForServiceUrl", sServiceUrl);
|
|
347
349
|
|
|
348
350
|
return sServiceUrl;
|
|
349
351
|
};
|
|
@@ -564,7 +564,8 @@
|
|
|
564
564
|
|
|
565
565
|
if (oImplementation.componentName) {
|
|
566
566
|
// SAPUI5 component
|
|
567
|
-
var
|
|
567
|
+
var ComponentContainer = sap.ui.require("sap/ui/core/ComponentContainer");
|
|
568
|
+
var oComponentContainer = new ComponentContainer();
|
|
568
569
|
// load the content lazily to enable components using async interface
|
|
569
570
|
this.oComponentPromise = new Promise(function (resolve, reject) {
|
|
570
571
|
sap.ui.require([
|
|
@@ -586,7 +587,7 @@
|
|
|
586
587
|
}
|
|
587
588
|
|
|
588
589
|
// SAPUI5 MVC
|
|
589
|
-
return sap.ui.view({
|
|
590
|
+
return sap.ui.view({ // LEGACY API (deprecated)
|
|
590
591
|
type: oImplementation.$ViewType,
|
|
591
592
|
viewName: oImplementation.$ViewName,
|
|
592
593
|
viewData: oData
|
|
@@ -10,14 +10,16 @@ sap.ui.define([
|
|
|
10
10
|
"sap/ushell_abap/pbServices/ui2/ODataService",
|
|
11
11
|
"sap/ushell_abap/pbServices/ui2/Error",
|
|
12
12
|
"sap/base/Log",
|
|
13
|
-
"sap/ui/thirdparty/jquery"
|
|
13
|
+
"sap/ui/thirdparty/jquery",
|
|
14
|
+
"sap/ui/core/Core"
|
|
14
15
|
], function (
|
|
15
16
|
datajs,
|
|
16
17
|
Utils,
|
|
17
18
|
ODataService,
|
|
18
19
|
SrvcError,
|
|
19
20
|
Log,
|
|
20
|
-
jQuery
|
|
21
|
+
jQuery,
|
|
22
|
+
Core
|
|
21
23
|
) {
|
|
22
24
|
"use strict";
|
|
23
25
|
|
|
@@ -316,7 +318,7 @@ sap.ui.define([
|
|
|
316
318
|
that.check(fnSuccess, fnFailure);
|
|
317
319
|
oHeaders = {
|
|
318
320
|
Accept: "application/json",
|
|
319
|
-
"Accept-Language":
|
|
321
|
+
"Accept-Language": Core.getConfiguration().getLanguage() || "",
|
|
320
322
|
"X-CSRF-Token": oODataService.getCsrfToken()
|
|
321
323
|
};
|
|
322
324
|
|
|
@@ -441,7 +443,7 @@ sap.ui.define([
|
|
|
441
443
|
|
|
442
444
|
// add specifc headers for read request
|
|
443
445
|
oHeaders.Accept = "application/json";
|
|
444
|
-
oHeaders["Accept-Language"] =
|
|
446
|
+
oHeaders["Accept-Language"] = Core.getConfiguration().getLanguage() || "";
|
|
445
447
|
// always fetch a new token with GET requests;
|
|
446
448
|
// this avoids using old tokens from responses served from browser cache
|
|
447
449
|
// see internal BCP incident 1570753380
|
|
@@ -1197,8 +1199,8 @@ sap.ui.define([
|
|
|
1197
1199
|
ODataWrapper.checkSapStatisticsSetting = function (sWindowLocationSearch) {
|
|
1198
1200
|
try {
|
|
1199
1201
|
// read the value from UI5 as it may be set via [CTRL-SHIFT-ALT-P]
|
|
1200
|
-
ODataWrapper["sap-statistics"] =
|
|
1201
|
-
|
|
1202
|
+
ODataWrapper["sap-statistics"] = Core.getConfiguration().getStatistics();
|
|
1203
|
+
|
|
1202
1204
|
} catch (e) {
|
|
1203
1205
|
// Read sap-statistics directly form query parameter in scenarios without UI5
|
|
1204
1206
|
ODataWrapper["sap-statistics"] =
|
package/ui5.yaml
CHANGED
|
@@ -603,6 +603,7 @@ builder:
|
|
|
603
603
|
- sap/ushell/override.js
|
|
604
604
|
- sap/ushell/utils/HttpClient.js
|
|
605
605
|
- sap/ushell/utils/utilsCdm.js
|
|
606
|
+
- sap/ushell/adapters/cdm/v3/StaticGroupsAdapter.js
|
|
606
607
|
- sap/ushell/adapters/cdm/PagesCommonDataModelAdapter.js
|
|
607
608
|
- sap/ushell/adapters/local/UserInfoAdapter.js
|
|
608
609
|
- sap/ushell/adapters/local/NavTargetResolutionAdapter.js
|
|
Binary file
|
|
Binary file
|
|
Binary file
|