@sapui5/sap.ushell 1.117.0 → 1.118.0

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.0
+ * @version 1.118.0
  */
 
 sap.ui.define([

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

@@ -71,7 +71,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.117.0
+ * @version 1.118.0
  * @namespace
  */
 sap.ui.define([

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

@@ -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.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/HeaderManager.js

@@ -9,7 +9,7 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/EventHub",
     "sap/ushell/utils",
-    "sap/ushell/utils/clone"
+    "sap/base/util/deepClone"
 ], function (
     ObjectPath,
     Core,
@@ -19,7 +19,7 @@ sap.ui.define([
     Config,
     EventHub,
     ushellUtils,
-    ushellClone
+    deepClone
 ) {
     "use strict";
 
@@ -247,7 +247,7 @@ sap.ui.define([
             oState[sDeltaState] = Object.keys(oDelta).reduce(function (oTarget, sDeltaProperty) {
                 oTarget[sDeltaProperty] = oDelta[sDeltaProperty];
                 return oTarget;
-            }, ushellClone(oDefaults));
+            }, deepClone(oDefaults));
         });
         return oState;
     }
@@ -312,7 +312,7 @@ sap.ui.define([
             throw new Error("the state (" + sNewStateName + ") does not exist");
         }
 
-        Config.emit("/core/shellHeader", ushellClone(oBaseState));
+        Config.emit("/core/shellHeader", deepClone(oBaseState));
     }
 
     /**
@@ -348,7 +348,7 @@ sap.ui.define([
         var oResult = {};
         Object.keys(oBaseState).forEach(function (sPropertyName) {
             var oPropertyStrategy = _PropertyStrategiesFactory(sPropertyName);
-            var vPropertyValue = ushellClone(oBaseState[sPropertyName]);
+            var vPropertyValue = deepClone(oBaseState[sPropertyName]);
             // when a strategy is available, the property from base state might be overridden
             if (oPropertyStrategy) {
                 // Extend state has higher property than custom property
@@ -432,7 +432,7 @@ sap.ui.define([
         if (aStates.length === 0) {
             return oBaseStates;
         }
-        var oNewState = ushellClone(oBaseStates);
+        var oNewState = deepClone(oBaseStates);
         aStates.forEach(function (sStateName) {
             var oState = oNewState[sStateName];
             if (oState) {

package/src/main/js/sap/ushell/components/appfinder/CatalogView.js

@@ -4,7 +4,7 @@ sap.ui.define([
     "sap/m/BusyIndicator",
     "sap/m/library",
     "sap/m/List",
-    "sap/m/MessagePage",
+    "sap/m/IllustratedMessage",
     "sap/m/Page",
     "sap/m/PageAccessibleLandmarkInfo",
     "sap/m/SplitApp",
@@ -26,7 +26,7 @@ sap.ui.define([
     BusyIndicator,
     mobileLibrary,
     List,
-    MessagePage,
+    IllustratedMessage,
     Page,
     PageAccessibleLandmarkInfo,
     SplitApp,
@@ -67,7 +67,7 @@ sap.ui.define([
                 var iCatalogTileInGroup = aGroupsIDs ? Array.prototype.indexOf.call(aGroupsIDs, oGroupContext.id) : -1;
                 sText = iCatalogTileInGroup !== -1 ? "removeAssociatedTileFromContextGroup" : "addAssociatedTileToContextGroup";
 
-                return resources.i18n.getText(sText, oGroupContext.title);
+                return resources.i18n.getText(sText, [oGroupContext.title]);
             }
 
             sText = aGroupsIDs && aGroupsIDs.length ? "EasyAccessMenu_PinButton_Toggled_Tooltip" : "EasyAccessMenu_PinButton_UnToggled_Tooltip";
@@ -339,27 +339,26 @@ sap.ui.define([
                 }
             });
 
-            this.oMessagePage = new MessagePage({
+            this.oIllustratedMessage = new IllustratedMessage({
                 visible: true,
-                showHeader: false,
-                text: resources.i18n.getText("EasyAccessMenu_NoAppsToDisplayMessagePage_Text"),
-                description: ""
+                title: resources.i18n.getText("EasyAccessMenu_NoAppsToDisplayMessagePage_Text"),
+                description: " "
             }).addEventDelegate({
                 onAfterRendering: function () {
-                    var oMessagePageDomRef = this.oMessagePage.getDomRef();
-                    if (oMessagePageDomRef) {
-                        var aMessagePageMainTexts = oMessagePageDomRef.getElementsByClassName("sapMMessagePageMainText");
-                        if (aMessagePageMainTexts.length) {
-                            aMessagePageMainTexts[0].setAttribute("tabindex", "0");
+                    var oIllustratedMessageDomRef = this.oIllustratedMessage.getDomRef();
+                    if (oIllustratedMessageDomRef) {
+                        var aIllustratedMessageMainTexts = oIllustratedMessageDomRef.getElementsByClassName("sapMTitle");
+                        if (aIllustratedMessageMainTexts.length) {
+                            aIllustratedMessageMainTexts[0].setAttribute("tabindex", "0");
                         }
                     }
                 }.bind(this),
                 onBeforeRendering: function () {
-                    var oMessagePageDomRef = this.oMessagePage.getDomRef();
-                    if (oMessagePageDomRef) {
-                        var aMessagePageMainTexts = oMessagePageDomRef.getElementsByClassName("sapMMessagePageMainText");
-                        if (aMessagePageMainTexts.length) {
-                            aMessagePageMainTexts[0].removeAttribute();
+                    var oIllustratedMessageDomRef = this.oIllustratedMessage.getDomRef();
+                    if (oIllustratedMessageDomRef) {
+                        var aIllustratedMessageMainTexts = oIllustratedMessageDomRef.getElementsByClassName("sapMTitle");
+                        if (aIllustratedMessageMainTexts.length) {
+                            aIllustratedMessageMainTexts[0].removeAttribute();
                         }
                     }
                 }.bind(this)
@@ -441,7 +440,7 @@ sap.ui.define([
                 showHeader: false,
                 showFooter: false,
                 showNavButton: false,
-                content: [this.oMessagePage]
+                content: [this.oIllustratedMessage]
             });
 
             var oSelectBusyIndicator = new BusyIndicator("catalogSelectBusyIndicator", { size: "1rem" });

package/src/main/js/sap/ushell/components/appfinder/HierarchyAppsView.js

@@ -211,7 +211,7 @@ sap.ui.define([
                     ? "removeAssociatedTileFromContextGroup"
                     : "addAssociatedTileToContextGroup";
 
-                sTooltip = oResourceBundle.getText(sTooltipKey, sGroupContextTitle);
+                sTooltip = oResourceBundle.getText(sTooltipKey, [sGroupContextTitle]);
             } else {
                 sTooltip = bookmarkCount
                     ? oResourceBundle.getText("EasyAccessMenu_PinButton_Toggled_Tooltip")

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.appfinder",
         "applicationVersion": {
-            "version": "1.117.0"
+            "version": "1.118.0"
         },
         "i18n": {
             "bundleUrl": "../../renderers/fiori2/resources/resources.properties",

package/src/main/js/sap/ushell/components/applicationIntegration/AppLifeCycle.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.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/elements/model",
@@ -772,7 +772,7 @@ sap.ui.define([
 
             //setup & register communication
             this.registerShellCommunicationHandler({
-                "sap.ushell.services.appLifeCycle": {
+                "sap.ushell.services.AppLifeCycle": {
                     oRequestCalls: {
                         create: {
                             isActiveOnly: true,
@@ -814,11 +814,11 @@ sap.ui.define([
                                         } else {
                                             arrCap.push({
                                                 "action": "create",
-                                                "service": "sap.ushell.services.appLifeCycle"
+                                                "service": "sap.ushell.services.AppLifeCycle"
                                             });
                                             arrCap.push({
                                                 "action": "destroy",
-                                                "service": "sap.ushell.services.appLifeCycle"
+                                                "service": "sap.ushell.services.AppLifeCycle"
                                             });
                                             oServiceParams.oContainer.setProperty("statefulType", BlueBoxHandler.STATEFUL_TYPES.FLP_V2, true);
                                         }
@@ -826,9 +826,6 @@ sap.ui.define([
                                     if (oSetup.isIframeValid === true) {
                                         arrCap.push({"action":"iframeIsValid","service":"sap.ushell.appRuntime"});
                                     }
-                                    if (oSetup.isIframeBusy === true) {
-                                        arrCap.push({"action":"iframeIsBusy","service":"sap.ushell.appRuntime"});
-                                    }
                                     if (oSetup.session && oSetup.session.bLogoutSupport === true) {
                                         arrCap.push({"action":"logout","service":"sap.ushell.sessionHandler"});
                                     }
@@ -1262,13 +1259,14 @@ sap.ui.define([
             oTargetAppContainer = BlueBoxHandler.getBlueBoxByUrl(oTarget.url);
             if (BlueBoxHandler.isStatefulContainer(oTargetAppContainer)) {
                 iLastValidTimeDelta = new Date().getTime() - oTargetAppContainer.getIsIframeValidTime().time;
-                if ((BlueBoxHandler.isIframeBusySupported(oTargetAppContainer) && oTargetAppContainer.getIsIframeBusy() === true) ||
-                    (BlueBoxHandler.isIframeIsValidSupported(oTargetAppContainer) && iLastValidTimeDelta >= 3500) ||
+                if ((BlueBoxHandler.isIframeIsValidSupported(oTargetAppContainer) && iLastValidTimeDelta >= 3500) ||
                     oTargetAppContainer.getIsInvalidIframe() === true) {
+                    var sReason = oTargetAppContainer.getIsInvalidIframe() === true ?
+                        "iframe did not ping in the last '" + iLastValidTimeDelta + "' ms" :
+                        "iframe is in invalid state";
                     Log.warning(
                         "Destroying statefull container iframe due to unresponsiveness (" + oTargetAppContainer.getId() + ")",
-                        "reason: " + (oTargetAppContainer.getIsIframeBusy() === true ? "iframe is still creating a different app" :
-                            "no ping from the iframe in the last '" + iLastValidTimeDelta + "' ms"),
+                        "reason: " + sReason,
                         "sap.ushell.components.applicationIntegration.AppLifeCycle");
                     BlueBoxHandler.removeCapabilities(oTargetAppContainer);
                     this.destroyApplication(sFullAppId, oTargetAppContainer);

package/src/main/js/sap/ushell/components/applicationIntegration/application/Application.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.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/components/container/ApplicationContainer",
@@ -134,6 +134,12 @@ sap.ui.define([
                 }
             }
 
+            // Handle messages to AppLifeCycle service
+            // Replace calls with old naming convention 'appLifeCycle'
+            if (sService.indexOf("sap.ushell.services.appLifeCycle") === 0) {
+                sService = sService.replace(/appLifeCycle/gi, "AppLifeCycle");
+            }
+
             for (var oEntryCommHandlerKey in oShellCommunicationHandlersObj) {
                 if (oShellCommunicationHandlersObj.hasOwnProperty(oEntryCommHandlerKey)) {
                     if (sService.indexOf(oEntryCommHandlerKey) !== -1) {

package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxHandler.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.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/application/BlueBoxesCache",
@@ -26,10 +26,10 @@ sap.ui.define([
         var oBlueBoxContainer = {},
             oBasicStatefulCapabilities = [
                 {
-                    service: "sap.ushell.services.appLifeCycle",
+                    service: "sap.ushell.services.AppLifeCycle",
                     action: "create"
                 }, {
-                    service: "sap.ushell.services.appLifeCycle",
+                    service: "sap.ushell.services.AppLifeCycle",
                     action: "destroy"
                 }
             ];
@@ -51,14 +51,6 @@ sap.ui.define([
             if (oBlueBox.setBlueBoxCapabilities) {
                 oBlueBox.setProperty("blueBoxCapabilities", {}, true);
             }
-
-            var bCheckTemplateCapabilities = true;
-            if (oTarget.url && oTarget.url.indexOf("/ui5appruntimescube") > 0) {
-                bCheckTemplateCapabilities = false;
-            }
-            if (bCheckTemplateCapabilities && oTarget.appCapabilities && oTarget.appCapabilities.statefulContainer === true) {
-                this.addCapabilities(oBlueBox, oBasicStatefulCapabilities);
-            }
             if (oInitialCapabilities) {
                 this.addCapabilities(oBlueBox, oInitialCapabilities);
             }
@@ -100,9 +92,12 @@ sap.ui.define([
 
             var oCapMap = oBlueBox.getBlueBoxCapabilities();
             oCapabilities.forEach(function (oCap) {
+                if (oCap.service === "sap.ushell.services.appLifeCycle") {
+                    oCap.service = "sap.ushell.services.AppLifeCycle";
+                }
                 oCapMap[oCap.service + "." + oCap.action] = true;
             });
-            if (oCapMap["sap.ushell.services.appLifeCycle.create"]) {
+            if (oCapMap["sap.ushell.services.AppLifeCycle.create"]) {
                 oBlueBox.setProperty("statefulType", this.STATEFUL_TYPES.FLP_V2, true);
             }
         };
@@ -118,7 +113,7 @@ sap.ui.define([
                 var oCapMap = oBlueBox.getBlueBoxCapabilities();
                 oCapabilities.forEach(function (oCap) {
                     delete oCapMap[oCap.service + "." + oCap.action];
-                    if (oCap.service + "." + oCap.action === "sap.ushell.services.appLifeCycle.create") {
+                    if (oCap.service + "." + oCap.action === "sap.ushell.services.AppLifeCycle.create") {
                         oBlueBox.setProperty("statefulType", 0 - oBlueBox.getStatefulType(), true);
                     }
                 });
@@ -259,11 +254,7 @@ sap.ui.define([
         };
 
         this.isStatefulContainer = function (oBlueBox) {
-            return this.isCapabilitySupported(oBlueBox, "sap.ushell.services.appLifeCycle", "create");
-        };
-
-        this.isIframeBusySupported = function (oBlueBox) {
-            return this.isCapabilitySupported(oBlueBox, "sap.ushell.appRuntime", "iframeIsBusy");
+            return this.isCapabilitySupported(oBlueBox, "sap.ushell.services.AppLifeCycle", "create");
         };
 
         this.isIframeIsValidSupported = function (oBlueBox) {

package/src/main/js/sap/ushell/components/applicationIntegration/application/PostMessageAPI.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview defines the post message API for all applications running in iframe within the shell
- * @version 1.117.0
+ * @version 1.118.0
  * @private
  */
 sap.ui.define([
@@ -928,7 +928,7 @@ sap.ui.define([
                 },
                 iframeIsBusy: {
                     executeServiceCallFn: function (oServiceParams) {
-                        oServiceParams.oContainer.setProperty("isIframeBusy", oServiceParams.oMessageData.body.bValue, true);
+                        //deprecated since 1.118 and not used anymore
                         return new jQuery.Deferred().resolve().promise();
                     }
                 },
@@ -1325,10 +1325,10 @@ sap.ui.define([
         "sap.ushell.services.UITracer": {
             oServiceCalls: {
                 trace: {
-                    executeServiceCallFn: function (/*oServiceParams*/) {
+                    executeServiceCallFn: function (oServiceParams) {
                         var oDeferred = new jQuery.Deferred();
-                        sap.ushell.Container.getServiceAsync("UITracer").then(function (UITracer) {
-                            UITracer.trace();
+                        sap.ushell.Container.getServiceAsync("UITracer").then(function () {
+                            EventHub.emit("UITracer.trace", oServiceParams.oMessageData.body.trace);
                             oDeferred.resolve();
                         });
                         return oDeferred.promise();
@@ -1444,6 +1444,10 @@ sap.ui.define([
                 });
             }
 
+            if (!oCommObject.oRequestCalls) {
+                oCommObject.oRequestCalls = {};
+            }
+
             if (oCommunicationEntry.oRequestCalls) {
                 Object.keys(oCommunicationEntry.oRequestCalls).forEach(function (key) {
                     oCommObject.oRequestCalls[key] = oCommunicationEntry.oRequestCalls[key];

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.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/util/extend",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The models assosicated with the applciation.
- * @version 1.117.0
+ * @version 1.118.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.117.0
+ * @version 1.118.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.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -102,9 +102,7 @@ sap.ui.define([
         };
 
         this.calculateElementsState = function (sNav, sAppType, appState, isExplicit) {
-            var oNav = oApplicationTypeToElementModelStateMap[sNav]
-                ? oApplicationTypeToElementModelStateMap[sNav]
-                : oApplicationTypeToElementModelStateMap.default;
+            var oNav = oApplicationTypeToElementModelStateMap[sNav];
             var oApp = oNav[isExplicit ? undefined : sAppType] ? oNav[sAppType] : oNav.default;
 
             return oApp[appState] ? oApp[appState] : oApp.default;

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.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -630,9 +630,9 @@ sap.ui.define([
 
         var sUi5ComponentName = oContainer && oContainer.getUi5ComponentName && oContainer.getUi5ComponentName(),
             oMessageData = oMessage.data,
-            bIsIframeAliveMsg = typeof oMessageData === "string" && oMessageData.indexOf("sap.ushell.appRuntime.iframeIsValid") > 0;
+            bIframeIsValidMsg = typeof oMessageData === "string" && oMessageData.indexOf("sap.ushell.appRuntime.iframeIsValid") > 0;
 
-        if (oContainer && !oContainer.getActive() && bIsIframeAliveMsg !== true) {
+        if (oContainer && !oContainer.getActive() && bIframeIsValidMsg !== true) {
             Log.debug(
                 "Skipping handling of postMessage 'message' event with data '" + JSON.stringify(oMessageData) + "' on inactive container '" + oContainer.getId() + "'",
                 "Only active containers can handle 'message' postMessage event",
@@ -1143,10 +1143,6 @@ sap.ui.define([
             return;
         }
 
-        if (oContainer.getFrameworkId && oContainer.getFrameworkId() === "UI5" &&
-                oContainer.getStatefulType && oContainer.getStatefulType() > 0) {
-            oContainer.setProperty("isIframeBusy", true, true);
-        }
         // embed URL via <IFRAME>
         oContainer.fireEvent("applicationConfiguration");
         oRenderManager
@@ -1340,7 +1336,6 @@ sap.ui.define([
                 frameworkId: { defaultValue: "", type: "string" },
                 iframeReusedForApp: { defaultValue: false, type: "boolean" },
                 isIframeValidTime: { defaultValue: {time: 0}, type: "object" },
-                isIframeBusy: { defaultValue: false, type: "boolean" },
                 isInvalidIframe: { defaultValue: false, type: "boolean" },
                 isFetchedFromCache: { defaultValue: false, type: "boolean" },
                 blueBoxCapabilities: { defaultValue: {}, type: "object" }

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder Component
  *
- * @version 1.117.0
+ * @version 1.118.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.117.0
+ * @version 1.118.0
  */
 sap.ui.define([
     "./ContentFinderDialog.controller",
@@ -263,9 +263,9 @@ sap.ui.define([
             var sActiveNavigationTarget = this.oModel.getProperty("/activeNavigationTarget");
 
             if (sActiveNavigationTarget === sNavigationTargetAppSearchTiles) {
-                return this.byId("tilesGridList");
+                return this.byId("tiles");
             } else if (sActiveNavigationTarget === sNavigationTargetAppSearchCards) {
-                return this.byId("cardsGridList");
+                return this.byId("cards");
             }
 
             Log.error("Invalid navigation target provided. Could not determine GridList.", null, this.getOwnerComponent().logComponent);

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

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog root view
- * @version 1.117.0
+ * @version 1.118.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.117.0
+ * @version 1.118.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.117.0"
+            "version": "1.118.0"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",
@@ -20,6 +20,7 @@
         }
     },
     "sap.ui5": {
+        "autoPrefixId": true,
         "componentName": "sap.ushell.components.contentFinder",
         "dependencies": {
             "minUI5Version": "1.99",
@@ -41,8 +42,9 @@
         },
         "rootView": {
             "viewName": "sap.ushell.components.contentFinder.view.ContentFinderDialog",
+            "id": "contentFinderDialogView",
             "type": "XML",
             "async": true
         }
     }
-}
+}