chore: resolved merge conflicts

Author: sf-aastha-paruthi

README.md

@@ -1,6 +1,6 @@
 # Omnistudio Migration Assistant
 
-The Omnistudio Migration Assistant is a command-line interface (CLI) plugin that you install via Salesforce CLI. It creates records for your omnistudio components on the Salesforce standard objects.
+The Omnistudio Migration Assistant is a Salesforce CLI plugin that automates the migration of Omnistudio components. When run on a custom data model with managed package runtime, it migrates components to the standard data model and switches them to the Omnistudio standard runtime. When run on a standard data model with managed package, it cleans record names, enables the metadata API, and switches to the Omnistudio standard runtime.
 
 ## 🚀 Before You Begin
 

messages/assess.json

@@ -10,7 +10,7 @@
     "omnistudio:migration:assess -u [email protected]  --relatedobjects apex,lwc,flexipage,expsites",
     "omnistudio:migration:assess -u [email protected]  -r apex,lwc,flexipage,expsites"
   ],
-  "commandDescription": "Assess the migration of Omnistudio components from Omnistudio managed package runtime to Omnistudio standard runtime.",
+  "commandDescription": "If your Omnistudio components are on custom data model, assess the migration of the components from Omnistudio managed package runtime to Omnistudio standard runtime. If your Omnistudio components are on standard data model, assess the updates made to the component names and references.See: https://help.salesforce.com/s/articleView?id=xcloud.os_omnistudio_naming_conventions.htm&type=5",
   "errorNoOrgResults": "No records found in the org '%s' to migrate.",
   "onlyFlagDescription": "Migrate a single component: os | ip | fc | dm | autonumber | cl",
   "couldNotTruncate": "We couldn't clear all %s records.",
@@ -38,10 +38,10 @@
   "processingDataRaptor": "Processing Data Mapper: %s",
   "processingOmniScript": "Processing Omniscript: %s",
   "foundDataRaptorsToAssess": "Found %s Data Mappers to assess.",
-  "foundOmniScriptsToAssess": "Found %s Omniscripts to assess",
+  "foundOmniScriptsToAssess": "Found %s %s to assess",
   "foundGlobalAutoNumbersToAssess": "Found %s Omni Global Auto Numbers to assess.",
   "startingDataRaptorAssessment": "Starting Data Mapper assessment",
-  "startingOmniScriptAssessment": "Starting Omniscript assessment",
+  "startingOmniScriptAssessment": "Starting %s assessment",
   "startingGlobalAutoNumberAssessment": "Starting Omni Global Auto Number assessment",
   "allVersionsInfo": "All versions: %s",
   "assessmentInitialization": "Assessment process started. Using namespace: %s",
@@ -77,7 +77,7 @@
   "fileNoOmnistudioCalls": "The %s file doesn't have any Omnistudio calls or remote calls. No changes will be applied.",
   "fileAlreadyImplementsCallable": "The %s file already implements the Callable interface. No changes will be applied.",
   "inApexDrNameWillBeUpdated": "In the %s Apex file, the Data Mapper name, %s, will be updated to %s.",
-  "inApexIpNameWillBeUpdated": "In the %s Apex file, the Data Mapper name, %s, will be updated to %s.",
+  "inApexIpNameWillBeUpdated": "In the %s Apex file, the Integration Procedure name, %s, will be updated to %s.",
   "startingLwcAssessment": "Starting LWC assessment in: %s",
   "processingLwcsForAssessment": "Processing LWCs for assessment",
   "successfullyProcessedLwcsForAssessment": "Successfully processed %s LWCs for assessment.",
@@ -114,7 +114,7 @@
   "notSfdxProjectFolderPath": "Provided folder is not a valid Salesforce DX project. Please select a folder containing sfdx-project.json",
   "errorRunningAssess": "Assessment process failed reason : %s",
   "enableVerboseOutput": "Enable verbose output",
-  "apexFileChangesIdentifiedNotApplied": "Changes were identified but not applied for the %s Apex class when the assessment mode was running.Changes were identified but not applied for the %s Apex class when the assessment mode was running.",
+  "apexFileChangesIdentifiedNotApplied": "Changes were identified but not applied for the %s Apex class when the assessment mode was running.",
   "apexFileHasMultipleInterfaces": "The %s file has multiple interfaces, including Callable interfaces. Standardizing the file to use only the System.Callable interface.",
   "apexFileImplementsVlocityOpenInterface2": "The %s file implements VlocityOpenInterface2. Replacing it with the System.Callable interface.",
   "errorParsingHtmlTemplate": "Error while parsing template",
