@sapui5/sap.ushell 1.117.2 → 1.119.0

package/src/main/js/sap/ushell/appRuntime/ui5/renderers/fiori2/RendererExtensions.js

@@ -11,18 +11,24 @@ sap.ui.define([
 ) {
     "use strict";
 
+    var oRenderer = {};
+
     function _addSubHeader (oItem, sLaunchpadState1, sLaunchpadState2) {
         //sap.ushell.Container.getRenderer("fiori2").showSubHeader(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
+
     function _removeSubHeader (oItem, sLaunchpadState1, sLaunchpadState2) {
         //sap.ushell.Container.getRenderer("fiori2").hideSubHeader(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
+
     function _addHeaderItem (oItem, sLaunchpadState1, sLaunchpadState2) {
         //sap.ushell.Container.getRenderer("fiori2").showHeaderItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
+
     function _removeHeaderItem (oItem, sLaunchpadState1, sLaunchpadState2) {
         //sap.ushell.Container.getRenderer("fiori2").hideHeaderItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
+
     function _addOptionsActionSheetButton (oButton, sLaunchpadState1, sLaunchpadState2) {
         var aButtons = Array.isArray(oButton) ? oButton : [oButton],
             aStates = [sLaunchpadState1],
@@ -35,7 +41,7 @@ sap.ui.define([
             var sOuerShellId = fnGetUid() + "-apprt";
 
             oCurrButton.idAppRuntime = sOuerShellId;
-            sap.ushell.renderers.fiori2.Renderer._addButtonHandler(sOuerShellId, function () {
+            oRenderer._addButtonHandler(sOuerShellId, function () {
                 oCurrButton.firePress();
             });
             aButtonsDesc.push({
@@ -50,6 +56,7 @@ sap.ui.define([
         return AppRuntimeService.sendMessageToOuterShell(
             "sap.ushell.services.Renderer.addOptionsActionSheetButton", aButtonsDesc);
     }
+
     function _removeOptionsActionSheetButton (oButton, sLaunchpadState1, sLaunchpadState2) {
         var aButtons = Array.isArray(oButton) ? oButton : [oButton],
             aStates = [sLaunchpadState1],
@@ -69,24 +76,31 @@ sap.ui.define([
         return AppRuntimeService.sendMessageToOuterShell(
             "sap.ushell.services.Renderer.removeOptionsActionSheetButton", aButtonIds);
     }
+
     function _setLeftPaneContent (oContent, sLaunchpadState1, sLaunchpadState2) {
         //sap.ushell.Container.getRenderer("fiori2").showLeftPaneContent(oContent.getId(), false,  [sLaunchpadState1, sLaunchpadState2]);
     }
+
     function _removeLeftPaneContent (sLaunchpadState1, sLaunchpadState2) {
         //sap.ushell.Container.getRenderer("fiori2").hideLeftPaneContent(false, [sLaunchpadState1, sLaunchpadState2]);
     }
+
     function _addFloatingActionButton (oItem, sLaunchpadState1, sLaunchpadState2) {
         //sap.ushell.Container.getRenderer("fiori2").showFloatingActionButton(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
+
     function _removeFloatingActionButton (oItem, sLaunchpadState1, sLaunchpadState2) {
         //sap.ushell.Container.getRenderer("fiori2").hideFloatingActionButton(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
+
     function _addHeaderEndItem (oItem, sLaunchpadState1, sLaunchpadState2) {
         //sap.ushell.Container.getRenderer("fiori2").showHeaderEndItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
+
     function _removeHeaderEndItem (oItem, sLaunchpadState1, sLaunchpadState2) {
         //sap.ushell.Container.getRenderer("fiori2").hideHeaderEndItem(oItem.getId(), false, [sLaunchpadState1, sLaunchpadState2]);
     }
+
     function _getConfiguration () {
         if (AppRuntimeContext.getIsScube()) {
             return {
@@ -95,36 +109,50 @@ sap.ui.define([
         }
         return {};
     }
+
     function _setHeaderItemVisibility (sItem, sLaunchpadState, bToLocal, bIsVisible) {
         //var oItem = sap.ui.getCore().byId(sItem);
         //if (bIsVisible) {
         //    sap.ushell.Container.getRenderer("fiori2").showHeaderItem(oItem.getId(), bToLocal, [sLaunchpadState]);
         //}
     }
+
     function _addEndUserFeedbackCustomUI (oCustomUIContent, bShowCustomUIContent) {
         // Deprecated;
     }
+
     function _addUserPreferencesEntry (entryObject) {
         //sap.ushell.Container.getRenderer("fiori2").addUserPreferencesEntry(entryObject);
     }
+
     function _addUserPreferencesGroupedEntry (entryObject) {
         //sap.ushell.Container.getRenderer("fiori2")._addUserPreferencesGroupedEntry(entryObject);
     }
+
     function _setHeaderTitle (sTitle) {
         //sap.ushell.Container.getRenderer("fiori2").setHeaderTitle(sTitle);
     }
+
     function _setLeftPaneVisibility (sLaunchpadState, bVisible) {
         //sap.ushell.Container.getRenderer("fiori2").setLeftPaneVisibility(sLaunchpadState, bVisible);
     }
+
     function _setHeaderHiding (bHiding) {
         //sap.ushell.Container.getRenderer("fiori2").setHeaderHiding(bHiding);
     }
+
     function _setFooter (oFooter) {
         //sap.ushell.Container.getRenderer("fiori2").setFooter(oFooter);
     }
+
     function _removeFooter () {
         //sap.ushell.Container.getRenderer("fiori2").removeFooter();
     }
+
+    function _setRenderer (oRendererProxy) {
+        oRenderer = oRendererProxy;
+    }
+
     function RendererExtensions () {
         this.addHeaderItem = _addHeaderItem;
         this.setHeaderItemVisibility = _setHeaderItemVisibility;
@@ -152,8 +180,8 @@ sap.ui.define([
         this.removeLeftPaneContent = _removeLeftPaneContent;
         this.setLeftPaneVisibility = _setLeftPaneVisibility;
         this.getConfiguration = _getConfiguration;
+        this.setRenderer = _setRenderer;
     }
 
-    var RendererExtensions1 = new RendererExtensions();
-    return RendererExtensions1;
+    return new RendererExtensions();
 });

package/src/main/js/sap/ushell/appRuntime/ui5/services/AppLifeCycleAgent.js

@@ -110,7 +110,6 @@ sap.ui.define([
                     isStateful: true,
                     isKeepAlive: true,
                     isIframeValid: true,
-                    isIframeBusy: true,
                     session: {
                         bLogoutSupport: true
                     }
@@ -142,10 +141,6 @@ sap.ui.define([
                     sScubeAppIntent = "",
                     sKeepAliveAppKey;
 
-                AppRuntimeService.sendMessageToOuterShell(
-                    "sap.ushell.appRuntime.iframeIsBusy", {
-                        bValue: true
-                    });
                 FesrEnhancer.startInteraction();
 
                 sUrl = oMsg.body.sUrl;
@@ -162,6 +157,7 @@ sap.ui.define([
                 }
 
                 hasher.disableCFLPUpdate = true;
+                hasher.replaceHash("");
                 hasher.replaceHash(oMsg.body.sHash);
                 hasher.disableCFLPUpdate = false;
 
@@ -188,12 +184,8 @@ sap.ui.define([
                     }
                     that.expandSapIntentParams(new URI(sUrl).query(true)).then(function (oURLParameters) {
                         fnCreateApplication(sAppId, oURLParameters, values.oResolvedHashFragment, sAppIntent, values.oParsedHash)
-                            .then(function (oResolutionResult) {
-                                fnRenderApp(oResolutionResult);
-                                AppRuntimeService.sendMessageToOuterShell(
-                                    "sap.ushell.appRuntime.iframeIsBusy", {
-                                        bValue: false
-                                    });
+                            .then(function (oCreateApplicationResult) {
+                                fnRenderApp(oCreateApplicationResult);
                                 Core.getEventBus().publish("sap.ushell", "appOpened", {});
                                 fnResolve({
                                     deletedKeepAliveId: sKeepAliveAppKey
@@ -304,6 +296,7 @@ sap.ui.define([
                 bRouterDisableRetrigger = oRouterDisableRetriggerApplications[oCachedEntry.oApp.sId];
 
             hasher.disableCFLPUpdate = true;
+            hasher.replaceHash("");
             hasher.replaceHash(oMsg.body.sHash);
             hasher.disableCFLPUpdate = false;
 

package/src/main/js/sap/ushell/appRuntime/ui5/services/adapters/Ui5ComponentLoaderAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the application runtime platform
  *
- * @version 1.117.2
+ * @version 1.119.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent.js

@@ -96,8 +96,8 @@ sap.ui.define([
             if (loadingStepConfiguration.oConfig.loadingMode === oLoadingModes.CONTINUE_ON_EVENT) {
                 oStepConfig.sStepType = oLoadingModes.CONTINUE_ON_EVENT;
                 oStepConfig.sStepName = loadingStepConfiguration.oContent.LoadingStep;
-                oStepConfig.oData.eventName = loadingStepConfiguration.oConfig.continueOnEvent &&
-                                              loadingStepConfiguration.oConfig.continueOnEvent.eventName;
+                oStepConfig.oData.eventName = loadingStepConfiguration.oConfig.continueOnEvent && loadingStepConfiguration.oConfig.continueOnEvent.eventName;
+                oStepConfig.oData.timeoutInMs = loadingStepConfiguration.oConfig.continueOnEvent && loadingStepConfiguration.oConfig.continueOnEvent.timeoutInMs;
                 oStepConfig.oData.stepName = loadingStepConfiguration.oContent.LoadingStep;
                 oStepConfig.bConfigOk = !!(oStepConfig.oData.eventName && oStepConfig.oData.stepName);
 
@@ -209,11 +209,11 @@ sap.ui.define([
                 }
 
                 if (oNextStep.sStatus === oStatusDefinitions.BLOCKDONE) {
-                    // TODO
+                    // Not yet implemented as no use case existing
                 }
 
                 if (oNextStep.sStatus === oStatusDefinitions.SKIPPED) {
-                    // TODO
+                    // Not yet implemented as no use case existing
                 }
 
                 if (oNextStep.sStatus === oStatusDefinitions.STEP) {
@@ -239,12 +239,16 @@ sap.ui.define([
                         var sStepName = oStepConfig.sStepName;
                         oPathLoadingPromise.then(
                             function () {
+                                /* eslint-disable */
                                 state.setForLoadingStep(sStepName, state.id.loadingStep.InProgress, "", "Step's promise has resolved");
+                                /* eslint-enable */
                                 delete this.oPathsLoading[sStepName];
                                 EventHub.emit("StepDone", sStepName);
                         }.bind(this),
                             function () {
+                                /* eslint-disable */
                                 state.setForLoadingStep(sStepName, state.id.loadingStep.FatalError, "", "Step's promise failed");
+                                /* eslint-enable */
                                 delete this.oPathsLoading[sStepName];
                                 EventHub.emit("StepFailed", sStepName);
                             }.bind(this)

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/EventProcessor.js

@@ -16,7 +16,7 @@ sap.ui.define([
          * of the "StepDone" event. The step name must be passed as the data of the EventHub event.
          * This method should only be called by the Scheduling Agent.
          *
-         * @param {object} Agent The scheduling agent singleton.
+         * @param {object} agent The scheduling agent singleton.
          * @protected
          */
         initializeStepDoneListener: function (agent) {
@@ -37,14 +37,33 @@ sap.ui.define([
          * Uses the EventHub to listen to a given event and enters the corresponding step to the internal state.
          * The scheduling agent is notified that an event is received and a new loading step is set in the internal state.
          *
-         * @param {{eventName: string, stepName: string}} event
+         * @param {{eventName: string, stepName: string, timeoutInMs: int}} event The StepConfiguration event definition.
          * @protected
          */
         listenToEvent: function (event) {
+            let bEventHandled = false;
+
             EventHub.once(event.eventName).do(function () {
+                if (bEventHandled) {
+                    return;
+                }
+
+                bEventHandled = true;
                 InternalState.setForLoadingStep(event.stepName, InternalState.id.loadingStep.Done, event.eventName, "Event received");
                 this.SchedulingAgent.eventReceived();
             }.bind(this));
+
+            if (event.timeoutInMs) {
+                setTimeout(() => {
+                    if (bEventHandled) {
+                        return;
+                    }
+
+                    bEventHandled = true;
+                    InternalState.setForLoadingStep(event.stepName, InternalState.id.loadingStep.Done, event.eventName, "Event received");
+                    this.SchedulingAgent.eventReceived();
+                }, event.timeoutInMs);
+            }
         },
 
         /**

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/FLPLoader.js

@@ -48,7 +48,7 @@ sap.ui.define([
          * @see sap.ui.require
          * Examples:
          * {string} sap/ushell/designtime/PageComposition.extension
-         * @returns {Promise<Object>} A Promise that resolves with the dependency at the specified <code>sPath</code>.
+         * @returns {Promise<object>} A Promise that resolves with the dependency at the specified <code>sPath</code>.
          * @protected
          */
         loadComponentByRequire: function (sPath) {

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/FLPScheduler.js

@@ -1,10 +1,12 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
+    "sap/ui/performance/trace/FESR",
     "sap/ushell/bootstrap/_SchedulingAgent/state",
     "sap/base/util/LoaderExtensions",
     "sap/base/Log",
     "sap/ushell/Config"
 ], function (
+    FESR,
     state,
     LoaderExtensions,
     Log,
@@ -39,17 +41,14 @@ sap.ui.define([
 
         /**
          * Initializes the scheduler.
-         *
-         * @param {object} stepConfig The technical configuration of
-         *                 all loading steps
-         * @returns {boolean} A flag indicating if the construction of
-         *                    the schedule was succesful
+         * @returns {Promise} A flag indicating if the construction of the schedule was successful.
          * @protected
          */
         initializeSchedule: function () {
             var pStepConfig = LoaderExtensions.loadResource(STEP_CONFIG_PATH, {async: true});
             var pLoadingConfig = LoaderExtensions.loadResource(LOADING_CONFIG_PATH, {async: true});
             var oPromise = Promise.all([pStepConfig, pLoadingConfig]).then(function (values) {
+                this._adaptForSpecialEvents(values);
                 var oStepConfig = values[0];
                 var oLoadingConfig = values[1];
                 var bConfigOk = this._validateConfig(oLoadingConfig, oStepConfig);
@@ -120,7 +119,7 @@ sap.ui.define([
                 oCurrentBlock = this.oSchedule.oBlocks[sCurrentBlock];
                 iCurrentStep = oCurrentBlock.iStepIndex;
                 oCurrentStep = oCurrentBlock.LoadingSteps[iCurrentStep];
-                bStepEndOfBlock = iCurrentStep === oCurrentBlock.LoadingSteps.length -1;
+                bStepEndOfBlock = iCurrentStep === oCurrentBlock.LoadingSteps.length - 1;
 
                 // Check if the async queue is still loading
                 oCurrentLoading = this._checkAndUpdateAsyncQueue(oCurrentBlock);
@@ -171,6 +170,22 @@ sap.ui.define([
             Log.debug(JSON.stringify(this.oSchedule));
         },
 
+        /**
+         *  Special overriding of StepConfiguration.json for special SchedulingAgent Events.
+         *  @param {object[]} values Array of StepConfig and LoadingConfig json loaded
+         *  @private
+         */
+        _adaptForSpecialEvents: function (values) {
+            var oStepConfig = values[0];
+            if (oStepConfig.ConditionalWaitForAppLoading &&
+                oStepConfig.ConditionalWaitForAppLoading.continueOnEvent &&
+                oStepConfig.ConditionalWaitForAppLoading.continueOnEvent.eventName === "startUpFesrEnhanced" &&
+                FESR.getActive() === false) {
+                // To not change loading behaviour for not enabled FESR ABAP-Servers, the default event timeout is overridden.
+                oStepConfig["ConditionalWaitForAppLoading"].continueOnEvent.timeoutInMs = 3000;
+            }
+        },
+
         /**
          * Checks the different config switches to see if a step should be loaded or skipped.
          * This information is checked on the ExcludedFLPStates, the mandatoryFLPStates,
@@ -351,7 +366,8 @@ sap.ui.define([
                     if (!state.isStepLoaded(step.oConfig.Dependencies[i]) && !state.isStepLoading(step.oConfig.Dependencies[i])) {
                         state.setForLoadingStep(step.oContent.LoadingStep, state.id.loadingStep.Aborted, step.oConfig.Dependencies[i], "Missing a dependency");
                         state.setForLoadingBlock(blockName, state.id.loadingBlock.Aborted, step.oConfig.Dependencies[i], "A step is missing a dependency");
-                        state.setForModule(state.id.module.flpScheduler.id, state.id.module.flpScheduler.LoadingAborted, "Dependencies can not be resolved: a dependency isn't loading before it is required.");
+                        state.setForModule(state.id.module.flpScheduler.id, state.id.module.flpScheduler.LoadingAborted,
+                                    "Dependencies can not be resolved: a dependency isn't loading before it is required.");
                         oDependencyStatus.bMissing = true;
                         oDependencyStatus.bAllLoaded = false;
                         break;

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/StepConfiguration.json

@@ -203,10 +203,11 @@
         "Dependencies": ["FirstSegmentCompleteLoaded", "LoadPlugins"]
     },
     "ConditionalWaitForAppLoading": {
-        "loadingMode": "waitInMs",
+        "loadingMode": "continueOnEvent",
 
-        "waitInMs": {
-            "waitingTime": 3000
+        "continueOnEvent": {
+            "eventName": "startUpFesrEnhanced",
+            "timeoutInMs": 7000
         },
 
         "mandatoryFLPStates": ["app"]

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/logger.js

@@ -45,7 +45,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.117.2
+ * @version 1.119.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/state.js

@@ -71,7 +71,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.117.2
+ * @version 1.119.0
  * @namespace
  */
 sap.ui.define([
@@ -196,7 +196,7 @@ sap.ui.define([
         /**
          * Returns the state of a loading block
          * @param {string} id ID of the loading block: Use values defined in {@link #.id}
-         * @return {{time: float, status: string, parameter: object, remark: string, byModule: string}} State information
+         * @returns {{time: float, status: string, parameter: object, remark: string, byModule: string}} State information
          * @protected
          */
         getForLoadingBlock: function (id) {
@@ -237,7 +237,7 @@ sap.ui.define([
         /**
          * Returns the state of a loading step
          * @param {string} id ID of the loading step: Use values defined in {@link #.id}
-         * @return {{time: float, status: string, parameter: object, remark: string, byModule: string}} State information
+         * @returns {{time: float, status: string, parameter: object, remark: string, byModule: string}} State information
          * @protected
          */
         getForLoadingStep: function (id) {

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5.js

@@ -65,8 +65,8 @@ sap.ui.define([
                     Log.error("Given onInit module (" + bootOnInit + ") cannot be loaded.");
                 }
             }
-            sap.ui.require(["sap/ushell/Container"], function (/*Container for bootstrap*/) {
-                window.sap.ushell.bootstrap(sPlatform, oPlatformAdapters).then(function () {
+            sap.ui.require(["sap/ushell/Container"], function (Container) {
+                Container.init(sPlatform, oPlatformAdapters).then(function () {
                     (oSettings.onInitCallback || fnLoadLaunchpadContent)();
                 });
             });
@@ -77,6 +77,7 @@ sap.ui.define([
         oSAPUIConfig.libs = oSettings.libs.join();
         oSAPUIConfig.theme = sUi5Theme;
         oSAPUIConfig["xx-boottask"] = oSettings.bootTask;
+        oSAPUIConfig.calendarWeekNumbering = oUshellConfig?.services?.Container?.adapter?.config?.calendarWeekNumbering || "Default";
 
         if (oUshellConfig && oUshellConfig.ushell && oUshellConfig.ushell.verticalization
             && oUshellConfig.ushell.verticalization.activeTerminologies

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5datetimeformat.js

@@ -4,7 +4,7 @@
  * @fileOverview Configure the UI5Settings for Date and Time Format for the 'CDM'
  *               platform.
  *
- * @version 1.117.2
+ * @version 1.119.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/bootstrap/common/common.create.configcontract.core.js

@@ -272,6 +272,7 @@ sap.ui.define([
                     enableFiori3: true, // since 1.66, it is always "true"
                     sessionTimeoutIntervalInMinutes: getConfigValue("renderers/fiori2/componentData/config/sessionTimeoutIntervalInMinutes", -1),
                     enableFeaturePolicyInIframes: getConfigValue("renderers/fiori2/componentData/config/enableFeaturePolicyInIframes", true),
+                    enableOpenIframeWithPost: getConfigValue("renderers/fiori2/componentData/config/enableOpenIframeWithPost", true),
                     favIcon: getConfigValue("renderers/fiori2/componentData/config/favIcon", undefined),
                     enableMessageBroker: getConfigValue("services/MessageBroker/config/enabled", true),
                     enablePersistantAppstateWhenSharing: getConfigValue("services/AppState/config/persistentWhenShared", false),

package/src/main/js/sap/ushell/bootstrap/common/common.load.core-min.js

@@ -15,8 +15,8 @@ sap.ui.define([
      * Load the <em>coreResources</em> bundles by adding the script tags to the head.
      * If debug mode is switched on, this method performs a regular boot of the UI5 core.
      *
-     * @param {Object} oPreloadBundleConfig The preload bundle configuration.
-     * @param {Boolean} [oPreloadBundleConfig.enabled = true] If set to <code>false</code>,
+     * @param {object} oPreloadBundleConfig The preload bundle configuration.
+     * @param {boolean} [oPreloadBundleConfig.enabled = true] If set to <code>false</code>,
             the custom preload bundles are not used
      * @param {String[]} [oPreloadBundleConfig.coreResources] The resources containing the initially needed
             modules and the UI5 core; the resource path is resolved by standard UI5 loader logic; must contain

package/src/main/js/sap/ushell/bootstrap/common/common.load.launchpad.js

@@ -3,7 +3,11 @@
  * This module provides a function that actually initiates loading of the
  * launchpad content.
  */
-sap.ui.define([], function () {
+sap.ui.define([
+
+], function (
+
+) {
     "use strict";
 
     return loadLaunchpadContent;
@@ -11,9 +15,9 @@ sap.ui.define([], function () {
     function loadLaunchpadContent (sDomId) {
 
         //Lazy loading of iconfonts and AppConfiguration (avoid packing this module into cdm.js bundle)
-        sap.ui.require(["sap/ushell/iconfonts", "sap/ushell/services/AppConfiguration"], function (IconFonts, Configuration) {
+        sap.ui.require(["sap/ushell/iconfonts", "sap/ushell/services/AppConfiguration", "sap/ushell/Container"], function (IconFonts, Configuration, Container) {
             // Create the default renderer asynchronously and place its UI5 control into the canvas div replacing the contents
-            window.sap.ushell.Container.createRenderer(null, true).then(
+            Container.createRenderer(null, true).then(
                 function (oContent) {
                     oContent.placeAt(sDomId || "canvas", "only");
                 }

package/src/main/js/sap/ushell/bootstrap/common/common.load.script.js

@@ -7,10 +7,10 @@ sap.ui.define([], function () {
      * Load the js script by adding the script tag to the head.
      * The script tag is added with async attribute.
      *
-     * @param {String} sFilePath The src attribute for the script.
-     * @param {String} [sId] The id attribute for the script. Not set, if not defined.
-     * @param {Boolean} [bIsDefer] The defer attribute for the script. Not set, if not defined.
-     * @param {Boolean} [bAsync=false] The async attribute for the script.
+     * @param {string} sFilePath The src attribute for the script.
+     * @param {string} [sId] The id attribute for the script. Not set, if not defined.
+     * @param {boolean} [bIsDefer] The defer attribute for the script. Not set, if not defined.
+     * @param {boolean} [bAsync=false] The async attribute for the script.
      *
      * @returns {Promise} Result promise is resolved if script was loaded successfully
      *

package/src/main/js/sap/ushell/bootstrap/common/common.util.js

@@ -9,8 +9,8 @@ sap.ui.define(["sap/base/Log"], function (Log) {
     /**
      * The method will fail if the given object has a cyclic reference.
      *
-     * @param {Object} o Object to deep freeze; it should not contain a cyclic reference anywhere in its tree.
-     * @returns {Object} The given object which is no longer mutable.
+     * @param {object} o Object to deep freeze; it should not contain a cyclic reference anywhere in its tree.
+     * @returns {object} The given object which is no longer mutable.
      *
      * @private
      */
@@ -31,7 +31,7 @@ sap.ui.define(["sap/base/Log"], function (Log) {
      * This is equivalent to reading the value of location.origin
      * (Needed for compatibility reasons)
      *
-     * @returns {String} A String containing the canonical form of the origin of the specific location.
+     * @returns {string} A String containing the canonical form of the origin of the specific location.
      *
      * @private
      */
@@ -43,9 +43,9 @@ sap.ui.define(["sap/base/Log"], function (Log) {
     /**
      * Add trialing slash to the end of path if it is missing
      *
-     * @param {String} sPath path
+     * @param {string} sPath path
      *
-     * @returns {String} The path with a trialing slash
+     * @returns {string} The path with a trialing slash
      *
      * @private
      */
@@ -97,8 +97,8 @@ sap.ui.define(["sap/base/Log"], function (Log) {
     /**
      * Checks if the sap-statistics setting as query parameter or via local storage, as
      * UI5 does it in some cases.
-     * @param {String} sQueryToTest String to test. By default, take the window.location.search
-     * @returns {Boolean} true if the sap-statistics is set as query parameter or via local storage
+     * @param {string} sQueryToTest String to test. By default, take the window.location.search
+     * @returns {boolean} true if the sap-statistics is set as query parameter or via local storage
      * @private
      */
      function isSapStatisticsSet (sQueryToTest) {