@sapui5/sap.ushell 1.111.1 → 1.112.1

package/src/main/js/sap/ushell/components/workPageRuntime/controller/WorkPageRuntime.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file WorkPageRuntime controller for WorkPageRuntime view
- * @version 1.111.1
+ * @version 1.112.1
  */
 sap.ui.define([
     "sap/base/Log",
@@ -11,9 +11,7 @@ sap.ui.define([
     "sap/base/util/deepExtend",
     "sap/ushell/EventHub",
     "sap/ushell/components/pages/controller/PagesAndSpaceId",
-    "sap/ushell/resources",
-    "sap/ushell/Config",
-    "sap/base/util/ObjectPath"
+    "sap/ushell/Config"
 ], function (
     Log,
     Controller,
@@ -21,9 +19,7 @@ sap.ui.define([
     deepExtend,
     EventHub,
     PagesAndSpaceId,
-    resources,
-    Config,
-    ObjectPath
+    Config
 ) {
     "use strict";
 
@@ -62,15 +58,8 @@ sap.ui.define([
                 .then(function (sPageId) {
                     this._sPageId = sPageId;
                     this._sSiteId = oUrlParams.get("siteId") || Config.last("/core/site/siteId");
-                    this._bWorkPageIsDirty = false;
 
-                    var oAttachEventPromise = this._oWorkPageBuilderComponentCreatedPromise.then(function (oComponent) {
-                        oComponent.attachEvent("workPageEdited", this._onWorkPageChanged.bind(this, true));
-                        oComponent.attachEvent("visualizationFilterApplied", this._loadFilteredVisualizations.bind(this));
-                        oComponent.attachEvent("closeEditMode", this._closeEditMode.bind(this));
-                    }.bind(this));
-
-                    var oWorkPageLoadPromise = this._onWorkPageLoad()
+                    return this._onWorkPageLoad()
                         .finally(function () {
                             // Required to load the core-ext bundles to enable menubar, usersettings, search, ...
                             EventHub.emit("CenterViewPointContentRendered");
@@ -81,45 +70,10 @@ sap.ui.define([
                                 this.oContainerRouter.getRoute("openFLPPage").attachMatched(this.onRouteMatched.bind(this, false));
                             }
                         }.bind(this));
-
-                    return Promise.all([
-                        oAttachEventPromise,
-                        oWorkPageLoadPromise
-                    ]);
                 }.bind(this))
                 .catch(this._handleErrors.bind(this));
         },
 
-        /**
-         * On first rendering of the page
-         * @param {boolean} bEditable Flag if the WorkPage is allowed to be edited.
-         * @return {Promise} Promise Resolves if operation is successful
-         * @private
-         *
-         */
-        _handleEditModeButton: function (bEditable) {
-            var bPageIsEditable = bEditable; // Editable property comes from server
-            var bIsAdminUser = sap.ushell.Container.getUser().isAdminUser(); // The flag comes from the server, too.
-            if (bPageIsEditable && bIsAdminUser) {
-                return this._createEditModeButton(
-                    this._createEditButtonControlProperties()
-                );
-            }
-            this._hideEditModeButton();
-            return Promise.resolve();
-        },
-
-        /**
-         * Called when the user has changed the work page during editing or the dirty state is cleared.
-         * @param {boolean} bChanged If the page was changed after last save
-         * @private
-         *
-         */
-        _onWorkPageChanged: function (bChanged) {
-            this._bWorkPageIsDirty = !!bChanged;
-            sap.ushell.Container.setDirtyFlag(!!bChanged);
-        },
-
         /**
          * Navigates to the WorkPage page in the NavContainer.
          *
@@ -129,232 +83,22 @@ sap.ui.define([
             this.oWorkPageNavContainer.to(this.byId("workPage"));
         },
 
-        /**
-         * Create control properties for edit button
-         * @returns {Object} control properties for the edit button
-         * @private
-         */
-        _createEditButtonControlProperties: function () {
-            var sButtonText = resources.i18n.getText("WorkpageRuntime.EditMode.Activate");
-            Log.debug("cep/editMode: create Edit Button", "Workpage runtime");
-            return {
-                id: "EditModeBtn",
-                text: sButtonText,
-                icon: "sap-icon://edit",
-                press: [this.pressEditModeButton, this]
-            };
-        },
-
-        /**
-         * Creates the edit button or sets visibility to true if it exists
-         * @param {Object} oEditButtonObjectData UI data for edit button
-         * @return {Promise} Promise Resolves if operation is successful
-         * @private
-         *
-         */
-        _createEditModeButton: function (oEditButtonObjectData) {
-            var oAddEditButtonParameters = {
-                controlType: "sap.ushell.ui.launchpad.ActionItem",
-                oControlProperties: oEditButtonObjectData,
-                bIsVisible: true,
-                aStates: ["home"]
-            };
-            this._showEditModeButton();
-            return sap.ushell.Container
-                .getRenderer("fiori2")
-                .addUserAction(oAddEditButtonParameters)
-                .then(function (oEditButton) {
-                    // if xRay is enabled
-                    if (Config.last("/core/extension/enableHelp")) {
-                        oEditButton.addStyleClass("help-id-EditModeBtn");// xRay help ID
-                    }
-                });
-        },
-
-        /**
-         * Sets the text ID for the edit button
-         * @param {String} sTextId Text ID
-         * @private
-         */
-        _setEditButtonText: function (sTextId) {
-            if (sTextId) {
-                var oEditModeButton = sap.ui.getCore().byId("EditModeBtn");
-                if (oEditModeButton) {
-                    var sEditModeText = resources.i18n.getText(sTextId);
-                    oEditModeButton.setText(sEditModeText);
-                    oEditModeButton.setTooltip(sEditModeText);
-                }
-            }
-        },
-
-        /**
-         * Toggles the edit mode via the user menu
-         * Toggles the text of the edit menu entry
-         * @private
-         */
-        pressEditModeButton: function () {
-            // If edit mode and there are changes
-            if (this._oWorkPageBuilderComponent.getEditMode()) {
-                if (this._bWorkPageIsDirty) {
-                    this._saveChanges(); // Save and exit
-                } else {
-                    this._toggleEditMode(false); // No changes, exit directly
-                }
-            } else {
-                this._toggleEditMode(true); // Activate editing mode
-            }
-        },
-
-        /**
-         * Toggles the edit mode according to the given bEditMode argument.
-         *
-         * @param {boolean} bEditMode Boolean indicating if editMode should be entered or left.
-         * @private
-         */
-        _toggleEditMode: function (bEditMode) {
-            EventHub.emit("enableMenuBarNavigation", !bEditMode);
-            Log.debug("cep/editMode: toggle edit mode", " Work Page runtime");
-            this._oWorkPageBuilderComponent.setEditMode(bEditMode);
-            this._setEditButtonText(
-                bEditMode ? "PageRuntime.EditMode.Exit" : "WorkpageRuntime.EditMode.Activate"
-            );
-            // Clear the dirty flag when start or done with editing.
-            this._onWorkPageChanged(false);
-        },
-
-        /**
-         * Cancel any changes when the user pressed Cancel in Editing Mode and close editing.
-         *
-         * @private
-         */
-        _cancelChanges: function () {
-            this._toggleEditMode(false);
-            this._oWorkPageBuilderComponent.setPageData(deepExtend({}, this._oOriginalData));
-        },
-
-        /**
-         * Save changes when the user pressed Save in Editing Mode and close editing.
-         * @return {Promise} A promise resolving when the WorkPage has been updated.
-         * @private
-         */
-        _saveChanges: function () {
-            var oView = this.getView();
-            oView.setBusy(true);
-            return this._updateWorkPage()
-                .then(function (oData) {
-                    // Show message and update workpage builder.
-                    sap.ui.require(["sap/m/MessageToast"], function (MessageToast) {
-                        MessageToast.show(resources.i18n.getText("savedChanges"), { duration: 4000 });
-                    });
-                    this._toggleEditMode(false);
-                    this._oOriginalData = deepExtend({}, oData);
-                    this._oWorkPageBuilderComponent.setPageData(oData);
-                }.bind(this))
-                .catch(function (oError) {
-                    // Show error message
-                    var sErrorMsg = oError.responseText || oError;
-                    sap.ui.require(["sap/m/MessageBox"], function (MessageBox) {
-                        MessageBox.error(sErrorMsg, {
-                            title: oError.statusText
-                        });
-                    });
-                })
-                .finally(function () {
-                    oView.setBusy(false);
-                });
-        },
-
-        /**
-         * Closes the edit mode.
-         *
-         * @param {sap.base.Event} oEvent Event indicating if the changes have to be saved.
-         * @private
-         */
-        _closeEditMode: function (oEvent) {
-            (oEvent.getParameter("saveChanges") ? this._saveChanges : this._cancelChanges).bind(this)();
-        },
-
         /**
          * @param {sap.base.Event} oEvent The "onWorkPageBuilderCreated" event.
          */
         onWorkPageBuilderCreated: function (oEvent) {
             this._oWorkPageBuilderComponent = oEvent.getParameter("component");
-            this._oWorkPageBuilderComponent.setShowFooter(true);
             this._oWorkPageBuilderComponentResolve(this._oWorkPageBuilderComponent);
         },
 
-        /**
-         * Loads the available visualizations. If the "Type" filter is present, apply the given filter value.
-         *
-         * @param {sap.ui.base.Event} oEvent The "visualizationFilterApplied" event.
-         * @return {Promise} A promise resolving when the resulting visualizations have been set to the WorkPageBuilder
-         * @private
-         */
-        _loadFilteredVisualizations: function (oEvent) {
-            var aFilters = oEvent.getParameter("filters") || [];
-            var oTypeFilter;
-            var aTypeFilterValues = [];
-
-            if (aFilters.length > 0) {
-                oTypeFilter = aFilters.find(function (oFilter) { return oFilter.filterKey === "Type"; });
-                if (oTypeFilter && oTypeFilter.filterValue && oTypeFilter.filterValue.length > 0) {
-                    aTypeFilterValues = oTypeFilter.filterValue;
-                }
-            }
-
-            return this.oWorkPageService.loadFilteredVisualizations("", aTypeFilterValues).then(function (oVizNodes) {
-                this._oWorkPageBuilderComponent.setVisualizationData(oVizNodes);
-            }.bind(this));
-        },
-
-        /**
-         * Saves the WorkPage on the backend after editing.
-         * @return {Promise<{ WorkPage: {UsedVisualizations: { nodes: object[] }, Editable: boolean}}>} Promise resolving with the updated data.
-         * @private
-         */
-        _updateWorkPage: function () {
-            var oPageData = this._oWorkPageBuilderComponent.getPageData();
-            var oWorkPageDataCopy = deepExtend({ Id: this._sPageId }, oPageData);
-            return this.oWorkPageService.updateWorkPage(this._sPageId, ObjectPath.get("WorkPage.Contents", oWorkPageDataCopy));
-        },
-
-        /**
-         * Hides the edit mode button
-         *
-         * @private
-         * @since 1.107.0
-         */
-        _hideEditModeButton: function () {
-            var oEditModeButton = sap.ui.getCore().byId("EditModeBtn");
-            Log.debug("cep/editMode: hide Edit Mode button", "Work Page runtime");
-            if (oEditModeButton) {
-                oEditModeButton.setVisible(false);
-            }
-        },
-        /**
-         * Shows the edit mode button.
-         *
-         * @private
-         * @since 1.107.0
-         */
-        _showEditModeButton: function () {
-            var oEditModeButton = sap.ui.getCore().byId("EditModeBtn");
-            Log.debug("cep/editMode: show Edit Mode button", "Work Page runtime");
-            if (oEditModeButton) {
-                oEditModeButton.setVisible(true);
-            }
-        },
-
         /**
          * Handles errors.
-         * Hides the edit button.
          * Navigates to the error page.
          *
          * @param {object|string} vError An error object or string.
          * @private
          */
         _handleErrors: function (vError) {
-            this._hideEditModeButton();
             Log.error("An error occurred while loading the page", vError);
             Log.debug("cep/editMode: on Route matched: Handle errors", "Work Page runtime");
             this.oWorkPageNavContainer.to(this.byId("errorPage"));
@@ -403,7 +147,6 @@ sap.ui.define([
                 oComponent.setPageData(oData);
 
                 this._navigate();
-                return this._handleEditModeButton(oData.WorkPage.Editable);
             }.bind(this));
         },
 
@@ -427,7 +170,6 @@ sap.ui.define([
          */
         hideRuntime: function () {
             Log.debug("cep/editMode: navigate to empty page", "Page runtime");
-            this._hideEditModeButton();
             this.oWorkPageNavContainer.to(this.oEmptyPage);
         }
     });

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.workPageRuntime",
         "applicationVersion": {
-            "version": "1.111.1"
+            "version": "1.112.1"
         },
         "ach": "CA-FLP-FE-UI",
         "type": "component",

package/src/main/js/sap/ushell/components/workPageRuntime/services/NavigationResolver.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module resolves the given inbounds via the navigation service.
- * @version 1.111.1
+ * @version 1.112.1
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell/components/workPageRuntime/services/WorkPage.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module communicates with the content API graphql service to retrieve and save workpage and visualization data.
- * @version 1.111.1
+ * @version 1.112.1
  */
 sap.ui.define([
     "sap/ui/core/Core",
@@ -103,175 +103,6 @@ sap.ui.define([
             });
     };
 
-    /**
-     * Save the WorkPage data for the given page Id.
-     * @param {string} sPageId The page id.
-     * @param {object} oPageData Data object with page data.
-     * @return {Promise<{ WorkPage: {UsedVisualizations: { nodes: object[] }, Editable: boolean}}>} A promise resolving with the returned work page and visualizations.
-     */
-    WorkPage.prototype.updateWorkPage = function (sPageId, oPageData) {
-
-        // Workaround until the service is updated to correctly accept the DescriptorSchemaId field
-        function _findDescriptorSchemaVersion (obj) {
-            for (var i in obj) {
-                if (obj[i] !== null && typeof obj[i] === "object") {
-                    if (obj.DescriptorSchemaVersion) {
-                        return obj.DescriptorSchemaVersion; // we believe it is always the same
-                    }
-                    return _findDescriptorSchemaVersion(obj[i]); // traverse recursively
-                }
-            }
-            return "";
-        }
-        var sDescriptorSchemaVersion = _findDescriptorSchemaVersion(oPageData);
-        function _fixPageData (obj, bCheckDescriptor) {
-            if (obj && obj.DescriptorSchemaId) {
-                delete obj.DescriptorSchemaId; // the DescriptorSchemaId field is not accepted by the server
-            }
-            for (var i in obj) {
-                if (obj[i] !== null && typeof obj[i] === "object") {
-                    _fixPageData(obj[i], !isNaN(i)); // traverse recursively, check descriptors for all array items
-                }
-            }
-            if (obj && bCheckDescriptor) { // make sure the required fields are present
-                obj.Descriptor = obj.Descriptor || {};
-                obj.DescriptorSchemaVersion = obj.DescriptorSchemaVersion || sDescriptorSchemaVersion;
-            }
-        }
-
-        // Workaround because the backend does not return an empty Cells array when querying the page, but expects one when saving the page.
-        function _fixEmptyColumns (obj) {
-            if (obj.Rows) {
-                obj.Rows.forEach(function (oRow) {
-                    if (oRow.Columns) {
-                        oRow.Columns.forEach(function (oCol) {
-                            if (!oCol.Cells) {
-                                oCol.Cells = [];
-                            }
-                        });
-                    }
-                });
-            }
-        }
-        _fixPageData(oPageData, true);
-        _fixEmptyColumns(oPageData);
-        // End of workarounds
-
-        var sQuery = "mutation updateWorkPage($WorkPageId: String!, $Contents: JSON) {" +
-                        "updateWorkPage(WorkPageId: $WorkPageId, Contents: $Contents ) {" +
-                            // return Id and new Contents
-                            "Id," +
-                            "Contents," +
-                            "Editable," +
-                            "UsedVisualizations{" +
-                                "nodes{" +
-                                    "Id," +
-                                    "Type," +
-                                    "Descriptor," +
-                                    "DescriptorResources{" +
-                                        "BaseUrl," +
-                                        "DescriptorPath" +
-                                    "}" +
-                                "}" +
-                            "}" +
-                        "}" +
-                    "}";
-        var oRequestData = {
-            query: sQuery,
-            variables: {
-                WorkPageId: sPageId,
-                Contents: oPageData
-            }
-        };
-
-        return this.httpClient.post(this._sBaseUrl, {
-            data: oRequestData,
-            headers: {
-                "Content-Type": "application/json",
-                Accept: "application/json",
-                "Accept-Language": Core.getConfiguration().getLanguageTag()
-            }
-        }).then(function (oResponse) {
-            if (oResponse.status < 200 || oResponse.status >= 300) {
-                return Promise.reject({
-                    statusText: "HTTP request failed with status: " + oResponse.status,
-                    responseText: oResponse.statusText
-                });
-            }
-            var oResponseData = {};
-            try {
-                oResponseData = JSON.parse(oResponse.responseText || "{}");
-            } catch (error) {
-                return Promise.reject({
-                    statusText: undefined,
-                    responseText: oResponse.responseText
-                });
-            }
-            var sTitle;
-            var sErrorMsg;
-            if (oResponseData.errors) {
-                // Try to format the graphql error response to a more readable state
-                try {
-                    var aErr = oResponseData.errors[0].split("[");
-                    sTitle = aErr[0];
-                    var aErrors = JSON.parse("[" + aErr[1]);
-                    sErrorMsg = JSON.stringify(aErrors, null, "  ");
-                } catch (error) {
-                    sTitle = null;
-                    sErrorMsg = oResponseData.errors;
-                }
-                return Promise.reject({
-                    statusText: sTitle,
-                    responseText: sErrorMsg
-                });
-            }
-            return oResponseData;
-        }).then(function (oReturnedPageData) {
-            var oWorkPageData = ObjectPath.get("data.updateWorkPage.Contents", oReturnedPageData);
-            var aVizData = ObjectPath.get("data.updateWorkPage.UsedVisualizations.nodes", oReturnedPageData) || [];
-            var bEditable = ObjectPath.get("data.updateWorkPage.Editable", oReturnedPageData) === true;
-            return {
-                WorkPage: {
-                    Contents: oWorkPageData,
-                    UsedVisualizations: { nodes: aVizData },
-                    Editable: bEditable
-                }
-            };
-        });
-    };
-
-    /**
-     * Load the visualizations for the given type in the given siteId.
-     * @param {string} sSiteId The site id.
-     * @param {string[]} aTypes The viz Types.
-     * @return {Promise<{Visualizations: {nodes: object[]}}>} Promise that resolves with an object containing the array of visualizations.
-     */
-
-    WorkPage.prototype.loadFilteredVisualizations = function (sSiteId, aTypes) {
-        var sTypes = aTypes.map(function (sType) { return "\"" + sType + "\""; }).join(",");
-        var sQuery = "{" +
-                "Visualizations(" +
-                    "SiteId:\"" + sSiteId + "\"," +
-                    "QueryInput:{filter:{Type:{in:[" + sTypes + "]}}}" +
-                ") {" +
-                    "nodes{" +
-                        "Id," +
-                        "Type," +
-                        "Descriptor," +
-                        "DescriptorResources{" +
-                            "BaseUrl," +
-                            "DescriptorPath" +
-                        "}" +
-                    "}" +
-                "}" +
-            "}";
-
-        return this._doRequest(sQuery).then(function (oResult) {
-            var aVizData = ObjectPath.get("data.Visualizations.nodes", oResult) || [];
-            return { Visualizations: { nodes: aVizData } };
-        });
-    };
-
     /**
      * Do the XHR request with the given query.
      *

package/src/main/js/sap/ushell/designtime/ApplicationContainer.designtime.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Provides the Design Time Metadata for the sap.ushell.components.container.ApplicationContainer control
- * @version 1.111.1
+ * @version 1.112.1
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/library.js

@@ -19,7 +19,7 @@ sap.ui.define([
      */
     var oUshellLibrary = Core.initLibrary({
         name: "sap.ushell",
-        version: "1.111.1",
+        version: "1.112.1",
         dependencies: [
             "sap.ui.core",
             "sap.m"
@@ -79,8 +79,6 @@ sap.ui.define([
             "sap.ushell.ui.footerbar.JamShareButton",
             "sap.ushell.ui.footerbar.LogoutButton",
             "sap.ushell.ui.footerbar.SendAsEmailButton",
-            "sap.ushell.ui.footerbar.SettingsButton",
-            "sap.ushell.ui.footerbar.UserPreferencesButton",
             "sap.ushell.ui.launchpad.ActionItem",
             "sap.ushell.ui.launchpad.AnchorItem",
             "sap.ushell.ui.launchpad.AnchorNavigationBar",

package/src/main/js/sap/ushell/navigationMode.js

@@ -11,7 +11,7 @@
  * Method Compute is used by ClientSide TargetResolution and takes not only the
  * next application but also the current application into account.
  *
- * @version 1.111.1
+ * @version 1.112.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/performance/ShellAnalytics.js

@@ -3,7 +3,7 @@
  * @fileOverview Provides analytical data like duration for navigation steps in the shell, in FLP,
  *               in particular an array of all statistical records
  *
- * @version 1.111.1
+ * @version 1.112.1
  */
 sap.ui.define([
     "sap/ushell/EventHub",

package/src/main/js/sap/ushell/performance/StatisticalRecord.js

@@ -3,7 +3,7 @@
  * @fileOverview Class for statistical record
  *               It should contain data like step, duration after a navigation in the shell, can have status open.
  *               The closing of a record is logged in debug mode
- * @version 1.111.1
+ * @version 1.112.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/plugins/appwarmup/Component.js

@@ -87,7 +87,7 @@ sap.ui.define(
         var sComponentName = "sap.ushell.plugins.appwarmup.Component";
         return Component.extend(sComponentName, {
             metadata: {
-                version: "1.111.1",
+                version: "1.112.1",
                 library: "sap.ushell"
             },
 

package/src/main/js/sap/ushell/renderers/fiori2/AccessKeysHandler.js

@@ -585,7 +585,9 @@ sap.ui.define([
 
         for (; oElement !== document.body; oElement = oElement.parentNode) {
             oClassList = oElement.classList;
-            if (oClassList.contains("sapUiCompSmartTable") || oClassList.contains("sapUiMdcTable")) {
+            if (oClassList.contains("sapUiCompSmartTable")
+                || oClassList.contains("sapUiMdcTable")
+                || oClassList.contains("sapMListTbl")) {
                 return true;
             }
         }

package/src/main/js/sap/ushell/renderers/fiori2/Renderer.js

@@ -75,9 +75,9 @@ sap.ui.define([
      */
     var Renderer = UIComponent.extend("sap.ushell.renderers.fiori2.Renderer", {
         metadata: {
-            version: "1.111.1",
+            version: "1.112.1",
             dependencies: {
-                version: "1.111.1",
+                version: "1.112.1",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },

package/src/main/js/sap/ushell/renderers/fiori2/allMyApps/AllMyApps.controller.js

@@ -655,7 +655,8 @@ sap.ui.define([
                         parts: ["allMyAppsModel>type", "/allMyAppsMasterLevel"],
                         formatter: this.formatListItemType
                     },
-                    title: "{allMyAppsModel>title}"
+                    title: "{allMyAppsModel>title}",
+                    wrapping: true // Accessibility: the whole text must be visible
                 });
             }
             return this.oTemplate;