@sapui5/sap.ushell 1.114.7 → 1.114.9

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

@@ -12,8 +12,6 @@ sap.ui.define([
     "use strict";
 
     return View.extend("sap.ushell.components.appfinder.EasyAccessView", {
-        BUSY_INDICATOR_DELAY: 1000,
-
         createContent: function (oController) {
             this.oResourceBundle = resources.i18n;
 
@@ -34,10 +32,7 @@ sap.ui.define([
                 }
             }).then(function (HierarchyFolders) {
                 this.hierarchyFolders = HierarchyFolders;
-
-                this.hierarchyFolders.setBusyIndicatorDelay(this.BUSY_INDICATOR_DELAY);
                 this.hierarchyFolders.addStyleClass("sapUshellHierarchyFolders");
-
                 return HierarchyFolders;
             }.bind(this));
 
@@ -56,12 +51,9 @@ sap.ui.define([
                 }
             }).then(function (HierarchyApps) {
                 this.hierarchyApps = HierarchyApps;
-                this.hierarchyApps.setBusyIndicatorDelay(this.BUSY_INDICATOR_DELAY);
-
                 return HierarchyApps;
             }.bind(this));
 
-
             /*
              * Setup split app
              */

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.appfinder",
         "applicationVersion": {
-            "version": "1.114.7"
+            "version": "1.114.9"
         },
         "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.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/elements/model",

package/src/main/js/sap/ushell/components/applicationIntegration/Storage.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.114.7
+ * @version 1.114.9
  */
 sap.ui.define([], function () {
     "use strict";

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.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "sap/ushell/components/container/ApplicationContainer",

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.114.7
+ * @version 1.114.9
  */
 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.114.7
+ * @version 1.114.9
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/components/applicationIntegration/configuration/AppMeta.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.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "sap/base/util/extend",

package/src/main/js/sap/ushell/components/applicationIntegration/elements/model.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The models assosicated with the applciation.
- * @version 1.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "sap/ushell/EventHub",

package/src/main/js/sap/ushell/components/applicationIntegration/relatedServices/RelatedServices.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the services for the different applications.
- * @version 1.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "sap/ui/core/Core"

package/src/main/js/sap/ushell/components/applicationIntegration/relatedShellElements/RelatedShellElements.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the related shell elements of the different applications.
- * @version 1.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/container/ApplicationContainer.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The UI integration's SAPUI5 control which supports application embedding.
- * @version 1.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "sap/base/Log",
@@ -1640,7 +1640,7 @@ sap.ui.define([
 
             // remove all event listeners
             if (that._unloadEventListener) {
-                removeEventListener("unload", that._unloadEventListener);
+                removeEventListener("pagehide", that._unloadEventListener);
             }
 
             if (that._disableRouterEventHandler) {
@@ -1679,7 +1679,8 @@ sap.ui.define([
             // be sure to remove entry from list of NWBC-containing containers
             // when the window is closed
             that._unloadEventListener = that.exit.bind(that);
-            addEventListener("unload", that._unloadEventListener); //TODO doesn't work in IE9 when F5 is pressed?!
+            // As of chrome 117 the unload event is deprecated and therefore was changed
+            addEventListener("pagehide", that._unloadEventListener); //TODO doesn't work in IE9 when F5 is pressed?!
 
             that._storageEventListener = function (oStorageEvent) {
                 var sApplicationType = that.getApplicationType();

package/src/main/js/sap/ushell/components/contentFinder/Component.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder Component
  *
- * @version 1.114.7
+ * @version 1.114.9
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/contentFinder/controller/AppSearch.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file AppSearch controller for AppSearch view
- * @version 1.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "./ContentFinderDialog.controller",

package/src/main/js/sap/ushell/components/contentFinder/controller/ContentFinderDialog.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog root view
- * @version 1.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "../model/formatter",

package/src/main/js/sap/ushell/components/contentFinder/controller/WidgetGallery.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for WidgetGallery view
- * @version 1.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "./ContentFinderDialog.controller"

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.contentFinder",
         "applicationVersion": {
-            "version": "1.114.7"
+            "version": "1.114.9"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

package/src/main/js/sap/ushell/components/factsheet/Component.js

@@ -17,7 +17,7 @@ sap.ui.define([
 
         // use inline declaration instead of component.json to save 1 round trip
         metadata: {
-            version: "1.114.7",
+            version: "1.114.9",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m", "sap.ui.vbm", "sap.suite.ui.commons", "sap.ui.layout", "sap.viz"],

package/src/main/js/sap/ushell/components/homepage/ActionMode.js

@@ -18,7 +18,7 @@
  *  - Deactivation handler
  *  - Rendering tile action menu
  *
- * @version 1.114.7
+ * @version 1.114.9
  */
 /**
  * @namespace

package/src/main/js/sap/ushell/components/homepage/DashboardContent.view.js

@@ -5,7 +5,7 @@
  * with a header of type <code>sap.ushell.ui.launchpad.AnchorNavigationBar</code>
  * and content of type <code>sap.ushell.ui.launchpad.DashboardGroupsContainer</code>.
  *
- * @version 1.114.7
+ * @version 1.114.9
  * @name sap.ushell.components.homepage.DashboardContent.view
  * @private
  */

package/src/main/js/sap/ushell/components/homepage/DashboardGroupsBox.js

@@ -6,7 +6,7 @@
  * Exposes the public function <code>createGroupsBox</code>
  * @see sap.ushell.components.homepage.DashboardContent.view
  *
- * @version 1.114.7
+ * @version 1.114.9
  * @name sap.ushell.components.homepage.DashboardGroupsBox
  * @since 1.35.0
  * @private

package/src/main/js/sap/ushell/components/homepage/DashboardUIActions.js

@@ -5,7 +5,7 @@
  * Extends <code>sap.ui.base.Object</code><br>
  * Exposes the public function <code>initializeUIActions</code>
  *
- * @version 1.114.7
+ * @version 1.114.9
  * @name sap.ushell.components.homepage.DashboardUIActions
  * @since 1.35.0
  * @private

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

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

package/src/main/js/sap/ushell/components/pages/ActionMode.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ActionMode for the PageRuntime view
  *
- * @version 1.114.7
+ * @version 1.114.9
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/Component.js

@@ -5,7 +5,7 @@
  * #Shell-home or #Launchpad-openFLPPage if spaces are enabled (/core/spaces/enabled).
  * In the future it should completely replace the classical homepage.
  *
- * @version 1.114.7
+ * @version 1.114.9
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/MyHomeImport.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview MyHome migrate functionality for the PageRuntime view
  *
- * @version 1.114.7
+ * @version 1.114.9
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/controller/PageRuntime.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file PageRuntime controller for PageRuntime view
- * @version 1.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "sap/ushell/library",

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

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

package/src/main/js/sap/ushell/components/runtimeSwitcher/controller/RuntimeSwitcher.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file RuntimeSwitcher's controller for RuntimeSwitcher's view
- * @version 1.114.7
+ * @version 1.114.9
  */
  sap.ui.define([
     "sap/ui/core/mvc/Controller",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.runtimeSwitcher",
         "applicationVersion": {
-            "version": "1.114.7"
+            "version": "1.114.9"
         },
         "ach": "CA-FLP-FE-COR",
         "type": "component",

package/src/main/js/sap/ushell/components/shell/MenuBar/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.MenuBar",
         "applicationVersion": {
-            "version": "1.114.7"
+            "version": "1.114.9"
         },
         "i18n": {
             "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/controller/NavigationBarMenu.controller.js

@@ -4,7 +4,7 @@
  * @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
  * logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
  *
- * @version 1.114.7
+ * @version 1.114.9
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.NavigationBarMenu",
         "applicationVersion": {
-            "version": "1.114.7"
+            "version": "1.114.9"
         },
         "i18n": {
             "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/Notifications/Component.js

@@ -42,7 +42,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.Notifications.Component", {
         metadata: {
-            version: "1.114.7",
+            version: "1.114.9",
             library: "sap.ushell.components.shell.Notifications",
             dependencies: {
                 libs: ["sap.m"]

package/src/main/js/sap/ushell/components/shell/ProductSwitch/Component.js

@@ -31,7 +31,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.ProductSwitch.Component", {
 
         metadata: {
-            version: "1.114.7",
+            version: "1.114.9",
             library: "sap.ushell.components.shell.ProductSwitch",
             dependencies: {
                 libs: {

package/src/main/js/sap/ushell/components/shell/Search/manifest.json

@@ -4,7 +4,7 @@
         "id": "sap.ushell.components.shell.Search",
 
         "applicationVersion": {
-            "version": "1.114.7"
+            "version": "1.114.9"
         },
         "i18n": {
             "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/SearchCEP/Component.js

@@ -23,7 +23,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.114.7",
+            version: "1.114.9",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/FrequentActivityProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/NavigationSvcSearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module handles the navigation service search actions
- * @version 1.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/RecentSearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.114.7
+ * @version 1.114.9
  */
 sap.ui.define([
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module is the search provider main interface
- * @version 1.114.7
+ * @version 1.114.9
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/components/shell/Settings/Component.js

@@ -48,7 +48,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.Settings.Component", {
 
         metadata: {
-            version: "1.114.7",
+            version: "1.114.9",
             library: "sap.ushell",
             dependencies: {
                 libs: {

package/src/main/js/sap/ushell/components/shell/Settings/UserSettings.controller.js

@@ -70,6 +70,7 @@ sap.ui.define([
 
             Device.orientation.attachHandler(this._fnOrientationChange, this);
 
+            this._oSelectedItemOnMobile = null; // used to enable selection on mobile
             this._oConfigDoable = Config
                 .on("/core/userPreferences/entries")
                 .do(this._processNewEntries.bind(this));
@@ -338,8 +339,8 @@ sap.ui.define([
          * @private
          */
         _navToggleButtonPressHandler: function () {
-            var oSplitApp = this.getView().byId("settingsApp"),
-                bIsMasterShown = oSplitApp.isMasterShown();
+            var oSplitApp = this.getView().byId("settingsApp");
+            var bIsMasterShown = oSplitApp.isMasterShown();
 
             if (bIsMasterShown) {
                 oSplitApp.hideMaster();
@@ -394,6 +395,7 @@ sap.ui.define([
             var oModel = oView.getModel();
             var oResultsModel = oView.getModel("results");
 
+            var oSplitApp = oView.byId("settingsApp");
             var sEntryPath = oSelectedItem.getBindingContextPath();
             var oEntry = oModel.getProperty(sEntryPath);
             var sEntryId = oEntry.id;
@@ -407,17 +409,19 @@ sap.ui.define([
                 this._aPreviouslySelectedItems = [sEntryId];
             }
 
-            // Clear selection from list.
-            if (Device.system.phone) {
+            if (Device.system.phone) { // Clear selection from list on mobile.
+                this._oSelectedItemOnMobile = oSelectedItem;
                 oSelectedItem.setSelected(false);
             }
 
+            // Entry result was already saved
             if (sDetailPageId) {
                 this._navToDetail(sDetailPageId, oView);
                 var sWrapperId = oEntry.tabs.map(function (oTabEntry) {
                     return oTabEntry.id;
                 }).join("-");
                 var oWrapperPromise = this._mLoadedWrappers.get(sWrapperId);
+                // Loading of actual wrapper+entry was started
                 if (oWrapperPromise) {
                     oWrapperPromise.then(function (oWrapper) {
                         var oIconTabBar = oWrapper.getContent()[1];
@@ -438,24 +442,48 @@ sap.ui.define([
                     return Promise.resolve();
                 }
             }
+            // First time entry was required => load wrapper+entry
+
+            // Show busy content as long as the selected Page is not yet loaded.
+            if (Device.system.phone) {
+                // the busy page interacts with the back navigation on mobile
+                oSplitApp.setBusy(true);
+            } else {
+                this._navToBusyPage();
+            }
 
             return Promise.all([
                 this._createContentWrapper(oEntry),
                 this._createEntryContent(oEntry)
             ]).then(function (aResults) {
+                var oWrapper = aResults[0];
+                var oEntryContent = aResults[1];
+
                 var aEntries = Config.last("/core/userPreferences/entries");
                 var bEntryAvailable = aEntries.some(function (oEntry) {
                     return oEntry.id === sEntryId && oEntry.visible !== false;
                 });
+
+                var oMasterEntryList = oView.byId("userSettingEntryList");
+                var oCurrentSelectedItem = oMasterEntryList.getSelectedItem() || this._oSelectedItemOnMobile;
+                // Since the entry content creation is delayed, it might be that the user already selected a different settings entry.
+                var bLoadedDetailMatchesSelectedEntry = oSelectedItem === oCurrentSelectedItem;
+
                 if (!bEntryAvailable) {
+                    if (bLoadedDetailMatchesSelectedEntry) {
+                        if (oSplitApp.getMode() === "ShowHideMode") {
+                                oSplitApp.showMaster();
+                                this._updateHeaderButtonVisibility(true);
+                        } else {
+                            this._toDetail(oCurrentSelectedItem || oMasterEntryList.getItems()[0]);
+                        }
+                    }
+
                     // don't add entries which are not visible anymore
                     return;
                 }
 
-                var oWrapper = aResults[0];
-                var oEntryContent = aResults[1];
-
-                this.getView().byId("settingsApp").addDetailPage(oWrapper);
+                oSplitApp.addDetailPage(oWrapper);
 
                 if (oEntry.tabs.length > 1) {
                     oWrapper.getContent()[1].getItems()[0].addContent(oEntryContent);
@@ -466,8 +494,11 @@ sap.ui.define([
                 var sNewDetailPageId = oWrapper.getId();
                 oResultsModel.setProperty("/entries/" + sEntryId + "/contentResult", sNewDetailPageId);
 
-                this._navToDetail(sNewDetailPageId, oView);
-                this._emitEntryOpened(sEntryId);
+
+                if (bLoadedDetailMatchesSelectedEntry) {
+                    this._navToDetail(sNewDetailPageId, oView);
+                    this._emitEntryOpened(sEntryId);
+                }
 
                 return oWrapper.getId();
             }.bind(this));
@@ -578,6 +609,14 @@ sap.ui.define([
             });
         },
 
+        /**
+         * Navigates to busy page
+         */
+        _navToBusyPage: function () {
+            var oView = this.getView();
+            this._navToDetail(oView.createId("userSettingBusyPage"), oView);
+        },
+
         /**
          * Navigates to the corresponding detail Page.
          *
@@ -587,6 +626,7 @@ sap.ui.define([
          */
         _navToDetail: function (sId, oView) {
             var oSplitApp = oView.byId("settingsApp");
+            oSplitApp.setBusy(false);
 
             oSplitApp.toDetail(sId);
             if (oSplitApp.getMode() === "ShowHideMode") {

package/src/main/js/sap/ushell/components/shell/Settings/UserSettings.view.xml

@@ -70,6 +70,11 @@
                                 </content>
                             </Page>
                         </masterPages>
+                        <detailPages>
+                            <Page id="userSettingBusyPage"
+                                showHeader="false"
+                                busy="true" />
+                        </detailPages>
                     </SplitApp>
                 </content>
                 <footer>

package/src/main/js/sap/ushell/components/shell/UserActionsMenu/Component.js

@@ -25,7 +25,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.UserActionsMenu.Component", {
 
         metadata: {
-            version: "1.114.7",
+            version: "1.114.9",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m"]

package/src/main/js/sap/ushell/components/shell/UserImage/Component.js

@@ -37,7 +37,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.UserImage.Component", {
 
         metadata: {
-            version: "1.114.7",
+            version: "1.114.9",
             library: "sap.ushell.components.shell.UserImage",
             dependencies: {
                 libs: {