@sap-ux/adp-tooling 0.18.63 → 0.18.66

package/dist/abap/client.d.ts

@@ -1,15 +1,15 @@
 import { type AbapServiceProvider } from '@sap-ux/axios-extension';
 import type { ManifestNamespace } from '@sap-ux/project-access';
-import type { FlexUISupportedSystem } from '../types';
+import type { FlexUICapability } from '../types';
 import type { ToolsLogger } from '@sap-ux/logger';
 /**
  * Fetches system supports Flex UI features.
  *
  * @param {AbapServiceProvider} provider - Instance of the ABAP provider.
  * @param {boolean} isCustomerBase - Indicates whether the adaptation layer is CUSTOMER_BASE.
- * @returns {Promise<FlexUISupportedSystem | undefined>} settings indicating support for onPremise and UI Flex capabilities.
+ * @returns {Promise<FlexUICapability | undefined>} settings indicating support for onPremise and UI Flex capabilities.
  */
-export declare function getFlexUISupportedSystem(provider: AbapServiceProvider, isCustomerBase: boolean): Promise<FlexUISupportedSystem>;
+export declare function getFlexUICapability(provider: AbapServiceProvider, isCustomerBase: boolean): Promise<FlexUICapability>;
 /**
  * Fetches system UI5 Version from the UI5VersionService, if the request throws
  * fallback to the legacy api introduced in the UI5RtVersionService.

package/dist/abap/client.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFlexUISupportedSystem = getFlexUISupportedSystem;
+exports.getFlexUICapability = getFlexUICapability;
 exports.getSystemUI5Version = getSystemUI5Version;
 exports.getBaseAppInbounds = getBaseAppInbounds;
 const axios_extension_1 = require("@sap-ux/axios-extension");
@@ -14,13 +14,13 @@ const FILTER = {
  *
  * @param {AbapServiceProvider} provider - Instance of the ABAP provider.
  * @param {boolean} isCustomerBase - Indicates whether the adaptation layer is CUSTOMER_BASE.
- * @returns {Promise<FlexUISupportedSystem | undefined>} settings indicating support for onPremise and UI Flex capabilities.
+ * @returns {Promise<FlexUICapability | undefined>} settings indicating support for onPremise and UI Flex capabilities.
  */
