@sap-ux/adp-tooling 0.18.115 → 0.18.117

package/dist/btp/api.d.ts

@@ -1,5 +1,6 @@
 import type { ToolsLogger } from '@sap-ux/logger';
-import type { Uaa, BtpDestinationConfig } from '../types';
+import type { Destinations } from '@sap-ux/btp-utils';
+import type { Uaa, BtpDestinationConfig, CfDestinationServiceCredentials } from '../types';
 /**
  * Obtain an OAuth2 access token using the client credentials grant.
  *
@@ -19,4 +20,11 @@ export declare function getToken(uaa: Uaa, logger?: ToolsLogger): Promise<string
  * @returns The destinationConfiguration object (e.g. Name, ProxyType, URL, Authentication) or undefined on failure.
  */
 export declare function getBtpDestinationConfig(uri: string, token: string, destinationName: string, logger?: ToolsLogger): Promise<BtpDestinationConfig | undefined>;
+/**
+ * Lists all subaccount destinations from the BTP Destination Configuration API.
+ *
+ * @param {CfDestinationServiceCredentials} credentials - Destination service credentials.
+ * @returns {Promise<Destinations>} Map of destination name to Destination object.
+ */
+export declare function listBtpDestinations(credentials: CfDestinationServiceCredentials): Promise<Destinations>;
 //# sourceMappingURL=api.d.ts.map

package/dist/btp/api.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getToken = getToken;
 exports.getBtpDestinationConfig = getBtpDestinationConfig;
+exports.listBtpDestinations = listBtpDestinations;
 const axios_1 = __importDefault(require("axios"));
 const i18n_1 = require("../i18n");
 /**
@@ -30,8 +31,8 @@ async function getToken(uaa, logger) {
         return response.data['access_token'];
     }
     catch (e) {
-        logger?.error(`Failed to obtain OAuth token from ${uri}: ${e.message}`);
-        throw new Error((0, i18n_1.t)('error.failedToGetAuthKey', { error: e.message }));
+        logger?.error(`Failed to obtain OAuth token from ${uri}: ${e instanceof Error ? e.message : String(e)}`);
+        throw new Error((0, i18n_1.t)('error.failedToGetAuthKey', { error: e instanceof Error ? e.message : String(e) }));
     }
 }
 /**
@@ -56,8 +57,41 @@ async function getBtpDestinationConfig(uri, token, destinationName, logger) {
         return config;
     }
     catch (e) {
-        logger?.error(`Failed to fetch destination config for "${destinationName}": ${e.message}`);
+        logger?.error(`Failed to fetch destination config for "${destinationName}": ${e instanceof Error ? e.message : String(e)}`);
         return undefined;
     }
 }
+/**
+ * Lists all subaccount destinations from the BTP Destination Configuration API.
+ *
+ * @param {CfDestinationServiceCredentials} credentials - Destination service credentials.
+ * @returns {Promise<Destinations>} Map of destination name to Destination object.
+ */
+async function listBtpDestinations(credentials) {
+    const uaa = 'uaa' in credentials
+        ? credentials.uaa
+        : { clientid: credentials.clientid, clientsecret: credentials.clientsecret, url: credentials.url };
+    const token = await getToken(uaa);
+    const url = `${credentials.uri}/destination-configuration/v1/subaccountDestinations`;
+    try {
+        const response = await axios_1.default.get(url, {
+            headers: { Authorization: `Bearer ${token}` }
+        });
+        const configs = Array.isArray(response.data) ? response.data : [];
+        return configs.reduce((acc, config) => {
+            acc[config.Name] = {
+                Name: config.Name,
+                Host: config.URL,
+                Type: config.Type,
+                Authentication: config.Authentication,
+                ProxyType: config.ProxyType,
+                Description: config.Description ?? ''
+            };
+            return acc;
+        }, {});
+    }
+    catch (e) {
+        throw new Error((0, i18n_1.t)('error.failedToListBtpDestinations', { error: e instanceof Error ? e.message : String(e) }));
+    }
+}
 //# sourceMappingURL=api.js.map

package/dist/cf/project/yaml.d.ts

