@sapui5/sap.ushell 1.112.3 → 1.114.0

package/src/main/js/sap/ushell/renderers/fiori2/resources/resources_zh_TW.properties

@@ -147,6 +147,7 @@ notificationsBtn_title=\u901A\u77E5
 shellHeaderOverflowBtn_tooltip=\u66F4\u591A\u9078\u9805
 homeBtn_tooltip=\u9996\u9801
 homeBtn_tooltip_text=\u700F\u89BD\u81F3\u9996\u9801
+lastPage_tooltip=\u700F\u89BD\u81F3\u4E0A\u6B21\u958B\u555F\u7684\u9801\u9762
 allMyApps_customString=\u6709 {0} \u500B\u7121\u6CD5\u5728\u6B64\u8655\u986F\u793A\u7684\u81EA\u8A02\u61C9\u7528\u7A0B\u5F0F\u3002
 allMyApps_customStringSingle=\u6709 1 \u500B\u7121\u6CD5\u5728\u6B64\u8655\u986F\u793A\u7684\u81EA\u8A02\u61C9\u7528\u7A0B\u5F0F
 allMyApps_customLinkHomePage=\u5728\u9996\u9801\u4E2D\u6AA2\u8996
@@ -156,6 +157,8 @@ allMyApps_customLinkAppFinderSingle=\u5728\u61C9\u7528\u7A0B\u5F0F\u641C\u5C0B\u
 allMyApps_headerTitle=\u6240\u6709\u6211\u7684\u61C9\u7528\u7A0B\u5F0F
 allMyApps_launchingButtonTitle=\u6240\u6709\u6211\u7684\u61C9\u7528\u7A0B\u5F0F
 allMyApps_homeEntryTitle=\u9996\u9801\u61C9\u7528\u7A0B\u5F0F
+allMyApps_CatalogsList=\u76EE\u9304\u6E05\u55AE
+allMyApps_ListOfApps=\u76EE\u9304\u4E2D\u7684\u61C9\u7528\u7A0B\u5F0F\u6E05\u55AE
 logoutBtn_title=\u767B\u51FA
 logoutBtn_tooltip=\u767B\u51FA
 signoutBtn_title=\u767B\u51FA
@@ -665,6 +668,7 @@ catalog_title=\u529F\u80FD\u78DA\u76EE\u9304
 flp_page_name=SAP Fiori Launchpad
 
 SHELL_LOGO_TOOLTIP=\u516C\u53F8\u5546\u6A19
+sapLogoText=SAP \u5546\u6A19
 
 Shell_Header_AriaLabel=Shell \u8868\u982D\u5217
 
@@ -720,6 +724,9 @@ appFinderTitle=\u61C9\u7528\u7A0B\u5F0F\u641C\u5C0B\u5668
 appFinderCatalogTitle=\u76EE\u9304
 appFinderUserMenuTitle=\u4F7F\u7528\u8005\u529F\u80FD\u8868
 appFinderSapMenuTitle=SAP \u529F\u80FD\u8868
+AppFinder.SegmentedButton.Catalog.Describedby=\u81EA\u60A8\u6307\u6D3E\u7684\u76EE\u9304\u4E2D\u5B58\u53D6\u61C9\u7528\u7A0B\u5F0F
+AppFinder.SegmentedButton.UserMenu.Describedby=\u81EA\u524D\u7AEF\u7CFB\u7D71\u4E2D\u5B58\u53D6\u60A8\u7684\u6700\u611B\u61C9\u7528\u7A0B\u5F0F
+AppFinder.SegmentedButton.SAPMenu.Describedby=\u81EA\u524D\u7AEF\u7CFB\u7D71\u4E2D\u5B58\u53D6\u60A8\u6307\u6D3E\u7684\u61C9\u7528\u7A0B\u5F0F
 appFinder_group_context_title=\u61C9\u7528\u7A0B\u5F0F\u641C\u5C0B\u5668 - \u500B\u4EBA\u5316\u7FA4\u7D44 "{0}"
 UserAccountFld=\u4F7F\u7528\u8005\u5E33\u6236
 UserAccountServerFld=\u4F3A\u670D\u5668
