@sap-ux/adp-tooling 0.18.101 → 0.18.103

package/dist/cf/services/manifest.js

@@ -37,7 +37,7 @@ class ManifestServiceCF {
     static async init(projectPath, logger) {
         const service = new ManifestServiceCF(logger);
         logger.debug('Triggering project build to generate dist folder');
-        await (0, project_builder_1.runBuild)(projectPath, { ADP_BUILDER_MODE: 'preview' });
+        await (0, project_builder_1.runBuild)(projectPath);
         const manifestPath = (0, node_path_1.join)(projectPath, CF_BUILD_PATH, 'manifest.json');
         logger.debug(`Reading manifest from '${manifestPath}'`);
         const manifestContent = (0, node_fs_1.readFileSync)(manifestPath, 'utf-8');

package/dist/prompts/change-data-source/index.js

@@ -4,6 +4,23 @@ exports.getPrompts = getPrompts;
 const i18n_1 = require("../../i18n");
 const project_access_1 = require("@sap-ux/project-access");
 const project_input_validator_1 = require("@sap-ux/project-input-validator");
+/**
+ * Checks if the selected service has server-side annotations.
+ * A server-side annotation is detected when:
+ * 1. The service has annotations referenced in its settings
+ * 2. The referenced annotation data source has a URI starting with '/'
+ *
+ * @param {Record<string, ManifestNamespace.DataSource>} dataSources - All data sources from the manifest.
+ * @param {string} serviceId - The selected service ID.
+ * @returns {boolean} True if server-side annotations are detected for the selected service.
+ */
+function hasServerSideAnnotations(dataSources, serviceId) {
+    const annotationId = dataSources[serviceId]?.settings?.annotations?.[0];
+    if (!annotationId) {
+        return false;
+    }
+    return !!dataSources[annotationId]?.uri?.startsWith('/');
+}
 /**
  * Validates the OData Source URI prompt.
  *
@@ -85,7 +102,8 @@ function getPrompts(dataSources) {
             guiOptions: {
                 hint: (0, i18n_1.t)('prompts.oDataAnnotationSourceURITooltip')
             },
-            validate: validatePromptAnnotationURI
+            validate: validatePromptAnnotationURI,
+            when: (answers) => hasServerSideAnnotations(dataSources, answers.id)
         }
     ];
 }

package/dist/source/applications.d.ts

@@ -1,6 +1,7 @@
-import { type AbapServiceProvider, AdaptationProjectType } from '@sap-ux/axios-extension';
+import type { AbapServiceProvider } from '@sap-ux/axios-extension';
 import type { ToolsLogger } from '@sap-ux/logger';
 import type { SourceApplication } from '../types';
+import { SupportedProject } from './systems';
 /**
  * Checks whether the application supports manifest-first approach.
  *
@@ -16,12 +17,12 @@ export declare function isAppSupported(provider: AbapServiceProvider, id: string
  *
  * @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.
- * @param {AdaptationProjectType | undefined} projectType - The project type.
+ * @param {SupportedProject | undefined} supportedProject - The supported ADP projects by the system.
  * @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
+ * in case the {@link isCustomerBase} flag is set to true. In case the {@link supportedProject} is NOT set
  * we return an empty array.
  */
-export declare function loadApps(provider: AbapServiceProvider, isCustomerBase: boolean, projectType?: AdaptationProjectType): Promise<SourceApplication[]>;
+export declare function loadApps(provider: AbapServiceProvider, isCustomerBase: boolean, supportedProject?: SupportedProject): Promise<SourceApplication[]>;
 //# sourceMappingURL=applications.d.ts.map

package/dist/source/applications.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAppSupported = isAppSupported;
 exports.loadApps = loadApps;
-const axios_extension_1 = require("@sap-ux/axios-extension");
 const i18n_1 = require("../i18n");
-const ONPREM_APP_FIELDS = [
+const systems_1 = require("./systems");
+const ONPREM_APP_FIELDS_LIST = [
     'sap.app/id',
     'sap.app/ach',
     'sap.fiori/registrationIds',
@@ -13,22 +13,23 @@ const ONPREM_APP_FIELDS = [
     'fileType',
     'repoName'
 ];
-const CLOUD_APP_FIELDS = [...ONPREM_APP_FIELDS, 'sap.fiori/cloudDevAdaptationStatus'];
+const ONPREM_APP_FIELDS_STR = ONPREM_APP_FIELDS_LIST.join(',');
+const CLOUD_APP_FIELDS_STR = [...ONPREM_APP_FIELDS_LIST, 'sap.fiori/cloudDevAdaptationStatus'].join(',');
 const APPS_WITH_DESCR_FILTER = {
-    fields: ONPREM_APP_FIELDS.join(','),
+    fields: ONPREM_APP_FIELDS_STR,
     'sap.ui/technology': 'UI5',
     'sap.app/type': 'application',
     'fileType': 'appdescr'
 };
 const APPS_WITH_VARIANT_DESCR_FILTER = {
-    fields: ONPREM_APP_FIELDS.join(','),
+    fields: ONPREM_APP_FIELDS_STR,
     'sap.ui/technology': 'UI5',
     'sap.app/type': 'application',
     'fileType': 'appdescr_variant',
     'originLayer': 'VENDOR'
 };
 const CLOUD_ONLY_APPS_FILTER = {
-    fields: CLOUD_APP_FIELDS.join(','),
+    fields: CLOUD_APP_FIELDS_STR,
     'sap.app/type': 'application',
     'sap.fiori/cloudDevAdaptationStatus': 'released'
 };
@@ -97,29 +98,46 @@ async function isAppSupported(provider, id, logger) {
  *
  * @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.
- * @param {AdaptationProjectType | undefined} projectType - The project type.
+ * @param {SupportedProject | undefined} supportedProject - The supported ADP projects by the system.
  * @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
+ * in case the {@link isCustomerBase} flag is set to true. In case the {@link supportedProject} is NOT set
  * we return an empty array.
  */
-async function loadApps(provider, isCustomerBase, projectType) {
-    if (!projectType) {
+async function loadApps(provider, isCustomerBase, supportedProject) {
+    if (!supportedProject) {
         return [];
     }
     try {
         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();
+        const appIndex = (await Promise.all(getAppFilters(isCustomerBase, supportedProject).map((filter) => appIndexService.search(filter)))).flat();
         return appIndex.map(toSourceApplication).sort(compareByTitleOrId);
     }
     catch (error) {
         throw new Error(`Could not load applications: ${error.message}`);
     }
 }
+/**
+ * Helper method used to create the application filters required by the app index service.
+ *
+ * @param {boolean} isCustomerBase Indicates whether the system is customer-based or not.
+ * @param {SupportedProject} supportedProject The supported ADP projects by the system.
+ * @returns {UI5AppFilter[]} The array of filters dermined by the supported ADP projects from the system.
+ */
+function getAppFilters(isCustomerBase, supportedProject) {
+    if (supportedProject === systems_1.SupportedProject.CLOUD_READY) {
+        return [CLOUD_ONLY_APPS_FILTER];
+    }
+    const displayAllAppsFilters = [APPS_WITH_DESCR_FILTER, ...(isCustomerBase ? [APPS_WITH_VARIANT_DESCR_FILTER] : [])];
+    if (supportedProject === systems_1.SupportedProject.CLOUD_READY_AND_ON_PREM) {
+        // In case of a mixed system we want to also include the cloudDevAdaptationStatus property
+        // for each application result in the list. The property is available as a column for all apps
+        // due to the nature of the system - mixed, so we are safe no error 400 will occur like
+        // with older onPremise only systems for which the column is missing. For non cloud app the
+        // property cloudDevAdaptationStatus has value an empty string for a cloud app - 'released'.
+        return displayAllAppsFilters.map((filter) => ({ ...filter, fields: CLOUD_APP_FIELDS_STR }));
+    }
+    return displayAllAppsFilters;
+}
 //# sourceMappingURL=applications.js.map

package/dist/types.d.ts

@@ -154,6 +154,7 @@ export interface ConfigAnswers {
     password: string;
     storeCredentials?: boolean;
     application: SourceApplication;
+    projectType?: AdaptationProjectType;
     fioriId?: string;
     ach?: string;
     shouldCreateExtProject?: boolean;

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.101",
+  "version": "0.18.103",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",