Merge branch 'prerelease/develop-ga' into mvp_alpha

Author: snehaljha-sf

messages/assess.json

@@ -64,7 +64,7 @@
   "flexCardAssessmentCompleted": "FlexCard assessment completed",
   "globalAutoNumberAssessment": "GlobalAutoNumber Assessment",
   "assessedGlobalAutoNumbersCount": "Assessed %s GlobalAutoNumbers",
-  "globalAutoNumberAssessmentCompleted": "GlobalAutoNumber assessment completed",
+  "globalAutoNumberAssessmentCompleted": "The assessment for Global Auto Number is complete.",
   "omniScriptAssessment": "OmniScript and Integration Procedure Assessment",
   "assessedOmniScriptsCount": "Assessed %s OmniScripts",
   "assessedIntegrationProceduresCount": "Assessed %s Integration Procedures",

messages/migrate.json

@@ -66,6 +66,7 @@
   "migratingComponent": "Migrating: %s",
   "cleaningFailed": "Cleaning Failed: %s",
   "migrationCompleted": "Migration completed: %s",
+  "migrationFailed": "Migration failed: %s",
   "formulaSyntaxError": "There was some problem while updating the formula syntax, please check the all the formula's syntax once : %s",
   "foundDataRaptorsToMigrate": "Found %s DataRaptors to migrate",
   "foundFlexCardsToMigrate": "Found %s FlexCards to migrate",
@@ -131,24 +132,26 @@
   "errorProcessingFlexiPage": "Error processing flexipage file: %s, %s",
   "flexipagesWithChanges": "Found %s flexipage files with changes",
   "omniGlobalAutoNumberPrefEnabled": "Successfully enabled OmniGlobalAutoNumberPref org preference",
-  "errorEnablingOmniGlobalAutoNumberPref": "Error enabling OmniGlobalAutoNumberPref org preference",
+  "errorEnablingOmniGlobalAutoNumberPref": "We couldn’t enable the Global Auto Number setting. Turn on the Global Auto Number setting manually, and try again. See <a href='https://help.salesforce.com/s/articleView?id=xcloud.os_standard_global_auto_number.htm&type=5' target='_blank'>Set Up Omni Global Auto Number</a>.",
   "performingPreMigrationChecks": "Performing pre-migration checks for Global Auto Number...",
   "preMigrationChecksPassed": "Pre-migration checks passed. Proceeding with Global Auto Number migration.",
   "preMigrationChecksFailed": "Pre-migration checks failed. Migration cannot proceed.",
-  "globalAutoNumberPrefEnabledError": "Global Auto Number preference (OmniGlobalAutoNumberPref) is enabled. Please disable it before proceeding with migration.",
-  "bothRollbackFlagsEnabledError": "Both RollbackIPChanges and RollbackDRChanges flags are enabled. Please disable both flags before proceeding with Global Auto Number migration.",
-  "rollbackIPFlagEnabledError": "RollbackIPChanges flag is enabled. Please disable this flag before proceeding with Global Auto Number migration.",
-  "rollbackDRFlagEnabledError": "RollbackDRChanges flag is enabled. Please disable this flag before proceeding with Global Auto Number migration.",
+  "globalAutoNumberPrefEnabledError": "The Global Auto Number setting is enabled and global auto numbers have already been migrated.",
+  "bothRollbackFlagsEnabledError": "We couldn’t turn on Global Auto Number. Disable the RollBackDRChanges and RollBackIPChanges <a href='https://help.salesforce.com/s/articleView?id=xcloud.os_standard_global_auto_number.htm&type=5' target='_blank'>Omni Interaction Configurations</a>, and try again.",
+  "rollbackIPFlagEnabledError": "We couldn’t turn on Global Auto Number. Disable the RollBackIPChanges <a href='https://help.salesforce.com/s/articleView?id=xcloud.os_standard_global_auto_number.htm&type=5' target='_blank'>Omni Interaction Configurations</a> and try again.",
+  "rollbackDRFlagEnabledError": "We couldn’t turn on Global Auto Number. Disable the RollBackDRChanges <a href='https://help.salesforce.com/s/articleView?id=xcloud.os_standard_global_auto_number.htm&type=5' target='_blank'>Omni Interaction Configurations</a> and try again.",
   "errorCheckingRollbackFlags": "Error checking rollback flags status.",
   "startingPostMigrationCleanup": "Starting post-migration cleanup for Global Auto Number...",
   "postMigrationCleanupCompleted": "Post-migration cleanup completed successfully.",