@@ -790,8 +797,8 @@ DontDisplayImg=\u4E0D\u8981\u986F\u793A\u5716\u50CF
 ShellNavigationMenu_AriaLabel={0} - \u986F\u793A\u5C0E\u89BD\u529F\u80FD\u8868
 ShowAllMyApps_AriaLabel={0} - \u986F\u793A\u6240\u4EE5\u6211\u7684\u61C9\u7528\u7A0B\u5F0F
 AnchorNavigationBar_AriaLabel=\u7FA4\u7D44\u5C0E\u89BD
-SecondaryContent_AriaLabel=\u6B21\u8981\u5167\u5BB9
-ShellLayout.AriaLabel=Shell \u5167\u5BB9
+SidePane_AriaLabel=Secondary Content
+ShellContent.AriaLabel=Shell Content
 ToolArea_AriaLabel=\u5DE5\u5177\u5340
 FloatingContainer_AriaLabel=\u6D6E\u9EDE\u5132\u5B58\u5340
 ShellNavigationMenu_HierarchyItemsAriaLabel=\u968E\u5C64\u5C0E\u89BD
@@ -908,8 +915,8 @@ VisualizationOrganizer.MessageToastPageRemove=\u5DF2\u81EA "{1}" \u79FB\u9664 "{
 VisualizationOrganizer.PageContextTitle=\u61C9\u7528\u7A0B\u5F0F\u641C\u5C0B\u5668 - \u500B\u4EBA\u5316 "{0}"
 VisualizationOrganizer.AppFinderSectionContextTitle=\u61C9\u7528\u7A0B\u5F0F\u641C\u5C0B\u5668 - \u500B\u4EBA\u5316 "{0}"
 VisualizationOrganizer.AppFinderSectionContextTitleUnnamed=\u61C9\u7528\u7A0B\u5F0F\u641C\u5C0B\u5668 - \u500B\u4EBA\u5316\u672A\u547D\u540D\u7684\u5340\u6BB5
-VisualizationOrganizer.Button.Tooltip.AddToSection=\u65B0\u589E\u81F3\u5340\u6BB5 "{0}"
-VisualizationOrganizer.Button.Tooltip.RemoveFromSection=\u81EA\u5340\u6BB5 "{0}" \u79FB\u9664
+VisualizationOrganizer.Button.Tooltip.AddToSection=\u65B0\u589E\u81F3\u5340\u6BB5
+VisualizationOrganizer.Button.Tooltip.RemoveFromSection=\u81EA\u5340\u6BB5\u79FB\u9664
 VisualizationOrganizer.Button.Tooltip.AddToPage=\u65B0\u589E\u81F3\u9801\u9762 "{0}"
 VisualizationOrganizer.Button.Tooltip.RemoveFromPage=\u81EA\u9801\u9762 "{0}" \u79FB\u9664
 
@@ -962,29 +969,16 @@ MyHome.InitialPage.Message.ImportSuccessful=\u532F\u5165\u6210\u529F
 ContentFinder.AppBox.Button.Tooltip.LaunchApplication=\u555F\u52D5\u61C9\u7528\u7A0B\u5F0F
 ContentFinder.AppBox.Label.Type=\u985E\u578B\uFF1A
 ContentFinder.AppBox.Label.Information=\u8CC7\u8A0A\uFF1A
-ContentFinder.AppBox.Label.FioriId=\u61C9\u7528\u7A0B\u5F0F ID\uFF1A
+ContentFinder.AppBox.Label.FioriId=SAP Fiori ID\uFF1A
 ContentFinder.AppBox.Label.SystemId=\u7CFB\u7D71 ID\uFF1A
 ContentFinder.AppBox.Label.Preview=\u9810\u89BD\uFF1A
 ContentFinder.AppBox.Text.FieldEmpty=\u7121\u6CD5\u4F7F\u7528
 ContentFinder.AppBox.Button.Preview=\u9810\u89BD
 ContentFinder.AppBox.Button.Close=\u95DC\u9589
