@sapui5/sap.ushell 1.120.7 → 1.121.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell",
-    "version": "1.120.7",
+    "version": "1.121.0",
     "description": "SAPUI5 Library sap.ushell",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [
@@ -15,7 +15,7 @@
         "build-themes": "cross-env-shell ui5 build --exclude-task=* --include-task=buildThemes --framework-version $npm_package_version"
     },
     "devDependencies": {
-        "@ui5/cli": "^3.2.0",
+        "@ui5/cli": "^3.7.1",
         "cross-env": "^7.0.3"
     }
 }

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

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

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

@@ -6,9 +6,8 @@ sap.ui.define([
     "sap/base/util/restricted/_curry",
     "sap/base/util/restricted/_zipObject",
     "sap/ui/VersionInfo",
-    "sap/ushell/Config",
-    "sap/ushell/TechnicalParameters"
-], function (Log, oAppConfiguration, _curry, _zipObject, VersionInfo, Config, TechnicalParameters) {
+    "sap/ushell/Config"
+], function (Log, oAppConfiguration, _curry, _zipObject, VersionInfo, Config) {
     "use strict";
     /*global */
 
@@ -105,7 +104,7 @@ sap.ui.define([
             UI5: function () {
                 var oComponentInstance = oCurrentApplication.componentInstance;
                 if (oComponentInstance) {
-                    var sComponentName = oComponentInstance.getMetadata().getManifestEntry("/sap.ui5/componentName");
+                    var sComponentName = oComponentInstance.getManifestEntry("/sap.ui5/componentName");
                     if (!sComponentName) {
                         sComponentName = oComponentInstance.getMetadata().getComponentName();
                     }
@@ -209,7 +208,7 @@ sap.ui.define([
      * else it looks up the application type
      * @param {*} oCurrentApplication current application
      * @returns {function} Function that resolves to a promise with the framework id
-    */
+     */
     function getAppFrameworkId (oCurrentApplication) {
         return Promise.resolve().then(function () {
             var oCurrentApp = oAppConfiguration.getCurrentApplication();
@@ -268,10 +267,21 @@ sap.ui.define([
         technicalAppComponentId: getTechnicalAppComponentId,
         appId: getAppId,
         appVersion: getAppVersion,
-        productName: _curry(getSystemContext)("productName")
+        productName: _curry(getSystemContext)("productName"),
+        applicationParams: getStartupParams
     };
 
 
+    function getStartupParams(oCurrentApplication, oApplicationContainer) {
+        var oStartupParams = {};
+        if (oApplicationContainer && oApplicationContainer.getCurrentAppTargetResolution &&
+            oApplicationContainer.getCurrentAppTargetResolution().extendedInfo) {
+            oStartupParams = oApplicationContainer.getCurrentAppTargetResolution().extendedInfo.appParams;
+        }
+
+        return Promise.resolve(oStartupParams);
+    }
+
     /**
      * Returns <code>true</code> if the given parameter is a custom property.
      * This is the case when:
@@ -287,10 +297,11 @@ sap.ui.define([
         return !oHandlers[sParameter] && /[.]/.test(sParameter);
     }
 
-    function getAllAppInfo (bValues, oCurrentApplication, oComponentInstance, oApplicationContainer, sApplicationType) {
+    function getAllAppInfo (bValues, oCurrentApplication, oComponentInstance, oApplicationContainer) {
         return new Promise(function (fnResolve) {
             var allAppInfo = {};
 
+            //first, we collect all custom attributes
             for (var sCustomerAttribute in getCustomAttributes()) {
                 if (bValues) {
                     allAppInfo[sCustomerAttribute] = getCustomAttributes()[sCustomerAttribute].value;
@@ -299,44 +310,22 @@ sap.ui.define([
                 }
             }
 
-            var arrResults = {},
-            aPromises = [];
-            aPromises.push(_getInfo(["appFrameworkId"], oCurrentApplication)
-                .then(function () {
-                    return _getInfo(Object.keys(oHandlers), oCurrentApplication);
-                }));
-            aPromises.push(TechnicalParameters.getTechnicalParametersAppInfo(oComponentInstance, oApplicationContainer, sApplicationType));
-            Promise.allSettled(aPromises).then(function (aResults) {
-                if (aResults[0].status === "fulfilled") {
-                        for (var handler in aResults[0].value) {
-                            if (aResults[0].value[handler] !== undefined) {
-                                if (bValues) {
-                                    arrResults[handler] = aResults[0].value[handler];
-                                } else {
-                                    arrResults[handler] = {
-                                        value: aResults[0].value[handler]
-                                    };
-                                }
-                            }
-                        }
-                }
-                if (aResults[1].status === "fulfilled") {
-                    for (var sTechnicalParameter in aResults[1].value) {
-                        if (!allAppInfo.hasOwnProperty(sTechnicalParameter)) {
-                            if (aResults[1].value[sTechnicalParameter].value && aResults[1].value[sTechnicalParameter].value[0] !== undefined) {
-                                if (bValues) {
-                                    arrResults[sTechnicalParameter] = aResults[1].value[sTechnicalParameter].value[0];
-                                } else {
-                                    arrResults[sTechnicalParameter] = {
-                                        value: aResults[1].value[sTechnicalParameter].value[0]
-                                    };
-                                }
-                            }
-                        }
+            //then, we add all FLP's attributes
+            _getInfo(Object.keys(oHandlers), oCurrentApplication, oApplicationContainer).then((oResult) => {
+                let arrResults = {};
+                for (var handler in oResult) {
+                    if (bValues) {
+                        arrResults[handler] = oResult[handler];
+                    } else {
+                        arrResults[handler] = {
+                            value: oResult[handler]
+                        };
                     }
                 }
                 allAppInfo = Object.assign(arrResults, allAppInfo);
                 fnResolve(allAppInfo);
+            }, () => {
+                fnResolve(allAppInfo);
             });
         });
     }
@@ -348,7 +337,7 @@ sap.ui.define([
      * @returns {Promise} oPromise Promise that resolves to an object
      *    keeping the application info parameters with values
      */
-        function _getInfo (aParameters, oCurrentApplication) {
+        function _getInfo (aParameters, oCurrentApplication, oApplicationContainer) {
             var aPromises = aParameters.map(function (sParameter) {
                 if (isAttributeExist(sParameter)) {
                     return Promise.resolve(getCustomValue(sParameter));
@@ -361,12 +350,20 @@ sap.ui.define([
                     Log.error(sParameter + " is not a valid app info parameter");
                     return undefined;
                 }
-                return oHandlers[sParameter](oCurrentApplication);
+                return oHandlers[sParameter](oCurrentApplication, oApplicationContainer);
             });
 
-        return Promise.all(aPromises).then(function (aValues) {
-            return _zipObject(aParameters, aValues);
-        });
+            return Promise.allSettled(aPromises).then(function (aValues) {
+                for (var i = 0; i < aValues.length; i++) {
+                    if (aValues[i].status === "fulfilled") {
+                        aValues[i] = aValues[i].value;
+                    } else {
+                        aValues[i] = undefined;
+                    }
+                }
+
+                return _zipObject(aParameters, aValues);
+            });
     }
 
     //object of all app info
@@ -415,15 +412,15 @@ sap.ui.define([
          * @returns {Promise} Promise that resolves to an object
          *    keeping the application info parameters with values
          */
-        getInfo: function (aParameters, oCurrentApplication) {
+        getInfo: function (aParameters, oCurrentApplication, oApplicationContainer) {
             if (!oCurrentApplication) {
                 return Promise.reject("Parameter application missing");
             }
             return _getInfo(
                 ["appFrameworkId"],
-                oCurrentApplication
+                oCurrentApplication, oApplicationContainer
             ).then(function () {
-                return _getInfo(aParameters, oCurrentApplication);
+                return _getInfo(aParameters, oCurrentApplication, oApplicationContainer);
             });
         },
         getCustomValue : getCustomValue,

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

@@ -19,8 +19,9 @@ sap.ui.define([
      * 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 */
-
+    /**
+     * Point object for controlling the points on canvas
+     */
     var Point = function (x, y) {
         this.x = x || 0;
         this.y = y || 0;
@@ -89,7 +90,7 @@ sap.ui.define([
 
             this._updateCanvasDimensions(oCanvas);
 
-            Container.getRenderer().setShellShapes(oCanvas);
+            Container.getRendererInternal().setShellShapes(oCanvas);
             return oCanvas;
         },
 
@@ -200,7 +201,7 @@ sap.ui.define([
             this._enableDrawing = bEnableAnimationDrawing;
         },
 
-        /*
+        /**
          * Parameters:
          *   shape: the CircleShape that will become amorphous
          *   startPoint: start point that it's controlPoints should be rotated
@@ -248,7 +249,7 @@ sap.ui.define([
             return shape;
         },
 
-        /*
+        /**
          * Increment controlPoint1 coordinates by given offsets, and decrement controlPoint2 coordinates by same off set values.
          * This creates rotation effect of the line that defined by the two given points
          */
@@ -268,7 +269,7 @@ sap.ui.define([
             return controlsPoints;
         },
 
-        /*
+        /**
          * return an array of four points. these points are points on the square circumference.
          * Each point is on the middle between two corners of the square that blocks the circle that defined by the given parameters:
          *   radius: the radius of the circle
@@ -294,7 +295,7 @@ sap.ui.define([
             return Math.floor(Math.random() * (max - min + 1)) + min;
         },
 
-        /*
+        /**
          * Calculate bezierCurves of a circle with given radius
          *   radius: the circle radius
          *   squarePoints: the square tangent points that blocks the circle (which is the center of the edges)