@@ -139,7 +139,7 @@
   "experienceSiteConsentNotProvidedWarning": "You’ve not provided consent and your Experience Cloud sites won’t be processed.",
   "relatedObjectsToProcessAfterExpSitesRemoval": "Objects to process after removing expsite are %s.",
   "experienceBundleMetadataAPIAlreadyEnabled": "The ExperienceBundle metadata API is already enabled.",
-  "enableExperienceBundleMetadataAPIProgramatically": "We couldn't enable the ExperienceBundle metadata API. Enable it programmatically.",
+  "enableExperienceBundleMetadataAPIProgramatically": "Enabling ExperienceBundle metadata API programmatically.",
   "unableToEnableExperienceBundleMetadataAPI": "We couldn’t enable the ExperienceBundle metadata API. Experience Cloud sites won’t be assessed.",
   "relatedObjectsToProcess": "These objects will be processed: %s",
   "consentForExperienceSites": "By proceeding further, you hereby consent to enable the ExperienceBundle metadata API and assess Experience Cloud sites. Do you want to proceed? [y/n]",
@@ -152,13 +152,13 @@
   "readingFile": "Started reading the files",
   "totalFileCount": "The total count of files is %s",
   "skipNonJsonFile": "Skipping non-JSON file %s",
-  "experienceSiteWithOmniWrapperSuccessfullyProcessed": "Successfully processed the Experience Cloud site file with a Vlocity wrapper.",
-  "fileNotHavingWrapper": "File doesn’t contain Vlocity wrapper.",
+  "experienceSiteWithOmniWrapperSuccessfullyProcessed": "Successfully processed the Experience Cloud site file with a wrapper having the Omnistudio content.",
+  "fileNotHavingWrapper": "File doesn’t contain wrapper having Omnistudio content.",
   "errorProcessingExperienceSite": "We’ve encountered an error while processing the Experience Cloud site file",
-  "experienceSiteReportingDetails": "Only files with a Vlocity wrapper will be shown in the assessment report.",
+  "experienceSiteReportingDetails": "Only files with wrapper with Omnistudio content will be shown in the assessment report.",
   "processingFile": "Processing for file",
   "currentRegionOfExperienceSite": "The current region being processed is %s.",
-  "omniWrapperFound": "Omnistudio wrapper component found.",
+  "omniWrapperFound": "Wrapper with Omnistudio content found.",
   "printUpdatedObject": "Printing the updated object %s.",
   "printDifference": "Printing the difference %s.",
   "updatingFile": "Updating the file content.",
@@ -169,7 +169,7 @@
   "manualInterventionForExperienceSite": "We couldn’t process the %s component because no key was found.",
   "manualInterventionForExperienceSiteAsFailure": "We couldn’t process the %s component. ",
   "manualInterventionForExperienceSiteAsDuplicateKey": "We couldn’t process the %s component because a duplicate key was found. ",
-  "manualInterventionForExperienceSiteConfiguration": "We couldn’t process the %s Experience site because one of the type/subtype/language is missing in the omnistudio wrapper in experience site configuration.",
+  "manualInterventionForExperienceSiteConfiguration": "We couldn’t process the %s Experience site because of the error %s in the Experience Cloud site configuration.",
   "updatingStorageForOmniscipt": "Preparing storage for Omniscripts",
   "keyAlreadyInStorage": "The %s %s name already exists in storage.",
   "flexcardStorageProcessingStarted": "Preparing storage for Flexcards.",
@@ -197,8 +197,6 @@
   "dmNameUpdateFailed": "DM reference %s can’t be updated",
   "invalidTypeAssessErrorMessage": "We couldn't assess your Omnistudio components in the %s namespace. Select the correct namespace and try again",
   "assessmentSuccessfulMessage": "Migration assessment for org %s is complete and reports are ready for review in the folder %s",
-  "needManualInterventionAsSpecialCharsInChildFlexcardName": "Need manual intervention as child flexcards have special characters in their name",
-  "needManualInterventionAsSpecialCharsInFlexcardName": "Need manual intervention as flexcard has special characters in name",
   "errorCheckingOmniStudioMetadata": "We couldn't check whether the Omnistudio Metadata is enabled: %s. Try again later.",
   "omniStudioSettingsMetadataAlreadyEnabled": "The Omnistudio Metadata setting is already enabled with standard data model. No need for migration.",
   "missingMandatoryField": "Missing mandatory field: %s for %s"

