@sap-ux/create 0.8.78 → 0.8.80

package/dist/cli/add/annotations-to-odata.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAnnotationsToOdataCommand = addAnnotationsToOdataCommand;
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
+const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
 const tracing_1 = require("../../tracing");
 const common_1 = require("../../common");
 const validation_1 = require("../../validation/validation");
@@ -35,13 +36,21 @@ async function addAnnotationsToOdata(basePath, simulate, yamlPath) {
         await (0, validation_1.validateAdpProject)(basePath);
         const variant = (0, adp_tooling_1.getVariant)(basePath);
         const adpConfig = await (0, adp_tooling_1.getAdpConfig)(basePath, yamlPath);
-        const dataSources = await (0, adp_tooling_1.getManifestDataSources)(variant.reference, adpConfig, logger);
+        const manifestService = await adp_tooling_1.ManifestService.initMergedManifest(basePath, variant, adpConfig, logger);
+        const dataSources = manifestService.getManifestDataSources();
         const answers = await (0, common_1.promptYUIQuestions)((0, adp_tooling_1.getPromptsForAddAnnotationsToOData)(basePath, dataSources), false);
+        let namespaces = [];
+        if (!answers.filePath) {
+            const metadata = await manifestService.getDataSourceMetadata(answers.id);
+            namespaces = (0, odata_service_writer_1.getAnnotationNamespaces)({ metadata });
+        }
         const fs = await (0, adp_tooling_1.generateChange)(basePath, "appdescr_app_addAnnotationsToOData" /* ChangeType.ADD_ANNOTATIONS_TO_ODATA */, {
             variant,
             annotation: {
                 dataSource: answers.id,
-                filePath: answers.filePath
+                filePath: answers.filePath,
+                namespaces,
+                serviceUrl: dataSources[answers.id].uri
             }
         });
         if (!simulate) {
@@ -55,7 +64,7 @@ async function addAnnotationsToOdata(basePath, simulate, yamlPath) {
         logger.error(error.message);
         if (error.response?.status === 401 && loginAttempts) {
             loginAttempts--;
-            logger.error(`Authentication failed. Please check your credentials. Login attempts left: ${loginAttempts}`);
+            logger.error(`Authentication failed. Please check your credentials. Login attempts left: ${loginAttempts + 1}`);
             await addAnnotationsToOdata(basePath, simulate, yamlPath);
             return;
         }

package/dist/cli/change/change-data-source.js

@@ -35,7 +35,8 @@ async function changeDataSource(basePath, simulate, yamlPath) {
         await (0, validation_1.validateAdpProject)(basePath);
         const variant = (0, adp_tooling_1.getVariant)(basePath);
         const adpConfig = await (0, adp_tooling_1.getAdpConfig)(basePath, yamlPath);
-        const dataSources = await (0, adp_tooling_1.getManifestDataSources)(variant.reference, adpConfig, logger);
+        const manifestService = await adp_tooling_1.ManifestService.initBaseManifest(variant.reference, adpConfig, logger);
+        const dataSources = manifestService.getManifestDataSources();
         const answers = await (0, common_1.promptYUIQuestions)((0, adp_tooling_1.getPromptsForChangeDataSource)(dataSources), false);
         const fs = await (0, adp_tooling_1.generateChange)(basePath, "appdescr_app_changeDataSource" /* ChangeType.CHANGE_DATA_SOURCE */, {
             variant,
@@ -53,7 +54,7 @@ async function changeDataSource(basePath, simulate, yamlPath) {
         logger.error(error.message);
         if (error.response?.status === 401 && loginAttempts) {
             loginAttempts--;
-            logger.error(`Authentication failed. Please check your credentials. Login attempts left: ${loginAttempts}`);
+            logger.error(`Authentication failed. Please check your credentials. Login attempts left: ${loginAttempts + 1}`);
             await changeDataSource(basePath, simulate, yamlPath);
             return;
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/create",
   "description": "SAP Fiori tools module to add or remove features",
-  "version": "0.8.78",
+  "version": "0.8.80",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,19 +30,20 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "prompts": "2.4.2",
-    "@sap-ux/abap-deploy-config-inquirer": "1.0.20",
-    "@sap-ux/adp-tooling": "0.12.76",
-    "@sap-ux/abap-deploy-config-writer": "0.0.59",
-    "@sap-ux/app-config-writer": "0.4.52",
-    "@sap-ux/cap-config-writer": "0.7.57",
-    "@sap-ux/cards-editor-config-writer": "0.4.6",
-    "@sap-ux/inquirer-common": "0.5.0",
+    "@sap-ux/abap-deploy-config-inquirer": "1.0.22",
+    "@sap-ux/abap-deploy-config-writer": "0.0.61",
+    "@sap-ux/adp-tooling": "0.12.78",
+    "@sap-ux/app-config-writer": "0.4.54",
+    "@sap-ux/cap-config-writer": "0.7.58",
+    "@sap-ux/cards-editor-config-writer": "0.4.7",
+    "@sap-ux/inquirer-common": "0.5.1",
     "@sap-ux/logger": "0.6.0",
-    "@sap-ux/mockserver-config-writer": "0.6.6",
-    "@sap-ux/preview-middleware": "0.16.118",
-    "@sap-ux/system-access": "0.5.17",
-    "@sap-ux/project-access": "1.28.6",
-    "@sap-ux/ui5-config": "0.25.1"
+    "@sap-ux/mockserver-config-writer": "0.6.7",
+    "@sap-ux/odata-service-writer": "0.23.3",
+    "@sap-ux/preview-middleware": "0.16.120",
+    "@sap-ux/project-access": "1.28.7",
+    "@sap-ux/system-access": "0.5.18",
+    "@sap-ux/ui5-config": "0.25.2"
   },
   "devDependencies": {
     "@types/diff": "5.0.9",
@@ -50,7 +51,7 @@
     "@types/mem-fs": "1.1.2",
     "@types/mem-fs-editor": "7.0.1",
     "@types/prompts": "2.4.4",
-    "@sap-ux/inquirer-common": "0.5.0",
+    "@sap-ux/inquirer-common": "0.5.1",
     "@sap-ux/store": "0.9.3"
   },
   "scripts": {