@@ -18,6 +18,17 @@ interface AdjustMtaYamlParams {
  * @returns {boolean} True if the selected path is a MTA project, false otherwise.
  */
 export declare function isMtaProject(selectedPath: string): boolean;
+/**
+ * Adds a connectivity service resource to the project's mta.yaml if not already present,
+ * creates the CF service instance and generates a service key for it.
+ * Only applies to MTA projects. Required when the selected CF destination is OnPremise
+ * so the AppRouter can proxy requests through the Cloud Connector.
+ *
+ * @param {string} projectPath - The root path of the project.
+ * @param {Editor} memFs - The mem-fs editor instance.
+ * @param {ToolsLogger} [logger] - Optional logger.
+ */
+export declare function addConnectivityServiceToMta(projectPath: string, memFs: Editor, logger?: ToolsLogger): Promise<void>;
 /**
  * Gets the SAP Cloud Service.
  *

package/dist/cf/project/yaml.js

@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isMtaProject = isMtaProject;
+exports.addConnectivityServiceToMta = addConnectivityServiceToMta;
 exports.getSAPCloudService = getSAPCloudService;
 exports.getRouterType = getRouterType;
 exports.getAppParamsFromUI5Yaml = getAppParamsFromUI5Yaml;
@@ -60,6 +61,44 @@ const SAP_APPLICATION_CONTENT = 'com.sap.application.content';
 function isMtaProject(selectedPath) {
     return node_fs_1.default.existsSync(path.join(selectedPath, 'mta.yaml'));
 }
+/**
+ * Adds a connectivity service resource to the project's mta.yaml if not already present,
+ * creates the CF service instance and generates a service key for it.
+ * Only applies to MTA projects. Required when the selected CF destination is OnPremise
+ * so the AppRouter can proxy requests through the Cloud Connector.
+ *
+ * @param {string} projectPath - The root path of the project.
+ * @param {Editor} memFs - The mem-fs editor instance.
+ * @param {ToolsLogger} [logger] - Optional logger.
+ */
+async function addConnectivityServiceToMta(projectPath, memFs, logger) {
+    if (!isMtaProject(projectPath)) {
+        return;
+    }
+    const mtaYamlPath = path.join(projectPath, 'mta.yaml');
+    const yamlContent = (0, yaml_loader_1.getYamlContent)(mtaYamlPath);
+    if (!yamlContent) {
+        return;
+    }
+    const projectName = yamlContent.ID.toLowerCase();
+    const connectivityResourceName = `${projectName}-connectivity`;
+    if (yamlContent.resources?.some((r) => r.name === connectivityResourceName)) {
+        return;
+    }
+    await (0, api_1.createServiceInstance)('lite', connectivityResourceName, 'connectivity', { logger });
+    await (0, api_1.getOrCreateServiceInstanceKeys)({ names: [connectivityResourceName] }, logger);
+    yamlContent.resources = yamlContent.resources ?? [];
+    yamlContent.resources.push({
+        name: connectivityResourceName,
+        type: CF_MANAGED_SERVICE,
+        parameters: {
+            service: 'connectivity',
+            'service-plan': 'lite',
+            'service-name': connectivityResourceName
+        }
+    });
+    memFs.write(mtaYamlPath, js_yaml_1.default.dump(yamlContent, { lineWidth: -1 }));
+}
 /**
  * Gets the SAP Cloud Service.
  *

package/dist/cf/services/destinations.d.ts

@@ -0,0 +1,11 @@
+import type { Destinations } from '@sap-ux/btp-utils';
+/**
+ * Returns the list of available BTP destinations from the logged-in CF subaccount.
+ * Reads the destination service credentials from the CF project's service keys
+ * and calls the BTP Destination Configuration API directly.
+ *
+ * @param {string} projectPath - The root path of the CF app project.
+ * @returns {Promise<Destinations>} Map of destination name to Destination object.
+ */
+export declare function getBtpDestinations(projectPath: string): Promise<Destinations>;
+//# sourceMappingURL=destinations.d.ts.map

package/dist/cf/services/destinations.js

@@ -0,0 +1,79 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBtpDestinations = getBtpDestinations;
+const path = __importStar(require("node:path"));
+const api_1 = require("./api");
+const api_2 = require("../../btp/api");
+const yaml_loader_1 = require("../project/yaml-loader");
+const i18n_1 = require("../../i18n");
+/**
+ * Finds the name of the destination service instance declared in the MTA project's mta.yaml.
+ *
+ * @param {string} projectPath - The root path of the app project.
+ * @returns {string} The CF service instance name.
+ * @throws {Error} When the destination service instance is not found or mta.yaml cannot be read.
+ */
+function getDestinationServiceName(projectPath) {
+    try {
+        const yamlContent = (0, yaml_loader_1.getYamlContent)(path.join(path.dirname(projectPath), 'mta.yaml'));
+        const name = yamlContent?.resources?.find((r) => r.parameters?.service === 'destination')?.name;
+        if (!name) {
+            throw new Error((0, i18n_1.t)('error.destinationServiceNotFoundInMtaYaml'));
+        }
+        return name;
+    }
+    catch (e) {
+        throw e instanceof Error ? e : new Error((0, i18n_1.t)('error.destinationServiceNotFoundInMtaYaml'));
+    }
+}
+/**
+ * Returns the list of available BTP destinations from the logged-in CF subaccount.
+ * Reads the destination service credentials from the CF project's service keys
+ * and calls the BTP Destination Configuration API directly.
+ *
+ * @param {string} projectPath - The root path of the CF app project.
+ * @returns {Promise<Destinations>} Map of destination name to Destination object.
+ */
+async function getBtpDestinations(projectPath) {
+    const destinationServiceName = getDestinationServiceName(projectPath);
+    const serviceInfo = await (0, api_1.getOrCreateServiceInstanceKeys)({ names: [destinationServiceName] });
+    if (!serviceInfo?.serviceKeys?.length) {
+        throw new Error((0, i18n_1.t)('error.noServiceKeysFoundForDestination', { serviceInstanceName: destinationServiceName }));
+    }
+    const credentials = serviceInfo.serviceKeys[0].credentials;
+    return (0, api_2.listBtpDestinations)(credentials);
+}
+//# sourceMappingURL=destinations.js.map

package/dist/cf/services/index.d.ts

@@ -1,5 +1,6 @@
 export * from './api';
 export * from './ssh';
 export * from './cli';
+export * from './destinations';
 export * from './manifest';
 //# sourceMappingURL=index.d.ts.map

package/dist/cf/services/index.js

@@ -17,5 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./api"), exports);
 __exportStar(require("./ssh"), exports);
 __exportStar(require("./cli"), exports);
+__exportStar(require("./destinations"), exports);
 __exportStar(require("./manifest"), exports);
 //# sourceMappingURL=index.js.map

package/dist/prompts/add-new-model/index.d.ts

@@ -1,12 +1,32 @@
 import type { YUIQuestion } from '@sap-ux/inquirer-common';
 import type { UI5FlexLayer } from '@sap-ux/project-access';
-import { type NewModelAnswers } from '../../types';
+import type { ToolsLogger } from '@sap-ux/logger';
+import { ServiceType, type DescriptorVariant, type NewModelAnswers, type NewModelData } from '../../types';
+/**
+ * Returns the OData version string for use in change content based on the selected service type.
+ * Returns undefined for HTTP service type as it has no OData version.
+ *
+ * @param {ServiceType} serviceType - The selected service type.
+ * @returns {string | undefined} The OData version string ('2.0' or '4.0'), or undefined for HTTP.
+ */
+export declare function getODataVersionFromServiceType(serviceType: ServiceType): string | undefined;
 /**
  * Gets the prompts for adding the new model.
  *
  * @param {string} projectPath - The root path of the project.
  * @param {UI5FlexLayer} layer - UI5 Flex layer.
+ * @param {ToolsLogger} [logger] - Optional logger.
  * @returns {YUIQuestion<NewModelAnswers>[]} The questions/prompts.
  */
-export declare function getPrompts(projectPath: string, layer: UI5FlexLayer): Promise<YUIQuestion<NewModelAnswers>[]>;
+export declare function getPrompts(projectPath: string, layer: UI5FlexLayer, logger?: ToolsLogger): Promise<YUIQuestion<NewModelAnswers>[]>;
+/**
+ * Builds the NewModelData object from the prompts answers.
+ *
+ * @param {string} projectPath - The root path of the project.
+ * @param {DescriptorVariant} variant - The descriptor variant of the adaptation project.
+ * @param {NewModelAnswers} answers - The answers to the prompts.
+ * @param {ToolsLogger} [logger] - Optional logger instance.
+ * @returns {Promise<NewModelData>} The data required by NewModelWriter.
+ */
+export declare function createNewModelData(projectPath: string, variant: DescriptorVariant, answers: NewModelAnswers, logger?: ToolsLogger): Promise<NewModelData>;
 //# sourceMappingURL=index.d.ts.map

package/dist/prompts/add-new-model/index.js

@@ -1,13 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getODataVersionFromServiceType = getODataVersionFromServiceType;
 exports.getPrompts = getPrompts;
+exports.createNewModelData = createNewModelData;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const btp_utils_1 = require("@sap-ux/btp-utils");
+const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 const i18n_1 = require("../../i18n");
 const change_utils_1 = require("../../base/change-utils");
+const destinations_1 = require("../../cf/services/destinations");
+const types_1 = require("../../types");
 const cf_1 = require("../../base/cf");
+const helper_1 = require("../../base/helper");
 const project_input_validator_1 = require("@sap-ux/project-input-validator");
-const oDataVersions = [
-    { name: '2.0', value: '2.0' },
-    { name: '4.0', value: '4.0' }
+/**
+ * Reads the routes array from the xs-app.json file in the project's webapp folder.
+ * Returns an empty array if the file does not exist or cannot be parsed.
+ *
+ * @param {string} projectPath - The root path of the project.
+ * @returns {XsAppRoute[]} The existing routes.
+ */
+function readXsAppRoutes(projectPath) {
+    try {
+        const xsAppPath = (0, node_path_1.join)(projectPath, 'webapp', 'xs-app.json');
+        const content = JSON.parse((0, node_fs_1.readFileSync)(xsAppPath, 'utf-8'));
+        return Array.isArray(content?.routes) ? content.routes : [];
+    }
+    catch {
+        return [];
+    }
+}
+const serviceTypeChoices = [
+    { name: types_1.ServiceType.ODATA_V2, value: types_1.ServiceType.ODATA_V2 },
+    { name: types_1.ServiceType.ODATA_V4, value: types_1.ServiceType.ODATA_V4 },
+    { name: types_1.ServiceType.HTTP, value: types_1.ServiceType.HTTP }
 ];
 /**
  * Exucute generic validation for input.
@@ -23,6 +50,9 @@ function validatePromptInput(value) {
             return validationResult;
         }
     }
+    if (!/[a-zA-Z0-9]$/.test(value)) {
+        return (0, i18n_1.t)('validators.errorInputMustEndWithAlphanumeric');
+    }
     return true;
 }
 /**
@@ -64,18 +94,17 @@ function validatePromptJSON(value) {
  * Validates the OData Service name prompt.
  *
  * @param value The value to validate.
- * @param answers The answers object.
  * @param isCustomerBase Whether the validation is for customer usage.
  * @param changeFiles The list of existing change files to check against.
  * @returns {boolean | string} True if no duplication is found, or an error message if validation fails.
  */
-function validatePromptODataName(value, answers, isCustomerBase, changeFiles) {
+function validatePromptODataName(value, isCustomerBase, changeFiles) {
     let validationResult = validatePromptInput(value);
     if (typeof validationResult === 'string') {
         return validationResult;
     }
     if (isCustomerBase) {
-        validationResult = validateCustomerValue(value, 'prompts.oDataServiceNameLabel');
+        validationResult = validateCustomerValue(value, 'prompts.modelAndDatasourceNameLabel');
         if (typeof validationResult === 'string') {
             return validationResult;
         }
@@ -83,149 +112,198 @@ function validatePromptODataName(value, answers, isCustomerBase, changeFiles) {
     if ((0, project_input_validator_1.hasContentDuplication)(value, 'dataSource', changeFiles)) {
         return (0, i18n_1.t)('validators.errorDuplicatedValueOData');
     }
-    if (answers.addAnnotationMode && value === answers.dataSourceName) {
-        return (0, i18n_1.t)('validators.errorDuplicateNamesOData');
-    }
     return true;
 }
 /**
- * Validates the OData Annotation name prompt.
+ * Validates the OData Source URI prompt.
  *
  * @param value The value to validate.
- * @param answers The answers object.
- * @param isCustomerBase Whether the validation is for customer usage.
- * @param changeFiles The list of existing change files to check against.
- * @returns {boolean | string} True if no duplication is found, or an error message if validation fails.
+ * @returns {boolean | string} True if the URI is valid, or an error message if validation fails.
  */
-function validatePromptODataAnnotationsName(value, answers, isCustomerBase, changeFiles) {
-    let validationResult = validatePromptInput(value);
+function validatePromptURI(value) {
+    const validationResult = (0, project_input_validator_1.validateEmptyString)(value);
     if (typeof validationResult === 'string') {
         return validationResult;
     }
-    if (isCustomerBase) {
-        validationResult = validateCustomerValue(value, 'prompts.oDataAnnotationDataSourceNameLabel');
-        if (typeof validationResult === 'string') {
-            return validationResult;
-        }
-    }
-    if ((0, project_input_validator_1.hasContentDuplication)(value, 'dataSource', changeFiles)) {
-        return (0, i18n_1.t)('validators.errorDuplicatedValueOData');
-    }
-    if (value === answers.name) {
-        return (0, i18n_1.t)('validators.errorDuplicateNamesOData');
+    if (!(0, project_input_validator_1.isDataSourceURI)(value)) {
+        return (0, i18n_1.t)('validators.errorInvalidDataSourceURI');
     }
     return true;
 }
 /**
- * Validates the model name prompts.
+ * Builds the full resulting service URL from a destination URL and a service URI.
+ * Returns undefined if either value is absent or the URI fails basic validation.
  *
- * @param value The value to validate.
- * @param isCustomerBase Whether the validation is for customer usage.
- * @param changeFiles The list of existing change files to check against.
- * @returns {boolean | string} True if no duplication is found, or an error message if validation fails.
+ * @param {string | undefined} destinationUrl - The destination base URL.
+ * @param {string | undefined} serviceUri - The relative service URI from the prompt.
+ * @returns {string | undefined} The concatenated URL, or undefined if it cannot be formed.
  */
-function validatePromptModelName(value, isCustomerBase, changeFiles) {
-    let validationResult = validatePromptInput(value);
-    if (typeof validationResult === 'string') {
-        return validationResult;
+function buildResultingServiceUrl(destinationUrl, serviceUri) {
+    if (!destinationUrl || !serviceUri || validatePromptURI(serviceUri) !== true) {
+        return undefined;
     }
-    if (isCustomerBase) {
-        validationResult = validateCustomerValue(value, 'prompts.oDataServiceModelNameLabel');
-        if (typeof validationResult === 'string') {
-            return validationResult;
+    return destinationUrl.replace(/\/$/, '') + serviceUri;
+}
+/**
+ * Returns the OData version string for use in change content based on the selected service type.
+ * Returns undefined for HTTP service type as it has no OData version.
+ *
+ * @param {ServiceType} serviceType - The selected service type.
+ * @returns {string | undefined} The OData version string ('2.0' or '4.0'), or undefined for HTTP.
+ */
+function getODataVersionFromServiceType(serviceType) {
+    if (serviceType === types_1.ServiceType.ODATA_V2) {
+        return '2.0';
+    }
+    if (serviceType === types_1.ServiceType.ODATA_V4) {
+        return '4.0';
+    }
+    return undefined;
+}
+/**
+ * Resolves the backend base URL for ABAP (non-CF) projects.
+ * For VS Code projects the URL is read directly from the `target.url` field in ui5.yaml.
+ * For BAS projects the destination name is read from `target.destination` and the URL
+ * is resolved via the BAS destination service.
+ *
+ * @param {string} projectPath - The root path of the project.
+ * @returns {Promise<string | undefined>} The resolved base URL, or undefined if it cannot be determined.
+ */
+async function getAbapServiceUrl(projectPath) {
+    try {
+        const { target } = (await (0, helper_1.getAdpConfig)(projectPath, 'ui5.yaml'));
+        if (!target) {
+            return undefined;
+        }
+        if (target.url) {
+            return target.url;
+        }
+        if (target.destination) {
+            const destinations = await (0, btp_utils_1.listDestinations)();
+            return destinations[target.destination]?.Host;
         }
     }
-    if ((0, project_input_validator_1.hasContentDuplication)(value, 'model', changeFiles)) {
-        return (0, i18n_1.t)('validators.errorDuplicatedValueSapui5Model');
+    catch {
+        // Message will not be shown
     }
-    return true;
+    return undefined;
 }
 /**
- * Validates the OData Source URI prompt.
+ * Fetches destination choices for CF environments.
+ * Returns the choices and a generic UI error message if the fetch fails, logging the original error.
  *
- * @param value The value to validate.
- * @returns {boolean | string} True if the URI is valid, or an error message if validation fails.
+ * @param {string} projectPath - The root path of the project.
+ * @param {ToolsLogger} [logger] - Optional logger for error details.
+ * @returns {Promise<{ choices: { name: string; value: Destination }[]; error?: string }>} The destination choices and an optional error message.
  */
-function validatePromptURI(value) {
-    const validationResult = (0, project_input_validator_1.validateEmptyString)(value);
-    if (typeof validationResult === 'string') {
-        return validationResult;
+async function getDestinationChoices(projectPath, logger) {
+    try {
+        const destinations = await (0, destinations_1.getBtpDestinations)(projectPath);
+        const choices = Object.entries(destinations).map(([name, dest]) => ({
+            name,
+            value: dest
+        }));
+        return { choices };
     }
-    if (!(0, project_input_validator_1.isDataSourceURI)(value)) {
-        return (0, i18n_1.t)('validators.errorInvalidDataSourceURI');
+    catch (e) {
+        logger?.error(e.message);
+        return { choices: [], error: (0, i18n_1.t)('error.errorFetchingDestinations') };
     }
-    return true;
 }
 /**
  * Gets the prompts for adding the new model.
  *
  * @param {string} projectPath - The root path of the project.
  * @param {UI5FlexLayer} layer - UI5 Flex layer.
+ * @param {ToolsLogger} [logger] - Optional logger.
  * @returns {YUIQuestion<NewModelAnswers>[]} The questions/prompts.
  */
-async function getPrompts(projectPath, layer) {
+async function getPrompts(projectPath, layer, logger) {
     const isCustomerBase = "CUSTOMER_BASE" /* FlexLayer.CUSTOMER_BASE */ === layer;
     const defaultSeviceName = isCustomerBase ? "customer." /* NamespacePrefix.CUSTOMER */ : "" /* NamespacePrefix.EMPTY */;
     const isCFEnv = await (0, cf_1.isCFEnvironment)(projectPath);
-    const changeFiles = (0, change_utils_1.getChangesByType)(projectPath, "appdescr_ui5_addNewModel" /* ChangeType.ADD_NEW_MODEL */, 'manifest');
+    const abapServiceUrl = isCFEnv ? undefined : await getAbapServiceUrl(projectPath);
+    const changeFiles = [
+        ...(0, change_utils_1.getChangesByType)(projectPath, "appdescr_ui5_addNewModel" /* ChangeType.ADD_NEW_MODEL */),
+        ...(0, change_utils_1.getChangesByType)(projectPath, "appdescr_app_addNewDataSource" /* ChangeType.ADD_NEW_DATA_SOURCE */)
+    ];
+    let destinationError;
+    let destinationChoices;
+    if (isCFEnv) {
+        ({ choices: destinationChoices, error: destinationError } = await getDestinationChoices(projectPath, logger));
+    }
+    const buildResultingUrlMessage = (i18nKey, uri, previousAnswers) => {
+        const destinationUrl = isCFEnv ? previousAnswers?.destination?.Host : abapServiceUrl;
+        const resultingUrl = buildResultingServiceUrl(destinationUrl, uri);
+        if (!resultingUrl) {
+            return undefined;
+        }
+        return {
+            message: (0, i18n_1.t)(i18nKey, { url: resultingUrl, interpolation: { escapeValue: false } }),
+            severity: yeoman_ui_types_1.Severity.information
+        };
+    };
     return [
         {
-            type: 'input',
-            name: 'name',
-            message: (0, i18n_1.t)('prompts.oDataServiceNameLabel'),
-            default: defaultSeviceName,
+            type: 'list',
+            name: 'serviceType',
+            message: (0, i18n_1.t)('prompts.serviceTypeLabel'),
+            choices: isCFEnv ? serviceTypeChoices : serviceTypeChoices.filter((c) => c.value !== types_1.ServiceType.HTTP),
             store: false,
-            validate: (value, answers) => {
-                return validatePromptODataName(value, answers, isCustomerBase, changeFiles);
-            },
+            validate: project_input_validator_1.validateEmptyString,
             guiOptions: {
                 mandatory: true,
-                hint: (0, i18n_1.t)('prompts.oDataServiceNameTooltip')
+                hint: (0, i18n_1.t)('prompts.serviceTypeTooltip')
             }
         },
+        {
+            type: 'list',
+            name: 'destination',
+            message: (0, i18n_1.t)('prompts.destinationLabel'),
+            choices: () => destinationChoices ?? [],
+            when: () => isCFEnv,
+            guiOptions: {
+                mandatory: true,
+                hint: (0, i18n_1.t)('prompts.destinationTooltip')
+            },
+            validate: (value) => destinationError ?? (0, project_input_validator_1.validateEmptyString)(value?.Name)
+        },
         {
             type: 'input',
             name: 'uri',
-            message: (0, i18n_1.t)('prompts.oDataServiceUriLabel'),
+            message: (0, i18n_1.t)('prompts.serviceUriLabel'),
             guiOptions: {
                 mandatory: true,
                 hint: (0, i18n_1.t)('prompts.oDataServiceUriTooltip')
             },
-            validate: validatePromptURI,
-            store: false
-        },
-        {
-            type: 'list',
-            name: 'version',
-            message: (0, i18n_1.t)('prompts.oDataServiceVersionLabel'),
-            choices: oDataVersions,
-            default: (answers) => {
-                if (answers.uri?.startsWith(isCFEnv ? '/odata/v4/' : '/sap/opu/odata4/')) {
-                    return oDataVersions[1].value;
+            validate: (value) => {
+                const uriResult = validatePromptURI(value);
+                if (typeof uriResult === 'string') {
+                    return uriResult;
                 }
-                return oDataVersions[0].value;
+                if (isCFEnv && readXsAppRoutes(projectPath).some((r) => r.target === `${value}$1`)) {
+                    return (0, i18n_1.t)('validators.errorRouteAlreadyExists');
+                }
+                return true;
             },
             store: false,
-            validate: project_input_validator_1.validateEmptyString,
-            guiOptions: {
-                mandatory: true,
-                hint: (0, i18n_1.t)('prompts.oDataServiceVersionTooltip'),
-                applyDefaultWhenDirty: true
-            }
+            additionalMessages: (uri, previousAnswers) => buildResultingUrlMessage('prompts.resultingServiceUrl', uri, previousAnswers)
         },
         {
             type: 'input',
-            name: 'modelName',
-            message: (0, i18n_1.t)('prompts.oDataServiceModelNameLabel'),
-            guiOptions: {
-                mandatory: true,
-                hint: (0, i18n_1.t)('prompts.oDataServiceModelNameTooltip')
-            },
+            name: 'modelAndDatasourceName',
+            message: (answers) => answers.serviceType === types_1.ServiceType.HTTP
+                ? (0, i18n_1.t)('prompts.datasourceNameLabel')
+                : (0, i18n_1.t)('prompts.modelAndDatasourceNameLabel'),
             default: defaultSeviceName,
+            store: false,
             validate: (value) => {
-                return validatePromptModelName(value, isCustomerBase, changeFiles);
+                return validatePromptODataName(value, isCustomerBase, changeFiles);
             },
-            store: false
+            guiOptions: {
+                mandatory: true,
+                hint: (0, i18n_1.t)('prompts.modelAndDatasourceNameTooltip')
+            }
         },
         {
             type: 'editor',
@@ -233,6 +311,7 @@ async function getPrompts(projectPath, layer) {
             message: (0, i18n_1.t)('prompts.oDataServiceModelSettingsLabel'),
             store: false,
             validate: validatePromptJSON,
+            when: (answers) => answers.serviceType !== types_1.ServiceType.HTTP,
             guiOptions: {
                 hint: (0, i18n_1.t)('prompts.oDataServiceModelSettingsTooltip')
             }
@@ -241,22 +320,8 @@ async function getPrompts(projectPath, layer) {
             type: 'confirm',
             name: 'addAnnotationMode',
             message: 'Do you want to add annotation?',
-            default: false
-        },
-        {
-            type: 'input',
-            name: 'dataSourceName',
-            message: (0, i18n_1.t)('prompts.oDataAnnotationDataSourceNameLabel'),
-            validate: (value, answers) => {
-                return validatePromptODataAnnotationsName(value, answers, isCustomerBase, changeFiles);
-            },
-            default: defaultSeviceName,
-            store: false,
-            guiOptions: {
-                mandatory: true,
-                hint: (0, i18n_1.t)('prompts.oDataAnnotationDataSourceNameTooltip')
-            },
-            when: (answers) => answers.addAnnotationMode
+            default: false,
+            when: (answers) => answers.serviceType !== types_1.ServiceType.HTTP
         },
         {
             type: 'input',
@@ -268,7 +333,8 @@ async function getPrompts(projectPath, layer) {
                 mandatory: true,
                 hint: (0, i18n_1.t)('prompts.oDataAnnotationDataSourceUriTooltip')
             },
-            when: (answers) => answers.addAnnotationMode
+            when: (answers) => answers.addAnnotationMode,
+            additionalMessages: (uri, previousAnswers) => buildResultingUrlMessage('prompts.resultingAnnotationUrl', uri, previousAnswers)
         },
         {
             type: 'editor',
@@ -283,4 +349,42 @@ async function getPrompts(projectPath, layer) {
         }
     ];
 }
+/**
+ * Builds the NewModelData object from the prompts answers.
+ *
+ * @param {string} projectPath - The root path of the project.
+ * @param {DescriptorVariant} variant - The descriptor variant of the adaptation project.
+ * @param {NewModelAnswers} answers - The answers to the prompts.
+ * @param {ToolsLogger} [logger] - Optional logger instance.
+ * @returns {Promise<NewModelData>} The data required by NewModelWriter.
+ */
+async function createNewModelData(projectPath, variant, answers, logger) {
+    const { modelAndDatasourceName, uri, serviceType, modelSettings, addAnnotationMode } = answers;
+    const isCloudFoundry = await (0, cf_1.isCFEnvironment)(projectPath);
+    return {
+        variant,
+        serviceType,
+        isCloudFoundry,
+        destinationName: isCloudFoundry ? answers.destination?.Name : undefined,
+        ...(isCloudFoundry &&
+            answers.destination && {
+            isOnPremiseDestination: (0, btp_utils_1.isOnPremiseDestination)(answers.destination)
+        }),
+        logger,
+        service: {
+            name: modelAndDatasourceName,
+            uri,
+            modelName: serviceType === types_1.ServiceType.HTTP ? undefined : modelAndDatasourceName,
+            version: getODataVersionFromServiceType(serviceType),
+            modelSettings
+        },
+        ...(addAnnotationMode && {
+            annotation: {
+                dataSourceName: `${modelAndDatasourceName}.annotation`,
+                dataSourceURI: answers.dataSourceURI,
+                settings: answers.annotationSettings
+            }
+        })
+    };
+}
 //# sourceMappingURL=index.js.map

package/dist/prompts/index.d.ts

@@ -1,6 +1,6 @@
 export { getPrompts as getPromptsForChangeDataSource } from './change-data-source';
 export { getPrompts as getPromptsForAddComponentUsages } from './add-component-usages';
-export { getPrompts as getPromptsForNewModel } from './add-new-model';
+export { getPrompts as getPromptsForNewModel, getODataVersionFromServiceType, createNewModelData } from './add-new-model';
 export { getPrompts as getPromptsForChangeInbound } from './change-inbound';
 export { getPrompts as getPromptsForAddAnnotationsToOData } from './add-annotations-to-odata';
 //# sourceMappingURL=index.d.ts.map

package/dist/prompts/index.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPromptsForAddAnnotationsToOData = exports.getPromptsForChangeInbound = exports.getPromptsForNewModel = exports.getPromptsForAddComponentUsages = exports.getPromptsForChangeDataSource = void 0;
+exports.getPromptsForAddAnnotationsToOData = exports.getPromptsForChangeInbound = exports.createNewModelData = exports.getODataVersionFromServiceType = exports.getPromptsForNewModel = exports.getPromptsForAddComponentUsages = exports.getPromptsForChangeDataSource = void 0;
 var change_data_source_1 = require("./change-data-source");
 Object.defineProperty(exports, "getPromptsForChangeDataSource", { enumerable: true, get: function () { return change_data_source_1.getPrompts; } });
 var add_component_usages_1 = require("./add-component-usages");
 Object.defineProperty(exports, "getPromptsForAddComponentUsages", { enumerable: true, get: function () { return add_component_usages_1.getPrompts; } });
 var add_new_model_1 = require("./add-new-model");
 Object.defineProperty(exports, "getPromptsForNewModel", { enumerable: true, get: function () { return add_new_model_1.getPrompts; } });
+Object.defineProperty(exports, "getODataVersionFromServiceType", { enumerable: true, get: function () { return add_new_model_1.getODataVersionFromServiceType; } });
+Object.defineProperty(exports, "createNewModelData", { enumerable: true, get: function () { return add_new_model_1.createNewModelData; } });
 var change_inbound_1 = require("./change-inbound");
 Object.defineProperty(exports, "getPromptsForChangeInbound", { enumerable: true, get: function () { return change_inbound_1.getPrompts; } });
 var add_annotations_to_odata_1 = require("./add-annotations-to-odata");

package/dist/translations/adp-tooling.i18n.json

@@ -13,10 +13,20 @@
         "filePathLabel": "Annotation File path",
         "filePathTooltip": "Select the annotation file from your workspace",
         "addAnnotationOdataSourceTooltip": "Select the OData service you want to add the annotation file to",
+        "destinationLabel": "Destination",
+        "destinationTooltip": "Select a destination for the service.",
+        "serviceTypeLabel": "Service Type",
+        "serviceTypeTooltip": "Select the type of service you want to add.",
         "oDataServiceNameLabel": "OData Service Name",
         "oDataServiceNameTooltip": "Enter a name for the OData service you want to add",
         "oDataServiceUriLabel": "OData Service URI",
         "oDataServiceUriTooltip": "Enter the URI for the OData service you want to add. The URI must start and end with '/' and must not contain any whitespaces or parameters",
+        "serviceUriLabel": "Service URI",
+        "resultingServiceUrl": "Resulting Service URL: {{url}}",
+        "resultingAnnotationUrl": "Resulting Annotation URL: {{url}}",
+        "modelAndDatasourceNameLabel": "Model and Data Source Name",
+        "modelAndDatasourceNameTooltip": "Enter a name for the data source and model.",
+        "datasourceNameLabel": "Data Source Name",
         "oDataServiceVersionLabel": "OData Version",
         "oDataServiceVersionTooltip": "Select the version of OData of the service you want to add",
         "oDataServiceModelNameLabel": "OData Service SAPUI5 Model Name",
@@ -67,7 +77,9 @@
         "errorDuplicateNamesOData": "An OData Service Name must be different from an OData Annotation Data Source Name. Rename and try again.",
         "errorInputInvalidValuePrefix": "{{value}} must start with '{{prefix}}'.",
         "errorCustomerEmptyValue": "{{value}} must contain at least one character in addition to '{{prefix}}'.",
+        "errorInputMustEndWithAlphanumeric": "The input must end with an alphanumeric character.",
         "errorInvalidDataSourceURI": "Invalid URI. The URI must start and end with '/' and contain no spaces.",
+        "errorRouteAlreadyExists": "A route with the same Service URI already exists in xs-app.json. Use a different URI.",
         "appDoesNotSupportManifest": "The selected application is not supported by SAPUI5 Adaptation Project because it does not have a `manifest.json` file. Please select a different application.",
         "ui5VersionNotReachableError": "The URL of the SAPUI5 version you have selected is not reachable. The <URL> URL must be made accessible through the cloud connector and the destination configuration so it can be consumed within the SAPUI5 adaptation project and its SAPUI5 Adaptation Editor.",
         "ui5VersionOutdatedError": "The SAPUI5 version you have selected is not compatible with the SAPUI5 Adaptation Editor. Please select a different version.",
@@ -115,6 +127,10 @@
         "noServiceKeysFoundForInstance": "No service keys found for service instance: {{serviceInstanceName}}",
         "couldNotFetchServiceKeys": "Cannot fetch the service keys. Error: {{error}}",
         "metadataFetchingNotSupportedForCF": "Metadata fetching is not supported for Cloud Foundry projects.",
+        "failedToListBtpDestinations": "Failed to list BTP destinations. Error: {{error}}",
+        "destinationServiceNotFoundInMtaYaml": "Destination service instance not found in mta.yaml. Ensure a resource with 'service: destination' is declared.",
+        "noServiceKeysFoundForDestination": "No service keys found for destination service instance '{{serviceInstanceName}}'. Ensure the service is provisioned and try again.",
+        "errorFetchingDestinations": "Error fetching destinations. Check log for details.",
         "cfPushFailed": "cf push failed for the '{{appName}}' app: {{error}}",
         "cfEnableSshFailed": "cf enable-ssh failed for the '{{appName}}' app: {{error}}",
         "cfRestartFailed": "cf restart failed for the '{{appName}}' app: {{error}}"

package/dist/types.d.ts

@@ -6,6 +6,7 @@ import type { Editor } from 'mem-fs-editor';
 import type { Destination } from '@sap-ux/btp-utils';
 import type { YUIQuestion } from '@sap-ux/inquirer-common';
 import type AdmZip from 'adm-zip';
+import type { ToolsLogger } from '@sap-ux/logger';
 import type { SupportedProject } from './source';
 export type DataSources = Record<string, ManifestNamespace.DataSource>;
 /**
@@ -481,12 +482,19 @@ export interface IWriter<T> {
  */
 export declare const enum ChangeType {
     ADD_NEW_MODEL = "appdescr_ui5_addNewModel",
+    ADD_NEW_DATA_SOURCE = "appdescr_app_addNewDataSource",
     ADD_ANNOTATIONS_TO_ODATA = "appdescr_app_addAnnotationsToOData",
     CHANGE_DATA_SOURCE = "appdescr_app_changeDataSource",
     ADD_COMPONENT_USAGES = "appdescr_ui5_addComponentUsages",
     ADD_LIBRARY_REFERENCE = "appdescr_ui5_addLibraries",
     CHANGE_INBOUND = "appdescr_app_changeInbound"
 }
+export declare const ServiceType: {
+    readonly ODATA_V2: "OData v2";
+    readonly ODATA_V4: "OData v4";
+    readonly HTTP: "HTTP";
+};
+export type ServiceType = (typeof ServiceType)[keyof typeof ServiceType];
 /**
  * A mapping of ChangeType values to their respective change names.
  */
@@ -571,15 +579,25 @@ export type AddComponentUsageAnswersBase = {
 export type AddComponentUsageAnswers = AddComponentUsageAnswersBase & (AddComponentUsageAnswersWithoutLibrary | addComponentUsageAnswersWithLibrary);
 export interface NewModelDataBase {
     variant: DescriptorVariant;
+    /** The type of service being added. Determines dataSource type and whether a model entry is created. */
+    serviceType: ServiceType;
+    /** Whether the project is deployed on Cloud Foundry. Affects URI construction and model settings. */
+    isCloudFoundry?: boolean;
+    /** Name of the BTP destination. Required when isCloudFoundry is true to write the xs-app.json route. */
+    destinationName?: string;
+    /** True when the selected CF destination is OnPremise (ProxyType: 'OnPremise'). Triggers connectivity service in mta.yaml. */
+    isOnPremiseDestination?: boolean;
+    /** Optional logger passed to the writer for use during the write operation. */
+    logger?: ToolsLogger;
     service: {
         /** Name of the OData service. */
         name: string;
         /** URI of the OData service. */
         uri: string;
-        /** Name of the OData service model. */
-        modelName: string;
-        /** Version of OData used. */
-        version: string;
+        /** Name of the OData service model. Optional for absent for HTTP service type. */
+        modelName?: string;
+        /** Version of OData used. Optional for HTTP service type. */
+        version?: string;
         /** Settings for the OData service model. */
         modelSettings?: string;
     };
@@ -596,21 +614,19 @@ export interface NewModelDataWithAnnotations extends NewModelDataBase {
 }
 export type NewModelData = NewModelDataBase | NewModelDataWithAnnotations;
 export interface NewModelAnswersBase {
-    /** Name of the OData service. */
-    name: string;
+    /** Selected BTP destination. Only relevant for CF projects. */
+    destination?: Destination;
+    /** Type of service to add. */
+    serviceType: ServiceType;
+    /** Name used for both the OData service datasource and the SAPUI5 model. */
+    modelAndDatasourceName: string;
     /** URI of the OData service. */
     uri: string;
-    /** Name of the OData service model. */
-    modelName: string;
-    /** Version of OData used. */
-    version: string;
     /** Settings for the OData service model. */
     modelSettings: string;
 }
 export interface NewModelAnswersWithAnnotations extends NewModelAnswersBase {
     addAnnotationMode: true;
-    /** Name of the OData annotation data source. */
-    dataSourceName: string;
     /** Optional URI of the OData annotation data source. */
     dataSourceURI?: string;
     /** Optional settings for the OData annotation. */
@@ -794,6 +810,12 @@ export interface Uaa {
     clientsecret: string;
     url: string;
 }
+export type CfDestinationServiceCredentials = {
+    uri: string;
+    uaa: Uaa;
+} | ({
+    uri: string;
+} & Uaa);
 export interface CfAppParams {
     appName: string;
     appVersion: string;

package/dist/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cfServicesPromptNames = exports.AppRouterType = exports.ChangeTypeMap = exports.ApplicationType = void 0;
+exports.cfServicesPromptNames = exports.AppRouterType = exports.ChangeTypeMap = exports.ServiceType = exports.ApplicationType = void 0;
 var ApplicationType;
 (function (ApplicationType) {
     ApplicationType["FIORI_ELEMENTS"] = "FioriElements";
@@ -8,11 +8,17 @@ var ApplicationType;
     ApplicationType["FREE_STYLE"] = "FreeStyle";
     ApplicationType["NONE"] = "";
 })(ApplicationType || (exports.ApplicationType = ApplicationType = {}));
+exports.ServiceType = {
+    ODATA_V2: 'OData v2',
+    ODATA_V4: 'OData v4',
+    HTTP: 'HTTP'
+};
 /**
  * A mapping of ChangeType values to their respective change names.
  */
 exports.ChangeTypeMap = {
     ["appdescr_ui5_addNewModel" /* ChangeType.ADD_NEW_MODEL */]: 'addNewModel',
+    ["appdescr_app_addNewDataSource" /* ChangeType.ADD_NEW_DATA_SOURCE */]: 'addNewDataSource',
     ["appdescr_app_addAnnotationsToOData" /* ChangeType.ADD_ANNOTATIONS_TO_ODATA */]: 'addAnnotationsToOData',
     ["appdescr_app_changeDataSource" /* ChangeType.CHANGE_DATA_SOURCE */]: 'changeDataSource',
     ["appdescr_ui5_addComponentUsages" /* ChangeType.ADD_COMPONENT_USAGES */]: 'addComponentUsages',

package/dist/writer/cf.d.ts

@@ -1,6 +1,6 @@
 import { type Editor } from 'mem-fs-editor';
 import { type ToolsLogger } from '@sap-ux/logger';
-import type { CfAdpWriterConfig, CfUi5AppInfo, CfConfig } from '../types';
+import type { CfAdpWriterConfig, CfConfig, CfUi5AppInfo } from '../types';
 /**
  * Writes the CF adp-project template to the mem-fs-editor instance.
  *

package/dist/writer/cf.js

@@ -16,8 +16,9 @@ const source_1 = require("../source");
 const manifest_1 = require("./manifest");
 const project_utils_1 = require("./project-utils");
 const i18n_1 = require("./i18n");
-const helper_1 = require("../base/helper");
 const project_builder_1 = require("../base/project-builder");
+const helper_1 = require("../base/helper");
+const discovery_1 = require("../cf/app/discovery");
 /**
  * Writes the CF adp-project template to the mem-fs-editor instance.
  *
@@ -118,7 +119,7 @@ async function setupCfPreview(basePath, yamlPath, cfConfig, logger) {
         throw new Error(`No service keys found for service instance: ${serviceInstanceName}`);
     }
     const appId = await (0, helper_1.getBaseAppId)(basePath);
-    const appHostIds = (0, cf_1.getAppHostIds)(serviceInfo.serviceKeys);
+    const appHostIds = (0, discovery_1.getAppHostIds)(serviceInfo.serviceKeys);
     const ui5AppInfo = await (0, cf_1.getCfUi5AppInfo)(appId, appHostIds, cfConfig, logger);
     if (appHostIds.length === 0) {
         throw new Error('No app host IDs found in service keys.');

package/dist/writer/changes/writers/new-model-writer.d.ts

@@ -25,5 +25,12 @@ export declare class NewModelWriter implements IWriter<NewModelData> {
      * @returns {Promise<void>} A promise that resolves when the change writing process is completed.
      */
     write(data: NewModelData): Promise<void>;
+    /**
+     * Creates or updates the xs-app.json in the webapp folder with a new AppRouter route
+     * for the added OData service.
+     *
+     * @param {NewModelData} data - The new model data containing service name, URI and destination name.
+     */
+    private writeXsAppRoute;
 }
 //# sourceMappingURL=new-model-writer.d.ts.map

package/dist/writer/changes/writers/new-model-writer.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NewModelWriter = void 0;
+const node_path_1 = require("node:path");
+const logger_1 = require("@sap-ux/logger");
+const types_1 = require("../../../types");
 const change_utils_1 = require("../../../base/change-utils");
+const yaml_1 = require("../../../cf/project/yaml");
+const ssh_1 = require("../../../cf/services/ssh");
 /**
  * Handles the creation and writing of new sapui5 model data changes for a project.
  */
@@ -23,29 +28,35 @@ class NewModelWriter {
      * @returns {object} The constructed content object for the new model change.
      */
     constructContent(data) {
-        const { service } = data;
+        const { service, isCloudFoundry, serviceType } = data;
+        const isHttp = serviceType === types_1.ServiceType.HTTP;
+        const uri = isCloudFoundry ? `${service.name.replaceAll('.', '/')}${service.uri}` : service.uri;
+        const dataSourceEntry = {
+            uri,
+            type: isHttp ? 'http' : 'OData',
+            settings: {}
+        };
+        if (service.version) {
+            dataSourceEntry.settings.odataVersion = service.version;
+        }
         const content = {
             dataSource: {
-                [service.name]: {
-                    uri: service.uri,
-                    type: 'OData',
-                    settings: {
-                        odataVersion: service.version
-                    }
-                }
-            },
-            model: {
-                [service.modelName]: {
-                    dataSource: service.name
-                }
+                [service.name]: dataSourceEntry
             }
         };
-        if (service.modelSettings && service.modelSettings.length !== 0) {
-            content.model[service.modelName].settings = (0, change_utils_1.parseStringToObject)(service.modelSettings);
+        if (!isHttp && service.modelName) {
+            content.model = {
+                [service.modelName]: {
+                    dataSource: service.name,
+                    ...(service.modelSettings?.length ? { settings: (0, change_utils_1.parseStringToObject)(service.modelSettings) } : {})
+                }
+            };
         }
         if ('annotation' in data) {
             const { annotation } = data;
-            content.dataSource[service.name].settings.annotations = [`${annotation.dataSourceName}`];
+            content.dataSource[service.name].settings.annotations = [
+                `${annotation.dataSourceName}`
+            ];
             content.dataSource[annotation.dataSourceName] = {
                 uri: annotation.dataSourceURI,
                 type: 'ODataAnnotation'
@@ -64,9 +75,35 @@ class NewModelWriter {
      */
     async write(data) {
         const timestamp = Date.now();
+        const isHttp = data.serviceType === types_1.ServiceType.HTTP;
         const content = this.constructContent(data);
-        const change = (0, change_utils_1.getChange)(data.variant, timestamp, content, "appdescr_ui5_addNewModel" /* ChangeType.ADD_NEW_MODEL */);
+        const change = (0, change_utils_1.getChange)(data.variant, timestamp, content, isHttp ? "appdescr_app_addNewDataSource" /* ChangeType.ADD_NEW_DATA_SOURCE */ : "appdescr_ui5_addNewModel" /* ChangeType.ADD_NEW_MODEL */);
         await (0, change_utils_1.writeChangeToFolder)(this.projectPath, change, this.fs);
+        if (data.isCloudFoundry) {
+            this.writeXsAppRoute(data);
+        }
+        if (data.isOnPremiseDestination) {
+            await (0, yaml_1.addConnectivityServiceToMta)((0, node_path_1.dirname)(this.projectPath), this.fs);
+            await (0, ssh_1.ensureTunnelAppExists)(ssh_1.DEFAULT_TUNNEL_APP_NAME, data.logger ?? new logger_1.ToolsLogger());
+        }
+    }
+    /**
+     * Creates or updates the xs-app.json in the webapp folder with a new AppRouter route
+     * for the added OData service.
+     *
+     * @param {NewModelData} data - The new model data containing service name, URI and destination name.
+     */
+    writeXsAppRoute(data) {
+        const xsAppPath = (0, node_path_1.join)(this.projectPath, 'webapp', 'xs-app.json');
+        const source = `^/${data.service.name.replaceAll('.', '/')}${data.service.uri}(.*)`;
+        const newRoute = {
+            source,
+            target: `${data.service.uri}$1`,
+            destination: data.destinationName
+        };
+        const existing = this.fs.readJSON(xsAppPath, { routes: [] });
+        existing.routes.push(newRoute);
+        this.fs.writeJSON(xsAppPath, existing);
     }
 }
 exports.NewModelWriter = NewModelWriter;

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "0.18.115",
+  "version": "0.18.117",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -36,17 +36,17 @@
     "prompts": "2.4.2",
     "sanitize-filename": "1.6.4",
     "uuid": "11.1.0",
-    "@sap-ux/axios-extension": "1.25.30",
-    "@sap-ux/btp-utils": "1.1.13",
+    "@sap-ux/axios-extension": "1.25.31",
+    "@sap-ux/btp-utils": "1.1.14",
     "@sap-ux/i18n": "0.3.10",
-    "@sap-ux/inquirer-common": "0.11.35",
+    "@sap-ux/inquirer-common": "0.11.36",
     "@sap-ux/logger": "0.8.5",
-    "@sap-ux/nodejs-utils": "0.2.20",
+    "@sap-ux/nodejs-utils": "0.2.21",
     "@sap-ux/odata-service-writer": "0.31.7",
     "@sap-ux/project-access": "1.35.20",
     "@sap-ux/project-input-validator": "0.6.76",
     "@sap-ux/store": "1.5.13",
-    "@sap-ux/system-access": "0.7.6",
+    "@sap-ux/system-access": "0.7.7",
     "@sap-ux/ui5-config": "0.30.3",
     "@sap-ux/ui5-info": "0.13.19"
   },