@sapui5/sap.ushell 1.118.0 → 1.119.0

package/src/main/js/sap/ushell/components/applicationIntegration/configuration/AppMeta.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.118.0
+ * @version 1.119.0
  */
 sap.ui.define([
     "sap/base/util/extend",
@@ -22,7 +22,7 @@ sap.ui.define([
     ElementsModel,
     Device,
     Config,
-    utils,
+    ushellUtils,
     resources,
     EventHub,
     RelatedShellElements,
@@ -148,15 +148,15 @@ sap.ui.define([
             ElementsModel.updateStateProperty("application/title", sTitle, true);
             RelatedShellElements.genericSetItem("application/title", sTitle);
             window.document.title = sTitle;
-            utils.setPerformanceMark("FLP -- title change");
+            ushellUtils.setPerformanceMark("FLP -- title change");
             EventHub.emit("TitleChanged", sTitle);
         };
 
         /*
          * Helper function to get the favIcon image URL based on a given theme parameter.
          */
-        this._getDefaultFavIcon = function (oParameters) {
-            var favIcon = oParameters.get("sapUiShellFavicon");
+        this._getDefaultFavIcon = async function () {
+            let [favIcon] = await ushellUtils.getThemingParameters(["sapUiShellFavicon"]);
             if (favIcon) { // custom theme favicon
                 var match = /url[\s]*\('?"?([^'")]*)'?"?\)/.exec(favIcon);
                 if (match) {
@@ -199,31 +199,26 @@ sap.ui.define([
             //Performance Debug
             Measurement.start("FLP:ShellController.setAppIcons", "setValues", "FLP");
 
-            sap.ui.require(["sap/ui/core/theming/Parameters"], function (Parameters) {
-                if (Core.isThemeApplied()) {
-                    this.setValues(oMetadataConfig, Parameters);
-                } else {
-                    Core.attachThemeChanged(function () {
-                        this.setValues(oMetadataConfig, Parameters);
-                    }.bind(this));
-                }
-            }.bind(this));
+            if (Core.isThemeApplied()) {
+                this.setValues(oMetadataConfig);
+            } else {
+                Core.attachThemeChanged(function () {
+                    this.setValues(oMetadataConfig);
+                }.bind(this));
+            }
 
             Measurement.end("FLP:ShellController.setAppIcons");
         };
 
-        this.setValues = function (oMetadataConfig, Parameters) {
-            var sModulePath = sap.ui.require.toUrl("sap/ushell"),
-                oLaunchIconPhone = (oMetadataConfig && oMetadataConfig.homeScreenIconPhone) ||
-                    (sModulePath + "/themes/base/img/launchicons/57_iPhone_Desktop_Launch.png"),
-                oLaunchIconPhone2 = (oMetadataConfig && oMetadataConfig["homeScreenIconPhone@2"]) ||
-                    (sModulePath + "/themes/base/img/launchicons/114_iPhone-Retina_Web_Clip.png"),
-                oLaunchIconTablet = (oMetadataConfig && oMetadataConfig.homeScreenIconTablet) ||
-                    (sModulePath + "/themes/base/img/launchicons/72_iPad_Desktop_Launch.png"),
-                oLaunchIconTablet2 = (oMetadataConfig && oMetadataConfig["homeScreenIconTablet@2"]) ||
-                    (sModulePath + "/themes/base/img/launchicons/144_iPad_Retina_Web_Clip.png"),
-                oFavIcon = (oMetadataConfig && oMetadataConfig.favIcon) || (this._getDefaultFavIcon(Parameters)),
-                sCurrentFavIconHref = this.getFavIconHref();
+        this.setValues = async function (oMetadataConfig) {
+            var sModulePath = sap.ui.require.toUrl("sap/ushell");
+            var oLaunchIconPhone = (oMetadataConfig && oMetadataConfig.homeScreenIconPhone) || (sModulePath + "/themes/base/img/launchicons/57_iPhone_Desktop_Launch.png");
+            var oLaunchIconPhone2 = (oMetadataConfig && oMetadataConfig["homeScreenIconPhone@2"]) || (sModulePath + "/themes/base/img/launchicons/114_iPhone-Retina_Web_Clip.png");
+            var oLaunchIconTablet = (oMetadataConfig && oMetadataConfig.homeScreenIconTablet) || (sModulePath + "/themes/base/img/launchicons/72_iPad_Desktop_Launch.png");
+            var oLaunchIconTablet2 = (oMetadataConfig && oMetadataConfig["homeScreenIconTablet@2"]) || (sModulePath + "/themes/base/img/launchicons/144_iPad_Retina_Web_Clip.png");
+            var sDefaultFavIcon = await this._getDefaultFavIcon();
+            var oFavIcon = (oMetadataConfig && oMetadataConfig.favIcon) || sDefaultFavIcon;
+            var sCurrentFavIconHref = this.getFavIconHref();
             if (Device.os.ios) {
                 Mobile.setIcons({
                     phone: oLaunchIconPhone,

package/src/main/js/sap/ushell/components/applicationIntegration/elements/model.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The models assosicated with the applciation.
- * @version 1.118.0
+ * @version 1.119.0
  */
 sap.ui.define([
     "sap/ushell/EventHub",

package/src/main/js/sap/ushell/components/applicationIntegration/relatedServices/RelatedServices.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the services for the different applications.
- * @version 1.118.0
+ * @version 1.119.0
  */
 sap.ui.define([
     "sap/ui/core/Core"

package/src/main/js/sap/ushell/components/applicationIntegration/relatedShellElements/RelatedShellElements.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the related shell elements of the different applications.
- * @version 1.118.0
+ * @version 1.119.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/cards/Configuration.controller.js

@@ -194,8 +194,8 @@ sap.ui.define([
         /**
          * Fill the card's CHIP bag with texts extracted from the card's manifest
          *
-         * @param {Object} extractedData The card data extraced from the manifest
-         * @param {Object} tilePropertiesBag The card's properties bag
+         * @param {object} extractedData The card data extraced from the manifest
+         * @param {object} tilePropertiesBag The card's properties bag
          *
          * @private
          */

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

@@ -13,8 +13,9 @@ sap.ui.define([
   "sap/m/Menu",
   "sap/m/MenuItem",
   "sap/ushell/ui/footerbar/AddBookmarkButton",
-  "sap/f/GridContainerItemLayoutData"
-], function (Controller, Core, JSONModel, Edition, mLib, Menu, MenuItem, AddBookmarkButton, GridContainerItemLayoutData) {
+  "sap/f/GridContainerItemLayoutData",
+  "sap/ushell/EventHub"
+], function (Controller, Core, JSONModel, Edition, mLib, Menu, MenuItem, AddBookmarkButton, GridContainerItemLayoutData, EventHub) {
 
   "use strict";
   var URLHelper = mLib.URLHelper;
@@ -57,6 +58,9 @@ sap.ui.define([
           this.changeCategory(sQueryCategory);
         }
         this.getView().setVisible(true);
+
+        // Close FESR Record - consumed in ShellAnalytics
+        EventHub.emit("CloseFesrRecord", Date.now());
       }.bind(this));
     },
 

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/controls/Category.js

@@ -73,6 +73,11 @@ sap.ui.define(
 
     var IllustrationType = mLibrary.IllustratedMessageType;
 
+    var defaultItemWidths = {
+      tile: 190,
+      card: 400
+    };
+
     // Fix object identifier handle press
     ObjectIdentifier.prototype._handlePress = function (oEvent) {
       var oClickedItem = oEvent.target;
@@ -312,7 +317,7 @@ sap.ui.define(
       this.updateDataModel({});
     };
 
-    Category.prototype.search = function (sSearchTerm, iSkip, iTop) {
+    Category.prototype.search = function (sSearchTerm, iSkip, iTop, bForced) {
       iTop = isNaN(iTop) || iTop < 0 ? this._iTop || this.getPageSize() : iTop;
       iSkip = isNaN(iSkip) || iSkip < 0 ? this._iSkip || 0 : iSkip;
       if (typeof sSearchTerm !== "string") {
@@ -323,7 +328,7 @@ sap.ui.define(
         pFetch,
         oCurrentData = this.getModel("data").getData() || {};
 
-      if (!this.resetDataRequired(sSearchTerm, iSkip, iTop)) {
+      if (!bForced && !this.resetDataRequired(sSearchTerm, iSkip, iTop)) {
         this.fireFetchEvent("before", "skipped", oCurrentData);
         this.fireFetchEvent("after", "skipped", oCurrentData);
         return;
@@ -351,18 +356,40 @@ sap.ui.define(
       if (pFetch) {
         pFetch.then(function (oData) {
           this._iCurrentCount = oData.count || 0;
-          this.setNoDataText(this.translate("NoData"), "NoData");
+          setTimeout(function() {
+            this.setNoDataText(this.translate("NoData"), "NoData");
+          }.bind(this), 100);
           this.fireFetchEvent("after", bVisible ? "data" : "count", oData);
         }.bind(this));
       }
     };
 
+    Category.prototype.getMaxRowItemsAsync = function () {
+      if (!this.getDomRef()) {
+        return new Promise(function(resolve) {
+          setTimeout(function() {
+            resolve(this._getMaxRowItems());
+          }.bind(this), 200);
+        }.bind(this));
+      }
+      return Promise.resolve(this._getMaxRowItems());
+    };
+
+    Category.prototype._getMaxRowItems = function () {
+      if (this.getDomRef()) {
+        var iPixelWidth = this.getDomRef().clientWidth;
+        return Math.floor(iPixelWidth / (defaultItemWidths[this.getCurrentView()] || iPixelWidth));
+      }
+      return 1;
+    };
+
+
     Category.prototype.applyDataChange = function (bSearchTermChanged, oResultData) {
       var oData = {
         count: oResultData.count,
-        top: this._iTop,
+        top: this.getPageSize(),
         skip: this._iSkip,
-        page: Math.floor(this._iSkip / this._iTop) + 1,
+        page: Math.floor(this._iSkip / this.getPageSize()) + 1,
         data: oResultData.data
       };
       this.showLoadingPlaceholder(false, function () {
@@ -513,6 +540,7 @@ sap.ui.define(
         pageSize: "{= ${data>/top}}",
         currentPage: "{= ${data>/page}}",
         selectPage: function (oEvent) {
+
           this.fixHeight();
           this.bPaging = true;
           this.search(
@@ -596,6 +624,7 @@ sap.ui.define(
         this.bindListViewItems(sView);
         this._oList.addStyleClass(sView);
         this._iCurrentHeight = 0;
+        this.search(this._sSearchTerm, this._iSkip, this.iTop, true);
       }
       return this;
     };
@@ -692,6 +721,7 @@ sap.ui.define(
         src: sIconBinding || "{data>icon}",
         displaySize: this._oCategoryConfig.icon.size,
         displayShape: this._oCategoryConfig.icon.shape,
+        imageFitType: this._oCategoryConfig.icon.imageFitType || "Contain",
         backgroundColor: this._oCategoryConfig.icon.backgroundColor
       };
     };
@@ -805,9 +835,17 @@ sap.ui.define(
       if (this._oList && this._oList._oItemNavigation) {
         this._oList._oItemNavigation.setColumns(this._oList._getCurrentColCount());
       }
+      this.fixHeight(true);
+      if (Math.abs(oEvent.oldSize.width - oEvent.size.width) > 50) {
+        if (this._iResizeTimer) {
+          clearTimeout(this._iResizeTimer);
+        }
+        this._iResizeTimer = setTimeout(function() {
+          this.search(this._sSearchTerm, this._iSkip, this._iTop);
+        }.bind(this), 300);
+      }
       if (oEvent.oldSize && oEvent.size && oEvent.oldSize.width !== oEvent.size.width) {
         this._iCurrentHeight = 0;
-        this.fixHeight();
       }
     };
 

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/controls/categories/Application.js

@@ -4,13 +4,11 @@ sap.ui.define(
   [
     "../Category",
     "sap/ushell/services/VisualizationInstantiation",
-    "sap/ushell/services/SearchCEP",
     "sap/ui/thirdparty/jquery"
   ],
   function (
     Category,
     VisualizationInstantiation,
-    JSSearchFactory,
     jQuery
   ) {
     "use strict";
@@ -21,7 +19,7 @@ sap.ui.define(
     );
 
     var oInstanceFactory = new VisualizationInstantiation();
-    var iTileActivationTime = 1200;
+    var iTileActivationTime = 500;
 
     Application.prototype.getViewSettings = function () {
       return {
@@ -72,9 +70,9 @@ sap.ui.define(
         oViz.addStyleClass(oVizData.displayFormatHint);
         oItem._oViz = oViz;
         if (this.getCurrentView() === "tile") {
-          this.activateTile(oViz);
           oItem.destroyContent();
           oItem.addContent(oViz);
+          this.activateTile(oViz, true, iTileActivationTime);
         } else {
           // render a hidden tile to trigger event in itemNavigate
           oItem.addContent(oViz.addStyleClass("hiddentile"));
@@ -82,14 +80,15 @@ sap.ui.define(
       }
     };
 
-    Application.prototype.activateTile = function (oViz) {
+    Application.prototype.activateTile = function (oViz, bActivate, iTime) {
       setTimeout(function () {
         if (sap.ushell.Container) {
           sap.ushell.Container.getServiceAsync("ReferenceResolver").then(function () {
-            oViz.setActive(true, false);
-          });
+            oViz.setActive(bActivate, false);
+            this.activateTile(oViz, false, 1000);
+          }.bind(this));
         }
-      }, iTileActivationTime);
+      }.bind(this), iTime);
     };
 
     Application.prototype.itemNavigate = function (oEvent) {
@@ -106,6 +105,8 @@ sap.ui.define(
 
     Application.prototype._getSearchParameters = function (sSearchTerm, iSkip, iTop) {
       return {
+        includeAppsWithoutVisualizations: false,
+        enableVisualizationPreview: false,
         searchTerm: sSearchTerm,
         skip: iSkip,
         top: iTop,
@@ -132,7 +133,19 @@ sap.ui.define(
     };
 
     Application.prototype.fetchData = function (sSearchTerm, iSkip, iTop) {
-      return this.getData(this._getSearchParameters(sSearchTerm, iSkip, iTop));
+      return this.getMaxRowItemsAsync().then(function (iMaxRowItems) {
+        var iMaxTop = Math.ceil(iTop / iMaxRowItems) * iMaxRowItems;
+        return this.getData(this._getSearchParameters(sSearchTerm, iSkip, iMaxTop)).then(function(oData) {
+          var aData = oData.data;
+          aData.forEach(function (o, i) {
+            if (aData.length > iTop && o.visualization.displayFormatHint === "standardWide") {
+              aData.pop();
+            }
+          });
+          oData.pageGap = aData.length - iTop;
+          return oData;
+        });
+      }.bind(this));
     };
 
     Application.prototype.fetchCount = function (sSearchTerm, iSkip, iTop) {

package/src/main/js/sap/ushell/components/container/ApplicationContainer.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The UI integration's SAPUI5 control which supports application embedding.
- * @version 1.118.0
+ * @version 1.119.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -58,7 +58,7 @@ sap.ui.define([
     resources,
     System,
     User,
-    utils,
+    ushellUtils,
     oUrlParsing,
     Core,
     hasher,
@@ -118,7 +118,7 @@ sap.ui.define([
     */
     EventHub.once("initMessagePopover").do(initializeMessagePopover);
 
-    mLogouts = new utils.Map();
+    mLogouts = new ushellUtils.Map();
 
     /**
      * Returns the logout handler function for the given container object.
@@ -753,7 +753,7 @@ sap.ui.define([
         var oIframe = oContainer._getIFrame(),
             sApplicationType = oContainer.getApplicationType();
 
-        if (utils.isApplicationTypeEmbeddedInIframe(oContainer.getApplicationType(sApplicationType)) && oIframe) {
+        if (ushellUtils.isApplicationTypeEmbeddedInIframe(oContainer.getApplicationType(sApplicationType)) && oIframe) {
             var oUri = new URI(oContainer._getIFrameUrl(oIframe));
             var targetDomain = oUri.protocol() + "://" + oUri.host();
 
@@ -800,7 +800,7 @@ sap.ui.define([
         if (bForFramelessWindow === undefined) {
             bForFramelessWindow = false;
         }
-        if (utils.isApplicationTypeEmbeddedInIframe(sApplicationType) || (oContainer && utils.isApplicationTypeEmbeddedInIframe(oContainer.getFrameworkId()))) {
+        if (ushellUtils.isApplicationTypeEmbeddedInIframe(sApplicationType) || (oContainer && ushellUtils.isApplicationTypeEmbeddedInIframe(oContainer.getFrameworkId()))) {
             var sTargetNavigationMode = oContainer && oContainer.getTargetNavigationMode();
 
             // amend already resolved url with additional parameters
@@ -808,7 +808,7 @@ sap.ui.define([
 
             // add this container to list of NWBC-containing containers
             if (oContainer && bForFramelessWindow === false) {
-                utils.localStorageSetItem(oContainer.globalDirtyStorageKey,
+                ushellUtils.localStorageSetItem(oContainer.globalDirtyStorageKey,
                     sap.ushell.Container.DirtyState.INITIAL);
             }
         }
@@ -836,7 +836,7 @@ sap.ui.define([
         }
         var sTheme,
             getAccessibility = function () {
-                var vUrl = utils.getParameterValueBoolean("sap-accessibility");
+                var vUrl = ushellUtils.getParameterValueBoolean("sap-accessibility");
                 if (vUrl !== undefined) {
                     return vUrl;
                 }
@@ -857,7 +857,7 @@ sap.ui.define([
                     oResolvedUrlParameters = UriParameters.fromURL(sUrl) || { mParams: {} };
 
                 // To take care of the precedence of the intent over UI5 configuration
-                bAddStatistics = Configuration.getStatistics()
+                bAddStatistics = Configuration.getStatisticsEnabled()
                     && oResolvedUrlParameters.mParams["sap-statistics"] === undefined;
                 return bAddStatistics;
             },
@@ -949,7 +949,8 @@ sap.ui.define([
             sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
             sUrl += "sap-ushell-timeout=" + sessionTimeout;
 
-            return utils.appendSapShellParam(sUrl, sUrlApplicationType);
+            // Deprecated API, We need to migrate to async flow
+            return ushellUtils.appendSapShellParamSync(sUrl, sUrlApplicationType);
         }
         return sUrl;
     }
@@ -1015,7 +1016,7 @@ sap.ui.define([
      */
     function render (oRenderManager, oContainer, sApplicationType, sUrl, sAdditionalInformation) {
         var fnLogout,
-            bPostMechanismEnabled = true,
+            bPostMechanismEnabled,
             bForceOpenWithPost = false;
 
         // remove container from list of NWBC-containing containers
@@ -1075,14 +1076,14 @@ sap.ui.define([
         if (sap.ushell.Container) {
             fnLogout = ApplicationContainer.prototype._getLogoutHandler(oContainer);
             if (!fnLogout) {
-                if (utils.isApplicationTypeEmbeddedInIframe(sApplicationType)) {
+                if (ushellUtils.isApplicationTypeEmbeddedInIframe(sApplicationType)) {
                     // create only for NWBC if not already existing
                     fnLogout = ApplicationContainer.prototype._logout.bind(null, oContainer);
                     mLogouts.put(oContainer.getId(), fnLogout);
                     sap.ushell.Container.attachLogoutEvent(fnLogout);
                     sap.ushell.Container.addRemoteSystem(ApplicationContainer.prototype._createSystemForUrl(sUrl));
                 }
-            } else if (!utils.isApplicationTypeEmbeddedInIframe(sApplicationType)) {
+            } else if (!ushellUtils.isApplicationTypeEmbeddedInIframe(sApplicationType)) {
                 // detach if not used *anymore*
                 sap.ushell.Container.detachLogoutEvent(fnLogout);
                 mLogouts.remove(oContainer.getId());
@@ -1124,6 +1125,11 @@ sap.ui.define([
             oContainer.setProperty("iframePostAllParams", true, true);
         }
 
+        bPostMechanismEnabled = Config.last("/core/shell/enableOpenIframeWithPost");
+        if (bPostMechanismEnabled === undefined) {
+            bPostMechanismEnabled = true;
+        }
+
         if (urlParams.get("sap-post") === "false") {
             bPostMechanismEnabled = false;
         } else if (window.QUnit !== undefined) {
@@ -1156,7 +1162,7 @@ sap.ui.define([
             .style("width", oContainer.getWidth());
 
         if (Config.last("/core/shell/enableFeaturePolicyInIframes") === true) {
-            oRenderManager.attr("allow", utils.getIframeFeaturePolicies());
+            oRenderManager.attr("allow", ushellUtils.getIframeFeaturePolicies());
         }
         oRenderManager
             .openEnd()
@@ -1366,7 +1372,7 @@ sap.ui.define([
 
             // remove all event listeners
             if (that._unloadEventListener) {
-                removeEventListener("unload", that._unloadEventListener);
+                removeEventListener("pagehide", that._unloadEventListener);
             }
 
             if (that._disableRouterEventHandler) {
@@ -1405,13 +1411,14 @@ sap.ui.define([
             // be sure to remove entry from list of NWBC-containing containers
             // when the window is closed
             that._unloadEventListener = that.exit.bind(that);
-            addEventListener("unload", that._unloadEventListener); //TODO doesn't work in IE9 when F5 is pressed?!
+            // As of chrome 117 the unload event is deprecated and therefore was changed
+            addEventListener("pagehide", that._unloadEventListener); //TODO doesn't work in IE9 when F5 is pressed?!
 
             that._storageEventListener = function (oStorageEvent) {
                 var sApplicationType = that.getApplicationType();
                 if (oStorageEvent.key === that.globalDirtyStorageKey
                     && oStorageEvent.newValue === sap.ushell.Container.DirtyState.PENDING
-                    && utils.isApplicationTypeEmbeddedInIframe(sApplicationType)) {
+                    && ushellUtils.isApplicationTypeEmbeddedInIframe(sApplicationType)) {
 
                     var oIframe = that._getIFrame();
                     if (oIframe) {

package/src/main/js/sap/ushell/components/contentFinder/Component.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder Component
  *
- * @version 1.118.0
+ * @version 1.119.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/contentFinder/controller/AppSearch.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file AppSearch controller for AppSearch view
- * @version 1.118.0
+ * @version 1.119.0
  */
 sap.ui.define([
     "./ContentFinderDialog.controller",

package/src/main/js/sap/ushell/components/contentFinder/controller/ContentFinderDialog.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog root view
- * @version 1.118.0
+ * @version 1.119.0
  */
 sap.ui.define([
     "../model/formatter",

package/src/main/js/sap/ushell/components/contentFinder/controller/WidgetGallery.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for WidgetGallery view
- * @version 1.118.0
+ * @version 1.119.0
  */
 sap.ui.define([
     "./ContentFinderDialog.controller"

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.contentFinder",
         "applicationVersion": {
-            "version": "1.118.0"
+            "version": "1.119.0"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

package/src/main/js/sap/ushell/components/factsheet/Component.js

@@ -17,7 +17,7 @@ sap.ui.define([
 
         // use inline declaration instead of component.json to save 1 round trip
         metadata: {
-            version: "1.118.0",
+            version: "1.119.0",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m", "sap.ui.vbm", "sap.suite.ui.commons", "sap.ui.layout", "sap.viz"],

package/src/main/js/sap/ushell/components/factsheet/controls/PictureTile.js

@@ -28,7 +28,6 @@ sap.ui.define([
      * @param {object} [mSettings] initial settings for the new control
      * @class Tile control embedding an image and allowing custom sizing
      * @extends sap.m.CustomTile
-     * @constructor
      * @public
      * @deprecated since 1.22. Please use {@link sap.m.Carousel} instead.
      *
@@ -80,7 +79,7 @@ sap.ui.define([
      * @param {string | sap.ushell.components.factsheet.controls.PictureViewerItem} vTileContent
      *   Id of an element which becomes the new target of this <code>tileContent</code> association.
      *   Alternatively, an element instance may be given.
-     * @return {sap.ushell.components.factsheet.controls.PictureTile} <code>this</code> to allow method chaining
+     * @returns {sap.ushell.components.factsheet.controls.PictureTile} <code>this</code> to allow method chaining
      * @public
      * @name sap.ushell.components.factsheet.controls.PictureTile#setTileContent
      * @function

package/src/main/js/sap/ushell/components/factsheet/controls/PictureViewer.js

@@ -23,7 +23,6 @@ sap.ui.define([
      * @param {object} [mSettings] initial settings for the new control
      * @class Picture viewer control relying on the TileContainer control
      * @extends sap.m.TileContainer
-     * @constructor
      * @public
      * @deprecated since 1.22. Please use {@link sap.m.Carousel} instead.
      *   PictureViewer was replacing the Carousel as it wasn't supporting some versions of MS Internet Explorer.
@@ -132,7 +131,7 @@ sap.ui.define([
      *
      * @override
      * @param {sap.ushell.components.factsheet.controls.PictureViewerItem} oItem the item to add; if empty, nothing is inserted
-     * @return {sap.ushell.components.factsheet.controls.PictureViewer} <code>this</code> to allow method chaining
+     * @returns {sap.ushell.components.factsheet.controls.PictureViewer} <code>this</code> to allow method chaining
      * @public
      * @name sap.ushell.components.factsheet.controls.PictureViewer#addItem
      * @function
@@ -153,7 +152,7 @@ sap.ui.define([
      * @param {int} iIndex the <code>0</code>-based index the item should be inserted at;
      *   for a negative value of <code>iIndex</code>, the item is inserted at position 0;
      *   for a value greater than the current size of the aggregation, the item is inserted at the last position
-     * @return {sap.ushell.components.factsheet.controls.PictureViewer} <code>this</code> to allow method chaining
+     * @returns {sap.ushell.components.factsheet.controls.PictureViewer} <code>this</code> to allow method chaining
      * @public
      * @name sap.ushell.components.factsheet.controls.PictureViewer#insertItem
      * @function
@@ -188,7 +187,7 @@ sap.ui.define([
      * @override
      * @param {int} iIndex the <code>0</code>-based index of the picture collection to delete;
      *   if <code>iIndex</code> is out of range or empty, the current image will be deleted.
-     * @return {sap.ushell.components.factsheet.controls.PictureViewer} <code>this</code> to allow method chaining
+     * @returns {sap.ushell.components.factsheet.controls.PictureViewer} <code>this</code> to allow method chaining
      * @public
      * @name sap.ushell.components.factsheet.controls.PictureViewer#deletePicture
      * @function
@@ -222,7 +221,7 @@ sap.ui.define([
      * @param {int} iIndex the <code>0</code>-based index of the aggregation to select;
      *   for a negative value of <code>iIndex</code>, the picture at position 0 is selected;
      *   for a value greater than the current size of the aggregation, the selected picture at the last position is selected
-     * @return {sap.ushell.components.factsheet.controls.PictureViewer} <code>this</code> to allow method chaining
+     * @returns {sap.ushell.components.factsheet.controls.PictureViewer} <code>this</code> to allow method chaining
      * @public
      * @name sap.ushell.components.factsheet.controls.PictureViewer#selectPicture
      * @function
@@ -254,7 +253,7 @@ sap.ui.define([
      * Gets the current picture index.
      *
      * @override
-     * @return {sap.ushell.components.factsheet.controls.PictureViewer} the current picture index
+     * @returns {sap.ushell.components.factsheet.controls.PictureViewer} the current picture index
      * @public
      * @name sap.ushell.components.factsheet.controls.PictureViewer#getCurrentPictureIndex
      * @function

package/src/main/js/sap/ushell/components/factsheet/controls/PictureViewerItem.js

@@ -14,7 +14,6 @@ sap.ui.define([
      * @param {object} [mSettings] initial settings for the new control
      * @class Picture viewer control relying on the TileContainer control
      * @extends sap.ui.core.Control
-     * @constructor
      * @public
      * @deprecated since 1.22. Please use {@link sap.m.Carousel} instead.
      *   PictureViewerItem is used in PictureViewer control and is not meant to be consumed outside of PictureViewer usage.
@@ -44,7 +43,7 @@ sap.ui.define([
      * Default value is empty/<code>undefined</code>
      *
      * @param {string} sSrc  new value for property <code>src</code>
-     * @return {sap.ushell.components.factsheet.controls.PictureViewerItem} <code>this</code> to allow method chaining
+     * @returns {sap.ushell.components.factsheet.controls.PictureViewerItem} <code>this</code> to allow method chaining
      * @public
      * @name sap.ushell.components.factsheet.controls.PictureViewerItem#setSrc
      * @function