@sap-ux/repo-app-import-sub-generator 0.3.17 → 0.3.18

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

@@ -2,14 +2,14 @@ import { type FioriElementsApp, type LROPSettings } from '@sap-ux/fiori-elements
 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';
 /**
  * Generates the deployment configuration for an ABAP application.
  *
- * @param {AppInfo} app - Application info containing `url` and `repoName`.
  * @param {QfaJsonConfig} qfaJson - The QFA JSON configuration containing app details.
  * @returns {AbapDeployConfig} The deployment configuration containing `target` and `app` info.
  */
-export declare const getAbapDeployConfig: (app: AppInfo, qfaJson: QfaJsonConfig) => AbapDeployConfig;
+export declare const getAbapDeployConfig: (qfaJson: QfaJsonConfig) => 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.
@@ -17,9 +17,10 @@ export declare const getAbapDeployConfig: (app: AppInfo, qfaJson: QfaJsonConfig)
  * @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 {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, fs: Editor): Promise<FioriElementsApp<LROPSettings>>;
+export declare function getAppConfig(app: AppInfo, extractedProjectPath: string, qfaJson: QfaJsonConfig, systemSelection: OdataServiceAnswers, fs: Editor): Promise<FioriElementsApp<LROPSettings>>;
 //# sourceMappingURL=app-config.d.ts.map

package/generators/app/app-config.js

@@ -17,16 +17,15 @@ const ui5_info_1 = require("@sap-ux/ui5-info");
 /**
  * Generates the deployment configuration for an ABAP application.
  *
- * @param {AppInfo} app - Application info containing `url` and `repoName`.
  * @param {QfaJsonConfig} qfaJson - The QFA JSON configuration containing app details.
  * @returns {AbapDeployConfig} The deployment configuration containing `target` and `app` info.
  */
-const getAbapDeployConfig = (app, qfaJson) => {
+const getAbapDeployConfig = (qfaJson) => {
     return {
         target: {
             url: prompt_state_1.PromptState.baseURL,
             client: prompt_state_1.PromptState.sapClient,
-            destination: app.repoName
+            destination: prompt_state_1.PromptState.destinationName
         },
         app: {
             name: qfaJson.deploymentDetails.repositoryName,
@@ -34,7 +33,7 @@ const getAbapDeployConfig = (app, qfaJson) => {
             description: qfaJson.deploymentDetails.repositoryDescription,
             transport: 'REPLACE_WITH_TRANSPORT'
         }
-    };
+    }; // NOSONAR
 };
 exports.getAbapDeployConfig = getAbapDeployConfig;
 /**
@@ -61,11 +60,12 @@ 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 {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, fs) {
+async function getAppConfig(app, extractedProjectPath, qfaJson, systemSelection, fs) {
     try {
         const manifest = (0, file_helpers_1.readManifest)((0, path_1.join)(extractedProjectPath, project_access_1.FileName.Manifest), fs);
         const serviceProvider = prompt_state_1.PromptState.systemSelection?.connectedSystem?.serviceProvider;
@@ -110,7 +110,8 @@ async function getAppConfig(app, extractedProjectPath, qfaJson, fs) {
                 path: manifest?.['sap.app']?.dataSources?.mainService.uri,
                 version: odataVersion,
                 metadata: metadata,
-                url: serviceProvider.defaults.baseURL
+                url: prompt_state_1.PromptState.baseURL,
+                client: prompt_state_1.PromptState.sapClient
             },
             appOptions: {
                 addAnnotations: odataVersion === odata_service_inquirer_1.OdataVersion.v4,
@@ -120,6 +121,9 @@ async function getAppConfig(app, extractedProjectPath, qfaJson, fs) {
                 localVersion
             }
         };
+        if (prompt_state_1.PromptState.destinationName) {
+            appConfig.service.destination = { name: prompt_state_1.PromptState.destinationName };
+        }
         return appConfig;
     }
     catch (error) {

package/generators/app/index.js

@@ -124,10 +124,10 @@ class default_1 extends yeoman_generator_1.default {
         // Generate project files
         (0, validators_1.validateQfaJsonFile)(qfaJson);
         // Generate app config
-        const config = await (0, app_config_1.getAppConfig)(this.answers.selectedApp, this.extractedProjectPath, qfaJson, this.fs);
+        const config = await (0, app_config_1.getAppConfig)(this.answers.selectedApp, this.extractedProjectPath, qfaJson, 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)(this.answers.selectedApp, qfaJson);
+        const deployConfig = (0, app_config_1.getAbapDeployConfig)(qfaJson);
         await (0, abap_deploy_config_writer_1.generate)(this.projectPath, deployConfig, undefined, this.fs);
         if (this.vscode) {
             // Generate Fiori launch config

package/generators/app/types.d.ts

@@ -1,9 +1,8 @@
 import type Generator from 'yeoman-generator';
 import type { AppWizard } from '@sap-devx/yeoman-ui-types';
 import type { VSCodeInstance, TelemetryData, LogWrapper } from '@sap-ux/fiori-generator-shared';
-import type { Destination } from '@sap-ux/btp-utils';
-import type { BackendSystem } from '@sap-ux/store';
-import type { AbapServiceProvider, AppIndex } from '@sap-ux/axios-extension';
+import type { AppIndex } from '@sap-ux/axios-extension';
+import type { OdataServiceAnswers } from '@sap-ux/odata-service-inquirer';
 import type { YUIQuestion } from '@sap-ux/inquirer-common';
 import type { AutocompleteQuestionOptions } from 'inquirer-autocomplete-prompt';
 /**
@@ -46,27 +45,6 @@ export interface RepoAppDownloadOptions extends Generator.GeneratorOptions {
     /** Logger instance for logging operations. */
     logWrapper?: LogWrapper;
 }
