@sapui5/sap.ushell 1.117.0 → 1.118.0

package/src/main/js/sap/ushell/adapters/cdm/util/AppForInbound.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview AppForInbound uses a navigation data inbound to resolve an CDM app reference of a CDM page.
- * @version 1.117.0
+ * @version 1.118.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/util/cdmSiteUtils.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The file provides helper functions for PagesCommonDataModelAdapter.
  *
- * @version 1.117.0
+ * @version 1.118.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/AdapterBase.js

@@ -4,7 +4,7 @@
  * @fileOverview The Base of Unified Shell's LaunchPageAdapter for the 'CDM' platform - Version 3 (V3)
  *   and StaticGroupsContainer for Featured Group
  *
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/v3/_LaunchPage/readHome",

package/src/main/js/sap/ushell/adapters/cdm/v3/LaunchPageAdapter.js

@@ -5,7 +5,7 @@
  *               'CDM' platform - Version 3 (V3)
  *
  * @deprecated since 1.100
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/v3/_LaunchPage/readHome",

package/src/main/js/sap/ushell/adapters/cdm/v3/StaticGroupsAdapter.js

@@ -3,7 +3,7 @@
  * @fileOverview The Unified Shell's LaunchPageAdapter for the
  *               'CDM' platform - Version 3 (V3)
  *
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/v3/AdapterBase"

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readApplications.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Helper for accessing application data for the 'CDM' platform.
  *
- * @version 1.117.0
+ * @version 1.118.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readCatalogs.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Helper for accessing catalog data for the 'CDM' platform.
  *
