@sapui5/sap.ushell 1.129.1 → 1.130.1

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

@@ -1,99 +1,178 @@
 <core:FragmentDefinition
-        xmlns="sap.m"
-        xmlns:core="sap.ui.core"
-        xmlns:form="sap.ui.layout.form">
+    xmlns="sap.m"
+    xmlns:core="sap.ui.core"
+    xmlns:form="sap.ui.layout.form"
+    xmlns:custom="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
+    core:require="{
+        coreLibrary: 'sap/ui/core/library',
+        mobileLibrary: 'sap/m/library'
+    }">
     <Dialog
         id="aboutDialog"
         title="{i18n>about}"
-        contentWidth="40rem"
-        horizontalScrolling="false"
+        class="sapUshellUserSetting sapContrastPlus"
+        contentHeight="42rem"
+        contentWidth="62rem"
+        afterClose=".onAfterClose"
         beforeOpen=".onBeforeOpen"
-        class="sapContrastPlus"
-        afterClose=".onAfterClose">
+        stretch="{device>/system/phone}">
+        <customHeader>
+            <Bar id="settingsBar">
+                <contentLeft>
+                    <Button id="aboutDialogNavBackButton"
+                        icon="sap-icon://nav-back"
+                        press=".navigateBackToMaster"
+                        tooltip="{i18n>ToggleButtonShow}"
+                        visible="false" />
+                    <ToggleButton id="aboutDialogMenuButton"
+                        icon="sap-icon://menu2"
+                        press=".navToggleButtonPressHandler"
+                        tooltip="{i18n>ToggleButtonShow}"
+                        visible="false" />
+                </contentLeft>
+                <contentMiddle>
+                    <Title
+                        text="{i18n>about}" />
+                </contentMiddle>
+            </Bar>
+        </customHeader>
         <content>