-/**
- * Answers related to system selection in the application download process.
- */
-export interface SystemSelectionAnswers {
-    /**
-     * Details of the connected system allowing downstream consumers to access it without creating new connections.
-     */
-    connectedSystem?: {
-        /** Service provider for the connected ABAP system. */
-        serviceProvider: AbapServiceProvider;
-        /**
-         * Persistable backend system representation of the connected service provider.
-         * `newOrUpdated` is true if the system was newly created or updated during connection validation.
-         */
-        backendSystem?: BackendSystem & {
-            newOrUpdated?: boolean;
-        };
-        /** Destination details of the connected system. */
-        destination?: Destination;
-    };
-}
 /**
  * Represents a question in the app download process.
  * Extends `YUIQuestion` with optional autocomplete functionality.
@@ -93,7 +71,7 @@ export declare enum PromptNames {
  */
 export interface RepoAppDownloadAnswers {
     /** Selected backend system connection details. */
-    [PromptNames.systemSelection]: SystemSelectionAnswers;
+    [PromptNames.systemSelection]: OdataServiceAnswers;
     /** Information about the selected application for download. */
     [PromptNames.selectedApp]: AppInfo;
     /** Target folder where the application will be generated. */

package/generators/prompts/prompt-helpers.d.ts

@@ -1,5 +1,6 @@
-import type { AbapServiceProvider, AppIndex } from '@sap-ux/axios-extension';
+import type { AppIndex } from '@sap-ux/axios-extension';
 import type { AppInfo, AppItem } from '../app/types';
+import { type ConnectedSystem } from '@sap-ux/odata-service-inquirer';
 /**
  * Returns the details for the YUI prompt.
  *
@@ -32,9 +33,9 @@ export declare const formatAppChoices: (appList: AppIndex) => Array<{
 /**
  * Fetches the application list for the selected system.
  *
- * @param {AbapServiceProvider} serviceProvider - The ABAP service provider.
+ * @param {ConnectedSystem} connectedSystem - The ABAP service provider.
  * @param {string} appId - Application ID to be downloaded.
  * @returns {Promise<AppIndex>} A list of applications filtered by source template.
  */
-export declare function fetchAppListForSelectedSystem(serviceProvider: AbapServiceProvider, appId?: string): Promise<AppIndex>;
+export declare function fetchAppListForSelectedSystem(connectedSystem: ConnectedSystem, appId?: string): Promise<AppIndex>;
 //# sourceMappingURL=prompt-helpers.d.ts.map

package/generators/prompts/prompt-helpers.js

@@ -96,16 +96,16 @@ async function getAppList(provider, appId) {
 /**
  * Fetches the application list for the selected system.
  *
- * @param {AbapServiceProvider} serviceProvider - The ABAP service provider.
+ * @param {ConnectedSystem} connectedSystem - The ABAP service provider.
  * @param {string} appId - Application ID to be downloaded.
  * @returns {Promise<AppIndex>} A list of applications filtered by source template.
  */
-async function fetchAppListForSelectedSystem(serviceProvider, appId) {
-    if (serviceProvider) {
+async function fetchAppListForSelectedSystem(connectedSystem, appId) {
+    if (connectedSystem?.serviceProvider) {
         prompt_state_1.PromptState.systemSelection = {
-            connectedSystem: { serviceProvider }
+            connectedSystem: connectedSystem
         };
-        return await getAppList(serviceProvider, appId);
+        return await getAppList(connectedSystem.serviceProvider, appId);
     }
     return [];
 }

package/generators/prompts/prompt-state.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import type { SystemSelectionAnswers } from '../app/types';
 import AdmZip from 'adm-zip';
+import { type OdataServiceAnswers } from '@sap-ux/odata-service-inquirer';
 /**
  * Much of the values returned by the app downloader prompting are derived from prompt answers and are not direct answer values.
  * Since inquirer does not provide a way to return values that are not direct answers from prompts, this class will maintain the derived values
@@ -15,13 +15,13 @@ export declare class PromptState {
      *
      * @returns {SystemSelectionAnswers} service config
      */
-    static get systemSelection(): SystemSelectionAnswers;
+    static get systemSelection(): OdataServiceAnswers;
     /**
      * Set the state of the system selection.
      *
-     * @param {SystemSelectionAnswers} value - system selection value
+     * @param {OdataServiceAnswers} value - system selection value
      */
-    static set systemSelection(value: Partial<SystemSelectionAnswers>);
+    static set systemSelection(value: Partial<OdataServiceAnswers>);
     /**
      * Set the downloaded app package.
      */
@@ -44,6 +44,12 @@ export declare class PromptState {
      * @returns {string | undefined} sap-client
      */
     static get sapClient(): string | undefined;
+    /**
+     * Get the destination parameter from the connected system's service provider defaults.
+     *
+     * @returns {string | undefined} sap-client
+     */
+    static get destinationName(): string | undefined;
     static reset(): void;
 }
 //# sourceMappingURL=prompt-state.d.ts.map

package/generators/prompts/prompt-state.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PromptState = void 0;
 const adm_zip_1 = __importDefault(require("adm-zip"));
+const odata_service_inquirer_1 = require("@sap-ux/odata-service-inquirer");
 /**
  * Much of the values returned by the app downloader prompting are derived from prompt answers and are not direct answer values.
  * Since inquirer does not provide a way to return values that are not direct answers from prompts, this class will maintain the derived values
@@ -12,7 +13,7 @@ const adm_zip_1 = __importDefault(require("adm-zip"));
  *
  */
 class PromptState {
-    static _systemSelection = {};
+    static _systemSelection = { datasourceType: odata_service_inquirer_1.DatasourceType.sapSystem };
     static _admZipInstance;
     /**
      * Returns the current state of the service config.
@@ -25,10 +26,10 @@ class PromptState {
     /**
      * Set the state of the system selection.
      *
-     * @param {SystemSelectionAnswers} value - system selection value
+     * @param {OdataServiceAnswers} value - system selection value
      */
     static set systemSelection(value) {
-        this._systemSelection = value;
+        this._systemSelection = value; // NOSONAR
     }
     /**
      * Set the downloaded app package.
@@ -50,7 +51,8 @@ class PromptState {
      * @returns {string | undefined} baseURL
      */
     static get baseURL() {
-        return this._systemSelection.connectedSystem?.serviceProvider?.defaults?.baseURL;
+        return (this._systemSelection.connectedSystem?.backendSystem?.url ??
+            this._systemSelection.connectedSystem?.destination?.Host);
     }
     /**
      * Get the sap-client parameter from the connected system's service provider defaults.
@@ -58,7 +60,16 @@ class PromptState {
      * @returns {string | undefined} sap-client
      */
     static get sapClient() {
-        return this._systemSelection.connectedSystem?.serviceProvider?.defaults?.params?.['sap-client'];
+        return (this._systemSelection.connectedSystem?.backendSystem?.client ??
+            this._systemSelection.connectedSystem?.destination?.['sap-client']);
+    }
+    /**
+     * Get the destination parameter from the connected system's service provider defaults.
+     *
+     * @returns {string | undefined} sap-client
+     */
+    static get destinationName() {
+        return this._systemSelection.connectedSystem?.destination?.Name;
     }
     static reset() {
         PromptState.systemSelection = {};

package/generators/prompts/prompts.js

@@ -47,8 +47,9 @@ const getTargetFolderPrompt = (appRootPath, appId) => {
         default: () => appRootPath
     };
 };
-const getCliValidatePrompts = async (appList, quickDeployedAppConfig, appWizard) => {
+const getCliValidatePrompts = (appList, quickDeployedAppConfig, appWizard) => {
     return {
+        type: 'input',
         when: async (answers) => {
             if (answers?.[types_1.PromptNames.selectedApp]) {
                 try {
@@ -90,7 +91,7 @@ async function getPrompts(appRootPath, quickDeployedAppConfig, appWizard, isCli
                 when: async (answers) => {
                     if (answers[types_1.PromptNames.systemSelection] &&
                         systemQuestions.answers.connectedSystem?.serviceProvider) {
-                        appList = await (0, prompt_helpers_1.fetchAppListForSelectedSystem)(systemQuestions.answers.connectedSystem?.serviceProvider, quickDeployedAppConfig?.appId);
+                        appList = await (0, prompt_helpers_1.fetchAppListForSelectedSystem)(systemQuestions.answers.connectedSystem, quickDeployedAppConfig?.appId);
                     }
                     return !!systemQuestions.answers.connectedSystem?.serviceProvider;
                 },

package/generators/utils/constants.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.appListResultFields = exports.appListSearchParams = exports.extractedFilePath = exports.defaultAnswers = exports.qfaJsonFileName = exports.fioriAppSourcetemplateId = exports.adtSourceTemplateId = exports.generatorName = exports.generatorDescription = exports.generatorTitle = void 0;
+const odata_service_inquirer_1 = require("@sap-ux/odata-service-inquirer");
 const types_1 = require("../app/types");
 // Title and description for the generator
 exports.generatorTitle = 'Download ADT deployed app from UI5 ABAP repository';
@@ -15,7 +16,7 @@ exports.fioriAppSourcetemplateId = '@sap/generator-fiori:lrop';
 exports.qfaJsonFileName = 'qfa.json';
 // Default initial answers to use as a fallback.
 exports.defaultAnswers = {
-    [types_1.PromptNames.systemSelection]: {},
+    [types_1.PromptNames.systemSelection]: { datasourceType: odata_service_inquirer_1.DatasourceType.sapSystem },
     [types_1.PromptNames.selectedApp]: {
         appId: '',
         title: '',

package/generators/utils/validators.js

@@ -119,7 +119,7 @@ async function validateAppSelection(answers, appList, quickDeployedAppConfig, ap
         return await generateAppNotFoundHelpLink();
     }
     // No apps available at all
-    if (appList.length === 0) {
+    if (appList.length === 0 && !answers?.appId) {
         return await generateAppNotFoundHelpLink();
     }
     // Valid app selected, try to download

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.17",
+  "version": "0.3.18",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,18 +29,18 @@
     "@sap-ux/inquirer-common": "0.7.5",
     "@sap-ux/project-access": "1.30.2",
     "@sap-ux/odata-service-inquirer": "2.4.11",
-    "@sap-ux/fiori-elements-writer": "2.4.10",
     "@sap-ux/logger": "0.7.0",
+    "@sap-ux/fiori-elements-writer": "2.4.10",
     "@sap-ux/project-input-validator": "0.6.2",
     "@sap-ux/launch-config": "0.10.2",
     "@sap-ux/fiori-tools-settings": "0.2.0",
-    "@sap-ux/abap-deploy-config-writer": "0.1.4",
     "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/ui5-info": "0.11.0",
-    "@sap-ux/axios-extension": "1.21.2",
+    "@sap-ux/abap-deploy-config-writer": "0.1.4",
     "@sap-ux/store": "1.1.0",
-    "@sap-ux/system-access": "0.6.2",
-    "@sap-ux/guided-answers-helper": "0.3.0"
+    "@sap-ux/axios-extension": "1.21.2",
+    "@sap-ux/guided-answers-helper": "0.3.0",
+    "@sap-ux/system-access": "0.6.2"
   },
   "devDependencies": {
     "@jest/types": "29.6.3",