@sapui5/sap.ushell 1.124.1 → 1.125.0

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.124.1
+ * @version 1.125.0
  * @private
  */
 sap.ui.define([
@@ -63,7 +63,7 @@ sap.ui.define([
     "use strict";
 
     // shortcut for sap.ushell.ContentNodeType
-    var ContentNodeType = ushellLibrary.ContentNodeType;
+    const ContentNodeType = ushellLibrary.ContentNodeType;
 
     const SAP_API_PREFIX = "sap.ushell.";
 
@@ -1047,18 +1047,30 @@ sap.ui.define([
                 },
                 getSystemAlias: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        let sSystemAlias = oServiceParams.oContainer.getSystemAlias();
-                        if (sSystemAlias === null || sSystemAlias === undefined) {
-                            sSystemAlias = "";
-                        } else {
-                            const iUnderscoreCount = (sSystemAlias.match(/_/g) || []).length;
-                            if (iUnderscoreCount >= 2) {
-                                const iSecondUnderscoreIndex = sSystemAlias.indexOf("_", sSystemAlias.indexOf("_") + 1);
-                                sSystemAlias = sSystemAlias.substring(iSecondUnderscoreIndex + 1);
+                        const oAppTargetResolution = oServiceParams.oContainer.getCurrentAppTargetResolution();
+                        const sFullSystemAlias = oAppTargetResolution.systemAlias;
+                        const sContentProviderId = oAppTargetResolution.contentProviderId;
+
+                        if (sContentProviderId) {
+                            if (!sFullSystemAlias.includes(sContentProviderId)) {
+                                Log.error("Unexpected format for systemAlias: missing contentProviderId.");
+                                return sFullSystemAlias;
+                            }
+
+                            const sSystemAliasSuffix = sFullSystemAlias.replace(sContentProviderId, "");
+
+                            if (sSystemAliasSuffix.length === 0) {
+                                return sSystemAliasSuffix;
+                            }
+
+                            if (sSystemAliasSuffix[0] !== "_") {
+                                Log.error("Unexpected format for systemAlias: missing underscore delimiter.");
+                                return sSystemAliasSuffix;
                             }
-                        }
 
-                        return sSystemAlias;
+                            return sSystemAliasSuffix.replace("_", "");
+                        }
+                        return sFullSystemAlias;
                     }
                 },
                 setNewAppInfo: {
@@ -1246,6 +1258,21 @@ sap.ui.define([
                 }
             }
         },
+        "sap.ushell.services.UserDefaultParameters": {
+            oServiceCalls: {
+                getValue: {
+                    executeServiceCallFn: async (oServiceParams) => {
+                        const { sParameterName } = oServiceParams.oMessageData.body;
+                        const [AppLifeCycle, UserDefaultParameters] = await Promise.all([
+                            Container.getServiceAsync("AppLifeCycle"),
+                            Container.getServiceAsync("UserDefaultParameters")
+                        ]);
+                        const oSystemContext = await AppLifeCycle.getCurrentApplication().getSystemContext();
+                        return UserDefaultParameters.getValue(sParameterName, oSystemContext);
+                    }
+                }
+            }
+        },
         "sap.ushell.services.ShellNavigation": {
             oServiceCalls: {
                 toExternal: {
@@ -1410,54 +1437,112 @@ sap.ui.define([
             oServiceCalls: {
                 addHeaderItem: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        addRendererButton("addHeaderItem", oServiceParams);
+                        const { sId, sTooltip, sIcon, iFloatingNumber, bVisible, bCurrentState, aStates } = oServiceParams.oMessageData.body;
+                        const FrameBoundExtension = await Container.getServiceAsync("FrameBoundExtension");
+
+                        const oItem = await FrameBoundExtension.createHeaderItem({
+                            id: sId,
+                            tooltip: sTooltip,
+                            icon: sIcon,
+                            floatingNumber: iFloatingNumber,
+                            press: async function () {
+                                const [ PostMessageUtils ] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"]);
+
+                                PostMessageUtils.postMessageToIframeApp(
+                                    oServiceParams.oContainer,
+                                    "sap.ushell.appRuntime",
+                                    "buttonClick",
+                                    { buttonId: sId }
+                                );
+                            }
+                        }, {
+                            position: "begin"
+                        });
+
+                        storeItem(sId, oItem);
+                        applyItemVisibility(oItem, bVisible, bCurrentState, aStates);
                     }
                 },
 
                 addHeaderEndItem: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        addRendererButton("addHeaderEndItem", oServiceParams);
+                        const { sId, sTooltip, sIcon, iFloatingNumber, bVisible, bCurrentState, aStates } = oServiceParams.oMessageData.body;
+                        const FrameBoundExtension = await Container.getServiceAsync("FrameBoundExtension");
+
+                        const oItem = await FrameBoundExtension.createHeaderItem({
+                            id: sId,
+                            tooltip: sTooltip,
+                            icon: sIcon,
+                            floatingNumber: iFloatingNumber,
+                            press: async function () {
+                                const [ PostMessageUtils ] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"]);
+
+                                PostMessageUtils.postMessageToIframeApp(
+                                    oServiceParams.oContainer,
+                                    "sap.ushell.appRuntime",
+                                    "buttonClick",
+                                    { buttonId: sId }
+                                );
+                            }
+                        }, {
+                            position: "end"
+                        });
+
+                        storeItem(sId, oItem);
+                        applyItemVisibility(oItem, bVisible, bCurrentState, aStates);
                     }
                 },
 
                 showHeaderItem: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        const { aIds, bCurrentState, aStates } = oServiceParams.oMessageData.body;
-                        const oRenderer = Container.getRendererInternal("fiori2");
+                        const { aIds: vIds, bCurrentState, aStates } = oServiceParams.oMessageData.body;
+
+                        const aIds = Array.isArray(vIds) ? vIds : [vIds];
 
-                        oRenderer.showHeaderItem(aIds, !!bCurrentState, aStates);
+                        visitItems(aIds, (oItem) => {
+                            applyItemVisibility(oItem, true, bCurrentState, aStates);
+                        });
                     }
                 },
                 showHeaderEndItem: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        const { aIds, bCurrentState, aStates } = oServiceParams.oMessageData.body;
-                        const oRenderer = Container.getRendererInternal("fiori2");
+                        const { aIds: vIds, bCurrentState, aStates } = oServiceParams.oMessageData.body;
 
-                        oRenderer.showHeaderEndItem(aIds, !!bCurrentState, aStates);
+                        const aIds = Array.isArray(vIds) ? vIds : [vIds];
+
+                        visitItems(aIds, (oItem) => {
+                            applyItemVisibility(oItem, true, bCurrentState, aStates);
+                        });
                     }
                 },
                 hideHeaderItem: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        const { aIds, bCurrentState, aStates } = oServiceParams.oMessageData.body;
-                        const oRenderer = Container.getRendererInternal("fiori2");
+                        const { aIds: vIds, bCurrentState, aStates } = oServiceParams.oMessageData.body;
+
+                        const aIds = Array.isArray(vIds) ? vIds : [vIds];
 
-                        oRenderer.hideHeaderItem(aIds, !!bCurrentState, aStates);
+                        visitItems(aIds, (oItem) => {
+                            applyItemVisibility(oItem, false, bCurrentState, aStates);
+                        });
                     }
                 },
                 hideHeaderEndItem: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        const { aIds, bCurrentState, aStates } = oServiceParams.oMessageData.body;
