@sap-ux/adp-tooling 0.16.14 → 0.17.0

package/dist/abap/client.d.ts

@@ -1,6 +1,7 @@
 import { type AbapServiceProvider } from '@sap-ux/axios-extension';
 import type { ManifestNamespace } from '@sap-ux/project-access';
 import type { FlexUISupportedSystem } from '../types';
+import type { ToolsLogger } from '@sap-ux/logger';
 /**
  * Fetches system supports Flex UI features.
  *
@@ -10,12 +11,14 @@ import type { FlexUISupportedSystem } from '../types';
  */
 export declare function getFlexUISupportedSystem(provider: AbapServiceProvider, isCustomerBase: boolean): Promise<FlexUISupportedSystem>;
 /**
- * Fetches system UI5 Version from UI5RtVersionService.
+ * Fetches system UI5 Version from the UI5VersionService, if the request throws
+ * fallback to the legacy api introduced in the UI5RtVersionService.
  *
  * @param {AbapServiceProvider} provider - Instance of the ABAP provider.
+ * @param {ToolsLogger} logger - The logger instance.
  * @returns {string | undefined} System UI5 version.
  */
-export declare function getSystemUI5Version(provider: AbapServiceProvider): Promise<string | undefined>;
+export declare function getSystemUI5Version(provider: AbapServiceProvider, logger: ToolsLogger): Promise<string | undefined>;
 /**
  * Retrieves the list of tile inbounds of the application.
  *

package/dist/abap/client.js

@@ -33,14 +33,23 @@ async function getFlexUISupportedSystem(provider, isCustomerBase) {
     return { isOnPremise, isUIFlex };
 }
 /**
- * Fetches system UI5 Version from UI5RtVersionService.
+ * Fetches system UI5 Version from the UI5VersionService, if the request throws
+ * fallback to the legacy api introduced in the UI5RtVersionService.
  *
  * @param {AbapServiceProvider} provider - Instance of the ABAP provider.
+ * @param {ToolsLogger} logger - The logger instance.
  * @returns {string | undefined} System UI5 version.
  */
