@sap-ux/repo-app-import-sub-generator 1.2.73 → 1.2.75

package/generators/app/app-config-quick-deploy.js

@@ -2,7 +2,7 @@ import { TemplateType } from '@sap-ux/fiori-elements-writer';
 import { OdataVersion } from '@sap-ux/odata-service-inquirer';
 import { t } from '../utils/i18n.js';
 import { readManifest } from '../utils/file-helpers.js';
-import { fioriAppSourcetemplateId, adtSourceTemplateId } from '../utils/constants.js';
+import { fioriAppSourcetemplateId, adtSourceTemplateIds } from '../utils/constants.js';
 import { PromptState } from '../prompts/prompt-state.js';
 import RepoAppDownloadLogger from '../utils/logger.js';
 import { FileName } from '@sap-ux/project-access';
@@ -26,11 +26,11 @@ export async function getAppConfig(app, extractedProjectPath, context, systemSel
         const manifest = readManifest(join(extractedProjectPath, FileName.Manifest), fs);
         const serviceProvider = PromptState.systemSelection?.connectedSystem?.serviceProvider;
         context.serviceProvider = serviceProvider;
-        if (manifest?.['sap.app']?.sourceTemplate?.id !== adtSourceTemplateId) {
-            RepoAppDownloadLogger.logger?.error(t('error.readManifestErrors.sourceTemplateNotSupported'));
+        if (!adtSourceTemplateIds.includes(manifest?.['sap.app']?.sourceTemplate?.id ?? '')) {
+            RepoAppDownloadLogger.logger?.warn(t('error.readManifestErrors.sourceTemplateNotSupported'));
         }
         if (!manifest?.['sap.app']?.dataSources) {
-            RepoAppDownloadLogger.logger?.error(t('error.dataSourcesNotFound'));
+            RepoAppDownloadLogger.logger?.warn(t('error.dataSourcesNotFound'));
         }
         const odataVersion = manifest?.['sap.app']?.dataSources?.mainService?.settings?.odataVersion?.startsWith('4')
             ? OdataVersion.v4

package/generators/prompts/prompt-helpers.js

@@ -1,4 +1,4 @@
-import { appListResultFields, downloadTypeConfig, generatorTitleConfig, adtSourceTemplateId, appListFieldsWithoutSourceTemplate, sourceTemplateIdField } from '../utils/constants.js';
+import { appListResultFields, downloadTypeConfig, generatorTitleConfig, adtSourceTemplateIds, adtSourceTemplateId, adtSourceTemplateIdCorrected, appListFieldsWithoutSourceTemplate, sourceTemplateIdField } from '../utils/constants.js';
 import { AppDownloadType } from '../app/types.js';
 import { PromptState } from './prompt-state.js';
 import { t } from '../utils/i18n.js';
@@ -67,38 +67,78 @@ export const formatAppChoices = (appList) => {
  * @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.
  */
+/**
+ * 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.
+ *
+ * @param appIndex - The app index instance to search against.
+ * @returns All apps without filtering, or an empty array if the retry also fails.
+ */
+async function retryAbapAppListFetch(appIndex) {
+    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;
+    }
+    catch (retryError) {
+        const message = retryError instanceof Error ? retryError.message : String(retryError);
+        RepoAppDownloadLogger.logger?.error(t('error.applicationListFetchError', { error: message }));
+        return [];
+    }
+}
+/**
+ * Searches the app index for AbapRepository apps, filtering out ADT-deployed entries.
+ *
+ * @param appIndex - The app index instance to search against.
+ * @param appId - Optional app ID to narrow the search.
+ * @returns Filtered app list excluding any ADT source template IDs.
+ */
+async function searchAbapRepositoryApps(appIndex, appId) {
+    const base = downloadTypeConfig[AppDownloadType.AbapRepository].searchParams;
+    const searchParams = appId ? { ...base, 'sap.app/id': appId } : base;
+    const results = await appIndex.search(searchParams, appListResultFields);
+    const filtered = results.filter((app) => !adtSourceTemplateIds.includes(app[sourceTemplateIdField]));
+    RepoAppDownloadLogger.logger?.debug(`App list fetched: ${results.length} total, ${filtered.length} after filtering out ADT-deployed apps`);
+    return filtered;
+}
+/**
+ * Searches the app index for ADTQuickDeploy apps using both legacy and corrected template IDs concurrently.
+ * The app index API does not support OR filters, so two parallel searches are required.
+ *
+ * @param appIndex - The app index instance to search against.
+ * @param appId - Optional app ID to narrow the search.
+ * @returns Deduplicated app list from both template ID searches.
+ */
+async function searchAdtQuickDeployApps(appIndex, appId) {
+    const buildSearchParams = (templateId) => ({
+        [sourceTemplateIdField]: templateId,
+        ...(appId ? { 'sap.app/id': appId } : {})
+    });
+    const [legacyResults, correctedResults] = await Promise.all([
+        appIndex.search(buildSearchParams(adtSourceTemplateId), appListResultFields),
+        appIndex.search(buildSearchParams(adtSourceTemplateIdCorrected), appListResultFields)
+    ]);
+    // An app can only carry one template ID at a time, so duplicates should not occur in practice.
+    // Dedup by sap.app/id as a safeguard against unexpected backend behaviour.
+    const legacyAppIds = new Set(legacyResults.map((app) => app['sap.app/id']));
+    return [...legacyResults, ...correctedResults.filter((app) => !legacyAppIds.has(app['sap.app/id']))];
+}
 async function getAppList(provider, appId, downloadType = AppDownloadType.ADTQuickDeploy) {
-    const baseSearchParams = downloadTypeConfig[downloadType].searchParams;
-    const searchParams = appId ? { ...baseSearchParams, 'sap.app/id': appId } : baseSearchParams;
+    const appIndex = provider.getAppIndex();
     try {
-        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.
-            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 await searchAbapRepositoryApps(appIndex, appId);
         }
-        return results;
+        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.
-            // 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 [];
-            }
+            return retryAbapAppListFetch(appIndex);
         }
         const message = error instanceof Error ? error.message : String(error);
         RepoAppDownloadLogger.logger?.error(t('error.applicationListFetchError', { error: message }));

package/generators/utils/constants.d.ts

@@ -7,6 +7,8 @@ export interface DownloadTypeConfig {
     searchParams: Record<string, string>;
 }
 export declare const adtSourceTemplateId = "@sap.adt.sevicebinding.deploy:lrop";
+export declare const adtSourceTemplateIdCorrected = "@sap.adt.servicebinding.deploy:lrop";
+export declare const adtSourceTemplateIds: readonly string[];
 export declare const sourceTemplateIdField = "sap.app/sourceTemplate/id";
 /**
  * Title and configuration of the description per download flow, used in the constructor

package/generators/utils/constants.js

@@ -4,6 +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';
+// Corrected spelling introduced; both IDs must be recognised during the transition period.
+export const adtSourceTemplateIdCorrected = '@sap.adt.servicebinding.deploy:lrop';
+// Both ADT source template IDs (typo and corrected) for backward-compatible matching.
+export const adtSourceTemplateIds = [adtSourceTemplateId, adtSourceTemplateIdCorrected];
 // The app index field name for the source template ID
 export const sourceTemplateIdField = 'sap.app/sourceTemplate/id';
 /**

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.73",
+  "version": "1.2.75",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -25,11 +25,13 @@
     "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.19",
     "@sap-ux/inquirer-common": "1.0.45",
     "@sap-ux/project-access": "2.2.2",
     "@sap-ux/odata-service-inquirer": "3.2.23",
-    "@sap-ux/feature-toggle": "1.0.5",
+    "@sap-ux/fiori-elements-writer": "3.1.71",
+    "@sap-ux/fiori-freestyle-writer": "3.0.116",
     "@sap-ux/logger": "1.0.3",
     "@sap-ux/project-input-validator": "1.0.22",
     "@sap-ux/launch-config": "1.0.23",
@@ -40,9 +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.2",
-    "@sap-ux/fiori-elements-writer": "3.1.70",
-    "@sap-ux/fiori-freestyle-writer": "3.0.115"
+    "@sap-ux/guided-answers-helper": "1.0.2"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",