@sap-ux/preview-middleware 0.25.9 → 0.25.12

package/dist/base/utils/cards.js

@@ -41,6 +41,10 @@ function getIntegrationCard(multipleCard) {
         },
         entitySet: ''
     };
+    // sanitize URL to avoid issues with double slashes when joining paths
+    if (integrationCard.manifest['sap.card']?.data?.request) {
+        integrationCard.manifest['sap.card'].data.request.url = integrationCard.manifest['sap.card'].data.request.url.replaceAll(/\/{2,}/g, '/');
+    }
     prepareIntegrationCardForSaving(integrationCard.manifest);
     return integrationCard;
 }

package/dist/client/flp/init.js

@@ -1,6 +1,6 @@
 "use strict";
 
-sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common", "sap/ui/core/IconPool", "sap/base/i18n/ResourceBundle", "../adp/api-handler", "../utils/error", "./initCdm", "./initConnectors", "../utils/version", "../utils/info-center-message"], function (Log, ___sap_ux_private_control_property_editor_common, IconPool, ResourceBundle, ___adp_api_handler, ___utils_error, __initCdm, __initConnectors, ___utils_version, ___utils_info_center_message) {
+sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common", "sap/ui/core/IconPool", "sap/base/i18n/ResourceBundle", "../adp/api-handler", "../utils/error", "./initConnectors", "../utils/version", "../utils/info-center-message"], function (Log, ___sap_ux_private_control_property_editor_common, IconPool, ResourceBundle, ___adp_api_handler, ___utils_error, __initConnectors, ___utils_version, ___utils_info_center_message) {
   "use strict";
 
   function _interopRequireDefault(obj) {
@@ -27,7 +27,6 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
   const SCENARIO = ___sap_ux_private_control_property_editor_common["SCENARIO"];
   const getManifestAppdescr = ___adp_api_handler["getManifestAppdescr"];
   const getError = ___utils_error["getError"];
-  const initCdm = _interopRequireDefault(__initCdm);
   const initConnectors = _interopRequireDefault(__initConnectors);
   const getUi5Version = ___utils_version["getUi5Version"];
   const isLowerThanMinimalUi5Version = ___utils_version["isLowerThanMinimalUi5Version"];
@@ -261,11 +260,6 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
     enhancedHomePage,
     enableCardGenerator
   }) {
-    // Set CDM configuration before importing ushell container
-    // to ensure proper configuration pickup during bootstrap
-    if (enhancedHomePage) {
-      initCdm();
-    }
     const urlParams = new URLSearchParams(window.location.search);
     const container = sap?.ushell?.Container ?? (await __ui5_require_async('sap/ushell/Container')).default;
     let scenario = '';

package/dist/client/flp/init.ts

@@ -8,7 +8,6 @@ import ResourceBundle from 'sap/base/i18n/ResourceBundle';
 import type AppState from 'sap/ushell/services/AppState';
 import { getManifestAppdescr } from '../adp/api-handler';
 import { getError } from '../utils/error';
-import initCdm from './initCdm';
 import initConnectors from './initConnectors';
 import { getUi5Version, isLowerThanMinimalUi5Version, Ui5VersionInfo } from '../utils/version';
 import type Component from 'sap/ui/core/Component';
@@ -302,12 +301,6 @@ export async function init({
     enhancedHomePage?: boolean | null;
     enableCardGenerator?: boolean;
 }): Promise<void> {
-    // Set CDM configuration before importing ushell container
-    // to ensure proper configuration pickup during bootstrap
-    if (enhancedHomePage) {
-        initCdm();
-    }
-
     const urlParams = new URLSearchParams(window.location.search);
     const container =
         sap?.ushell?.Container ??

package/dist/client/flp/initCdm.js

@@ -1,117 +1,114 @@
 "use strict";
 
-sap.ui.define([], function () {
-  "use strict";
-
-  /**
-   * Initializes the CDM (Common Data Model) configuration for the SAP Fiori Launchpad.
-   *
-   * @returns {void}
-   */
-  function initCdm() {
-    window['sap-ushell-config'] = {
-      defaultRenderer: 'fiori2',
-      renderers: {
-        fiori2: {
-          componentData: {
-            config: {
-              enableSearch: false,
-              enableRecentActivity: true,
-              rootIntent: 'Shell-home'
-            }
+/**
+ * Initializes the CDM (Common Data Model) configuration for the SAP Fiori Launchpad.
+ *
+ * @returns {void}
+ */
+(() => {
+  const initScript = document.getElementById('init-cdm');
+  const basePath = initScript?.dataset.basePath ?? '';
+  window['sap-ushell-config'] = {
+    defaultRenderer: 'fiori2',
+    renderers: {
+      fiori2: {
+        componentData: {
+          config: {
+            enableSearch: false,
+            enableRecentActivity: true,
+            rootIntent: 'Shell-home'
           }
         }
+      }
+    },
+    ushell: {
+      customPreload: {
+        enabled: false
       },
-      ushell: {
-        customPreload: {
-          enabled: false
-        },
-        spaces: {
-          enabled: true,
-          myHome: {
-            enabled: true
-          }
-        },
-        homeApp: {
-          component: {
-            name: 'open.ux.preview.client.flp.homepage',
-            url: '/preview/client/flp/homepage'
-          }
+      spaces: {
+        enabled: true,
+        myHome: {
+          enabled: true
         }
       },
-      services: {
-        Container: {
-          adapter: {
-            config: {
-              userProfile: {
-                metadata: {
-                  editablePropterties: ['accessibility', 'contentDensity', 'theme']
-                },
-                defaults: {
-                  email: 'john.doe@sap.com',
-                  firstName: 'John',
-                  lastName: 'Doe',
-                  fullName: 'John Doe',
-                  id: 'DOEJ'
-                }
+      homeApp: {
+        component: {
+          name: 'open.ux.preview.client.flp.homepage',
+          url: `${basePath}/preview/client/flp/homepage`
+        }
+      }
+    },
+    services: {
+      Container: {
+        adapter: {
+          config: {
+            userProfile: {
+              metadata: {
+                editablePropterties: ['accessibility', 'contentDensity', 'theme']
+              },
+              defaults: {
+                email: 'john.doe@sap.com',
+                firstName: 'John',
+                lastName: 'Doe',
+                fullName: 'John Doe',
+                id: 'DOEJ'
               }
             }
           }
-        },
-        CommonDataModel: {
-          adapter: {
-            config: {
-              ignoreSiteDataPersonalization: true,
-              siteDataUrl: '/cdm.json'
-            }
-          }
-        },
-        Personalization: {
-          adapter: {
-            module: 'sap.ushell.adapters.local.PersonalizationAdapter',
-            config: {
-              storageType: 'MEMORY'
-            }
-          }
-        },
-        PersonalizationV2: {
-          adapter: {
-            module: 'sap.ushell.adapters.local.PersonalizationAdapter',
-            config: {
-              storageType: 'MEMORY'
-            }
+        }
+      },
+      CommonDataModel: {
+        adapter: {
+          config: {
+            ignoreSiteDataPersonalization: true,
+            siteDataUrl: `${basePath}/cdm.json`
           }
-        },
-        AppState: {
-          adapter: {
-            module: 'sap.ushell.adapters.local.AppStateAdapter'
-          },
+        }
+      },
+      Personalization: {
+        adapter: {
+          module: 'sap.ushell.adapters.local.PersonalizationAdapter',
           config: {
-            transient: true
+            storageType: 'MEMORY'
           }
-        },
-        NavTargetResolutionInternal: {
+        }
+      },
+      PersonalizationV2: {
+        adapter: {
+          module: 'sap.ushell.adapters.local.PersonalizationAdapter',
           config: {
-            allowTestUrlComponentConfig: false,
-            enableClientSideTargetResolution: true
-          },
-          adapter: {
-            module: 'sap.ushell.adapters.local.NavTargetResolutionInternalAdapter'
+            storageType: 'MEMORY'
           }
+        }
+      },
+      AppState: {
+        adapter: {
+          module: 'sap.ushell.adapters.local.AppStateAdapter'
         },
-        UserInfo: {
-          adapter: {
-            module: 'sap.ushell.adapters.local.UserInfoAdapter'
-          }
+        config: {
+          transient: true
+        }
+      },
+      NavTargetResolutionInternal: {
+        config: {
+          allowTestUrlComponentConfig: false,
+          enableClientSideTargetResolution: true
         },
-        FlpLaunchPage: {
-          adapter: {
-            module: 'sap.ushell.adapters.cdm.v3.FlpLaunchPageAdapter'
-          }
+        adapter: {
+          module: 'sap.ushell.adapters.local.NavTargetResolutionInternalAdapter'
+        }
+      },
+      UserInfo: {
+        adapter: {
+          module: 'sap.ushell.adapters.local.UserInfoAdapter'
+        }
+      },
+      FlpLaunchPage: {
+        adapter: {
+          module: 'sap.ushell.adapters.cdm.v3.FlpLaunchPageAdapter'
         }
       }
-    };
-  }
-  return initCdm;
-});
+    }
+  };
+})();
 //# sourceMappingURL=initCdm.js.map

package/dist/client/flp/initCdm.ts

@@ -5,7 +5,10 @@ import type { Window } from 'types/global';
  *
  * @returns {void}
  */
-export default function initCdm(): void {
+((): void => {
+    const initScript = document.getElementById('init-cdm');
+    const basePath = initScript?.dataset.basePath ?? '';
+
     (window as unknown as Window)['sap-ushell-config'] = {
         defaultRenderer: 'fiori2',
         renderers: {
@@ -32,7 +35,7 @@ export default function initCdm(): void {
             homeApp: {
                 component: {
                     name: 'open.ux.preview.client.flp.homepage',
-                    url: '/preview/client/flp/homepage'
+                    url: `${basePath}/preview/client/flp/homepage`
                 }
             }
         },
@@ -59,7 +62,7 @@ export default function initCdm(): void {
                 adapter: {
                     config: {
                         ignoreSiteDataPersonalization: true,
-                        siteDataUrl: '/cdm.json'
+                        siteDataUrl: `${basePath}/cdm.json`
                     }
                 }
             },
@@ -108,4 +111,4 @@ export default function initCdm(): void {
             }
         }
     };
-}
+})();

package/dist/types/index.d.ts

@@ -248,6 +248,19 @@ export interface I18nEntry {
     annotation?: string;
 }
 export interface CardManifest {
+    'sap.card'?: {
+        type?: string;
+        header?: Record<string, unknown>;
+        data?: {
+            request?: {
+                url: string;
+            };
+        };
+        configuration?: {
+            parameters?: Record<string, Record<string, unknown>>;
+        };
+        [key: string]: unknown;
+    };
     'sap.insights': {
         versions?: {
             dtpMiddleware?: string;

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Apreview-middleware"
   },
-  "version": "0.25.9",
+  "version": "0.25.12",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -27,17 +27,17 @@
     "mem-fs-editor": "9.4.0",
     "qrcode": "1.5.4",
     "@sap/bas-sdk": "3.13.3",
-    "@sap-ux/adp-tooling": "0.18.106",
+    "@sap-ux/adp-tooling": "0.18.107",
     "@sap-ux/btp-utils": "1.1.12",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.22",
-    "@sap-ux/feature-toggle": "0.3.7",
-    "@sap-ux/logger": "0.8.3",
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.23",
+    "@sap-ux/feature-toggle": "0.3.8",
+    "@sap-ux/logger": "0.8.4",
     "@sap-ux/project-access": "1.35.17",
-    "@sap-ux/system-access": "0.7.3",
+    "@sap-ux/system-access": "0.7.4",
     "@sap-ux/i18n": "0.3.10"
   },
   "devDependencies": {
-    "@sap-ux-private/playwright": "0.2.13",
+    "@sap-ux-private/playwright": "0.2.14",
     "@types/connect": "^3.4.38",
     "@types/qrcode": "1.5.6",
     "@types/ejs": "3.1.5",
@@ -53,10 +53,10 @@
     "nock": "14.0.11",
     "npm-run-all2": "8.0.4",
     "supertest": "7.2.2",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.19.1",
-    "@sap-ux/axios-extension": "1.25.27",
-    "@sap-ux/store": "1.5.11",
-    "@sap-ux/ui5-info": "0.13.16"
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.25.12",
+    "@sap-ux/axios-extension": "1.25.28",
+    "@sap-ux/store": "1.5.12",
+    "@sap-ux/ui5-info": "0.13.17"
   },
   "peerDependencies": {
     "express": "4"

package/templates/flp/cdm.ejs

@@ -24,6 +24,9 @@
          for productive scenarios.
     -->
 
+    <!-- Initialize CDM -->
+    <script src="<%- basePath %>/preview/client/flp/initCdm.js" id="init-cdm" data-base-path="<%- basePath %>"></script>
+
     <!-- Bootstrap the UI5 core library. 'data-sap-ui-frameOptions="allow"' is a NON-SECURE setting for test environments -->
     <script id="sap-ui-bootstrap"
         src="<%- basePath %>/resources/sap-ui-core.js"