@sapui5/sap.ushell 1.113.0 → 1.115.0

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/i18n/i18n_vi.properties

@@ -82,6 +82,21 @@ CATEGORIES.BusinessRecord.Card.SubTitle=
 CATEGORIES.BusinessRecord.LoadingData=\u0110ang ti\u0300m ki\u00EA\u0301m ba\u0309n ghi kinh doanh...
 CATEGORIES.BusinessRecord.NoData=Kh\u00F4ng ti\u0300m th\u00E2\u0301y ba\u0309n ghi kinh doanh phu\u0300 h\u01A1\u0323p
 
+CATEGORIES.Document.Title=Documents
+CATEGORIES.Document.ShortTitle=Documents
+CATEGORIES.Document.Card.Title=Documents
+CATEGORIES.Document.Card.SubTitle=
+CATEGORIES.Document.LoadingData=Searching for documents
+CATEGORIES.Document.NoData=No matching documents found
+
+CATEGORIES.Video.Title=Videos
+CATEGORIES.Video.ShortTitle=Videos
+CATEGORIES.Video.Card.Title=Videos
+CATEGORIES.Video.Card.SubTitle=
+CATEGORIES.Video.LoadingData=Searching for videos
+CATEGORIES.Video.NoData=No matching videos found
+
+CATEGORIES.All.ViewAll=View All
 
 FILTERS.Tags.Label=The\u0309/T\u01B0\u0300 kho\u0301a
 FILTERS.Tags.Description=B\u00F4\u0323 lo\u0323c the\u0309 va\u0300 t\u01B0\u0300 kho\u0301a
@@ -92,3 +107,11 @@ FILTERS.System.Description=B\u00F4\u0323 lo\u0323c trong h\u00EA\u0323 th\u00F4\
 FILTERS.Modified.Label=\u0110a\u0303 chi\u0309nh s\u01B0\u0309a
 FILTERS.Modified.Description=B\u00F4\u0323 lo\u0323c \u0111a\u0303 chi\u0309nh s\u01B0\u0309a
 
+CATEGORY.Views.TileButtonText=Tile
+CATEGORY.Views.ListButtonText=List
+CATEGORY.Views.CardButtonText=Card
+CATEGORY.Views.TileButtonTooltip=Tile View
+CATEGORY.Views.ListButtonTooltip=List View
+CATEGORY.Views.CardButtonTooltip=Card View
+
+CATEGORY.Views.RefreshButton=Refresh Result

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/i18n/i18n_zh_CN.properties

@@ -82,6 +82,21 @@ CATEGORIES.BusinessRecord.Card.SubTitle=
 CATEGORIES.BusinessRecord.LoadingData=\u6B63\u5728\u641C\u7D22\u4E1A\u52A1\u8BB0\u5F55...
 CATEGORIES.BusinessRecord.NoData=\u672A\u627E\u5230\u5339\u914D\u7684\u4E1A\u52A1\u8BB0\u5F55
 
+CATEGORIES.Document.Title=Documents
+CATEGORIES.Document.ShortTitle=Documents
+CATEGORIES.Document.Card.Title=Documents
+CATEGORIES.Document.Card.SubTitle=
+CATEGORIES.Document.LoadingData=Searching for documents
+CATEGORIES.Document.NoData=No matching documents found
+
+CATEGORIES.Video.Title=Videos
+CATEGORIES.Video.ShortTitle=Videos
+CATEGORIES.Video.Card.Title=Videos
+CATEGORIES.Video.Card.SubTitle=
+CATEGORIES.Video.LoadingData=Searching for videos
+CATEGORIES.Video.NoData=No matching videos found
+
+CATEGORIES.All.ViewAll=View All
 
 FILTERS.Tags.Label=\u6807\u8BB0/\u5173\u952E\u5B57
 FILTERS.Tags.Description=\u5BF9\u6807\u8BB0\u548C\u5173\u952E\u5B57\u8FDB\u884C\u8FC7\u6EE4
