@sap-ux/repo-app-import-sub-generator 0.3.150 → 0.3.152

package/generators/app/app-config.d.ts

@@ -1,26 +1,34 @@
 import { type FioriElementsApp, type LROPSettings } from '@sap-ux/fiori-elements-writer';
+import type { AbapServiceProvider } from '@sap-ux/axios-extension';
 import type { Editor } from 'mem-fs-editor';
 import type { AppInfo, QfaJsonConfig } from '../app/types';
 import type { AbapDeployConfig } from '@sap-ux/ui5-config';
 import { type OdataServiceAnswers } from '@sap-ux/odata-service-inquirer';
+/**
+ * Shared context for downloading and deploying ABAP applications.
+ */
+export interface AppDownloadContext {
+    serviceProvider?: AbapServiceProvider;
+    qfaJson: QfaJsonConfig;
+}
 /**
  * Generates the deployment configuration for an ABAP application.
  *
- * @param {QfaJsonConfig} qfaJson - The QFA JSON configuration containing app details.
+ * @param {AppDownloadContext} context - The download context with service provider and qfa info.
  * @returns {AbapDeployConfig} The deployment configuration containing `target` and `app` info.
  */
-export declare const getAbapDeployConfig: (qfaJson: QfaJsonConfig) => AbapDeployConfig;
+export declare const getAbapDeployConfig: (context: AppDownloadContext) => Promise<AbapDeployConfig>;
 /**
  * Gets the application configuration based on the provided user answers and manifest data.
  * This configuration will be used to initialize a new Fiori application.
  *
  * @param {AppInfo} app - Selected app information.
  * @param {string} extractedProjectPath - Path where the app files are extracted.
- * @param {QfaJsonConfig} qfaJson - The QFA JSON configuration containing app details.
+ * @param {AppDownloadContext} context - The download context with service provider and qfa info.
  * @param {OdataServiceAnswers} systemSelection - User's selection of the OData service and system.
  * @param {Editor} fs - The file system editor to manipulate project files.
  * @returns {Promise<FioriElementsApp<LROPSettings>>} - A promise resolving to the generated app configuration.
  * @throws {Error} - Throws an error if there are issues generating the configuration.
  */
-export declare function getAppConfig(app: AppInfo, extractedProjectPath: string, qfaJson: QfaJsonConfig, systemSelection: OdataServiceAnswers, fs: Editor): Promise<FioriElementsApp<LROPSettings>>;
+export declare function getAppConfig(app: AppInfo, extractedProjectPath: string, context: AppDownloadContext, systemSelection: OdataServiceAnswers, fs: Editor): Promise<FioriElementsApp<LROPSettings>>;
 //# sourceMappingURL=app-config.d.ts.map

package/generators/app/app-config.js

@@ -7,6 +7,7 @@ exports.getAbapDeployConfig = void 0;
 exports.getAppConfig = getAppConfig;
 const fiori_elements_writer_1 = require("@sap-ux/fiori-elements-writer");
 const odata_service_inquirer_1 = require("@sap-ux/odata-service-inquirer");
+const axios_extension_1 = require("@sap-ux/axios-extension");
 const i18n_1 = require("../utils/i18n");
 const file_helpers_1 = require("../utils/file-helpers");
 const constants_1 = require("../utils/constants");
@@ -15,13 +16,50 @@ const logger_1 = __importDefault(require("../utils/logger"));
 const project_access_1 = require("@sap-ux/project-access");
 const node_path_1 = require("node:path");
 const ui5_info_1 = require("@sap-ux/ui5-info");
