@sapui5/sap.ushell 1.112.3 → 1.114.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell",
-    "version": "1.112.3",
+    "version": "1.114.0",
     "description": "SAPUI5 Library sap.ushell",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [

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

@@ -2,8 +2,8 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell</name>
     <vendor>SAP SE</vendor>
-    <version>1.112.3</version>
-    <copyright>Copyright (c) 2009-2022 SAP SE, All Rights Reserved</copyright>
+    <version>1.114.0</version>
+    <copyright>Copyright (c) 2009-2023 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell</documentation>
 
     <dependencies>

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/Log",
@@ -33,7 +33,7 @@ sap.ui.define([
     }
 
     function getCurrentAppCapabilities () {
-        return oAppConfiguration.getCurrentApplication().appCapabilities || {};
+        return (oAppConfiguration.getCurrentApplication() && oAppConfiguration.getCurrentApplication().appCapabilities) || {};
     }
 
     function getFrameworkVersion (oCurrentApplication) {

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/base/Log",
@@ -35,7 +35,8 @@ sap.ui.define([
 ) {
     "use strict";
 
-    var sIframeURLDomainForTests = (new URI(document.URL)).search(true)["iframe-url"];
+    var oUrlParams = (new URI(document.URL)).search(true),
+        sIframeURLDomainForTests = oUrlParams["iframe-url"];
 
     function generateWDAResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         var oInbound = oMatchingTarget.inbound;
@@ -52,7 +53,9 @@ sap.ui.define([
 
         if (oPromise) {
             oPromise.then(function (oResult) {
+                oResult.extendedInfo = getExtendedInfo(oMatchingTarget);
                 checkOpenWithPost(oMatchingTarget, oResult);
+                addKeepAliveToURLTemplateResult(oResult);
                 return oResult;
             });
         }
@@ -63,7 +66,9 @@ sap.ui.define([
     function generateTRResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         return oGuiResolution.generateTRResolutionResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver)
             .then(function (oResult) {
+                oResult.extendedInfo = getExtendedInfo(oMatchingTarget);
                 checkOpenWithPost(oMatchingTarget, oResult);
+                addKeepAliveToURLTemplateResult(oResult);
                 return oResult;
             });
     }
@@ -105,10 +110,12 @@ sap.ui.define([
                         text: oInboundResolutionResult.text || "",
                         additionalInformation: oInboundResolutionResult.additionalInformation || "",
                         applicationType: "WCF",
-                        fullWidth: true
+                        fullWidth: true,
+                        extendedInfo: getExtendedInfo(oMatchingTarget)
                     };
 
                     checkOpenWithPost(oMatchingTarget, oResolutionResult);
+                    addKeepAliveToURLTemplateResult(oResolutionResult);
                     addIframeCacheHintToURL(oResolutionResult, "WCF");
                     fnResolve(oResolutionResult);
                 })
@@ -427,23 +434,25 @@ sap.ui.define([
         return oAppCapabilities;
     }
 
-    function getExtendedInfo (oSite, oSiteAppSection, oMatchingTarget) {
+    function getExtendedInfo (oMatchingTarget, oSiteAppSection, oSite) {
         var oInfo = {
             appParams: {},
             system: undefined
         };
 
         // set all parameters list
-        if (oMatchingTarget.mappedIntentParamsPlusSimpleDefaults) {
+        if (oMatchingTarget && oMatchingTarget.mappedIntentParamsPlusSimpleDefaults) {
             oInfo.appParams = JSON.parse(JSON.stringify(oMatchingTarget.mappedIntentParamsPlusSimpleDefaults));
         }
 
         // get the system attributes
-        var sSystem = oUtils.getMember(oSiteAppSection, "sap|app.destination");
-        if (typeof sSystem === "string" && sSystem.length > 0) {
-            oInfo.system = oSite.systemAliases[sSystem] && JSON.parse(JSON.stringify(oSite.systemAliases[sSystem]));
-            if (typeof oInfo.system === "object") {
-                oInfo.system.alias = sSystem;
+        if (oSiteAppSection) {
+            var sSystem = oUtils.getMember(oSiteAppSection, "sap|app.destination");
+            if (typeof sSystem === "string" && sSystem.length > 0) {
+                oInfo.system = oSite.systemAliases[sSystem] && JSON.parse(JSON.stringify(oSite.systemAliases[sSystem]));
+                if (typeof oInfo.system === "object") {
+                    oInfo.system.alias = sSystem;
+                }
             }
         }
 
@@ -529,9 +538,17 @@ sap.ui.define([
     add "sap-keep-alive" parameter as a url parameter
      */
     function addKeepAliveToURLTemplateResult (oResult) {
-        var sKeepAlive = oResult.extendedInfo.appParams["sap-keep-alive"];
+        var sKeepAlive;
+        if (oUrlParams && oUrlParams.hasOwnProperty("sap-keep-alive")) {
+            sKeepAlive = oUrlParams["sap-keep-alive"];
+        } else {
+            sKeepAlive = ObjectPath.get("extendedInfo.appParams.sap-keep-alive", oResult);
+            if (Array.isArray(sKeepAlive)) {
+                sKeepAlive = sKeepAlive[0];
+            }
+        }
         if (sKeepAlive !== undefined) {
-            appParameterToUrl(oResult, "sap-keep-alive", sKeepAlive[0]);
+            appParameterToUrl(oResult, "sap-keep-alive", sKeepAlive);
         }
     }
 
@@ -713,7 +730,7 @@ sap.ui.define([
                         fnInstantiateTemplate
                     ),
                     url: sURL,
-                    extendedInfo: getExtendedInfo(oTemplateContext.site, oTemplateContext.siteAppSection, oMatchingTarget),
+                    extendedInfo: getExtendedInfo(oMatchingTarget, oTemplateContext.siteAppSection, oTemplateContext.site),
                     contentProviderId: oInbound.contentProviderId || "",
                     systemAlias: (oTemplateContext.siteAppSection["sap.app"] &&
                         oTemplateContext.siteAppSection["sap.app"].destination) ||

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/Device",
@@ -7,11 +7,11 @@ sap.ui.define([
     "use strict";
 
     /*
-     * Module for drawing background shpes and performing animations on user events
+     * Module for drawing background shapes and performing animations on user events
      * Draws three shapes, each shape is defined by its center, which is set randomly in predefined range on the screen,
      * 3 anchor points that define 3 bezier curves to be set between them.
      * Control points are calculated randomly with certain restrictions - two control  points for each pair of anchor points.
-     * Then, the cubic bezier curve is drawn by canvas, while each pair of anchors are passed as start and end points and their corresponding conrol points are passed as control points.
+     * Then, the cubic bezier curve is drawn by canvas, while each pair of anchors are passed as start and end points and their corresponding control points are passed as control points.
      */
 
     /* Point object for controlling the points on canvas */
@@ -52,16 +52,16 @@ sap.ui.define([
         this.y = { min: iYmin, max: iYmax };
     };
 
-    var canvasWidth = (window.innerWidth > 0) ? window.innerWidth : screen.width,
-        canvasHeight = (window.innerHeight > 0) ? window.innerHeight : screen.height,
-        centerRanges = {
-            cpr1: new Range(0, canvasWidth / 4, 0, canvasHeight / 4),
-            cpr2: new Range(canvasWidth / 2, canvasWidth, 0, canvasHeight / 4),
-            cpr3: new Range(canvasWidth / 4, 3 * canvasWidth / 4, canvasHeight * 3 / 4, canvasHeight)
-        },
-        manager = function () {
-            this.init();
-        };
+    var canvasWidth = (window.innerWidth > 0) ? window.innerWidth : screen.width;
+    var canvasHeight = (window.innerHeight > 0) ? window.innerHeight : screen.height;
+    var centerRanges = {
+        cpr1: new Range(0, canvasWidth / 4, 0, canvasHeight / 4),
+        cpr2: new Range(canvasWidth / 2, canvasWidth, 0, canvasHeight / 4),
+        cpr3: new Range(canvasWidth / 4, 3 * canvasWidth / 4, canvasHeight * 3 / 4, canvasHeight)
+    };
+    var manager = function () {
+        this.init();
+    };
 
     manager.prototype = {
         radiusRange: {
@@ -69,8 +69,31 @@ sap.ui.define([
             max: 900
         },
 
+        _getCanvas: function () {
+            var canvas = document.getElementById("shell-shapes");
+            if (canvas) {
+                return canvas;
+            }
+            return this._createCanvas("shell-shapes");
+        },
+
+        _createCanvas: function (sId) {
+            var oCanvas = document.createElement("canvas");
+            oCanvas.setAttribute("id", sId);
+            oCanvas.setAttribute("role", "presentation");
+
+            this._updateCanvasDimensions(oCanvas);
+
+            sap.ushell.Container.getRenderer().setShellShapes(oCanvas);
+            return oCanvas;
+        },
+
+        _updateCanvasDimensions: function (oCanvas) {
+            oCanvas.height = (window.innerHeight > 0) ? window.innerHeight : screen.height + "px";
+            oCanvas.width = (window.innerWidth > 0) ? window.innerWidth : screen.width + "px";
+        },
+
         init: function () {
-            this.Id = "shell-shapes";
             var cprs = { cpr1: centerRanges.cpr1, cpr2: centerRanges.cpr2, cpr3: centerRanges.cpr3 },
                 radius,
                 center,
@@ -160,10 +183,9 @@ sap.ui.define([
         },
 
         resizeHandler: function () {
-            var canvas = document.getElementById(this.Id);
+            var canvas = this._getCanvas();
             if (canvas) {
-                canvas.width = window.innerWidth;
-                canvas.height = window.innerHeight;
+                this._updateCanvasDimensions(canvas);
                 this.bIsDirty = true;
                 this.onThemeChanged();
             }
@@ -312,7 +334,7 @@ sap.ui.define([
         },
 
         drawShapes: function () {
-            var canvas = document.getElementById(this.Id);
+            var canvas = this._getCanvas();
             if (this.bIsDirty && canvas && canvas.getContext) {
                 var context = canvas.getContext("2d"),
                     startPoint,

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ushell/EventHub",
     "sap/ushell/bootstrap/common/common.create.configcontract.core",