-  "errorDuringPostMigrationCleanup": "Error during post-migration cleanup.",
+  "errorDuringPostMigrationCleanup": "We’ve encountered an error during the post-migration cleanup. Try again later.",
   "globalAutoNumberNameChangeMessage": "Global Auto Number name has been modified to fit naming rules: %s",
   "duplicatedGlobalAutoNumberName": "Duplicated Global Auto Number name",
   "errorWhileUploadingGlobalAutoNumber": "An error occurred while uploading Global Auto Number: ",
   "startingGlobalAutoNumberAssessment": "Starting Global Auto Number assessment...",
   "foundGlobalAutoNumbersToAssess": "Found %s Global Auto Numbers to assess",
   "unexpectedError": "An unexpected error occurred during processing",
-  "migrationValidationFailed": "Post Migration validation failed.",
-  "incompleteMigrationDetected": "Incomplete migration detected. Source objects: %s, Target objects: %s."
-}
+  "migrationValidationFailed": "The post-migration validation has failed.",
+  "incompleteMigrationDetected": "We couldn’t complete the migration process",
+  "errorCheckingGlobalAutoNumber": "We couldn’t check whether the Global Auto Number setting is enabled: %s. Try again later.",
+  "errorMigrationMessage": "Error migrating object: %s"
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/plugin-omnistudio-migration-tool",
   "description": "This SFDX plugin migrates FlexCard, OmniScript, DataRaptor, and Integration Procedure custom objects to standard objects.",
-  "version": "2.0.0-rc.3",
+  "version": "2.0.0-rc.4",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {

src/commands/omnistudio/migration/migrate.ts

@@ -174,6 +174,9 @@ export default class Migrate extends OmniStudioBaseCommand {
     const debugTimer = DebugTimer.getInstance();
     // We need to truncate the standard objects first
     let objectMigrationResults = await this.truncateObjects(migrationObjects, debugTimer);
+    objectMigrationResults = objectMigrationResults.filter(
+      (result) => result.name !== Constants.GlobalAutoNumberComponentName
+    );
     const allTruncateComplete = objectMigrationResults.length === 0;
 
     if (allTruncateComplete) {
@@ -325,6 +328,7 @@ export default class Migrate extends OmniStudioBaseCommand {
           data: [],
           errors: [ex.message],
         });
+        Logger.logVerbose(ex.stack);
         Logger.error(messages.getMessage('cleaningFailed', [cls.getName()]));
       }
     }