-                        const oRenderer = Container.getRendererInternal("fiori2");
+                        const { aIds: vIds, bCurrentState, aStates } = oServiceParams.oMessageData.body;
+
+                        const aIds = Array.isArray(vIds) ? vIds : [vIds];
 
-                        oRenderer.hideHeaderEndItem(aIds, !!bCurrentState, aStates);
+                        visitItems(aIds, (oItem) => {
+                            applyItemVisibility(oItem, false, bCurrentState, aStates);
+                        });
                     }
                 },
-                setHeaderTitle: {
+                setHeaderTitle: { // secondTitle
                     executeServiceCallFn: async (oServiceParams) => {
                         const { sTitle } = oServiceParams.oMessageData.body;
-                        const oRenderer = Container.getRendererInternal("fiori2");
+                        const Extension = await Container.getServiceAsync("Extension");
 
-                        oRenderer.setHeaderTitle(sTitle);
+                        Extension.setSecondTitle(sTitle);
                     }
                 },
                 setHeaderVisibility: {
@@ -1481,59 +1566,67 @@ sap.ui.define([
                                 { buttonId: params.id }
                             );
                         };
-                        /*eslint-disable no-new*/
+                        // eslint-disable-next-line no-new
                         new ShellHeadItem(params);
-                        /*eslint-enable no-new*/
                     }
                 },
                 showActionButton: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        const { aIds, bCurrentState, aStates } = oServiceParams.oMessageData.body;