-ContentFinder.Categories.AllWidgets.Title=\u6240\u6709 Widget
 ContentFinder.Categories.Applications.Title=\u61C9\u7528\u7A0B\u5F0F
-ContentFinder.Categories.MyHomeWidgets.Title=\u6211\u7684\u9996\u9801 Widget
 ContentFinder.Widgets.Tiles.Title=\u529F\u80FD\u78DA
 ContentFinder.Widgets.Tiles.Description=\u61C9\u7528\u7A0B\u5F0F\u7684\u8996\u89BA\u8868\u793A\u65B9\u5F0F\u3002
 ContentFinder.Widgets.Cards.Title=\u5361\u7247
 ContentFinder.Widgets.Cards.Description=\u61C9\u7528\u7A0B\u5F0F\u7684\u8996\u89BA\u8868\u793A\u65B9\u5F0F (\u4F9D\u5F48\u6027\u914D\u7F6E\u986F\u793A)\u3002
-ContentFinder.Widgets.ToDos.Title=\u5F85\u8FA6\u4E8B\u9805
-ContentFinder.Widgets.ToDos.Description=\u60A8\u7684\u6240\u6709\u52D5\u4F5C\u548C\u5DE5\u4F5C\u7D30\u9805\u7686\u4F4D\u65BC\u540C\u4E00\u500B\u4F4D\u7F6E\u3002
-ContentFinder.Widgets.Insights.Title=\u6D1E\u5BDF
-ContentFinder.Widgets.Insights.Description=\u60A8\u7684\u52D5\u614B\u5167\u5BB9\u500B\u4EBA\u5316\uFF0C\u4F8B\u5982 KPI\u3001\u734E\u91D1\u652F\u51FA\u548C\u5176\u4ED6\u9805\u76EE\u3002
-ContentFinder.Button.Add=\u65B0\u589E
-ContentFinder.Button.Cancel=\u53D6\u6D88
-ContentFinder.Dialog.Title=Widget \u5716\u5EAB
-ContentFinder.Button.ToggleSidebar=\u5207\u63DB\u5074\u908A\u5217
-ContentFinder.Dialog.AddTiles.TitleLabel=\u65B0\u589E\u529F\u80FD\u78DA
-ContentFinder.Dialog.AddCards.TitleLabel=\u65B0\u589E\u5361\u7247
-ContentFinder.Dialog.Button.Add=\u65B0\u589E ({0})
-ContentFinder.CategoryTree.Row.AllTiles=\u6240\u6709\u529F\u80FD\u78DA
-ContentFinder.CategoryTree.Row.AllCards=\u6240\u6709\u5361\u7247
+
+MenuBar.Personalization.Button=Personalize Navigation Bar

package/src/main/js/sap/ushell/renderers/fiori2/search/searchComponent/Component.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/UIComponent",

package/src/main/js/sap/ushell/renderers/fiori2/search/searchComponent/controller/CEPSearchApp.controller.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/mvc/Controller", "../../util"

package/src/main/js/sap/ushell/renderers/fiori2/search/searchComponent/controller/SearchApp.controller.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/mvc/Controller", "sap/esh/search/ui/SearchShellHelper", "sap/esh/search/ui/SearchShellHelperAndModuleLoader", "../../util"

package/src/main/js/sap/ushell/renderers/fiori2/search/searchComponent/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.renderers.fiori2.search.searchComponent",
         "applicationVersion": {
-            "version": "1.112.3"
+            "version": "1.114.0"
         },
         "type": "component"
     },

package/src/main/js/sap/ushell/renderers/fiori2/search/searchComponent/view/CEPSearchApp.view.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/mvc/View",

package/src/main/js/sap/ushell/renderers/fiori2/search/searchComponent/view/SearchApp.view.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/mvc/View",

package/src/main/js/sap/ushell/renderers/fiori2/search/util.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/UIComponent",

package/src/main/js/sap/ushell/resources.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview This file handles the resource bundles.
  */