@@ -338,7 +342,11 @@ export default class Migrate extends OmniStudioBaseCommand {
         Logger.log(messages.getMessage('migratingComponent', [cls.getName()]));
         debugTimer.lap('Migrating: ' + cls.getName());
         const results = await cls.migrate();
-        Logger.log(messages.getMessage('migrationCompleted', [cls.getName()]));
+        if (results.some((result) => result?.errors?.length > 0)) {
+          Logger.error(messages.getMessage('migrationFailed', [cls.getName()]));
+        } else {
+          Logger.log(messages.getMessage('migrationCompleted', [cls.getName()]));
+        }
         objectMigrationResults = objectMigrationResults.concat(
           results.map((r) => {
             return {
@@ -353,11 +361,13 @@ export default class Migrate extends OmniStudioBaseCommand {
           Logger.error(ex.message);
           process.exit(1);
         }
-        Logger.error('Error migrating object', ex);
+        const errMsg = error instanceof Error ? error.message : String(error);
+        Logger.error(messages.getMessage('errorMigrationMessage', [errMsg]));
+        Logger.logVerbose(error);
         objectMigrationResults.push({
           name: cls.getName(),
           data: [],
-          errors: [ex.message],
+          errors: [errMsg],
         });
       }
     }

src/migration/globalautonumber.ts

@@ -13,22 +13,23 @@ import { Logger } from '../utils/logger';
 import { createProgressBar } from './base';
 import { OrgPreferences } from '../utils/orgPreferences';
 import { OmniGlobalAutoNumberPrefManager } from '../utils/OmniGlobalAutoNumberPrefManager';
+import { Constants } from '../utils/constants/stringContants';
 
 export class GlobalAutoNumberMigrationTool extends BaseMigrationTool implements MigrationTool {
   private prefManager: OmniGlobalAutoNumberPrefManager;
   private globalAutoNumberSettings: AnyJson[] | null = null;
 
   constructor(namespace: string, connection: Connection, logger: Logger, messages: Messages, ux: UX) {
     super(namespace, connection, logger, messages, ux);
-    this.prefManager = new OmniGlobalAutoNumberPrefManager(this.connection);
+    this.prefManager = new OmniGlobalAutoNumberPrefManager(this.connection, this.messages);
   }
 
   static readonly GLOBAL_AUTO_NUMBER_SETTING_NAME = 'GlobalAutoNumberSetting__c';
   static readonly OMNI_GLOBAL_AUTO_NUMBER_NAME = 'OmniGlobalAutoNumber';
   static readonly ROLLBACK_FLAGS: string[] = ['RollbackIPChanges', 'RollbackDRChanges'];
 
   public getName(): string {
-    return 'GlobalAutoNumber';
+    return Constants.GlobalAutoNumberComponentName;
   }
 
   public getRecordName(record: string) {
@@ -45,12 +46,11 @@ export class GlobalAutoNumberMigrationTool extends BaseMigrationTool implements
   }
 
   public async truncate(): Promise<void> {
-    try {
-      // Perform pre-migration checks before truncation
-      await this.performPreMigrationChecks();
+    // Perform pre-migration checks before truncation
+    await this.performPreMigrationChecks();
+    this.globalAutoNumberSettings = await this.getAllGlobalAutoNumberSettings();
+    if (this.globalAutoNumberSettings.length > 0) {
       await super.truncate(GlobalAutoNumberMigrationTool.OMNI_GLOBAL_AUTO_NUMBER_NAME);
-    } catch (error) {
-      Logger.error(this.messages.getMessage('cleaningFailed', [this.getName()]));
     }
   }
 
@@ -62,7 +62,7 @@ export class GlobalAutoNumberMigrationTool extends BaseMigrationTool implements
     const migrationResult = await this.migrateGlobalAutoNumberData();
 
     // Validate migration success
-    const validationError = await this.validateMigrationSuccess(migrationResult.results);
+    const validationError = await this.validateMigrationSuccess(migrationResult);
 
     const errors = [];
     if (validationError) {
@@ -111,39 +111,41 @@ export class GlobalAutoNumberMigrationTool extends BaseMigrationTool implements
         return errorMessage;
       }
     } catch (error) {
-      Logger.error(this.messages.getMessage('errorDuringPostMigrationCleanup'));
+      Logger.logVerbose(error);
+      const initialCount = this.globalAutoNumberSettings.length;
+      const finalLength = (await this.getAllGlobalAutoNumberSettings()).length;
+      const message =
+        initialCount !== finalLength ? 'errorEnablingOmniGlobalAutoNumberPref' : 'errorDuringPostMigrationCleanup';
+      const errorMessage = this.messages.getMessage(message);
+      Logger.error(errorMessage);
+      return errorMessage;
     }
   }
 
   /**
    * Validate that all Global Auto Number objects are successfully migrated
    * before proceeding with source object truncation
    */
-  private async validateMigrationSuccess(uploadInfo: Map<string, UploadRecordResult>): Promise<string> {
+  private async validateMigrationSuccess(migrationResults: MigrationResult): Promise<string> {
+    const { results, records } = migrationResults;
     // Check if all uploaded records have success: true
-    const failedRecords = Array.from(uploadInfo.values()).filter((result) => !result.success);
-    const successfulRecords = Array.from(uploadInfo.values()).filter((result) => result.success);
+    const failedRecords = Array.from(results.values()).filter((result) => !result.success);
+    const successfulRecords = Array.from(results.values()).filter((result) => result.success);
 
     // Get source count
     const sourceCount = this.globalAutoNumberSettings.length;
     const targetCount = successfulRecords.length;
 
     // Check for count difference
-    if (sourceCount !== targetCount) {
-      const errorMessage = this.messages.getMessage('incompleteMigrationDetected', [sourceCount, targetCount]);
-      Logger.error(errorMessage);
-      Logger.error(this.messages.getMessage('migrationValidationFailed'));
-      return errorMessage;
-    }
-
-    // Check for failed records
-    if (failedRecords.length > 0) {
-      const failedCount = failedRecords.length;
-      const totalCount = uploadInfo.size;
-      const errorMessage = this.messages.getMessage('incompleteMigrationDetected', [
-        totalCount,
-        totalCount - failedCount,
-      ]);
+    if (sourceCount !== targetCount || failedRecords.length > 0) {
+      const uniqueErrors = [
+        ...new Set([...results.values(), ...records.values()].filter((r) => r?.errors?.length).map((r) => r.errors[0])),
+      ];
+      let errorMessage = this.messages.getMessage('incompleteMigrationDetected');
+      if (uniqueErrors.length > 0) {
+        const errors = uniqueErrors.length === 1 ? uniqueErrors[0] : uniqueErrors.join(', ');
+        errorMessage += ` because of ${errors}`;
+      }
       Logger.error(errorMessage);
       Logger.error(this.messages.getMessage('migrationValidationFailed'));
       return errorMessage;
@@ -171,7 +173,6 @@ export class GlobalAutoNumberMigrationTool extends BaseMigrationTool implements
     const isEnabled = await this.prefManager.isEnabled();
     if (isEnabled) {
       const errorMessage = this.messages.getMessage('globalAutoNumberPrefEnabledError');
-      Logger.error(errorMessage);
       throw new Error(errorMessage);
     }
     // Check rollback flags using existing utility
@@ -188,7 +189,6 @@ export class GlobalAutoNumberMigrationTool extends BaseMigrationTool implements
       } else if (enabledFlags.includes('RollbackDRChanges')) {
         errorMessage = this.messages.getMessage('rollbackDRFlagEnabledError');
       }
-      Logger.error(errorMessage);
       throw new Error(errorMessage);
     }
   }
@@ -198,10 +198,6 @@ export class GlobalAutoNumberMigrationTool extends BaseMigrationTool implements
     let globalAutoNumberUploadInfo = new Map<string, UploadRecordResult>();
     const uniqueNames = new Set<string>();
 
-    // Query all GlobalAutoNumber settings
-    DebugTimer.getInstance().lap('Query GlobalAutoNumber settings');
-    this.globalAutoNumberSettings = await this.getAllGlobalAutoNumberSettings();
-
     let progressCounter = 0;
     Logger.logVerbose(
       this.messages.getMessage('foundGlobalAutoNumbersToMigrate', [this.globalAutoNumberSettings.length])
@@ -262,16 +258,17 @@ export class GlobalAutoNumberMigrationTool extends BaseMigrationTool implements
           referenceId: recordId,
           hasErrors: true,
           success: false,
-          errors: err,
+          errors: [err],
           warnings: [],
         });
+        Logger.logVerbose(err.stack);
       }
     }
 
     progressBar.stop();
 
     return {
-      name: 'GlobalAutoNumber',
+      name: Constants.GlobalAutoNumberComponentName,
       results: globalAutoNumberUploadInfo,
       records: originalGlobalAutoNumberRecords,
       errors: [],
@@ -288,6 +285,7 @@ export class GlobalAutoNumberMigrationTool extends BaseMigrationTool implements
       const globalAutoNumberAssessmentInfos = await this.processGlobalAutoNumberComponents(globalAutoNumbers);
       return globalAutoNumberAssessmentInfos;
     } catch (err) {
+      Logger.logVerbose(err.stack);
       return [];
     }
   }
