@sap-ux/fiori-generator-shared 0.13.21 → 0.13.23

package/dist/logging/logWrapper.js

@@ -116,7 +116,7 @@ class LogWrapper {
             }
             LogWrapper._logLevel = logLevel === 'off' || !logLevel ? 'info' : logLevel;
         }
-        LogWrapper._vscodeLogger?.debug((0, i18n_1.t)('debug.loggingConfigured', { logLevel: LogWrapper._logLevel }));
+        LogWrapper._vscodeLogger?.debug((0, i18n_1.t)('logMessages.debug.loggingConfigured', { logLevel: LogWrapper._logLevel }));
     }
     static logAtLevel = (level, message, ...args) => {
         if (typeof message === 'object') {
@@ -134,7 +134,7 @@ class LogWrapper {
             }
         }
         else {
-            exports.DefaultLogger.error((0, i18n_1.t)('error.logWrapperNotInitialised'));
+            exports.DefaultLogger.error((0, i18n_1.t)('logMessages.error.logWrapperNotInitialised'));
         }
     };
     /**

package/dist/npm-package-scripts/getPackageScripts.js

@@ -19,7 +19,7 @@ function buildStartNoFLPCommand(localOnly, searchParams) {
     const searchParamString = searchParams?.toString();
     const searchParam = searchParamString ? `?${searchParamString}` : '';
     if (localOnly) {
-        return `echo \\"${(0, i18n_1.t)('info.mockOnlyWarning')}\\"`;
+        return `echo \\"${(0, i18n_1.t)('logMessages.info.mockOnlyWarning')}\\"`;
     }
     return `fiori run --open "/index.html${searchParam}"`;
 }
@@ -50,7 +50,7 @@ function buildParams(searchParams, flpAppId) {
  */
 function buildStartCommand(localOnly, params, startFile) {
     if (localOnly) {
-        return `echo \\"${(0, i18n_1.t)('info.mockOnlyWarning')}\\"`;
+        return `echo \\"${(0, i18n_1.t)('logMessages.info.mockOnlyWarning')}\\"`;
     }
     return `fiori run --open "${startFile ?? constants_1.SCRIPT_FLP_SANDBOX}${params}"`;
 }
@@ -112,7 +112,7 @@ function getPackageScripts({ localOnly, addMock = true, addTest = false, flpAppI
         scripts['int-test'] = 'fiori run --config ./ui5-mock.yaml --open "/test/integration/opaTests.qunit.html"';
     }
     scripts['start-variants-management'] = localOnly
-        ? `echo \\"${(0, i18n_1.t)('info.mockOnlyWarning')}\\"`
+        ? `echo \\"${(0, i18n_1.t)('logMessages.info.mockOnlyWarning')}\\"`
         : getVariantPreviewAppScript(!supportVirtualEndpoints, flpAppId);
     return scripts;
 }

package/dist/system-utils.d.ts

@@ -1,18 +1,18 @@
+import type { BackendSystem } from '@sap-ux/store';
 /**
- * Relevant values for display extended system properties to the UI
+ * Creates and returns a display name for the system, appending the system type and user display name if available.
+ *
+ * @param system the backend system to create a display name for
+ * @returns the display name for the system
  */
-export declare enum Suffix {
-    S4HC = "S4HC",
-    BTP = "BTP"
-}
+export declare function getBackendSystemDisplayName(system: BackendSystem): string;
 /**
  * Get the system display name.
  *
  * @param systemName - system name
  * @param displayUsername - display username
- * @param isBtp - is BTP
- * @param isS4HC - is S/4 Hana Cloud
+ * @param systemType - 'ABAPCloud' or undefined
  * @returns system display name
  */
-export declare function getSystemDisplayName(systemName: string, displayUsername?: string, isBtp?: boolean, isS4HC?: boolean): string;
+export declare function getSystemDisplayName(systemName: string, displayUsername?: string, systemType?: string): string;
 //# sourceMappingURL=system-utils.d.ts.map

package/dist/system-utils.js

@@ -1,56 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Suffix = void 0;
+exports.getBackendSystemDisplayName = getBackendSystemDisplayName;
 exports.getSystemDisplayName = getSystemDisplayName;
+const i18n_1 = require("./i18n");
 /**
- * Relevant values for display extended system properties to the UI
- */
-var Suffix;
-(function (Suffix) {
-    Suffix["S4HC"] = "S4HC";
-    Suffix["BTP"] = "BTP";
-})(Suffix || (exports.Suffix = Suffix = {}));
-/**
- * Escape any special RegExp character that we want to use literally.
- *
- * @param str string input
- * @returns string a cleansed version of the input
- */
-function escapeRegExp(str) {
-    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
-}
-/**
- * Trim, cleanse and return a system name appended with the appropriate suffix i.e. BTP | S4HC.
+ * Creates and returns a display name for the system, appending the system type and user display name if available.
  *
- * @param systemName name of the system
- * @param suffix the appropriate suffix appended, BTP | S4HC
- * @returns string return an escaped string, appended with the appropriate suffix
+ * @param system the backend system to create a display name for
+ * @returns the display name for the system
  */
