@sapui5/sap.ushell 1.124.1 → 1.125.0

package/src/main/js/sap/ushell/ui/ShellHeader.js

@@ -11,11 +11,13 @@ sap.ui.define([
     "sap/ushell/api/NewExperience",
     "sap/ushell/EventHub",
     "sap/ushell/Config",
-    "sap/ushell/library", // css style dependency
+    // css style dependency
+    "sap/ushell/library",
     "sap/ushell/resources",
     "sap/ushell/ui/ShellHeaderRenderer",
     "sap/ushell/utils",
-    "sap/ushell/utils/WindowUtils"
+    "sap/ushell/utils/WindowUtils",
+    "sap/ushell/Container"
 ], function (
     Localization,
     Control,
@@ -31,7 +33,8 @@ sap.ui.define([
     resources,
     ShellHeaderRenderer,
     utils,
-    WindowUtils
+    WindowUtils,
+    Container
 ) {
     "use strict";
 
@@ -137,7 +140,7 @@ sap.ui.define([
          * shell controller initialize ShellNavigationInternal before using it here.
          */
         EventHub.once("ShellNavigationInitialized").do(function () {
-            sap.ushell.Container.getServiceAsync("ShellNavigationInternal").then(function (oShellNavigationInternal) {
+            Container.getServiceAsync("ShellNavigationInternal").then(function (oShellNavigationInternal) {
                 this._rerenderLogoNavigationFilterBound = this._rerenderLogoNavigationFilter.bind(this, oShellNavigationInternal);
 
                 oShellNavigationInternal.registerNavigationFilter(this._rerenderLogoNavigationFilterBound);
@@ -588,7 +591,7 @@ sap.ui.define([
      * @private
      */
     ShellHeader.prototype._getLeanMode = function () {
-        return sap.ushell.Container.getRendererInternal().getSapUshellConfigParam() === "lean";
+        return Container.getRendererInternal().getSapUshellConfigParam() === "lean";
     };
 
     /**

package/src/main/js/sap/ushell/ui/appfinder/AppBoxInternal.js

@@ -93,7 +93,7 @@ sap.ui.define([
      */
     AppBoxInternal.prototype.init = function () {
         this._oIcon = new Icon().addStyleClass("sapUshellAppBoxIcon");
-        this._oDoable = Config.on("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations").do(bShowContentProviderLabel => {
+        this._oDoable = Config.on("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations").do((bShowContentProviderLabel) => {
             this.setProperty("showContentProviderLabel", bShowContentProviderLabel);
         });
     };

package/src/main/js/sap/ushell/ui/cards/FrequentActivitiesExtension.js

@@ -7,8 +7,9 @@ sap.ui.define([
     "sap/ushell/library",
     "sap/ushell/Config",
     "sap/ushell/EventHub",
-    "sap/ushell/resources"
-], function (Extension, UrlParsing, AppTypeUtils, ushellLibrary, Config, EventHub, resources) {
+    "sap/ushell/resources",
+    "sap/ushell/Container"
+], function (Extension, UrlParsing, AppTypeUtils, ushellLibrary, Config, EventHub, resources, Container) {
     "use strict";
 
     // shortcut for sap.ushell.AppType
@@ -52,8 +53,8 @@ sap.ui.define([
          */
         init: function () {
             Extension.prototype.init.apply(this, arguments);
-            this.oUserRecentsPromise = sap.ushell.Container.getServiceAsync("UserRecents");
-            this.oCrossAppNavPromise = sap.ushell.Container.getServiceAsync("CrossApplicationNavigation");
+            this.oUserRecentsPromise = Container.getServiceAsync("UserRecents");
+            this.oCrossAppNavPromise = Container.getServiceAsync("CrossApplicationNavigation");
         },
 
         /**

package/src/main/js/sap/ushell/ui/cards/RecentActivitiesExtension.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Extension for recent activities card
  *
- * @version 1.124.1
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/ui/integration/Extension",
@@ -12,8 +12,9 @@ sap.ui.define([
     "sap/ushell/library",
     "sap/ushell/Config",
     "sap/ushell/EventHub",
-    "sap/ushell/resources"
-], function (Extension, UrlParsing, AppTypeUtils, ushellLibrary, Config, EventHub, resources) {
+    "sap/ushell/resources",
+    "sap/ushell/Container"
+], function (Extension, UrlParsing, AppTypeUtils, ushellLibrary, Config, EventHub, resources, Container) {
     "use strict";
 
     // shortcut for sap.ushell.AppType
@@ -57,8 +58,8 @@ sap.ui.define([
          */
         init: function () {
             Extension.prototype.init.apply(this, arguments);
-            this.oUserRecentsPromise = sap.ushell.Container.getServiceAsync("UserRecents");
-            this.oCrossAppNavPromise = sap.ushell.Container.getServiceAsync("CrossApplicationNavigation");
+            this.oUserRecentsPromise = Container.getServiceAsync("UserRecents");
+            this.oCrossAppNavPromise = Container.getServiceAsync("CrossApplicationNavigation");
         },
 
         /**

package/src/main/js/sap/ushell/ui/footerbar/AboutDialog.controller.js

@@ -9,7 +9,8 @@ sap.ui.define([
     "sap/ushell/resources",
     "sap/base/Log",
     "sap/base/util/isEmptyObject",
-    "sap/ui/Device"
+    "sap/ui/Device",
+    "sap/ushell/Container"
 ], function (
     Controller,
     Fragment,
@@ -19,7 +20,8 @@ sap.ui.define([
     resources,
     Log,
     isEmptyObject,
-    Device
+    Device,
+    Container
 ) {
     "use strict";
     return Controller.extend("sap.ushell.ui.footerbar.AboutDialog.controller", {
@@ -91,12 +93,13 @@ sap.ui.define([
                     "technicalAppComponentId",
                     "appFrameworkId",
                     "appFrameworkVersion",
-                    "appTitle"
+                    "appTitle",
+                    "title"
                 ],
                 oAboutDialog = this._getDialog();
 
             return new Promise(function (resolve, reject) {
-                sap.ushell.Container.getServiceAsync("AppLifeCycle")
+                Container.getServiceAsync("AppLifeCycle")
                     .then(function (oAppLifeCycle) {
                         var oCurrentApplication = oAppLifeCycle.getCurrentApplication();
                         return Promise.all([
@@ -112,7 +115,8 @@ sap.ui.define([
                         aAppInfoParameters = aAppInfoParameters.concat([
                             "contentProviderLabel"
                         ]);
-                        oInfo.appTitle = (oInfo.appTitle && typeof oInfo.appTitle === "string" && oInfo.appTitle.length > 0) ? oInfo.appTitle : oMetaData.title;
+                        // 1. title from WebGUI/WDA (PostMessage API), 2. appTitle from cFLP, 3. title from metadata
+                        oInfo.appTitle = oInfo.title || oInfo.appTitle || oMetaData.title || "";
                         oInfo.contentProviderLabel = sProviderId;
 
                         var oApplicationInformation = this._buildApplicationInformationObject(aAppInfoParameters, oInfo);
@@ -144,7 +148,7 @@ sap.ui.define([
         },
 
         _getSystemInformation: function () {
-            var oLogonSystem = sap.ushell.Container.getLogonSystem(),
+            var oLogonSystem = Container.getLogonSystem(),
                 sProductName = oLogonSystem.getProductName(),
                 sProductVersion = oLogonSystem.getProductVersion(),
                 sSystemName = oLogonSystem.getSystemName(),
@@ -194,7 +198,7 @@ sap.ui.define([
             };
             var sDeviceType = this._getDeviceType(),
                 bTouchSupported = this._isTouchSupported(),
-                oUser = sap.ushell.Container.getUser(),
+                oUser = Container.getUser(),
                 sTheme = oUser.getTheme(),
                 bOptimizedForTouchInput = oUser.getContentDensity() === "cozy";
 

package/src/main/js/sap/ushell/ui/footerbar/AboutDialog.fragment.xml

@@ -23,7 +23,7 @@
                 labelSpanL="12"
                 labelSpanXL="12">
                 <form:title>
-                    <core:Title text="{i18n>aboutCategoryApplication}" level="H3"></core:Title>
+                    <core:Title text="{i18n>aboutCategoryApplication}" level="H2"></core:Title>
                 </form:title>
                 <Label id="appInfoAppTitleLabel" visible="{= !!${AppInfo>/appTitle/label}}" text="{AppInfo>/appTitle/label}"/>
                 <Text id="appInfoAppTitleText" visible="{= !!${AppInfo>/appTitle/label}}" text="{AppInfo>/appTitle/text}"/>
@@ -55,7 +55,7 @@
                 labelSpanL="12"
                 labelSpanXL="12">
                 <form:title>
-                    <core:Title text="{i18n>aboutCategorySystem}" level="H3"></core:Title>
+                    <core:Title text="{i18n>aboutCategorySystem}" level="H2"></core:Title>
                 </form:title>
                 <Label id="sysInfoProductNameLabel" visible="{= !!${SysInfo>/productName/label}}" text="{SysInfo>/productName/label}"/>
                 <Text id="sysInfoProductNameText" visible="{= !!${SysInfo>/productName/label}}" text="{SysInfo>/productName/text}"/>
@@ -81,7 +81,7 @@
                 labelSpanL="12"
                 labelSpanXL="12">
                 <form:title>
-                    <core:Title text="{i18n>aboutCategoryUser}" level="H3"></core:Title>
+                    <core:Title text="{i18n>aboutCategoryUser}" level="H2"></core:Title>
                 </form:title>
                 <Label id="userEnvInfoDeviceTypeLabel" visible="{= !!${UserEnvInfo>/deviceType/label}}" text="{UserEnvInfo>/deviceType/label}"/>
                 <Text id="userEnvInfoDeviceTypeText" visible="{= !!${UserEnvInfo>/deviceType/label}}" text="{UserEnvInfo>/deviceType/text}"/>

package/src/main/js/sap/ushell/ui/footerbar/AddBookmarkButton.js

@@ -459,7 +459,7 @@ sap.ui.define([
         }
 
         if (!bValid) {
-            sap.ushell.Container.getServiceAsync("Message").then(function (oMessageService) {
+            sap.ushell.Container.getServiceAsync("MessageInternal").then(function (oMessageService) {
                 oMessageService.info(resources.i18n.getText("SaveAsTileDialog.MessageToast.ValidationFailed"));
             });
             return;
@@ -490,7 +490,7 @@ sap.ui.define([
         });
 
         Promise.all(aAddToPagePromises).then(function (aResults) {
-            sap.ushell.Container.getServiceAsync("Message").then(function (oMessageService) {
+            sap.ushell.Container.getServiceAsync("MessageInternal").then(function (oMessageService) {
                 var iSuccess = aResults.filter(function (oResult) {
                     return oResult.status === "resolved";
                 }).length;
@@ -522,7 +522,7 @@ sap.ui.define([
      * @private
      */
     AddBookmarkButton.prototype._showErrorDialog = function (failedBookmarks, nrOfSuccessfulBookmarks, bookmarkTitle) {
-        sap.ushell.Container.getServiceAsync("Message").then(function (oMessageService) {
+        sap.ushell.Container.getServiceAsync("MessageInternal").then(function (oMessageService) {
             var sErrorMessage;
             var sDetailMessage;
 
@@ -597,7 +597,7 @@ sap.ui.define([
 
         return Promise.all([
             sap.ushell.Container.getServiceAsync("BookmarkV2"),
-            sap.ushell.Container.getServiceAsync("Message")
+            sap.ushell.Container.getServiceAsync("MessageInternal")
         ]).then(function (aResult) {
             var oBookmarkService = aResult[0];
             var oMessageService = aResult[1];

package/src/main/js/sap/ushell/ui/footerbar/ContactSupportDialog.controller.js

@@ -5,13 +5,15 @@ sap.ui.define([
     "sap/ui/core/Fragment",
     "sap/ui/model/json/JSONModel",
     "sap/ushell/UserActivityLog",
-    "sap/ushell/resources"
+    "sap/ushell/resources",
+    "sap/ushell/Container"
 ], function (
     Controller,
     Fragment,
     JSONModel,
     UserActivityLog,
-    resources
+    resources,
+    Container
 ) {
     "use strict";
     const _sFragmentId = "contactSupportDialogFragment";
@@ -101,8 +103,8 @@ sap.ui.define([
             this._checkErrorState(oTextArea);
 
             if (sSubject && sText) {
-                const oSupportTicketService = await sap.ushell.Container.getServiceAsync("SupportTicket");
-                const oMessageService = await sap.ushell.Container.getServiceAsync("Message");
+                const oSupportTicketService = await Container.getServiceAsync("SupportTicket");
+                const oMessageService = await Container.getServiceAsync("MessageInternal");
                 try {
                     await oSupportTicketService.createTicket({ subject: sSubject, text: sText, clientContext: this.oClientContext });
                     oMessageService.info(resources.i18n.getText("supportTicketCreationSuccess"));

package/src/main/js/sap/ushell/ui/footerbar/JamDiscussButton.js

@@ -4,15 +4,18 @@
 sap.ui.define([
     "sap/base/Log",
     "sap/m/Button",
-    "sap/m/ButtonRenderer", // will load the renderer async
+    // will load the renderer async
+    "sap/m/ButtonRenderer",
     "sap/ui/core/Component",
-    "sap/ushell/resources"
+    "sap/ushell/resources",
+    "sap/ushell/Container"
 ], function (
     Log,
     Button,
     ButtonRenderer,
     Component,
-    resources
+    resources,
+    Container
 ) {
     "use strict";
 
@@ -83,7 +86,7 @@ sap.ui.define([
     };
 
     JamDiscussButton.prototype.setEnabled = function (bEnabled) {
-        if (!sap.ushell.Container) {
+        if (!Container) {
             if (this.getEnabled()) {
                 Log.warning(
                     "Disabling JamDiscussButton: unified shell container not initialized",
@@ -93,7 +96,7 @@ sap.ui.define([
             }
             bEnabled = false;
         } else {
-            var user = sap.ushell.Container.getUser();
+            var user = Container.getUser();
             if (!(user && user.isJamActive())) {
                 if (this.getEnabled()) {
                     Log.info(

package/src/main/js/sap/ushell/ui/footerbar/JamShareButton.js

@@ -8,7 +8,8 @@ sap.ui.define([
     "sap/m/ButtonRenderer", // will load the renderer async
     "sap/ui/core/Component",
     "sap/ushell/library", // css style dependency
-    "sap/ushell/resources"
+    "sap/ushell/resources",
+    "sap/ushell/Container"
 ], function (
     Log,
     Component,
@@ -16,7 +17,8 @@ sap.ui.define([
     ButtonRenderer,
     CoreComponent,
     ushellLibrary,
-    resources
+    resources,
+    Container
 ) {
     "use strict";
 
@@ -77,7 +79,7 @@ sap.ui.define([
             this.oShareComponentPromise = this._createShareComponent();
         }
 
-        if (sap.ushell.Container && sap.ushell.Container.inAppRuntime()) {
+        if (Container.inAppRuntime()) {
             this.adjustFLPUrl(this.getJamData())
                 .then(function () {
                     return this.oShareComponentPromise.then(function (oShareComponent) {
@@ -113,8 +115,8 @@ sap.ui.define([
     };
 
     JamShareButton.prototype.setEnabled = function (bEnabled) {
-        if (sap.ushell.Container) {
-            var oUser = sap.ushell.Container.getUser();
+        if (Container.isInitialized()) {
+            var oUser = Container.getUser();
             if (!(oUser && oUser.isJamActive())) {
                 if (!bEnabled) {
                     Log.info("Disabling JamShareButton: user not logged in or Jam not active", null,
@@ -146,7 +148,7 @@ sap.ui.define([
      */
     JamShareButton.prototype.adjustFLPUrl = function (jamData) {
         if (jamData && jamData.object && jamData.object.id && typeof jamData.object.id === "string" && jamData.object.id === document.URL) {
-            return sap.ushell.Container.getFLPUrl(true).then(function (sURL) {
+            return Container.getFLPUrl(true).then(function (sURL) {
                 jamData.object.id = sURL;
             });
         }

package/src/main/js/sap/ushell/ui/footerbar/LogoutButton.js

@@ -3,12 +3,14 @@
 // Provides control sap.ushell.ui.footerbar.LogoutButton.
 sap.ui.define([
     "sap/base/Log",
-    "sap/m/ButtonRenderer", // will load the renderer async
+    // will load the renderer async
+    "sap/m/ButtonRenderer",
     "sap/m/MessageBox",
     "sap/ui/core/ElementMetadata",
     "sap/ushell/resources",
     "sap/ushell/ui/launchpad/ActionItem",
-    "sap/ushell/ui/launchpad/LoadingDialog"
+    "sap/ushell/ui/launchpad/LoadingDialog",
+    "sap/ushell/Container"
 ], function (
     Log,
     ButtonRenderer,
@@ -16,7 +18,8 @@ sap.ui.define([
     ElementMetadata,
     resources,
     ActionItem,
-    LoadingDialog
+    LoadingDialog,
+    Container
 ) {
     "use strict";
 
@@ -62,7 +65,7 @@ sap.ui.define([
             bIsLoadingScreenShown = false,
             oLoading = new LoadingDialog({ text: "" });
 
-        sap.ushell.Container.getGlobalDirty().done(function (dirtyState) {
+        Container.getGlobalDirty().done(function (dirtyState) {
             bShowLoadingScreen = false;
             if (bIsLoadingScreenShown === true) {
                 oLoading.exit();
@@ -72,7 +75,7 @@ sap.ui.define([
             var oResourceBundle = resources.i18n,
                 oLogoutDetails;
 
-            if (dirtyState === sap.ushell.Container.DirtyState.DIRTY) {
+            if (dirtyState === Container.DirtyState.DIRTY) {
                 // show warning only if it is sure that there are unsaved changes
                 oLogoutDetails = {
                     message: oResourceBundle.getText("unsaved_data_warning_popup_message"),
@@ -94,7 +97,7 @@ sap.ui.define([
                     if (oAction === Action.OK) {
                         oLoading.openLoadingScreen();
                         oLoading.showAppInfo(resources.i18n.getText("beforeLogoutMsg"), null);
-                        sap.ushell.Container.logout();
+                        Container.logout();
                     }
                 }, ElementMetadata.uid("confirm"));
         });
@@ -106,7 +109,7 @@ sap.ui.define([
     };
 
     LogoutButton.prototype.setEnabled = function (bEnabled) {
-        if (!sap.ushell.Container) {
+        if (!Container.isInitialized()) {
             if (this.getEnabled()) {
                 Log.warning(
                     "Disabling 'Logout' button: unified shell container not initialized",

package/src/main/js/sap/ushell/ui/footerbar/SaveAsTile.controller.js

@@ -8,13 +8,15 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ushell/resources",
     "sap/ui/core/library",
-    "sap/ui/thirdparty/hasher"
+    "sap/ui/thirdparty/hasher",
+    "sap/ushell/Container"
 ], function (
     Controller,
     Log,
     resources,
     coreLibrary,
-    hasher
+    hasher,
+    Container
 ) {
     "use strict";
 
@@ -45,7 +47,7 @@ sap.ui.define([
          */
         loadPersonalizedGroups: function () {
             // Determine targets for bookmark placement
-            return sap.ushell.Container.getServiceAsync("FlpLaunchPage")
+            return Container.getServiceAsync("FlpLaunchPage")
                 .then(function (LaunchPageService) {
                     return new Promise(function (resolve, reject) {
                         LaunchPageService.getGroupsForBookmarks()

package/src/main/js/sap/ushell/ui/footerbar/SendAsEmailButton.js

@@ -7,14 +7,16 @@ sap.ui.define([
     "sap/m/ButtonRenderer",
     "sap/m/library",
     "sap/ushell/Config",
-    "sap/ushell/resources"
+    "sap/ushell/resources",
+    "sap/ushell/Container"
 ], function (
     Log,
     Button,
     ButtonRenderer,
     mobileLibrary,
     Config,
-    resources
+    resources,
+    Container
 ) {
     "use strict";
 
@@ -69,7 +71,7 @@ sap.ui.define([
      */
     SendAsEmailButton.prototype.sendAsEmailPressed = function (fnCallback) {
         // If we're running over an IFrame...
-        if (sap.ushell.Container.inAppRuntime()) {
+        if (Container.inAppRuntime()) {
             // DO NOT CHANGE the line below, this is to optimize the bundle build process
             sap.ui.require(["sap/ushell/appRuntime/ui5/AppRuntimeService"], function (AppRuntimeService) {
                 AppRuntimeService.sendMessageToOuterShell(
@@ -82,7 +84,7 @@ sap.ui.define([
             var sSubject = (sAppName === undefined) ?
                 resources.i18n.getText("linkToApplication") :
                 resources.i18n.getText("linkTo") + " '" + sAppName + "'";
-            sap.ushell.Container.getServiceAsync("AppState")
+            Container.getServiceAsync("AppState")
                 .then(function (oAppStateService) {
                     oAppStateService.setAppStateToPublic(sURL)
                         .done(function (sNewURL) {

package/src/main/js/sap/ushell/ui/launchpad/CatalogEntryContainer.js

@@ -3,15 +3,18 @@
 sap.ui.define([
     "sap/base/Log",
     "sap/ui/core/Control",
-    "sap/ushell/library", // css style dependency
+    // css style dependency
+    "sap/ushell/library",
     "sap/ushell/resources",
-    "sap/ushell/ui/launchpad/TileContainerUtils"
+    "sap/ushell/ui/launchpad/TileContainerUtils",
+    "sap/ushell/Container"
 ], function (
     Log,
     Control,
     ushellLibrary,
     resources,
-    TileContainerUtils
+    TileContainerUtils,
+    Container
 ) {
     "use strict";
 
@@ -167,7 +170,7 @@ sap.ui.define([
                 }
             }
 
-            sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchpageService) {
+            Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchpageService) {
                 oLaunchpageService.getCatalogTileViewControl(elementToDisplay.getProperty("src")).done(
                     function (catalogTileView) {
                         elementToDisplay.getModel().setProperty(elementToDisplay.getPath() + "/content", [catalogTileView]);

package/src/main/js/sap/ushell/ui/launchpad/ExtendedChangeDetection.js

@@ -7,7 +7,7 @@
  * of recreating them. Items which get removed from the aggregation get destroyed and items which get added to the
  * aggregation get created.
  *
- * @version 1.124.1
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/ui/base/ManagedObject",

package/src/main/js/sap/ushell/ui/launchpad/Section.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Provides control sap.ushell.ui.launchpad.Section
  *
- * @version 1.124.1
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/ui/launchpad/TileContainer.js

@@ -11,11 +11,15 @@ sap.ui.define([
     "sap/ui/core/EventBus",
     "sap/ui/core/Icon",
     "sap/ushell/override",
-    "sap/ushell/library", // css style dependency
+    // css style dependency
+    "sap/ushell/library",
     "sap/ushell/resources",
     "sap/ushell/ui/launchpad/PlusTile",
     "sap/ushell/utils",
-    "sap/ushell/ui/launchpad/TileContainerRenderer"
+    "sap/ushell/ui/launchpad/TileContainerRenderer",
+    "sap/ushell/Container",
+    /* jQuery Plugin "selectText"*/
+    "sap/ui/dom/jquery/selectText"
 ], function (
     Log,
     Input,
@@ -30,7 +34,8 @@ sap.ui.define([
     resources,
     PlusTile,
     utils,
-    TileContainerRenderer
+    TileContainerRenderer,
+    Container
 ) {
     "use strict";
 
@@ -192,6 +197,7 @@ sap.ui.define([
             onAfterRendering: function () {
                 var $Ref = this.oEditInputField.$("inner");
                 $Ref.focus();
+                // jQuery Plugin "selectText"
                 $Ref.selectText(0, $Ref.val().length);
 
                 var oEditInputFieldDomRef = this.oEditInputField.getDomRef();
@@ -201,13 +207,11 @@ sap.ui.define([
             }.bind(this)
         }).addStyleClass("sapUshellTileContainerTitleInput");
 
-        if (sap.ushell.Container) {
-            sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
-                if (oLaunchPageService.isLinkPersonalizationSupported()) {
-                    TileContainer.prototype.isLinkPersonalizationOveride();
-                }
-            });
-        }
+        Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
+            if (oLaunchPageService.isLinkPersonalizationSupported()) {
+                TileContainer.prototype.isLinkPersonalizationOveride();
+            }
+        });
 
         this.fnTitleTextClickHandler = this._titleTextClickHandler.bind(this);
     };

package/src/main/js/sap/ushell/ui/launchpad/ViewPortState.js

@@ -5,7 +5,7 @@ sap.ui.define(function () {
     /**
      * @name sap.ushell.ui.launchpad.ViewPortState
      * @private
-     * @deprecated Since version 1.120.0. The ViewPortState is related to Fiori2 and not used anymore.
+     * @deprecated since 1.120.0. The ViewPortState is related to Fiori2 and not used anymore.
      */
 
 }, /* bExport= */ false);

package/src/main/js/sap/ushell/ui/launchpad/VizInstance.js

@@ -520,13 +520,16 @@ sap.ui.define([
 
         // If oContent is a component container that does not have any aggregated objects,
         // return the first Generic Tile or Card in the component itself
-        if (this._oComponent && this._oComponent.findAggregatedObjects) {
-            aPossibleControls = this._oComponent.findAggregatedObjects(true, function (oControl) {
-                return oControl.isA("sap.m.GenericTile") || oControl.isA("sap.f.Card") || oControl.isA("sap.m.SlideTile");
-            });
+        if (oContent.isA("sap.ui.core.ComponentContainer")) {
+            const oComponent = oContent.getComponentInstance();
+            if (oComponent?.findAggregatedObjects) {
+                aPossibleControls = oComponent.findAggregatedObjects(true, function (oControl) {
+                    return oControl.isA("sap.m.GenericTile") || oControl.isA("sap.f.Card") || oControl.isA("sap.m.SlideTile");
+                });
 
-            if (aPossibleControls.length) {
-                return aPossibleControls[0].getFocusDomRef();
+                if (aPossibleControls.length) {
+                    return aPossibleControls[0].getFocusDomRef();
+                }
             }
         }
 
@@ -546,7 +549,7 @@ sap.ui.define([
                 scope: "Display",
                 action: "Press"
             });
-        } else if (this._oRemoveIconVBox && this._oRemoveIconVBox.getDomRef().contains(oEvent.target)) {
+        } else if (this._oRemoveIconVBox && this._oRemoveIconVBox.getDomRef && this._oRemoveIconVBox.getDomRef() && this._oRemoveIconVBox.getDomRef().contains(oEvent.target)) {
             this.firePress({
                 scope: "Actions",
                 action: "Remove"

package/src/main/js/sap/ushell/ui/launchpad/VizInstanceAbap.js

@@ -6,8 +6,9 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ushell/library",
     "sap/ushell/utils/chipsUtils",
-    "sap/ushell/ui/launchpad/VizInstanceRenderer"
-], function (VizInstance, mobileLibrary, Log, ushellLibrary, chipsUtils, VizInstanceRenderer) {
+    "sap/ushell/ui/launchpad/VizInstanceRenderer",
+    "sap/ushell/Container"
+], function (VizInstance, mobileLibrary, Log, ushellLibrary, chipsUtils, VizInstanceRenderer, Container) {
     "use strict";
 
     // shortcut for sap.m.LoadState
@@ -35,7 +36,7 @@ sap.ui.define([
     VizInstanceAbap.prototype.init = function () {
         VizInstance.prototype.init.apply(this, arguments);
 
-        this._oChipInstancePromise = sap.ushell.Container.getServiceAsync("PageBuilding")
+        this._oChipInstancePromise = Container.getServiceAsync("PageBuilding")
             .then(function (oPageBuildingService) {
                 var oFactory = oPageBuildingService.getFactory();