Merge pull request #444 from sf-aastha-paruthi/u/aparuthi/blitzfixes

@W-20155340 - [Dev Blitz] OMA Use Case#2 issues

Author: sf-aastha-paruthi

src/migration/flexcard.ts

@@ -935,6 +935,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
         }
 
         uploadResult.newName = transformedCardName;
+        uploadResult.actualName = transformedCard['Name']; // This is required as storage needs name without version, for replacement in other references
         if (transformedCard['Name'] !== card['Name']) {
           uploadResult.warnings.unshift(this.messages.getMessage('cardNameChangeMessage', [transformedCardName]));
         }
@@ -1000,6 +1001,10 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
         if (flexCardAssessmentInfo.errors && flexCardAssessmentInfo.errors.length > 0) {
           value.error = flexCardAssessmentInfo.errors;
           value.migrationSuccess = false;
+        } else if (flexCardAssessmentInfo.migrationStatus === 'Needs manual intervention') {
+          // Duplicate name and other critical warnings
+          value.error = flexCardAssessmentInfo.warnings;
+          value.migrationSuccess = false;
         } else {
           value.migrationSuccess = true;
         }
@@ -1059,13 +1064,19 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
 
         const originalName: string = oldrecord['Name'];
         let value: FlexcardStorage = {
-          name: newrecord?.newName,
+          name: newrecord?.actualName,
           isDuplicate: false,
           originalName: originalName,
         };
 
         if (newrecord === undefined) {
-          value.error = ['Migration Failed'];
+          // Card was not migrated - check if original record has error details
+          if (oldrecord['errors'] && Array.isArray(oldrecord['errors'])) {
+            value.error = oldrecord['errors'];
+          } else {
+            value.error = ['Migration Failed'];
+          }
+          value.migrationSuccess = false;
         } else {
           if (newrecord.hasErrors) {
             value.error = newrecord.errors;

src/migration/interfaces.ts

@@ -38,7 +38,8 @@ export interface ObjectMapping {
 export interface UploadRecordResult {
   referenceId: string;
   id?: string;
-  newName?: string;
+  newName?: string; // Display name (may include version suffix for reports)
+  actualName?: string; // Actual Salesforce Name field (for references/dependencies)
   errors: string[];
   warnings: string[];
   hasErrors: boolean;

src/migration/premigrate.ts

@@ -131,17 +131,21 @@ export class PreMigrate extends BaseMigrationTool {
       deploymentConfig.authKey = process.env[authEnvKey];
       if (!deploymentConfig.authKey) {
         Logger.warn(this.messages.getMessage('authKeyEnvVarNotSet'));
-        actionItems.push(this.messages.getMessage('authKeyEnvVarNotSet'));
+        actionItems.push(
+          `${this.messages.getMessage('authKeyEnvVarNotSet')}\n${this.messages.getMessage('manualDeploymentSteps', [
+            documentRegistry.manualDeploymentSteps,
+          ])}`
+        );
       }
     }
 
     if (!consent) {
       Logger.warn(this.messages.getMessage('deploymentConsentNotGiven'));
-      actionItems.push(this.messages.getMessage('deploymentConsentNotGiven'));
-    }
-
-    if (!consent || (includeLwc && !deploymentConfig.authKey)) {
-      actionItems.push(this.messages.getMessage('manualDeploymentSteps', [documentRegistry.manualDeploymentSteps]));
+      actionItems.push(
+        `${this.messages.getMessage('deploymentConsentNotGiven')}\n${this.messages.getMessage('manualDeploymentSteps', [
+          documentRegistry.manualDeploymentSteps,
+        ])}`
+      );
     }
 
     return deploymentConfig;