-async function getSystemUI5Version(provider) {
-    const service = await provider.getAdtService(axios_extension_1.UI5RtVersionService);
-    return service?.getUI5Version();
+async function getSystemUI5Version(provider, logger) {
+    try {
+        const ui5VersionService = provider.getUI5VersionService();
+        return await ui5VersionService.getUI5Version();
+    }
+    catch (error) {
+        logger.debug(`Could not fetch the system UI5 version: ${error.message}. Try to fetch the UI5 version with the adt api.`);
+        const ui5RtVersionService = await provider.getAdtService(axios_extension_1.UI5RtVersionService);
+        return ui5RtVersionService?.getUI5Version();
+    }
 }
 /**
  * Retrieves the list of tile inbounds of the application.

package/dist/translations/adp-tooling.i18n.json

@@ -71,8 +71,7 @@
         "appDoesNotSupportManifest": "The selected application is not supported by SAPUI5 Adaptation Project because it does not have a `manifest.json` file. Please select a different application.",
         "ui5VersionNotReachableError": "The URL of the SAPUI5 version you have selected is not reachable. The <URL> URL must be made accessible through the cloud connector and the destination configuration so it can be consumed within the SAPUI5 adaptation project and its SAPUI5 Adaptation Editor.",
         "ui5VersionOutdatedError": "The SAPUI5 version you have selected is not compatible with the SAPUI5 Adaptation Editor. Please select a different version.",
-        "ui5VersionDoesNotExistGeneric": "An error occurred when validating the SAPUI5 version: {{error}}. Please select a different version.",
-        "ui5VersionNotDetectedError": "The SAPUI5 version of the selected system cannot be determined. You will be able to create and edit adaptation projects using the newest version but it will not be usable on this system until the system`s SAPUI5 version is upgraded to version 1.71 or higher."
+        "ui5VersionDoesNotExistGeneric": "An error occurred when validating the SAPUI5 version: {{error}}. Please select a different version."
     },
     "error": {
         "appDoesNotSupportFlexibility": "The selected application does not support flexibility because it has `flexEnabled=false`. SAPUI5 Adaptation Project only supports applications that support flexibility. Please select a different application.",

package/dist/ui5/format.d.ts

@@ -47,6 +47,21 @@ export declare function removeMicroPart(version: string): string;
  * @returns {string} The version string without the timestamp, including only the major, minor, and micro version numbers.
  */
 export declare function removeTimestampFromVersion(version: string): string;
+/**
+ * Removes the '-snapshot' suffix from a version string's patch number.
+ * Converts version strings like '1.96.0-snapshot' to '1.96.0' by cleaning
+ * the patch part of any snapshot designation.
+ *
+ * @param {string} version - The version string that may include '-snapshot' in the patch number.
+ * @returns {string} The version string with the snapshot suffix removed from the patch number.
+ * @example
+ * ```typescript
+ * removeSnapshotFromVersion('1.96.0-snapshot'); // Returns '1.96.0'
+ * removeSnapshotFromVersion('1.87.3-SNAPSHOT'); // Returns '1.87.3' (case-insensitive)
+ * removeSnapshotFromVersion('1.120.1');         // Returns '1.120.1' (no change)
+ * ```
+ */
+export declare function removeSnapshotFromVersion(version: string): string;
 /**
  * Conditionally appends a '-snapshot' suffix to a version string if certain criteria are met.
  * The suffix is added only if the version string includes an unreleased snapshot version.

package/dist/ui5/format.js

@@ -6,6 +6,7 @@ exports.buildSystemVersionLabel = buildSystemVersionLabel;
 exports.removeBracketsFromVersion = removeBracketsFromVersion;
 exports.removeMicroPart = removeMicroPart;
 exports.removeTimestampFromVersion = removeTimestampFromVersion;
+exports.removeSnapshotFromVersion = removeSnapshotFromVersion;
 exports.addSnapshot = addSnapshot;
 exports.parseUI5Version = parseUI5Version;
 exports.isFeatureSupportedVersion = isFeatureSupportedVersion;
@@ -82,6 +83,25 @@ function removeTimestampFromVersion(version) {
     const versionParts = version.split('.');
     return `${versionParts[0]}.${versionParts[1]}.${versionParts[2]}`;
 }
+/**
+ * Removes the '-snapshot' suffix from a version string's patch number.
+ * Converts version strings like '1.96.0-snapshot' to '1.96.0' by cleaning
+ * the patch part of any snapshot designation.
+ *
+ * @param {string} version - The version string that may include '-snapshot' in the patch number.
+ * @returns {string} The version string with the snapshot suffix removed from the patch number.
+ * @example
+ * ```typescript
+ * removeSnapshotFromVersion('1.96.0-snapshot'); // Returns '1.96.0'
+ * removeSnapshotFromVersion('1.87.3-SNAPSHOT'); // Returns '1.87.3' (case-insensitive)
+ * removeSnapshotFromVersion('1.120.1');         // Returns '1.120.1' (no change)
+ * ```
+ */
+function removeSnapshotFromVersion(version) {
+    const versionParts = version.split('.');
+    const patchNumber = versionParts[2].toLowerCase().replace('-snapshot', '');
+    return `${versionParts[0]}.${versionParts[1]}.${patchNumber}`;
+}
 /**
  * Conditionally appends a '-snapshot' suffix to a version string if certain criteria are met.
  * The suffix is added only if the version string includes an unreleased snapshot version.

package/dist/ui5/version-info.js

@@ -96,7 +96,12 @@ function getVersionLabels(version, publicVersions) {
  */
 function checkSystemVersionPattern(version) {
     const pattern = /^[1-9]\.\d{1,3}\.\d{1,2}\.*/;
-    return version && pattern.test(version) ? (0, format_1.removeTimestampFromVersion)(version) : undefined;
+    if (!version || !pattern.test(version)) {
+        return undefined;
+    }
+    let normalizedVersion = (0, format_1.removeTimestampFromVersion)(version);
+    normalizedVersion = (0, format_1.removeSnapshotFromVersion)(normalizedVersion);
+    return normalizedVersion;
 }
 /**
  * Retrieves and filters internal UI5 versions.

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%3Aadp-tooling"
   },
-  "version": "0.16.14",
+  "version": "0.17.0",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -36,7 +36,7 @@
     "prompts": "2.4.2",
     "sanitize-filename": "1.6.3",
     "uuid": "10.0.0",
-    "@sap-ux/axios-extension": "1.23.1",
+    "@sap-ux/axios-extension": "1.24.0",
     "@sap-ux/btp-utils": "1.1.4",
     "@sap-ux/i18n": "0.3.4",
     "@sap-ux/inquirer-common": "0.8.7",
@@ -46,7 +46,7 @@
     "@sap-ux/project-access": "1.32.7",
     "@sap-ux/project-input-validator": "0.6.29",
     "@sap-ux/store": "1.2.1",
-    "@sap-ux/system-access": "0.6.22",
+    "@sap-ux/system-access": "0.6.23",
     "@sap-ux/ui5-config": "0.29.8",
     "@sap-ux/ui5-info": "0.13.0"
   },