-            <form:SimpleForm
-                id="aboutDialogApplicationForm"
-                editable="false"
-                layout="ColumnLayout"
-                visible="{ path: 'AppInfo>/', formatter: '.isFormVisible' }"
-                columnsM="{ path: 'AppInfo>/', formatter: '.calculateNumberOfColumns' }"
-                columnsL="{ path: 'AppInfo>/', formatter: '.calculateNumberOfColumns' }"
-                columnsXL="{ path: 'AppInfo>/', formatter: '.calculateNumberOfColumns' }"
-                labelSpanM="12"
-                labelSpanL="12"
-                labelSpanXL="12">
-                <form:title>
-                    <core:Title text="{i18n>aboutCategoryApplication}" level="H2"></core:Title>
-                </form:title>
-                <Label id="appInfoAppTitleLabel" visible="{= !!${AppInfo>/appTitle/label}}" text="{AppInfo>/appTitle/label}"/>
-                <Text id="appInfoAppTitleText" visible="{= !!${AppInfo>/appTitle/label}}" text="{AppInfo>/appTitle/text}"/>
-                <Label id="appInfoAppIdLabel" visible="{= !!${AppInfo>/appId/label}}" text="{AppInfo>/appId/label}"/>
-                <Text id="appInfoAppIdText" visible="{= !!${AppInfo>/appId/label}}" text="{AppInfo>/appId/text}"/>
-                <Label id="appInfoAppVersionLabel" visible="{= !!${AppInfo>/appVersion/label}}" text="{AppInfo>/appVersion/label}"/>
-                <Text id="appInfoAppVersionText" visible="{= !!${AppInfo>/appVersion/label}}" text="{AppInfo>/appVersion/text}"/>
-                <Label id="appInfoAppSupportInfoLabel" visible="{= !!${AppInfo>/appSupportInfo/label}}" text="{AppInfo>/appSupportInfo/label}"/>
-                <Text id="appInfoAppSupportInfoText" visible="{= !!${AppInfo>/appSupportInfo/label}}" text="{AppInfo>/appSupportInfo/text}"/>
-                <Label id="appInfoTechnicalAppComponentIdLabel" visible="{= !!${AppInfo>/technicalAppComponentId/label}}" text="{AppInfo>/technicalAppComponentId/label}"/>
-                <Text id="appInfoTechnicalAppComponentIdText" visible="{= !!${AppInfo>/technicalAppComponentId/label}}" text="{AppInfo>/technicalAppComponentId/text}"/>
-                <Label id="appInfoAppFrameworkIdLabel" visible="{= !!${AppInfo>/appFrameworkId/label}}" text="{AppInfo>/appFrameworkId/label}"/>
-                <Text id="appInfoAppFrameworkIdText" visible="{= !!${AppInfo>/appFrameworkId/label}}" text="{AppInfo>/appFrameworkId/text}"/>
-                <Label id="appInfoAppFrameworkVersionLabel" visible="{= !!${AppInfo>/appFrameworkVersion/label}}" text="{AppInfo>/appFrameworkVersion/label}"/>
-                <Text id="appInfoAppFrameworkVersionText" visible="{= !!${AppInfo>/appFrameworkVersion/label}}" text="{AppInfo>/appFrameworkVersion/text}"/>
-                <Label id="appInfoContentProviderLabel" visible="{= !!${AppInfo>/contentProviderLabel/label}}" text="{AppInfo>/contentProviderLabel/label}"/>
-                <Text id="appInfoContentProviderText" visible="{= !!${AppInfo>/contentProviderLabel/label}}" text="{AppInfo>/contentProviderLabel/text}"/>
-            </form:SimpleForm>
-
-            <form:SimpleForm
-                id="aboutDialogSystemForm"
-                editable="false"
-                layout="ColumnLayout"
-                visible="{ path: 'SysInfo>/', formatter: '.isFormVisible' }"
-                columnsM="{ path: 'SysInfo>/', formatter: '.calculateNumberOfColumns' }"
-                columnsL="{ path: 'SysInfo>/', formatter: '.calculateNumberOfColumns' }"
-                columnsXL="{ path: 'SysInfo>/', formatter: '.calculateNumberOfColumns' }"
-                labelSpanM="12"
-                labelSpanL="12"
-                labelSpanXL="12">
-                <form:title>
-                    <core:Title text="{i18n>aboutCategorySystem}" level="H2"></core:Title>
-                </form:title>
-                <Label id="sysInfoProductNameLabel" visible="{= !!${SysInfo>/productName/label}}" text="{SysInfo>/productName/label}"/>
-                <Text id="sysInfoProductNameText" visible="{= !!${SysInfo>/productName/label}}" text="{SysInfo>/productName/text}"/>
-                <Label id="sysInfoProductVersionLabel" visible="{= !!${SysInfo>/productVersion/label}}" text="{SysInfo>/productVersion/label}"/>
-                <Text id="sysInfoProductVersionText" visible="{= !!${SysInfo>/productVersion/label}}" text="{SysInfo>/productVersion/text}"/>
-                <Label id="sysInfoSystemNameLabel" visible="{= !!${SysInfo>/systemName/label}}" text="{SysInfo>/systemName/label}"/>
-                <Text id="sysInfoSystemNameText" visible="{= !!${SysInfo>/systemName/label}}" text="{SysInfo>/systemName/text}"/>
-                <Label id="sysInfoSystemRoleLabel" visible="{= !!${SysInfo>/systemRole/label}}" text="{SysInfo>/systemRole/label}"/>
-                <Text id="sysInfoSystemRoleText" visible="{= !!${SysInfo>/systemRole/label}}" text="{SysInfo>/systemRole/text}"/>
-                <Label id="sysInfoTenantRoleLabel" visible="{= !!${SysInfo>/tenantRole/label}}" text="{SysInfo>/tenantRole/label}"/>
-                <Text id="sysInfoTenantRoleText" visible="{= !!${SysInfo>/tenantRole/label}}" text="{SysInfo>/tenantRole/text}"/>
-            </form:SimpleForm>
-
-            <form:SimpleForm
-                id="aboutDialogUserForm"
-                editable="false"
-                layout="ColumnLayout"
-                visible="{ path: 'UserEnvInfo>/', formatter: '.isFormVisible' }"
-                columnsM="{ path: 'UserEnvInfo>/', formatter: '.calculateNumberOfColumns' }"
-                columnsL="{ path: 'UserEnvInfo>/', formatter: '.calculateNumberOfColumns' }"
-                columnsXL="{ path: 'UserEnvInfo>/', formatter: '.calculateNumberOfColumns' }"
-                labelSpanM="12"
-                labelSpanL="12"
-                labelSpanXL="12">
-                <form:title>
-                    <core:Title text="{i18n>aboutCategoryUser}" level="H2"></core:Title>
-                </form:title>
-                <Label id="userEnvInfoDeviceTypeLabel" visible="{= !!${UserEnvInfo>/deviceType/label}}" text="{UserEnvInfo>/deviceType/label}"/>
-                <Text id="userEnvInfoDeviceTypeText" visible="{= !!${UserEnvInfo>/deviceType/label}}" text="{UserEnvInfo>/deviceType/text}"/>
-                <Label id="userEnvInfoActiveThemeLabel" visible="{= !!${UserEnvInfo>/activeTheme/label}}" text="{UserEnvInfo>/activeTheme/label}"/>
-                <Text id="userEnvInfoActiveThemeText" visible="{= !!${UserEnvInfo>/activeTheme/label}}" text="{UserEnvInfo>/activeTheme/text}"/>
-                <Label id="userEnvInfoOptimizedForTouchLabel" visible="{= !!${UserEnvInfo>/optimizedForTouch/label}}" text="{UserEnvInfo>/optimizedForTouch/label}"/>
-                <Text id="userEnvInfoOptimizedForTouchText" visible="{= !!${UserEnvInfo>/optimizedForTouch/label}}" text="{UserEnvInfo>/optimizedForTouch/text}"/>
-                <Label id="userEnvInfoTouchSupportedLabel" visible="{= !!${UserEnvInfo>/touchSupported/label}}" text="{UserEnvInfo>/touchSupported/label}"/>
-                <Text id="userEnvInfoTouchSupportedText" visible="{= !!${UserEnvInfo>/touchSupported/label}}" text="{UserEnvInfo>/touchSupported/text}"/>
-                <Label id="userEnvInfoUserAgentFldLabel" visible="{= !!${UserEnvInfo>/userAgentFld/label}}" text="{UserEnvInfo>/userAgentFld/label}"/>
-                <Text id="userEnvInfoUserAgentFldText" visible="{= !!${UserEnvInfo>/userAgentFld/label}}" text="{UserEnvInfo>/userAgentFld/text}"/>
-            </form:SimpleForm>
+            <Page
+                showHeader="false"
+                class="sapUshellSettingsPage">
+                <content>
+                    <SplitContainer id="aboutDialogContainer"
+                        initialDetail="aboutDialogDetail"
+                        defaultTransitionNameDetail="show"
+                        afterMasterClose=".onAfterMasterClose"
+                        beforeMasterOpen=".onBeforeMasterOpen">
+                        <masterPages>
+                            <Page
+                                id="aboutDialogMaster"
+                                class="sapUshellUserSettingMaster"
+                                showHeader="false">
+                                <content>
+                                    <List id="aboutDialogEntryList"
+                                        itemPress=".onItemPress"
+                                        mode="{= mobileLibrary.ListMode.SingleSelectMaster}">
+                                        <items>
+                                            <StandardListItem
+                                                title="{i18n>aboutCategoryApplication}"
+                                                type="Active"
+                                                icon="sap-icon://header"
+                                                custom:to="aboutDialogDetailApplication"
+                                                wrapping="true" />
+                                            <StandardListItem
+                                                title="{i18n>aboutCategorySystem}"
+                                                icon="sap-icon://wrench"
+                                                type="Active"
+                                                custom:to="aboutDialogDetailSystem"
+                                                wrapping="true" />
+                                            <StandardListItem
+                                                title="{i18n>aboutCategoryEnvironment}"
+                                                icon="sap-icon://desktop-mobile"
+                                                type="Active"
+                                                custom:to="aboutDialogDetailEnvironment"
+                                                wrapping="true" />
+                                        </items>
+                                    </List>
+                                </content>
+                            </Page>
+                        </masterPages>
+                        <detailPages>
+                            <Page
+                                id="aboutDialogDetailApplication"
+                                showHeader="false">
+                                <content>
+                                    <ObjectHeader
+                                        title="{i18n>aboutCategoryApplication}"
+                                        titleLevel="{= coreLibrary.TitleLevel.H3}"
+                                        backgroundDesign="Solid"
+                                        class="sapUshellUserSettingDetailHeader"/>
+                                    <VBox class="sapUiSmallMargin">
+                                        <form:SimpleForm
+                                            id="aboutDialogApplicationForm"
+                                            editable="false"
+                                            layout="ColumnLayout"
+                                            columnsM="2"
+                                            columnsL="2"
+                                            columnsXL="2"
+                                            content="{
+                                                path: 'AppInfo>/entries',
+                                                factory: '.itemFactory'
+                                            }">
+                                        </form:SimpleForm>
+                                    </VBox>
+                                    <VBox class="sapUiSmallMargin">
+                                        <form:SimpleForm
+                                            id="aboutDialogApplicationFormCustomValues"
+                                            editable="false"
+                                            layout="ColumnLayout"
+                                            columnsM="2"
+                                            columnsL="2"
+                                            columnsXL="2"
+                                            content="{
+                                                path: 'AppInfo>/customEntries',
+                                                factory: '.itemFactory'
+                                            }">
+                                        </form:SimpleForm>
+                                    </VBox>
+                                </content>
+                            </Page>
+                            <Page
+                                id="aboutDialogDetailSystem"
+                                showHeader="false">
+                                <content>
+                                    <ObjectHeader
+                                        title="{i18n>aboutCategorySystem}"
+                                        titleLevel="{= coreLibrary.TitleLevel.H3}"
+                                        backgroundDesign="Solid"
+                                        class="sapUshellUserSettingDetailHeader"/>
+                                    <VBox class="sapUiSmallMargin">
+                                        <form:SimpleForm
+                                            id="aboutDialogSystemForm"
+                                            editable="false"
+                                            layout="ColumnLayout"
+                                            columnsM="2"
+                                            columnsL="2"
+                                            columnsXL="2"
+                                            content="{
+                                                path: 'SysInfo>/entries',
+                                                factory: '.itemFactory'
+                                            }">
+                                        </form:SimpleForm>
+                                    </VBox>
+                                </content>
+                            </Page>
+                            <Page
+                                id="aboutDialogDetailEnvironment"
+                                showHeader="false">
+                                <content>
+                                    <ObjectHeader
+                                        title="{i18n>aboutCategoryEnvironment}"
+                                        titleLevel="{= coreLibrary.TitleLevel.H3}"
+                                        backgroundDesign="Solid"
+                                        class="sapUshellUserSettingDetailHeader"/>
+                                    <VBox class="sapUiSmallMargin">
+                                        <form:SimpleForm
+                                            id="aboutDialogUserForm"
+                                            editable="false"
+                                            layout="ColumnLayout"
+                                            columnsM="2"
+                                            columnsL="2"
+                                            columnsXL="2"
+                                            content="{
+                                                path: 'UserEnvInfo>/entries',
+                                                factory: '.itemFactory'
+                                            }">
+                                        </form:SimpleForm>
+                                    </VBox>
+                                </content>
+                            </Page>
+                        </detailPages>
+                    </SplitContainer>
+                </content>
+            </Page>
         </content>
         <beginButton>
             <Button

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

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

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

