@sapui5/sap.ushell 1.115.1 → 1.117.0

package/src/main/js/sap/ushell/components/pages/controller/PageRuntime.controller.js

@@ -2,10 +2,11 @@
 
 /**
  * @file PageRuntime controller for PageRuntime view
- * @version 1.115.1
+ * @version 1.117.0
  */
 sap.ui.define([
     "sap/ushell/library",
+    "sap/ui/core/Core",
     "sap/ui/core/mvc/Controller",
     "sap/ui/events/KeyCodes",
     "sap/m/GenericTile",
@@ -24,11 +25,12 @@ sap.ui.define([
     "sap/ushell/components/pages/controller/PagesAndSpaceId",
     "sap/ushell/components/pages/MyHomeImport",
     "sap/ui/thirdparty/hasher",
-    "sap/ui/thirdparty/jquery",
     "sap/base/Log", // S/4 my home
-    "sap/ui/core/theming/Parameters"
+    "sap/ui/core/theming/Parameters",
+    "sap/ushell/ui/launchpad/Section"
 ], function (
     ushellLibrary,
+    Core,
     Controller,
     KeyCodes,
     GenericTile,
@@ -47,9 +49,9 @@ sap.ui.define([
     PagesAndSpaceId,
     MyHomeImport,
     hasher,
-    jQuery,
     Log, // S/4 my home
-    Parameters
+    Parameters,
+    Section
 ) {
     "use strict";
 
@@ -145,7 +147,7 @@ sap.ui.define([
 
             this.oEventHubListener = EventHub.once("PagesRuntimeRendered").do(this._onFirstPageRendering.bind(this));
 
-            this._oEventBus = sap.ui.getCore().getEventBus();
+            this._oEventBus = Core.getEventBus();
             this._oEventBus.subscribe("launchpad", "shellFloatingContainerIsDocked", this._handleUshellContainerDocked, this);
             this._oEventBus.subscribe("launchpad", "shellFloatingContainerIsUnDocked", this._handleUshellContainerDocked, this);
 
@@ -173,9 +175,16 @@ sap.ui.define([
                 // The NavContainer handles initial focus which lands on the emptyPage instead of the loaded page after first render
                 // Therefore we are focusing the first item on first render in case there is no item focused yet
                 if (!document.activeElement || document.activeElement === document.body) {
-                    var oFocusableDomRef = jQuery(this.oPagesNavContainer.getDomRef()).firstFocusableDomRef();
-                    if (oFocusableDomRef) {
-                        oFocusableDomRef.focus();
+                    var oCurrentPage = this.oPagesNavContainer.getCurrentPage();
+                    var oCurrentLaunchpadPage = oCurrentPage && oCurrentPage.getContent()[0];
+                    var oFirstSection = oCurrentLaunchpadPage && oCurrentLaunchpadPage.getSections()[0];
+                    if (oFirstSection) {
+                        oFirstSection.focus();
+                    } else {
+                        var oFocusableDomRef = this.oPagesNavContainer.$().firstFocusableDomRef();
+                        if (oFocusableDomRef) {
+                            oFocusableDomRef.focus();
+                        }
                     }
                 }
 
@@ -300,7 +309,7 @@ sap.ui.define([
 
             // Hide "[Edit Current Page]" button of page`s runtime
             // if custom home app is displayed
-            var oActionModeButton = sap.ui.getCore().byId("ActionModeBtn");
+            var oActionModeButton = Core.byId("ActionModeBtn");
             if (!oActionModeButton) {
                 return;
             }
@@ -360,7 +369,7 @@ sap.ui.define([
             this._sActionModeTextId = sTextId; // For the case when the Action Mode button was not created yet.
 
             this._getMyHomeTitle().then(function (sTitle) {
-                var oActionModeButton = sap.ui.getCore().byId("ActionModeBtn");
+                var oActionModeButton = Core.byId("ActionModeBtn");
                 if (oActionModeButton) {
                     var sActionModeText = resources.i18n.getText(sTextId, sTitle);
                     oActionModeButton.setText(sActionModeText);
@@ -399,7 +408,7 @@ sap.ui.define([
          * @since 1.72.0
          */
         _openFLPPage: function () {
-            return PagesAndSpaceId._getPageAndSpaceId()
+            return PagesAndSpaceId.getPageAndSpaceId()
                 .then(function (ids) {
                     var sPageId = ids.pageId;
                     var sSpaceId = ids.spaceId;
@@ -642,6 +651,67 @@ sap.ui.define([
             }
         },
 
+        /**
+         * UI5 factory function which is used by the page control inside the runtime view to fill the sections aggregation
+         * @see sap.ushell.ui.launchpad.Section
+         *
+         * @param {string} id Control ID
+         * @param {sap.ui.model.Context} context UI5 context
+         * @returns {sap.ushell.ui.launchpad.Section} The UI5 control
+         * @private
+         * @since 1.117.0
+         */
+        _sectionFactory: function (id, context) {
+            return new Section({
+                title: "{title}",
+                sizeBehavior: "{viewSettings>/sizeBehavior}",
+                dataHelpId: "Section-{id}",
+                default: "{default}",
+                visualizations: {
+                    path: "visualizations",
+                    factory: this._visualizationFactory.bind(this),
+                    key: "id"
+                },
+                gridContainerGap: "{viewSettings>/gridContainerGap/gridContainerGap}",
+                gridContainerGapXS: "{viewSettings>/gridContainerGap/gridContainerGapXS}",
+                gridContainerGapS: "{viewSettings>/gridContainerGap/gridContainerGapS}",
+                gridContainerGapM: "{viewSettings>/gridContainerGap/gridContainerGapM}",
+                gridContainerGapL: "{viewSettings>/gridContainerGap/gridContainerGapL}",
+                gridContainerGapXL: "{viewSettings>/gridContainerGap/gridContainerGapXL}",
+                gridContainerRowSize: "{viewSettings>/gridContainerRowSize/gridContainerRowSize}",
+                gridContainerRowSizeXS: "{viewSettings>/gridContainerRowSize/gridContainerRowSizeXS}",
+                gridContainerRowSizeS: "{viewSettings>/gridContainerRowSize/gridContainerRowSizeS}",
+                gridContainerRowSizeM: "{viewSettings>/gridContainerRowSize/gridContainerRowSizeM}",
+                gridContainerRowSizeL: "{viewSettings>/gridContainerRowSize/gridContainerRowSizeL}",
+                gridContainerRowSizeXL: "{viewSettings>/gridContainerRowSize/gridContainerRowSizeXL}",
+                enableGridBreakpoints: false,
+                enableGridContainerQuery: "{viewSettings>/ushellContainerDocked}",
+                editable: "{viewSettings>/actionModeEditActive}",
+                add: this.handleEditModeAction.bind(this, "addVisualization"),
+                delete: this.handleEditModeAction.bind(this, "deleteSection"),
+                reset: this.handleEditModeAction.bind(this, "resetSection"),
+                sectionVisibilityChange: this.handleEditModeAction.bind(this, "changeSectionVisibility"),
+                titleChange: this.handleEditModeAction.bind(this, "changeSectionTitle"),
+                enableVisualizationReordering: "{viewSettings>/personalizationEnabled}",
+                areaDragEnter: this.onAreaDragEnter.bind(this),
+                visualizationDrop: this.moveVisualization.bind(this),
+                showSection: "{visible}",
+                visible: "{= !!${visualizations}.length || ${viewSettings>/actionModeEditActive} }",
+                noVisualizationsText: "{i18n>PageRuntime.EditMode.EmptySection}",
+                showNoVisualizationsText: true,
+                enableAddButton: "{viewSettings>/showAddButton}",
+                enableResetButton: {
+                    parts: ["id", "preset"],
+                    formatter: this._sectionEnableReset.bind(this)
+                },
+                enableDeleteButton: {
+                    parts: ["id", "preset"],
+                    formatter: this._sectionEnableDelete.bind(this)
+                },
+                enableShowHideButton: "{viewSettings>/showHideButton}"
+            }).addStyleClass("sapContrastPlus");
+        },
+
         /**
          * UI5 factory function which is used by the sections control inside the runtime view to fill the visualizations aggregation
          * @see sap.ushell.ui.launchpad.Section
@@ -791,7 +861,7 @@ sap.ui.define([
          *
          * @param {sap.ui.base.Event} oEvent The click event.
          * @param {sap.ushell.ui.launchpad.VizInstance} oVizInstance The vizInstance that should be added to the My Home page.
-         * @return {Promise<undefined>} A promise resolving when the vizInstance was added to the My Home page
+         * @returns {Promise<undefined>} A promise resolving when the vizInstance was added to the My Home page
          * @private
          */
         _addToMyHome: function (oEvent, oVizInstance) {
@@ -810,7 +880,7 @@ sap.ui.define([
          * A message is announced to the user confirming the success of the move.
          *
          * @param {sap.ui.base.Event} oEvent SAP UI5 event object.
-         * @return {Promise<undefined>} Resolves after the Visualization is moved.
+         * @returns {Promise<undefined>} Resolves after the Visualization is moved.
          */
         _confirmSelect: function (oEvent) {
             var oVizInstanceToBeMovedContextPath = this._oVizInstanceToBeMoved.getBindingContext().getPath();
@@ -995,7 +1065,7 @@ sap.ui.define([
             this._oEventBus.unsubscribe("launchpad", "shellFloatingContainerIsUnDocked", this._handleUshellContainerDocked, this);
             StateManager.exit();
 
-            var oActionModeButton = sap.ui.getCore().byId("ActionModeBtn");
+            var oActionModeButton = Core.byId("ActionModeBtn");
             if (oActionModeButton) {
                 oActionModeButton.destroy();
             }
@@ -1008,7 +1078,7 @@ sap.ui.define([
          * @since 1.84.0
          */
         _hideActionModeButton: function () {
-            var oActionModeButton = sap.ui.getCore().byId("ActionModeBtn");
+            var oActionModeButton = Core.byId("ActionModeBtn");
             Log.debug("cep/editMode: hide Action Mode Button", "Page runtime");
             if (oActionModeButton) {
                 oActionModeButton.setVisible(false);
@@ -1022,7 +1092,7 @@ sap.ui.define([
          * @since 1.84.0
          */
         _showActionModeButton: function () {
-            var oActionModeButton = sap.ui.getCore().byId("ActionModeBtn");
+            var oActionModeButton = Core.byId("ActionModeBtn");
             if (oActionModeButton) {
                 oActionModeButton.setVisible(true);
             }
@@ -1192,12 +1262,12 @@ sap.ui.define([
          *
          * @param {string} sHandler Name of the handler within the action mode module
          * @param {sap.ui.base.Event} oEvent Event object
-         * @param {sap.ui.core.Control} oSource Source control
-         * @param {object} oParameters Event parameters
          * @private
          * @since 1.74.0
          */
-        handleEditModeAction: function (sHandler, oEvent, oSource, oParameters) {
+        handleEditModeAction: function (sHandler, oEvent) {
+            var oSource = oEvent.getSource();
+            var oParameters = oEvent.getParameters();
             sap.ui.require([
                 "sap/ushell/components/pages/ActionMode"
             ], function (ActionMode) {

package/src/main/js/sap/ushell/components/pages/controller/PagesAndSpaceId.js

@@ -16,7 +16,7 @@ sap.ui.define([
      * @private
      * @since 1.72.0
      */
-    PagesAndSpaceId.prototype._getPageAndSpaceId = function (sShellHash) {
+    PagesAndSpaceId.prototype.getPageAndSpaceId = function (sShellHash) {
         return sap.ushell.Container.getServiceAsync("URLParsing").then(function (urlParsingService) {
             // during boottask the hash gets provided via parameter
             // within the controller it needs to be fetched via the hasher

package/src/main/js/sap/ushell/components/pages/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.pages",
         "applicationVersion": {
-            "version": "1.115.1"
+            "version": "1.117.0"
         },
         "i18n": {
             "bundleUrl": "../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/pages/view/PageRuntime.view.xml

@@ -21,56 +21,12 @@
                             dataHelpId="Page-{id}"
                             sections="{
                                 path: 'sections',
-                                templateShareable: false,
+                                factory: '._sectionFactory',
                                 key: 'id'
                             }"
                             addSectionButtonPressed=".handleEditModeAction('addSection', $event, ${$source>/}, ${$parameters>/})"
                             enableSectionReordering="{viewSettings>/actionModeEditActive}"
                             sectionDrop=".handleEditModeAction('moveSection', $event, ${$source>/}, ${$parameters>/})">
-                            <launchpad:sections>
-                                <launchpad:Section
-                                    title="{title}"
-                                    class="sapContrastPlus"
-                                    sizeBehavior="{viewSettings>/sizeBehavior}"
-                                    dataHelpId="Section-{id}"
-                                    default="{default}"
-                                    visualizations="{
-                                        path: 'visualizations',
-                                        factory: '._visualizationFactory',
-                                        key: 'id'
-                                    }"
-                                    gridContainerGap="{viewSettings>/gridContainerGap/gridContainerGap}"
-                                    gridContainerGapXS="{viewSettings>/gridContainerGap/gridContainerGapXS}"
-                                    gridContainerGapS="{viewSettings>/gridContainerGap/gridContainerGapS}"
-                                    gridContainerGapM="{viewSettings>/gridContainerGap/gridContainerGapM}"
-                                    gridContainerGapL="{viewSettings>/gridContainerGap/gridContainerGapL}"
-                                    gridContainerGapXL="{viewSettings>/gridContainerGap/gridContainerGapXL}"
-                                    gridContainerRowSize="{viewSettings>/gridContainerRowSize/gridContainerRowSize}"
-                                    gridContainerRowSizeXS="{viewSettings>/gridContainerRowSize/gridContainerRowSizeXS}"
-                                    gridContainerRowSizeS="{viewSettings>/gridContainerRowSize/gridContainerRowSizeS}"
-                                    gridContainerRowSizeM="{viewSettings>/gridContainerRowSize/gridContainerRowSizeM}"
-                                    gridContainerRowSizeL="{viewSettings>/gridContainerRowSize/gridContainerRowSizeL}"
-                                    gridContainerRowSizeXL="{viewSettings>/gridContainerRowSize/gridContainerRowSizeXL}"
-                                    enableGridBreakpoints="false"
-                                    enableGridContainerQuery="{viewSettings>/ushellContainerDocked}"
-                                    editable="{viewSettings>/actionModeEditActive}"
-                                    add=".handleEditModeAction('addVisualization', $event, ${$source>/}, ${$parameters>/})"
-                                    delete=".handleEditModeAction('deleteSection', $event, ${$source>/}, ${$parameters>/})"
-                                    reset=".handleEditModeAction('resetSection', $event, ${$source>/}, ${$parameters>/})"
-                                    sectionVisibilityChange=".handleEditModeAction('changeSectionVisibility', $event, ${$source>/}, ${$parameters>/})"
-                                    titleChange=".handleEditModeAction('changeSectionTitle', $event, ${$source>/}, ${$parameters>/})"
-                                    enableVisualizationReordering="{viewSettings>/personalizationEnabled}"
-                                    areaDragEnter=".onAreaDragEnter"
-                                    visualizationDrop=".moveVisualization($event, ${$source>/}, ${$parameters>/})"
-                                    showSection="{visible}"
-                                    visible="{= !!${visualizations}.length || ${viewSettings>/actionModeEditActive} }"
-                                    noVisualizationsText="{i18n>PageRuntime.EditMode.EmptySection}"
-                                    showNoVisualizationsText="{viewSettings>/actionModeEditActive}"
-                                    enableAddButton="{viewSettings>/showAddButton}"
-                                    enableResetButton="{ parts: ['id', 'preset'], formatter: '._sectionEnableReset'}"
-                                    enableDeleteButton="{ parts: ['id', 'preset'], formatter: '._sectionEnableDelete'}"
-                                    enableShowHideButton="{viewSettings>/showHideButton}" />
-                            </launchpad:sections>
                             <launchpad:dragDropConfig>
                                 <dnd:DropInfo
                                     groupName="Section"

package/src/main/js/sap/ushell/components/runtimeSwitcher/controller/RuntimeSwitcher.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file RuntimeSwitcher's controller for RuntimeSwitcher's view
- * @version 1.115.1
+ * @version 1.117.0
  */
  sap.ui.define([
     "sap/ui/core/mvc/Controller",
@@ -25,7 +25,7 @@
     return Controller.extend("sap.ushell.components.runtimeSwitcher.controller.RuntimeSwitcher", /** @lends sap.ushell.components.runtimeSwitcher.controller.RuntimeSwitcher.prototype */ {
         /**
          * UI5 lifecycle method which is called upon controller initialization.
-         * @return {Promise} Resolves when the routing has been handled.
+         * @returns {Promise} Resolves when the routing has been handled.
          * @since 1.106.0
          * @private
          */
@@ -46,13 +46,13 @@
 
         /**
          * Decides which component should be loaded/navigated to
-         * @return {Promise} A promise that resolves when the component is loaded
+         * @returns {Promise} A promise that resolves when the component is loaded
          * @private
          */
         _handleRouter: function () {
             var sPageId;
             return Promise.all([
-                PagesAndSpaceId._getPageAndSpaceId(),
+                PagesAndSpaceId.getPageAndSpaceId(),
                 sap.ushell.Container.getServiceAsync("Menu")
             ])
                 .then(function (aResults) {

package/src/main/js/sap/ushell/components/runtimeSwitcher/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.runtimeSwitcher",
         "applicationVersion": {
-            "version": "1.115.1"
+            "version": "1.117.0"
         },
         "ach": "CA-FLP-FE-COR",
         "type": "component",

package/src/main/js/sap/ushell/components/shell/MenuBar/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.MenuBar",
         "applicationVersion": {
-            "version": "1.115.1"
+            "version": "1.117.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",