@sap-ux/repo-app-import-sub-generator 0.1.1 → 0.1.3

package/generators/prompts/prompts.js

@@ -7,7 +7,7 @@ const i18n_1 = require("../utils/i18n");
 const project_input_validator_1 = require("@sap-ux/project-input-validator");
 const prompt_state_1 = require("./prompt-state");
 const prompt_helpers_1 = require("./prompt-helpers");
-const download_utils_1 = require("../utils/download-utils");
+const validators_1 = require("../utils/validators");
 /**
  * Gets the target folder selection prompt.
  *
@@ -75,29 +75,7 @@ async function getPrompts(appRootPath, quickDeployedAppConfig) {
                 },
                 message: (0, i18n_1.t)('prompts.appSelection.message'),
                 choices: () => (appList.length ? (0, prompt_helpers_1.formatAppChoices)(appList) : []),
-                validate: async (answers) => {
-                    // Quick deploy config exists but no apps found
-                    if (quickDeployedAppConfig?.appId && appList.length === 0) {
-                        return (0, i18n_1.t)('error.quickDeployedAppDownloadErrors.noAppsFound', {
-                            appId: quickDeployedAppConfig.appId
-                        });
-                    }
-                    // No apps available at all
-                    if (appList.length === 0) {
-                        return (0, i18n_1.t)('prompts.appSelection.noAppsDeployed');
-                    }
-                    // Valid app selected, try to download
-                    if (answers?.appId) {
-                        try {
-                            await (0, download_utils_1.downloadApp)(answers.repoName);
-                            return true;
-                        }
-                        catch (error) {
-                            return (0, i18n_1.t)('error.appDownloadErrors.appDownloadFailure', { error: error.message });
-                        }
-                    }
-                    return false;
-                }
+                validate: async (answers) => (0, validators_1.validateAppSelection)(answers, appList, quickDeployedAppConfig)
             }
         ];
         const targetFolderPrompts = getTargetFolderPrompt(appRootPath, quickDeployedAppConfig?.appId);

package/generators/translations/repo-app-import-sub-generator.i18n.json

@@ -9,6 +9,7 @@
         "appConfigGenError": "Error generating application configuration: {{- error}}",
         "endPhase": "Error in end phase: {{- error}}",
         "errorProcessingJsonFile": "Error processing JSON file: {{- error}}",
+        "noAppsDeployed": "No applications deployed to this system can be downloaded.",
         "validationErrors": {
             "invalidMetadataPackage": "Invalid or missing package in metadata",
             "invalidServiceName": "Invalid or missing serviceName in serviceBindingDetails",
@@ -37,9 +38,6 @@
             "sapAppNotDefined": "Error: sap.app not defined in the manifest file",
             "sourceTemplateNotSupported": "Error: Source template not supported",
             "invalidManifestStructureError": "Invalid manifest structure: 'sap.ui5' or 'sap.app' are missing."
-        },
-        "quickDeployedAppDownloadErrors": {
-            "noAppsFound": "No application with id {{ appId }} found in the system. Please check if the application is deployed correctly or select another app"
         }
     },
     "warn": {
@@ -49,8 +47,7 @@
         "appSelection": {
             "message": "App",
             "hint": "Select the app to download",
-            "breadcrumb": "App",
-            "noAppsDeployed": "No applications deployed to this system can be downloaded. {{- help}}"
+            "breadcrumb": "App"
         },
         "targetPath": {
             "message": "Project folder path",

package/generators/utils/validators.d.ts

@@ -1,4 +1,6 @@
-import type { QfaJsonConfig } from '../app/types';
+import type { AppIndex } from '@sap-ux/axios-extension';
+import type { ValidationLink } from '@sap-ux/inquirer-common';
+import type { AppInfo, QuickDeployedAppConfig, QfaJsonConfig } from '../app/types';
 /**
  * Validates the entire app configuration.
  *
@@ -14,4 +16,13 @@ export declare const validateQfaJsonFile: (config: QfaJsonConfig) => boolean;
  * @returns {boolean} - Returns true if the prompt state is valid, false otherwise.
  */
 export declare const isValidPromptState: (targetFolder: string, appId?: string) => boolean;
