@sap-ux/generator-adp 0.9.32 → 0.9.34

package/generators/app/questions/key-user.js

@@ -9,6 +9,24 @@ const i18n_1 = require("../../utils/i18n");
 const types_1 = require("../types");
 const choices_1 = require("./helper/choices");
 exports.DEFAULT_ADAPTATION_ID = 'DEFAULT';
+const UNSUPPORTED_STATUS_CODES = new Set([400, 404, 405]);
+/**
+ * Returns a user-friendly error message if the error is an axios error with a status code
+ * indicating the API is not supported (400, 404, 405), or the original error message otherwise.
+ *
+ * @param e - The error to check.
+ * @param userMessage - The user-friendly message to return if the error matches.
+ * @returns The user-friendly message or the original error message.
+ */
+function getUnsupportedApiMessage(e, userMessage) {
+    if ((0, axios_extension_1.isAxiosError)(e)) {
+        const status = e.response?.status;
+        if (status !== undefined && UNSUPPORTED_STATUS_CODES.has(status)) {
+            return userMessage;
+        }
+    }
+    return e.message;
+}
 /**
  * Determines the flex version to be used. If the first version is the draft (versionId "0"), use the second version (active version).
  *
@@ -188,23 +206,34 @@ class KeyUserImportPrompter {
      * Loads adaptations for the current provider.
      */
     async loadAdaptations() {
-        const version = determineFlexVersion(this.flexVersions);
-        const lrep = this.provider?.getLayeredRepository();
-        const response = await lrep?.listAdaptations(this.componentId, version);
-        this.adaptations = response?.adaptations ?? [];
-        this.logger.log(`Loaded adaptations: ${JSON.stringify(this.adaptations, null, 2)}`);
-        if (!this.adaptations.length) {
-            throw new Error((0, i18n_1.t)('error.keyUserNoAdaptations'));
+        try {
+            const version = determineFlexVersion(this.flexVersions);
+            const lrep = this.provider?.getLayeredRepository();
+            const response = await lrep?.listAdaptations(this.componentId, version);
+            this.adaptations = response?.adaptations ?? [];
+            this.logger.log(`Loaded adaptations: ${JSON.stringify(this.adaptations, null, 2)}`);
+        }
+        catch (e) {
+            this.logger.error(`Error loading adaptations for component ${this.componentId}: ${e.message}`);
+            this.logger.debug(e);
+            throw new Error(getUnsupportedApiMessage(e, (0, i18n_1.t)('error.keyUserAdaptationsNotSupported')));
         }
     }
     /**
      * Loads flex versions for the current provider.
      */
     async loadFlexVersions() {
-        const lrep = this.provider?.getLayeredRepository();
-        const response = await lrep?.getFlexVersions(this.componentId);
-        this.flexVersions = response?.versions ?? [];
-        this.logger.log(`Loaded flex versions: ${JSON.stringify(this.flexVersions, null, 2)}`);
+        try {
+            const lrep = this.provider?.getLayeredRepository();
+            const response = await lrep?.getFlexVersions(this.componentId);
+            this.flexVersions = response?.versions ?? [];
+            this.logger.log(`Loaded flex versions: ${JSON.stringify(this.flexVersions, null, 2)}`);
+        }
+        catch (e) {
+            this.logger.error(`Error loading flex versions for component ${this.componentId}: ${e.message}`);
+            this.logger.debug(e);
+            throw new Error(getUnsupportedApiMessage(e, (0, i18n_1.t)('error.keyUserFlexVersionsNotSupported')));
+        }
     }
     /**
      * Resets the state by clearing adaptations, flex versions, and key-user changes.
@@ -226,6 +255,9 @@ class KeyUserImportPrompter {
         await this.provider.isAbapCloud();
         await this.loadFlexVersions();
         await this.loadAdaptations();
+        if (!this.adaptations.length) {
+            throw new Error((0, i18n_1.t)('error.keyUserNoAdaptations'));
+        }
         if (this.adaptations.length === 1 && this.adaptations[0]?.id === exports.DEFAULT_ADAPTATION_ID) {
             return await this.validateKeyUserChanges(exports.DEFAULT_ADAPTATION_ID);
         }
@@ -321,13 +353,7 @@ class KeyUserImportPrompter {
         catch (e) {
             this.logger.error(`Error validating key-user changes for adaptation ${adaptationId}: ${e.message}`);
             this.logger.debug(e);
-            if ((0, axios_extension_1.isAxiosError)(e)) {
-                const status = e.response?.status;
-                if (status === 400 || status === 404 || status === 405) {
-                    return (0, i18n_1.t)('error.keyUserNotSupported');
-                }
-            }
-            return e.message;
+            return getUnsupportedApiMessage(e, (0, i18n_1.t)('error.keyUserNotSupported'));
         }
     }
 }

package/generators/translations/generator-adp.i18n.json

@@ -124,7 +124,9 @@
         "keyUserNoChangesDefault": "Only a single adaptation ('DEFAULT') was found and no key-user changes were found for it. Please select a different system to continue, or navigate back to the 'Project Attributes' page and choose not to import key-user changes.",
         "keyUserNoChangesAdaptation": "No key-user changes have been found for the '{{adaptationId}}' adaptation. Please select a different adaptation.",
         "keyUserNoAdaptations": "No context-based adaptations have been found for the selected application. Please refer to the documentation.",
-        "keyUserNotSupported": "The selected system does not allow or support the import of key-user changes. Please refer to the documentation."
+        "keyUserNotSupported": "The selected system does not allow or support importing key-user changes. Please refer to the documentation.",
+        "keyUserFlexVersionsNotSupported": "The selected system does not support retrieving flex versions. Please refer to the documentation.",
+        "keyUserAdaptationsNotSupported": "The selected system does not support retrieving adaptations. Please refer to the documentation."
     },
     "validators": {
         "ui5VersionNotDetectedError": "The SAPUI5 version of the selected system cannot be determined. You are able to create and edit adaptation projects that use the latest SAPUI5 version, but they are not usable on this system until the system's SAPUI5 version is upgraded to version 1.71 or higher."

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "SAPUI5 Adaptation Project",
   "homepage": "https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/ada9567b767941aba8d49fdb4fdedea7.html",
   "description": "Adaptation project allows you to create an app variant for an existing SAP Fiori elements-based or SAPUI5 freestyle application, without changing the original application.",
-  "version": "0.9.32",
+  "version": "0.9.34",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,18 +30,18 @@
     "i18next": "25.8.18",
     "yeoman-generator": "5.10.0",
     "uuid": "11.1.0",
-    "@sap-ux/adp-tooling": "0.18.95",
+    "@sap-ux/adp-tooling": "0.18.96",
     "@sap-ux/axios-extension": "1.25.24",
     "@sap-ux/btp-utils": "1.1.10",
     "@sap-ux/feature-toggle": "0.3.7",
-    "@sap-ux/inquirer-common": "0.11.24",
     "@sap-ux/logger": "0.8.2",
-    "@sap-ux/project-access": "1.35.13",
     "@sap-ux/store": "1.5.10",
-    "@sap-ux/system-access": "0.6.66",
+    "@sap-ux/inquirer-common": "0.11.25",
     "@sap-ux/project-input-validator": "0.6.68",
-    "@sap-ux/fiori-generator-shared": "0.13.86",
+    "@sap-ux/project-access": "1.35.13",
     "@sap-ux/odata-service-writer": "0.30.1",
+    "@sap-ux/fiori-generator-shared": "0.13.87",
+    "@sap-ux/system-access": "0.6.66",
     "@sap-ux/telemetry": "0.6.87"
   },
   "devDependencies": {
@@ -57,7 +57,7 @@
     "fs-extra": "11.3.4",
     "rimraf": "6.1.3",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.5.114"
+    "@sap-ux/deploy-config-sub-generator": "0.5.115"
   },
   "engines": {
     "node": ">=20.x"