@sap-ux/repo-app-import-sub-generator 1.2.90 → 1.2.92

package/generators/app/index.d.ts

@@ -10,7 +10,8 @@ export default class extends Generator {
     private readonly vscode?;
     private readonly appRootPath;
     private readonly answers;
-    private readonly downloadType;
+    private downloadType;
+    private readonly downloadTypeExplicit;
     private readonly prompts;
     options: RepoAppDownloadOptions;
     private projectPath;

package/generators/app/index.js

@@ -4,7 +4,7 @@ import { AppWizard, Prompts, MessageType } from '@sap-devx/yeoman-ui-types';
 import { isInternalFeaturesSettingEnabled } from '@sap-ux/feature-toggle';
 import { extractedFilePath, generatorName, defaultAnswers, qfaJsonFileName, downloadTypeConfig } from '../utils/constants.js';
 import { t } from '../utils/i18n.js';
-import { extractZip } from '../utils/download-utils.js';
+import { extractZip, hasQfaJson } from '../utils/download-utils.js';
 import { EventName } from '../telemetryEvents/index.js';
 import { getDefaultTargetFolder, generateAppGenInfo, sendTelemetry, TelemetryHelper, isCli, setYeomanEnvConflicterForce, getFloorplanLabel } from '@sap-ux/fiori-generator-shared';
 import { AppDownloadType, PromptNames } from './types.js';
@@ -37,6 +37,7 @@ export default class extends Generator {
     appRootPath;
     answers = defaultAnswers;
     downloadType;
+    downloadTypeExplicit;
     prompts;
     options;
     projectPath;
@@ -58,6 +59,7 @@ export default class extends Generator {
         this.appRootPath = opts?.appRootPath ?? getDefaultTargetFolder(this.vscode) ?? this.destinationRoot();
         this.options = opts;
         this.downloadType = opts.data?.appDownloadType ?? AppDownloadType.ADTQuickDeploy;
+        this.downloadTypeExplicit = opts.data?.appDownloadType !== undefined;
         // Configure logging
         RepoAppDownloadLogger.configureLogging(this.rootGeneratorName(), this.log, this.options.logWrapper, this.options.logLevel, this.options.logger, this.vscode);
         this.prompts = new Prompts(getYUIDetails(this.downloadType));
@@ -110,8 +112,14 @@ export default class extends Generator {
      * Writes the configuration files for the project, including deployment config, and README.
      */
     async writing() {
+        // hasQfaJson() is the authoritative signal: qfa.json is only present in ADT Quick Deploy apps.
+        // When downloadType was not explicitly set (CLI invocation defaults to ADTQuickDeploy),
+        // use qfa.json presence to decide which flow to run.
+        const isAdtQuickDeploy = this.downloadType === AppDownloadType.ADTQuickDeploy && (this.downloadTypeExplicit || hasQfaJson());
+        // Resolve the effective type so all post-writing phases (README, telemetry, success msg) are consistent.
+        this.downloadType = isAdtQuickDeploy ? AppDownloadType.ADTQuickDeploy : AppDownloadType.AbapRepository;
         try {
-            if (this.downloadType === AppDownloadType.AbapRepository) {
+            if (!isAdtQuickDeploy) {
                 await this._generateAbapRepositoryApp();
             }
             else {

package/generators/prompts/prompt-helpers.js

@@ -69,18 +69,21 @@ export const formatAppChoices = (appList) => {
  */
 /**
  * Fallback for older ABAP systems that reject sourceTemplate/type search params with HTTP 400.
- * Returns all apps unfiltered — old systems won't have ADT-deployed apps anyway.
+ * Fetches the full unfiltered list and then applies client-side appId filtering if provided,
+ * since older systems cannot handle server-side field filtering.
  *
  * @param appIndex - The app index instance to search against.
- * @returns All apps without filtering, or an empty array if the retry also fails.
+ * @param appId - Optional app ID to filter results client-side.
+ * @returns Matching apps (or all apps when appId is omitted), or an empty array if the retry also fails.
  */
-async function retryAbapAppListFetch(appIndex) {
+async function retryAppListFetchForOlderSystems(appIndex, appId) {
     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 results = await appIndex.search({}, appListFieldsWithoutSourceTemplate);
-        RepoAppDownloadLogger.logger?.debug(`Retry succeeded: ${results.length} results`);
-        return results;
+        const filtered = appId ? results.filter((app) => app['sap.app/id'] === appId) : results;
+        RepoAppDownloadLogger.logger?.debug(`Retry succeeded: ${filtered.length} results`);
+        return filtered;
     }
     catch (retryError) {
         const message = retryError instanceof Error ? retryError.message : String(retryError);
@@ -134,13 +137,16 @@ async function getAppList(provider, appId, downloadType = AppDownloadType.ADTQui
         return await searchAdtQuickDeployApps(appIndex, appId);
     }
     catch (error) {
-        if (downloadType === AppDownloadType.AbapRepository &&
-            error?.response?.status === 400) {
-            // Older systems may not support sourceTemplateIdField or the sap.app/type search param.
-            RepoAppDownloadLogger.logger?.debug(`Retrying without ${sourceTemplateIdField} and search params`);
-            return retryAbapAppListFetch(appIndex);
-        }
+        const status = error?.response?.status;
         const message = error instanceof Error ? error.message : String(error);
+        // Older systems rejects unknown fields either as HTTP 400 or with an "unknown column" error message
+        const isOlderSystemError = status === 400 || /column.*unknown|unknown.*column/i.test(message);
+        if (isOlderSystemError) {
+            // Older systems reject sap.app/sourceTemplate/id as an unknown column.
+            // Both flows send it — ADTQuickDeploy as a search param, AbapRepository as a result field.
+            RepoAppDownloadLogger.logger?.debug(`Retrying without ${sourceTemplateIdField} and search params (original error: ${message})`);
+            return retryAppListFetchForOlderSystems(appIndex, appId);
+        }
         RepoAppDownloadLogger.logger?.error(t('error.applicationListFetchError', { error: message }));
         return [];
     }

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

@@ -10,7 +10,9 @@
         "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}}. 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.",
+        "appDownloadFailed": "The application could not be downloaded. The ABAP system does not support any available download method.",
+        "adtFallbackDownload": "ZIP download is not supported on this system. Falling back to downloading from the ADT file store.",
+        "adtFallbackDownloadFailed": "Downloading from the ADT file store failed: {{- error}}",
         "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.js

@@ -78,6 +78,7 @@ export const appListResultFields = [
     'fileType',
     'url'
 ];
-// Fallback for older systems that reject sap.app/sourceTemplate/id with HTTP 400.
-export const appListFieldsWithoutSourceTemplate = appListResultFields.filter((field) => field !== sourceTemplateIdField);
+// Fallback for older systems (e.g. ABAP 731) that reject unknown columns with HTTP 400.
+// Drops sourceTemplateIdField and fileType, which older app index versions do not support.
+export const appListFieldsWithoutSourceTemplate = appListResultFields.filter((field) => field !== sourceTemplateIdField && field !== 'fileType');
 //# sourceMappingURL=constants.js.map

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

@@ -24,6 +24,8 @@ export declare function hasQfaJson(): boolean;
 export declare function extractZip(extractedProjectPath: string, fs: Editor): Promise<void>;
 /**
  * Downloads application files from the ABAP repository.
+ * First attempts download via ABAP_REPOSITORY_SRV (requires SAP_UI 754+).
+ * Falls back to ADT FileStoreService on older systems.
  *
  * @param {string} repoName - The repository name of the application.
  * @returns `{ success: true }` on success, or `{ success: false, errorMessage }` if the server

package/generators/utils/download-utils.js

@@ -3,7 +3,7 @@ import { PromptState } from '../prompts/prompt-state.js';
 import { t } from './i18n.js';
 import RepoAppDownloadLogger from '../utils/logger.js';
 import { qfaJsonFileName } from './constants.js';
-import { TransportChecksService } from '@sap-ux/axios-extension';
+import { TransportChecksService, FileStoreService } from '@sap-ux/axios-extension';
 import { restoreServiceProviderLoggers } from '@sap-ux/fiori-generator-shared';
 /**
  * Fetches the metadata of a given service from the provided ABAP service provider.
@@ -57,6 +57,8 @@ export async function extractZip(extractedProjectPath, fs) {
 }
 /**
  * Downloads application files from the ABAP repository.
+ * First attempts download via ABAP_REPOSITORY_SRV (requires SAP_UI 754+).
+ * Falls back to ADT FileStoreService on older systems.
  *
  * @param {string} repoName - The repository name of the application.
  * @returns `{ success: true }` on success, or `{ success: false, errorMessage }` if the server
@@ -64,10 +66,30 @@ export async function extractZip(extractedProjectPath, fs) {
  */
 export async function downloadApp(repoName) {
     const serviceProvider = PromptState.systemSelection?.connectedSystem?.serviceProvider;
-    const ui5AbapRepository = await serviceProvider.getUi5AbapRepository();
+    const ui5AbapRepository = serviceProvider.getUi5AbapRepository();
     ui5AbapRepository.log = RepoAppDownloadLogger.logger;
     RepoAppDownloadLogger.logger?.debug(`App download started: ${repoName}`);
-    const downloadedAppPackage = await ui5AbapRepository.downloadFiles(repoName);
+    let downloadedAppPackage;
+    try {
+        downloadedAppPackage = await ui5AbapRepository.downloadFiles(repoName);
+    }
+    catch (error) {
+        // ABAP_REPOSITORY_SRV may not be available on older systems (e.g. ABAP 731 / SAP_UI < 754).
+        // Fall through to the ADT FileStoreService fallback below.
+        RepoAppDownloadLogger.logger?.debug(`ABAP_REPOSITORY_SRV unavailable, falling back to ADT: ${error.message}`);
+    }
+    if (!downloadedAppPackage || downloadedAppPackage.length === 0) {
+        RepoAppDownloadLogger.logger?.debug(t('error.adtFallbackDownload'));
+        try {
+            const fileStoreService = await serviceProvider.getAdtService(FileStoreService);
+            if (fileStoreService) {
+                downloadedAppPackage = await ui5AbapRepository.downloadFilesViaAdt(repoName, fileStoreService);
+            }
+        }
+        catch (error) {
+            RepoAppDownloadLogger.logger?.error(t('error.adtFallbackDownloadFailed', { error: error.message }));
+        }
+    }
     if (!downloadedAppPackage || downloadedAppPackage.length === 0) {
         // Legacy ABAP systems may return empty content rather than an error response.
         const errorMessage = t('error.appDownloadFailed');
@@ -75,7 +97,6 @@ export async function downloadApp(repoName) {
         return { success: false, errorMessage };
     }
     RepoAppDownloadLogger.logger?.debug(`App download completed: ${repoName}`);
-    // store downloaded package in prompt state
     PromptState.admZip = downloadedAppPackage;
     return { success: true };
 }

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.90",
+  "version": "1.2.92",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -25,24 +25,24 @@
     "i18next": "26.3.6",
     "inquirer": "8.2.7",
     "yeoman-generator": "5.10.0",
-    "@sap-ux/feature-toggle": "1.0.5",
-    "@sap-ux/fiori-generator-shared": "1.2.23",
-    "@sap-ux/inquirer-common": "1.0.49",
-    "@sap-ux/project-access": "2.3.1",
-    "@sap-ux/odata-service-inquirer": "3.2.27",
-    "@sap-ux/fiori-elements-writer": "3.1.85",
-    "@sap-ux/fiori-freestyle-writer": "3.0.128",
+    "@sap-ux/fiori-generator-shared": "1.2.24",
+    "@sap-ux/inquirer-common": "1.0.50",
+    "@sap-ux/odata-service-inquirer": "3.2.28",
+    "@sap-ux/project-access": "2.3.2",
+    "@sap-ux/fiori-elements-writer": "3.1.87",
+    "@sap-ux/fiori-freestyle-writer": "3.0.130",
     "@sap-ux/logger": "1.0.3",
-    "@sap-ux/project-input-validator": "1.0.24",
-    "@sap-ux/launch-config": "1.0.25",
+    "@sap-ux/project-input-validator": "1.0.25",
+    "@sap-ux/launch-config": "1.0.26",
     "@sap-ux/fiori-tools-settings": "1.1.1",
-    "@sap-ux/abap-deploy-config-writer": "1.0.33",
+    "@sap-ux/abap-deploy-config-writer": "1.0.34",
     "@sap-ux/btp-utils": "2.0.8",
     "@sap-ux/ui5-info": "1.0.7",
-    "@sap-ux/axios-extension": "2.1.3",
+    "@sap-ux/axios-extension": "2.1.4",
+    "@sap-ux/system-access": "1.0.18",
     "@sap-ux/store": "2.0.7",
-    "@sap-ux/system-access": "1.0.17",
-    "@sap-ux/guided-answers-helper": "1.0.2"
+    "@sap-ux/guided-answers-helper": "1.0.2",
+    "@sap-ux/feature-toggle": "1.0.5"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
@@ -67,7 +67,7 @@
     "unionfs": "4.6.0",
     "yeoman-environment": "3.19.3",
     "yeoman-test": "6.3.0",
-    "@sap-ux/nodejs-utils": "1.0.12",
+    "@sap-ux/nodejs-utils": "1.0.13",
     "@sap-ux/store": "2.0.7",
     "@sap-ux/ui5-config": "1.0.10"
   },