+/**
+ * Resolve a transport request for the given app/package context.
+ * This function performs defensive checks and logs clear, actionable messages.
+ *
+ * @param context - AppDownloadContext containing qfaJson and serviceProvider
+ * @returns { Promise<string> } - Resolved transport request string
+ *  - '' when package is local ('$TMP')
+ *  - '<transport-request-id>' when transport request is found
+ *  - 'REPLACE_WITH_TRANSPORT' when no transport request is found
+ * @throws Error when the transport check fails
+ */
+async function resolveTransportRequest(context) {
+    const { serviceProvider, qfaJson } = context;
+    const packageName = qfaJson.metadata.package;
+    const appName = qfaJson.deploymentDetails.repositoryName;
+    if (packageName === '$TMP') {
+        return '';
+    }
+    try {
+        const transportService = await serviceProvider?.getAdtService(axios_extension_1.TransportChecksService);
+        const transportRequests = await transportService?.getTransportRequests(packageName, appName);
+        if (transportRequests?.length === 1) {
+            return transportRequests[0].transportNumber;
+        }
+        return 'REPLACE_WITH_TRANSPORT';
+    }
+    catch (error) {
+        if (error.message === axios_extension_1.TransportChecksService.LocalPackageError) {
+            return '';
+        }
+        const msg = (0, i18n_1.t)('error.transportCheckFailed', { error: error?.message });
+        logger_1.default.logger?.error(msg);
+        throw new Error(msg);
+    }
+}
 /**
  * Generates the deployment configuration for an ABAP application.
  *
- * @param {QfaJsonConfig} qfaJson - The QFA JSON configuration containing app details.
+ * @param {AppDownloadContext} context - The download context with service provider and qfa info.
  * @returns {AbapDeployConfig} The deployment configuration containing `target` and `app` info.
  */