+/**
+ * Validates the app selection and handles app download if applicable.
+ *
+ * @param answers - The selected app information.
+ * @param appList - The list of available apps.
+ * @param quickDeployedAppConfig - The quick deployed app configuration.
+ * @returns A promise resolving to a boolean or a validation error message.
+ */
+export declare function validateAppSelection(answers: AppInfo, appList: AppIndex, quickDeployedAppConfig?: QuickDeployedAppConfig): Promise<string | boolean | ValidationLink>;
 //# sourceMappingURL=validators.d.ts.map

package/generators/utils/validators.js

@@ -3,10 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidPromptState = exports.validateQfaJsonFile = void 0;
+exports.validateAppSelection = exports.isValidPromptState = exports.validateQfaJsonFile = void 0;
 const i18n_1 = require("../utils/i18n");
 const logger_1 = __importDefault(require("../utils/logger"));
 const prompt_state_1 = require("../prompts/prompt-state");
+const guided_answers_helper_1 = require("@sap-ux/guided-answers-helper");
+const inquirer_common_1 = require("@sap-ux/inquirer-common");
+const download_utils_1 = require("../utils/download-utils");
 /**
  * Validates the metadata section of the app configuration.
  *
@@ -91,4 +94,42 @@ const isValidPromptState = (targetFolder, appId) => {
     return !!(prompt_state_1.PromptState.systemSelection.connectedSystem?.serviceProvider && appId && targetFolder);
 };
 exports.isValidPromptState = isValidPromptState;
+/**
+ * Generates a help link for the "App Not Found" error.
+ *
+ * @returns {Promise<ValidationLink>} - A promise resolving to a validation link for the error.
+ */
+async function generateAppNotFoundHelpLink() {
+    return inquirer_common_1.ErrorHandler.getHelpLink(guided_answers_helper_1.HELP_NODES.ADT_APP_NOT_FOUND_ERROR, inquirer_common_1.ERROR_TYPE.INTERNAL_SERVER_ERROR, (0, i18n_1.t)('error.noAppsDeployed'));
+}
+/**
+ * Validates the app selection and handles app download if applicable.
+ *
+ * @param answers - The selected app information.
+ * @param appList - The list of available apps.
+ * @param quickDeployedAppConfig - The quick deployed app configuration.
+ * @returns A promise resolving to a boolean or a validation error message.
+ */
+async function validateAppSelection(answers, appList, quickDeployedAppConfig) {
+    // Quick deploy config exists but no apps found
+    if (quickDeployedAppConfig?.appId && appList.length === 0) {
+        return await generateAppNotFoundHelpLink();
+    }
+    // No apps available at all
+    if (appList.length === 0) {
+        return await generateAppNotFoundHelpLink();
+    }
+    // Valid app selected, try to download
+    if (answers?.appId) {
+        try {
+            await (0, download_utils_1.downloadApp)(answers.repoName);
+            return true;
+        }
+        catch (error) {
+            return (0, i18n_1.t)('error.appDownloadErrors.appDownloadFailure', { error: error.message });
+        }
+    }
+    return false;
+}
+exports.validateAppSelection = validateAppSelection;
 //# sourceMappingURL=validators.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/repo-app-import-sub-generator",
   "description": "Generator to download LROP Fiori applications deployed from an ABAP repository.",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -26,19 +26,20 @@
     "yeoman-generator": "5.10.0",
     "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/fiori-generator-shared": "0.10.2",
-    "@sap-ux/inquirer-common": "0.6.35",
+    "@sap-ux/inquirer-common": "0.6.36",
     "@sap-ux/project-access": "1.29.18",
-    "@sap-ux/odata-service-inquirer": "2.2.34",
+    "@sap-ux/odata-service-inquirer": "2.2.36",
     "@sap-ux/fiori-elements-writer": "2.1.40",
     "@sap-ux/logger": "0.6.0",
-    "@sap-ux/project-input-validator": "0.5.0",
+    "@sap-ux/project-input-validator": "0.5.1",
     "@sap-ux/launch-config": "0.8.1",
     "@sap-ux/fiori-tools-settings": "0.1.0",
     "@sap-ux/abap-deploy-config-writer": "0.0.103",
     "@sap-ux/btp-utils": "1.0.3",
     "@sap-ux/ui5-info": "0.9.1",
     "@sap-ux/axios-extension": "1.20.0",
-    "@sap-ux/store": "1.0.0"
+    "@sap-ux/store": "1.0.0",
+    "@sap-ux/guided-answers-helper": "0.2.2"
   },
   "devDependencies": {
     "@jest/types": "29.6.3",