messages/migrate.json

@@ -12,7 +12,7 @@
     "omnistudio:migration:migrate -u [email protected]  -r apex",
     "omnistudio:migration:migrate -u [email protected]  -r lwc"
   ],
-  "commandDescription": "Migrate Omnistudio components from Omnistudio managed package runtime to Omnistudio standard runtime.",
+  "commandDescription": "If your Omnistudio components are on custom data model, migrate the components from custom data model to standard data model, and switch the runtime from Omnistudio managed package runtime to Omnistudio standard runtime. If your Omnistudio components are on standard data model, the component names and references will be updated to contain only alphanumeric characters. This update is required to enable the metadata API. See: https://help.salesforce.com/s/articleView?id=xcloud.os_omnistudio_naming_conventions.htm&type=5",
   "errorNoOrgResults": "No records found in the org '%s' to migrate.",
   "onlyFlagDescription": "Migrate a single component: os | ip | fc | dm | autonumber | cl",
   "invalidOnlyFlag": "Invalid parameter entered. Select a valid parameter from these options: os | ip | fc | dm | autonumber | cl",
@@ -134,7 +134,7 @@
   "experienceSiteConsentNotProvidedWarning": "You've not provided consent and your Experience Cloud sites won't be migrated.",
   "relatedObjectsToProcessAfterExpSitesRemoval": "Prerequisites for Experience Cloud sites complete. The objects to migrate are %s.",
   "experienceBundleMetadataAPIAlreadyEnabled": "The ExperienceBundle metadata API is already enabled.",
-  "enableExperienceBundleMetadataAPIProgramatically": "The ExperienceBundle metadata API needs to be programmatically enabled.",
+  "enableExperienceBundleMetadataAPIProgramatically": "Enabling ExperienceBundle metadata API programmatically.",
   "unableToEnableExperienceBundleMetadataAPI": "We couldn’t enable the ExperienceBundle metadata API. Experience Cloud sites won’t be processed.",
   "relatedObjectsToProcess": "These objects will be processed: %s",
   "consentForExperienceSites": "By proceeding further, you hereby consent to enable the ExperienceBundle metadata API and migrate Experience Cloud sites. Do you want to proceed?",
@@ -147,13 +147,13 @@
   "readingFile": "Started reading the files",
   "totalFileCount": "The total count of files is %s",
   "skipNonJsonFile": "Skipping non-JSON file %s",
-  "experienceSiteWithOmniWrapperSuccessfullyProcessed": "Successfully processed the Experience Cloud site file with a Vlocity wrapper.",
-  "fileNotHavingWrapper": "File doesn’t contain Vlocity wrapper.",
+  "experienceSiteWithOmniWrapperSuccessfullyProcessed": "Successfully processed the Experience Cloud site file with a wrapper having the Omnistudio content.",
+  "fileNotHavingWrapper": "File doesn’t contain wrapper having Omnistudio content.",
   "errorProcessingExperienceSite": "We’ve encountered an error while processing the Experience Cloud site file",
-  "experienceSiteReportingDetails": "Only files with a Vlocity wrapper will be shown in the report.",
+  "experienceSiteReportingDetails": "Only Experience Cloud site files with a wrapper having Omnistudio content will be shown in the report.",
   "processingFile": "Processing for file",
   "currentRegionOfExperienceSite": "The current region being processed is  %s.",
-  "omniWrapperFound": "Omnistudio wrapper component found.",
+  "omniWrapperFound": "Wrapper by omnistudio component found.",
   "printUpdatedObject": "Printing the updated object %s.",
   "printDifference": "Printing the difference %s.",
   "updatingFile": "Updating the file content.",
@@ -164,7 +164,7 @@
   "emptyTargetData": "The Target Name is empty. Check your Experience Cloud site configuration",
   "manualInterventionForExperienceSiteAsFailure": "We couldn’t process the %s component.",
   "manualInterventionForExperienceSiteAsDuplicateKey": "We couldn’t process the %s component because a duplicate key was found.",
-  "manualInterventionForExperienceSiteConfiguration": "We couldn’t process the %s Experience site because one of the type/subtype/language is missing in the omnistudio wrapper in experience site configuration.",
+  "manualInterventionForExperienceSiteConfiguration": "We couldn’t process the %s Experience site because of the error %s in the Experience Cloud site configuration.",
   "updatingStorageForOmniscipt": "Preparing storage for Omniscripts %s",
   "keyAlreadyInStorage": "The %s %s name already exists in storage.",
   "flexcardStorageProcessingStarted": "Preparing storage for Flexcards.",