package/src/main/js/sap/ushell/services/AllMyApps.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
 ], function (

package/src/main/js/sap/ushell/services/AppConfiguration.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/i18n/ResourceBundle",
@@ -77,16 +77,16 @@ sap.ui.define([
          *
          * @param {object} oRecentActivity oRecentActivity
          * @example Of oRecentActivity object - all properties are mandatory:
-         *   <code>
+         * <pre>
          *   {
          *     title: 'Sample Activity Entry',
          *     appType: 'OVP',
          *     appId: "#Action-todefaultapp",
          *     url: "#Action-todefaultapp?param1"
          *   }
-         *   </code>
+         * </pre>
          * @example Of oRecentActivity object for application of type Search and Co-Pilot:
-         *   <code>
+         * <pre>
          *   {
          *     icon: 'sap-icon://search',//not mandatory. In case icon is not set, a default one will be used
          *     title: 'Sample Activity Entry',
@@ -94,7 +94,7 @@ sap.ui.define([
          *     appId: "#Action-todefaultapp",
          *     url: "#Action-todefaultapp?param1"
          *   }
-         *   </code>
+         * </pre>
          * @returns {jQuery.Promise} A jQuery Promise that is resolved to the updated list of user recents.
          * @private
          */

package/src/main/js/sap/ushell/services/AppLifeCycle.js

@@ -1,9 +1,9 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview The Unified Shell's AppLifeCycle service enables plug-ins to enquire the which
  *    application is currently displayed and listen to life cycle events.
  *
- * @version 1.112.3
+ * @version 1.114.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -15,7 +15,6 @@ sap.ui.define([
     "sap/ushell/TechnicalParameters",
     "sap/ui/core/Component",
     "sap/ushell/services/AppConfiguration",
-    "sap/ushell/services/_MessageBroker/MessageBrokerEngine",
     "sap/ushell/utils/UrlParsing"
 ], function (
     Log,
@@ -27,7 +26,6 @@ sap.ui.define([
     TechnicalParameters,
     Component,
     AppConfiguration,
-    MessageBrokerEngine,
     UrlParsing
 ) {
     "use strict";
@@ -177,24 +175,40 @@ sap.ui.define([
             });
         };
 
-        this.setAppInfo = function (oAppInfo) {
+        this.setAppInfo = function (oAppInfo, bIsNewApp) {
             AppInfoParameters.setCustomAttributes(oAppInfo);
-            oCurrentApplication.getAllAppInfo(true).then(function (data) {
-                MessageBrokerEngine.publish("flp-app-info", "FLP", Date.now().toString(), "app info update", "*" , data);
+            sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
+                if (oMessageBrokerService.isEnabled()) {
+                    oCurrentApplication.getAllAppInfo(true).then(function (data) {
+                        oMessageBrokerService.publish("flp-app-info", "FLP", Date.now().toString(), (bIsNewApp === true ? "new-app-info" : "app-info-update"), "*", data);
+                    });
+                }
             });
         };
 
+        function handleMessageBrokerIncommingMessage (oMessageBrokerService, sClientId, sChannelId, sMessageName, data) {
+            if (sChannelId === "flp-app-info" && sMessageName === "get-current-app-info" && oCurrentApplication) {
+                oCurrentApplication.getAllAppInfo(true).then(function (appData) {
+                    oMessageBrokerService.publish("flp-app-info", "FLP", Date.now().toString(), sMessageName, [sClientId], appData);
+                });
+            }
+        }
+
         // CONSTRUCTOR CODE //
         if (window.QUnit === undefined && sap.ushell.Container.inAppRuntime() === false) {
-            MessageBrokerEngine.subscribe(
-                "FLP",
-                [{
-                    channelId: "flp-app-info",
-                    version: "1.0"
-                }],
-                function () {},
-                function () {}
-            );
+            sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
+                if (oMessageBrokerService.isEnabled()) {
+                    oMessageBrokerService.subscribe(
+                        "FLP",
+                        [{
+                            channelId: "flp-app-info",
+                            version: "1.0"
+                        }],
+                        handleMessageBrokerIncommingMessage.bind(undefined, oMessageBrokerService),
+                        function () {}
+                    );
+                }
+            });
         }
         oEventProvider = new EventProvider();
         if (sap.ushell.Container.inAppRuntime() === false) {
@@ -369,8 +383,12 @@ sap.ui.define([
             setTimeout(function () {
                 oEventProvider.fireEvent(S_APP_LOADED_EVENT, oCurrentApplication);
                 if (window.QUnit === undefined && sap.ushell.Container.inAppRuntime() === false) {
-                    oCurrentApplication.getAllAppInfo(true).then(function (data) {
-                        MessageBrokerEngine.publish("flp-app-info", "FLP", Date.now().toString(), "new app info", "*" , data);
+                    sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
+                        if (oMessageBrokerService.isEnabled()) {
+                            oCurrentApplication.getAllAppInfo(true).then(function (data) {
+                                oMessageBrokerService.publish("flp-app-info", "FLP", Date.now().toString(), "new-app-info", "*", data);
+                            });
+                        }
                     });
                 }
             }, 0);

package/src/main/js/sap/ushell/services/AppState.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview
@@ -6,7 +6,7 @@
  * This is *not* an application facing service, but for Shell Internal usage.
  * This service should be accessed by the application via the CrossApplicationNavigation service.
  *
- * @version 1.112.3
+ * @version 1.114.0
  */
 sap.ui.define([
     "sap/ui/base/Object",
@@ -73,14 +73,14 @@ sap.ui.define([
      * @param {object} oContainerInterface The interface.
      * @param {string} sParameter Service instantiation.
      * @param {object} oConfig service configuration. A configuration object which may contain service configuration
-     *   <code>
+     * <pre>
      *   { config : { transient : false } }
-     *   </code>
+     * </pre>
      *   The 'transient' property controls whether app state data is only kept in the browser memory (default) or stored in the database.
      *   Note that persistency might not be supported by the respective FLP platform implementation.
      *   <br>
      *   Additionally initial app state data might be passed at runtime in the configuration object in the format:
-     *     <code>
+     * <pre>
      *     {
      *       config : {
      *         initialAppState : {
@@ -89,17 +89,17 @@ sap.ui.define([
      *           ...
      *         }
      *     }
-     *     </code>
+     * </pre>
      *   Alternatively, it may contain an thenable (ES6 Promise) as member
      *   <code>{ config : { initialAppStatesPromise : <promise> } }</code>
      *   which, when resolved will return a initial AppState map
-     *   <code>
+     * <pre>
      *   {
      *     <Key> : JSON.stringify(<content>),
      *     <Key2> : JSON.stringify(<content>),
      *     ...
      *   }
-     *   </code>
+     * </pre>
      *   as first argument.
      * @private
      * @constructor
@@ -142,9 +142,9 @@ sap.ui.define([
      * @since 1.28.0
      */
     AppState.prototype.getAppState = function (sKey) {
-        var oDeferred = new jQuery.Deferred(),
-            that = this,
-            oAppState;
+        var oDeferred = new jQuery.Deferred();
+        var that = this;
+        var oAppState;
         this._loadAppState(sKey).done(function (sKey, sData, iPersistencyMethod, oPersistencySettings) {
             oAppState = new AppStateAppState(that, sKey, false, sData, undefined, undefined, undefined, iPersistencyMethod, oPersistencySettings);
             oDeferred.resolve(oAppState);
@@ -202,8 +202,6 @@ sap.ui.define([
      * @since 1.28.0
      * @private
      */
-
-    // eslint-disable-next-line complexity
     AppState.prototype.createEmptyAppState = function (oComponent, bTransientEnforced, sPersistencyMethod, oPersistencySettings) {
         var oAppState;
         var sAppName = "";
@@ -256,13 +254,11 @@ sap.ui.define([
      * @since 1.28.0
      */
     AppState.prototype.createEmptyUnmodifiableAppState = function (/*oComponent*/) {
-        var sKey = this._getGeneratedKey(),
-            oAppState;
-        oAppState = new AppStateAppState(this, sKey, false);
+        var sKey = this._getGeneratedKey();
+        var oAppState = new AppStateAppState(this, sKey, false);
         return oAppState;
     };
 
-
     /**
      * Method to save an application state
      *
@@ -282,10 +278,10 @@ sap.ui.define([
      * @since 1.28.0
      */
     AppState.prototype._saveAppState = function (sKey, sData, sAppName, sComponent, bTransient, iPersistencyMethod, oPersistencySettings) {
-        var sSessionKey = this._getSessionKey(),
-            bUseTransientAppState = utils.isDefined(bTransient)
-                ? bTransient
-                : getConfiguredTransientOption(this._oConfig);
+        var sSessionKey = this._getSessionKey();
+        var bUseTransientAppState = utils.isDefined(bTransient)
+            ? bTransient
+            : getConfiguredTransientOption(this._oConfig);
 
         if (bUseTransientAppState) {
             iPersistencyMethod = undefined;
@@ -304,6 +300,27 @@ sap.ui.define([
         return this._oAdapter.saveAppState(sKey, sSessionKey, sData, sAppName, sComponent, bUseTransientAppState, iPersistencyMethod, oPersistencySettings);
     };
 
+    /**
+     * Check if the application state key contains JSON data
+     *
+     * @param {string} sKey Application State key
+     * @returns {boolean} true if the key is a JSON string
+     * @private
+     * @since 1.114.0
+     */
+    AppState.prototype._keyIsJson = function (sKey) {
+        if (typeof sKey === "string" && sKey.indexOf("{") === 0) {
+            // key may contain JSON data itself
+            try {
+                JSON.parse(sKey);
+                return true;
+            } catch (err) {
+                return false;
+            }
+        }
+        return false;
+    };
+
     /**
      * Method to load an application state
      *
@@ -313,6 +330,9 @@ sap.ui.define([
      * @since 1.28.0
      */
     AppState.prototype._loadAppState = function (sKey) {
+        if (this._keyIsJson(sKey)) {
+            return new jQuery.Deferred().resolve(sKey, sKey).promise();
+        }
         return this._oAdapter.loadAppState(sKey);
     };
 
@@ -356,7 +376,7 @@ sap.ui.define([
     };
 
     /**
-     * Method to check if the platform supports a specific persistancy method
+     * Method to check if the platform supports a specific persistency method
      *
      * @param {string} sPersistencyMethod the persistency method
      * @returns {boolean} true if the method supported or through if not
@@ -384,34 +404,34 @@ sap.ui.define([
      * @protected
      */
     AppState.prototype.setAppStateToPublic = function (url) {
-        var sXStateKey = getURLParamValue(url, "sap-xapp-state"),
-            sIStateKey = getURLParamValue(url, "sap-iapp-state"),
-            oXStateDeferred = new jQuery.Deferred().resolve(),
-            oIStateDeferred = new jQuery.Deferred().resolve(),
-            oDeferred = new jQuery.Deferred(),
-            sXStateKeyNew,
-            sIStateKeyNew;
+        var sXStateKey = getURLParamValue(url, "sap-xapp-state");
+        var sIStateKey = getURLParamValue(url, "sap-iapp-state");
+        var oXStateDeferred = new jQuery.Deferred().resolve();
+        var oIStateDeferred = new jQuery.Deferred().resolve();
+        var oDeferred = new jQuery.Deferred();
+        var sXStateKeyNew;
+        var sIStateKeyNew;
 
         if (sXStateKey !== undefined) {
             oXStateDeferred = this.makeStatePersistent(sXStateKey, AppStatePersistencyMethod.PublicState)
-            .done(function (sNewKey) {
-                if (sXStateKey !== sNewKey) {
-                    url = url.replace(sXStateKey, sNewKey);
-                    sXStateKeyNew = sNewKey;
-                }
-            })
-            .fail(oDeferred.reject);
+                .done(function (sNewKey) {
+                    if (sXStateKey !== sNewKey) {
+                        url = url.replace(sXStateKey, sNewKey);
+                        sXStateKeyNew = sNewKey;
+                    }
+                })
+                .fail(oDeferred.reject);
         }
 
         if (sIStateKey !== undefined) {
             oIStateDeferred = this.makeStatePersistent(sIStateKey, AppStatePersistencyMethod.PublicState)
-            .done(function (sNewKey) {
-                if (sIStateKey !== sNewKey) {
-                    url = url.replace(sIStateKey, sNewKey);
-                    sIStateKeyNew = sNewKey;
-                }
-            })
-            .fail(oDeferred.reject);
+                .done(function (sNewKey) {
+                    if (sIStateKey !== sNewKey) {
+                        url = url.replace(sIStateKey, sNewKey);
+                        sIStateKeyNew = sNewKey;
+                    }
+                })
+                .fail(oDeferred.reject);
         }
 
         jQuery.when(oXStateDeferred, oIStateDeferred).done(function () {
@@ -428,9 +448,9 @@ sap.ui.define([
      * @returns {string} The requested param data
      */
     function getURLParamValue (sUrl, sParamName) {
-        var sReg = new RegExp("(?:" + sParamName + "=)([^&/]+)"),
-            sRes = sReg.exec(sUrl),
-            sValue;
+        var sReg = new RegExp("(?:" + sParamName + "=)([^&/]+)");
+        var sRes = sReg.exec(sUrl);
+        var sValue;
 
         if (sRes && sRes.length === 2) {
             sValue = sRes[1];
@@ -457,6 +477,11 @@ sap.ui.define([
             return oDeferred.resolve(key);
         }
 
+        // app state in JSON form is self-persistent
+        if (this._keyIsJson(key)) {
+            return oDeferred.resolve(key);
+        }
+
         if (this.isPersistencyMethodSupported(persistencyMethod)) {
             this.getAppState(key)
                 .done(function (oAppState) {

package/src/main/js/sap/ushell/services/AppType.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ushell/library",
     "sap/ushell/utils/AppType"

package/src/main/js/sap/ushell/services/Bookmark.js

@@ -1,10 +1,10 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The Unified Shell's bookmark service, which allows you to create shortcuts on the
  * user's home page.
  *
- * @version 1.112.3
+ * @version 1.114.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
@@ -122,6 +122,8 @@ sap.ui.define([
          *   This does not influence the data source of the app itself.
          * @param {string} [oParameters.dataSource.type]
          *   The type of the serviceURL's service. Only "OData" is supported.
+         * @param {object} [oParameters.dataSource.settings]
+         *   Additional settings for the data source.
          * @param {object} [oParameters.dataSource.settings.odataVersion]
          *   The OData version of parameter serviceURL. Valid values are "2.0" and "4.0".
          * @param {string} [oParameters.serviceRefreshInterval]

package/src/main/js/sap/ushell/services/ClientSideTargetResolution.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @file
@@ -29,7 +29,7 @@
  * In the future, the custom resolver mechanism should be probably moved towards modifying (or only adding to the list of Inbounds),
  * this way a single data source has to be altered to support consistently getLinks, isIntentSupported.
  *
- * @version 1.112.3
+ * @version 1.114.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -1645,7 +1645,7 @@ sap.ui.define([
      *
      * @param {object} oSystemContext The systemContext for which the user default parameter names should be returned.
      * @returns {jQuery.Deferred.promise} A promise that resolves to an object with the following structure
-     *   <code>
+     * <pre>
      *   {
      *     simple: {
      *       parameternamextractUserDefaultReferenceNamee1: {},
@@ -1656,7 +1656,7 @@ sap.ui.define([
      *       parametername4: {}
      *     }
      *   }
-     *   </code>
+     * </pre>
      *   The name of a user default parameter referenced in an inbound.
      *   NOTE: the parameter names do not include surrounding special syntax. Only the inner part is returned.
      *   For example: "UserDefault.ParameterName" is returned as "ParameterName"