- * @version 1.117.0
+ * @version 1.118.0
  * @private
  */
 sap.ui.define( [

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readHome.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Helper for accessing Home Page data for the 'CDM' platform.
  *
- * @version 1.117.0
+ * @version 1.118.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readPages.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Helper for accessing pages data for the 'CDM' platform.
  *
- * @version 1.117.0
+ * @version 1.118.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readUtils.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Helper for accessing the read utils for the 'CDM' platform.
  *
- * @version 1.117.0
+ * @version 1.118.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readVisualizations.js

@@ -4,15 +4,17 @@
  *
  * TODO: Simplify function names
  *
- * @version 1.117.0
+ * @version 1.118.0
  * @private
  */
 sap.ui.define([
     "sap/ushell/utils",
-    "sap/base/util/ObjectPath"
+    "sap/base/util/ObjectPath",
+    "sap/base/util/deepClone"
 ], function (
     utils,
-    ObjectPath
+    ObjectPath,
+    deepClone
 ) {
     "use strict";
 
@@ -273,7 +275,7 @@ sap.ui.define([
      * @private
      */
     readVisualizations.getKeywords = function (aCdmParts) {
-        var aClonedCdmParts = utils.clone(aCdmParts); // do not modify input parameter
+        var aClonedCdmParts = deepClone(aCdmParts, 20); // do not modify input parameter
         aClonedCdmParts.splice(2, 1); // Inbound
         aClonedCdmParts.splice(0, 1); // Tile
         return utils.getNestedObjectProperty(
@@ -348,7 +350,7 @@ sap.ui.define([
      * @private
      */
     readVisualizations.getNumberUnit = function (aCdmParts) {
-        var aClonedCdmParts = utils.clone(aCdmParts); // do not modify input parameter
+        var aClonedCdmParts = deepClone(aCdmParts, 20); // do not modify input parameter
         aClonedCdmParts.splice(2, 2); // Inbound + App
         return utils.getNestedObjectProperty(
             aClonedCdmParts,
@@ -374,19 +376,19 @@ sap.ui.define([
     };
 
     /**
-     * Returns the shorttitle
+     * Returns the short title
      * which is evaluated on the basis of the CDM parts
      *
      * @param {object[]} aCdmParts
      *      A fixed list containing the Tile, the VizConfig, the Inbound, and the App.
      * @returns {string}
-     *      the evaluated shorttitle or undefined if not present
+     *      the evaluated short title or undefined if not present
      *
      * @since 1.74.0
      * @private
      */
     readVisualizations.getShortTitle = function (aCdmParts) {
-        var aClonedCdmParts = utils.clone(aCdmParts); // do not modify input parameter
+        var aClonedCdmParts = deepClone(aCdmParts, 20); // do not modify input parameter
         aClonedCdmParts.splice(0, 1); // Tile
         return utils.getNestedObjectProperty(
             aClonedCdmParts,
@@ -435,7 +437,7 @@ sap.ui.define([
      * @private
      */
     readVisualizations.getDataSource = function (aCdmParts, sDataSourceId) {
-        var aClonedCdmParts = utils.clone(aCdmParts); // do not modify input parameter
+        var aClonedCdmParts = deepClone(aCdmParts, 20); // do not modify input parameter
         aClonedCdmParts.splice(2, 1); // Inbound
         aClonedCdmParts.splice(0, 1); // Tile
 

package/src/main/js/sap/ushell/adapters/cdm/v3/utilsCdm.js

@@ -353,7 +353,7 @@ sap.ui.define([
      * Formats the target mappings contained in the CDM site projection into inbounds
      *
      * @param {object} oSite the CDM site projection.
-     * @return {object[]} Inbounds suitable for ClientSideTargetResolution service consumption.
+     * @returns {object[]} Inbounds suitable for ClientSideTargetResolution service consumption.
      */
     utilsCdm.formatSite = function (oSite) {
         var that = this;

package/src/main/js/sap/ushell/adapters/cep/NavTargetResolutionAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileoverview The NavTargetResolution adapter for SAP MyHome
- * @version 1.117.0
+ * @version 1.118.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cep/SearchCEPAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Search adapter for CEP applications (client-side search).
  *
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/utils/UrlParsing",

package/src/main/js/sap/ushell/adapters/cflp/UserDefaultParameterPersistenceAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's UserDefaultParameterPersistence adapter for the CFLP
  *               platform.
  *
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/utils/HttpClient",

package/src/main/js/sap/ushell/adapters/local/AdapterContainer.js

@@ -5,7 +5,7 @@
  *
  * The local personalization adapter can be configured to store data either in
  * the local storage (default) or in memory.
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell/adapters/local/AppStateAdapter.js

@@ -5,7 +5,7 @@
  *   TODO will be replaced by true persistence within this SP!
  *   This adapter delegates to the Personalization Adapter
  *
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/services/appstate/AppStatePersistencyMethod",

package/src/main/js/sap/ushell/adapters/local/ClientSideTargetResolutionAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's ClientSideTargetResolutionAdapter for the local
  *               platform.
  *
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell/adapters/local/ContainerAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's container adapter for standalone demos.
  *
- * @version 1.117.0
+ * @version 1.118.0
  */
 /**
  * @namespace Default namespace for Unified Shell adapters for standalone demos. They can usually

package/src/main/js/sap/ushell/adapters/local/LaunchPageAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's page builder adapter for the 'demo' platform.
  *
  * @deprecated since 1.100
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -547,6 +547,10 @@ sap.ui.define([
             return true;
         };
 
+        this.isTileIntentSupportedAsync = function (oTile) {
+            return Promise.resolve(this.isTileIntentSupported(oTile));
+        };
+
         this.isLinkPersonalizationSupported = function (oTile) {
             if (oTile) {
                 return oTile.isLinkPersonalizationSupported;

package/src/main/js/sap/ushell/adapters/local/NavTargetResolutionAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The NavTargetResolution adapter for the demo platform.
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/services/_ClientSideTargetResolution/VirtualInbounds",
@@ -83,7 +83,8 @@ sap.ui.define([
                         applicationType: oResult.applicationType,
                         url: oResult.url,
                         text: oResult.text,
-                        fullWidth: oResult.fullWidth
+                        fullWidth: oResult.fullWidth,
+                        navigationMode: "embedded"
                     };
                     // add sParameter to URL
                     if (sParameters) {

package/src/main/js/sap/ushell/adapters/local/PageBuildingAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's page builder adapter for the 'demo' platform.
  * It creates chip instances from chip raw data. Compared to the other platforms this adapter has restricted functionality.
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ui/core/ComponentContainer",

package/src/main/js/sap/ushell/adapters/local/PagePersistenceAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview PagePersistenceAdapter for the local platform.
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/utils",

package/src/main/js/sap/ushell/adapters/local/PersonalizationAdapter.js

@@ -6,7 +6,7 @@
  *
  * The local personalization adapter can be configured to store data either in
  * the local storage (default) or in memory.
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/utils",

package/src/main/js/sap/ushell/adapters/local/SearchAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Search adapter for the demo platform.
  *
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/adapters/local/SearchCEPAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Search adapter for CEP Search
  *
- * @version 1.117.0
+ * @version 1.118.0
  */
 /*eslint-disable quote-props*/
 sap.ui.define([], function () {

package/src/main/js/sap/ushell/adapters/local/SupportTicketAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The SupportTicket adapter for the local platform.
  *
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/adapters/local/Ui5ComponentLoaderAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the local platform
  *
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/adapters/local/UserDefaultParameterPersistenceAdapter.js

@@ -6,7 +6,7 @@
  *               TODO will be replaced by true persistence within this SP!
  *               This adapter delegates to the Personalization Adapter
  *
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell/adapters/local/UserInfoAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The UserInfo adapter for the demo platform.
- * @version 1.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell/appRuntime/ui5/AppRuntime.js

@@ -76,7 +76,6 @@ sap.ui.define([
 
     var _that,
         oPageUriParams = new URI().search(true),
-        oComponentContainer,
         bURLHelperReplaced = false,
         fnOrigURLHelperRedirect,
         bPluginsLoaded = false,
@@ -106,11 +105,6 @@ sap.ui.define([
             jQuery("body").css("height", "100%").css("width", "100%");
             AppCommunicationMgr.init(true);
 
-            AppRuntimeService.sendMessageToOuterShell(
-                "sap.ushell.appRuntime.iframeIsBusy", {
-                bValue: true
-            });
-
             this.getPageConfig(oUrlData);
             _that.setModulePaths();
             arrPrimisesInit = _that.loadAdditionalLibs();
@@ -171,12 +165,8 @@ sap.ui.define([
                         _that._setInitialAppRoute();
 
                         _that.createApplication(sAppId, oURLParameters, oAppInfo, sAppIntent, oParsedHash)
-                            .then(function (oResolutionResult) {
-                                _that.renderApplication(oResolutionResult);
-                                AppRuntimeService.sendMessageToOuterShell(
-                                    "sap.ushell.appRuntime.iframeIsBusy", {
-                                        bValue: false
-                                    });
+                            .then(function (oCreateApplicationResult) {
+                                _that.renderApplication(oCreateApplicationResult);
                             });
                     });
                 });
@@ -597,7 +587,7 @@ sap.ui.define([
                         "property in the Iframe to: " + sDirection);
                 }
 
-                oComponentContainer = new ComponentContainer({
+                var oComponentContainer = new ComponentContainer({
                     id: (AppRuntimeContext.getIsScube() === true ? sAppIntent : sAppId) + "-content",
                     width: "100%",
                     height: "100%"
@@ -688,7 +678,6 @@ sap.ui.define([
                                 }
                             }
                             oComponentContainer.setComponent(oResolutionResultWithComponentHandle.componentHandle.getInstance());
-                            AppLifeCycleAgent.setCurrentApp(oComponentContainer, sAppIntent || "", oAppProperties.ui5ComponentName);
                             FesrEnhancer.setAppShortId(oResolutionResultWithComponentHandle.componentHandle);
                             oAppLifeCycleService.prepareCurrentAppObject(
                                 "UI5",
@@ -715,7 +704,12 @@ sap.ui.define([
                             });
                             _that.considerChangingTheDefaultFullWidthVal(oResolutionResultWithComponentHandle);
                             _that.overrideUrlHelperFuncs();
-                            fnResolve(oResolutionResultWithComponentHandle);
+                            fnResolve({
+                                oComponentContainer: oComponentContainer,
+                                oResolutionResultWithComponentHandle: oResolutionResultWithComponentHandle,
+                                sAppIntent: sAppIntent || "",
+                                ui5ComponentName: oAppProperties.ui5ComponentName
+                            });
                         });
                     });
                 });
@@ -840,15 +834,19 @@ sap.ui.define([
         /**
          * @private
          */
-        this.renderApplication = function (oResolutionResult) {
-            oComponentContainer.placeAt("content");
+        this.renderApplication = function (oCreateApplicationResult) {
+            oCreateApplicationResult.oComponentContainer.placeAt("content");
             BusyIndicator.hide();
             setTimeout(function () {
-                if (oResolutionResult.componentHandle.getInstance().active) {
-                    oResolutionResult.componentHandle.getInstance().active();
+                if (oCreateApplicationResult.oResolutionResultWithComponentHandle.componentHandle.getInstance().active) {
+                    oCreateApplicationResult.oResolutionResultWithComponentHandle.componentHandle.getInstance().active();
                 }
                 _that.loadPlugins();
             }, 0);
+            AppLifeCycleAgent.setCurrentApp(
+                oCreateApplicationResult.oComponentContainer,
+                oCreateApplicationResult.sAppIntent,
+                oCreateApplicationResult.ui5ComponentName);
         };
     }
 

package/src/main/js/sap/ushell/appRuntime/ui5/AppRuntimeContext.js

@@ -2,8 +2,8 @@
 sap.ui.define([
     "sap/base/assert",
     "sap/ushell/utils/UrlParsing",
-    "sap/ushell/utils/clone"
-], function (assert, UrlParsing, clone) {
+    "sap/base/util/deepClone"
+], function (assert, UrlParsing, deepClone) {
     "use strict";
 
     function AppRuntimeContext () {
@@ -43,7 +43,7 @@ sap.ui.define([
             }
 
             return new Promise(function (fnResolve) {
-                var aAppsIntentsCopy = clone(aAppsIntents);
+                var aAppsIntentsCopy = deepClone(aAppsIntents);
                 var aIntents = [];
                 var oParsedHash;
 

package/src/main/js/sap/ushell/appRuntime/ui5/SessionHandlerAgent.js

@@ -18,6 +18,16 @@ sap.ui.define([
             AppCommunicationMgr.registerCommHandlers({
                 "sap.ushell.sessionHandler": {
                     oServiceCalls: {
+                        beforeApplicationHide: {
+                            executeServiceCallFn: function (oMessageData) {
+                                return Promise.resolve();
+                            }
+                        },
+                        afterApplicationShow: {
+                            executeServiceCallFn: function (oMessageData) {
+                                return Promise.resolve();
+                            }
+                        },
                         logout: {
                             executeServiceCallFn: function (oMessageData) {
                                 return that.handleLogoutEvent(oMessageData);

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;
@@ -188,12 +183,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

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.0
+ * @version 1.118.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);
+            }
         },
 
         /**