@sapui5/sap.ushell 1.131.1 → 1.132.1

package/src/main/js/sap/ushell/services/BookmarkV2.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bookmark service. Allows creating shortcuts on the user's home page.
  *
- * @version 1.131.1
+ * @version 1.132.1
  */
 sap.ui.define([
     "sap/ui/core/EventBus",
@@ -14,7 +14,7 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ushell/utils",
     "sap/ushell/Container"
-], function (
+], (
     EventBus,
     Config,
     ushellLibrary,
@@ -23,7 +23,7 @@ sap.ui.define([
     Log,
     ushellUtils,
     Container
-) {
+) => {
     "use strict";
 
     const sModuleName = "sap.ushell.services.BookmarkV2";
@@ -167,24 +167,23 @@ sap.ui.define([
          * @since 1.119.0
          * @private
          */
-        this._addBookmarkToContentNodes = function (oBookmarkParams, aContentNodes, bCustom, sContentProviderId) {
-            const aPromises = aContentNodes.map(function (oContentNode) {
+        this._addBookmarkToContentNodes = async function (oBookmarkParams, aContentNodes, bCustom, sContentProviderId) {
+            const aPromises = aContentNodes.map(async (oContentNode) => {
                 if (oContentNode && oContentNode.hasOwnProperty("type") && oContentNode.isContainer) {
                     if (oContentNode.type === ContentNodeType.Page) {
                         return this.addBookmarkToPage(oBookmarkParams, oContentNode.id, sContentProviderId);
                     }
                     // deprecated As of version 1.120
                     if (oContentNode.type === ContentNodeType.HomepageGroup) {
-                        return this._getLaunchPageService()
-                            .then((oLaunchPageService) => ushellUtils.promisify(oLaunchPageService.getGroupById(oContentNode.id)))
-                            .then(function (oGroup) {
-                                return this.addBookmarkToHomepageGroup(oBookmarkParams, oGroup, bCustom, sContentProviderId);
-                            }.bind(this));
+                        const LaunchPage = await this._getLaunchPageService();
+                        const oGroup = await ushellUtils.promisify(LaunchPage.getGroupById(oContentNode.id));
+
+                        return this.addBookmarkToHomepageGroup(oBookmarkParams, oGroup, bCustom, sContentProviderId);
                     }
-                    return Promise.reject("Bookmark Service: The API needs to be called with a valid content node type. '" + oContentNode.type + "' is not supported.");
+                    throw new Error(`Bookmark Service: The API needs to be called with a valid content node type. '${ oContentNode.type }' is not supported.`);
                 }
-                return Promise.reject("Bookmark Service: Not a valid content node.");
-            }.bind(this));
+                throw new Error("Bookmark Service: Not a valid content node.");
+            });
 
             return Promise.all(aPromises);
         };
@@ -213,48 +212,46 @@ sap.ui.define([
          * @since 1.119.0
          * @public
          */
-        this.addBookmark = function (oParameters, vContainer, sContentProviderId) {
+        this.addBookmark = async function (oParameters, vContainer, sContentProviderId) {
             const bEnablePersonalization = Config.last("/core/shell/enablePersonalization");
             const bEnableSpace = Config.last("/core/spaces/enabled");
             const bEnableMyHome = Config.last("/core/spaces/myHome/enabled");
 
             // Ignore call and do not complain if personalization is disabled
             if (!bEnablePersonalization && (!bEnableSpace || !bEnableMyHome)) {
-                return Promise.resolve();
+                return;
             }
 
-            return this._checkBookmarkParameters(oParameters)
-                .then(function () {
-                    // Check if no container was provided and we are in spaces mode.
-                    if (typeof vContainer === "undefined" && bEnableSpace) {
-                        return Container.getServiceAsync("Menu")
-                            .then((oMenuService) => oMenuService.getDefaultSpace())
-                            .then((oDefaultSpace) => {
-                                const oDefaultPage = oDefaultSpace && oDefaultSpace.children && oDefaultSpace.children[0];
-                                return oDefaultPage;
-                            })
-                            .then(function (oContentNode) {
-                                return this._addBookmarkToContentNodes(oParameters, [oContentNode], false, sContentProviderId);
-                            }.bind(this));
-                    }
+            try {
+                await this._checkBookmarkParameters(oParameters);
 
-                    /**
-                     * Check if an old Launchpad Group object was provided instead of a content node
-                     * @deprecated As of version 1.120
-                     */
-                    if ((typeof vContainer === "undefined" || !vContainer.hasOwnProperty("type")) && !Array.isArray(vContainer)) {
-                        return this.addBookmarkToHomepageGroup(oParameters, vContainer, false, sContentProviderId);
-                    }
+                const oBookmarkConfig = deepClone(oParameters, 20);
+                oBookmarkConfig.url = await this._changeUrlStatesToPersistent(oBookmarkConfig.url);
 
-                    // Make sure we always use an array of content nodes
-                    const aContentNodes = [].concat(vContainer);
+                // Check if no container was provided and we are in spaces mode.
+                if (typeof vContainer === "undefined" && bEnableSpace) {
+                    const Menu = await Container.getServiceAsync("Menu");
+                    const oDefaultSpace = await Menu.getDefaultSpace();
+                    const oDefaultPage = oDefaultSpace && oDefaultSpace.children && oDefaultSpace.children[0];
+                    return this._addBookmarkToContentNodes(oBookmarkConfig, [oDefaultPage], false, sContentProviderId);
+                }
 
-                    return this._addBookmarkToContentNodes(oParameters, aContentNodes, false, sContentProviderId);
-                }.bind(this))
-                .catch(function (vError) {
-                    Log.error("Error during Bookmark creation: ", vError, sModuleName);
-                    throw vError;
-                });
+                /**
+                 * Check if an old Launchpad Group object was provided instead of a content node
+                 * @deprecated As of version 1.120
+                 */
+                if ((typeof vContainer === "undefined" || !vContainer.hasOwnProperty("type")) && !Array.isArray(vContainer)) {
+                    return this.addBookmarkToHomepageGroup(oBookmarkConfig, vContainer, false, sContentProviderId);
+                }
+
+                // Make sure we always use an array of content nodes
+                const aContentNodes = [].concat(vContainer);
+
+                return this._addBookmarkToContentNodes(oBookmarkConfig, aContentNodes, false, sContentProviderId);
+            } catch (vError) {
+                Log.error("Error during Bookmark creation: ", vError, sModuleName);
+                throw vError;
+            }
         };
 
         /**
@@ -308,7 +305,7 @@ sap.ui.define([
          * @private
          * @ui5-restricted ssuite.smartbusiness
          */
-        this.addCustomBookmark = function (sVizType, oConfig, vContentNodes, sContentProviderId) {
+        this.addCustomBookmark = async function (sVizType, oConfig, vContentNodes, sContentProviderId) {
             const oClonedConfig = deepClone(oConfig);
             const oBookmarkConfig = deepExtend(oClonedConfig, {
                 vizType: sVizType,
@@ -325,6 +322,8 @@ sap.ui.define([
             delete oBookmarkConfig.chipConfig;
             delete oBookmarkConfig.loadManifest;
 
+            oBookmarkConfig.url = await this._changeUrlStatesToPersistent(oBookmarkConfig.url);
+
             // Make sure we always use an array of content nodes
             const aContentNodes = [].concat(vContentNodes);
 
@@ -378,7 +377,7 @@ sap.ui.define([
         this.addBookmarkToHomepageGroup = async function (oParameters, oGroup, bCustom, sContentProviderId) {
             // Reject if in launchpad spaces mode
             if (Config.last("/core/spaces/enabled")) {
-                return Promise.reject("Bookmark Service: The API is not available in spaces mode.");
+                throw new Error("Bookmark Service: The API is not available in spaces mode.");
             }
 
             // Delegate to launchpage service and publish event
@@ -416,10 +415,10 @@ sap.ui.define([
          * @since 1.119.0
          * @private
          */
-        this.addBookmarkToPage = function (oParameters, sPageId, sContentProviderId) {
+        this.addBookmarkToPage = async function (oParameters, sPageId, sContentProviderId) {
             // Reject of in launchpad home page mode
             if (!Config.last("/core/spaces/enabled")) {
-                return Promise.reject("Bookmark Service: 'addBookmarkToPage' is not valid in launchpad home page mode, use 'addBookmark' instead.");
+                throw new Error("Bookmark Service: 'addBookmarkToPage' is not valid in launchpad home page mode, use 'addBookmark' instead.");
             }
 
             // Reject if personalization is disabled
@@ -427,17 +426,16 @@ sap.ui.define([
             const bEnableMyHome = Config.last("/core/spaces/myHome/enabled");
             const sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
             if (!bEnablePersonalization && (!bEnableMyHome || (bEnableMyHome && sPageId !== sMyHomePageId))) {
-                return Promise.reject("Bookmark Service: Add bookmark is not allowed as the personalization functionality is not enabled.");
+                throw new Error("Bookmark Service: Add bookmark is not allowed as the personalization functionality is not enabled.");
             }
 
             if (oParameters && (typeof oParameters.title !== "string" || typeof oParameters.url !== "string")) {
-                return Promise.reject("Bookmark Service - Invalid bookmark data.");
+                throw new Error("Bookmark Service - Invalid bookmark data.");
             }
 
             // Delegate to pages service
-            return this._getPagesService().then((oPagesService) => {
-                return oPagesService.addBookmarkToPage(sPageId, oParameters, undefined, sContentProviderId);
-            });
+            const Pages = await this._getPagesService();
+            return Pages.addBookmarkToPage(sPageId, oParameters, undefined, sContentProviderId);
         };
 
         /**
@@ -464,19 +462,18 @@ sap.ui.define([
          * @deprecated As of version 1.120. Use {@link sap.ushell.services.BookmarkV2.addBookmark} instead.
          * @private
          */
-        this.addBookmarkByGroupId = function (oParameters, groupId, sContentProviderId) {
+        this.addBookmarkByGroupId = async function (oParameters, groupId, sContentProviderId) {
             // Reject if in launchpad spaces mode
             if (Config.last("/core/spaces/enabled")) {
                 const sError = "Bookmark Service: The API 'addBookmarkByGroupId' is not supported in launchpad spaces mode.";
-                return Promise.reject(sError);
+                throw new Error(sError);
             }
 
-            return this._getLaunchPageService()
-                .then((oLaunchPageService) => ushellUtils.promisify(oLaunchPageService.getGroups()))
-                .then(function (aGroups) {
-                    const oGroup = aGroups.find((entry) => entry.id === groupId) || null;
-                    return this.addBookmark(oParameters, oGroup, sContentProviderId);
-                }.bind(this));
+            const LaunchPage = await this._getLaunchPageService();
+            const aGroups = await ushellUtils.promisify(LaunchPage.getGroups());
+            const oGroup = aGroups.find((entry) => entry.id === groupId) || null;
+
+            return this.addBookmark(oParameters, oGroup, sContentProviderId);
         };
 
         /**
@@ -492,40 +489,22 @@ sap.ui.define([
          * @deprecated As of version 1.120. Use {@link sap.ushell.services.BookmarkV2.getContentNodes} instead.
          * @private
          */
-        this.getShellGroupIDs = function (bGetAll) {
+        this.getShellGroupIDs = async function (bGetAll) {
             // Reject if in launchpad spaces mode
             if (Config.last("/core/spaces/enabled")) {
                 const sError = "Bookmark Service: The API 'getShellGroupIDs' is not supported in launchpad spaces mode.";
-                return Promise.reject(sError);
+                throw new Error(sError);
             }
 
-            return this._getLaunchPageService()
-                .then((oLaunchPageService) => {
-                    return ushellUtils.promisify(oLaunchPageService.getGroupsForBookmarks(bGetAll))
-                        .then((aGroups) => {
-                            aGroups = aGroups.map((group) => {
-                                return {
-                                    id: oLaunchPageService.getGroupId(group.object),
-                                    title: group.title
-                                };
-                            });
-                            return aGroups;
-                        });
-                });
-        };
-
-        this._isSameCatalogTile = function (sCatalogTileId, oCatalogTile, oLaunchPageService) {
-            const sIdWithPotentialSuffix = oLaunchPageService.getCatalogTileId(oCatalogTile);
-
-            if (sIdWithPotentialSuffix === undefined) {
-                // prevent to call undefined.indexOf.
-                // assumption is that undefined is not a valid ID, so it is not the same tile. Thus false is returned.
-                return false;
-            }
-            // getCatalogTileId appends the system alias of the catalog if present.
-            // This must be considered when comparing the IDs.
-            // see BCP 0020751295 0000142292 2017
-            return sIdWithPotentialSuffix.indexOf(sCatalogTileId) === 0;
+            const LaunchPage = await this._getLaunchPageService();
+            let aGroups = await ushellUtils.promisify(LaunchPage.getGroupsForBookmarks(bGetAll));
+            aGroups = aGroups.map((group) => {
+                return {
+                    id: LaunchPage.getGroupId(group.object),
+                    title: group.title
+                };
+            });
+            return aGroups;
         };
 
         /**
@@ -537,35 +516,30 @@ sap.ui.define([
          * @since 1.119.0
          * @private
          */
-        this._checkBookmarkParameters = function (oParameters) {
-            return Promise.resolve()
-                .then(function () {
-                    if (!oParameters) {
-                        throw new Error("Invalid Bookmark Data: No bookmark parameters passed.");
-                    }
-                    const oDataSource = oParameters.dataSource;
-                    let sODataVersion;
-                    if (oDataSource) {
-                        if (oDataSource.type !== "OData") {
-                            throw new Error("Invalid Bookmark Data: Unknown data source type: " + oDataSource.type);
-                        }
-
-                        sODataVersion = oDataSource.settings && oDataSource.settings.odataVersion;
-                        const aValidODataVersions = ["2.0", "4.0"];
-                        if (!aValidODataVersions.includes(sODataVersion)) {
-                            throw new Error("Invalid Bookmark Data: Unknown OData version in the data source: " + sODataVersion);
-                        }
-                    }
+        this._checkBookmarkParameters = async function (oParameters) {
+            if (!oParameters) {
+                throw new Error("Invalid Bookmark Data: No bookmark parameters passed.");
+            }
+            const oDataSource = oParameters.dataSource;
+            let sODataVersion;
+            if (oDataSource) {
+                if (oDataSource.type !== "OData") {
+                    throw new Error(`Invalid Bookmark Data: Unknown data source type: ${oDataSource.type}`);
+                }
 
-                    if (oParameters.serviceUrl) {
-                        return Container.getServiceAsync("ReferenceResolver")
-                            .then((oReferenceResolver) => {
-                                if (oReferenceResolver.hasSemanticDateRanges(oParameters.serviceUrl) && !oDataSource) {
-                                    throw new Error("Invalid Bookmark Data: Provide a data source to use semantic date ranges.");
-                                }
-                            });
-                    }
-                });
+                sODataVersion = oDataSource.settings && oDataSource.settings.odataVersion;
+                const aValidODataVersions = ["2.0", "4.0"];
+                if (!aValidODataVersions.includes(sODataVersion)) {
+                    throw new Error(`Invalid Bookmark Data: Unknown OData version in the data source: ${sODataVersion}`);
+                }
+            }
+
+            if (oParameters.serviceUrl) {
+                const ReferenceResolver = await Container.getServiceAsync("ReferenceResolver");
+                if (ReferenceResolver.hasSemanticDateRanges(oParameters.serviceUrl) && !oDataSource) {
+                    throw new Error("Invalid Bookmark Data: Provide a data source to use semantic date ranges.");
+                }
+            }
         };
 
         /**
@@ -589,17 +563,17 @@ sap.ui.define([
          * @since 1.119.0
          * @public
          */
-        this.countBookmarks = function (sUrl, sContentProviderId) {
+        this.countBookmarks = async function (sUrl, sContentProviderId) {
             /**
              * @deprecated As of version 1.120
              */
             if (!Config.last("/core/spaces/enabled")) {
-                return this._getLaunchPageService()
-                    .then((oLaunchPageService) => ushellUtils.promisify(oLaunchPageService.countBookmarks(sUrl, sContentProviderId)));
+                const LaunchPage = await this._getLaunchPageService();
+                return ushellUtils.promisify(LaunchPage.countBookmarks(sUrl, sContentProviderId));
             }
 
-            return this._getPagesService()
-                .then((oPagesService) => oPagesService.countBookmarks({ url: sUrl, contentProviderId: sContentProviderId }));
+            const Pages = await this._getPagesService();
+            return Pages.countBookmarks({ url: sUrl, contentProviderId: sContentProviderId });
         };
 
         /**
@@ -624,19 +598,21 @@ sap.ui.define([
          * @private
          * @ui5-restricted ssuite.smartbusiness
          */
-        this.countCustomBookmarks = function (oIdentifier) {
+        this.countCustomBookmarks = async function (oIdentifier) {
             if (!oIdentifier || !oIdentifier.url || !oIdentifier.vizType) {
-                return Promise.reject("countCustomBookmarks: required parameters are missing.");
+                throw new Error("countCustomBookmarks: required parameters are missing.");
             }
 
             /**
              * @deprecated As of version 1.120
              */
             if (!Config.last("/core/spaces/enabled")) {
-                return this._getLaunchPageService().then((LaunchPageService) => LaunchPageService.countCustomBookmarks(oIdentifier));
+                const LaunchPage = await this._getLaunchPageService();
+                return LaunchPage.countCustomBookmarks(oIdentifier);
             }
 
-            return this._getPagesService().then((oPagesService) => oPagesService.countBookmarks(oIdentifier));
+            const Pages = await this._getPagesService();
+            return Pages.countBookmarks(oIdentifier);
         };
 
         /**
@@ -657,21 +633,20 @@ sap.ui.define([
          * @since 1.119.0
          * @public
          */
-        this.deleteBookmarks = function (sUrl, sContentProviderId) {
+        this.deleteBookmarks = async function (sUrl, sContentProviderId) {
             /**
              * @deprecated As of version 1.120
              */
             if (!Config.last("/core/spaces/enabled")) {
-                return this._getLaunchPageService()
-                    .then((LaunchPageService) => ushellUtils.promisify(LaunchPageService.deleteBookmarks(sUrl, sContentProviderId)))
-                    .then((oResult) => {
-                        EventBus.getInstance().publish("sap.ushell.services.Bookmark", "bookmarkTileDeleted", sUrl);
-                        return oResult;
-                    });
+                const LaunchPage = await this._getLaunchPageService();
+                const oResult = await ushellUtils.promisify(LaunchPage.deleteBookmarks(sUrl, sContentProviderId));
+                EventBus.getInstance().publish("sap.ushell.services.Bookmark", "bookmarkTileDeleted", sUrl);
+
+                return oResult;
             }
 
-            return this._getPagesService()
-                .then((oPagesService) => oPagesService.deleteBookmarks({ url: sUrl, contentProviderId: sContentProviderId }));
+            const Pages = await this._getPagesService();
+            return Pages.deleteBookmarks({ url: sUrl, contentProviderId: sContentProviderId });
         };
 
         /**
@@ -696,23 +671,24 @@ sap.ui.define([
          * @private
          * @ui5-restricted ssuite.smartbusiness
          */
-        this.deleteCustomBookmarks = function (oIdentifier) {
+        this.deleteCustomBookmarks = async function (oIdentifier) {
             if (!oIdentifier || !oIdentifier.url || !oIdentifier.vizType) {
-                return Promise.reject("deleteCustomBookmarks: Some required parameters are missing.");
+                throw new Error("deleteCustomBookmarks: Some required parameters are missing.");
             }
 
             /**
              * @deprecated As of version 1.120
              */
             if (!Config.last("/core/spaces/enabled")) {
-                return this._getLaunchPageService()
-                    .then((oLaunchPageService) => oLaunchPageService.deleteCustomBookmarks(oIdentifier))
-                    .then(() => {
-                        EventBus.getInstance().publish("sap.ushell.services.Bookmark", "bookmarkTileDeleted", oIdentifier.url);
-                    });
+                const LaunchPage = await this._getLaunchPageService();
+                await LaunchPage.deleteCustomBookmarks(oIdentifier);
+
+                EventBus.getInstance().publish("sap.ushell.services.Bookmark", "bookmarkTileDeleted", oIdentifier.url);
+                return;
             }
 
-            return this._getPagesService().then((oPagesService) => oPagesService.deleteBookmarks(oIdentifier));
+            const Pages = await this._getPagesService();
+            return Pages.deleteBookmarks(oIdentifier);
         };
 
         /**
@@ -743,17 +719,20 @@ sap.ui.define([
          * @since 1.119.0
          * @public
          */
-        this.updateBookmarks = function (sUrl, oParameters, sContentProviderId) {
+        this.updateBookmarks = async function (sUrl, oParameters, sContentProviderId) {
+            const oBookmarkConfig = deepClone(oParameters, 20);
+            oBookmarkConfig.url = await this._changeUrlStatesToPersistent(oBookmarkConfig.url);
+
             /**
              * @deprecated As of version 1.120
              */
             if (!Config.last("/core/spaces/enabled")) {
-                return this._getLaunchPageService().then((LaunchPageService) => {
-                    return ushellUtils.promisify(LaunchPageService.updateBookmarks(sUrl, oParameters, sContentProviderId));
-                });
+                const LaunchPage = await this._getLaunchPageService();
+                return ushellUtils.promisify(LaunchPage.updateBookmarks(sUrl, oBookmarkConfig, sContentProviderId));
             }
-            return this._getPagesService()
-                .then((oPagesService) => oPagesService.updateBookmarks({ url: sUrl, contentProviderId: sContentProviderId }, oParameters));
+
+            const Pages = await this._getPagesService();
+            return Pages.updateBookmarks({ url: sUrl, contentProviderId: sContentProviderId }, oBookmarkConfig);
         };
 
         /**
@@ -810,9 +789,9 @@ sap.ui.define([
          * @private
          * @ui5-restricted ssuite.smartbusiness
          */
-        this.updateCustomBookmarks = function (oIdentifier, oConfig) {
+        this.updateCustomBookmarks = async function (oIdentifier, oConfig) {
             if (!oIdentifier || !oIdentifier.url || !oIdentifier.vizType) {
-                return Promise.reject("deleteCustomBookmarks: Some required parameters are missing.");
+                throw new Error("deleteCustomBookmarks: Some required parameters are missing.");
             }
 
             const oBookmarkConfig = deepExtend({}, oConfig, {
@@ -829,16 +808,18 @@ sap.ui.define([
             delete oBookmarkConfig.chipConfig;
             delete oBookmarkConfig.loadManifest;
 
+            oBookmarkConfig.url = await this._changeUrlStatesToPersistent(oBookmarkConfig.url);
+
             /**
              * @deprecated As of version 1.120
              */
             if (!Config.last("/core/spaces/enabled")) {
-                return this._getLaunchPageService()
-                    .then((oLaunchPageService) => oLaunchPageService.updateCustomBookmarks(oIdentifier, oBookmarkConfig));
+                const LaunchPage = await this._getLaunchPageService();
+                return LaunchPage.updateCustomBookmarks(oIdentifier, oBookmarkConfig);
             }
 
-            return this._getPagesService()
-                .then((oPagesService) => oPagesService.updateBookmarks(oIdentifier, oBookmarkConfig));
+            const Pages = await this._getPagesService();
+            return Pages.updateBookmarks(oIdentifier, oBookmarkConfig);
         };
 
         /**
@@ -861,33 +842,61 @@ sap.ui.define([
          * @public
          * @since 1.119.0
          */
-        this.getContentNodes = function () {
+        this.getContentNodes = async function () {
             /**
              * @deprecated As of version 1.120
              */
             if (!Config.last("/core/spaces/enabled")) {
                 // Classic home page
-                return this._getLaunchPageService().then((oLaunchPageService) => {
-                    return ushellUtils.promisify(oLaunchPageService.getGroupsForBookmarks())
-                        .then((aHomepageGroups) => {
-                            const aResults = aHomepageGroups.map((oBookmarkGroup) => {
-                                return {
-                                    id: oLaunchPageService.getGroupId(oBookmarkGroup.object),
-                                    label: oBookmarkGroup.title,
-                                    type: ContentNodeType.HomepageGroup,
-                                    isContainer: true
-                                };
-                            });
-                            return aResults;
-                        });
+                const LaunchPage = await this._getLaunchPageService();
+                const aHomepageGroups = await ushellUtils.promisify(LaunchPage.getGroupsForBookmarks());
+
+                const aResults = aHomepageGroups.map((oBookmarkGroup) => {
+                    return {
+                        id: LaunchPage.getGroupId(oBookmarkGroup.object),
+                        label: oBookmarkGroup.title,
+                        type: ContentNodeType.HomepageGroup,
+                        isContainer: true
+                    };
                 });
+                return aResults;
             }
 
             // Spaces mode
-            return Container.getServiceAsync("Menu").then((oMenuService) => oMenuService.getContentNodes());
+            const Menu = await Container.getServiceAsync("Menu");
+            return Menu.getContentNodes();
+        };
+
+        /**
+         * If the bookmark created contains state keys, change their state
+         * to be persistent (originally, a cFLP requirement).
+         * In case of an error, the function reports it but it will not stop
+         * the creation of the bookmark.
+         *
+         * @param {string} sUrl The URL of the bookmark.
+         * @returns {Promise<string>} The URL with the changed states
+         * @since 1.133
+         * @private
+         */
+        this._changeUrlStatesToPersistent = async function (sUrl) {
+            const AppState = await Container.getServiceAsync("AppState");
+
+            const bAppStateConfigPersistent = AppState.getPersistentWhenShared();
+            // gate keeper - if the platform did not implement yet the new persistency mechanism
+            // with different persistency method types, no action should be taken
+            if (AppState.getSupportedPersistencyMethods().length === 0 && bAppStateConfigPersistent !== true) {
+                return sUrl;
+            }
+
+            if (!sUrl || typeof sUrl !== "string") {
+                return sUrl;
+            }
+
+            return ushellUtils.promisify(AppState.setAppStateToPublic(sUrl));
         };
     }
 
+
     BookmarkV2.hasNoAdapter = true;
     return BookmarkV2;
 }, true /* bExport */);

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/Formatter.js

@@ -13,7 +13,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.131.1
+ * @version 1.132.1
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/InboundIndex.js

@@ -27,7 +27,7 @@
  *
  * @private
  *
- * @version 1.131.1
+ * @version 1.132.1
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/InboundProvider.js

@@ -34,7 +34,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.131.1
+ * @version 1.132.1
  */
 sap.ui.define([
     "sap/ushell/services/ClientSideTargetResolution/VirtualInbounds",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/PrelaunchOperations.js

@@ -4,7 +4,7 @@
  * @file PrelaunchOperations are executed just before launching the application (post parameter mapping and app state merging) if the
  * <code>sap-prelaunch-operations</code> parameter is specified as a technical parameter.
  *
- * @version 1.131.1
+ * @version 1.132.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/Search.js

@@ -8,7 +8,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.131.1
+ * @version 1.132.1
  */
 sap.ui.define([
     "sap/ushell/utils",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution/StagedLogger.js

@@ -39,7 +39,7 @@
  *
  * This is a dependency of ClientSideTargetResolution. Interfaces exposed by this module may change at any time without notice.
  *
- * @version 1.131.1
+ * @version 1.132.1
  */
 sap.ui.define([
     "sap/base/Log"