-                        const oRenderer = Container.getRendererInternal("fiori2");
+                        const { aIds: vIds, bCurrentState, aStates } = oServiceParams.oMessageData.body;
+
+                        const aIds = Array.isArray(vIds) ? vIds : [vIds];
 
-                        oRenderer.showActionButton(aIds, !!bCurrentState, aStates);
+                        visitItems(aIds, (oItem) => {
+                            applyItemVisibility(oItem, true, bCurrentState, aStates);
+                        });
                     }
                 },
                 hideActionButton: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        const { aIds, bCurrentState, aStates } = oServiceParams.oMessageData.body;
-                        const oRenderer = Container.getRendererInternal("fiori2");
+                        const { aIds: vIds, bCurrentState, aStates } = oServiceParams.oMessageData.body;
+
+                        const aIds = Array.isArray(vIds) ? vIds : [vIds];
 
-                        oRenderer.hideActionButton(aIds, !!bCurrentState, aStates);
+                        visitItems(aIds, (oItem) => {
+                            applyItemVisibility(oItem, true, bCurrentState, aStates);
+                        });
                     }
                 },
                 addUserAction: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        const { oParameters } = oServiceParams.oMessageData.body;
-                        const oRenderer = Container.getRendererInternal("fiori2");
+                        const { controlType, oControlProperties, bIsVisible, bCurrentState, aStates } = oServiceParams.oMessageData.body.oParameters;
+                        const Extension = await Container.getServiceAsync("Extension");
 
-                        oParameters.oControlProperties.press = async function () {
+                        oControlProperties.press = async function () {
                             const [ PostMessageUtils ] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"]);
 
                             PostMessageUtils.postMessageToIframeApp(
                                 oServiceParams.oContainer,
                                 "sap.ushell.appRuntime",
                                 "buttonClick",
-                                { buttonId: oParameters.oControlProperties.id }
+                                { buttonId: oControlProperties.id }
                             );
                         };
-                        oRenderer.addUserAction(oParameters);
+
+                        const oItem = await Extension.createUserAction(oControlProperties, {
+                            controlType
+                        });
+
+                        storeItem(oControlProperties.id, oItem);
+                        applyItemVisibility(oItem, bIsVisible, bCurrentState, aStates);
                     }
                 },
                 addOptionsActionSheetButton: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        let aButtons = oServiceParams.oMessageData.body;
-                        if (!Array.isArray(aButtons)) {
-                            aButtons = [aButtons];
-                        }
-                        const oRenderer = Container.getRendererInternal("fiori2");
+                        const vButtons = oServiceParams.oMessageData.body;
+                        const Extension = await Container.getServiceAsync("Extension");
 
-                        aButtons.forEach((oButton) => {
-                            const oControl = Element.getElementById(oButton.id);
-                            if (oControl) {
-                                oControl.destroy();
-                            }
-                            /*eslint-disable no-new*/
+                        const aButtons = Array.isArray(vButtons) ? vButtons : [vButtons];
+
+                        aButtons.forEach(async (oButton) => {
+                            destroyControl(oButton.id);
+
+                            // eslint-disable-next-line no-new
                             new Button({
                                 id: oButton.id,
                                 text: oButton.text,
@@ -1550,42 +1643,59 @@ sap.ui.define([
                                     );
                                 }
                             });
-                            /*eslint-enable no-new*/
-                            oRenderer.showActionButton([oButton.id], true, oButton.aStates);
+
+                            const oItem = await Extension.createUserAction(oButton, {
+                                id: oButton.id
+                            });
+
+                            storeItem(oButton.id, oItem);
+                            applyItemVisibility(oItem, true, true, oButton.aStates);
                         });
                     }
                 },
                 removeOptionsActionSheetButton: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        let aButtons = oServiceParams.oMessageData.body;
