Merge branch 'prerelease/alpha' into u/kkurri/W-19181248

Author: sf-kishore-kurri

messages/assess.json

@@ -114,5 +114,6 @@
   "errorParsingData": "Error while parsing data for template",
   "errorGeneratingHTML": "Error while generating HTML from template for %s with properties %s",
   "unexpectedError": "Unexpected Assessment error",
-  "errorEvaluatingExpression": "Error evaluating expression: %s, %s"
+  "errorEvaluatingExpression": "Error evaluating expression: %s, %s",
+  "invalidTypeAssessErrorMessage": "We couldn't assess your Omnistudio components in the %s namespace. Select the correct namespace and try again"
 }

messages/migrate.json

@@ -115,5 +115,6 @@
   "labelStatusComplete": "Complete",
   "migrationConsentNotGiven": "Couldn't confirm whether assessment errors are resolved",
   "migrationConsentMessage": "Ensure that all items in the assessment report are marked as Green before proceeding with the migration. Do you want to proceed?",
-  "truncationFailed": "Truncation failed for %s: %s"
+  "truncationFailed": "Truncation failed for %s: %s",
+  "invalidTypeMigrateErrorMessage": "We couldn't migrate your Omnistudio components in the %s namespace. Select the correct namespace and try again"
 }

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-beta.23",
+  "version": "2.0.0-beta.24",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {

src/commands/omnistudio/migration/assess.ts

@@ -5,6 +5,7 @@ import OmniStudioBaseCommand from '../../basecommand';
 import { AssessmentInfo } from '../../../utils/interfaces';
 import { AssessmentReporter } from '../../../utils/resultsbuilder/assessmentReporter';
 import { OmniScriptExportType, OmniScriptMigrationTool } from '../../../migration/omniscript';
+import { InvalidEntityTypeError } from '../../../migration/interfaces';
 import { CardMigrationTool } from '../../../migration/flexcard';
 import { DataRaptorMigrationTool } from '../../../migration/dataraptor';
 import { DebugTimer } from '../../../utils';
@@ -116,9 +117,13 @@ export default class Assess extends OmniStudioBaseCommand {
     try {
       // Assess OmniStudio components
       await this.assessOmniStudioComponents(assesmentInfo, assessOnly, namespace, conn, allVersions);
-    } catch (error) {
-      Logger.error(`Cannot assess OmniStudio components within ${namespace}`);
-      process.exit(1);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (ex: any) {
+      if (ex instanceof InvalidEntityTypeError) {
+        Logger.error(`${messages.getMessage('invalidTypeAssessErrorMessage', [namespace])}`);
+        process.exit(1);
+      }
+      Logger.error('Error assessing object', ex);
     }
 
     let objectsToProcess: string[];

src/commands/omnistudio/migration/migrate.ts

@@ -176,7 +176,7 @@ export default class Migrate extends OmniStudioBaseCommand {
     }
 
     if (allTruncateComplete) {
-      objectMigrationResults = await this.migrateObjects(migrationObjects, debugTimer);
+      objectMigrationResults = await this.migrateObjects(migrationObjects, debugTimer, namespace);
     }
 
     const omnistudioRelatedObjectsMigration = new OmnistudioRelatedObjectMigrationFacade(
@@ -281,7 +281,11 @@ export default class Migrate extends OmniStudioBaseCommand {
     return objectMigrationResults;
   }
 
-  private async migrateObjects(migrationObjects: MigrationTool[], debugTimer: DebugTimer): Promise<MigratedObject[]> {
+  private async migrateObjects(
+    migrationObjects: MigrationTool[],
+    debugTimer: DebugTimer,
+    namespace: string
+  ): Promise<MigratedObject[]> {
     let objectMigrationResults: MigratedObject[] = [];
     // Migrate in correct dependency order
     // DM -> IP -> OS -> FC
@@ -301,7 +305,7 @@ export default class Migrate extends OmniStudioBaseCommand {
         );
       } catch (ex: any) {
         if (ex instanceof InvalidEntityTypeError) {
-          Logger.error(ex.message);
+          Logger.error(messages.getMessage('invalidTypeMigrateErrorMessage', [namespace]));
           process.exit(1);
         }
         Logger.error('Error migrating object', ex);