-function addSuffix(systemName, suffix) {
-    const suffixStr = ` (${suffix})`;
-    return RegExp(`${escapeRegExp(suffixStr)}$`).exec(systemName.trim()) ? systemName : `${systemName} (${suffix})`;
+function getBackendSystemDisplayName(system) {
+    const systemTypeName = getSystemDisplayName(system.name, system.userDisplayName, system.systemType);
+    return systemTypeName;
 }
 /**
  * Get the system display name.
  *
  * @param systemName - system name
  * @param displayUsername - display username
- * @param isBtp - is BTP
- * @param isS4HC - is S/4 Hana Cloud
+ * @param systemType - 'ABAPCloud' or undefined
  * @returns system display name
  */
-function getSystemDisplayName(systemName, displayUsername, isBtp = false, isS4HC = false) {
+function getSystemDisplayName(systemName, displayUsername, systemType) {
     const userDisplayName = displayUsername ? ` [${displayUsername}]` : '';
-    let systemDisplayName;
-    if (isBtp) {
-        systemDisplayName = addSuffix(systemName, Suffix.BTP);
-    }
-    else if (isS4HC) {
-        systemDisplayName = addSuffix(systemName, Suffix.S4HC);
-    }
-    else {
-        systemDisplayName = systemName;
+    return `${systemName}${getSystemTypeLabel(systemType)}${userDisplayName}`;
+}
+/**
+ * Returns the formatted system type name for the given backend system.
+ *
+ * @param systemType the system type to get the parenthesised name for
+ * @returns system type name formatted as a string, e.g. " (ABAP Cloud)".
+ */
+function getSystemTypeLabel(systemType) {
+    let systemTypeName = ''; // for on prem we do not show the system type
+    const abapCloudLabel = ` (${(0, i18n_1.t)('texts.systemTypeLabel.abapCloud')})`;
+    // Legacy store system types will now display as ABAP Cloud
+    if (systemType === 'ABAPCloud' || systemType === 'S4HC' || systemType === 'BTP') {
+        systemTypeName = abapCloudLabel;
     }
-    return `${systemDisplayName}${userDisplayName}`;
+    return systemTypeName;
 }
 //# sourceMappingURL=system-utils.js.map

package/dist/translations/fiori-generator-shared.i18n.json

@@ -1,14 +1,21 @@
 {
-    "info": {
-        "mockOnlyWarning": "This application was generated with a local metadata file and does not reference a live server. Please add the required server configuration or start this application with mock data using the target: `npm run start-mock`."
-    },
-    "error": {
-        "logWrapperNotInitialised": "`LogWrapper` is not initialised."
-    },
-    "debug": {
-        "loggingConfigured": "Logging has been configured at log level: {{logLevel}}."
+    "logMessages": {
+        "info": {
+            "mockOnlyWarning": "This application was generated with a local metadata file and does not reference a live server. Please add the required server configuration or start this application with mock data using the target: `npm run start-mock`."
+        },
+        "error": {
+            "logWrapperNotInitialised": "`LogWrapper` is not initialised."
+        },
+        "debug": {
+            "loggingConfigured": "Logging has been configured at log level: {{logLevel}}."
+        }
     },
     "telemetry": {
         "unknownOs": "Unknown"
+    },
+    "texts": {
+        "systemTypeLabel": {
+            "abapCloud": "ABAP Cloud"
+        }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-generator-shared",
   "description": "Commonly used shared functionality and types to support the fiori generator.",
-  "version": "0.13.21",
+  "version": "0.13.23",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -25,8 +25,8 @@
     "os-name": "4.0.1",
     "semver": "7.5.4",
     "@sap-ux/btp-utils": "1.1.4",
-    "@sap-ux/project-access": "1.32.3",
-    "@sap-ux/telemetry": "0.6.27"
+    "@sap-ux/project-access": "1.32.4",
+    "@sap-ux/telemetry": "0.6.29"
   },
   "devDependencies": {
     "@types/mem-fs-editor": "7.0.1",
@@ -34,8 +34,9 @@
     "@types/semver": "7.5.2",
     "@types/vscode": "1.73.1",
     "@types/yeoman-environment": "2.10.11",
-    "@sap-ux/axios-extension": "1.22.10",
-    "@sap-ux/logger": "0.7.0"
+    "@sap-ux/axios-extension": "1.23.0",
+    "@sap-ux/logger": "0.7.0",
+    "@sap-ux/store": "1.2.0"
   },
   "engines": {
     "node": ">=20.x"