-                        if (!Array.isArray(aButtons)) {
-                            aButtons = [aButtons];
-                        }
-                        const oRenderer = Container.getRendererInternal("fiori2");
+                        const vButtons = oServiceParams.oMessageData.body;
+
+                        const aButtons = Array.isArray(vButtons) ? vButtons : [vButtons];
 
                         aButtons.forEach((oButton) => {
-                            oRenderer.hideActionButton(oButton.id, true, oButton.aStates);
-                            const oControl = Element.getElementById(oButton.id);
-                            if (oControl) {
-                                oControl.destroy();
+                            const oItem = getItem(oButton.id);
+                            if (oItem) {
+                                applyItemVisibility(oItem, true, true, oButton.aStates);
+
+                                return destroyControl(oButton.id);
                             }
+                            Log.warning(`User action with id ${oButton.id} not found`);
                         });
                     }
                 },
                 updateHeaderItem: {
                     executeServiceCallFn: async (oServiceParams) => {
                         const { sId, oControlProperties } = oServiceParams.oMessageData.body;
-                        const oRenderer = Container.getRendererInternal("fiori2");
 
-                        oRenderer.updateHeaderItem(sId, oControlProperties);
+                        // we only support update of floatingNumber
+                        if (!Object.hasOwn(oControlProperties, "floatingNumber")) {
+                            return;
+                        }
+
+                        const oItem = getItem(sId);
+
+                        if (oItem?.getControl) {
+                            const oControl = await oItem.getControl();
+                            oControl?.setFloatingNumber?.(oControlProperties.floatingNumber);
+                        }
                     }
                 },
                 destroyButton: {
                     executeServiceCallFn: async (oServiceParams) => {
-                        const { aIds } = oServiceParams.oMessageData.body;
-                        const oRenderer = Container.getRendererInternal("fiori2");
+                        const { aIds: vIds } = oServiceParams.oMessageData.body;
 
-                        oRenderer.destroyButton(aIds);
+                        const aIds = Array.isArray(vIds) ? vIds : [vIds];
+
+                        aIds.forEach((sId) => {
+                            destroyControl(sId);
+                        });
                     }
                 }
             }
@@ -1721,6 +1831,14 @@ sap.ui.define([
                             oItem.hideOnHome();
                         }
                     }
+                },
+                setSecondTitle: {
+                    executeServiceCallFn: async (oServiceParams) => {
+                        const { title } = oServiceParams.oMessageData.body;
+                        const Extension = await Container.getServiceAsync("Extension");
+
+                        return Extension.setSecondTitle(title);
+                    }
                 }
             }
         },