-async function getFlexUISupportedSystem(provider, isCustomerBase) {
+async function getFlexUICapability(provider, isCustomerBase) {
     if (!isCustomerBase) {
         return {
-            isOnPremise: true,
-            isUIFlex: true
+            isDtaFolderDeploymentSupported: true,
+            isUIFlexSupported: true
         };
     }
     const response = await provider.get(axios_extension_1.AdtCatalogService.ADT_DISCOVERY_SERVICE_PATH, {
@@ -28,9 +28,9 @@ async function getFlexUISupportedSystem(provider, isCustomerBase) {
             Accept: 'application/*'
         }
     });
-    const isOnPremise = response.data.includes(FILTER.term);
-    const isUIFlex = response.data.includes(FILTER.scheme);
-    return { isOnPremise, isUIFlex };
+    const isDtaFolderDeploymentSupported = response.data.includes(FILTER.term);
+    const isUIFlexSupported = response.data.includes(FILTER.scheme);
+    return { isDtaFolderDeploymentSupported, isUIFlexSupported };
 }
 /**
  * Fetches system UI5 Version from the UI5VersionService, if the request throws

package/dist/base/constants/index.d.ts

@@ -10,22 +10,4 @@ export declare const RESOURCE_BUNDLE_TEXT = "\n\n# This is the resource bundle f
 export declare const TRANSLATION_UUID_TEXT = "\n#__ldi.translation.uuid=";
 export declare const MAIN_I18N_PATH = "i18n/i18n.properties";
 export declare const BASE_I18N_DESCRIPTION = "#Make sure you provide a unique prefix to the newly added keys in this file, to avoid overriding of SAP Fiori application keys.";
-export declare const S4HANA_APPS_PARAMS: {
-    'sap.app/type': string;
-    'sap.fiori/cloudDevAdaptationStatus': string;
-    fields: string;
-};
-export declare const ABAP_APPS_PARAMS: {
-    fields: string;
-    'sap.ui/technology': string;
-    'sap.app/type': string;
-    fileType: string;
-};
-export declare const ABAP_VARIANT_APPS_PARAMS: {
-    fields: string;
-    'sap.ui/technology': string;
-    'sap.app/type': string;
-    fileType: string;
-    originLayer: string;
-};
 //# sourceMappingURL=index.d.ts.map

package/dist/base/constants/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ABAP_VARIANT_APPS_PARAMS = exports.ABAP_APPS_PARAMS = exports.S4HANA_APPS_PARAMS = exports.BASE_I18N_DESCRIPTION = exports.MAIN_I18N_PATH = exports.TRANSLATION_UUID_TEXT = exports.RESOURCE_BUNDLE_TEXT = exports.SNAPSHOT_UNTESTED_VERSION = exports.SNAPSHOT_VERSION = exports.LATEST_VERSION = exports.CURRENT_SYSTEM_VERSION = exports.SNAPSHOT_CDN_URL = exports.UI5_VERSIONS_NEO_CDN_URL = exports.UI5_VERSIONS_CDN_URL = exports.UI5_CDN_URL = void 0;
+exports.BASE_I18N_DESCRIPTION = exports.MAIN_I18N_PATH = exports.TRANSLATION_UUID_TEXT = exports.RESOURCE_BUNDLE_TEXT = exports.SNAPSHOT_UNTESTED_VERSION = exports.SNAPSHOT_VERSION = exports.LATEST_VERSION = exports.CURRENT_SYSTEM_VERSION = exports.SNAPSHOT_CDN_URL = exports.UI5_VERSIONS_NEO_CDN_URL = exports.UI5_VERSIONS_CDN_URL = exports.UI5_CDN_URL = void 0;
 exports.UI5_CDN_URL = 'https://ui5.sap.com';
 exports.UI5_VERSIONS_CDN_URL = 'https://sapui5.hana.ondemand.com/version.json';
 exports.UI5_VERSIONS_NEO_CDN_URL = 'https://ui5.sap.com/neo-app.json';
@@ -13,22 +13,4 @@ exports.RESOURCE_BUNDLE_TEXT = '\n\n# This is the resource bundle for ';
 exports.TRANSLATION_UUID_TEXT = '\n#__ldi.translation.uuid=';
 exports.MAIN_I18N_PATH = 'i18n/i18n.properties';
 exports.BASE_I18N_DESCRIPTION = '#Make sure you provide a unique prefix to the newly added keys in this file, to avoid overriding of SAP Fiori application keys.';
-exports.S4HANA_APPS_PARAMS = {
-    'sap.app/type': 'application',
-    'sap.fiori/cloudDevAdaptationStatus': 'released',
-    'fields': 'sap.app/id,repoName,sap.fiori/cloudDevAdaptationStatus,sap.app/ach,sap.fiori/registrationIds,sap.app/title,url,fileType'
-};
-exports.ABAP_APPS_PARAMS = {
-    'fields': 'sap.app/id,sap.app/ach,sap.fiori/registrationIds,sap.app/title,url,fileType,repoName',
-    'sap.ui/technology': 'UI5',
-    'sap.app/type': 'application',
-    'fileType': 'appdescr'
-};
-exports.ABAP_VARIANT_APPS_PARAMS = {
-    'fields': 'sap.app/id,sap.app/ach,sap.fiori/registrationIds,sap.app/title,url,fileType,repoName',
-    'sap.ui/technology': 'UI5',
-    'sap.app/type': 'application',
-    'fileType': 'appdescr_variant',
-    'originLayer': 'VENDOR'
-};
 //# sourceMappingURL=index.js.map

package/dist/base/helper.d.ts

@@ -1,7 +1,7 @@
 import type { Editor } from 'mem-fs-editor';
 import type { ReaderCollection } from '@ui5/fs';
 import type { UI5Config } from '@sap-ux/ui5-config';
-import type { Inbound } from '@sap-ux/axios-extension';
+import { type Inbound, AdaptationProjectType } from '@sap-ux/axios-extension';
 import { type ManifestNamespace, type Manifest } from '@sap-ux/project-access';
 import type { DescriptorVariant, AdpPreviewConfig, UI5YamlCustomTaskConfiguration } from '../types';
 /**
@@ -83,6 +83,16 @@ export declare function loadAppVariant(rootProject: ReaderCollection): Promise<D
  * @returns The `AdpPreviewConfig` object if found, otherwise throws an error.
  */
 export declare function getAdpConfig<T = AdpPreviewConfig>(basePath: string, yamlPath: string): Promise<T>;
+/**
+ * Returns the project type for an existing Adaptation project based on the information
+ * inside the ui5.yaml. If the builder key is presented inside the yaml then we are
+ * in a cloudReady project otherwise - onPremise.
+ *
+ * @param {string} basePath - The path to the adaptation project root folder.
+ * @returns {Promise<AdaptationProjectType | undefined>} The project type or undefined in casde the project is
+ * NOT an Adaptation project or an error is thrown from reading the configuration file.
+ */
+export declare function getExistingAdpProjectType(basePath: string): Promise<AdaptationProjectType | undefined>;
 /**
  * Get all files in the webapp folder.
  *

package/dist/base/helper.js

@@ -10,11 +10,13 @@ exports.extractCfBuildTask = extractCfBuildTask;
 exports.readManifestFromBuildPath = readManifestFromBuildPath;
 exports.loadAppVariant = loadAppVariant;
 exports.getAdpConfig = getAdpConfig;
+exports.getExistingAdpProjectType = getExistingAdpProjectType;
 exports.getWebappFiles = getWebappFiles;
 exports.filterAndMapInboundsToManifest = filterAndMapInboundsToManifest;
 exports.getBaseAppId = getBaseAppId;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
+const axios_extension_1 = require("@sap-ux/axios-extension");
 const project_access_1 = require("@sap-ux/project-access");
 /**
  * Get the app descriptor variant.
@@ -153,6 +155,31 @@ async function getAdpConfig(basePath, yamlPath) {
         throw new Error(`No system configuration found in ${(0, node_path_1.basename)(ui5ConfigPath)}`);
     }
 }
+/**
+ * Returns the project type for an existing Adaptation project based on the information
+ * inside the ui5.yaml. If the builder key is presented inside the yaml then we are
+ * in a cloudReady project otherwise - onPremise.
+ *
+ * @param {string} basePath - The path to the adaptation project root folder.
+ * @returns {Promise<AdaptationProjectType | undefined>} The project type or undefined in casde the project is
+ * NOT an Adaptation project or an error is thrown from reading the configuration file.
+ */
+async function getExistingAdpProjectType(basePath) {
+    try {
+        const appType = await (0, project_access_1.getAppType)(basePath);
+        if (appType !== 'Fiori Adaptation') {
+            return undefined;
+        }
+        const yamlPath = (0, node_path_1.join)(basePath, project_access_1.FileName.Ui5Yaml);
+        const ui5Config = await readUi5Config(basePath, yamlPath);
+        return ui5Config.hasBuilderKey() ? axios_extension_1.AdaptationProjectType.CLOUD_READY : axios_extension_1.AdaptationProjectType.ON_PREMISE;
+    }
+    catch {
+        // Expected: Project may not be an ADP project or configuration files may be missing/invalid
+        // Returning undefined allows callers to handle non-ADP projects gracefully
+        return undefined;
+    }
+}
 /**
  * Get all files in the webapp folder.
  *

package/dist/preview/adp-preview.d.ts

@@ -2,8 +2,8 @@ import type { ReaderCollection } from '@ui5/fs';
 import type { MiddlewareUtils } from '@ui5/server';
 import type { NextFunction, Request, Response, Router } from 'express';
 import type { Logger, ToolsLogger } from '@sap-ux/logger';
-import { type UI5FlexLayer } from '@sap-ux/project-access';
-import type { MergedAppDescriptor } from '@sap-ux/axios-extension';
+import type { UI5FlexLayer } from '@sap-ux/project-access';
+import type { AdaptationProjectType, MergedAppDescriptor } from '@sap-ux/axios-extension';
 import type { AdpPreviewConfig, CommonChangeProperties, DescriptorVariant, OperationType, CommonAdditionalChangeInfoProperties } from '../types';
 import type { Editor } from 'mem-fs-editor';
 declare global {
@@ -37,7 +37,7 @@ export declare class AdpPreview {
     private routesHandler;
     private lrep;
     private descriptorVariantId;
-    private isCloud;
+    private projectTypeValue?;
     /**
      * @returns merged manifest.
      */
@@ -49,9 +49,9 @@ export declare class AdpPreview {
         [name: string]: string;
     };
     /**
-     * @returns {boolean} true if the project is an ABAP cloud project, false otherwise.
+     * @returns {AdaptationProjectType | undefined} The project type.
      */
-    get isCloudProject(): boolean;
+    get projectType(): AdaptationProjectType | undefined;
     /**
      * Constructor taking the config and a logger as input.
      *

package/dist/preview/adp-preview.js

@@ -9,6 +9,8 @@ const system_access_1 = require("@sap-ux/system-access");
 const routes_handler_1 = __importDefault(require("./routes-handler"));
 const change_handler_1 = require("./change-handler");
 const descriptor_change_handler_1 = require("./descriptor-change-handler");
+const helper_1 = require("../base/helper");
+const node_path_1 = __importDefault(require("node:path"));
 /**
  * Instance of an adaptation project handling requests and data transformation.
  */
@@ -31,7 +33,7 @@ class AdpPreview {
     routesHandler;
     lrep;
     descriptorVariantId;
-    isCloud;
+    projectTypeValue;
     /**
      * @returns merged manifest.
      */
@@ -68,15 +70,10 @@ class AdpPreview {
         }
     }
     /**
-     * @returns {boolean} true if the project is an ABAP cloud project, false otherwise.
+     * @returns {AdaptationProjectType | undefined} The project type.
      */
-    get isCloudProject() {
-        if (this.isCloud !== undefined) {
-            return this.isCloud;
-        }
-        else {
-            throw new Error('Not initialized');
-        }
+    get projectType() {
+        return this.projectTypeValue;
     }
     /**
      * Constructor taking the config and a logger as input.
@@ -108,8 +105,7 @@ class AdpPreview {
         this.lrep = this.provider.getLayeredRepository();
         // fetch a merged descriptor from the backend
         await this.lrep.getCsrfToken();
-        // check if the project is an ABAP cloud project
-        this.isCloud = await this.provider.isAbapCloud();
+        this.projectTypeValue = await (0, helper_1.getExistingAdpProjectType)(node_path_1.default.resolve());
         await this.sync();
         return descriptorVariant.layer;
     }
@@ -121,7 +117,7 @@ class AdpPreview {
      */
     async initCfBuildMode(descriptorVariant) {
         this.descriptorVariantId = descriptorVariant.id;
-        this.isCloud = false;
+        this.projectTypeValue = undefined;
         this.routesHandler = new routes_handler_1.default(this.project, this.util, {}, this.logger);
         return descriptorVariant.layer;
     }

package/dist/source/applications.d.ts

@@ -1,23 +1,6 @@
+import { type AbapServiceProvider, AdaptationProjectType } from '@sap-ux/axios-extension';
 import type { ToolsLogger } from '@sap-ux/logger';
-import type { AbapServiceProvider, App } from '@sap-ux/axios-extension';
 import type { SourceApplication } from '../types';
-/**
- * Compares two applications for sorting, using the title and falling back to the ID if titles are missing or equal.
- * This function ensures that applications are sorted alphabetically by their title or ID in a case-insensitive manner.
- *
- * @param {SourceApplication} appA - The first application to compare.
- * @param {SourceApplication} appB - The second application to compare.
- * @returns {number} A number indicating the sort order.
- */
-export declare const filterApps: (appA: SourceApplication, appB: SourceApplication) => number;
-/**
- * Transforms raw application data into a structured Application object.
- * This function maps properties from a loosely typed app data structure to a strongly typed Application object.
- *
- * @param {Partial<App>} app - The raw application data, possibly incomplete.
- * @returns {SourceApplication} A structured application object with defined properties, even if some may be empty.
- */
-export declare const mapApps: (app: Partial<App>) => SourceApplication;
 /**
  * Checks whether the application supports manifest-first approach.
  *
@@ -28,14 +11,17 @@ export declare const mapApps: (app: Partial<App>) => SourceApplication;
  */
 export declare function isAppSupported(provider: AbapServiceProvider, id: string, logger: ToolsLogger): Promise<boolean>;
 /**
- * Loads and processes application data from the ABAP service provider.
- *
- * This function retrieves the application index from the provider and then searches for applications based on system type.
- * If the system is not a cloud system and the base is customer-specific, additional variant applications are fetched and merged.
+ * Loads and processes application data from the ABAP service provider. This function
+ * retrieves the application index from the provider and then searches for applications based on project type.
  *
  * @param {AbapServiceProvider} provider - The ABAP service provider used to retrieve application data.
  * @param {boolean} isCustomerBase - Flag indicating whether the system is customer-based. Affects application selection.
- * @returns {Promise<SourceApplication[]>} A promise that resolves to a sorted list of applications.
+ * @param {AdaptationProjectType | undefined} projectType - The project type.
+ * @returns {Promise<SourceApplication[]>} If the project type is cloudReady resolves with
+ * applications for which the {@link SourceApplication.cloudDevAdaptationStatus} is `released`.
+ * If the project type is onPremise we display all applications, plus applications with variant descriptor
+ * in case the {@link isCustomerBase} flag is set to true. In case the {@link projectType} is NOT set
+ * we return an empty array.
  */
-export declare function loadApps(provider: AbapServiceProvider, isCustomerBase: boolean): Promise<SourceApplication[]>;
+export declare function loadApps(provider: AbapServiceProvider, isCustomerBase: boolean, projectType?: AdaptationProjectType): Promise<SourceApplication[]>;
 //# sourceMappingURL=applications.d.ts.map

package/dist/source/applications.js

@@ -1,10 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapApps = exports.filterApps = void 0;
 exports.isAppSupported = isAppSupported;
 exports.loadApps = loadApps;
+const axios_extension_1 = require("@sap-ux/axios-extension");
 const i18n_1 = require("../i18n");
-const constants_1 = require("../base/constants");
+const APP_FIELDS = 'sap.app/id,sap.app/ach,sap.fiori/registrationIds,sap.app/title,url,fileType,repoName,sap.fiori/cloudDevAdaptationStatus';
+const APPS_WITH_DESCR_FILTER = {
+    fields: APP_FIELDS,
+    'sap.ui/technology': 'UI5',
+    'sap.app/type': 'application',
+    'fileType': 'appdescr'
+};
+const APPS_WITH_VARIANT_DESCR_FILTER = {
+    fields: APP_FIELDS,
+    'sap.ui/technology': 'UI5',
+    'sap.app/type': 'application',
+    'fileType': 'appdescr_variant',
+    'originLayer': 'VENDOR'
+};
+const CLOUD_ONLY_APPS_FILTER = {
+    fields: APP_FIELDS,
+    'sap.ui/technology': 'UI5',
+    'sap.app/type': 'application',
+    'sap.fiori/cloudDevAdaptationStatus': 'released'
+};
 /**
  * Compares two applications for sorting, using the title and falling back to the ID if titles are missing or equal.
  * This function ensures that applications are sorted alphabetically by their title or ID in a case-insensitive manner.
@@ -13,7 +32,7 @@ const constants_1 = require("../base/constants");
  * @param {SourceApplication} appB - The second application to compare.
  * @returns {number} A number indicating the sort order.
  */
-const filterApps = (appA, appB) => {
+const compareByTitleOrId = (appA, appB) => {
     let titleA = appA.title.toUpperCase();
     let titleB = appB.title.toUpperCase();
     if (!titleA.trim()) {
@@ -30,7 +49,6 @@ const filterApps = (appA, appB) => {
     }
     return 0;
 };
-exports.filterApps = filterApps;
 /**
  * Transforms raw application data into a structured Application object.
  * This function maps properties from a loosely typed app data structure to a strongly typed Application object.
@@ -38,16 +56,16 @@ exports.filterApps = filterApps;
  * @param {Partial<App>} app - The raw application data, possibly incomplete.
  * @returns {SourceApplication} A structured application object with defined properties, even if some may be empty.
  */
-const mapApps = (app) => ({
+const toSourceApplication = (app) => ({
     id: app['sap.app/id'] ?? '',
     title: app['sap.app/title'] ?? '',
     ach: app['sap.app/ach'] ?? '',
     registrationIds: app['sap.fiori/registrationIds'] ?? [],
     fileType: app['fileType'] ?? '',
     bspUrl: app['url'] ?? '',
-    bspName: app['repoName'] ?? ''
+    bspName: app['repoName'] ?? '',
+    cloudDevAdaptationStatus: app['sap.fiori/cloudDevAdaptationStatus']?.toString() ?? ''
 });
-exports.mapApps = mapApps;
 /**
  * Checks whether the application supports manifest-first approach.
  *
@@ -66,29 +84,34 @@ async function isAppSupported(provider, id, logger) {
     return true;
 }
 /**
- * Loads and processes application data from the ABAP service provider.
- *
- * This function retrieves the application index from the provider and then searches for applications based on system type.
- * If the system is not a cloud system and the base is customer-specific, additional variant applications are fetched and merged.
+ * Loads and processes application data from the ABAP service provider. This function
+ * retrieves the application index from the provider and then searches for applications based on project type.
  *
  * @param {AbapServiceProvider} provider - The ABAP service provider used to retrieve application data.
  * @param {boolean} isCustomerBase - Flag indicating whether the system is customer-based. Affects application selection.
- * @returns {Promise<SourceApplication[]>} A promise that resolves to a sorted list of applications.
+ * @param {AdaptationProjectType | undefined} projectType - The project type.
+ * @returns {Promise<SourceApplication[]>} If the project type is cloudReady resolves with
+ * applications for which the {@link SourceApplication.cloudDevAdaptationStatus} is `released`.
+ * If the project type is onPremise we display all applications, plus applications with variant descriptor
+ * in case the {@link isCustomerBase} flag is set to true. In case the {@link projectType} is NOT set
+ * we return an empty array.
  */
-async function loadApps(provider, isCustomerBase) {
-    let result = [];
+async function loadApps(provider, isCustomerBase, projectType) {
+    if (!projectType) {
+        return [];
+    }
     try {
-        const isCloudSystem = await provider.isAbapCloud();
-        const appIndex = provider.getAppIndex();
-        result = await appIndex.search(isCloudSystem ? constants_1.S4HANA_APPS_PARAMS : constants_1.ABAP_APPS_PARAMS);
-        if (!isCloudSystem && isCustomerBase) {
-            const extraApps = await appIndex.search(constants_1.ABAP_VARIANT_APPS_PARAMS);
-            result = result.concat(extraApps);
-        }
-        return result.map(exports.mapApps).sort(exports.filterApps);
+        const appIndexService = provider.getAppIndex();
+        const appIndex = (await Promise.all([
+            appIndexService.search(projectType === axios_extension_1.AdaptationProjectType.CLOUD_READY ? CLOUD_ONLY_APPS_FILTER : APPS_WITH_DESCR_FILTER),
+            projectType === axios_extension_1.AdaptationProjectType.ON_PREMISE && isCustomerBase
+                ? appIndexService.search(APPS_WITH_VARIANT_DESCR_FILTER)
+                : Promise.resolve([])
+        ])).flat();
+        return appIndex.map(toSourceApplication).sort(compareByTitleOrId);
     }
-    catch (e) {
-        throw new Error(`Could not load applications: ${e.message}`);
+    catch (error) {
+        throw new Error(`Could not load applications: ${error.message}`);
     }
 }
 //# sourceMappingURL=applications.js.map

package/dist/source/systems.d.ts

@@ -1,6 +1,19 @@
 import type { ToolsLogger } from '@sap-ux/logger';
 import type { BackendSystem } from '@sap-ux/store';
 import type { Endpoint } from '../types';
+import { type AbapServiceProvider } from '@sap-ux/axios-extension';
+export declare enum SupportedProject {
+    ON_PREM = "onPremise",
+    CLOUD_READY = "cloudReady",
+    CLOUD_READY_AND_ON_PREM = "cloudReadyAndOnPrem"
+}
+/**
+ * Gets the supported project types for the system. A system can support cloudReady, onPremise or both types of project.
+ *
+ * @param provider - The ABAP service provider.
+ * @returns {Promise<SupportedProject>} The supported project types.
+ */
+export declare function getSupportedProject(provider: AbapServiceProvider): Promise<SupportedProject>;
 /**
  * Retrieves the names of all stored systems, sorted alphabetically.
  *

package/dist/source/systems.js

@@ -1,9 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemLookup = exports.transformBackendSystem = void 0;
+exports.SystemLookup = exports.transformBackendSystem = exports.SupportedProject = void 0;
+exports.getSupportedProject = getSupportedProject;
 exports.getEndpointNames = getEndpointNames;
 const store_1 = require("@sap-ux/store");
 const btp_utils_1 = require("@sap-ux/btp-utils");
+const axios_extension_1 = require("@sap-ux/axios-extension");
+const i18n_1 = require("../i18n");
+var SupportedProject;
+(function (SupportedProject) {
+    SupportedProject["ON_PREM"] = "onPremise";
+    SupportedProject["CLOUD_READY"] = "cloudReady";
+    SupportedProject["CLOUD_READY_AND_ON_PREM"] = "cloudReadyAndOnPrem";
+})(SupportedProject || (exports.SupportedProject = SupportedProject = {}));
+/**
+ * Gets the supported project types for the system. A system can support cloudReady, onPremise or both types of project.
+ *
+ * @param provider - The ABAP service provider.
+ * @returns {Promise<SupportedProject>} The supported project types.
+ */
+async function getSupportedProject(provider) {
+    try {
+        const layerdRepositoryService = provider.getLayeredRepository();
+        const { adaptationProjectTypes } = await layerdRepositoryService.getSystemInfo();
+        const hasCloudReady = adaptationProjectTypes?.includes(axios_extension_1.AdaptationProjectType.CLOUD_READY);
+        const hasOnPrem = adaptationProjectTypes?.includes(axios_extension_1.AdaptationProjectType.ON_PREMISE);
+        if (hasCloudReady && hasOnPrem) {
+            return SupportedProject.CLOUD_READY_AND_ON_PREM;
+        }
+        else if (hasCloudReady) {
+            return SupportedProject.CLOUD_READY;
+        }
+        else if (hasOnPrem) {
+            return SupportedProject.ON_PREM;
+        }
+    }
+    catch (error) {
+        // Handle the case where the API is not available and continue to standard onPremise flow.
+        if ((0, axios_extension_1.isAxiosError)(error) && [404, 405].includes(error.response?.status ?? 0)) {
+            return SupportedProject.ON_PREM;
+        }
+        throw error;
+    }
+    throw new Error((0, i18n_1.t)('error.projectTypeNotProvided'));
+}
 /**
  * Retrieves the names of all stored systems, sorted alphabetically.
  *

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

@@ -106,6 +106,7 @@
         "failedToGetFDCApps": "Retrieving FDC apps failed: {{error}}",
         "failedToConnectToFDCService": "Failed to connect to the FDC service: '{{status}}'",
         "baseAppRequired": "A base app is required for Cloud Foundry project generation. Please select a base app and try again.",
+        "projectTypeNotProvided": "The project type is missing.",
         "invalidXsAppJson": "The xs-app.json file is invalid: {{error}}",
         "xsAppJsonNotFound": "The xs-app.json file was not found in any of the expected locations: {{paths}}",
         "noServiceInstanceNameFound": "No serviceInstanceName found in the app-variant-bundler-build configuration",

package/dist/types.d.ts

@@ -1,11 +1,12 @@
 import type { UI5FlexLayer, ManifestNamespace, Manifest, Package } from '@sap-ux/project-access';
 import type { DestinationAbapTarget, UrlAbapTarget } from '@sap-ux/system-access';
 import type { Adp, BspApp } from '@sap-ux/ui5-config';
-import type { AxiosRequestConfig, KeyUserChangeContent, OperationsType } from '@sap-ux/axios-extension';
+import type { AdaptationProjectType, AxiosRequestConfig, KeyUserChangeContent, OperationsType } from '@sap-ux/axios-extension';
 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 { SupportedProject } from './source';
 export interface DescriptorVariant {
     layer: UI5FlexLayer;
     reference: string;
@@ -150,10 +151,11 @@ export interface SourceApplication {
     fileType: string;
     bspUrl: string;
     bspName: string;
+    cloudDevAdaptationStatus: string;
 }
-export interface FlexUISupportedSystem {
-    isUIFlex: boolean;
-    isOnPremise: boolean;
+export interface FlexUICapability {
+    isUIFlexSupported: boolean;
+    isDtaFolderDeploymentSupported: boolean;
 }
 export interface UI5Version {
     latest: VersionDetail;
@@ -685,6 +687,8 @@ export interface CustomConfig {
     adp: {
         environment: OperationsType;
         support: ToolsSupport;
+        projectType?: AdaptationProjectType;
+        supportedProject?: SupportedProject;
     };
 }
 export type CloudCustomTaskConfigTarget = DestinationAbapTarget | (Pick<UrlAbapTarget, 'url' | 'client' | 'scp' | 'authenticationType'> & {

package/dist/writer/options.js

@@ -10,6 +10,8 @@ exports.enhanceManifestChangeContentWithFlpConfig = enhanceManifestChangeContent
 exports.enhanceUI5YamlWithCfCustomTask = enhanceUI5YamlWithCfCustomTask;
 exports.enhanceUI5YamlWithFioriToolsMiddleware = enhanceUI5YamlWithFioriToolsMiddleware;
 const constants_1 = require("../base/constants");
+const axios_extension_1 = require("@sap-ux/axios-extension");
+const source_1 = require("../source");
 const VSCODE_URL = 'https://REQUIRED_FOR_VSCODE.example';
 /**
  * Generate the configuration for the middlewares required for the ui5.yaml.
@@ -50,7 +52,7 @@ function enhanceUI5YamlWithCustomTask(ui5Config, config) {
             }
         ]);
     }
-    if (config.customConfig?.adp?.environment === 'C') {
+    if (config.customConfig?.adp?.projectType === axios_extension_1.AdaptationProjectType.CLOUD_READY) {
         const tasks = getAdpCloudCustomTasks(config);
         ui5Config.addCustomTasks(tasks);
     }
@@ -211,10 +213,15 @@ function getAdpCloudCustomTasks(config) {
         };
     }
     else {
+        const customConfig = config.customConfig?.adp;
+        const isCloudProjectInPrivateCloudSystem = customConfig?.projectType === axios_extension_1.AdaptationProjectType.CLOUD_READY &&
+            customConfig.supportedProject === source_1.SupportedProject.CLOUD_READY_AND_ON_PREM;
+        const client = isCloudProjectInPrivateCloudSystem ? config.target.client : undefined;
         target = {
             url: config.target.url ?? VSCODE_URL,
             authenticationType: config.target.authenticationType,
-            ignoreCertErrors: false
+            ignoreCertErrors: false,
+            client
         };
     }
     const configuration = {

package/dist/writer/writer-config.d.ts

@@ -1,6 +1,6 @@
 import type { ToolsLogger } from '@sap-ux/logger';
 import type { Manifest, Package } from '@sap-ux/project-access';
-import type { AbapServiceProvider, KeyUserChangeContent } from '@sap-ux/axios-extension';
+import { type AbapServiceProvider, AdaptationProjectType, type KeyUserChangeContent } from '@sap-ux/axios-extension';
 import type { AdpWriterConfig, AttributesAnswers, CfAdpWriterConfig, ConfigAnswers, CreateCfConfigParams, UI5Version } from '../types';
 import { FlexLayer } from '../types';
 export interface ConfigOptions {
@@ -36,6 +36,10 @@ export interface ConfigOptions {
      * The application manifest.
      */
     manifest: Manifest | undefined;
+    /**
+     * The Adaptation project type.
+     */
+    projectType?: AdaptationProjectType;
     /**
      * Logger instance for debugging and error reporting.
      */

package/dist/writer/writer-config.js

@@ -4,10 +4,12 @@ exports.getConfig = getConfig;
 exports.getUi5Config = getUi5Config;
 exports.getCfConfig = getCfConfig;
 const node_path_1 = require("node:path");
+const axios_extension_1 = require("@sap-ux/axios-extension");
 const ui5_1 = require("../ui5");
 const abap_1 = require("../abap");
 const types_1 = require("../types");
 const i18n_1 = require("../i18n");
+const source_1 = require("../source");
 /**
  * Generates the configuration object for the Adaptation Project.
  *
@@ -22,13 +24,13 @@ const i18n_1 = require("../i18n");
  * @returns {Promise<AdpWriterConfig>} A promise that resolves to the generated ADP writer configuration.
  */
 async function getConfig(options) {
-    const { configAnswers, attributeAnswers, layer, logger, packageJson, provider, publicVersions, systemVersion, manifest, toolsId, keyUserChanges } = options;
+    const { configAnswers, attributeAnswers, layer, logger, packageJson, provider, publicVersions, systemVersion, manifest, projectType, toolsId, keyUserChanges } = options;
     const ato = await provider.getAtoInfo();
     const operationsType = ato.operationsType ?? 'P';
     const target = await (0, abap_1.getProviderConfig)(configAnswers.system, logger);
-    const isCloudProject = await provider.isAbapCloud();
+    const isCloudSystem = await provider.isAbapCloud();
     const isCustomerBase = layer === "CUSTOMER_BASE" /* FlexLayer.CUSTOMER_BASE */;
-    const ui5Version = isCloudProject
+    const ui5Version = isCloudSystem
         ? (0, ui5_1.getLatestVersion)(publicVersions)
         : (0, ui5_1.getVersionToBeUsed)(attributeAnswers.ui5Version, isCustomerBase, publicVersions);
     const { namespace, title, enableTypeScript } = attributeAnswers;
@@ -42,7 +44,8 @@ async function getConfig(options) {
         ach,
         fioriId
     };
-    if (isCloudProject) {
+    const supportedProject = await (0, source_1.getSupportedProject)(provider);
+    if (projectType === axios_extension_1.AdaptationProjectType.CLOUD_READY) {
         const lrep = provider.getLayeredRepository();
         const { activeLanguages: languages } = await lrep.getSystemInfo();
         Object.assign(app, {
@@ -61,7 +64,9 @@ async function getConfig(options) {
                     id: packageJson.name ?? '',
                     version: packageJson.version ?? '',
                     toolsId
-                }
+                },
+                projectType,
+                supportedProject
             }
         },
         target,

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.63",
+  "version": "0.18.66",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -36,18 +36,18 @@
     "prompts": "2.4.2",
     "sanitize-filename": "1.6.3",
     "uuid": "10.0.0",
-    "@sap-ux/axios-extension": "1.25.11",
-    "@sap-ux/btp-utils": "1.1.8",
+    "@sap-ux/axios-extension": "1.25.14",
+    "@sap-ux/btp-utils": "1.1.9",
     "@sap-ux/i18n": "0.3.7",
-    "@sap-ux/inquirer-common": "0.11.5",
+    "@sap-ux/inquirer-common": "0.11.8",
     "@sap-ux/logger": "0.8.1",
-    "@sap-ux/nodejs-utils": "0.2.14",
-    "@sap-ux/odata-service-writer": "0.29.18",
-    "@sap-ux/project-access": "1.35.3",
-    "@sap-ux/project-input-validator": "0.6.55",
+    "@sap-ux/nodejs-utils": "0.2.15",
+    "@sap-ux/odata-service-writer": "0.29.20",
+    "@sap-ux/project-access": "1.35.5",
+    "@sap-ux/project-input-validator": "0.6.57",
     "@sap-ux/store": "1.5.6",
-    "@sap-ux/system-access": "0.6.51",
-    "@sap-ux/ui5-config": "0.29.16",
+    "@sap-ux/system-access": "0.6.54",
+    "@sap-ux/ui5-config": "0.29.17",
     "@sap-ux/ui5-info": "0.13.12"
   },
   "devDependencies": {