Merge branch 'prerelease/develop-ga' into auto-deploy

Author: snehaljha-sf

messages/assess.json

@@ -46,10 +46,10 @@
   "processingOmniScript": "Processing OmniScript: %s",
   "processingGlobalAutoNumber": "Processing GlobalAutoNumber: %s",
   "foundDataRaptorsToAssess": "Found %s DataRaptors to assess",
-  "foundOmniScriptsToAssess": "Found %s OmniScripts and Integration Procedures to assess",
+  "foundOmniScriptsToAssess": "Found %s %s to assess",
   "foundGlobalAutoNumbersToAssess": "Found %s GlobalAutoNumbers to assess",
   "startingDataRaptorAssessment": "Starting DataRaptor assessment",
-  "startingOmniScriptAssessment": "Starting OmniScript assessment",
+  "startingOmniScriptAssessment": "Starting %s assessment",
   "startingGlobalAutoNumberAssessment": "Starting GlobalAutoNumber assessment",
   "allVersionsInfo": "allVersions : %s",
   "assessmentInitialization": "Assessment Initialization: Using namespace: %s",
@@ -65,10 +65,10 @@
   "globalAutoNumberAssessment": "GlobalAutoNumber Assessment",
   "assessedGlobalAutoNumbersCount": "Assessed %s GlobalAutoNumbers",
   "globalAutoNumberAssessmentCompleted": "The assessment for Global Auto Number is complete.",
-  "omniScriptAssessment": "OmniScript and Integration Procedure Assessment",
+  "omniScriptAssessment": "%s Assessment",
   "assessedOmniScriptsCount": "Assessed %s OmniScripts",
   "assessedIntegrationProceduresCount": "Assessed %s Integration Procedures",
-  "omniScriptAssessmentCompleted": "OmniScript and Integration Procedure assessment completed",
+  "omniScriptAssessmentCompleted": "%s assessment completed",
   "startingFlexCardAssessment": "Starting FlexCard assessment",
   "foundFlexCardsToAssess": "Found %s FlexCards to assess",
   "startingApexAssessment": "Starting Apex assessment in project path: %s",

messages/migrate.json

@@ -70,7 +70,7 @@
   "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",
-  "foundOmniScriptsToMigrate": "Found %s OmniScripts and Integration Procedures to migrate",
+  "foundOmniScriptsToMigrate": "Found %s %s to migrate",
   "foundGlobalAutoNumbersToMigrate": "Found %s GlobalAutoNumbers to migrate",
   "allVersionsInfo": "allVersions : %s",
   "migrationInitialization": "Migration Initialization: Using namespace: %s",
@@ -150,7 +150,6 @@
   "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.",
   "experienceSiteMetadataConsent": "The consent for exp site is %s",
   "experienceSiteConsentNotProvidedWarning": "Consent for experience sites is not provided. Experience sites will not be processed",
   "relatedObjectsToProcessAfterExpSitesRemoval": "Objects to process after removing expsite are",
@@ -209,7 +208,17 @@
   "npmConfigFileCreated": "Npm config file created",
   "authKeyEnvVarNotSet": "OMA_AUTH_KEY environment variable is not set, LWCs will not be deployed",
   "experienceSiteException": "Exception occurred while processing experience sites",
+  "reservedKeysFoundInPropertySet": "Reserved keys found in any of output response transformation fields: %s.",
+  "incompleteMigrationDetected": "We couldn't complete the migration process",
+  "nameMappingUndefined": "Name Mapping is undefined",
+  "errorComponentMapping": "Error during component pre-processing: %s",
+  "startingComponentPreProcessing": "Pre-processing components for name mapping",
+  "completeComponentMappingMessage": "Registered name mappings for %s components",
+  "componentMappingNotFound": "No registry mapping found for %s component: %s, using fallback cleaning",
+  "flexCardWithAngularOmniScriptWarning": "FlexCard has dependencies on Angular OmniScript(s) which are not migrated. Please convert OmniScript(s) to LWC before migrating this FlexCard.",
+  "angularOmniScriptDependencyWarning": "Element '%s' references Angular OmniScript '%s' which will not be migrated. Consider converting the referenced OmniScript to LWC",
+  "skipFlexcardAngularOmniScriptDependencyWarning": "Skipping FlexCard %s due to Angular OmniScript dependencies",
+  "flexCardMigrationProcessingMessage": "Processing %s FlexCards for migration (%s skipped due to Angular dependencies)",
   "noMetadataToDeploy": "No metadata to deploy",