@@ -196,7 +196,8 @@
   "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)",
+  "flexCardMigrationProcessingMessage": "Processing %s Flexcards for migration",
+  "skippingAsAngularDependencies": "(%s skipped due to Angular dependencies)",
   "noMetadataToDeploy": "No metadata to deploy",
   "missingMandatoryField": "Missing mandatory field: %s for %s",
   "dataMapperMigrationFailed": "DataMapper migration failed for: %s ",
@@ -285,8 +286,6 @@
   "deploymentTriggeredSuccessfully": "Please monitor your Deployment: %s using deployment status page in Org",
   "omniscriptPackageDeploymentFailedReturnedFalse": "Omniscript package deployment failed - deployment returned false. This may be due to missing package, permissions, or deployment timeout.",
   "omniscriptPackageDeploymentFailedWithMessage": "Omniscript package deployment failed: %s",
-  "needManualInterventionAsSpecialCharsInChildFlexcardName": "Need manual intervention as child flexcards have special characters in their name",
-  "needManualInterventionAsSpecialCharsInFlexcardName": "Need manual intervention as flexcard has special characters in name",
   "metadataTablesAlreadyClean": "OmniStudio metadata tables are empty",
   "startingMetadataCleanup": "Initiated cleanup process for Omnistudio metadata tables.",
   "failedToCleanTables": "Table cleanup failed: %s",
@@ -301,5 +300,8 @@
   "errorEnablingOmniStudioSettingsMetadata": "We couldn't enable the Omnistudio Metadata setting: %s. Enable it manually.",
   "manuallyEnableOmniStudioSettingsMetadata": "Manually enable the Omnistudio Metadata setting in your org’s Omnistudio Settings page.",
   "omniStudioMetadataEnableConsentNotGiven": "You’ve not consented to proceed with enabling the Omnistudio Metadata setting. We’ll not be able to proceed with the migration.",
-  "enablingOmniStudioSettingsMetadataStatus": "Enabling OmniStudio Settings Metadata..."
+  "enablingOmniStudioSettingsMetadataStatus": "Enabling Omnistudio Metadata setting…",
+  "omniStudioAllVersionsMigrationConsent": "Org uses the standard data model. All versions of Omnistudio components such as Omniscripts, Data Mappers, Integration Procedures, and Flexcards must be migrated to enable the Omnistudio Metadata API setting. But you’ve not specified -a  or allversions flag in the command.  Proceed to migrate all versions of the Omnistudio components? [y/n]",
+  "omniStudioAllVersionsMigrationConsentNotGiven": "You've not consented to migrate all versions of the Omnistudio components. We cannot proceed with the migration.",
+  "omniStudioAllVersionsMigrationConsentGiven": "You've consented to migrate all versions of the Omnistudio components."
 }

src/commands/omnistudio/migration/migrate.ts

@@ -89,7 +89,7 @@ export default class Migrate extends OmniStudioBaseCommand {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   public async runMigration(): Promise<any> {
     const migrateOnly = (this.flags.only || '') as string;
-    const allVersions = this.flags.allversions || (false as boolean);
+    let allVersions = this.flags.allversions || (false as boolean);
     const relatedObjects = (this.flags.relatedobjects || '') as string;
     // this.org is guaranteed because requiresUsername=true, as opposed to supportsUsername
     const conn = this.org.getConnection();
@@ -132,18 +132,8 @@ export default class Migrate extends OmniStudioBaseCommand {
     const isExperienceBundleMetadataAPIProgramaticallyEnabled: { value: boolean } = { value: false };
 
     if (isStandardDataModel()) {
-      // Get user consent to enable OmniStudio Metadata for standard data model migration
-      const omniStudioMetadataEnableConsent = await preMigrate.getOmniStudioMetadataEnableConsent();
-      if (!omniStudioMetadataEnableConsent) {
-        Logger.error(messages.getMessage('omniStudioMetadataEnableConsentNotGiven'));
-        return;
-      }
-
-      // Handle config tables cleanup for standard data model migration
-      const isMetadataCleanupSuccess = await preMigrate.handleOmniStudioMetadataCleanup();
-      if (!isMetadataCleanupSuccess) {
-        return;
-      }
+      allVersions = await preMigrate.handleAllVersionsPrerequisites(allVersions);
+      await preMigrate.handleOmnistudioMetadataPrerequisites();
     }
 
     let actionItems = [];