@sapui5/sap.ushell 1.120.28 → 1.120.30

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/rtaAgent/i18n/i18n_de.properties

@@ -1,10 +1,10 @@
 
 APP_TITLE=RTA-cFLP-Agent-Plug-In
 
-ERROR_TITLE=UI-Anpassung kann nicht gestartet werden.
+ERROR_TITLE=UI-Anpassung kann nicht gestartet werden
 
 TECHNICAL_ERROR=Technischer Fehler. Bitte wenden Sie sich an den Support.
 
 HEADER_FLEX_DISABLED=Information
 
-MSG_FLEX_DISABLED=Diese Anwendung ist nicht f\u00FCr die Anpassung aktiviert. Weitere Informationen finden Sie unter (https\://help.sap.com/viewer/4fc8d03390c342da8a60f8ee387bca1a/latest/de-DE/ef97b2485aa34a8890f4d51e5c2b15a8.html).
+MSG_FLEX_DISABLED=Diese Anwendung ist nicht f\u00FCr die Anpassung aktiviert. Weitere Informationen finden Sie [hier](https\://help.sap.com/viewer/4fc8d03390c342da8a60f8ee387bca1a/latest/de-DE/ef97b2485aa34a8890f4d51e5c2b15a8.html).

package/src/main/js/sap/ushell/appRuntime/ui5/services/AppLifeCycleAgent.js

@@ -150,8 +150,7 @@ sap.ui.define([
                     sAppId,
                     sAppIntent,
                     oParsedShellIntent,
-                    sScubeAppIntent = "",
-                    sKeepAliveAppKey;
+                    sScubeAppIntent = "";
 
                 FesrEnhancer.startInteraction();
 
@@ -181,31 +180,33 @@ sap.ui.define([
                     oShellUIService._resetBackNavigationCallback();
                 }
                 Core.getEventBus().publish("launchpad", "appOpening", {});
-                that.getAppInfo(sAppId, sUrl, sAppIntent).then(function (values) {
-                    let fnFindKeepAlive;
-                    if (Object.keys(oCachedApplications).length > 0) {
+                that.getAppInfo(sAppId, sUrl, sAppIntent).then(function (oAppInfo) {
+                    /**
+                     * In S/Cube, the ResolvedHashFragment is fully available
+                     * In other cases, we need to use the name property
+                     */
+                    const sUi5ComponentName = oAppInfo.oResolvedHashFragment?.ui5ComponentName || oAppInfo.oResolvedHashFragment?.name;
+
+                    const sKeepAliveAppKey = Object.keys(oCachedApplications).find((sCachedKey) => {
                         if (AppRuntimeContext.getIsScube() && sScubeAppIntent.length > 0) {
-                            fnFindKeepAlive = (sCachedKey) => {
-                                return oCachedApplications[sCachedKey].sAppIntent === sScubeAppIntent &&
-                                    oCachedApplications[sCachedKey].ui5ComponentName === values.oResolvedHashFragment.ui5ComponentName;
-                            };
-                        } else {
-                            fnFindKeepAlive = (sCachedKey) => {
-                                return oCachedApplications[sCachedKey].ui5ComponentName &&
-                                    oCachedApplications[sCachedKey].ui5ComponentName === values?.oResolvedHashFragment?.ui5ComponentName;
-                            };
-                        }
-                        sKeepAliveAppKey = Object.keys(oCachedApplications).find(fnFindKeepAlive);
-                        if (sKeepAliveAppKey) {
-                            that.destroy({
-                                body: {
-                                    sCacheId: sKeepAliveAppKey
-                                }
-                            }, true);
+                            return oCachedApplications[sCachedKey].sAppIntent === sScubeAppIntent
+                                && oCachedApplications[sCachedKey].ui5ComponentName === sUi5ComponentName;
                         }
+
+                        return oCachedApplications[sCachedKey].ui5ComponentName
+                            && oCachedApplications[sCachedKey].ui5ComponentName === sUi5ComponentName;
+                    });
+
+                    if (sKeepAliveAppKey) {
+                        that.destroy({
+                            body: {
+                                sCacheId: sKeepAliveAppKey
+                            }
+                        }, true);
                     }
+
                     that.expandSapIntentParams(new URI(sUrl).query(true)).then(function (oURLParameters) {
-                        fnCreateApplication(sAppId, oURLParameters, values.oResolvedHashFragment, sAppIntent, values.oParsedHash)
+                        fnCreateApplication(sAppId, oURLParameters, oAppInfo.oResolvedHashFragment, sAppIntent, oAppInfo.oParsedHash)
                             .then(function (oCreateApplicationResult) {
                                 fnRenderApp(oCreateApplicationResult);
                                 Core.getEventBus().publish("sap.ushell", "appOpened", {});
@@ -439,7 +440,7 @@ sap.ui.define([
         /**
          * @private
          */
-        this.getAppInfo = function (appId, sUrl, sAppIntent) {
+        this.getAppInfo = function (sAppId, sUrl, sAppIntent) {
             return new Promise(function (fnResolve) {
                 if (sAppIntent) {
                     that.addAppParamsToIntent(sUrl, sAppIntent).then(function (sParams) {
@@ -466,17 +467,17 @@ sap.ui.define([
                     });
                 } else {
                     var fnGetAppInfo = function () {
-                        oAppResolution.getAppInfo(appId, sUrl).then(function (oAppInfo) {
-                            that.addAppInfoToCache(appId, oAppInfo);
+                        oAppResolution.getAppInfo(sAppId, sUrl).then(function (oAppInfo) {
+                            that.addAppInfoToCache(sAppId, oAppInfo);
                             fnResolve({
                                 oResolvedHashFragment: oAppInfo
                             });
                         });
                     };
 
-                    if (bEnableAppResolutionCache === true && oAppResolutionCache[appId]) {
+                    if (bEnableAppResolutionCache === true && oAppResolutionCache[sAppId]) {
                         fnResolve({
-                            oResolvedHashFragment: JSON.parse(JSON.stringify(oAppResolutionCache[appId]))
+                            oResolvedHashFragment: JSON.parse(JSON.stringify(oAppResolutionCache[sAppId]))
                         });
                     } else if (oAppResolution) {
                         fnGetAppInfo();

package/src/main/js/sap/ushell/appRuntime/ui5/services/adapters/Ui5ComponentLoaderAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the application runtime platform
  *
- * @version 1.120.28
+ * @version 1.120.30
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/logger.js

@@ -45,7 +45,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.120.28
+ * @version 1.120.30
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/state.js

@@ -71,7 +71,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.120.28
+ * @version 1.120.30
  * @namespace
  */
 sap.ui.define([

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5datetimeformat.js

@@ -4,7 +4,7 @@
  * @fileOverview Configure the UI5Settings for Date and Time Format for the 'CDM'
  *               platform.
  *
- * @version 1.120.28
+ * @version 1.120.30
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/bootstrap/sandbox2.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  * This is the version that creates spaces/pages runtime environment.
  *
- * @version 1.120.28
+ * @version 1.120.30
  */
 
 /* eslint-disable quote-props */

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.appfinder",
         "applicationVersion": {
-            "version": "1.120.28"
+            "version": "1.120.30"
         },
         "i18n": {
             "bundleUrl": "../../renderer/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.120.28
+ * @version 1.120.30
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/elements/model",

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.120.28
+ * @version 1.120.30
  */
 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.120.28
+ * @version 1.120.30
  */
 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.120.28
+ * @version 1.120.30
  * @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.120.28
+ * @version 1.120.30
  */
 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.120.28
+ * @version 1.120.30
  */
 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.120.28
+ * @version 1.120.30
  */
 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.120.28
+ * @version 1.120.30
  */
 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.120.28
+ * @version 1.120.30
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/container/resources/resources_de.properties

@@ -5,6 +5,6 @@ loading={0} wird geladen...
 
 
 USHELL_FACTSHEET_NAME=Name
-USHELL_FACTSHEET_JOBTITLE=Position
+USHELL_FACTSHEET_JOBTITLE=Stellenbezeichnung
 USHELL_FACTSHEET_PHONE=Telefon
 USHELL_FACTSHEET_EMAIL=E-Mail

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder Component
  *
- * @version 1.120.28
+ * @version 1.120.30
  */
 
 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.120.28
+ * @version 1.120.30
  */
 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.120.28
+ * @version 1.120.30
  */
 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.120.28
+ * @version 1.120.30
  */
 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.120.28"
+            "version": "1.120.30"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

package/src/main/js/sap/ushell/components/contentFinder/resources/resources_ru.properties

@@ -1,5 +1,5 @@
 
-ContentFinder.Button.Add=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C ({0})\u044A
+ContentFinder.Button.Add=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C ({0})
 ContentFinder.Button.Cancel=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C
 
 

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.120.28",
+            version: "1.120.30",
             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

@@ -20,7 +20,7 @@
  *  - Deactivation handler
  *  - Rendering tile action menu
  *
- * @version 1.120.28
+ * @version 1.120.30
  *
  * @deprecated since 1.112
  */

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.120.28
+ * @version 1.120.30
  * @name sap.ushell.components.homepage.DashboardContent.view
  *
  * @deprecated since 1.112

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.120.28
+ * @version 1.120.30
  * @name sap.ushell.components.homepage.DashboardGroupsBox
  * @since 1.35.0
  *

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.120.28
+ * @version 1.120.30
  * @name sap.ushell.components.homepage.DashboardUIActions
  * @since 1.35.0
  *

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.homepage",
         "applicationVersion": {
-            "version": "1.120.28"
+            "version": "1.120.30"
         },
         "i18n": {
             "bundleUrl": "../../renderer/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.120.28
+ * @version 1.120.30
  */
 
 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.120.28
+ * @version 1.120.30
  */
 
 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.120.28
+ * @version 1.120.30
  */
 
 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.120.28
+ * @version 1.120.30
  */
 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.120.28"
+            "version": "1.120.30"
         },
         "i18n": {
             "bundleUrl": "../../renderer/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.120.28
+ * @version 1.120.30
  */
  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.120.28"
+            "version": "1.120.30"
         },
         "ach": "CA-FLP-FE-COR",
         "type": "component",

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

@@ -3,12 +3,14 @@ sap.ui.define([
     "sap/ui/core/UIComponent",
     "sap/ui/core/ComponentContainer",
     "sap/ui/core/mvc/XMLView",
-    "sap/ushell/Config"
+    "sap/ushell/Config",
+   "sap/ushell/resources"
 ], function (
     UIComponent,
     ComponentContainer,
     XMLView,
-    Config
+    Config,
+    resources
 ) {
     "use strict";
 
@@ -21,7 +23,7 @@ sap.ui.define([
 
         init: function () {
             UIComponent.prototype.init.apply(this, arguments);
-
+            this.setModel(resources.i18nModel, "i18n");
             this.oMenuModelPromise = sap.ushell.Container.getServiceAsync("Menu")
                 .then(function (oMenuService) {
                     return Promise.all([

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.120.28"
+            "version": "1.120.30"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/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.120.28
+ * @version 1.120.30
  * @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.120.28"
+            "version": "1.120.30"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",
@@ -36,14 +36,7 @@
                 "sap.ui.core": {}
             }
         },
-        "models": {
-            "i18n": {
-                "type": "sap.ui.model.resource.ResourceModel",
-                "settings": {
-                    "bundleName": "sap.ushell.renderer.resources.resources"
-                }
-            }
-        },
+        "models": {},
         "contentDensities": {
             "compact": true,
             "cozy": true

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

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

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

@@ -33,7 +33,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.ProductSwitch.Component", {
 
         metadata: {
-            version: "1.120.28",
+            version: "1.120.30",
             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.120.28"
+            "version": "1.120.30"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -24,7 +24,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.120.28",
+            version: "1.120.30",
             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.120.28
+ * @version 1.120.30
  */
 sap.ui.define([
     "sap/base/Log"

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.120.28
+ * @version 1.120.30
  */
 sap.ui.define([
     "sap/base/Log"

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.120.28
+ * @version 1.120.30
  */
 sap.ui.define([
     "sap/ushell/resources",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module handles the navigation service search actions
- * @version 1.120.28
+ * @version 1.120.30
  */
 sap.ui.define([
     "sap/base/Log",

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.120.28",
+            version: "1.120.30",
             library: "sap.ushell",
             dependencies: {
                 libs: {