@sapui5/sap.ushell 1.112.3 → 1.114.0

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

@@ -1,4 +1,4 @@
-//Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+//Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview this module handles the creation of requests for the dynamic tile
  */

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview
@@ -7,7 +7,7 @@
  *
  * Example:
  *
- * <code>
+ * <pre>
  *   var oXHttpClient = new XHttpClient("/basePath/", {
  *       headers: {
  *           "Content-Type": "application/json"
@@ -18,7 +18,7 @@
  *   }).catch(function () {
  *       ...
  *   });
- * </code>
+ * </pre>
  *
  * The supported HTTP methods of the XHttpClient are:
  * - GET

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

@@ -1,4 +1,4 @@
-//Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+//Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview A read-only JSON Model. The set and load methods are overwritten by empty methods.

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview URL Parsing
@@ -316,7 +316,7 @@ sap.ui.define([
      *   <code>#SO-Action~Context?P1=a&P2=x&/route?RPV=1</code> the hash part of an URL, <br/>
      *   e.g. <code>"#Object-name~AFE2==?PV1=PV2&PV4=V5&/display/detail/7?UU=HH</code>
      * @returns {object} <code>undefined</code> if not a parseable hash<br/>
-     *   <code>
+     * <pre>
      *   {
      *     semanticObject : string, <br/>
      *     action : string, <br/>
@@ -324,7 +324,7 @@ sap.ui.define([
      *     params :  MapObject<String,Array[String]>, <br/>
      *     appSpecificRoute : string <br/>
      *   }
-     *   </code>
+     * </pre>
      *   Note that params always has an Array for each parameter value!
      * @since 1.94.0
      * @protected
@@ -397,12 +397,12 @@ sap.ui.define([
      *   the hash part of an URL, e.g. <code>"#Object-name~AFE2==?PV1=PV2&PV4=V5&/display/detail/7?UU=HH<code>
      * @returns {object}
      *   <code>{}</code>(empty object) if not a parseable hash
-     *   <code>
+     * <pre>
      *   {
      *     shellPart : "Object-name~AFE2==?PV1=PV2&PV4=V5",
      *     appSpecificRoute : "display/detail/7?UU=HH"
      *   }
-     *   </code> otherwise
+     * </pre> otherwise
      *   Note that params always has an Array for each parameter value!
      * @since 1.94.0
      * @protected
@@ -448,7 +448,7 @@ sap.ui.define([
      *   returns "" for an undefined object
      * @param {object} oShellHash The action must be a valid action, it may not contain "?" or directly a parameter string
      *   <code>undefined</code> if not a parseable hash
-     *   <code>
+     * <pre>
      *   {
      *     target: {
      *       semanticObject: string,
@@ -459,7 +459,7 @@ sap.ui.define([
      *     appStateKey: string
      *     appSpecificRoute: string
      *   }
-     *   </code>
+     * </pre>
      *   xor
      *   <code>{ target: { shellHash } }</code>
      *   Note: in general it is preferred to add an appStateKey directly to the params object

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

@@ -1,11 +1,11 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview UrlShortening
  *
  * This module is for internal Shell usage only
  *
- * @version 1.112.3
+ * @version 1.114.0
  */
  sap.ui.define(["sap/base/Log", "sap/ushell/utils/UrlParsing"], function (Log, urlParsing) {
     "use strict";

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview This file contains miscellaneous utility functions for the window object.
@@ -139,48 +139,63 @@ sap.ui.define([
      *
      * Result: sap-client=010&sap-language=EN&sap-theme=sap_fiori_3
      *
-     * @param {string[]} aUrlParams url parameters which should be added to url
+     * @param {string[]} aUrlParams Array of obejcts with url parameters and their value which should be added to the url
+     * @param {string[]} aObsoleteUrlParams Array with url parameters (strings) which should be removed from the url
      *
-     * @returns {string} new query string
+     * @returns {string} new query string (without "?")
      * @private
      * @since 1.86.0
      */
-    WindowUtils._getAdjustedQueryString = function (aUrlParams) {
+    WindowUtils._getAdjustedQueryString = function (aUrlParams, aObsoleteUrlParams) {
+        if ((!aUrlParams || aUrlParams.length === 0) && (!aObsoleteUrlParams || aObsoleteUrlParams.length === 0)) {
+            return null;
+        }
+
+        var oOriginUriParameters = UriParameters.fromQuery(window.location.search);
+        var oNewUrlParameter = Array.from(oOriginUriParameters.keys()).reduce(function (oResult, sParam) {
+            oResult[sParam] = oOriginUriParameters.getAll(sParam);
+            return oResult;
+        }, {});
+
         if (aUrlParams && aUrlParams.length > 0) {
-            var oOriginUriParameters = UriParameters.fromQuery(window.location.search);
-            var oNewUrlParameter = Array.from(oOriginUriParameters.keys()).reduce(function (oResult, sParam) {
-                oResult[sParam] = oOriginUriParameters.getAll(sParam);
-                return oResult;
-            }, {});
             aUrlParams.forEach(function (oParam) {
                 var sParamName = Object.keys(oParam)[0];
                 if (sParamName) {
                     oNewUrlParameter[sParamName] = oParam[sParamName];
                 }
             });
-            return ushellUtils.urlParametersToString(oNewUrlParameter);
         }
-        return null;
+
+        if (aObsoleteUrlParams && aObsoleteUrlParams.length > 0) {
+            aObsoleteUrlParams.forEach(function (sParam) {
+                delete oNewUrlParameter[sParam];
+            });
+        }
+
+        return ushellUtils.urlParametersToString(oNewUrlParameter);
     };
 
     /**
      * Triggers a refresh to the current intent
      *
-     * @param {string[]} aUrlParams url parameters which should be added to url
+     * @param {string[]} aUrlParams url parameters which should be added to the url
+     * @param {string[]} aObsoleteUrlParams url parameters which should be removed from the url
      *
      * @private
      * @since 1.86.0
      */
-    WindowUtils.refreshBrowser = function (aUrlParams) {
-        var sNewHref = ushellUtils.getLocationHref(),
-            sNewLocationSearch = WindowUtils._getAdjustedQueryString(aUrlParams);
+    WindowUtils.refreshBrowser = function (aUrlParams, aObsoleteUrlParams) {
+        var sNewHref = ushellUtils.getLocationHref();
+        var sLocationSearch = ushellUtils.getLocationSearch();
+        var sNewLocationSearch = WindowUtils._getAdjustedQueryString(aUrlParams, aObsoleteUrlParams);
+
         if (sNewLocationSearch) {
-            sNewHref = sNewHref.replace(location.search, "?" + sNewLocationSearch);
+            sNewHref = sNewHref.replace(sLocationSearch, "?" + sNewLocationSearch);
         }
         if (ushellUtils.getLocationHref() === sNewHref) {
-            window.location.reload(true /* bHardReload */);
+            ushellUtils.windowLocationReload();
         } else {
-            window.location = sNewHref;
+            ushellUtils.windowLocationAssign(sNewHref);
         }
     };
 

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/ObjectPath"

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview This file contains functionality to deep clone javascript

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview This file contains miscellaneous utility

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview This file contains functionality to check and operate on

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/Log",

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @file This file contains miscellaneous utility functions.
@@ -774,10 +774,14 @@ sap.ui.define([
      * @returns {object[]} Tile objects, each one including the flag "isDisplayedInViewPort" indicating its visibility.
      */
     utils.getVisibleTiles = function () {
-        var nWindowHeight = document.body.clientHeight,
-            oControl = sap.ui.getCore().byId("dashboardGroups"),
-            oNavContainer = sap.ui.getCore().byId("viewPortContainer"),
-            groupsIndex,
+        var nWindowHeight = document.body.clientHeight;
+        var oControl = sap.ui.getCore().byId("dashboardGroups");
+        var oNavContainer = sap.ui.getCore().byId("viewPortContainer");
+        var shellHdrHeight = 0;
+        var aTiles = [];
+        var aVisibleTiles = [];
+        var oEventBus = sap.ui.getCore().getEventBus();
+        var groupsIndex,
             tilesIndex,
             aElementsInd,
             group,
@@ -788,12 +792,8 @@ sap.ui.define([
             tileOffset,
             tileTop,
             tileBottom,
-            shellHdrHeight = jQuery("#shell-hdr").height(),
-            aTiles = [],
             aGrpDomElement,
             bIsInDashBoard,
-            aVisibleTiles = [],
-            oEventBus = sap.ui.getCore().getEventBus(),
             aGroups,
             oElementsByType,
             oElements,
@@ -1177,6 +1177,35 @@ sap.ui.define([
         return window.location.href;
     };
 
+    /**
+     * Returns the current location search.
+     *
+     * @returns {string} The current location search.
+     * @private
+     */
+    utils.getLocationSearch = function () {
+        return window.location.search;
+    };
+
+    /**
+     * Reloads the current location
+     * @private
+     */
+    utils.windowLocationReload = function () {
+        window.location.reload(true /*Firefox-specific: Hard reload*/);
+    };
+
+    /**
+     * Updates the current location
+     *
+     * @param {string} url The URL to be assigned as location
+     * @private
+     */
+    utils.windowLocationAssign = function (url) {
+        window.location.assign(url);
+    };
+
+
     /**
      * Generates a key to store or retrieve an item from the storage localStorage or sessionStorage).
      * This key allows to reach the information in the local storage starting from the given ids and prefix.

package/src/test/js/sap/ushell/bootstrap/sandbox.js

@@ -1,9 +1,9 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  *
- * @version 1.112.3
+ * @version 1.114.0
  */
 
 (function () {

package/ui5.yaml

@@ -2,7 +2,7 @@ specVersion: '2.4'
 type: library
 metadata:
   name: sap.ushell
-  copyright: Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+  copyright: Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 resources:
   configuration:
     propertiesFileSourceEncoding: ISO-8859-1
@@ -271,8 +271,8 @@ builder:
               - sap/ushell/services/VisualizationDataProvider.js
               - sap/ushell/services/VisualizationInstantiation.js
               - sap/ushell/services/_VisualizationInstantiation/*.control.xml
+              - sap/ushell/ui/RendererRootView.fragment.xml
               - sap/ushell/ui/ShellHeader.fragment.xml
-              - sap/ushell/ui/ShellLayout.fragment.xml
               - sap/ushell/ui/cards/FrequentActivitiesExtension.js
               - sap/ushell/ui/cards/RecentActivitiesExtension.js.js
               - sap/ushell/ui5service/ShellUIService.js
@@ -320,7 +320,7 @@ builder:
               - sap/ui/unified/
               - sap/ui/util/
               - sap/ushell/
-              - '!**/*-preload.js'
+              - '!**/*-preload*.js'
               - '!**/*.support.js'
               - '!**/designtime/'
               - '!sap/m/rules/'
@@ -468,6 +468,7 @@ builder:
       - sap/ushell/components/pages/Component.js
       - sap/ushell/components/runtimeSwitcher/Component.js
       - sap/ushell/components/shell/MenuBar/Component.js
+      - sap/ushell/components/shell/NavigationBarMenu/Component.js
       - sap/ushell/components/shell/UserActionsMenu/Component.js
       - sap/ushell/components/shell/Notifications/Component.js
       - sap/ushell/components/shell/PostLoadingHeaderEnhancement/Component.js

package/src/main/js/sap/ushell/components/cepsearchresult/app/cards/searchresultwidget/Main.controller.js

@@ -1,111 +0,0 @@
-//Copyright (c) 2009-2022 SAP SE, All Rights Reserved
-sap.ui.define([
-  "sap/ui/core/mvc/Controller",
-  "sap/ui/model/resource/ResourceModel",
-  "sap/m/HBox",
-  "./controls/SearchResultList",
-  "sap/ushell/components/cepsearchresult/app/util/SearchResultManager"
-], function (Controller, ResourceModel, HBox, SearchResultList, SearchResultManager) {
-  "use strict";
-  //load fragments only once
-  return Controller.extend("sap.ushell.components.cepsearchresult.app.cards.searchresultwidget.Main", {
-    onInit: function () {
-      this.oView = this.getView();
-      var oOwnerComponent = this.getOwnerComponent();
-      this.oCard = oOwnerComponent.oCard;
-      this.oResourceModel = new ResourceModel({
-        bundleName: "sap.ushell.components.cepsearchresult.app.cards.searchresultwidget.i18n.i18n"
-      });
-      //the card i18n model
-      this.oView.setModel(this.oResourceModel, "card_i18n");
-      //allow data binding to parameters of the card
-      this.oView.setModel(this.oCard.getModel("parameters"), "parameters");
-      this.sCategories = oOwnerComponent.getCategories();
-      this.sSearchTerm = oOwnerComponent.getSearchTerm();
-      var sEdition = oOwnerComponent.getEdition();
-      if (sEdition === "custom") {
-        this.oSearchResultManager = new SearchResultManager(oOwnerComponent.getConfig());
-      } else {
-        this.oSearchResultManager = new SearchResultManager(oOwnerComponent.getEdition());
-      }
-      // init async
-      this.oSearchResultManager._loaded.then(this.initUIAsync.bind(this));
-    },
-    initUIAsync: function () {
-      this.oView.setModel(this.oSearchResultManager.getResourceModel(), "cati18n");
-      this.oCategoriesModel = this.oSearchResultManager.getCategoriesModel(this.sCategories);
-      this.oCategoriesModel.getProperty("/").forEach(function (oCategory) {
-        if (!oCategory) {
-          return;
-        }
-        // create the model
-        var oSearchResultModel = this.oSearchResultManager.createSearchResultModel(
-          oCategory.name,
-          this.oCard,
-          this.oCategoriesModel
-        );
-        //create a new list
-        var oList = this._createList(oSearchResultModel);
-        var oBox = new HBox({
-          items: [oList]
-        });
-        oBox.addStyleClass("sapFCard");
-        oBox.addStyleClass("sapUiCEPCatCard");
-        // add to view
-        this.oView.byId("content").addItem(oBox);
-      }.bind(this));
-      this.oView.setVisible(true);
-    },
-    _createList: function (oSearchResultModel) {
-      //clone the List
-      var oList = new SearchResultList({
-        noDataText: "{category>_status/dataStatusText}",
-        category: "{category>}",
-        paging: "{= ${category>list/paging}}",
-        viewAll: false,
-        view: "{category>list/_currentView}",
-        items: "{path:'data>'}",
-        template: "{= ${category>list/item/template}}"
-      });
-      if (this.sCategories === "all") {
-        oList.setViewAll(true);
-        oList.attachShowAll(function (oEvent) {
-          this._navigateTo(oEvent.getParameter("category"));
-        }.bind(this));
-      }
-      if (this.sSearchTerm) {
-        // Pass on the search term for highlighting text
-        oList.setHighlightTerm(this.sSearchTerm);
-      }
-      //apply the models and binding contexts
-      oList.applyModelContexts(oSearchResultModel, {
-        category: "/",
-        data: "/list/data/_result",
-        count: "/list/data/_count"
-      });
-      oList.attachItemPress(function (oEvent) {
-        var sUrl = oEvent.getParameter("listItem").getBindingContext("data").getProperty("url");
-        document.location.hash = sUrl;
-      });
-      oList.attachFetchData(function (oEvent) {
-        var mParameters = oEvent.getParameters();
-        oSearchResultModel.setProperty("/list/paginator/pageSize", mParameters.pageSize);
-        //trigger data fetch for the page
-        oSearchResultModel.fetchCategoryData(mParameters.page);
-      });
-      oList.loadForVisibleItemCount(
-        oSearchResultModel.getProperty("/list/paginator/pageSize"),
-        this.oCard.getDomRef()
-      );
-      return oList;
-    },
-    _navigateTo: function (sCategory) {
-      this.getOwnerComponent().oCard.fireAction({
-        type: "Navigation",
-        parameters: {
-          category: sCategory
-        }
-      });
-    }
-  });
-});

package/src/main/js/sap/ushell/components/cepsearchresult/app/cards/searchresultwidget/Main.view.xml

@@ -1,10 +0,0 @@
-<mvc:View xmlns:core="sap.ui.core"
-  xmlns:mvc="sap.ui.core.mvc"
-  xmlns="sap.m"
-  width="100%"
-  controllerName="sap.ushell.components.cepsearchresult.app.cards.searchresultwidget.Main"
-  visible="false">
-  <!-- initially the view is not visible, the controller needs to load fragments first in initViewAsync-->
-  <VBox id="content">
-  </VBox>
-</mvc:View>