@sapui5/sap.ushell_abap 1.121.1 → 1.122.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell_abap",
-    "version": "1.121.1",
+    "version": "1.122.0",
     "description": "SAPUI5 Library sap.ushell_abap",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [
@@ -15,7 +15,7 @@
         "build-themes": "cross-env-shell ui5 build --exclude-task=* --include-task=buildThemes --framework-version $npm_package_version"
     },
     "devDependencies": {
-        "@ui5/cli": "^3.7.1",
+        "@ui5/cli": "^3.9.1",
         "cross-env": "^7.0.3"
     }
 }

package/src/main/js/sap/ushell_abap/.library

@@ -2,7 +2,7 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell_abap</name>
     <vendor>SAP SE</vendor>
-    <version>1.121.1</version>
+    <version>1.122.0</version>
     <copyright>Copyright (c) 2009-2023 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell_abap</documentation>
 

package/src/main/js/sap/ushell_abap/adapters/abap/AppStateAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's AppStateAdapter for the ABAP platform.
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
@@ -11,7 +11,8 @@ sap.ui.define([
     "sap/ushell/utils",
     "sap/ushell_abap/pbServices/ui2/ODataWrapper",
     "sap/ushell_abap/pbServices/ui2/Error",
-    "sap/ushell_abap/pbServices/ui2/ODataService"
+    "sap/ushell_abap/pbServices/ui2/ODataService",
+    "sap/ushell/Container"
 ], function (
     ObjectPath,
     jQuery,
@@ -19,7 +20,8 @@ sap.ui.define([
     utils,
     ODataWrapper,
     SrvcError,
-    ODataService
+    ODataService,
+    Container
 ) {
     "use strict";
 
@@ -41,8 +43,8 @@ sap.ui.define([
         var sAppStateServiceURL = (ObjectPath.get("services.appState.baseUrl", oConfig) || "/sap/opu/odata/UI2/INTEROP") + "/";
         var oODataWrapperSettings = {
             baseUrl: sAppStateServiceURL,
-            "sap-language": sap.ushell.Container.getUser().getLanguage(),
-            "sap-client": sap.ushell.Container.getLogonSystem().getClient()
+            "sap-language": Container.getUser().getLanguage(),
+            "sap-client": Container.getLogonSystem().getClient()
         };
         this._oWrapper = ODataWrapper.createODataWrapper(oODataWrapperSettings);
         function fnDefaultFailure (oMessage) {

package/src/main/js/sap/ushell_abap/adapters/abap/ClientSideTargetResolutionAdapter.js

@@ -9,7 +9,7 @@
  *     <li>provide the resolveHashFragmentFallback function, a fallback method called by ClientSideTargetResolution service.</li>
  *   </ul>
  *
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
@@ -21,8 +21,9 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ushell_abap/pbServices/ui2/ODataWrapper",
     "sap/ushell_abap/pbServices/ui2/Utils",
-    "sap/ui/thirdparty/URI"
-], function (
+    "sap/ui/thirdparty/URI",
+    "sap/ushell/Container"
+], function(
     jQuery,
     ObjectPath,
     isPlainObject,
@@ -32,7 +33,8 @@ sap.ui.define([
     Log,
     ODataWrapper,
     Utils,
-    URI
+    URI,
+    Container
 ) {
     "use strict";
 
@@ -85,7 +87,7 @@ sap.ui.define([
     var ClientSideTargetResolutionAdapter = function (oSystem, sParameters, oAdapterConfig) {
         var that = this;
         // as the method getProductVersion returns the product name, the following holds true.
-        var oContainer = sap.ushell.Container,
+        var oContainer = Container,
             sProductName = "";
 
         if (oContainer) {
@@ -1236,7 +1238,7 @@ sap.ui.define([
 
         var oParams = urlParsing.parseParameters(aMatches[0]);
 
-        sap.ushell.Container.getServiceAsync("ShellNavigationInternal")
+        Container.getServiceAsync("ShellNavigationInternal")
             .then(function (oShellNavigationInternal) {
                 oShellNavigationInternal.compactParams(oParams, aNotCompactedWDAParameters, undefined /* no Component */)
                     .done(function (oCompactedParams) {

package/src/main/js/sap/ushell_abap/adapters/abap/CommonDataModelAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's CommonDataModelAdapter for the ABAP platform, it is used to avoid 404 when no adapter is found
  *
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell_abap/adapters/abap/ConfigurationDefaultsAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The ConfigurationDefaults adapter for the ABAP platform.
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ushell_abap/bootstrap/evo/abap.constants",

package/src/main/js/sap/ushell_abap/adapters/abap/ContainerAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's container adapter for the ABAP platform.
  *
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell_abap/adapters/abap/FlpLaunchPageAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileoverview The Unified Shell's page building adapter for the ABAP platform. Private copy. Classical home page functions are deprecated.
  * @since 1.121
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/URI",

package/src/main/js/sap/ushell_abap/adapters/abap/LaunchPageAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
  *
  * @deprecated since 1.100
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ushell_abap/adapters/abap/FlpLaunchPageAdapter"

package/src/main/js/sap/ushell_abap/adapters/abap/NavTargetResolutionAdapter.js

@@ -8,7 +8,7 @@
  * service now calls the ClientSideTargetResolution service in the ABAP
  * platform.
  *
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell_abap/adapters/abap/NavTargetResolutionInternalAdapter.js

@@ -0,0 +1,18 @@
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+
+/**
+ * @fileOverview The NavTargetResolutionInternal adapter for the ABAP platform.
+ *
+ * This adapter is not implemented in the ABAP platform, but its stub is here
+ * as it is always loaded by the Container currently. NavTargetResolutionInternal
+ * service now calls the ClientSideTargetResolution service in the ABAP
+ * platform.
+ *
+ * @version 1.122.0
+ * @since 1.121
+ */
+sap.ui.define([], function () {
+    "use strict";
+
+    return function () { };
+});

package/src/main/js/sap/ushell_abap/adapters/abap/PageBuildingAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell_abap/adapters/abap/PagePersistenceAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview PagePersistenceAdapter for the ABAP platform.
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/base/i18n/Localization",

package/src/main/js/sap/ushell_abap/adapters/abap/PersonalizationAdapter.js

@@ -7,7 +7,7 @@
  *               Container header properties transported via pseudo-items are mapped to the
  *               respective header properties in setItem/getItem/delItem
  *
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ushell_abap/adapters/abap/AdapterContainer",

package/src/main/js/sap/ushell_abap/adapters/abap/PersonalizationV2Adapter.js

@@ -7,7 +7,7 @@
  *               Container header properties transported via pseudo-items are mapped to the
  *               respective header properties in setItem/getItem/delItem
  *
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "./PersonalizationAdapter"

package/src/main/js/sap/ushell_abap/adapters/abap/SearchAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Search adapter for the ABAP platform.
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell_abap/adapters/abap/SupportTicketAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The SupportTicket adapter for the ABAP platform.
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/base/util/isEmptyObject",

package/src/main/js/sap/ushell_abap/adapters/abap/Ui5ComponentLoaderAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the ABAP platform
  *
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell_abap/adapters/hana/ContainerAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's container adapter for the HANA platform.
  *
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell_abap/bootstrap/evo/SAPCompanionConditionSetter.js

@@ -13,6 +13,7 @@ sap.ui.define([
     Deferred
 	) {
 		"use strict";
+
         var Setter = {};
         Setter._timeoutCounter = 120;
         Setter._ushellConfig = undefined;
@@ -30,18 +31,21 @@ sap.ui.define([
                 if (window.Help4 !== undefined) {
                     const oSpacesConfig = Setter._ushellConfig.ushell.spaces;
                     var oConditions = {};
+
                     // Classic Homepage is active for the current user
                     oConditions.FLPClassicHPActiveCurrentUser = !oSpacesConfig.enabled;
                     // Classic Homepage is possibly active for any user (either because it is enforced for every user or because it can be configured by the users themselves)
                     oConditions.FLPClassicHPPossActiveAllUsers = (oSpacesConfig.configurable === false && oSpacesConfig.enabled === false) || oSpacesConfig.configurable === true;
                     // Role of the used system client. Possible values: p = Production, t = Test, c = Customizing, d = Demonstration, e = Education, s = SAP reference
                     oConditions.FLPClientRole = Setter._ushellConfig.startupConfig.clientRole;
+
                     window.Help4.API.setConditions(oConditions);
                     Log.info("Conditions transferred to SAP Compagnion / SAP Help: " + JSON.stringify(oConditions));
                     return true;
                 }
                 return false;
             };
+
             var fnKeepTrying = function () {
                 if (counter < Setter._timeoutCounter) {
                     counter++;

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.configure.ushell.js

@@ -14,7 +14,7 @@
  * It furthermore calculates if FLP pages get activated and if needed sets up
  * the configuration environment to run these.
  *
- * @version 1.121.1
+ * @version 1.122.0
  */
 sap.ui.define([
     "./abap.constants",

package/src/main/js/sap/ushell_abap/bootstrap/evo/boottask.js

@@ -549,7 +549,7 @@ function (
         // configuration as it uses the LaunchPage adapter inside.
         oUshellConfig.services.VisualizationDataProvider = {
             adapter: {
-                module: "sap.ushell_abap.adapters.abap.LaunchPageAdapter",
+                module: "sap.ushell_abap.adapters.abap.FlpLaunchPageAdapter",
                 config: {
                     services: {
                         targetMappings: oStartupResult?.services?.targetMappings,
@@ -731,7 +731,9 @@ function (
 
 
     function afterBootstrap () {
-        SAPCompanionConditionSetter.run();
+        SAPCompanionConditionSetter.run().catch(() => {
+            Log.info("SAPCompanion conditions could not be set.");
+        });
 
         var sShellHash = oBoottask._getShellHash();
 
@@ -755,8 +757,8 @@ function (
             // resolve the shell hash and try to load a UI5 component for it; if successful,
             // the application context for the component will be attached to the resolution result
             // for non-UI5 targets, it will be empty
-            sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolution) {
-                oNavTargetResolution.resolveHashFragment("#" + oBoottask._getShellHash())
+            sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavTargetResolutionInternal) {
+                oNavTargetResolutionInternal.resolveHashFragment("#" + oBoottask._getShellHash())
                     .done(function (oResolutionResult) {
                         sap.ui.require(["sap/ushell/services/AppConfiguration"], function (AppConfiguration) {
                             AppConfiguration.setCurrentApplication(oResolutionResult);

package/src/main/js/sap/ushell_abap/integration/fileshares/NavTargetResolutionFileShareSupport.js

@@ -13,7 +13,7 @@ sap.ui.define([
      * Provides the configuration for integration with remote file shares.
      * <p>
      * This is the <em>FileShareSupport</em> strategy implementation for usage in the FLP on the ABAP platform.
-     * It uses the <code>NavTargetResolution</code> service to determine whether the Fiori App for the file integration
+     * It uses the <code>NavTargetResolutionInternal</code> service to determine whether the Fiori App for the file integration
      * is assigned to the currently logged on user (controls the enablement) and then reads the data source
      * properties for the file share integration service from the app manifest.
      * </p>
@@ -43,7 +43,7 @@ sap.ui.define([
      */
     NavTargetResolutionFileShareSupport.getDataSource = function () {
         if (!NavTargetResolutionFileShareSupport._getDataSourcePromise) {
-            NavTargetResolutionFileShareSupport._getDataSourcePromise = sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
+            NavTargetResolutionFileShareSupport._getDataSourcePromise = sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then(function (oNavTargetResolutionService) {
                 return oNavTargetResolutionService.resolveHashFragment(FILE_SHARE_INTENT); // jQuery promise is implicitly converted to native
             }).then(function (oResolvedHashFragment) {
                 var sManifestUrl = oResolvedHashFragment && oResolvedHashFragment.applicationDependencies && oResolvedHashFragment.applicationDependencies.manifest;

package/src/main/js/sap/ushell_abap/library.js

@@ -22,7 +22,7 @@ sap.ui.define([
      */
     var ushellAbapLib = Library.init({
         name: "sap.ushell_abap",
-        version: "1.121.1",
+        version: "1.122.0",
         dependencies: ["sap.ui.core", "sap.m"],
         noLibraryCSS: true,
         extensions: {

package/src/main/js/sap/ushell_abap/pbServices/ui2/Utils.js

@@ -247,7 +247,7 @@ sap.ui.define([
      * @param {string} sUrl
      *  e.g. "/sap/bc/ui5_ui5/application/path"
      *  URL to be changed
-     * @param {regEx} oPattern
+     * @param {RegExp} oPattern
      *  e.g /^\/sap\/bc\/ui5_ui5\//
      *  RegExp to determine if sUrl matches and needs to be extended by the cache buster token
      *  sToken
@@ -405,7 +405,7 @@ sap.ui.define([
         // /e.g. ?cb=~xxxxxx~
         // also consider URLs with query parameters and fragments
         // this case happens during navigation, because this method is both called from
-        // NavTargetResolution service as well as from the stubbed jQuery.sap.registerModulePath method
+        // NavTargetResolutionInternal service as well as from the stubbed jQuery.sap.registerModulePath method
         //
         // syntax for application cache-buster contains now an additional scope qualifier that can be
         // either empty, "R" for resource, "5" for UI5 app, "W" for web app and "C"  for custom
@@ -522,7 +522,7 @@ sap.ui.define([
         var aKeyValuePairs;
         var aKeyValuePairsLength;
             // Note: location.search starts with "?" if not empty
-        var  sSearch = arguments.length > 0 ? sSearchString : location.search;
+        var sSearch = arguments.length > 0 ? sSearchString : location.search;
 
         if (sSearch && sSearch.charAt(0) !== "?") {
             throw new SrvcError("Illegal search string " + sSearch);

package/ui5.yaml

@@ -355,6 +355,7 @@ builder:
               - sap/ushell/adapters/cdm/PagesCommonDataModelAdapter.js
               - sap/ushell/adapters/cdm/v3/StaticGroupsAdapter.js
               - sap/ushell/adapters/local/NavTargetResolutionAdapter.js
+              - sap/ushell/adapters/local/NavTargetResolutionInternalAdapter.js
               - sap/ushell/adapters/local/UserDefaultParameterPersistenceAdapter.js
               - sap/ushell/adapters/local/UserInfoAdapter.js
               - sap/ushell/api/RTA.js
@@ -398,6 +399,7 @@ builder:
               - sap/ushell/services/Menu.js
               - sap/ushell/services/Navigation.js
               - sap/ushell/services/NavTargetResolution.js
+              - sap/ushell/services/NavTargetResolutionInternal.js
               - sap/ushell/services/NavigationDataProvider.js
               - sap/ushell/services/PageBuilding.js
               - sap/ushell/services/PagePersistence.js
@@ -433,6 +435,7 @@ builder:
               - sap/ushell_abap/adapters/abap/FlpLaunchPageAdapter.js
               - sap/ushell_abap/adapters/abap/MenuAdapter.js
               - sap/ushell_abap/adapters/abap/NavTargetResolutionAdapter.js
+              - sap/ushell_abap/adapters/abap/NavTargetResolutionInternalAdapter.js
               - sap/ushell_abap/adapters/abap/PageBuildingAdapter.js
               - sap/ushell_abap/adapters/abap/PagePersistenceAdapter.js
               - sap/ushell_abap/adapters/abap/PersonalizationAdapter.js