-const getAbapDeployConfig = (qfaJson) => {
+const getAbapDeployConfig = async (context) => {
+    const { qfaJson } = context;
+    const transportRequest = await resolveTransportRequest(context);
     return {
         target: {
             url: prompt_state_1.PromptState.baseURL,
@@ -32,7 +70,7 @@ const getAbapDeployConfig = (qfaJson) => {
             name: qfaJson.deploymentDetails.repositoryName,
             package: qfaJson.metadata.package,
             description: qfaJson.deploymentDetails.repositoryDescription,
-            transport: 'REPLACE_WITH_TRANSPORT'
+            transport: transportRequest
         }
     }; // NOSONAR
 };
@@ -46,9 +84,9 @@ exports.getAbapDeployConfig = getAbapDeployConfig;
  */
 const fetchServiceMetadata = async (provider, serviceUrl) => {
     try {
-        const metdata = await provider.service(serviceUrl).metadata();
+        const metadata = await provider.service(serviceUrl).metadata();
         logger_1.default.logger?.debug('Metadata fetched successfully');
-        return metdata;
+        return metadata;
     }
     catch (err) {
         logger_1.default.logger?.error((0, i18n_1.t)('error.metadataFetchError', { error: err.message }));
@@ -60,16 +98,17 @@ const fetchServiceMetadata = async (provider, serviceUrl) => {
  *
  * @param {AppInfo} app - Selected app information.
  * @param {string} extractedProjectPath - Path where the app files are extracted.
- * @param {QfaJsonConfig} qfaJson - The QFA JSON configuration containing app details.
+ * @param {AppDownloadContext} context - The download context with service provider and qfa info.
  * @param {OdataServiceAnswers} systemSelection - User's selection of the OData service and system.
  * @param {Editor} fs - The file system editor to manipulate project files.
  * @returns {Promise<FioriElementsApp<LROPSettings>>} - A promise resolving to the generated app configuration.
  * @throws {Error} - Throws an error if there are issues generating the configuration.
  */
-async function getAppConfig(app, extractedProjectPath, qfaJson, systemSelection, fs) {
+async function getAppConfig(app, extractedProjectPath, context, systemSelection, fs) {
     try {
         const manifest = (0, file_helpers_1.readManifest)((0, node_path_1.join)(extractedProjectPath, project_access_1.FileName.Manifest), fs);
         const serviceProvider = prompt_state_1.PromptState.systemSelection?.connectedSystem?.serviceProvider;
+        context.serviceProvider = serviceProvider;
         if (!manifest?.['sap.app']?.dataSources) {
             logger_1.default.logger?.error((0, i18n_1.t)('error.dataSourcesNotFound'));
         }
@@ -103,7 +142,7 @@ async function getAppConfig(app, extractedProjectPath, qfaJson, systemSelection,
                 type: fiori_elements_writer_1.TemplateType.ListReportObjectPage,
                 settings: {
                     entityConfig: {
-                        mainEntityName: qfaJson.serviceBindingDetails.mainEntityName
+                        mainEntityName: context.qfaJson.serviceBindingDetails.mainEntityName
                     }
                 }
             },

package/generators/app/index.js

@@ -123,11 +123,14 @@ class default_1 extends yeoman_generator_1.default {
         const qfaJson = (0, file_helpers_1.makeValidJson)(qfaJsonFilePath, this.fs);
         // Generate project files
         (0, validators_1.validateQfaJsonFile)(qfaJson);
+        const context = {
+            qfaJson
+        };
         // Generate app config
-        const config = await (0, app_config_1.getAppConfig)(this.answers.selectedApp, this.extractedProjectPath, qfaJson, this.answers.systemSelection, this.fs);
+        const config = await (0, app_config_1.getAppConfig)(this.answers.selectedApp, this.extractedProjectPath, context, this.answers.systemSelection, this.fs);
         await (0, fiori_elements_writer_1.generate)(this.projectPath, config, this.fs);
         // Generate deploy config
-        const deployConfig = (0, app_config_1.getAbapDeployConfig)(qfaJson);
+        const deployConfig = await (0, app_config_1.getAbapDeployConfig)(context);
         await (0, abap_deploy_config_writer_1.generate)(this.projectPath, deployConfig, undefined, this.fs);
         if (this.vscode) {
             // Generate Fiori launch config

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

@@ -39,7 +39,8 @@
             "invalidManifestStructureError": "Invalid `manifest.json file` structure: `sap.ui5` or `sap.app` are missing. Check they exist."
         },
         "quickDeployedAppDownloadErrors": {
-            "noAppsFound": "No application with the ID {{ appId }} was found in the system. Please check if the application is deployed correctly or select another app."
+            "noAppsFound": "No application with the ID {{ appId }} was found in the system. Please check if the application is deployed correctly or select another app.",
+            "transportCheckFailed": "Transport request resolution failed with error: {error}."
         }
     },
     "warn": {

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.3.150",
+  "version": "0.3.152",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -25,18 +25,18 @@
     "inquirer": "8.2.7",
     "yeoman-generator": "5.10.0",
     "@sap-ux/feature-toggle": "0.3.4",
-    "@sap-ux/inquirer-common": "0.9.3",
     "@sap-ux/fiori-generator-shared": "0.13.33",
-    "@sap-ux/project-access": "1.32.8",
+    "@sap-ux/inquirer-common": "0.9.3",
     "@sap-ux/odata-service-inquirer": "2.11.4",
-    "@sap-ux/fiori-elements-writer": "2.7.37",
+    "@sap-ux/project-access": "1.32.8",
+    "@sap-ux/fiori-elements-writer": "2.8.0",
     "@sap-ux/logger": "0.7.1",
     "@sap-ux/project-input-validator": "0.6.30",
     "@sap-ux/launch-config": "0.10.34",
     "@sap-ux/fiori-tools-settings": "0.2.2",
     "@sap-ux/abap-deploy-config-writer": "0.2.33",
-    "@sap-ux/btp-utils": "1.1.5",
     "@sap-ux/ui5-info": "0.13.2",
+    "@sap-ux/btp-utils": "1.1.5",
     "@sap-ux/axios-extension": "1.24.2",
     "@sap-ux/store": "1.3.3",
     "@sap-ux/system-access": "0.6.28",