@@ -314,9 +312,8 @@ export class GlobalAutoNumberMigrationTool extends BaseMigrationTool implements
           warnings: [],
           errors: [this.messages.getMessage('unexpectedError')],
         });
-        const error = e as Error;
-        Logger.error(JSON.stringify(error));
-        Logger.error(error.stack);
+        Logger.error(e.message);
+        Logger.logVerbose(e.stack);
       }
       progressBar.update(++progressCounter);
     }

src/utils/OmniGlobalAutoNumberPrefManager.ts

@@ -1,4 +1,4 @@
-import { Connection } from '@salesforce/core';
+import { Connection, Messages } from '@salesforce/core';
 import { MetadataInfo } from './interfaces';
 import { Logger } from './logger';
 
@@ -12,9 +12,11 @@ import { Logger } from './logger';
  */
 export class OmniGlobalAutoNumberPrefManager {
   private connection: Connection;
+  private messages: Messages;
 
-  public constructor(connection: Connection) {
+  public constructor(connection: Connection, messages: Messages) {
     this.connection = connection;
+    this.messages = messages;
   }
 
   /**
@@ -35,7 +37,7 @@ export class OmniGlobalAutoNumberPrefManager {
       return result?.enableOmniGlobalAutoNumberPref === 'true' || false;
     } catch (error) {
       const errMsg = error instanceof Error ? error.message : String(error);
-      Logger.error(`Error checking OmniGlobalAutoNumberPref status: ${errMsg}`);
+      Logger.error(this.messages.getMessage('errorCheckingGlobalAutoNumber', [errMsg]));
       return false;
     }
   }

src/utils/logger.ts

@@ -64,9 +64,7 @@ export class Logger {
         Logger.sfUX.error(`\x1b[31m${message.message}\n${message.stack}\x1b[0m`);
       } else {
         if (error) {
-          Logger.sfUX.error(`\x1b[31m${message}\n${error.message}\n${error.stack}\x1b[0m`);
-        } else {
-          Logger.sfUX.error(`\x1b[31m${message}\x1b[0m`);
+          Logger.sfUX.error(`\x1b[31m${error.message}\n${error.stack}\x1b[0m`);
         }
       }
     }

test/migration/globalautonumber.test.ts

@@ -251,7 +251,7 @@ describe('GlobalAutoNumberMigrationTool', () => {
       getMessageStub.withArgs('startingPostMigrationCleanup').returns('Starting cleanup...');
       getMessageStub.withArgs('omniGlobalAutoNumberPrefEnabled').returns('Preference enabled');
       getMessageStub.withArgs('postMigrationCleanupCompleted').returns('Cleanup completed');
-
+      await globalAutoNumberMigrationTool.truncate();
       // Act
       const result = await globalAutoNumberMigrationTool.migrate();
 
@@ -342,7 +342,7 @@ describe('GlobalAutoNumberMigrationTool', () => {
       getMessageStub.withArgs('startingPostMigrationCleanup').returns('Starting cleanup...');
       getMessageStub.withArgs('incompleteMigrationDetected', [2, 1]).returns('Incomplete migration detected');
       getMessageStub.withArgs('migrationValidationFailed').returns('Migration validation failed');
-
+      await globalAutoNumberMigrationTool.truncate();
       // Act
       const result = await globalAutoNumberMigrationTool.migrate();
 
@@ -385,7 +385,7 @@ describe('GlobalAutoNumberMigrationTool', () => {
       getMessageStub.withArgs('startingPostMigrationCleanup').returns('Starting cleanup...');
       getMessageStub.withArgs('incompleteMigrationDetected', [1, 0]).returns('Incomplete migration');
       getMessageStub.withArgs('migrationValidationFailed').returns('Migration validation failed');
-
+      await globalAutoNumberMigrationTool.truncate();
       // Act
       const result = await globalAutoNumberMigrationTool.migrate();