@sap-ux/repo-app-import-sub-generator 1.1.39 → 1.1.41

package/generators/app/index.js

@@ -6,8 +6,7 @@ import { extractedFilePath, generatorName, defaultAnswers, qfaJsonFileName, down
 import { t } from '../utils/i18n.js';
 import { extractZip } from '../utils/download-utils.js';
 import { EventName } from '../telemetryEvents/index.js';
-import { getDefaultTargetFolder, generateAppGenInfo, sendTelemetry, TelemetryHelper, isCli, setYeomanEnvConflicterForce } from '@sap-ux/fiori-generator-shared';
-import { getFloorplanLabel } from '@sap-ux/fiori-app-sub-generator';
+import { getDefaultTargetFolder, generateAppGenInfo, sendTelemetry, TelemetryHelper, isCli, setYeomanEnvConflicterForce, getFloorplanLabel } from '@sap-ux/fiori-generator-shared';
 import { AppDownloadType, PromptNames } from './types.js';
 import { getPrompts } from '../prompts/prompts.js';
 import { generate } from '@sap-ux/fiori-elements-writer';
@@ -111,11 +110,26 @@ export default class extends Generator {
      * Writes the configuration files for the project, including deployment config, and README.
      */
     async writing() {
-        if (this.downloadType === AppDownloadType.AbapRepository) {
-            await this._generateAbapRepositoryApp();
+        try {
+            if (this.downloadType === AppDownloadType.AbapRepository) {
+                await this._generateAbapRepositoryApp();
+            }
+            else {
+                await this._generateAdtQuickDeployApp();
+            }
         }
-        else {
-            await this._generateAdtQuickDeployApp();
+        catch (error) {
+            RepoAppDownloadLogger.logger?.error(t('error.writingPhase', { error: error instanceof Error ? error.message : String(error) }));
+            const failEvent = this.downloadType === AppDownloadType.AbapRepository
+                ? EventName.ABAP_REPO_DOWNLOAD_FAIL
+                : EventName.ADT_QUICK_DEPLOY_DOWNLOAD_FAIL;
+            await sendTelemetry(failEvent, TelemetryHelper.createTelemetryData({
+                appType: generatorName,
+                ...this.options.telemetryData
+            }) ?? {}).catch(() => {
+                // telemetry errors are non-fatal
+            });
+            throw error;
         }
     }
     /**
@@ -319,8 +333,11 @@ export default class extends Generator {
         try {
             this.appWizard.showInformation(downloadTypeConfig[this.downloadType].generatorSuccessMsg, MessageType.notification);
             await this._handlePostAppGeneration();
-            await sendTelemetry(EventName.GENERATION_SUCCESS, TelemetryHelper.createTelemetryData({
-                appType: 'repo-app-import-sub-generator',
+            const successEvent = this.downloadType === AppDownloadType.AbapRepository
+                ? EventName.ABAP_REPO_DOWNLOAD_SUCCESS
+                : EventName.ADT_QUICK_DEPLOY_DOWNLOAD_SUCCESS;
+            await sendTelemetry(successEvent, TelemetryHelper.createTelemetryData({
+                appType: generatorName,
                 ...this.options.telemetryData
             }) ?? {}).catch((error) => {
                 RepoAppDownloadLogger.logger?.error(t('error.telemetry', { error: error.message }));

package/generators/telemetryEvents/index.d.ts

@@ -2,6 +2,9 @@
  * Event names for telemetry for the generator when downloading an app from repository
  */
 export declare enum EventName {
-    GENERATION_SUCCESS = "GENERATION_SUCCESS"
+    ABAP_REPO_DOWNLOAD_SUCCESS = "ABAP_REPO_DOWNLOAD_SUCCESS",
+    ABAP_REPO_DOWNLOAD_FAIL = "ABAP_REPO_DOWNLOAD_FAIL",
+    ADT_QUICK_DEPLOY_DOWNLOAD_SUCCESS = "ADT_QUICK_DEPLOY_DOWNLOAD_SUCCESS",
+    ADT_QUICK_DEPLOY_DOWNLOAD_FAIL = "ADT_QUICK_DEPLOY_DOWNLOAD_FAIL"
 }
 //# sourceMappingURL=index.d.ts.map

package/generators/telemetryEvents/index.js

@@ -3,6 +3,9 @@
  */
 export var EventName;
 (function (EventName) {
-    EventName["GENERATION_SUCCESS"] = "GENERATION_SUCCESS";
+    EventName["ABAP_REPO_DOWNLOAD_SUCCESS"] = "ABAP_REPO_DOWNLOAD_SUCCESS";
+    EventName["ABAP_REPO_DOWNLOAD_FAIL"] = "ABAP_REPO_DOWNLOAD_FAIL";
+    EventName["ADT_QUICK_DEPLOY_DOWNLOAD_SUCCESS"] = "ADT_QUICK_DEPLOY_DOWNLOAD_SUCCESS";
+    EventName["ADT_QUICK_DEPLOY_DOWNLOAD_FAIL"] = "ADT_QUICK_DEPLOY_DOWNLOAD_FAIL";
 })(EventName || (EventName = {}));
 //# sourceMappingURL=index.js.map

package/generators/translations/repo-app-import-sub-generator.i18n.json

@@ -7,6 +7,7 @@
         "metadataFetchError": "An error occurred when fetching metadata: {{- error}}. For more information, view the logs.",
         "appConfigGenError": "An error occurred when generating the application configuration: {{- error}}. For more information, view the logs.",
         "endPhase": "An error occurred in the end phase: {{- error}}. For more information, view the logs.",
+        "writingPhase": "An error occurred in the writing phase: {{- error}}. For more information, view the logs.",
         "errorProcessingJsonFile": "An error occurred when processing the JSON file: {{- error}}. Check the file is valid.",
         "noAppsDeployed": "No applications deployed to this system can be downloaded.",
         "validationErrors": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/repo-app-import-sub-generator",
   "description": "Generator to download LROP Fiori applications deployed from an ABAP repository.",
-  "version": "1.1.39",
+  "version": "1.1.41",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -26,13 +26,12 @@
     "inquirer": "8.2.7",
     "yeoman-generator": "5.10.0",
     "@sap-ux/feature-toggle": "1.0.5",
-    "@sap-ux/fiori-generator-shared": "1.0.20",
-    "@sap-ux/inquirer-common": "1.0.21",
+    "@sap-ux/fiori-generator-shared": "1.1.0",
+    "@sap-ux/inquirer-common": "1.0.22",
     "@sap-ux/project-access": "2.1.6",
-    "@sap-ux/odata-service-inquirer": "3.0.23",
-    "@sap-ux/fiori-elements-writer": "3.0.55",
-    "@sap-ux/fiori-freestyle-writer": "3.0.50",
-    "@sap-ux/fiori-app-sub-generator": "1.1.7",
+    "@sap-ux/odata-service-inquirer": "3.0.24",
+    "@sap-ux/fiori-elements-writer": "3.0.57",
+    "@sap-ux/fiori-freestyle-writer": "3.0.51",
     "@sap-ux/logger": "1.0.3",
     "@sap-ux/project-input-validator": "1.0.10",
     "@sap-ux/launch-config": "1.0.12",