@sapui5/sap.ushell 1.134.1 → 1.136.0

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

@@ -16,6 +16,7 @@ sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/ui/util/Storage",
     "sap/base/Log",
+    "sap/ushell/appIntegration/PostMessageManager",
     "sap/ushell/EventHub",
     "sap/ushell/Container"
 ], (
@@ -34,6 +35,7 @@ sap.ui.define([
     jQuery,
     Storage,
     Log,
+    PostMessageManager,
     EventHub,
     Container
 ) => {
@@ -56,10 +58,8 @@ sap.ui.define([
      *   - sessionTimeoutIntervalInMinutes : Session timeout configured by platform
      *   - keepSessionAliveAlertTimeInMinutes : Time before session timeout to display session keep alive popup
      *   - enableAutomaticLogout : When true the session refresh window is omitted and an automatic logoff performed.
-     *
-     * @param {object} AppLifeCycleAI The AppLifeCycle service
      */
-    function SessionHandler (AppLifeCycleAI) {
+    function SessionHandler () {
         const that = this;
         let bInitialized = false;
         let bLogoutInitialized = false;
@@ -173,10 +173,6 @@ sap.ui.define([
             if (bLogoutInitialized === false) {
                 Container.registerLogout(this.logout);
 
-                if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-                    this._registerCommHandlersFallback();
-                }
-
                 bLogoutInitialized = true;
             }
         };
@@ -200,38 +196,6 @@ sap.ui.define([
             this.monitorUserIsInactive();
         };
 
-        this._registerCommHandlersFallback = function () {
-            function fnExtendSession () {
-                if (bInitialized === true) {
-                    that.userActivityHandler();
-                }
-                return new jQuery.Deferred().resolve().promise();
-            }
-
-            AppLifeCycleAI.registerShellCommunicationHandler({
-                "sap.ushell.sessionHandler": {
-                    oRequestCalls: {
-                        logout: {
-                            isActiveOnly: false,
-                            distributionType: ["URL"]
-                        },
-                        extendSessionEvent: {
-                            isActiveOnly: false,
-                            distributionType: ["all"]
-                        }
-                    },
-                    oServiceCalls: {
-                        notifyUserActive: {
-                            executeServiceCallFn: fnExtendSession
-                        },
-                        extendSessionEvent: {
-                            executeServiceCallFn: fnExtendSession
-                        }
-                    }
-                }
-            });
-        };
-
         /**
          * Monitors if user is not active:
          * Display and handle session timeout warning, initiate session over handling if needed.
@@ -318,13 +282,7 @@ sap.ui.define([
                 Container.sessionKeepAlive();
 
                 // send post to isolated
-                if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-                    const [PostMessageUtils] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"]);
-                    PostMessageUtils.postMessageToMultipleIframes("sap.ushell.sessionHandler", "extendSessionEvent", {});
-                } else {
-                    const [PostMessageManager] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/PostMessageManager"]);
-                    PostMessageManager.sendRequestToAllApplications("sap.ushell.sessionHandler.extendSessionEvent", {}, false);
-                }
+                PostMessageManager.sendRequestToAllApplications("sap.ushell.sessionHandler.extendSessionEvent", {}, false);
             } else {
                 // No activity during last server session length - do nothing
             }
@@ -448,7 +406,7 @@ sap.ui.define([
             EventBus.getInstance().publish("launchpad", "setConnectionToServer", { active: active });
 
             /**
-             * @deprecated As of version 1.120
+             * @deprecated since 1.120
              */
             if (!Config.last("/core/spaces/enabled")) {
                 if (active) {
@@ -466,7 +424,7 @@ sap.ui.define([
          * Triggers the visibility update for tiles on the homepage.
          *
          * @since 1.70.0
-         * @deprecated As of version 1.120
+         * @deprecated since 1.120
          * @private
          */
         this._setTilesVisibleOnHomepage = function () {
@@ -482,7 +440,7 @@ sap.ui.define([
          * @returns {Promise} A promises which resolves once all tiles were set invisible
          *
          * @since 1.70.0
-         * @deprecated As of version 1.120
+         * @deprecated since 1.120
          * @private
          */
         this._setTilesInvisibleOnHomepage = function () {
@@ -692,13 +650,7 @@ sap.ui.define([
             this.attachVisibilityEvents();
 
             // Send post to isolated
-            if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-                const [PostMessageUtils] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"]);
-                PostMessageUtils.postMessageToMultipleIframes("sap.ushell.sessionHandler", "extendSessionEvent", {});
-            } else {
-                const [PostMessageManager] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/PostMessageManager"]);
-                PostMessageManager.sendRequestToAllApplications("sap.ushell.sessionHandler.extendSessionEvent", {}, false);
-            }
+            PostMessageManager.sendRequestToAllApplications("sap.ushell.sessionHandler.extendSessionEvent", {}, false);
         };
 
         this.createSessionExpiredDialog = function () {
@@ -902,30 +854,17 @@ sap.ui.define([
                 }
 
                 const oLoading = new LoadingDialog({ text: "" });
-                let oTimeout;
 
                 // post the logout event to isolated
-                if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-                    const [PostMessageUtils] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"]);
-                    PostMessageUtils.postMessageToMultipleIframes("sap.ushell.sessionHandler", "logout", {}, true).then(async () => {
-                        if (bIsLogoutProcessStarted === false) {
-                            bIsLogoutProcessStarted = true;
-                            window.clearTimeout(oTimeout);
-                            _logout(oLoading);
-                        }
-                    });
-                } else {
-                    const [PostMessageManager] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/PostMessageManager"]);
-                    PostMessageManager.sendRequestToAllApplications("sap.ushell.sessionHandler.logout", {}, true).then(async () => {
-                        if (bIsLogoutProcessStarted === false) {
-                            bIsLogoutProcessStarted = true;
-                            window.clearTimeout(oTimeout);
-                            _logout(oLoading);
-                        }
-                    });
-                }
+                PostMessageManager.sendRequestToAllApplications("sap.ushell.sessionHandler.logout", {}, true).then(async () => {
+                    if (bIsLogoutProcessStarted === false) {
+                        bIsLogoutProcessStarted = true;
+                        window.clearTimeout(oTimeout);
+                        _logout(oLoading);
+                    }
+                });
 
-                oTimeout = window.setTimeout(async () => {
+                const oTimeout = window.setTimeout(async () => {
                     bIsLogoutProcessStarted = true;
                     _logout(oLoading);
                 }, 4000);

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

@@ -42,7 +42,7 @@
  * parameters. If the application tries to access an internal parameter (e.g.,
  * sap-ui-app-id-hint) via the API, the application receives an error message.
  *
- * @version 1.134.1
+ * @version 1.136.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor/DefinitionParameterSetBuilder.js

@@ -4,7 +4,7 @@
  * @fileOverview Methods to build the set of parameters used by the URL template.
  *
  *
- * @version 1.134.1
+ * @version 1.136.0
  *
  * @private
  *

package/src/main/js/sap/ushell/URLTemplateProcessor/DependencyGraph.js

@@ -8,7 +8,7 @@
  * The proper order of evaluation can be determined by creating and visiting a graph that represents parameters and depending parameters
  * as nodes. This graph can be also used to detect cyclic references in the parameter set definition.
  *
- * @version 1.134.1
+ * @version 1.136.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor/Functions.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Methods to parse and execute functions defined for the URL Template parameter language.
- * @version 1.134.1
+ * @version 1.136.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor/Resolvers.js

@@ -5,7 +5,7 @@
  * For a given context (e.g. the reference to a site, the application section from the site, parameters added during runtime, etc),
  * this module can be used to find the values associated to given URL Template parameter names.
  *
- * @version 1.134.1
+ * @version 1.136.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/URLTemplateProcessor/TemplateParameterParser.js

@@ -34,7 +34,7 @@
  *     }
  *   }
  *   </pre>
- * @version 1.134.1
+ * @version 1.136.0
  * @private
  */
 sap.ui.define([

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

@@ -2,7 +2,7 @@
 
 /**
  * @file Utility functions for modules of <code>URLTemplateProcessor</code>.
- * @version 1.134.1
+ * @version 1.136.0
  * @private
  */
 sap.ui.define([

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

@@ -26,7 +26,7 @@
  * The language to define parameters in the URL Template parameter set contains a minimal set of conditionals,
  * logical operators, and functions that allow to define the parameter set with a certain degree of control.
  *
- * @version 1.134.1
+ * @version 1.136.0
  * @private
  */
 sap.ui.define([

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Ui5 Native Service Factory
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 
 sap.ui.define([

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

@@ -6,7 +6,7 @@
  * Exposes methods to create a UI5 Service Factory for a specific Unified Shell
  * Service.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 
 sap.ui.define([

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

@@ -12,7 +12,6 @@ sap.ui.define([
     "sap/ui/core/Locale",
     "sap/ui/core/LocaleData",
     "sap/ui/thirdparty/URI",
-    "sap/ushell/Config",
     "sap/ushell/utils"
 ], function (
     Log,
@@ -23,7 +22,6 @@ sap.ui.define([
     Locale,
     LocaleData,
     URI,
-    Config,
     ushellUtils
 ) {
     "use strict";
@@ -469,25 +467,16 @@ sap.ui.define([
             }
 
             // send a message the Iframe to change its theme
-            if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-                sap.ui.require(["sap/ushell/components/applicationIntegration/application/PostMessageUtils"], function (PostMessageUtils) {
-                    PostMessageUtils.postMessageToMultipleIframes("sap.ushell.appRuntime", "themeChange", {
+            sap.ui.require(["sap/ushell/appIntegration/PostMessageManager"], function (PostMessageManager) {
+                PostMessageManager.sendRequestToAllApplications(
+                    "sap.ushell.appRuntime.themeChange",
+                    {
                         currentThemeId: this.getTheme(User.prototype.constants.themeFormat.NWBC),
                         themeServiceRoute: window.location.protocol + "//" + window.location.host + "/comsapuitheming.runtime/themeroot/v1"
-                    });
-                }.bind(this));
-            } else {
-                sap.ui.require(["sap/ushell/components/applicationIntegration/PostMessageManager"], function (PostMessageManager) {
-                    PostMessageManager.sendRequestToAllApplications(
-                        "sap.ushell.appRuntime.themeChange",
-                        {
-                            currentThemeId: this.getTheme(User.prototype.constants.themeFormat.NWBC),
-                            themeServiceRoute: window.location.protocol + "//" + window.location.host + "/comsapuitheming.runtime/themeroot/v1"
-                        },
-                        false
-                    );
-                }.bind(this));
-            }
+                    },
+                    false
+                );
+            }.bind(this));
         };
 
         /**

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

@@ -9,7 +9,7 @@
  * <li>provide the resolveHashFragment function, a fallback method called by ClientSideTargetResolution service.</li>
  * </ul>
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/base/util/Version",

package/src/main/js/sap/ushell/adapters/cdm/CommonDataModelAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's sap.ushell.adapters.cdm.CommonDataModelAdapter for the 'CDM'
  *               platform.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/adapters/cdm/ConfigurationDefaultsAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The ConfigurationDefaults adapter for the CDM platform.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/ushell/bootstrap/cdm/cdm.constants",

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell"s container adapter for the Common Data Model (CDM) platform.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -184,16 +184,8 @@ sap.ui.define([
                 setAccessibilityPermitted: false,
                 setContentDensityPermitted: false,
                 getLanguageAndRegionSettingsEntry: async function () {
-                    let oEntry;
-                    // TODO:
-                    // This will check will be removed once we are good to set the new entry as default for the cdm platform
-                    // And only the cdm/UserLanguageAndRegionEntry will be used.
-                    // BLI Item to track this: https://jira.tools.sap/browse/FLPCOREANDUX-10542
-                    if (ushellConfig.last("/core/shell/cdmUserLanguageAndSettingsView")) {
-                        [oEntry] = await ushellUtils.requireAsync(["sap/ushell/adapters/cdm/Settings/UserLanguageAndRegion/UserLanguageAndRegionEntry"]);
-                    } else {
-                        [oEntry] = await ushellUtils.requireAsync(["sap/ushell/components/shell/Settings/userLanguageRegion/UserLanguageRegionEntry"]);
-                    }
+                    var [oEntry] = await ushellUtils.requireAsync(["sap/ushell/adapters/cdm/Settings/UserLanguageAndRegion/UserLanguageAndRegionEntry"]);
+
                     return oEntry;
                 }
             };

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's LaunchPageAdapter for the
  *               'CDM' platform - Version 2 (V2)
  * @deprecated since 1.100
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/_LaunchPage/readHome",
@@ -1880,7 +1880,8 @@ sap.ui.define([
                 return oCompContainer;
             };
             var _customTileCreateCompContainer = function (oComponentLoader) {
-                return oComponentLoader.createComponent({
+                const oDeferred = new jQuery.Deferred();
+                oComponentLoader.createComponent({
                     loadCoreExt: bIsCustomTile, // custom tiles may need modules from core-ext-light
                     loadDefaultDependencies: false,
                     componentData: oTileComponentData,
@@ -1894,7 +1895,15 @@ sap.ui.define([
                     // TODO: clarify about having stable IDs!
                     [], // instantiate directly,
                     UI5ComponentType.Visualization
-                ).then(createCompContainer);
+                )
+                    .then((oAppProperties) => {
+                        const oComponentContainer = createCompContainer(oAppProperties);
+                        oDeferred.resolve(oComponentContainer);
+                    })
+                    .catch(function (oError) {
+                        oDeferred.reject(oError);
+                    });
+                return oDeferred.promise();
             };
 
             var _standardTileCreateCompContainer = function () {
@@ -1920,7 +1929,7 @@ sap.ui.define([
                     .do(function () {
                         Container.getServiceAsync("Ui5ComponentLoader").then(function (oComponentLoader) {
                             _customTileCreateCompContainer(oComponentLoader)
-                                .then(function (oCompContainer) {
+                                .done(function (oCompContainer) {
                                     oDeferred.resolve(oCompContainer);
                                 })
                                 .fail(function (oError) {

package/src/main/js/sap/ushell/adapters/cdm/PagesCommonDataModelAdapter.js

@@ -5,7 +5,7 @@
  * It combines the page data, tile data, navigation data and personalization into a CDM 3.1 site.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -5,7 +5,7 @@
  *
  *
  * The CDM personalization adapter can be used to store data in the RA@ABAP platform.
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/_Personalization/internals",

package/src/main/js/sap/ushell/adapters/cdm/PersonalizationV2Adapter.js

@@ -5,7 +5,7 @@
  *
  *
  * The CDM personalization adapter can be used to store data in the RA@ABAP platform.
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "./PersonalizationAdapter"

package/src/main/js/sap/ushell/adapters/cdm/Settings/UserLanguageAndRegion/UserLanguageAndRegion.view.xml

@@ -32,7 +32,7 @@
         <form:content>
             <Label text="{i18n>timeZoneFld}"/>
             <HBox alignItems="Center">
-                <Text text="{/selectedTimeZone}" class="sapUiTinyMarginEnd"/>
+                <Text id="selectedTimeZone" text="{/selectedTimeZone}" class="sapUiTinyMarginEnd"/>
                 <core:Icon src="sap-icon://information" tooltip="{i18n>timeZoneTooltip}"/>
             </HBox>
 
@@ -46,24 +46,26 @@
             </ComboBox>
 
             <Label text="{i18n>date}"/>
-            <Text text="{/selectedDateFormat}" />
+            <Text id="selectedDateFormat" text="{/selectedDateFormat}" />
 
             <Label text="{i18n>time}"/>
-            <Text text="{/selectedTimeFormat}" />
+            <Text id="selectedTimeFormat" text="{/selectedTimeFormat}" />
 
             <Label text="{i18n>decimalFormat}"/>
-            <Text text="{/selectedDecimalFormat}" />
+            <Text id="selectedDecimalFormat" text="{/selectedDecimalFormat}" />
 
             <Label text="{i18n>workWeek}"/>
-            <Text text="{/selectedWorkWeek}" />
+            <Text id="selectedWorkWeek" text="{/selectedWorkWeek}" />
         </form:content>
         </form:SimpleForm>
         <core:InvisibleText id="LanguageSettingsLabel" text="{i18n>languageAndRegionForm}" />
+        <VBox>
         <MessageStrip
             text="{i18n>languageAndRegionsInfoPopup}"
             type="Information"
             showIcon="true"
-            showCloseButton="true"
-            class="sapUiMediumMarginBottom" />
+            class="sapUiSmallMarginBottom" />
+        <Text text="{i18n>LanguageAndRegionHelpingText}" class="sapUshellFlpSettingsWideDescription" visible="{= !!${/languageList}}" width="100%"/>
+        </VBox>
     </FlexBox>
 </mvc:View>

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

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

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/modifyHome.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Helper of modifying the home page data for the 'CDM' platform.
- * @version 1.134.1
+ * @version 1.136.0
  * @private
  */
 sap.ui.define([

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

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

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Helper of accessing Home Page data for the 'CDM' platform.
  *
- * @version 1.134.1
+ * @version 1.136.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/uri.transform.js

@@ -4,7 +4,7 @@
  * @fileOverview Transforms relative URIs as used e.g. for data sources in the
  * manifest.json
  *
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/URI"

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

@@ -5,7 +5,7 @@
  * Creates CDM site entries for apps with the provided data.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.134.1
+ * @version 1.136.0
  * @private
  */
 sap.ui.define([

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

@@ -5,7 +5,7 @@
  * Creates CDM site entities with the provided data.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.134.1
+ * @version 1.136.0
  * @private
  */
 sap.ui.define([