@@ -2028,34 +2146,52 @@ sap.ui.define([
     }
 
     /**
+     * Destroys a control by its ID.
+     * Does nothing if the control does not exist.
+     * @param {string} sControlId The ID of the control.
+     *
+     * @since 1.125.0
+     * @private
+     */
+    function destroyControl (sControlId) {
+        const oControl = Element.getElementById(sControlId);
+        if (oControl?.destroy) {
+            oControl.destroy();
+        }
+    }
+
+    /**
+     * Applies the visibility of an item according to the fiori2 renderer logic.
+     * @param {sap.ushell.services.Extension.Item|sap.ushell.services.FrameBoundExtension.Item} oItem The extension item.
+     * @param {boolean} bVisible The visibility for the item.
+     * @param {boolean} bCurrentState Wether the visibility applies to the current state.
+     * @param {sap.ushell.renderer.Renderer.LaunchpadState[]} aStates The desired launchpad states.
+     *
+     * @since 1.125.0
      * @private
      */
-    function addRendererButton (sAPI, oServiceParams) {
-        const { sId, sTooltip, sIcon, iFloatingNumber, bVisible, bCurrentState, aStates } = oServiceParams.oMessageData.body;
-        const oRenderer = Container.getRendererInternal("fiori2");
-
-        oRenderer[sAPI](
-            "sap.ushell.ui.shell.ShellHeadItem",
-            {
-                id: sId,
-                tooltip: sTooltip,
-                icon: sIcon,
-                floatingNumber: iFloatingNumber,
-                press: async function () {
-                    const [ PostMessageUtils ] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"]);
-
-                    PostMessageUtils.postMessageToIframeApp(
-                        oServiceParams.oContainer,
-                        "sap.ushell.appRuntime",
-                        "buttonClick",
-                        { buttonId: sId }
-                    );
+    function applyItemVisibility (oItem, bVisible, bCurrentState, aStates) {
+        /* eslint-disable no-unused-expressions */
+        if (bCurrentState) {
+            bVisible ? oItem.showForCurrentApp() : oItem.hideForCurrentApp();
+        } else {
+            bVisible ? oItem.hideForCurrentApp() : oItem.showForCurrentApp();
+
+            // aStates is only evaluated if bCurrentState is false
+            if (Array.isArray(aStates)) {
+                if (aStates.includes("app")) {
+                    bVisible ? oItem.showForAllApps() : oItem.hideForAllApps();
+                } else {
+                    bVisible ? oItem.hideForAllApps() : oItem.showForAllApps();
                 }
-            },
-            bVisible,
-            !!bCurrentState,
-            aStates
-        );
+                if (aStates.includes("home")) {
+                    bVisible ? oItem.showOnHome() : oItem.hideOnHome();
+                } else {
+                    bVisible ? oItem.hideOnHome() : oItem.showOnHome();
+                }
+            }
+        }
+        /* eslint-enable no-unused-expressions */
     }
 
     const oItemMap = {};
@@ -2065,6 +2201,7 @@ sap.ui.define([
      * @returns {string} A unique ID.
      *
      * @see sap.ushell.services.Extension.Item
+     * @see sap.ushell.services.FrameBoundExtension.Item
      *
      * @since 1.124.0
      * @private
@@ -2085,6 +2222,7 @@ sap.ui.define([
      * @param {object} oItem The item object.
      *
      * @see sap.ushell.services.Extension.Item
+     * @see sap.ushell.services.FrameBoundExtension.Item
      *
      * @since 1.124.0
      * @private
@@ -2099,6 +2237,7 @@ sap.ui.define([
      * @returns {object} The item object.
      *
      * @see sap.ushell.services.Extension.Item
+     * @see sap.ushell.services.FrameBoundExtension.Item
      *
      * @since 1.124.0
      * @private
@@ -2112,6 +2251,7 @@ sap.ui.define([
      * @param {string} sItemId The ID of the item.
      *
      * @see sap.ushell.services.Extension.Item
+     * @see sap.ushell.services.FrameBoundExtension.Item
      *
      * @since 1.124.0
      * @private
@@ -2120,6 +2260,26 @@ sap.ui.define([
         delete oItemMap[sItemId];
     }
 
+    /**
+     * Visits each item by its ID and calls a callback function.
+     * Ignores items that are not found.
+     * @param {string[]} aIds The ids of the items to visit
+     * @param {function} fnCallback The callback function to call for each item
+     *
+     * @since 1.125.0
+     * @private
+     */
+    function visitItems (aIds, fnCallback) {
+        aIds.forEach((sId) => {
+            const oItem = getItem(sId);
+            if (oItem) {
+                fnCallback(oItem);
+            } else {
+                Log.warning(`Item with id ${sId} not found`);
+            }
+        });
+    }
+
     /**
      * @private
      */

package/src/main/js/sap/ushell/components/applicationIntegration/configuration/AppMeta.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.124.1
+ * @version 1.125.0
  */
 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.124.1
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

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.124.1
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

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.124.1
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -65,7 +65,8 @@ sap.ui.define([
                     default: "app"
                 },
                 TR: {
-                    headerless: "headerless",
+                    // real headerless doesn't work for WebGUI apps: W/o a back button, WebGUI apps aren't usable.
+                    headerless: "minimal",
                     default: "app"
                 },
                 default: {

package/src/main/js/sap/ushell/components/cards/Card.controller.js

@@ -6,14 +6,16 @@ sap.ui.define([
     "sap/ushell/resources",
     "sap/ui/core/mvc/Controller",
     "sap/ui/model/json/JSONModel",
-    "sap/ui/core/mvc/XMLView"
+    "sap/ui/core/mvc/XMLView",
+    "sap/ushell/Container"
 ], function (
     utils,
     manifestPropertyHelper,
     resources,
     Controller,
     JSONModel,
-    XMLView
+    XMLView,
+    Container
 ) {
     "use strict";
 
@@ -50,7 +52,7 @@ sap.ui.define([
             } else if (sCardTileConfiguration) {
                 oCardTileConfiguration = JSON.parse(sCardTileConfiguration);
 
-                sap.ushell.Container.getServiceAsync("Navigation").then(function (oNavigation) {
+                Container.getServiceAsync("Navigation").then(function (oNavigation) {
                     oNavigation.navigate({
                         target: {
                             semanticObject: oCardTileConfiguration.navigation_semantic_object,

package/src/main/js/sap/ushell/components/cepsearchresult/app/Main.controller.js

@@ -14,8 +14,9 @@ sap.ui.define([
   "sap/m/MenuItem",
   "sap/ushell/ui/footerbar/AddBookmarkButton",
   "sap/f/GridContainerItemLayoutData",
-  "sap/ushell/EventHub"
-], function (Controller, Core, JSONModel, Edition, mLib, Menu, MenuItem, AddBookmarkButton, GridContainerItemLayoutData, EventHub) {
+  "sap/ushell/EventHub",
+  "sap/ushell/Container"
+], function (Controller, Core, JSONModel, Edition, mLib, Menu, MenuItem, AddBookmarkButton, GridContainerItemLayoutData, EventHub, Container) {
 
   "use strict";
   var URLHelper = mLib.URLHelper;
@@ -34,11 +35,10 @@ sap.ui.define([
       this.applyPersonalization();
       this.getView().setVisible(false);
       this.changeEdition(Edition.getEditionName());
-      if (sap.ushell.Container && sap.ushell.Container.getRendererInternal) {
-        var oShellRenderer = sap.ushell.Container.getRendererInternal();
-        if (oShellRenderer && oShellRenderer.getRouter && oShellRenderer.getRouter()) {
-          oShellRenderer.getRouter().getRoute("wzsearch").attachMatched(this.onRouteMatched.bind(this));
-        }
+
+      var oShellRenderer = Container.getRendererInternal();
+      if (oShellRenderer && oShellRenderer.getRouter && oShellRenderer.getRouter()) {
+        oShellRenderer.getRouter().getRoute("wzsearch").attachMatched(this.onRouteMatched.bind(this));
       }
     },
 
@@ -108,19 +108,14 @@ sap.ui.define([
     getPersonalization: function (sKey, vDefault) {
       //personalization service missing
       var sValue;
-      if (sap.ushell.Container) {
-        sValue = localStorage.getItem("sap.ushell.components.cepsearchresult.app-" + sKey);
-        return Promise.resolve(sValue !== undefined ? sValue : vDefault);
-      }
+
       sValue = localStorage.getItem("sap.ushell.components.cepsearchresult.app-" + sKey);
       return Promise.resolve(sValue !== undefined ? sValue : vDefault);
     },
 
     setPersonalization: function (sKey, vValue) {
       //personalization service missing
-      if (sap.ushell.Container) {
-        localStorage.setItem("sap.ushell.components.cepsearchresult.app-" + sKey, vValue + "");
-      }
+
       localStorage.setItem("sap.ushell.components.cepsearchresult.app-" + sKey, vValue + "");
     },