@sapui5/sap.ushell 1.118.0 → 1.119.0

package/src/main/js/sap/ushell/components/HomepageManager.js

@@ -996,8 +996,8 @@ sap.ui.define([
         /**
          * Add the group to the end of groups model
          *
-         * @param {Object} oGroup The group object
-         * @returns {Object} The group context
+         * @param {object} oGroup The group object
+         * @returns {object} The group context
          */
         addGroupToModel: function (oGroup) {
             var oGroupModel = this.oPageOperationAdapter.getPreparedGroupModel(oGroup, false, true, { isRendered: true });
@@ -1036,7 +1036,7 @@ sap.ui.define([
              * As the "plus tile" is always available if personalization is possible,
              * this will be focused if the aggregation of the tile/link is empty.
              *
-             * @param {number} tileIndex the index of the tile in the group model
+             * @param {int} tileIndex the index of the tile in the group model
              * @param {object} group the group model object containing the tile
              * @param {string} tileType determines the aggregation, the tile was in (tiles or links)
              */
@@ -1527,7 +1527,7 @@ sap.ui.define([
          * Function to update the settings of the HomepageManager.
          * This allows us to adjust settings we might not know yet after the constructor was called.
          *
-         * @param {Object} oSettings The new settings
+         * @param {object} oSettings The new settings
          * @private
          */
         updateSettings: function (oSettings) {
@@ -1957,9 +1957,9 @@ sap.ui.define([
 
         /**
          * Update the group in the model
-         * @param {Integer} nIndex
+         * @param {int} nIndex
          *      The index at which the group should be added. 0 is reserved for the default group.
-         * @param {Object} oNewGroupModel
+         * @param {object} oNewGroupModel
          *      The prepared group model
          */
         _loadGroup: function (nIndex, oNewGroupModel) {

package/src/main/js/sap/ushell/components/_HeaderManager/ControlManager.js

@@ -44,7 +44,7 @@ sap.ui.define([
     function _createUserActionsMenuButton (oShellModel) {
         var sId = "userActionsMenuHeaderButton",
             oUser = sap.ushell.Container.getUser(),
-            sTooltip = resources.i18n.getText("UserActionsMenuToggleButtonAria", oUser.getFullName());
+            sTooltip = resources.i18n.getText("UserActionsMenuToggleButtonAria", [oUser.getFullName()]);
 
         var oUserActionsMenuAvatar = new Avatar({
             id: sId,

package/src/main/js/sap/ushell/components/_HomepageManager/PagingManager.js

@@ -44,8 +44,8 @@ sap.ui.define([
 
         /**
          * Return a tile height depend on the size behavior
-         * @param {Boolean} bIsSmallSizeBehavior is small size behavior
-         * @returns {Integer} the height of a tile in px
+         * @param {boolean} bIsSmallSizeBehavior is small size behavior
+         * @returns {int} the height of a tile in px
          */
         _getTileHeight: function (bIsSmallSizeBehavior) {
             return bIsSmallSizeBehavior ? 148 : 176;
@@ -53,9 +53,9 @@ sap.ui.define([
 
         /**
          * Return a tile width depend on the size behavior
-         * @param {Boolean} bIsLongTile is a tile long
-         * @param {Boolean} bIsSmallSizeBehavior is small size behavior
-         * @returns {Integer} the width of a tile in px
+         * @param {boolean} bIsLongTile is a tile long
+         * @param {boolean} bIsSmallSizeBehavior is small size behavior
+         * @returns {int} the width of a tile in px
          */
         _getTileWidth: function (bIsLongTile, bIsSmallSizeBehavior) {
             if (bIsLongTile) {

package/src/main/js/sap/ushell/components/appfinder/AppFinder.controller.js

@@ -43,15 +43,14 @@ sap.ui.define([
 
             oView.setModel(oModel);
 
-
             oCatalogsManager = oComponent.oCatalogsManager;
 
             this.bEnableEasyAccessSAPMenu = oModel.getProperty("/enableEasyAccessSAPMenu");
             this.bEnableEasyAccessUserMenu = oModel.getProperty("/enableEasyAccessUserMenu");
-            this.bEnableEasyAccesOnTablet = oModel.getProperty("/enableEasyAccessOnTablet");
+            this.bEnableEasyAccessOnTablet = oModel.getProperty("/enableEasyAccessOnTablet");
 
             var bEnableOneEasyAccessMenu = this.bEnableEasyAccessSAPMenu || this.bEnableEasyAccessUserMenu;
-            var bIsDeviceEasyAccessMenuCompatible = !Device.system.phone && !Device.system.tablet || Device.system.tablet && this.bEnableEasyAccesOnTablet || Device.system.combi;
+            var bIsDeviceEasyAccessMenuCompatible = !Device.system.phone && !Device.system.tablet || Device.system.tablet && this.bEnableEasyAccessOnTablet || Device.system.combi;
 
             this.bShowEasyAccessMenu = bEnableOneEasyAccessMenu && bIsDeviceEasyAccessMenuCompatible;
 
@@ -110,7 +109,7 @@ sap.ui.define([
             if (bShowOpenCloseSplitAppButton !== bCurrentShowOpenCloseSplitAppButton) {
                 this.oSubHeaderModel.setProperty("/openCloseSplitAppButtonVisible", bShowOpenCloseSplitAppButton);
 
-                // in case we now show the button, then it must be foced untoggled, as the left panel closes automatically
+                // in case we now show the button, then it must be forced untoggled, as the left panel closes automatically
                 if (bShowOpenCloseSplitAppButton) {
                     this.oSubHeaderModel.setProperty("/openCloseSplitAppButtonToggled", false);
                 }
@@ -146,7 +145,7 @@ sap.ui.define([
             // toggle class on app finder page
             this._toggleViewWithToggleButtonClass(this._showOpenCloseSplitAppButton());
             if (this.bShowEasyAccessMenu) {
-                // in case we need to show the easy access menu buttons, update sub header accordigly (within the onShow)
+                // in case we need to show the easy access menu buttons, update sub header accordingly (within the onShow)
                 this.onShow(oEvent);
             } else if (oView._showSearch("catalog")) {
                 // else no easy access menu buttons, update sub header accordingly
@@ -161,6 +160,11 @@ sap.ui.define([
             // Id is included for UserActivityLog
             EventHub.emit("showCatalog", { sId: "showCatalog", oData: Date.now() });
             Core.getEventBus().publish("launchpad", "contentRendered");
+
+            // track navigation in ShellAnalytics
+            if (EventHub.last("firstCatalogSegmentCompleteLoaded")) {
+                EventHub.emit("CloseFesrRecord", Date.now());
+            }
         },
 
         _showOpenCloseSplitAppButton: function () {
@@ -238,14 +242,14 @@ sap.ui.define([
             // we are in search mode and on Phone
             if (oSearchData.searchMode && Device.system.phone) {
                 // in case we are in phone we untoggle the toggle button when search is invoked as
-                // the detailed page of the search results is nevigated to and opened.
+                // the detailed page of the search results is navigated to and opened.
                 // therefore we untoggle the button of the master page
                 this.oSubHeaderModel.setProperty("/openCloseSplitAppButtonToggled", false);
             }
 
             // check and update the search term
             if (sSearchTerm !== oSearchData.searchTerm) {
-                if (this.containsOnlyWhitepaces(sSearchTerm)) {
+                if (this.containsOnlyWhiteSpaces(sSearchTerm)) {
                     sSearchTerm = "*";
                 }
                 oSearchData.searchTerm = sSearchTerm;
@@ -304,13 +308,13 @@ sap.ui.define([
         _filterSystemModelsOnTablet: function (aReturnSystems) {
             var oDeferredReturnSystems = new jQuery.Deferred();
 
-            if (this.bEnableEasyAccesOnTablet) {
-                // We need to filter out the Shell-startWDA and Shell-startGUI sytems
+            if (this.bEnableEasyAccessOnTablet) {
+                // We need to filter out the Shell-startWDA and Shell-startGUI systems
                 // that do not support tablet
                 sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oService) {
                     // Shell-startWDA often requires the additional parameter sap-ui2-wd-app-id
-                    // and Shell-startGUI requires the additional paramter sap-ui2-tcode
-                    // We are provinding these with a placeholder value to be able to use
+                    // and Shell-startGUI requires the additional parameter sap-ui2-tcode
+                    // We are providing these with a placeholder value to be able to use
                     // the resolution service.
                     var aFilteredReturnSystemsPromises = aReturnSystems.reduce(function (aResult, oSystem) {
                         var oNavigationPromise;
@@ -641,10 +645,10 @@ sap.ui.define([
                         var systemsModel = [];
                         var aSystemsID = Object.keys(oSystems);
                         for (var i = 0; i < aSystemsID.length; i++) {
-                            var sCurrentsystemID = aSystemsID[i];
+                            var sCurrentSystemID = aSystemsID[i];
                             systemsModel[i] = {
-                                systemName: oSystems[sCurrentsystemID].text,
-                                systemId: sCurrentsystemID
+                                systemName: oSystems[sCurrentSystemID].text,
+                                systemId: sCurrentSystemID
                             };
                         }
                         oDeferred.resolve(systemsModel);
@@ -678,7 +682,7 @@ sap.ui.define([
          * @returns {boolean} True if the input field is ' ' (space) or '    ' (a few spaces).
          *     False if the input field contains not only spaces (for example 'a b') or if it is an empty string.
          */
-        containsOnlyWhitepaces: function (sTerm) {
+        containsOnlyWhiteSpaces: function (sTerm) {
             if (!sTerm || sTerm === "") {
                 return false;
             }

package/src/main/js/sap/ushell/components/appfinder/AppFinderView.js

@@ -34,14 +34,14 @@ sap.ui.define([
     AccessibilityCustomData,
     Toolbar,
     Page,
-    resources,
+    ushellResources,
     Device
 ) {
     "use strict";
 
     return View.extend("sap.ushell.components.appfinder.AppFinderView", {
         createContent: function () {
-            var oResourceBundle = resources.i18n;
+            var oResourceBundle = ushellResources.i18n;
 
             this.oPage = new Page("appFinderPage", {
                 showHeader: false,
@@ -52,7 +52,7 @@ sap.ui.define([
                 title: {
                     parts: ["/groupContext/title"],
                     formatter: function (title) {
-                        return !title ? oResourceBundle.getText("appFinderTitle") : oResourceBundle.getText("appFinder_group_context_title", title);
+                        return !title ? oResourceBundle.getText("appFinderTitle") : oResourceBundle.getText("appFinder_group_context_title", [title]);
                     }
                 }
             });
@@ -116,10 +116,10 @@ sap.ui.define([
                     press: function (oEvent) {
                         this.getController().oSubHeaderModel.setProperty("/openCloseSplitAppButtonToggled", oEvent.getSource().getPressed());
                         this.openCloseSplitAppButton.setTooltip(oEvent.getParameter("pressed") ?
-                            resources.i18n.getText("ToggleButtonHide") :
-                            resources.i18n.getText("ToggleButtonShow"));
+                            ushellResources.i18n.getText("ToggleButtonHide") :
+                            ushellResources.i18n.getText("ToggleButtonShow"));
                     }.bind(this),
-                    tooltip: resources.i18n.getText("ToggleButtonShow")
+                    tooltip: ushellResources.i18n.getText("ToggleButtonShow")
                 });
 
                 this.openCloseSplitAppButton.setModel(this.getController().oSubHeaderModel);
@@ -158,10 +158,10 @@ sap.ui.define([
             }
 
             var oController = this.getController();
-            var oResourceBundle = resources.i18n;
+            var oResourceBundle = ushellResources.i18n;
 
             var oCatalogSBIInvisibleText = new InvisibleText({
-                text: resources.i18n.getText("AppFinder.SegmentedButton.Catalog.Describedby")
+                text: oResourceBundle.getText("AppFinder.SegmentedButton.Catalog.Describedby")
             }).toStatic();
             this.addDependent(oCatalogSBIInvisibleText);
             this.segmentedButton = new SegmentedButton("appFinderSegmentedButtons", {
@@ -190,7 +190,7 @@ sap.ui.define([
 
             if (oController.bEnableEasyAccessUserMenu) {
                 var oUserMenuSBIInvisibleText = new InvisibleText({
-                    text: resources.i18n.getText("AppFinder.SegmentedButton.UserMenu.Describedby")
+                    text: oResourceBundle.getText("AppFinder.SegmentedButton.UserMenu.Describedby")
                 }).toStatic();
                 this.addDependent(oUserMenuSBIInvisibleText);
                 this.segmentedButton.addItem(new SegmentedButtonItem("userMenu", {
@@ -215,7 +215,7 @@ sap.ui.define([
             }
             if (oController.bEnableEasyAccessSAPMenu) {
                 var oSAPMenuSBIInvisibleText = new InvisibleText({
-                    text: resources.i18n.getText("AppFinder.SegmentedButton.SAPMenu.Describedby")
+                    text: oResourceBundle.getText("AppFinder.SegmentedButton.SAPMenu.Describedby")
                 }).toStatic();
                 this.addDependent(oSAPMenuSBIInvisibleText);
                 this.segmentedButton.addItem(new SegmentedButtonItem("sapMenu", {
@@ -317,8 +317,8 @@ sap.ui.define([
             }
 
             if (sSearchPlaceHolderKey && this.oAppFinderSearchControl) {
-                this.oAppFinderSearchControl.setPlaceholder(resources.i18n.getText(sSearchPlaceHolderKey));
-                this.oAppFinderSearchControl.setTooltip(resources.i18n.getText(sSearchPlaceHolderKey));
+                this.oAppFinderSearchControl.setPlaceholder(ushellResources.i18n.getText(sSearchPlaceHolderKey));
+                this.oAppFinderSearchControl.setTooltip(ushellResources.i18n.getText(sSearchPlaceHolderKey));
             }
         },
 

package/src/main/js/sap/ushell/components/appfinder/Catalog.controller.js

@@ -990,9 +990,9 @@ sap.ui.define([
             var oErrorMessage;
 
             if (bTileAdded) {
-                oErrorMessage = resources.i18n.getText({ messageId: "fail_tile_operation_add_to_group", parameters: [oCatalogTileModel.tileData.title, oGroupModel.title] });
+                oErrorMessage = { messageId: "fail_tile_operation_add_to_group", parameters: [oCatalogTileModel.tileData.title, oGroupModel.title]};
             } else {
-                oErrorMessage = resources.i18n.getText({ messageId: "fail_tile_operation_remove_from_group", parameters: [oCatalogTileModel.tileData.title, oGroupModel.title] });
+                oErrorMessage = { messageId: "fail_tile_operation_remove_from_group", parameters: [oCatalogTileModel.tileData.title, oGroupModel.title]};
             }
 
             oCatalogsManager.notifyOnActionFailure(oErrorMessage.messageId, oErrorMessage.parameters);
@@ -1001,7 +1001,7 @@ sap.ui.define([
         prepareErrorMessage: function (aErroneousActions, sTileTitle) {
             var sFirstErroneousAddGroup;
             var sFirstErroneousRemoveGroup;
-            var sMessage;
+            var oMessage;
             var iNumberOfFailAddActions = 0;
             var iNumberOfFailDeleteActions = 0;
             var bCreateNewGroupFailed = false;
@@ -1034,26 +1034,26 @@ sap.ui.define([
             // First - Handle bCreateNewGroupFailed
             if (bCreateNewGroupFailed) {
                 if (aErroneousActions.length === 1) {
-                    sMessage = resources.i18n.getText({ messageId: "fail_tile_operation_create_new_group" });
+                    oMessage = { messageId: "fail_tile_operation_create_new_group" };
                 } else {
-                    sMessage = resources.i18n.getText({ messageId: "fail_tile_operation_some_actions" });
+                    oMessage = { messageId: "fail_tile_operation_some_actions" };
                 }
                 // Single error - it can be either one add action or one remove action
             } else if (aErroneousActions.length === 1) {
                 if (iNumberOfFailAddActions) {
-                    sMessage = resources.i18n.getText({ messageId: "fail_tile_operation_add_to_group", parameters: [sTileTitle, sFirstErroneousAddGroup] });
+                    oMessage = { messageId: "fail_tile_operation_add_to_group", parameters: [sTileTitle, sFirstErroneousAddGroup] };
                 } else {
-                    sMessage = resources.i18n.getText({ messageId: "fail_tile_operation_remove_from_group", parameters: [sTileTitle, sFirstErroneousRemoveGroup] });
+                    oMessage = { messageId: "fail_tile_operation_remove_from_group", parameters: [sTileTitle, sFirstErroneousRemoveGroup] };
                 }
                 // Many errors (iErrorCount > 1) - it can be several remove actions, or several add actions, or a mix of both
             } else if (iNumberOfFailDeleteActions === 0) {
-                sMessage = resources.i18n.getText({ messageId: "fail_tile_operation_add_to_several_groups", parameters: [sTileTitle] });
+                oMessage = { messageId: "fail_tile_operation_add_to_several_groups", parameters: [sTileTitle] };
             } else if (iNumberOfFailAddActions === 0) {
-                sMessage = resources.i18n.getText({ messageId: "fail_tile_operation_remove_from_several_groups", parameters: [sTileTitle] });
+                oMessage = { messageId: "fail_tile_operation_remove_from_several_groups", parameters: [sTileTitle] };
             } else {
-                sMessage = resources.i18n.getText({ messageId: "fail_tile_operation_some_actions" });
+                oMessage = { messageId: "fail_tile_operation_some_actions" };
             }
-            return sMessage;
+            return oMessage;
         },
 
         prepareDetailedMessage: function (tileTitle, numberOfAddedGroups, numberOfRemovedGroups, firstAddedGroupTitle, firstRemovedGroupTitle) {
@@ -1086,8 +1086,8 @@ sap.ui.define([
         },
 
         /**
-         * @param {Object} oSourceContext model context
-         * @returns {Object} Returns the part of the model that contains the IDs of the groups that contain the relevant Tile
+         * @param {object} oSourceContext model context
+         * @returns {object} Returns the part of the model that contains the IDs of the groups that contain the relevant Tile
          */
         getCatalogTileDataFromModel: function (oSourceContext) {
             var sBindingCtxPath = oSourceContext.getPath();
@@ -1109,7 +1109,7 @@ sap.ui.define([
          *
          * @param {sap.ui.model.Context} oTileContext the catalog tile to add
          * @param {sap.ui.model.Context} oGroupContext the group where the tile should be added
-         * @returns {Object} deferred
+         * @returns {object} deferred
          * @private
          *
          * @deprecated since 1.112
@@ -1133,9 +1133,9 @@ sap.ui.define([
          *
          * Send request to delete a tile from a group. Request is triggered asynchronously, so UI is not blocked.
          *
-         * @param {Number} tileCatalogId the id of the tile
-         * @param {Number} index the index of the group in the model
-         * @returns {Object} deferred
+         * @param {int} tileCatalogId the id of the tile
+         * @param {int} index the index of the group in the model
+         * @returns {object} deferred
          * @private
          *
          * @deprecated since 1.112
@@ -1163,7 +1163,7 @@ sap.ui.define([
          *
          * @param {sap.ui.model.Context} oTileContext the catalog tile to add
          * @param {string} newGroupName the name of the new group where the tile should be added
-         * @returns {Object} deferred
+         * @returns {object} deferred
          * @private
          *
          * @deprecated since 1.112

package/src/main/js/sap/ushell/components/appfinder/CatalogView.js

@@ -358,7 +358,7 @@ sap.ui.define([
                     if (oIllustratedMessageDomRef) {
                         var aIllustratedMessageMainTexts = oIllustratedMessageDomRef.getElementsByClassName("sapMTitle");
                         if (aIllustratedMessageMainTexts.length) {
-                            aIllustratedMessageMainTexts[0].removeAttribute();
+                            aIllustratedMessageMainTexts[0].removeAttribute("tabindex");
                         }
                     }
                 }.bind(this)

package/src/main/js/sap/ushell/components/appfinder/EasyAccess.controller.js

@@ -403,14 +403,14 @@ sap.ui.define([
                 }
                 return this.translationBundle.getText("easyAccessErrorGetDataErrorMsg", [sMenuNameString, oError]);
             }
-            return this.translationBundle.getText("easyAccessErrorGetDataErrorMsgNoReason", sMenuNameString);
+            return this.translationBundle.getText("easyAccessErrorGetDataErrorMsgNoReason", [sMenuNameString]);
         },
 
         /**
          * @param {string} menuType - the service that need to be called (can be USER_MENU or SAP_MENU)
          * @param {string} systemId - the system that the user choose in the system selector
          * @param {string} entityId - the "root" entity. Can be a specific id or "" in case it is the first call
-         * @param {number} entityLevel - the entity level (if it is the root entity the level should be 0)
+         * @param {int} entityLevel - the entity level (if it is the root entity the level should be 0)
          * @param {string} numberOfNextLevels - how much levels would like to retrieve. id no value is passed the default value is 3
          * @returns {*} - an object to add to the system easy access model
          */

package/src/main/js/sap/ushell/components/appfinder/HierarchyApps.controller.js

@@ -141,7 +141,7 @@ sap.ui.define([
                 sFirstErroneousAddGroup,
                 iNumberOfFailAddActions = 0,
                 bCreateNewGroupFailed = false,
-                message;
+                oMessage;
 
             for (var index in aErroneousActions) {
                 // Get the data of the error (i.e. action name and group object).
@@ -175,17 +175,17 @@ sap.ui.define([
             // First - Handle bCreateNewGroupFailed
             if (bCreateNewGroupFailed) {
                 if (aErroneousActions.length === 1) {
-                    message = resources.i18n.getText({ messageId: "fail_tile_operation_create_new_group" });
+                    oMessage = { messageId: "fail_tile_operation_create_new_group" };
                 } else {
-                    message = resources.i18n.getText({ messageId: "fail_tile_operation_some_actions" });
+                    oMessage = { messageId: "fail_tile_operation_some_actions" };
                 }
                 // Single error - it can be either one add action or one remove action
             } else if (aErroneousActions.length === 1) {
-                message = resources.i18n.getText({ messageId: "fail_app_operation_add_to_group", parameters: [sAppTitle, sFirstErroneousAddGroup] });
+                oMessage = { messageId: "fail_app_operation_add_to_group", parameters: [sAppTitle, sFirstErroneousAddGroup] };
             } else {
-                message = resources.i18n.getText({ messageId: "fail_app_operation_add_to_several_groups", parameters: [sAppTitle] });
+                oMessage = { messageId: "fail_app_operation_add_to_several_groups", parameters: [sAppTitle] };
             }
-            return message;
+            return oMessage;
         },
 
         /**

package/src/main/js/sap/ushell/components/appfinder/VisualizationOrganizerHelper.js

@@ -34,7 +34,7 @@ sap.ui.define([
     /**
      * VisualizationOrganizerHelper constructor.
      *
-     * @constructor
+     * @class
      * @protected
      */
     function VisualizationOrganizerHelper () {
@@ -87,7 +87,7 @@ sap.ui.define([
                     }
                     var oAppFinderView = getAppFinderView();
                     if (oAppFinderView && oVisualizationOrganizer.getPersonalizablePages().length === 1) {
-                        var sTitle = resources.i18n.getText("VisualizationOrganizer.PageContextTitle", oVisualizationOrganizer.getPersonalizablePages()[0].title);
+                        var sTitle = resources.i18n.getText("VisualizationOrganizer.PageContextTitle", [oVisualizationOrganizer.getPersonalizablePages()[0].title]);
                         oAppFinderView.getController()._updateShellHeader(sTitle);
                     }
                 }.bind(this))
@@ -285,8 +285,8 @@ sap.ui.define([
                 this.oView.getModel().updateBindings(true);
                 if (oSectionContext) {
                     var sTitle = oSectionContext.sectionTitle
-                        ? resources.i18n.getText("VisualizationOrganizer.AppFinderSectionContextTitle", oSectionContext.sectionTitle)
-                        : resources.i18n.getText("VisualizationOrganizer.AppFinderSectionContextTitle", oSectionContext.pageTitle);
+                        ? resources.i18n.getText("VisualizationOrganizer.AppFinderSectionContextTitle", [oSectionContext.sectionTitle])
+                        : resources.i18n.getText("VisualizationOrganizer.AppFinderSectionContextTitle", [oSectionContext.pageTitle]);
                     this.oView.oPage.setTitle(sTitle);
                     if (this._updateShellHeader) {
                         return new Promise(function (resolve) {

package/src/main/js/sap/ushell/components/appfinder/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.appfinder",
         "applicationVersion": {
-            "version": "1.118.0"
+            "version": "1.119.0"
         },
         "i18n": {
             "bundleUrl": "../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/applicationIntegration/AppLifeCycle.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.118.0
+ * @version 1.119.0
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/elements/model",
@@ -296,6 +296,13 @@ sap.ui.define([
                 oPromiseAppClose,
                 oDeferredAppClose;
 
+            //this code must be at the beginning of the function to allow it to be processed once in
+            //a cycle of openning an app
+            if (sToId && oTo && oTo.getIframeReusedForApp && oTo.getIframeReusedForApp() === true) {
+                oTo.setProperty("iframeReusedForApp", false, true);
+                PostMessageUtils.postMessageToIframeApp(oTo, "sap.ushell.sessionHandler", "afterApplicationShow", {}, false);
+            }
+
             //if called from onAfterNavigate, do nothing if oFrom is stateful container, because
             //application was already closed at the beginning of 'handleControl'
             if (isHomePage === false && bFromAfterNavigate === true && (BlueBoxHandler.isStatefulContainer(oFrom) || BlueBoxHandler.isStatefulContainerInKeepAlivePool(oFrom))) {
@@ -306,11 +313,6 @@ sap.ui.define([
                 sFromId = oFrom.getCurrentAppId();
             }
 
-            if (sToId && oTo && oTo.getIframeReusedForApp && oTo.getIframeReusedForApp() === true) {
-                oTo.setProperty("iframeReusedForApp", false, true);
-                PostMessageUtils.postMessageToIframeApp(oTo, "sap.ushell.sessionHandler", "afterApplicationShow", {}, false);
-            }
-
             if (sFromId && oFrom) {
                 if (BlueBoxHandler.isStatefulContainer(oFrom)) {
                     oPromiseAppClose = this.handleExitStateful(sFromId, oFrom, isHomePage);

package/src/main/js/sap/ushell/components/applicationIntegration/application/Application.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.118.0
+ * @version 1.119.0
  */
 sap.ui.define([
     "sap/ushell/components/container/ApplicationContainer",
@@ -301,7 +301,7 @@ sap.ui.define([
              * @param {string} sSidOrName
              *   The sid or name representation of the system alias
              *
-             * @return {boolean}
+             * @returns {boolean}
              *   Whether the given system is in sid format and matches the local system.
              *
              * @private

package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxHandler.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.118.0
+ * @version 1.119.0
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/application/BlueBoxesCache",

package/src/main/js/sap/ushell/components/applicationIntegration/application/PostMessageAPI.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview defines the post message API for all applications running in iframe within the shell
- * @version 1.118.0
+ * @version 1.119.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/components/applicationIntegration/application/WebGUIStatefulHandler.js

@@ -6,7 +6,7 @@ sap.ui.define([
     "sap/ushell/utils",
     "sap/ushell/components/applicationIntegration/application/PostMessageUtils"
 ], function (
-    utils, PostMessageUtils
+    ushellUtils, PostMessageUtils
 ) {
     "use strict";
 
@@ -37,7 +37,7 @@ sap.ui.define([
     };
 
     function createGuiApp (oContainer, oTarget) {
-        return new Promise(function (fnResolve, fnReject) {
+        return new Promise(async function (fnResolve, fnReject) {
             var oPostParams,
                 oFLPParams,
                 sUrl = oTarget.url;
@@ -51,14 +51,14 @@ sap.ui.define([
                 PostMessageUtils.postMessageToIframeApp(oContainer, "sap.its", "startService", oPostParams, true).then(fnResolve, fnReject);
             }
 
-            sUrl = utils.appendSapShellParam(sUrl);
-            sUrl = utils.filterOutParamsFromLegacyAppURL(sUrl);
+            sUrl = await ushellUtils.appendSapShellParam(sUrl);
+            sUrl = ushellUtils.filterOutParamsFromLegacyAppURL(sUrl);
 
             oPostParams = {
                 url: sUrl
             };
             if (oContainer.getIframeWithPost && oContainer.getIframeWithPost() === true) {
-                var oAppStatesInfo = utils.getParamKeys(sUrl);
+                var oAppStatesInfo = ushellUtils.getParamKeys(sUrl);
 
                 if (oAppStatesInfo.aAppStateNamesArray.length > 0) {
                     sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oService) {