@@ -92,3 +107,11 @@ FILTERS.System.Description=\u5728\u8FDE\u63A5\u7684\u7279\u5B9A\u7CFB\u7EDF\u4E2
 FILTERS.Modified.Label=\u5DF2\u4FEE\u6539
 FILTERS.Modified.Description=\u5BF9\u5DF2\u4FEE\u6539\u5185\u5BB9\u8FDB\u884C\u8FC7\u6EE4
 
+CATEGORY.Views.TileButtonText=Tile
+CATEGORY.Views.ListButtonText=List
+CATEGORY.Views.CardButtonText=Card
+CATEGORY.Views.TileButtonTooltip=Tile View
+CATEGORY.Views.ListButtonTooltip=List View
+CATEGORY.Views.CardButtonTooltip=Card View
+
+CATEGORY.Views.RefreshButton=Refresh Result

package/src/main/js/sap/ushell/components/cepsearchresult/app/util/i18n/i18n_zh_TW.properties

@@ -82,6 +82,21 @@ CATEGORIES.BusinessRecord.Card.SubTitle=
 CATEGORIES.BusinessRecord.LoadingData=\u6B63\u5728\u641C\u5C0B\u4F01\u696D\u8A18\u9304...
 CATEGORIES.BusinessRecord.NoData=\u627E\u4E0D\u5230\u7B26\u5408\u7684\u4F01\u696D\u8A18\u9304
 
+CATEGORIES.Document.Title=Documents
+CATEGORIES.Document.ShortTitle=Documents
+CATEGORIES.Document.Card.Title=Documents
+CATEGORIES.Document.Card.SubTitle=
+CATEGORIES.Document.LoadingData=Searching for documents
+CATEGORIES.Document.NoData=No matching documents found
+
+CATEGORIES.Video.Title=Videos
+CATEGORIES.Video.ShortTitle=Videos
+CATEGORIES.Video.Card.Title=Videos
+CATEGORIES.Video.Card.SubTitle=
+CATEGORIES.Video.LoadingData=Searching for videos
+CATEGORIES.Video.NoData=No matching videos found
+
+CATEGORIES.All.ViewAll=View All
 
 FILTERS.Tags.Label=\u6A19\u7C64/\u95DC\u9375\u5B57
 FILTERS.Tags.Description=\u7BE9\u9078\u6A19\u7C64\u548C\u95DC\u9375\u5B57
@@ -92,3 +107,11 @@ FILTERS.System.Description=\u5728\u7279\u5B9A\u9023\u63A5\u7CFB\u7D71\u4E2D\u7BE
 FILTERS.Modified.Label=\u5DF2\u4FEE\u6539
 FILTERS.Modified.Description=\u7BE9\u9078\u5DF2\u4FEE\u6539
 
