@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/appIntegration/PostMessageManager/ServiceHandler.js

@@ -43,46 +43,6 @@ sap.ui.define([
     let oExtensionItems;
     const oDummyComponent = new UIComponent();
 
-    async function createNewInnerAppState (oMessageBody) {
-        const { sData } = oMessageBody;
-        let oValue;
-
-        if (sData !== undefined) {
-            try {
-                oValue = JSON.parse(sData);
-            } catch (e) {
-                oValue = sData;
-            }
-        } else {
-            oValue = "";
-        }
-
-        const AppState = await Container.getServiceAsync("AppState");
-        const oNewAppState = AppState.createEmptyAppState();
-
-        oNewAppState.setData(oValue);
-        oNewAppState.save();
-        const sNewAppStateKey = oNewAppState.getKey();
-
-        let sHash = hasher.getHash();
-        if (sHash.indexOf("&/") > 0) {
-            if (sHash.indexOf("sap-iapp-state=") > 0) {
-                const sCurrAppStateKey = /(?:sap-iapp-state=)([^&/]+)/.exec(sHash)[1];
-                sHash = sHash.replace(sCurrAppStateKey, sNewAppStateKey);
-            } else {
-                sHash = `${sHash}/sap-iapp-state=${sNewAppStateKey}`;
-            }
-        } else {
-            sHash = `${sHash}&/sap-iapp-state=${sNewAppStateKey}`;
-        }
-
-        hasher.disableBlueBoxHashChangeTrigger = true;
-        hasher.replaceHash(sHash);
-        hasher.disableBlueBoxHashChangeTrigger = false;
-
-        return sNewAppStateKey;
-    }
-
     /**
      * Helper function for removing the service URL of dynamic bookmark tiles
      * if the bookmark is created from a local service provider
@@ -119,6 +79,8 @@ sap.ui.define([
      * @private
      */
     function destroyControl (sControlId) {
+        oExtensionItems.removeItem(sControlId);
+
         const oControl = Element.getElementById(sControlId);
         if (oControl?.destroy) {
             oControl.destroy();
@@ -137,7 +99,7 @@ sap.ui.define([
         "sap.ushell.services.Navigation.backToPreviousApp": {
             async handler (oMessageBody, oMessageEvent) {
                 const Navigation = await Container.getServiceAsync("Navigation");
-                return Navigation.backToPreviousApp();
+                await Navigation.backToPreviousApp();
             }
         },
         "sap.ushell.services.Navigation.historyBack": {
@@ -145,7 +107,7 @@ sap.ui.define([
                 const { iSteps } = oMessageBody;
                 const Navigation = await Container.getServiceAsync("Navigation");
 
-                return Navigation.historyBack(iSteps);
+                Navigation.historyBack(iSteps);
             }
         },
         "sap.ushell.services.Navigation.isInitialNavigation": {
@@ -162,7 +124,7 @@ sap.ui.define([
                 const oTargetClone = deepExtend({}, oTarget);
                 ushellUtils.storeSapSystemToLocalStorage(oTargetClone);
 
-                return Navigation.navigate(oTargetClone);
+                await Navigation.navigate(oTargetClone);
             }
         },
         "sap.ushell.services.Navigation.getPrimaryIntent": {
@@ -219,7 +181,7 @@ sap.ui.define([
                 const { sUrl } = oMessageBody;
                 const Navigation = await Container.getServiceAsync("Navigation");
 
-                return Navigation.isUrlSupported(sUrl);
+                await Navigation.isUrlSupported(sUrl);
             }
         },
         "sap.ushell.services.CrossApplicationNavigation.hrefForExternal": {
@@ -234,14 +196,14 @@ sap.ui.define([
             async handler (oMessageBody, oMessageEvent) {
                 // beware sSemanticObject may also be an array of argument arrays
                 // {sSemanticObject, mParameters, bIgnoreFormFactors }
-                const { sSemanticObject, mParameters, bIgnoreFormFactors, bCompactIntents } = oMessageBody;
+                const { sSemanticObject, mParameters, bIgnoreFormFactors, sAppStateKey, bCompactIntents } = oMessageBody;
 
                 return navigationCompatibility.getSemanticObjectLinks(
                     sSemanticObject,
                     mParameters,
                     bIgnoreFormFactors,
-                    undefined,
-                    undefined,
+                    undefined, // oComponent
+                    sAppStateKey,
                     bCompactIntents
                 );
             }
@@ -275,14 +237,6 @@ sap.ui.define([
                 return Navigation.historyBack(iSteps);
             }
         },
-        "sap.ushell.services.CrossApplicationNavigation.getAppStateData": {
-            async handler (oMessageBody, oMessageEvent) {
-                // note: sAppStateKey may be an array of argument arrays
-                const { sAppStateKey: vAppStateKey } = oMessageBody;
-
-                return navigationCompatibility.getAppStateData(vAppStateKey);
-            }
-        },
         "sap.ushell.services.CrossApplicationNavigation.toExternal": {
             async handler (oMessageBody, oMessageEvent) {
                 const { oArgs } = oMessageBody;
@@ -291,12 +245,17 @@ sap.ui.define([
                 const oArgsClone = deepExtend({}, oArgs);
                 ushellUtils.storeSapSystemToLocalStorage(oArgsClone);
 
-                return Navigation.navigate(oArgsClone);
+                await Navigation.navigate(oArgsClone);
             }
         },
         "sap.ushell.services.CrossApplicationNavigation.registerBeforeAppCloseEvent": {
             async handler (oMessageBody, oApplicationContainer, oMessageEvent) {
                 const oParams = oMessageBody;
+
+                oApplicationContainer.addCapabilities([
+                    "sap.ushell.services.CrossApplicationNavigation.beforeAppCloseEvent"
+                ]);
+
                 oApplicationContainer.setBeforeAppCloseEvent({
                     enabled: true,
                     params: oParams
@@ -343,7 +302,9 @@ sap.ui.define([
                 const { sAppHash } = oMessageBody;
                 const Navigation = await Container.getServiceAsync("Navigation");
 
-                return Navigation.getHref(sAppHash);
+                return Navigation.getHref({
+                    appSpecificRoute: sAppHash
+                });
             }
         },
         "sap.ushell.services.CrossApplicationNavigation.isInitialNavigation": {
@@ -363,6 +324,55 @@ sap.ui.define([
                 return oAppState;
             }
         },
+        "sap.ushell.services.CrossApplicationNavigation.getAppStateData": {
+            async handler (oMessageBody, oMessageEvent) {
+                // note: sAppStateKey may be an array of argument arrays
+                const { sAppStateKey: vAppStateKey } = oMessageBody;
+
+                return navigationCompatibility.getAppStateData(vAppStateKey);
+            }
+        },
+        "sap.ushell.services.CrossApplicationNavigation.setInnerAppStateData": {
+            handler: async (oMessageBody) => {
+                const { sData } = oMessageBody;
+                let oValue;
+
+                if (sData !== undefined) {
+                    try {
+                        oValue = JSON.parse(sData);
+                    } catch (e) {
+                        oValue = sData;
+                    }
+                } else {
+                    oValue = {};
+                }
+
+                const AppState = await Container.getServiceAsync("AppState");
+                const oNewAppState = AppState.createEmptyAppState();
+
+                oNewAppState.setData(oValue);
+                await ushellUtils.promisify(oNewAppState.save());
+                const sNewAppStateKey = oNewAppState.getKey();
+
+                let sHash = hasher.getHash();
+                if (sHash.indexOf("&/") > 0) {
+                    if (sHash.indexOf("sap-iapp-state=") > 0) {
+                        const sCurrAppStateKey = /(?:sap-iapp-state=)([^&/]+)/.exec(sHash)[1];
+                        sHash = sHash.replace(sCurrAppStateKey, sNewAppStateKey);
+                    } else {
+                        sHash = `${sHash}/sap-iapp-state=${sNewAppStateKey}`;
+                    }
+                } else {
+                    sHash = `${sHash}&/sap-iapp-state=${sNewAppStateKey}`;
+                }
+
+                hasher.disableBlueBoxHashChangeTrigger = true;
+                hasher.replaceHash(sHash);
+                hasher.disableBlueBoxHashChangeTrigger = false;
+
+                return sNewAppStateKey;
+            }
+        },
         "sap.ushell.services.CrossApplicationNavigation.setInnerAppRoute": {
             async handler (oMessageBody, oMessageEvent) {
                 const { appSpecificRoute, writeHistory } = oMessageBody;
@@ -384,11 +394,6 @@ sap.ui.define([
                 hasher.disableBlueBoxHashChangeTrigger = false;
             }
         },
-        "sap.ushell.services.CrossApplicationNavigation.setInnerAppStateData": {
-            handler: (oMessageBody) => {
-                return createNewInnerAppState(oMessageBody);
-            }
-        },
         "sap.ushell.services.CrossApplicationNavigation.resolveIntent": {
             async handler (oMessageBody, oMessageEvent) {
                 const { sHashFragment } = oMessageBody;
@@ -423,16 +428,7 @@ sap.ui.define([
                     iPersistencyMethod,
                     oPersistencySettings
                 );
-                return ushellUtils.promisify(oDeferred);
-            }
-        },
-        "sap.ushell.services.AppState._loadAppState": {
-            async handler (oMessageBody, oMessageEvent) {
-                const { sKey } = oMessageBody;
-                const AppState = await Container.getServiceAsync("AppState");
-
-                const oDeferred = AppState._loadAppState(sKey);
-                return ushellUtils.promisify(oDeferred);
+                await ushellUtils.promisify(oDeferred);
             }
         },
         "sap.ushell.services.AppState.deleteAppState": {
@@ -441,7 +437,7 @@ sap.ui.define([
                 const AppState = await Container.getServiceAsync("AppState");
 
                 const oDeferred = AppState.deleteAppState(sKey);
-                return ushellUtils.promisify(oDeferred);
+                await ushellUtils.promisify(oDeferred);
             }
         },
         "sap.ushell.services.AppState.makeStatePersistent": {
@@ -463,7 +459,7 @@ sap.ui.define([
 
                 const BookmarkV2 = await Container.getServiceAsync("BookmarkV2");
 
-                return BookmarkV2.addBookmark(oParameters, vContainer, oSystemContext.id);
+                await BookmarkV2.addBookmark(oParameters, vContainer, oSystemContext.id);
             }
         },
         // Bookmark@addBookmarkByGroupId is mapped to sap.ushell.services.Bookmark.addBookmark
@@ -475,9 +471,14 @@ sap.ui.define([
                  */ // eslint-disable-next-line no-constant-condition
                 if (true) {
                     const { oParameters, groupId } = oMessageBody;
+
+                    const AppLifeCycle = await Container.getServiceAsync("AppLifeCycle");
+                    const oSystemContext = await AppLifeCycle.getCurrentApplication().getSystemContext();
+
                     const BookmarkV2 = await Container.getServiceAsync("BookmarkV2");
 
-                    return BookmarkV2.addBookmarkByGroupId(oParameters, groupId);
+                    await BookmarkV2.addBookmarkByGroupId(oParameters, groupId, oSystemContext.id);
+                    return;
                 }
 
                 throw new Error("Bookmark.addBookmarkByGroupId is deprecated. Please use BookmarkV2.addBookmark instead.");
@@ -509,7 +510,8 @@ sap.ui.define([
                     const Bookmark = await Container.getServiceAsync("Bookmark");
 
                     const oDeferred = Bookmark.addCatalogTileToGroup(sCatalogTileId, sGroupId, oCatalogData);
-                    return ushellUtils.promisify(oDeferred);
+                    await ushellUtils.promisify(oDeferred);
+                    return;
                 }
 
                 throw new Error("Bookmark.addCatalogTileToGroup is deprecated. Please use BookmarkV2.addBookmark instead.");
@@ -567,7 +569,7 @@ sap.ui.define([
 
                 const BookmarkV2 = await Container.getServiceAsync("BookmarkV2");
 
-                return BookmarkV2.addCustomBookmark(sVizType, oConfig, vContentNodes, oSystemContext.id);
+                await BookmarkV2.addCustomBookmark(sVizType, oConfig, vContentNodes, oSystemContext.id);
             }
         },
         "sap.ushell.services.Bookmark.countCustomBookmarks": {
@@ -618,7 +620,7 @@ sap.ui.define([
 
                 const BookmarkV2 = await Container.getServiceAsync("BookmarkV2");
 
-                return BookmarkV2.addBookmarkToPage(oParameters, sPageId, oSystemContext.id);
+                await BookmarkV2.addBookmarkToPage(oParameters, sPageId, oSystemContext.id);
             }
         },
         "sap.ushell.services.BookmarkV2.addBookmarkUI5": {
@@ -643,9 +645,14 @@ sap.ui.define([
                  */ // eslint-disable-next-line no-constant-condition
                 if (true) {
                     const { oParameters, groupId } = oMessageBody;
+
+                    const AppLifeCycle = await Container.getServiceAsync("AppLifeCycle");
+                    const oSystemContext = await AppLifeCycle.getCurrentApplication().getSystemContext();
+
                     const BookmarkV2 = await Container.getServiceAsync("BookmarkV2");
 
-                    return BookmarkV2.addBookmarkByGroupId(oParameters, groupId);
+                    await BookmarkV2.addBookmarkByGroupId(oParameters, groupId, oSystemContext.id);
+                    return;
                 }
 
                 throw new Error("BookmarkV2.addBookmarkByGroupId is deprecated. Please use BookmarkV2.addBookmark instead.");
@@ -717,7 +724,7 @@ sap.ui.define([
 
                 const BookmarkV2 = await Container.getServiceAsync("BookmarkV2");
 
-                return BookmarkV2.addCustomBookmark(sVizType, oConfig, vContentNodes, oSystemContext.id);
+                await BookmarkV2.addCustomBookmark(sVizType, oConfig, vContentNodes, oSystemContext.id);
             }
         },
         "sap.ushell.services.BookmarkV2.countCustomBookmarks": {
@@ -768,7 +775,7 @@ sap.ui.define([
 
                 const BookmarkV2 = await Container.getServiceAsync("BookmarkV2");
 
-                return BookmarkV2.addBookmarkToPage(oParameters, sPageId, oSystemContext.id);
+                await BookmarkV2.addBookmarkToPage(oParameters, sPageId, oSystemContext.id);
             }
         },
         "sap.ushell.services.UserInfo.getThemeList": {
@@ -800,16 +807,18 @@ sap.ui.define([
             async handler (oMessageBody, oMessageEvent) {
                 const { language } = oMessageBody;
 
-                if (language) {
-                    const oUser = Container.getUser();
-                    oUser.setLanguage(language);
-                    const UserInfo = await Container.getServiceAsync("UserInfo");
+                if (!language) {
+                    return;
+                }
 
-                    const oDeferred = UserInfo.updateUserPreferences();
-                    await ushellUtils.promisify(oDeferred);
+                const oUser = Container.getUser();
+                oUser.setLanguage(language);
+                const UserInfo = await Container.getServiceAsync("UserInfo");
 
-                    oUser.resetChangedProperty("language");
-                }
+                const oDeferred = UserInfo.updateUserPreferences();
+                await ushellUtils.promisify(oDeferred);
+
+                oUser.resetChangedProperty("language");
             }
         },
         "sap.ushell.services.UserInfo.openThemeManager": {
@@ -997,7 +1006,7 @@ sap.ui.define([
         },
         "sap.ushell.services.Renderer.addHeaderItem": {
             async handler (oMessageBody, oApplicationContainer, oMessageEvent) {
-                const { sId, sTooltip, sIcon, iFloatingNumber, bVisible, bCurrentState, aStates } = oMessageBody;
+                const { sId, sTooltip, sIcon, iFloatingNumber, bVisible } = oMessageBody;
                 const FrameBoundExtension = await Container.getServiceAsync("FrameBoundExtension");
 
                 const oItem = await FrameBoundExtension.createHeaderItem({
@@ -1019,15 +1028,54 @@ sap.ui.define([
                 });
 
                 oExtensionItems.storeItem(sId, oItem);
-                oExtensionItems.applyItemVisibility(oItem, bVisible, bCurrentState, aStates);
+                oExtensionItems.applyItemVisibility(oItem, bVisible);
             },
             options: {
                 provideApplicationContext: true
             }
         },
+        "sap.ushell.services.Renderer.showHeaderItem": {
+            async handler (oMessageBody, oMessageEvent) {
+                const { aIds: vIds } = oMessageBody;
+
+                const aIds = Array.isArray(vIds) ? vIds : [vIds];
+
+                oExtensionItems.visitItems(aIds, (oItem) => {
+                    oExtensionItems.applyItemVisibility(oItem, true);
+                });
+            }
+        },
+        "sap.ushell.services.Renderer.hideHeaderItem": {
+            async handler (oMessageBody, oMessageEvent) {
+                const { aIds: vIds } = oMessageBody;
+
+                const aIds = Array.isArray(vIds) ? vIds : [vIds];
+
+                oExtensionItems.visitItems(aIds, (oItem) => {
+                    oExtensionItems.applyItemVisibility(oItem, false);
+                });
+            }
+        },
+        "sap.ushell.services.Renderer.updateHeaderItem": {
+            async handler (oMessageBody, oMessageEvent) {
+                const { sId, oControlProperties } = oMessageBody;
+
+                // we only support update of floatingNumber
+                if (!Object.hasOwn(oControlProperties, "floatingNumber")) {
+                    return;
+                }
+
+                const oItem = oExtensionItems.getItem(sId);
+
+                if (oItem?.getControl) {
+                    const oControl = await oItem.getControl();
+                    oControl?.setFloatingNumber?.(oControlProperties.floatingNumber);
+                }
+            }
+        },
         "sap.ushell.services.Renderer.addHeaderEndItem": {
             async handler (oMessageBody, oApplicationContainer, oMessageEvent) {
-                const { sId, sTooltip, sIcon, iFloatingNumber, bVisible, bCurrentState, aStates } = oMessageBody;
+                const { sId, sTooltip, sIcon, iFloatingNumber, bVisible } = oMessageBody;
                 const FrameBoundExtension = await Container.getServiceAsync("FrameBoundExtension");
 
                 const oItem = await FrameBoundExtension.createHeaderItem({
@@ -1049,89 +1097,55 @@ sap.ui.define([
                 });
 
                 oExtensionItems.storeItem(sId, oItem);
-                oExtensionItems.applyItemVisibility(oItem, bVisible, bCurrentState, aStates);
+                oExtensionItems.applyItemVisibility(oItem, bVisible);
             },
             options: {
                 provideApplicationContext: true
             }
         },
-        "sap.ushell.services.Renderer.showHeaderItem": {
-            async handler (oMessageBody, oMessageEvent) {
-                const { aIds: vIds, bCurrentState, aStates } = oMessageBody;
-
-                const aIds = Array.isArray(vIds) ? vIds : [vIds];
-
-                oExtensionItems.visitItems(aIds, (oItem) => {
-                    oExtensionItems.applyItemVisibility(oItem, true, bCurrentState, aStates);
-                });
-            }
-        },
         "sap.ushell.services.Renderer.showHeaderEndItem": {
             async handler (oMessageBody, oMessageEvent) {
-                const { aIds: vIds, bCurrentState, aStates } = oMessageBody;
-
-                const aIds = Array.isArray(vIds) ? vIds : [vIds];
-
-                oExtensionItems.visitItems(aIds, (oItem) => {
-                    oExtensionItems.applyItemVisibility(oItem, true, bCurrentState, aStates);
-                });
-            }
-        },
-        "sap.ushell.services.Renderer.hideHeaderItem": {
-            async handler (oMessageBody, oMessageEvent) {
-                const { aIds: vIds, bCurrentState, aStates } = oMessageBody;
+                const { aIds: vIds } = oMessageBody;
 
                 const aIds = Array.isArray(vIds) ? vIds : [vIds];
 
                 oExtensionItems.visitItems(aIds, (oItem) => {
-                    oExtensionItems.applyItemVisibility(oItem, false, bCurrentState, aStates);
+                    oExtensionItems.applyItemVisibility(oItem, true);
                 });
             }
         },
         "sap.ushell.services.Renderer.hideHeaderEndItem": {
             async handler (oMessageBody, oMessageEvent) {
-                const { aIds: vIds, bCurrentState, aStates } = oMessageBody;
+                const { aIds: vIds } = oMessageBody;
 
                 const aIds = Array.isArray(vIds) ? vIds : [vIds];
 
                 oExtensionItems.visitItems(aIds, (oItem) => {
-                    oExtensionItems.applyItemVisibility(oItem, false, bCurrentState, aStates);
+                    oExtensionItems.applyItemVisibility(oItem, false);
                 });
             }
         },
-        "sap.ushell.services.Renderer.setHeaderTitle": { // secondTitle
-            async handler (oMessageBody, oMessageEvent) {
-                const { sTitle } = oMessageBody;
-                const Extension = await Container.getServiceAsync("Extension");
-
-                Extension.setSecondTitle(sTitle);
-            }
-        },
-        "sap.ushell.services.Renderer.setHeaderVisibility": {
-            async handler (oMessageBody, oMessageEvent) {
-                const { bVisible, bCurrentState, aStates } = oMessageBody;
-                const oRenderer = Container.getRendererInternal("fiori2");
-
-                oRenderer.setHeaderVisibility(bVisible, !!bCurrentState, aStates);
-            }
-        },
-        "sap.ushell.services.Renderer.createShellHeadItem": {
+        "sap.ushell.services.Renderer.addUserAction": {
             async handler (oMessageBody, oApplicationContainer, oMessageEvent) {
-                const { params } = oMessageBody;
-                params.press = async function () {
+                const { controlType, oControlProperties, bIsVisible } = oMessageBody.oParameters;
+                const FrameBoundExtension = await Container.getServiceAsync("FrameBoundExtension");
+
+                oControlProperties.press = async function () {
                     PostMessageManager.sendRequest(
                         "sap.ushell.appRuntime.buttonClick",
-                        { buttonId: params.id },
+                        { buttonId: oControlProperties.id },
                         oApplicationContainer.getPostMessageTarget(),
                         oApplicationContainer.getPostMessageTargetOrigin(),
                         false // bWaitForResponse
                     );
                 };
 
-                const [ShellHeadItem] = await ushellUtils.requireAsync(["sap/ushell/ui/shell/ShellHeadItem"]);
+                const oItem = await FrameBoundExtension.createUserAction(oControlProperties, {
+                    controlType
+                });
 
-                // eslint-disable-next-line no-new
-                new ShellHeadItem(params);
+                oExtensionItems.storeItem(oControlProperties.id, oItem);
+                oExtensionItems.applyItemVisibility(oItem, bIsVisible);
             },
             options: {
                 provideApplicationContext: true
@@ -1139,57 +1153,31 @@ sap.ui.define([
         },
         "sap.ushell.services.Renderer.showActionButton": {
             async handler (oMessageBody, oMessageEvent) {
-                const { aIds: vIds, bCurrentState, aStates } = oMessageBody;
+                const { aIds: vIds } = oMessageBody;
 
                 const aIds = Array.isArray(vIds) ? vIds : [vIds];
 
                 oExtensionItems.visitItems(aIds, (oItem) => {
-                    oExtensionItems.applyItemVisibility(oItem, true, bCurrentState, aStates);
+                    oExtensionItems.applyItemVisibility(oItem, true);
                 });
             }
         },
         "sap.ushell.services.Renderer.hideActionButton": {
             async handler (oMessageBody, oMessageEvent) {
-                const { aIds: vIds, bCurrentState, aStates } = oMessageBody;
+                const { aIds: vIds } = oMessageBody;
 
                 const aIds = Array.isArray(vIds) ? vIds : [vIds];
 
                 oExtensionItems.visitItems(aIds, (oItem) => {
-                    oExtensionItems.applyItemVisibility(oItem, false, bCurrentState, aStates);
+                    oExtensionItems.applyItemVisibility(oItem, false);
                 });
             }
         },
-        "sap.ushell.services.Renderer.addUserAction": {
-            async handler (oMessageBody, oApplicationContainer, oMessageEvent) {
-                const { controlType, oControlProperties, bIsVisible, bCurrentState, aStates } = oMessageBody.oParameters;
-                const Extension = await Container.getServiceAsync("Extension");
-
-                oControlProperties.press = async function () {
-                    PostMessageManager.sendRequest(
-                        "sap.ushell.appRuntime.buttonClick",
-                        { buttonId: oControlProperties.id },
-                        oApplicationContainer.getPostMessageTarget(),
-                        oApplicationContainer.getPostMessageTargetOrigin(),
-                        false // bWaitForResponse
-                    );
-                };
-
-                const oItem = await Extension.createUserAction(oControlProperties, {
-                    controlType
-                });
-
-                oExtensionItems.storeItem(oControlProperties.id, oItem);
-                oExtensionItems.applyItemVisibility(oItem, bIsVisible, bCurrentState, aStates);
-            },
-            options: {
-                provideApplicationContext: true
-            }
-        },
         "sap.ushell.services.Renderer.addOptionsActionSheetButton": {
             async handler (oMessageBody, oApplicationContainer, oMessageEvent) {
                 const vButtons = oMessageBody;
                 const [Button] = await ushellUtils.requireAsync(["sap/m/Button"]);
-                const Extension = await Container.getServiceAsync("Extension");
+                const FrameBoundExtension = await Container.getServiceAsync("FrameBoundExtension");
 
                 const aButtons = Array.isArray(vButtons) ? vButtons : [vButtons];
 
@@ -1213,12 +1201,12 @@ sap.ui.define([
                         }
                     });
 
-                    const oItem = await Extension.createUserAction({
+                    const oItem = await FrameBoundExtension.createUserAction({
                         id: oButton.id
                     });
 
                     oExtensionItems.storeItem(oButton.id, oItem);
-                    oExtensionItems.applyItemVisibility(oItem, true, true, oButton.aStates);
+                    oExtensionItems.applyItemVisibility(oItem, true);
                 });
             },
             options: {
@@ -1233,30 +1221,14 @@ sap.ui.define([
 
                 aButtons.forEach((oButton) => {
                     const oItem = oExtensionItems.getItem(oButton.id);
-                    if (oItem) {
-                        oExtensionItems.applyItemVisibility(oItem, false, true, oButton.aStates);
-
-                        return destroyControl(oButton.id);
+                    if (!oItem) {
+                        Log.warning(`User action with id ${oButton.id} not found`);
+                        return;
                     }
-                    Log.warning(`User action with id ${oButton.id} not found`);
-                });
-            }
-        },
-        "sap.ushell.services.Renderer.updateHeaderItem": {
-            async handler (oMessageBody, oMessageEvent) {
-                const { sId, oControlProperties } = oMessageBody;
 
-                // we only support update of floatingNumber
-                if (!Object.hasOwn(oControlProperties, "floatingNumber")) {
-                    return;
-                }
-
-                const oItem = oExtensionItems.getItem(sId);
-
-                if (oItem?.getControl) {
-                    const oControl = await oItem.getControl();
-                    oControl?.setFloatingNumber?.(oControlProperties.floatingNumber);
-                }
+                    oExtensionItems.applyItemVisibility(oItem, false);
+                    return destroyControl(oButton.id);
+                });
             }
         },
         "sap.ushell.services.Renderer.destroyButton": {
@@ -1270,6 +1242,44 @@ sap.ui.define([
                 });
             }
         },
+        "sap.ushell.services.Renderer.createShellHeadItem": {
+            async handler (oMessageBody, oApplicationContainer, oMessageEvent) {
+                const { params } = oMessageBody;
+                params.press = async function () {
+                    PostMessageManager.sendRequest(
+                        "sap.ushell.appRuntime.buttonClick",
+                        { buttonId: params.id },
+                        oApplicationContainer.getPostMessageTarget(),
+                        oApplicationContainer.getPostMessageTargetOrigin(),
+                        false // bWaitForResponse
+                    );
+                };
+
+                const [ShellHeadItem] = await ushellUtils.requireAsync(["sap/ushell/ui/shell/ShellHeadItem"]);
+
+                // eslint-disable-next-line no-new
+                new ShellHeadItem(params);
+            },
+            options: {
+                provideApplicationContext: true
+            }
+        },
+        "sap.ushell.services.Renderer.setHeaderTitle": { // secondTitle
+            async handler (oMessageBody, oMessageEvent) {
+                const { sTitle } = oMessageBody;
+                const Extension = await Container.getServiceAsync("Extension");
+
+                Extension.setSecondTitle(sTitle);
+            }
+        },
+        "sap.ushell.services.Renderer.setHeaderVisibility": {
+            async handler (oMessageBody, oMessageEvent) {
+                const { bVisible, bCurrentState, aStates } = oMessageBody;
+                const oRenderer = Container.getRendererInternal("fiori2");
+
+                oRenderer.setHeaderVisibility(bVisible, !!bCurrentState, aStates);
+            }
+        },
         "sap.ushell.services.Extension.createHeaderItem": {
             async handler (oMessageBody, oApplicationContainer, oMessageEvent) {
                 const { controlProperties, events, parameters } = oMessageBody;
@@ -1339,10 +1349,13 @@ sap.ui.define([
                 const { itemId } = oMessageBody;
 
                 const oItem = oExtensionItems.getItem(itemId);
-                if (oItem?.destroy) {
-                    oItem.destroy();
-                    oExtensionItems.removeItem(itemId);
+                if (!oItem) {
+                    Log.error(`Extension item with id ${itemId} not found - cannot destroy it.`);
+                    return;
                 }
+
+                oExtensionItems.removeItem(itemId);
+                oItem.destroy();
             }
         },
         "sap.ushell.services.Extension.Item.showForCurrentApp": {
@@ -1350,9 +1363,12 @@ sap.ui.define([
                 const { itemId } = oMessageBody;
 
                 const oItem = oExtensionItems.getItem(itemId);
-                if (oItem?.showForCurrentApp) {
-                    oItem.showForCurrentApp();
+                if (!oItem) {
+                    Log.error(`Extension item with id ${itemId} not found - cannot update its visibility.`);
+                    return;
                 }
+
+                oItem.showForCurrentApp();
             }
         },
         "sap.ushell.services.Extension.Item.hideForCurrentApp": {
@@ -1360,9 +1376,12 @@ sap.ui.define([
                 const { itemId } = oMessageBody;
 
                 const oItem = oExtensionItems.getItem(itemId);
-                if (oItem?.hideForCurrentApp) {
-                    oItem.hideForCurrentApp();
+                if (!oItem) {
+                    Log.error(`Extension item with id ${itemId} not found - cannot update its visibility.`);
+                    return;
                 }
+
+                oItem.hideForCurrentApp();
             }
         },
         "sap.ushell.services.Extension.Item.showForAllApps": {
@@ -1370,9 +1389,12 @@ sap.ui.define([
                 const { itemId } = oMessageBody;
 
                 const oItem = oExtensionItems.getItem(itemId);
-                if (oItem?.showForAllApps) {
-                    oItem.showForAllApps();
+                if (!oItem) {
+                    Log.error(`Extension item with id ${itemId} not found - cannot update its visibility.`);
+                    return;
                 }
+
+                oItem.showForAllApps();
             }
         },
         "sap.ushell.services.Extension.Item.hideForAllApps": {
@@ -1380,9 +1402,12 @@ sap.ui.define([
                 const { itemId } = oMessageBody;
 
                 const oItem = oExtensionItems.getItem(itemId);
-                if (oItem?.hideForAllApps) {
-                    oItem.hideForAllApps();
+                if (!oItem) {
+                    Log.error(`Extension item with id ${itemId} not found - cannot update its visibility.`);
+                    return;
                 }
+
+                oItem.hideForAllApps();
             }
         },
         "sap.ushell.services.Extension.Item.showOnHome": {
@@ -1390,9 +1415,12 @@ sap.ui.define([
                 const { itemId } = oMessageBody;
 
                 const oItem = oExtensionItems.getItem(itemId);
-                if (oItem?.showOnHome) {
-                    oItem.showOnHome();
+                if (!oItem) {
+                    Log.error(`Extension item with id ${itemId} not found - cannot update its visibility.`);
+                    return;
                 }
+
+                oItem.showOnHome();
             }
         },
         "sap.ushell.services.Extension.Item.hideOnHome": {
@@ -1400,9 +1428,12 @@ sap.ui.define([
                 const { itemId } = oMessageBody;
 
                 const oItem = oExtensionItems.getItem(itemId);
-                if (oItem?.hideOnHome) {
-                    oItem.hideOnHome();
+                if (!oItem) {
+                    Log.error(`Extension item with id ${itemId} not found - cannot update its visibility.`);
+                    return;
                 }
+
+                oItem.hideOnHome();
             }
         },
         "sap.ushell.services.Extension.setSecondTitle": {
@@ -1433,7 +1464,7 @@ sap.ui.define([
             async handler (oMessageBody, oMessageEvent) {
                 const Menu = await Container.getServiceAsync("Menu");
 
-                const aContentNodes = Menu.getContentNodes([ContentNodeType.Space, ContentNodeType.Page]);
+                const aContentNodes = await Menu.getContentNodes([ContentNodeType.Space, ContentNodeType.Page]);
 
                 return aContentNodes.map(({ id: spaceId, label: spaceLabel, children }) => {
                     return {
@@ -1475,6 +1506,15 @@ sap.ui.define([
         "sap.ushell.services.ReferenceResolver.resolveReferences": {
             async handler (oMessageBody, oMessageEvent) {
                 const { aReferences } = oMessageBody;
+
+                /**
+                 * This API is for S/Cube only!
+                 *
+                 * For S/Cube references are resolved in the context of the outer shell.
+                 * Therefore, we resolve the references without a system context.
+                 * However, for regular cflp integrations we would need to resolve with a system context.
+                 */
+
                 const ReferenceResolver = await Container.getServiceAsync("ReferenceResolver");
 
                 return ReferenceResolver.resolveReferences(aReferences);
@@ -1493,6 +1533,9 @@ sap.ui.define([
         },
 
         // for testing,
-        stripBookmarkServiceUrlForLocalContentProvider
+        stripBookmarkServiceUrlForLocalContentProvider,
+        getExtensionItems () {
+            return oExtensionItems;
+        }
     };
 });