@sapui5/sap.ushell 1.125.0 → 1.126.0

package/src/main/js/sap/ushell/utils/workpage/WorkPageService.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module communicates with the content API graphql service to retrieve workpage and visualization data.
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/base/i18n/Localization",
@@ -98,7 +98,8 @@ sap.ui.define([
         let workPage;
 
         do {
-            let sWorkPageQuery = this._createWorkPageQuery(this._sSiteId, sPageId, workPage === undefined, pageInfo?.endCursor);
+            const bUseIntentNavigation = Config.last("/core/shell/intentNavigation");
+            const sWorkPageQuery = this._createWorkPageQuery(this._sSiteId, sPageId, workPage === undefined, pageInfo?.endCursor, bUseIntentNavigation);
 
             const oRequestedData = await this._doRequest(sWorkPageQuery);
             const oValidatedData = await this._validateData(oRequestedData);
@@ -123,9 +124,10 @@ sap.ui.define([
      * @param {string} sPageId The WorkPage id
      * @param {boolean} bIncludeWorkPage toggles if {id, contents, editable} should also be part of the requetst. undefined object will cause errors
      * @param {string} sEndCursor endCursor of previous request
+     * @param {boolean} bUseIntentNavigation Toggle to retrieve targetAppIntent if intentNavigation feature in config is true
      * @returns {string} A GraphQL Query as a string
      */
-    WorkPage.prototype._createWorkPageQuery = function (sSiteId, sPageId, bIncludeWorkPage, sEndCursor) {
+    WorkPage.prototype._createWorkPageQuery = function (sSiteId, sPageId, bIncludeWorkPage, sEndCursor, bUseIntentNavigation) {
         if (!sSiteId || !sPageId) {
             throw new Error(`Invalid Arguments, missing either siteId: ${sSiteId} or pageId: ${sPageId}`);
         }
@@ -148,6 +150,12 @@ sap.ui.define([
                         }
                         nodes{
                             id,
+                            ${bUseIntentNavigation ? `
+                                targetAppIntent{
+                                    semanticObject,
+                                    action,
+                                    businessAppId
+                            },` : ""}
                             type,
                             descriptor{
                                 value
@@ -155,6 +163,10 @@ sap.ui.define([
                             descriptorResources{
                                 baseUrl,
                                 descriptorPath
+                            },
+                            indicatorDataSource{
+                                url,
+                                refreshInterval
                             }
                         }
                     }
@@ -315,17 +327,22 @@ sap.ui.define([
         const oDataSourceFromApp = ObjectPath.get(["sap.app", "dataSources", sIndicatorDataSourceName], oApplication);
         const sContentProviderId = ObjectPath.get(["sap.app", "contentProviderId"], oApplication);
         const sContentProviderLabel = await readUtils.getContentProviderLabel(sContentProviderId);
+        const bUseIntentNavigation = Config.last("/core/shell/intentNavigation");
         const oInstantiationVizData = {
             vizConfig: ObjectPath.get(["descriptor", "value"], oVizData)
         };
         oInstantiationVizData.target = readUtils.harmonizeTarget(readVisualizations.getTarget(oInstantiationVizData) || {});
+        if (bUseIntentNavigation) {
+            oVizData.target = oInstantiationVizData.target;
+            oVizData.targetURL = utilsCdm.toHashFromTargetIntent(oVizData.targetAppIntent, oInstantiationVizData.target);
+        }
 
         const oExtendedVizData = deepExtend({}, oVizData, {
             _siteData: {
                 contentProviderId: sContentProviderId,
                 contentProviderLabel: sContentProviderLabel,
-                target: oInstantiationVizData.target,
-                targetURL: utilsCdm.toHashFromVizData(oInstantiationVizData, oApplications),
+                target: bUseIntentNavigation ? "" : oInstantiationVizData.target,
+                targetURL: bUseIntentNavigation ? "" : utilsCdm.toHashFromVizData(oInstantiationVizData, oApplications),
                 dataSource: oDataSourceFromApp
             }
         });

package/src/main/js/sap/ushell/utils/workpage/WorkPageVizInstantiation.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module provides utilities for creating visualization instances for work pages.
- * @version 1.125.0
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/ushell/services/VisualizationInstantiation",
@@ -90,7 +90,7 @@ sap.ui.define([
          * @private
          * @since 1.123.0
          */
-        constructor (oVizInstantiationService, oStandardVizTypes) {
+        constructor(oVizInstantiationService, oStandardVizTypes) {
             // VisualizationInstantiation is directly constructed, because the ushell container is not available in the design-time
             this.#oVizInstantiationService = oVizInstantiationService;
             this.#oStandardVizTypes = oStandardVizTypes;
@@ -105,10 +105,11 @@ sap.ui.define([
          */
         _getVizInstantiationData (oVizData) {
             // viz instantiation service modifies the indicatorDataSource which breaks if objects are frozen
-            const oIndicatorDataSource = deepClone(ObjectPath.get(["descriptor", "value", "sap.flp", "indicatorDataSource"], oVizData));
             const oVizType = this.#oStandardVizTypes[oVizData.type];
             const bProviderInfoEnabled = Config.last("/core/contentProviders/providerInfo/enabled");
             const bShowProviderInfoInSystemInfo = bProviderInfoEnabled && Config.last("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations");
+            const bUseIntentNavigation = Config.last("/core/shell/intentNavigation");
+
             return {
                 id: oVizData.id,
                 title: ObjectPath.get(["descriptor", "value", "sap.app", "title"], oVizData),
@@ -120,14 +121,14 @@ sap.ui.define([
                     platform: "CDM",
                     vizType: oVizType
                 },
-                indicatorDataSource: oIndicatorDataSource,
+                indicatorDataSource: ObjectPath.get("indicatorDataSource", oVizData),
                 vizType: ObjectPath.get("type", oVizData),
                 dataSource: ObjectPath.get(["_siteData", "dataSource"], oVizData),
                 contentProviderId: ObjectPath.get(["_siteData", "contentProviderId"], oVizData),
                 contentProviderLabel: ObjectPath.get(["_siteData", "contentProviderLabel"], oVizData),
                 displayProviderLabel: bShowProviderInfoInSystemInfo,
-                target: ObjectPath.get(["_siteData", "target"], oVizData),
-                targetURL: ObjectPath.get(["_siteData", "targetURL"], oVizData),
+                target: bUseIntentNavigation ? ObjectPath.get("target", oVizData) : ObjectPath.get(["_siteData", "target"], oVizData),
+                targetURL: bUseIntentNavigation ? ObjectPath.get("targetURL", oVizData) : ObjectPath.get(["_siteData", "targetURL"], oVizData),
                 vizConfig: ObjectPath.get(["descriptor", "value"], oVizData),
                 supportedDisplayFormats: ObjectPath.get(["descriptor", "value", "sap.flp", "vizOptions", "displayFormats", "supported"], oVizData),
                 displayFormatHint: ObjectPath.get(["descriptor", "value", "sap.flp", "vizOptions", "displayFormats", "default"], oVizData) || "standard",

package/src/test/js/sap/ushell/bootstrap/sandbox.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  *
- * @version 1.125.0
+ * @version 1.126.0
  */
 
 (function () {

package/ui5.yaml

@@ -238,7 +238,7 @@ builder:
               - sap/ui/model/odata/v2/ODataModel.js
               - sap/ui/thirdparty/jquery-mobile-custom.js
               # dynamically required in ApplicationType (which is a dependency of ClientSideTargetResolution service)
-              - sap/ushell/_ApplicationType/urlTemplateResolution.js
+              - sap/ushell/_ApplicationType/
               - sap/ushell/CanvasShapesManager.js
               - sap/ushell/Container.js
               - sap/ushell/Fiori20AdapterTest.js