+CATEGORY.Views.TileButtonText=Tile
+CATEGORY.Views.ListButtonText=List
+CATEGORY.Views.CardButtonText=Card
+CATEGORY.Views.TileButtonTooltip=Tile View
+CATEGORY.Views.ListButtonTooltip=List View
+CATEGORY.Views.CardButtonTooltip=Card View
+
+CATEGORY.Views.RefreshButton=Refresh Result

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.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -157,12 +157,17 @@ sap.ui.define([
     function getParameterMap (sUrl) {
         var mParams = UriParameters.fromURL(sUrl).mParams,
             xAppState = mParams["sap-xapp-state"],
+            xAppStateData = mParams["sap-xapp-state-data"],
             oResult;
         delete mParams["sap-xapp-state"];
+        delete mParams["sap-xapp-state-data"];
         oResult = {
             startupParameters: mParams
         };
-        if (xAppState) {
+        if (xAppStateData) {
+            oResult["sap-xapp-state"] = xAppStateData;
+        }
+        if (xAppState) { // sap-xapp-state has priority over sap-xapp-state-data
             oResult["sap-xapp-state"] = xAppState;
         }
         return oResult;
@@ -316,7 +321,10 @@ sap.ui.define([
                 var componentData = oUrlData ? {
                     startupParameters: oUrlData.startupParameters
                 } : { startupParameters: {} };
-                if (oUrlData && oUrlData["sap-xapp-state"]) {
+                if (oUrlData && oUrlData["sap-xapp-state-data"]) {
+                    componentData["sap-xapp-state"] = oUrlData["sap-xapp-state-data"];
+                }
+                if (oUrlData && oUrlData["sap-xapp-state"]) { // sap-xapp-state has priority over sap-xapp-state-data
                     componentData["sap-xapp-state"] = oUrlData["sap-xapp-state"];
                 }
                 if (oContainer.getApplicationConfiguration()) {
@@ -426,7 +434,10 @@ sap.ui.define([
             oComponentData = {
                 startupParameters: oUrlData.startupParameters
             };
-            if (oUrlData["sap-xapp-state"]) {
+            if (oUrlData["sap-xapp-state-data"]) {
+                oComponentData["sap-xapp-state"] = oUrlData["sap-xapp-state-data"];
+            }
+            if (oUrlData["sap-xapp-state"]) { // sap-xapp-state has priority over sap-xapp-state-data
                 oComponentData["sap-xapp-state"] = oUrlData["sap-xapp-state"];
             }
             sUrl = sUrl.slice(0, iIndex);
@@ -820,16 +831,21 @@ sap.ui.define([
      *   the base URL
      * @private
      */
-    function checkNwbcUrlAdjustment (oContainer, sApplicationType, sUrl) {
-        if (utils.isApplicationTypeEmbeddedInIframe(sApplicationType) || utils.isApplicationTypeEmbeddedInIframe(oContainer.getFrameworkId())) {
-            var sTargetNavigationMode = oContainer.getTargetNavigationMode();
+    function checkNwbcUrlAdjustment (oContainer, sApplicationType, sUrl, bForFramelessWindow) {
+        if (bForFramelessWindow === undefined) {
+            bForFramelessWindow = false;
+        }
+        if (utils.isApplicationTypeEmbeddedInIframe(sApplicationType) || (oContainer && utils.isApplicationTypeEmbeddedInIframe(oContainer.getFrameworkId()))) {
+            var sTargetNavigationMode = oContainer && oContainer.getTargetNavigationMode();
 
             // amend already resolved url with additional parameters
-            sUrl = ApplicationContainer.prototype._adjustNwbcUrl(sUrl, sApplicationType, sTargetNavigationMode, oContainer.getIsStateful());
+            sUrl = ApplicationContainer.prototype._adjustNwbcUrl(sUrl, sApplicationType, sTargetNavigationMode, oContainer && oContainer.getIsStateful(), bForFramelessWindow);
 
             // add this container to list of NWBC-containing containers
-            utils.localStorageSetItem(oContainer.globalDirtyStorageKey,
-                sap.ushell.Container.DirtyState.INITIAL);
+            if (oContainer && bForFramelessWindow === false) {
+                utils.localStorageSetItem(oContainer.globalDirtyStorageKey,
+                    sap.ushell.Container.DirtyState.INITIAL);
+            }
         }
 
         return sUrl;
@@ -849,7 +865,10 @@ sap.ui.define([
      *   Modified url having additional parameters
      * @private
      */
-    function adjustNwbcUrl (sUrl, sUrlApplicationType, sTargetNavigationMode, bReuseSession) {
+    function adjustNwbcUrl (sUrl, sUrlApplicationType, sTargetNavigationMode, bReuseSession, bForFramelessWindow) {
+        if (bForFramelessWindow === undefined) {
+            bForFramelessWindow = false;
+        }
         var sTheme,
             getAccessibility = function () {
                 var vUrl = utils.getParameterValueBoolean("sap-accessibility");
@@ -908,19 +927,14 @@ sap.ui.define([
         // force IE to edge mode
         sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
         sUrl += "sap-ie=edge";
-        // transport sap-theme to NWBC HTML
-        sTheme = getTheme();
 
+        sTheme = getTheme();
         if (sTheme) {
             sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
             sUrl += "sap-theme=" + encodeURIComponent(sTheme);
             // note, we do not replace existing parameters
         }
-        if (sTargetNavigationMode) {
-            sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-            sUrl += "sap-target-navmode=" + encodeURIComponent(sTargetNavigationMode);
-            // note, we do not replace existing parameters
-        }
+
         if (getAccessibility()) {
             // propagate accessibility mode
             // Note: This is handled by the WebGUI/WDA framework which expects a value of "X"!
@@ -936,34 +950,43 @@ sap.ui.define([
             // note, we do not replace existing parameters
         }
 
-        if (sUrlApplicationType === "TR" || sUrlApplicationType === "GUI") {
-            sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-            sUrl += "sap-keepclientsession=2";
-        } else if (bReuseSession) {
-            sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-            sUrl += "sap-keepclientsession=1";
-        }
-
-        var sKey = getInAppState();
-        if (sKey && sKey.length > 0) {
-            sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-            sUrl += "sap-iapp-state=" + sKey;
-        }
-
         var sDensity = getDensity();
         if (sDensity && sDensity.length > 0) {
             sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
             sUrl += "sap-touch=" + sDensity;
         }
 
-        var sessionTimeout = 0;
-        if (Config.last("/core/shell/sessionTimeoutIntervalInMinutes") > 0) {
-            sessionTimeout = Config.last("/core/shell/sessionTimeoutIntervalInMinutes");
-        }
-        sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
-        sUrl += "sap-ushell-timeout=" + sessionTimeout;
+        if (bForFramelessWindow === false) {
+            if (sTargetNavigationMode) {
+                sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
+                sUrl += "sap-target-navmode=" + encodeURIComponent(sTargetNavigationMode);
+                // note, we do not replace existing parameters
+            }
 
-        return utils.appendSapShellParam(sUrl, sUrlApplicationType);
+            if (sUrlApplicationType === "TR" || sUrlApplicationType === "GUI") {
+                sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
+                sUrl += "sap-keepclientsession=2";
+            } else if (bReuseSession) {
+                sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
+                sUrl += "sap-keepclientsession=1";
+            }
+
+            var sKey = getInAppState();
+            if (sKey && sKey.length > 0) {
+                sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
+                sUrl += "sap-iapp-state=" + sKey;
+            }
+
+            var sessionTimeout = 0;
+            if (Config.last("/core/shell/sessionTimeoutIntervalInMinutes") > 0) {
+                sessionTimeout = Config.last("/core/shell/sessionTimeoutIntervalInMinutes");
+            }
+            sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?";
+            sUrl += "sap-ushell-timeout=" + sessionTimeout;
+
+            return utils.appendSapShellParam(sUrl, sUrlApplicationType);
+        }
+        return sUrl;
     }
 
     /**
@@ -1238,6 +1261,17 @@ sap.ui.define([
                 aAppStateKeysArray.push([aParams[1]]);
                 aInfoArray.push("sap-xapp-state-data");
             }
+        } else if (sUrl.indexOf("sap-xapp-state-data=") > 0) {
+            aParams = /(?:sap-xapp-state-data=)([^&/]+)/.exec(sUrl);
+            if (aParams && aParams.length === 2) {
+                try {
+                    var sDecodedParam = decodeURIComponent([aParams[1]]);
+                    aAppStateKeysArray.push([sDecodedParam]);
+                    aInfoArray.push("sap-xapp-state-data");
+                } catch (error) {
+                    Log.error("Invalid encoding of the sap-xapp-state-data parameter in the url: ", aParams[1]);
+                }
+            }
         }
 
         if (sUrl.indexOf("sap-iapp-state=") > 0) {