@@ -4,6 +4,8 @@
 sap.ui.define([
     "sap/m/Button",
     "sap/m/library",
+    "sap/m/Menu",
+    "sap/m/MenuItem",
     "sap/m/Text",
     "sap/ui/core/Control",
     "sap/ui/core/dnd/DragDropInfo",
@@ -15,6 +17,8 @@ sap.ui.define([
 ], function (
     Button,
     mLibrary,
+    Menu,
+    MenuItem,
     Text,
     Control,
     DragDropInfo,
@@ -211,6 +215,69 @@ sap.ui.define([
         this._oInvisibleMessageInstance = InvisibleMessage.getInstance();
     };
 
+    Page.prototype._onSectionContextMenu = function (oEvent, oSection) {
+        if (!this.getEdit()) {
+            return;
+        }
+
+        for (let oControl = oEvent.srcControl; !oControl.isA("sap.ushell.ui.launchpad.Section"); oControl = oControl.getParent()) {
+            if (oControl.isA("sap.m.Input") // section title
+                || oControl.isA("sap.ushell.ui.launchpad.VizInstance") // tile
+                || oControl.isA("sap.ushell.ui.launchpad.VizInstanceLink")) { // link
+                // If the context menu is opened inside of these controls, the default context menu should be shown.
+                return;
+            }
+        }
+
+        function moveSection (bUp) {
+            const aSections = this.getSections();
+            const iIndexOfSection = aSections.indexOf(oSection);
+
+            const oOtherSection = aSections[bUp ? iIndexOfSection - 1 : iIndexOfSection + 1];
+
+            this.fireSectionDrop({
+                draggedControl: oSection,
+                droppedControl: oOtherSection,
+                dropPosition: bUp ? "Before" : "After"
+            });
+        }
+
+        const bEnableSectionReordering = this.getEnableSectionReordering();
+
+        const aSections = this.getSections().filter((section) => {
+            return !section.getDefault();
+        });
+
+        // the default section is filtered out and will receive an index of -1
+        const iIndexOfSection = aSections.indexOf(oSection);
+
+        const oContextMenu = new Menu("sapUshellSectionContextMenu", {
+            items: [
+                new MenuItem({
+                    text: "{i18n>Page.MoveSection.Up}",
+                    // Enabled if section reordering is allowed and it is not the first section or the default section
+                    enabled: bEnableSectionReordering && iIndexOfSection > 0,
+                    press: moveSection.bind(this, true)
+                }),
+                new MenuItem({
+                    text: "{i18n>Page.MoveSection.Down}",
+                    // Enabled if section reordering is allowed and it is not the default section and it is also not the last section
+                    enabled: bEnableSectionReordering && iIndexOfSection !== -1 && iIndexOfSection < aSections.length - 1,
+                    press: moveSection.bind(this, false)
+                })
+            ],
+            closed: function () {
+                // The timeout is needed, as the close event is fired before the MenuItem press event.
+                setTimeout(this.destroy.bind(this));
+            }
+        }).setModel(resources.i18nModel, "i18n");
+        // Safeguards that the ContextMenu is destroyed when the page is destroyed
+        this.addDependent(oContextMenu);
+
+        oEvent.preventDefault();
+        oContextMenu.openAsContextMenu(oEvent, oSection);
+    };
+
     /**
      * Gets called on every focusin event within this control/ custom fastnavgroup.
      * Saves the last focused visualization and section to a private variable.
@@ -711,15 +778,6 @@ sap.ui.define([
         return [];
     };
 
-    Page.prototype._getCurrentlyFocusedSection = function () {
-        var aSections = this.getSections();
-        var oCurrentlyFocusedElement = window.document.activeElement;
-
-        return aSections.find(function (oSection) {
-            return oSection.getDomRef().contains(oCurrentlyFocusedElement);
-        });
-    };
-
     /**
      * Handles the borderReached event of a Section.
      *
@@ -736,6 +794,11 @@ sap.ui.define([
 
         if (sAggregationName === "sections") {
             oObject.attachEvent("borderReached", this._handleSectionBorderReached.bind(this));
+            oObject.addEventDelegate({
+                oncontextmenu: (oEvent) => {
+                    this._onSectionContextMenu(oEvent, oObject);
+                }
+            });
         }
 
         return this;
@@ -746,6 +809,11 @@ sap.ui.define([
 
         if (sAggregationName === "sections") {
             oObject.attachEvent("borderReached", this._handleSectionBorderReached.bind(this));
+            oObject.addEventDelegate({
+                oncontextmenu: (oEvent) => {
+                    this._onSectionContextMenu(oEvent, oObject);
+                }
+            });
         }
 
         return this;

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

@@ -22,12 +22,12 @@ sap.ui.define([], function () {
      *            Page control that should be rendered
      */
     PageRenderer.render = function (rm, page) {
-        var aSections = page.getSections();
-        var iNrOfSections = aSections.length;
-        var sDataHelpId = page.getDataHelpId();
-        var sTitle = page.getTitle();
-        var oSection;
-        var index;
+        const aVisibleSections = page.getSections().filter((oSection) => {
+            return page.getEdit() || (oSection.getShowSection() && oSection.getVisible());
+        });
+        const iNrOfVisualSections = aVisibleSections.length;
+        const sDataHelpId = page.getDataHelpId();
+        const sTitle = page.getTitle();
 
         rm.openStart("div", page);
         rm.class("sapUshellPage");
@@ -55,27 +55,27 @@ sap.ui.define([], function () {
         rm.text(sTitle);
         rm.close("h2");
 
-        if (page.getEdit() && !iNrOfSections) {
+        if (page.getEdit() && !iNrOfVisualSections) {
             rm.renderControl(page.getAggregation("_addSectionButtons")[0]);
         }
 
-        // render "NoSectionsText" when there are no sections
-        if (!iNrOfSections && page.getShowNoSectionsText()) {
+        // render "NoSectionsText" when there are no visible sections
+        if (!iNrOfVisualSections && page.getShowNoSectionsText()) {
             rm.renderControl(page.getAggregation("_noSectionText"));
         }
 
-        for (index = 0; index < iNrOfSections; index++) {
-            oSection = aSections[index];
-            if (page.getEdit() || (oSection.getShowSection() && oSection.getVisible())) {
-                rm.openStart("div");
-                rm.class("sapUshellPageSection");
-                rm.openEnd(); // div - tag
-                rm.renderControl(oSection);
-                if (page.getEdit()) {
-                    rm.renderControl(page.getAggregation("_addSectionButtons")[index + 1]);
-                }
-                rm.close("div");
+        let index;
+        let oSection;
+        for (index = 0; index < iNrOfVisualSections; index++) {
+            oSection = aVisibleSections[index];
+            rm.openStart("div");
+            rm.class("sapUshellPageSection");
+            rm.openEnd(); // div - tag
+            rm.renderControl(oSection);
+            if (page.getEdit()) {
+                rm.renderControl(page.getAggregation("_addSectionButtons")[index + 1]);
             }
+            rm.close("div");
         }
 
         rm.close("div");

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

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

package/src/main/js/sap/ushell/ui/launchpad/section/CompactArea.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Provides control sap.ushell.ui.launchpad.section.CompactArea
  *
- * @version 1.129.1
+ * @version 1.130.1
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/ui/shell/ToolAreaItem.js

@@ -18,7 +18,7 @@ sap.ui.define([
      * A control to be placed in the tool area
      * @extends sap.ui.core.Control
      *
-     * @version 1.129.1
+     * @version 1.130.1
      *
      * @public
      * @since 1.30.5

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

@@ -6,7 +6,7 @@
  * This is a utility module that collects common activities implemented
  * by controllers of different ui components.
  *
- * @version 1.129.1
+ * @version 1.130.1
  * @private
  */
 

package/src/main/js/sap/ushell/ui5service/ShellUIServiceFactory.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The ShellUIService UI5 service factory
  *
- * @version 1.129.1
+ * @version 1.130.1
  */
 sap.ui.define([
     "sap/base/util/Deferred",

package/src/main/js/sap/ushell/ui5service/UserStatus.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The UserStatus UI5 service
  *
- * @version 1.129.1
+ * @version 1.130.1
  * @deprecated since 1.70. Support for this service has been discontinued.
  */
 sap.ui.define([

package/src/main/js/sap/ushell/utils/DynamicTileRequest.js

@@ -13,7 +13,6 @@ sap.ui.define([
     "sap/ui/core/Configuration",
     "sap/base/util/ObjectPath",
     "sap/ushell/EventHub",
-    "sap/ushell/utils",
     "sap/ushell/Container"
 ], function (
     Localization,
@@ -25,7 +24,6 @@ sap.ui.define([
     Configuration,
     ObjectPath,
     EventHub,
-    ushellUtils,
     Container
 ) {
     "use strict";
@@ -410,7 +408,7 @@ sap.ui.define([
             const ReferenceResolverService = await Container.getServiceAsync("ReferenceResolver");
 
             const oSystemContext = await ClientSideTargetResolutionService.getSystemContext(sContentProviderId);
-            const oResult = await ushellUtils.promisify(ReferenceResolverService.resolveUserDefaultParameters(sUrl, oSystemContext));
+            const oResult = await ReferenceResolverService.resolveUserDefaultParameters(sUrl, oSystemContext);
 
             if (oResult.defaultsWithoutValue && oResult.defaultsWithoutValue.length > 0) {
                 Log.error("The service URL contains User Default(s) with no set value: " + oResult.defaultsWithoutValue.join(", "), "", sModuleName);

package/src/main/js/sap/ushell/utils/RestrictedJSONModel.js

@@ -6,7 +6,9 @@
  */
 sap.ui.define([
     "sap/ui/model/json/JSONModel"
-], function (JSONModel) {
+], function (
+    JSONModel
+) {
     "use strict";
 
     function noop () {

package/src/main/js/sap/ushell/utils/UrlParsing.js

@@ -421,6 +421,44 @@ sap.ui.define([
         return sHash;
     };
 
+    /**
+     * Ensures a leading # in a hash.
+     * @param {string} sHash Shell hash.
+     * @returns {string} the string with a leading #.
+     *
+     * @since 1.129.0
+     * @private
+     */
+    UrlParsing.ensureLeadingHash = function (sHash) {
+        if (!sHash) {
+            sHash = "#";
+        } else if (sHash.charAt(0) !== "#") {
+            sHash = `#${sHash}`;
+        }
+        return sHash;
+    };
+
+    /**
+     * Reduces a hash to the semantic object and action part.
+     * Does not include the leading '#'.
+     * Returns empty string if the hash is not parseable.
+     *
+     * @param {string} sHash Shell hash.
+     * @returns {string} The basic hash.
+     *
+     * @since 1.129.0
+     * @private
+     */
+    UrlParsing.getBasicHash = function (sHash) {
+        var oShellHash = this.parseShellHash(sHash);
+
+        if (!oShellHash) {
+            return "";
+        }
+
+        return `${oShellHash.semanticObject}-${oShellHash.action}`;
+    };
+
     /**
      * split a Unified Shell compliant hash into an Object containing a shell specific part and an app specific parts</br>
      * for non compliant hash strings, the empty object {} is returned.

package/src/main/js/sap/ushell/utils/UrlShortening.js

@@ -5,7 +5,7 @@
  *
  * This module is for internal Shell usage only
  *
- * @version 1.129.1
+ * @version 1.130.1
  */
  sap.ui.define(["sap/base/Log", "sap/ushell/utils/UrlParsing"], function (Log, urlParsing) {
     "use strict";