@sapui5/sap.ushell 1.120.8 → 1.121.0

package/src/main/js/sap/ushell/renderers/fiori2/RendererExtensions.js

@@ -1,56 +1,51 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
-/**
- * @name sap.ushell.renderers.fiori2.RendererExtensions
- * @since 1.26
- * @deprecated since 1.119.0
- * @private
- */
 sap.ui.define([
-    "sap/ui/core/Core",
-    "sap/base/Log"
-], function (Core, Log) {
+    "sap/base/Log",
+    "sap/ui/core/Element",
+    "sap/ushell/Container"
+], function (Log, Element, Container) {
     "use strict";
 
     function _removeHeaderItem (oItem, sLaunchpadState1, sLaunchpadState2) {
-        sap.ushell.Container.getRenderer("fiori2").hideHeaderItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
+        Container.getRendererInternal("fiori2").hideHeaderItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
 
     function _addOptionsActionSheetButton (oButton, sLaunchpadState1, sLaunchpadState2) {
-        sap.ushell.Container.getRenderer("fiori2").showActionButton(oButton.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
+        Container.getRendererInternal("fiori2").showActionButton(oButton.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
 
     function _removeOptionsActionSheetButton (oButton, sLaunchpadState1, sLaunchpadState2) {
-        sap.ushell.Container.getRenderer("fiori2").hideActionButton(oButton.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
+        Container.getRendererInternal("fiori2").hideActionButton(oButton.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
 
     function _setLeftPaneContent (oContent, sLaunchpadState1, sLaunchpadState2) {
-        sap.ushell.Container.getRenderer("fiori2").showLeftPaneContent(oContent.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
+        Container.getRendererInternal("fiori2").showLeftPaneContent(oContent.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
 
     function _removeLeftPaneContent (sLaunchpadState1, sLaunchpadState2) {
-        sap.ushell.Container.getRenderer("fiori2").hideLeftPaneContent(false, [sLaunchpadState1, sLaunchpadState2]);
+        Container.getRendererInternal("fiori2").hideLeftPaneContent(false, [sLaunchpadState1, sLaunchpadState2]);
     }
 
     function _addFloatingActionButton (oItem, sLaunchpadState1, sLaunchpadState2) {
-        sap.ushell.Container.getRenderer("fiori2").showFloatingActionButton(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
+        Container.getRendererInternal("fiori2").showFloatingActionButton(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
 
     function _removeFloatingActionButton (oItem, sLaunchpadState1, sLaunchpadState2) {
-        sap.ushell.Container.getRenderer("fiori2").hideFloatingActionButton(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
+        Container.getRendererInternal("fiori2").hideFloatingActionButton(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
 
     function _addHeaderEndItem (oItem, sLaunchpadState1, sLaunchpadState2) {
-        sap.ushell.Container.getRenderer("fiori2").showHeaderEndItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
+        Container.getRendererInternal("fiori2").showHeaderEndItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
 
     function _removeHeaderEndItem (oItem, sLaunchpadState1, sLaunchpadState2) {
-        sap.ushell.Container.getRenderer("fiori2").hideHeaderEndItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
+        Container.getRendererInternal("fiori2").hideHeaderEndItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
 
     /*-------------general functions Code ------------------------------------------------------*/
     function _getConfiguration () {
-        return sap.ushell.Container.getRenderer("fiori2").getModelConfiguration();
+        return Container.getRendererInternal("fiori2").getModelConfiguration();
     }
 
     function _addEndUserFeedbackCustomUI () {
@@ -58,36 +53,43 @@ sap.ui.define([
     }
 
     function _addUserPreferencesEntry (entryObject) {
-        sap.ushell.Container.getRenderer("fiori2").addUserPreferencesEntry(entryObject);
+        Container.getRendererInternal("fiori2").addUserPreferencesEntry(entryObject);
     }
 
     function _addUserPreferencesGroupedEntry (entryObject) {
-        sap.ushell.Container.getRenderer("fiori2").addUserPreferencesGroupedEntry(entryObject);
+        Container.getRendererInternal("fiori2").addUserPreferencesGroupedEntry(entryObject);
     }
 
     function _setHeaderTitle (sTitle) {
-        sap.ushell.Container.getRenderer("fiori2").setHeaderTitle(sTitle);
+        Container.getRendererInternal("fiori2").setHeaderTitle(sTitle);
     }
 
     function _setLeftPaneVisibility (sLaunchpadState, bVisible) {
-        sap.ushell.Container.getRenderer("fiori2").setLeftPaneVisibility(sLaunchpadState, bVisible);
+        Container.getRendererInternal("fiori2").setLeftPaneVisibility(sLaunchpadState, bVisible);
     }
 
     function _setHeaderHiding (bHiding) {
-        sap.ushell.Container.getRenderer("fiori2").setHeaderHiding(bHiding);
+        Container.getRendererInternal("fiori2").setHeaderHiding(bHiding);
     }
 
     function _setFooter (oFooter) {
-        sap.ushell.Container.getRenderer("fiori2").setFooter(oFooter);
+        Container.getRendererInternal("fiori2").setFooter(oFooter);
     }
 
     function _removeFooter () {
-        sap.ushell.Container.getRenderer("fiori2").removeFooter();
+        Container.getRendererInternal("fiori2").removeFooter();
     }
 
     //functions to be uses by a public API
 
     // a public API
+    /**
+     * @alias sap.ushell.renderers.fiori2.RendererExtensions
+     * @namespace
+     * @since 1.26
+     * @deprecated since 1.119.0
+     * @private
+     */
     function RendererExtensions () {
         /**
          * Adds a ShellHeadItem to the headItems aggregation of the see sap.ushell.ui.shell.shell, in the given launchpad states
@@ -111,28 +113,28 @@ sap.ui.define([
         this.addHeaderItem = function (oItem, sLaunchpadState1, sLaunchpadState2) {
             Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
 
-            sap.ushell.Container.getRenderer("fiori2").showHeaderItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
+            Container.getRendererInternal("fiori2").showHeaderItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
         };
 
         this.setHeaderItemVisibility = function (sItem, sLaunchpadState, bToLocal, bIsVisible) {
             Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
 
-            var oItem = Core.byId(sItem);
+            const oItem = Element.getElementById(sItem);
             if (bIsVisible) {
-                sap.ushell.Container.getRenderer("fiori2").showHeaderItem(oItem.getId(), bToLocal, [sLaunchpadState]);
+                Container.getRendererInternal("fiori2").showHeaderItem(oItem.getId(), bToLocal, [sLaunchpadState]);
             }
         };
 
         this.addSubHeader = function (oItem, sLaunchpadState1, sLaunchpadState2) {
             Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
 
-            sap.ushell.Container.getRenderer("fiori2").showSubHeader(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
+            Container.getRendererInternal("fiori2").showSubHeader(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
         };
 
         this.removeSubHeader = function (oItem, sLaunchpadState1, sLaunchpadState2) {
             Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
 
-            sap.ushell.Container.getRenderer("fiori2").hideSubHeader(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
+            Container.getRendererInternal("fiori2").hideSubHeader(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
         };
 
         /**
@@ -297,11 +299,11 @@ sap.ui.define([
          * @param {object} oConfig - defines the configuration settings for the added entry.
          *  [entryHelpID] : {string} - the ID of the object.
          *  title : {string} - the title of the entry to be presented in the list of User Preferences. We recommend to use the string from the translation bundle.
-         *  value : {string}/{function} - a string to be presented as the value of the entry OR a function to be called which returns a {jQuery.Deferred.promise} object.
-         *  [onSave] : {function} - a function to be called which returns a {jQuery.Deferred.promise} object when clicking Save in the User Preferences dialog box.
-         *  If an error occurs, pass the error message via the {jQuery.Deferred.promise} object. Errors are displayed in the log.
+         *  value : {string}/{function} - a string to be presented as the value of the entry OR a function to be called which returns a {@link jQuery.Promise} object.
+         *  [onSave] : {function} - a function to be called which returns a {@link jQuery.Promise} object when clicking Save in the User Preferences dialog box.
+         *  If an error occurs, pass the error message via the {@link jQuery.Promise} object. Errors are displayed in the log.
          *  [onCancel] : {function} - a function to be called that closes the User Preferences dialog box without saving any changes.
-         *  content : {function} - a function to be called which returns a {jQuery.Deferred.promise} object which consists of a {sap.ui.core.Control} to be displayed in a follow-on dialog box.
+         *  content : {function} - a function to be called which returns a {@link jQuery.Promise} object which consists of a {sap.ui.core.Control} to be displayed in a follow-on dialog box.
          *
          * @since 1.27
          *
@@ -318,11 +320,11 @@ sap.ui.define([
          * @param {object} oConfig - defines the configuration settings for the added entry.
          *  [entryHelpID] : {string} - the ID of the object.
          *  title : {string} - the title of the entry to be presented in the list of User Preferences. We recommend to use the string from the translation bundle.
-         *  value : {string}/{function} - a string to be presented as the value of the entry OR a function to be called which returns a {jQuery.Deferred.promise} object.
-         *  [onSave] : {function} - a function to be called which returns a {jQuery.Deferred.promise} object when clicking Save in the User Preferences dialog box.
-         *  If an error occurs, pass the error message via the {jQuery.Deferred.promise} object. Errors are displayed in the log.
+         *  value : {string}/{function} - a string to be presented as the value of the entry OR a function to be called which returns a {@link jQuery.Promise} object.
+         *  [onSave] : {function} - a function to be called which returns a {@link jQuery.Promise} object when clicking Save in the User Preferences dialog box.
+         *  If an error occurs, pass the error message via the {@link jQuery.Promise} object. Errors are displayed in the log.
          *  [onCancel] : {function} - a function to be called that closes the User Preferences dialog box without saving any changes.
-         *  content : {function} - a function to be called which returns a {jQuery.Deferred.promise} object which consists of a {sap.ui.core.Control} to be displayed in a follow-on dialog box.
+         *  content : {function} - a function to be called which returns a {@link jQuery.Promise} object which consists of a {sap.ui.core.Control} to be displayed in a follow-on dialog box.
          *  groupingId : {string} - The ID of the group this entry should be included in <br>
          *  groupingTabTitle : {string} - The tab title of the entry, when this entry is grouped. <br>
          *  groupingTabHelpId : {string} - The help ID for the grouped tab, when this entry is grouped. <br>
@@ -503,9 +505,15 @@ sap.ui.define([
      * appClosed - is published when a Fiori app is closed.
      * All events are published in the following channel: sap.ushell.renderers.fiori2.Renderer
      * @example to subscribe to an event:
-     * Core.getEventBus().subscribe("sap.ushell", "rendererLoaded", function() {
-     *      var headItem1 = new sap.ushell.ui.shell.ShellHeadItem({id : "button1", icon : sap.ui.core.IconPool.getIconURI("sys-help"), press: function() {alert("the button was pressed");}});
-     *      sap.ushell.renderers.fiori2.renderer.RendererExtensions.addHeaderItem(headItem1,sap.ushell.renderers.fiori2.renderer.RendererExtensions.LaunchpadState.Home)
+     * EventBus.getInstance().subscribe("sap.ushell", "rendererLoaded", function() {
+     *      const headItem1 = new sap.ushell.ui.shell.ShellHeadItem({
+     *          id: "button1",
+     *          icon: sap.ui.core.IconPool.getIconURI("sys-help"),
+     *          press: function() {
+     *              alert("the button was pressed");
+     *          }
+     *      });
+     *      sap.ushell.renderers.fiori2.renderer.RendererExtensions.addHeaderItem(headItem1,sap.ushell.renderers.fiori2.renderer.RendererExtensions.LaunchpadState.Home);
      * });
      * @since 1.26
      *

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

@@ -4,10 +4,10 @@
  */
 
 sap.ui.define([
-    "sap/ui/core/Configuration",
+    "sap/base/i18n/Localization",
     "sap/ui/model/resource/ResourceModel"
 ], function (
-    Configuration,
+    Localization,
     ResourceModel
 ) {
     "use strict";
@@ -26,7 +26,7 @@ sap.ui.define([
         return this._oResourceModel;
     };
 
-    oResources.i18nModel = oResources.getTranslationModel(Configuration.getLanguage());
+    oResources.i18nModel = oResources.getTranslationModel(Localization.getLanguage());
     oResources.i18n = oResources.i18nModel.getResourceBundle();
 
     return oResources;

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

@@ -8,12 +8,11 @@ sap.ui.define([
     /**
      * @alias sap.ushell.services.AllMyApps
      * @class
-     *
      * @classdesc A UShell service for registering an external provider of content (i.e., data source) to display All My Apps UI in the SAP Fiori launchpad.<br><br>
      *
      * <b>Note:</b> To retrieve a valid instance of this service, it is necessary to call
      * <code>sap.ushell.Container.getServiceAsync("AllMyApps")</code>. For details, see
-     * {@link sap.ushell.services.Container#getServiceAsync}.
+     * {@link sap.ushell.Container#getServiceAsync}.
      *
      * All My Apps UI is a Unified Shell module that allows the user to view their available data sources and applications
      * and to launch/navigate to an application.<br>
@@ -115,7 +114,7 @@ sap.ui.define([
          * @param {object} oProvider An object that provides the data source title and applications.<br>
          * The object must implement the following two functions:<br>
          *  - <code>getTitle</code> - A function that returns the data source title that will be presented in the data source list<br>
-         *  - <code>getData</code> - A function that returns a jQuery.deferred.promise() object that when resolved - returns the applications data in a group's/application's hierarchy.<br>
+         *  - <code>getData</code> - A function that returns {@link jQuery.Promise} that when resolved - returns the applications data in a group's/application's hierarchy.<br>
          *  A group is an object containing a title and an array of application objects in the following format:<br>
          *  <pre>
          *  {

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

@@ -1,11 +1,11 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
+    "sap/base/i18n/Localization",
     "sap/base/i18n/ResourceBundle",
     "sap/base/Log",
     "sap/base/util/ObjectPath",
     "sap/m/library",
-    "sap/ui/core/Configuration",
     "sap/ui/core/IconPool",
     "sap/ui/thirdparty/hasher",
     "sap/ui/thirdparty/jquery",
@@ -16,11 +16,11 @@ sap.ui.define([
     "sap/ushell/utils",
     "sap/ushell/Config"
 ], function (
+    Localization,
     ResourceBundle,
     Log,
     ObjectPath,
     mobileLibrary,
-    Configuration,
     IconPool,
     hasher,
     jQuery,
@@ -37,8 +37,11 @@ sap.ui.define([
     var ButtonType = mobileLibrary.ButtonType;
 
     /**
-     * AppConfiguration service.
+     * @alias sap.ushell.services.AppConfiguration
+     * @namespace
+     * @description The unified shell's AppConfiguration service as a singleton object.
      *
+     * @since 1.15.0
      * @public
      */
     function AppConfiguration () {
@@ -97,8 +100,10 @@ sap.ui.define([
          *     url: "#Action-todefaultapp?param1"
          *   }
          * </pre>
-         * @returns {jQuery.Promise} A jQuery Promise that is resolved to the updated list of user recents.
+         * @returns {jQuery.Promise} Resolves the updated list of user recents.
+         *
          * @private
+         * @alias sap.ushell.services.AppConfiguration#addActivity
          */
         this.addActivity = function (oRecentActivity) {
             var oDeferred = new jQuery.Deferred();
@@ -128,6 +133,7 @@ sap.ui.define([
          * @returns {object} A copy of the metadata object related to the application, or null if no application is currently opened
          *   (e.g., when home or app finder are opened).
          * @private
+         * @alias sap.ushell.services.AppConfiguration#getCurrentApplication
          */
         this.getCurrentApplication = function () {
             return oCurrentApplication;
@@ -149,6 +155,7 @@ sap.ui.define([
          *
          * @private
          * @ui5-restricted sap.feedback.ui
+         * @alias sap.ushell.services.AppConfiguration#getMetadata
          */
         this.getMetadata = function (oApplication) {
             if (!oApplication) {
@@ -167,6 +174,7 @@ sap.ui.define([
 
         /**
          * @private
+         * @alias sap.ushell.services.AppConfiguration#_getMemoizationKey
          */
         this._getMemoizationKey = function (sCompleteHash) {
             var aHashParts = sCompleteHash.split("?");
@@ -184,6 +192,13 @@ sap.ui.define([
             return sIntent;
         };
 
+        /**
+         * @param {string} sParams The params
+         * @returns {string} The process params
+         *
+         * @private
+         * @alias sap.ushell.services.AppConfiguration#_getMemoizationKey
+         */
         this._processParams = function (sParams) {
             if (sParams) {
                 var sPrefix = "";
@@ -209,6 +224,14 @@ sap.ui.define([
             return "";
         };
 
+        /**
+         * @param {object} oApplication The application
+         * @param {string} sKey The key
+         * @returns {object} The metadata
+         *
+         * @private
+         * @alias sap.ushell.services.AppConfiguration#_getMetadata
+         */
         this._getMetadata = function (oApplication, sKey) {
             if (!(oMetadata.hasOwnProperty(sKey)) || !oMetadata[sKey].complete) {
                 this.addMetadata(oApplication, sKey);
@@ -229,7 +252,10 @@ sap.ui.define([
         };
 
         /**
+         * @param {object} oApplication The new application
+         *
          * @private
+         * @alias sap.ushell.services.AppConfiguration#setCurrentApplication
          */
         this.setCurrentApplication = function (oApplication) {
             oCurrentApplication = oApplication;
@@ -243,6 +269,7 @@ sap.ui.define([
          * Sets the hiding of the shell header.
          * @deprecated since 1.56
          * @private
+         * @alias sap.ushell.services.AppConfiguration#setHeaderHiding
          */
         this.setHeaderHiding = function () {
             Log.warning("Application configuration headerHiding property is deprecated and has no effect");
@@ -255,6 +282,7 @@ sap.ui.define([
          *
          * @param {sap.m.Button[]} aButtons List of sap.m.Button controls
          * @private
+         * @alias sap.ushell.services.AppConfiguration#addApplicationSettingsButtons
          */
         this.addApplicationSettingsButtons = function (aButtons) {
             // in case current application is not yet open we delay the call till it would be opened.
@@ -284,7 +312,7 @@ sap.ui.define([
         function addApplicationSettingsButtons (aButtons) {
             var i,
                 aIds = [],
-                oRenderer = sap.ushell.Container.getRenderer("fiori2");
+                oRenderer = sap.ushell.Container.getRendererInternal("fiori2");
 
             for (i = 0; i < aButtons.length; i++) {
                 var oCurrentButton = aButtons[i];
@@ -310,7 +338,9 @@ sap.ui.define([
          * Sets the title of the browser tabSets the title of the browser tab.
          *
          * @param {string} sTitle title
+         *
          * @private
+         * @alias sap.ushell.services.AppConfiguration#setWindowTitle
          */
         this.setWindowTitle = function (sTitle) {
             window.document.title = sTitle;
@@ -320,7 +350,9 @@ sap.ui.define([
          * Sets the icons of the browser.
          *
          * @param {object} oIconsProperties Icon properties, an object holding icon URLs
+         *
          * @private
+         * @alias sap.ushell.services.AppConfiguration#setIcons
          */
         this.setIcons = function (oIconsProperties) {
             Mobile.setIcons(oIconsProperties);
@@ -330,9 +362,10 @@ sap.ui.define([
          * Sets the application screen size to full width
          *
          * @param {boolean} bValue A Boolean value indicating if the application fills the full width of the screen
+         *
          * @public
-         * @alias sap.ushell.services.AppConfiguration#setApplicationFullWidth
          * @deprecated since 1.120.0. Use the "sap.ui/fullWidth" property in the application's manifest.json instead.
+         * @alias sap.ushell.services.AppConfiguration#setApplicationFullWidth
          */
         this.setApplicationFullWidth = function (bValue) {
             this.setApplicationFullWidthInternal(bValue);
@@ -342,6 +375,7 @@ sap.ui.define([
          * Sets the application screen size to full width
          *
          * @param {boolean} bValue A Boolean value indicating if the application fills the full width of the screen
+         *
          * @private
          * @alias sap.ushell.services.AppConfiguration#setApplicationFullWidthInternal
          */
@@ -353,7 +387,11 @@ sap.ui.define([
         };
 
         /**
+         * @param {object} oApplication The application
+         * @returns {string} the application name
+         *
          * @private
+         * @alias sap.ushell.services.AppConfiguration#getApplicationName
          */
         this.getApplicationName = function (oApplication) {
             var aMatches,
@@ -371,7 +409,11 @@ sap.ui.define([
         };
 
         /**
+         * @param {object} oApplication The application
+         * @returns {string} the application url
+         *
          * @private
+         * @alias sap.ushell.services.AppConfiguration#getApplicationUrl
          */
         this.getApplicationUrl = function (oApplication) {
             var sUrl = (oApplication && oApplication.url) || null,
@@ -405,6 +447,7 @@ sap.ui.define([
          * The value (e.g. "TITLE_KEY") is the translation key in the resource bundle
          *
          * @private
+         * @alias sap.ushell.services.AppConfiguration#getPropertyValueFromConfig
          */
         this.getPropertyValueFromConfig = function (oConfig, sPropertyKey, oResourceBundle) {
             var oValue;
@@ -422,6 +465,7 @@ sap.ui.define([
          * Reads a property value from the manifest
          *
          * @private
+         * @alias sap.ushell.services.AppConfiguration#getPropertyValueFromManifest
          */
         this.getPropertyValueFromManifest = function (oLocalMetadataComponent, oProperties, sPropertyKey) {
             var sManifestEntryKey = oProperties[sPropertyKey].manifestEntryKey,
@@ -439,7 +483,9 @@ sap.ui.define([
          * @param {object} oApplication Includes data for launching the application, such as applicationType, url, etc..
          * @param {string} sKey - the complete url hash of the application which consists of the app Intent
          *   and the parameters in lexicographically sorted order.
+         *
          * @private
+         * @alias sap.ushell.services.AppConfiguration#addMetadata
          */
         this.addMetadata = function (oApplication, sKey) {
             try {
@@ -524,7 +570,7 @@ sap.ui.define([
                                     }
                                     oResourceBundle = ResourceBundle.create({
                                         url: sConfigResourceBundleUrl,
-                                        locale: Configuration.getLanguage()
+                                        locale: Localization.getLanguage()
                                     });
                                 }
                             }
@@ -642,6 +688,9 @@ sap.ui.define([
          * @param {object} oMetadataEntry - the metadata for a specific app
          * @param {object} oApplication - the application data retrieved from the
          *  navigation target resolution
+         *
+         * @private
+         * @alias sap.ushell.services.AppConfiguration#_setTitleFromNavResult
          */
         this._setTitleFromNavResult = function (oMetadataEntry, oApplication) {
             var sNavTargetResolutionTitle = oApplication && oApplication.text;
@@ -653,13 +702,5 @@ sap.ui.define([
         };
     } // Metadata
 
-    /**
-     * The Unified Shell App configuration service as a singleton object.
-     *
-     * @class The unified shell's AppConfiguration service.
-     * @name sap.ushell.services.AppConfiguration
-     * @since 1.15.0
-     * @public
-     */
     return new AppConfiguration();
 }, true /* bExport */);

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

@@ -4,12 +4,12 @@
  * @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.120.8
+ * @version 1.121.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/ui/base/EventProvider",
-    "sap/ui/core/Core",
+    "sap/ui/core/Element",
     "sap/ui/thirdparty/hasher",
     "sap/ushell/AppInfoParameters",
     "sap/ushell/EventHub",
@@ -22,7 +22,7 @@ sap.ui.define([
 ], function (
     Log,
     EventProvider,
-    Core,
+    Element,
     hasher,
     AppInfoParameters,
     EventHub,
@@ -44,15 +44,16 @@ sap.ui.define([
      *
      * <b>Note:</b> To retrieve a valid instance of this service, it is necessary to call
      * <code>sap.ushell.Container.getServiceAsync("AppLifeCycle")</code>. For details, see
-     * {@link sap.ushell.services.Container#getServiceAsync}.
-     *
-     * @hideconstructor
+     * {@link sap.ushell.Container#getServiceAsync}.
      *
      * @param {object} oAdapter not used
      * @param {object} oContainerInterface not used
      * @param {string} sParameters not used
      * @param {object} oServiceConfiguration not used
      *
+     * @augments sap.ushell.services.Service
+     * @hideconstructor
+     *
      * @since 1.38
      * @public
      */
@@ -67,9 +68,6 @@ sap.ui.define([
          * The function returns an object with following parameters:
          * <ul>
          *   <li> applicationType: “UI5|WDA|NWBC|URL|TR” </li>
-         *   <li> applicationFramework: when applicationType is "URL", this parameter indicates which application framework
-         *        is running inside the iframe - “UI5|WDA|GUI|CRM”.
-         *        This attribute is for SAP internal usage only. </li>
          *   <li> componentInstance: reference to component (only for applicationType "UI5"). </li>
          *   <li> homePage: <code>true</code> when root intent (normally #Shell-home) or Appfinder (#Shell-appfinder) is currently displayed. </li>
          *   <li> getTechnicalParameter: <code>function</code> that returns the value of a technical parameter for the given application.
@@ -107,7 +105,6 @@ sap.ui.define([
          *
          * @since 1.38
          * @public
-         * @alias sap.ushell.services.AppLifeCycle#getCurrentApplication
          */
         this.getCurrentApplication = function () {
             return oCurrentApplication;
@@ -127,7 +124,6 @@ sap.ui.define([
          *     handler function).
          * @since 1.38
          * @public
-         * @alias sap.ushell.services.AppLifeCycle#attachAppLoaded
          */
         this.attachAppLoaded = function (oData, fnFunction, oListener) {
             oEventProvider.attachEvent(S_APP_LOADED_EVENT, oData, fnFunction, oListener);
@@ -142,7 +138,6 @@ sap.ui.define([
          *     The object that wanted to be notified when the event occurred
          * @since 1.38
          * @public
-         * @alias sap.ushell.services.AppLifeCycle#detachAppLoaded
          */
         this.detachAppLoaded = function (fnFunction, oListener) {
             oEventProvider.detachEvent(S_APP_LOADED_EVENT, fnFunction, oListener);
@@ -216,21 +211,19 @@ sap.ui.define([
         }
         oEventProvider = new EventProvider();
         if (sap.ushell.Container && sap.ushell.Container.inAppRuntime() === false) {
-            if (sap.ushell.Container.getRenderer()) {
+            if (sap.ushell.Container.getRendererInternal()) {
                 registerToNavigationEvent();
             } else {
                 // Renderer not created yet. This can happen if the AppLifeCycle service is preloaded.
-                var fnOnRendererCreated = function () {
+                EventHub.once("RendererLoaded").do(function () {
                     registerToNavigationEvent();
-                    sap.ushell.Container.detachRendererCreatedEvent(fnOnRendererCreated);
-                };
-                sap.ushell.Container.attachRendererCreatedEvent(fnOnRendererCreated);
+                });
             }
         }
 
         function registerToNavigationEvent () {
             // only continue executing the constructor if the view port container exists in expected format
-            var oViewPortContainer = Core.byId("viewPortContainer");
+            var oViewPortContainer = Element.getElementById("viewPortContainer");
             if (!oViewPortContainer || typeof oViewPortContainer.attachAfterNavigate !== "function") {
                 Log.error(
                     "Error during instantiation of AppLifeCycle service",
@@ -266,7 +259,7 @@ sap.ui.define([
                         oComponentInstance = oComponentContainer.getComponentInstance();
                     }
                 } else {
-                    oComponentInstance = Component.get(oEvent.mParameters.to.getComponent());
+                    oComponentInstance = Component.getComponentById(oEvent.mParameters.to.getComponent());
                 }
 
                 // determine if we're dealing with home page by checking the component instance id
@@ -328,17 +321,10 @@ sap.ui.define([
         }
 
         function setCurrentApplicationObject (sApplicationType, oComponentInstance, bHomePage, oApplicationContainer, sFramework) {
-            if (!sFramework) {
-                sFramework = oApplicationContainer &&
-                    typeof oApplicationContainer.getFrameworkId === "function" &&
-                    oApplicationContainer.getFrameworkId() || "";
-            }
-
             cleanAppInfo();
             oCurrentApplicationContainer = oApplicationContainer;
             oCurrentApplication = {
                 applicationType: sApplicationType,
-                applicationFramework: sFramework,
                 componentInstance: oComponentInstance,
                 homePage: bHomePage,
                 getTechnicalParameter: function (sParameterName) {
@@ -357,10 +343,10 @@ sap.ui.define([
                  *    keeping the application info parameters with values
                  */
                 getInfo: function (aParameters) {
-                    return AppInfoParameters.getInfo(aParameters, oCurrentApplication);
+                    return AppInfoParameters.getInfo(aParameters, oCurrentApplication, oApplicationContainer);
                 },
                 getAllAppInfo: function (bValues) {
-                    return AppInfoParameters.getAllAppInfo(bValues, oCurrentApplication, oComponentInstance, oApplicationContainer, sApplicationType)
+                    return AppInfoParameters.getAllAppInfo(bValues, oCurrentApplication, oComponentInstance, oApplicationContainer)
                         .then(function (oData) {
                             if (bValues === true) {
                                 oData.applicationType = oCurrentApplication.applicationType;
@@ -390,7 +376,6 @@ sap.ui.define([
                  *     when a keep-alive application is restored
                  * @since 1.98
                  * @private
-                 * @alias sap.ushell.services.AppLifeCycle#disableKeepAliveAppRouterRetrigger
                  */
                 disableKeepAliveAppRouterRetrigger: function (bDisableRouterRetrigger) {
                     getAppIntent().then(function (oIntent) {