-  "manifestDeployementStarted": "Manifest deployment started with id: %s",
-  "reservedKeysFoundInPropertySet": "Reserved keys found in any of output response transformation fields: %s."
+  "manifestDeployementStarted": "Manifest deployment started with id: %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.12",
+  "version": "2.0.0-rc.13",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {

src/commands/omnistudio/migration/assess.ts

@@ -212,7 +212,8 @@ export default class Assess extends OmniStudioBaseCommand {
       // If no specific component is specified, assess all components
       await this.assessDataRaptors(assesmentInfo, namespace, conn);
       await this.assessFlexCards(assesmentInfo, namespace, conn, allVersions);
-      await this.assessOmniScripts(assesmentInfo, namespace, conn, allVersions, OmniScriptExportType.All);
+      await this.assessOmniScripts(assesmentInfo, namespace, conn, allVersions, OmniScriptExportType.OS);
+      await this.assessOmniScripts(assesmentInfo, namespace, conn, allVersions, OmniScriptExportType.IP);
       await this.assessGlobalAutoNumbers(assesmentInfo, namespace, conn);
       return;
     }
@@ -267,21 +268,39 @@ export default class Assess extends OmniStudioBaseCommand {
     allVersions: boolean,
     exportType: OmniScriptExportType
   ): Promise<void> {
-    Logger.logVerbose(messages.getMessage('omniScriptAssessment'));
+    const exportComponentType = exportType === OmniScriptExportType.IP ? 'Integration Procedures' : 'Omniscripts';
+    Logger.logVerbose(messages.getMessage('omniScriptAssessment', [exportComponentType]));
     const osMigrator = new OmniScriptMigrationTool(exportType, namespace, conn, Logger, messages, this.ux, allVersions);
-    assesmentInfo.omniAssessmentInfo = await osMigrator.assess(
+    const newOmniAssessmentInfo = await osMigrator.assess(
       assesmentInfo.dataRaptorAssessmentInfos,
       assesmentInfo.flexCardAssessmentInfos
     );
-    Logger.logVerbose(
-      messages.getMessage('assessedOmniScriptsCount', [assesmentInfo.omniAssessmentInfo.osAssessmentInfos.length])
-    );
-    Logger.logVerbose(
-      messages.getMessage('assessedIntegrationProceduresCount', [
-        assesmentInfo.omniAssessmentInfo.ipAssessmentInfos.length,
-      ])
-    );
-    Logger.log(messages.getMessage('omniScriptAssessmentCompleted'));
+
+    // Initialize omniAssessmentInfo if it doesn't exist
+    if (!assesmentInfo.omniAssessmentInfo) {
+      assesmentInfo.omniAssessmentInfo = {
+        osAssessmentInfos: [],
+        ipAssessmentInfos: [],
+      };
+    }
+
+    // Merge results instead of overwriting
+    if (exportType === OmniScriptExportType.OS) {
+      // For OmniScript assessment, update osAssessmentInfos
+      assesmentInfo.omniAssessmentInfo.osAssessmentInfos = newOmniAssessmentInfo.osAssessmentInfos;
+      Logger.logVerbose(
+        messages.getMessage('assessedOmniScriptsCount', [assesmentInfo.omniAssessmentInfo.osAssessmentInfos.length])
+      );
+    } else {
+      // For Integration Procedure assessment, update ipAssessmentInfos
+      assesmentInfo.omniAssessmentInfo.ipAssessmentInfos = newOmniAssessmentInfo.ipAssessmentInfos;
+      Logger.logVerbose(
+        messages.getMessage('assessedIntegrationProceduresCount', [
+          assesmentInfo.omniAssessmentInfo.ipAssessmentInfos.length,
+        ])
+      );
+    }
+    Logger.log(messages.getMessage('omniScriptAssessmentCompleted', [exportComponentType]));
   }
 
   private async assessGlobalAutoNumbers(