@sap-ux/repo-app-import-sub-generator 1.2.60 → 1.2.62

package/generators/prompts/prompt-helpers.js

@@ -1,4 +1,4 @@
-import { appListResultFields, downloadTypeConfig, generatorTitleConfig, adtSourceTemplateId } from '../utils/constants.js';
+import { appListResultFields, downloadTypeConfig, generatorTitleConfig, adtSourceTemplateId, appListFieldsWithoutSourceTemplate, sourceTemplateIdField } from '../utils/constants.js';
 import { AppDownloadType } from '../app/types.js';
 import { PromptState } from './prompt-state.js';
 import { t } from '../utils/i18n.js';
@@ -64,27 +64,44 @@ export const formatAppChoices = (appList) => {
  *
  * @param {AbapServiceProvider} provider - The ABAP service provider.
  * @param {string} appId - Application ID to filter the list.
- * @param {AppDownloadType} downloadType - The download type determining which search params to use.
- * @returns {Promise<AppIndex>} A list of applications filtered by source template.
+ * @param {AppDownloadType} downloadType - The download type determining which search parameters to use.
+ * @returns {Promise<AppIndex>} A list of deployed applications. For the ADTQuickDeploy flow, only ADT-deployed apps are returned. For the AbapRepository flow on systems that support it, ADT-deployed apps are excluded.
  */
 async function getAppList(provider, appId, downloadType = AppDownloadType.ADTQuickDeploy) {
+    const baseSearchParams = downloadTypeConfig[downloadType].searchParams;
+    const searchParams = appId ? { ...baseSearchParams, 'sap.app/id': appId } : baseSearchParams;
     try {
-        const baseSearchParams = downloadTypeConfig[downloadType].searchParams;
-        const searchParams = appId
-            ? {
-                ...baseSearchParams,
-                'sap.app/id': appId
-            }
-            : baseSearchParams;
         const results = await provider.getAppIndex().search(searchParams, appListResultFields);
         if (downloadType === AppDownloadType.AbapRepository) {
             // For ABAP Repository downloads, filter out apps with the ADT source template as they follow the quick deploy app download flow.
-            return results.filter((app) => app['sap.app/sourceTemplate/id'] !== adtSourceTemplateId);
+            const filtered = results.filter((app) => app[sourceTemplateIdField] !== adtSourceTemplateId);
+            RepoAppDownloadLogger.logger?.debug(`App list fetched: ${results.length} total, ${filtered.length} after filtering out ADT-deployed apps`);
+            return filtered;
         }
         return results;
     }
     catch (error) {
-        RepoAppDownloadLogger.logger?.error(t('error.applicationListFetchError', { error: error.message }));
+        if (downloadType === AppDownloadType.AbapRepository &&
+            error?.response?.status === 400) {
+            // Older systems may not support sourceTemplateIdField or the sap.app/type search param.
+            // Retry with no search params and without sourceTemplateIdField — return all results as-is
+            // since old systems won't have ADT-deployed apps to filter out anyway.
+            RepoAppDownloadLogger.logger?.debug(`Retrying without ${sourceTemplateIdField} and search params`);
+            try {
+                // sap.app/type=application is also dropped — older systems may reject it too.
+                // Non-application entries in the list are acceptable; they will fail at the download step.
+                const retryResults = await provider.getAppIndex().search({}, appListFieldsWithoutSourceTemplate);
+                RepoAppDownloadLogger.logger?.debug(`Retry succeeded: ${retryResults.length} results`);
+                return retryResults;
+            }
+            catch (retryError) {
+                const retryMessage = retryError instanceof Error ? retryError.message : String(retryError);
+                RepoAppDownloadLogger.logger?.error(t('error.applicationListFetchError', { error: retryMessage }));
+                return [];
+            }
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        RepoAppDownloadLogger.logger?.error(t('error.applicationListFetchError', { error: message }));
         return [];
     }
 }

package/generators/prompts/prompts.js

@@ -25,9 +25,8 @@ const getTargetFolderPrompt = (appRootPath, appId) => {
             if (appId) {
                 return true;
             }
-            // If appId is not provided, check if the user has selected an app.
-            // If an app is selected, display the prompt accordingly.
-            return Boolean(answers?.selectedApp?.appId);
+            // Only show after a successful download — admZip is set by downloadApp on success.
+            return Boolean(answers?.selectedApp?.appId) && !!PromptState.admZip;
         },
         guiOptions: {
             applyDefaultWhenDirty: true,

package/generators/telemetryEvents/index.d.ts

@@ -4,6 +4,7 @@
 export declare const EventName: {
     readonly ABAP_REPO_DOWNLOAD_SUCCESS: "ABAP_REPO_DOWNLOAD_SUCCESS";
     readonly ABAP_REPO_DOWNLOAD_FAIL: "ABAP_REPO_DOWNLOAD_FAIL";
+    readonly ABAP_REPO_DOWNLOAD_NO_FILES_RETURNED: "ABAP_REPO_DOWNLOAD_NO_FILES_RETURNED";
     readonly ADT_QUICK_DEPLOY_DOWNLOAD_SUCCESS: "ADT_QUICK_DEPLOY_DOWNLOAD_SUCCESS";
     readonly ADT_QUICK_DEPLOY_DOWNLOAD_FAIL: "ADT_QUICK_DEPLOY_DOWNLOAD_FAIL";
     readonly ABAP_REPO_DOWNLOAD_MIGRATION_COMPLETED: "ABAP_REPO_DOWNLOAD_MIGRATION_COMPLETED";

package/generators/telemetryEvents/index.js

@@ -4,6 +4,7 @@
 export const EventName = {
     ABAP_REPO_DOWNLOAD_SUCCESS: 'ABAP_REPO_DOWNLOAD_SUCCESS',
     ABAP_REPO_DOWNLOAD_FAIL: 'ABAP_REPO_DOWNLOAD_FAIL',
+    ABAP_REPO_DOWNLOAD_NO_FILES_RETURNED: 'ABAP_REPO_DOWNLOAD_NO_FILES_RETURNED',
     ADT_QUICK_DEPLOY_DOWNLOAD_SUCCESS: 'ADT_QUICK_DEPLOY_DOWNLOAD_SUCCESS',
     ADT_QUICK_DEPLOY_DOWNLOAD_FAIL: 'ADT_QUICK_DEPLOY_DOWNLOAD_FAIL',
     ABAP_REPO_DOWNLOAD_MIGRATION_COMPLETED: 'ABAP_REPO_DOWNLOAD_MIGRATION_COMPLETED'

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

@@ -8,8 +8,9 @@
         "appConfigGenError": "An error occurred when generating the application configuration: {{- error}}. For more information, view the logs.",
         "endPhase": "An error occurred in the end phase: {{- error}}. For more information, view the logs.",
         "writingPhase": "An error occurred in the writing phase: {{- error}}. For more information, view the logs.",
-        "errorProcessingJsonFile": "An error occurred when processing the JSON file: {{- error}}. Check the file is valid.",
+        "errorProcessingJsonFile": "An error occurred when processing the JSON file: {{- error}}. Ensure that the file is valid.",
         "noAppsDeployed": "No applications deployed to this system can be downloaded.",
+        "appDownloadFailed": "The application was found but no ZIP archive was returned by the system. The ABAP system may not support this download method.",
         "validationErrors": {
             "invalidMetadataPackage": "Invalid or missing package in the metadata. Check the metadata.",
             "invalidServiceName": "Invalid or missing `serviceName` in `serviceBindingDetails`. Check the `serviceName`.",

package/generators/utils/constants.d.ts

@@ -7,8 +7,9 @@ export interface DownloadTypeConfig {
     searchParams: Record<string, string>;
 }
 export declare const adtSourceTemplateId = "@sap.adt.sevicebinding.deploy:lrop";
+export declare const sourceTemplateIdField = "sap.app/sourceTemplate/id";
 /**
- * Title and description config per download flow, used in the constructor
+ * Title and configuration of the description per download flow, used in the constructor
  */
 export declare const generatorTitleConfig: Record<AppDownloadType, {
     title: string;
@@ -25,4 +26,5 @@ export declare const qfaJsonFileName = "qfa.json";
 export declare const defaultAnswers: RepoAppDownloadAnswers;
 export declare const extractedFilePath = "extractedFiles";
 export declare const appListResultFields: string[];
+export declare const appListFieldsWithoutSourceTemplate: string[];
 //# sourceMappingURL=constants.d.ts.map

package/generators/utils/constants.js

@@ -4,8 +4,10 @@ import { AppDownloadType } from '../app/types.js';
 import { t } from './i18n.js';
 // The source template ID used for filtering the apps in the repository
 export const adtSourceTemplateId = '@sap.adt.sevicebinding.deploy:lrop';
+// The app index field name for the source template ID
+export const sourceTemplateIdField = 'sap.app/sourceTemplate/id';
 /**
- * Title and description config per download flow, used in the constructor
+ * Title and configuration of the description per download flow, used in the constructor
  */
 export const generatorTitleConfig = {
     [AppDownloadType.ADTQuickDeploy]: {
@@ -61,14 +63,17 @@ export const defaultAnswers = {
 };
 // Path for storing the extracted files from repository
 export const extractedFilePath = 'extractedFiles';
-// Fields to retrieve from the app list, useful for displaying app metadata
+// Fields to retrieve from the app list, useful for displaying app metadata.
+// Includes sap.app/sourceTemplate/id so ADT-deployed apps can be filtered out on modern systems.
 export const appListResultFields = [
-    'sap.app/id', // ID of the application
-    'sap.app/title', // Title of the application
-    'sap.app/description', // Description of the application
-    'sap.app/sourceTemplate/id', // ID of the source template
-    'repoName', // Repository name where the app is located
-    'fileType', // Type of file (.zip etc)
-    'url' // URL for accessing the app
+    'sap.app/id',
+    'sap.app/title',
+    'sap.app/description',
+    sourceTemplateIdField,
+    'repoName',
+    'fileType',
+    'url'
 ];
+// Fallback for older systems that reject sap.app/sourceTemplate/id with HTTP 400.
+export const appListFieldsWithoutSourceTemplate = appListResultFields.filter((field) => field !== sourceTemplateIdField);
 //# sourceMappingURL=constants.js.map

package/generators/utils/download-utils.d.ts

@@ -26,8 +26,9 @@ export declare function extractZip(extractedProjectPath: string, fs: Editor): Pr
  * Downloads application files from the ABAP repository.
  *
  * @param {string} repoName - The repository name of the application.
+ * @returns {Promise<boolean>} - Resolves to false if no data was returned (such as on a legacy ABAP system), true otherwise.
  */
-export declare function downloadApp(repoName: string): Promise<void>;
+export declare function downloadApp(repoName: string): Promise<boolean>;
 /**
  * Resolve a transport request for the given app/package.
  *

package/generators/utils/download-utils.js

@@ -59,6 +59,7 @@ export async function extractZip(extractedProjectPath, fs) {
  * Downloads application files from the ABAP repository.
  *
  * @param {string} repoName - The repository name of the application.
+ * @returns {Promise<boolean>} - Resolves to false if no data was returned (such as on a legacy ABAP system), true otherwise.
  */
 export async function downloadApp(repoName) {
     const serviceProvider = PromptState.systemSelection?.connectedSystem?.serviceProvider;
@@ -66,9 +67,14 @@ export async function downloadApp(repoName) {
     ui5AbapRepository.log = RepoAppDownloadLogger.logger;
     RepoAppDownloadLogger.logger?.debug(`App download started: ${repoName}`);
     const downloadedAppPackage = await ui5AbapRepository.downloadFiles(repoName);
+    if (!downloadedAppPackage || downloadedAppPackage.length === 0) {
+        RepoAppDownloadLogger.logger?.error(t('error.appDownloadFailed'));
+        return false;
+    }
     RepoAppDownloadLogger.logger?.debug(`App download completed: ${repoName}`);
     // store downloaded package in prompt state
     PromptState.admZip = downloadedAppPackage;
+    return true;
 }
 /**
  * Resolve a transport request for the given app/package.

package/generators/utils/validators.d.ts

@@ -19,7 +19,7 @@ export declare const validateQfaJsonFile: (config: QfaJsonConfig) => boolean;
  */
 export declare const isValidPromptState: (targetFolder: string, appId?: string) => boolean;
 /**
- * Validates the app selection and handles app download if applicable.
+ * Validates the app selection and handles the app download, if applicable.
  *
  * @param answers - The selected app information.
  * @param appList - The list of available apps.

package/generators/utils/validators.js

@@ -7,6 +7,8 @@ import { AppDownloadType } from '../app/types.js';
 import { downloadApp, hasQfaJson } from '../utils/download-utils.js';
 import { MessageType } from '@sap-devx/yeoman-ui-types';
 import { qfaJsonFileName } from '../utils/constants.js';
+import { sendTelemetry, TelemetryHelper } from '@sap-ux/fiori-generator-shared';
+import { EventName } from '../telemetryEvents/index.js';
 /**
  * Validates the metadata section of the app configuration.
  *
@@ -98,7 +100,15 @@ async function generateAppNotFoundHelpLink() {
     return ErrorHandler.getHelpLink(HELP_NODES.ADT_APP_NOT_FOUND_ERROR, ERROR_TYPE.INTERNAL_SERVER_ERROR, t('error.noAppsDeployed'));
 }
 /**
- * Validates the app selection and handles app download if applicable.
+ * Generates a help link for the "App Download Failed" error.
+ *
+ * @returns {Promise<ValidationLink>} - A promise resolving to a validation link for the error.
+ */
+async function generateAppDownloadFailedHelpLink() {
+    return ErrorHandler.getHelpLink(HELP_NODES.ABAP_REPO_APP_DOWNLOAD_FAILED, ERROR_TYPE.INTERNAL_SERVER_ERROR, t('error.appDownloadFailed'));
+}
+/**
+ * Validates the app selection and handles the app download, if applicable.
  *
  * @param answers - The selected app information.
  * @param appList - The list of available apps.
@@ -119,7 +129,15 @@ export async function validateAppSelection(answers, appList, quickDeployedAppCon
     // Valid app selected, try to download
     if (answers?.appId) {
         try {
-            await downloadApp(answers.repoName);
+            const downloadSucceeded = await downloadApp(answers.repoName);
+            if (!downloadSucceeded) {
+                if (downloadType === AppDownloadType.AbapRepository) {
+                    await sendTelemetry(EventName.ABAP_REPO_DOWNLOAD_NO_FILES_RETURNED, TelemetryHelper.createTelemetryData({}) ?? {}).catch(() => {
+                        // telemetry errors are non-fatal
+                    });
+                }
+                return await generateAppDownloadFailedHelpLink();
+            }
             const isQfaJsonPresent = hasQfaJson();
             if (!isQfaJsonPresent && downloadType === AppDownloadType.ADTQuickDeploy) {
                 appWizard?.showError(t('error.qfaJsonNotFound', { jsonFileName: qfaJsonFileName }), MessageType.notification);

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": "1.2.60",
+  "version": "1.2.62",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -27,11 +27,11 @@
     "yeoman-generator": "5.10.0",
     "@sap-ux/feature-toggle": "1.0.5",
     "@sap-ux/fiori-generator-shared": "1.2.16",
-    "@sap-ux/inquirer-common": "1.0.41",
+    "@sap-ux/inquirer-common": "1.0.42",
     "@sap-ux/project-access": "2.2.0",
-    "@sap-ux/odata-service-inquirer": "3.2.18",
-    "@sap-ux/fiori-elements-writer": "3.1.57",
-    "@sap-ux/fiori-freestyle-writer": "3.0.102",
+    "@sap-ux/odata-service-inquirer": "3.2.19",
+    "@sap-ux/fiori-elements-writer": "3.1.59",
+    "@sap-ux/fiori-freestyle-writer": "3.0.104",
     "@sap-ux/logger": "1.0.3",
     "@sap-ux/project-input-validator": "1.0.19",
     "@sap-ux/launch-config": "1.0.21",
@@ -42,7 +42,7 @@
     "@sap-ux/axios-extension": "2.1.0",
     "@sap-ux/store": "2.0.7",
     "@sap-ux/system-access": "1.0.14",
-    "@sap-ux/guided-answers-helper": "1.0.1"
+    "@sap-ux/guided-answers-helper": "1.0.2"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",