@sapui5/sap.ushell 1.117.2 → 1.119.0

package/src/main/js/sap/ushell/plugins/appwarmup/Component.js

@@ -87,7 +87,7 @@ sap.ui.define(
         var sComponentName = "sap.ushell.plugins.appwarmup.Component";
         return Component.extend(sComponentName, {
             metadata: {
-                version: "1.117.2",
+                version: "1.119.0",
                 library: "sap.ushell"
             },
 

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

@@ -28,7 +28,7 @@ sap.ui.define([
             contentWidth: "50%",
             contentHeight: "50%",
             content: new HTML("SAMLDialogFrame", {content: "<iframe id=SAMLDialogFrame src=\"\"></iframe>"}),
-            rightButton: new Button({
+            endButton: new Button({
                     text: resources.i18n.getText("samlCloseBtn"),
                     press: sap.ushell.Container.cancelLogon.bind(sap.ushell.Container) // Note: it calls back destroyIFrameDialog()
                 })
@@ -38,7 +38,7 @@ sap.ui.define([
             var oContactSupportBtn = new ContactSupportButton();
             oContactSupportBtn.setWidth("150px");
             oContactSupportBtn.setIcon("");
-            oDialog.setLeftButton(oContactSupportBtn);
+            oDialog.setBeginButton(oContactSupportBtn);
         }
         oDialog.open();
 

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

@@ -30,8 +30,7 @@ sap.ui.define([
     "sap/ushell/ui/shell/ShellHeadItem",
     "sap/m/NotificationListItem",
     "sap/ushell/renderers/fiori2/ShellLayout",
-    "sap/ushell/renderers/fiori2/utils",
-    "./RendererExtensions"
+    "sap/ushell/renderers/fiori2/utils"
 ], function (
     Core,
     UIComponent,
@@ -59,7 +58,6 @@ sap.ui.define([
     NotificationListItem,
     ShellLayout,
     RendererUtils
-    // RendererExtensions
 ) {
     "use strict";
 
@@ -80,9 +78,9 @@ sap.ui.define([
      */
     var Renderer = UIComponent.extend("sap.ushell.renderers.fiori2.Renderer", {
         metadata: {
-            version: "1.117.2",
+            version: "1.119.0",
             dependencies: {
-                version: "1.117.2",
+                version: "1.119.0",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },
@@ -106,23 +104,23 @@ sap.ui.define([
                             return "homeapp";
                         }
 
-                            // CEP MyHome
-                            if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") !== null) {
-                                return "workpages";
-                            }
+                        // CEP MyHome
+                        if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") !== null) {
+                            return "workpages";
+                        }
 
-                            // CEP Standard
-                            if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") === null) {
-                                return "runtimeSwitcher";
-                            }
+                        // CEP Standard
+                        if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") === null) {
+                            return "runtimeSwitcher";
+                        }
 
-                            // Pages Spaces Mode
-                            if (Config.last("/core/spaces/enabled")) {
-                                return "pages";
-                            }
+                        // Pages Spaces Mode
+                        if (Config.last("/core/spaces/enabled")) {
+                            return "pages";
+                        }
 
-                            // Classic Homepage
-                            return "home";
+                        // Classic Homepage
+                        return "home";
                     })()
                 }, {
                     name: "appfinder",
@@ -278,6 +276,21 @@ sap.ui.define([
 
             var oRouter = this.getRouter();
 
+            // Track flp navigation with ShellAnalytics
+            [
+                "appfinder-legacy",
+                "home",
+                "appfinder",
+                "openFLPPage",
+                "openWorkPage",
+                "wzsearch"
+            ].forEach(sRouteName => {
+                oRouter.getRoute(sRouteName).attachBeforeMatched(() => {
+                    EventHub.emit("trackHashChange", window.hasher.getHash());
+                    // all targets have to close the FESR Record on their own
+                });
+            });
+
             // Add HomeApp target dynamically
             if (Config.last("/core/homeApp/enabled")) {
                 this._getHomeAppTarget().then(function (oTarget) {
@@ -308,8 +321,6 @@ sap.ui.define([
                     return;
                 }
 
-                //Use in ShellAnalytics to track navigation to app finder
-                EventHub.emit("trackHashChange", "Shell-appFinder");
                 var oComponent = Core.getComponent(this.createId("Shell-appfinder-component"));
                 var oData = oEvent.getParameter("arguments");
                 if (sap.ushell.Container.getRenderer("fiori2")) {
@@ -350,8 +361,6 @@ sap.ui.define([
      * @since 1.100.0
      */
     Renderer.prototype._prepareHomepage = function (oEvent) {
-        //Use in ShellAnalytics to track navigation to homepage
-        EventHub.emit("trackHashChange", "Shell-home");
         if (AppConfiguration.getCurrentApplication()) {
             sap.ushell.Container.getServiceAsync("ShellNavigation").then(function (ShellNavigation) {
                 ShellNavigation.setIsInitialNavigation(false);
@@ -2767,5 +2776,12 @@ sap.ui.define([
             });
     };
 
+    /**
+     * @deprecated since 1.119.0
+     */
+    (function () {
+        sap.ui.require(["sap/ushell/renderers/fiori2/RendererExtensions"], function () {});
+    })();
+
     return Renderer;
 }, true);

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

@@ -3,6 +3,7 @@
 /**
  * @name sap.ushell.renderers.fiori2.RendererExtensions
  * @since 1.26
+ * @deprecated since 1.119.0
  * @private
  */
 sap.ui.define([
@@ -109,10 +110,14 @@ sap.ui.define([
          * @private
          */
         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]);
         };
 
         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);
             if (bIsVisible) {
                 sap.ushell.Container.getRenderer("fiori2").showHeaderItem(oItem.getId(), bToLocal, [sLaunchpadState]);
@@ -120,10 +125,14 @@ sap.ui.define([
         };
 
         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]);
         };
 
         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]);
         };
 
@@ -145,7 +154,11 @@ sap.ui.define([
          *
          * @private
          */
-        this.addHeaderEndItem = _addHeaderEndItem;
+        this.addHeaderEndItem = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _addHeaderEndItem(...args);
+        };
 
         /**
          * Removes the ShellHeadItem from the headItems aggregation of the see sap.ushell.ui.shell.shell, in the given launchpad states
@@ -162,7 +175,11 @@ sap.ui.define([
          *
          * @private
          */
-        this.removeHeaderItem = _removeHeaderItem;
+        this.removeHeaderItem = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _removeHeaderItem(...args);
+        };
 
         /**
          * Removes the ShellHeadItem from the headEndItems aggregation of the see sap.ushell.ui.shell.shell, in the given launchpad states
@@ -179,7 +196,11 @@ sap.ui.define([
          *
          * @private
          */
-        this.removeHeaderEndItem = _removeHeaderEndItem;
+        this.removeHeaderEndItem = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _removeHeaderEndItem(...args);
+        };
 
         /**
          * Adds a custom control to a dedicated section within the End User Feedback dialog.
@@ -194,8 +215,11 @@ sap.ui.define([
          * @deprecated since 1.93. The functionality has been discontinued.
          * @private
          */
+        this.addEndUserFeedbackCustomUI = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
 
-        this.addEndUserFeedbackCustomUI = _addEndUserFeedbackCustomUI;
+            _addEndUserFeedbackCustomUI(...args);
+        };
 
         /**
          * Adds a button to the action sheet which opens when clicking the 'options' button, in the given launchpad states
@@ -212,7 +236,11 @@ sap.ui.define([
          *
          * @private
          */
-        this.addOptionsActionSheetButton = _addOptionsActionSheetButton;
+        this.addOptionsActionSheetButton = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _addOptionsActionSheetButton(...args);
+        };
 
         /**
          * Removes a button from the action sheet which opens when clicking the 'options' button, in the given launchpad states
@@ -231,7 +259,11 @@ sap.ui.define([
          *
          * @private
          */
-        this.removeOptionsActionSheetButton = _removeOptionsActionSheetButton;
+        this.removeOptionsActionSheetButton = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _removeOptionsActionSheetButton(...args);
+        };
 
         /**
          * Displays a footer at the bottom of the Fiori launchpad page. The footer is added to all launchpad states.
@@ -241,7 +273,11 @@ sap.ui.define([
          *
          * @private
          */
-        this.setFooter = _setFooter;
+        this.setFooter = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _setFooter(...args);
+        };
 
         /**
          * Removes the footer that was set using see sap.ushell.renderers.fiori2.RendererExtensions.setFooter from the
@@ -251,14 +287,18 @@ sap.ui.define([
          *
          * @private
          */
-        this.removeFooter = _removeFooter;
+        this.removeFooter = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _removeFooter(...args);
+        };
 
         /**
          * Add an entry to the User Preferences dialog box.
          * @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.
+         *  [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.
          *  [onCancel] : {function} - a function to be called that closes the User Preferences dialog box without saving any changes.
@@ -268,14 +308,18 @@ sap.ui.define([
          *
          * @private
          */
-        this.addUserPreferencesEntry = _addUserPreferencesEntry;
+        this.addUserPreferencesEntry = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _addUserPreferencesEntry(...args);
+        };
 
         /**
          * Add an entry to the User Preferences dialog box.
          * @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.
+         *  [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.
          *  [onCancel] : {function} - a function to be called that closes the User Preferences dialog box without saving any changes.
@@ -288,18 +332,26 @@ sap.ui.define([
          * @since 1.110
          * @private
          */
-        this.addUserPreferencesGroupedEntry = _addUserPreferencesGroupedEntry;
+        this.addUserPreferencesGroupedEntry = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _addUserPreferencesGroupedEntry(...args);
+        };
 
         /**
          * Set the title in the Shell Header
-         * @param {String} sTitle
+         * @param {string} sTitle
          *  The text of the title to set
          *
          * @since 1.27
          *
          * @private
          */
-        this.setHeaderTitle = _setHeaderTitle;
+        this.setHeaderTitle = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _setHeaderTitle(...args);
+        };
 
         /**
          * Set the visibility of the Shell Header
@@ -310,7 +362,11 @@ sap.ui.define([
          *
          * @private
          */
-        this.setHeaderHiding = _setHeaderHiding;
+        this.setHeaderHiding = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _setHeaderHiding(...args);
+        };
 
         /**
          * The launchpad states that can be passed as a parameter.
@@ -341,7 +397,11 @@ sap.ui.define([
          *
          * @private
          */
-        this.addFloatingActionButton = _addFloatingActionButton;
+        this.addFloatingActionButton = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _addFloatingActionButton(...args);
+        };
 
         /**
          * Removes a button from the bottom of the Fiori launchpad page, in the given launchpad states
@@ -359,7 +419,11 @@ sap.ui.define([
          *
          * @private
          */
-        this.removeFloatingActionButton = _removeFloatingActionButton;
+        this.removeFloatingActionButton = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _removeFloatingActionButton(...args);
+        };
 
         /**
          * Sets the content of the left pane in Fiori launchpad, in the given launchpad states
@@ -375,7 +439,11 @@ sap.ui.define([
          *
          * @private
          */
-        this.setLeftPaneContent = _setLeftPaneContent;
+        this.setLeftPaneContent = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _setLeftPaneContent(...args);
+        };
 
         /**
          * Removes content from the left pane content that was set using see sap.ushell.renderers.fiori2.RendererExtensions.setLeftPaneContent
@@ -390,7 +458,11 @@ sap.ui.define([
          *
          * @private
          */
-        this.removeLeftPaneContent = _removeLeftPaneContent;
+        this.removeLeftPaneContent = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _removeLeftPaneContent(...args);
+        };
 
         /**
          * Sets the visibility of the left pane in the Fiori launchpad, in the given launchpad states
@@ -403,7 +475,11 @@ sap.ui.define([
          *
          * @private
          */
-        this.setLeftPaneVisibility = _setLeftPaneVisibility;
+        this.setLeftPaneVisibility = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            _setLeftPaneVisibility(...args);
+        };
 
         /**
          * Getter for shell configuration object
@@ -412,7 +488,11 @@ sap.ui.define([
          *      shell configuration object
          * @private
          */
-        this.getConfiguration = _getConfiguration;
+        this.getConfiguration = function (...args) {
+            Log.error("'sap.ushell.renderers.fiori2.RendererExtensions' is deprecated. Please use 'sap.ushell.Container.getRenderer('fiori2')' instead.");
+
+            return _getConfiguration(...args);
+        };
     }
 
     /**