Merge branch 'release260omnistudiopackage' into u/aparuthi/finalchangesforomnistudiopackage

Author: sf-aastha-paruthi

messages/assess.json

@@ -218,5 +218,8 @@
   "failedToCheckPackagesValue": "Failed to check the value of packages in Omni Interaction Configuration.",
   "packageDetails": "Your org contains only the TheFirstInstalledOmniPackage Omni Interaction Configuration.",
   "orgUsecaseDetails": "The org is on %s data model with %s ",
-  "globalAutoNumberUnSupportedInOmnistudioPackage": "Omni Global Auto Number is not supported in Omnistudio Foundation package orgs."
+  "globalAutoNumberUnSupportedInOmnistudioPackage": "Omni Global Auto Number is not supported in Omnistudio Foundation package orgs.",
+  "omniStudioAllVersionsProcessingConsent": "Org uses the standard data model. All versions of Omnistudio components such as Omniscripts, Data Mappers, Integration Procedures, and Flexcards must be assessed. But you’ve not specified -a  or allversions flag in the command.  Proceed to assess all versions of the Omnistudio components? [y/n]",
+  "omniStudioAllVersionsProcessingConsentNotGiven": "You've not consented to assess all versions of the Omnistudio components. We cannot proceed with the assessment.",
+  "omniStudioAllVersionsProcessingConsentGiven": "You've consented to assess all versions of the Omnistudio components."
 }

messages/migrate.json

@@ -305,9 +305,9 @@
   "manuallyEnableOmniStudioSettingsMetadata": "Manually enable the Omnistudio Metadata setting in your org’s Omnistudio Settings page. Refer <a href='https://help.salesforce.com/s/articleView?id=xcloud.os_enable_omnistudio_metadata_api_support.htm&type=5' target='_blank'>this documentation</a> for more details.",
   "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 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.",
+  "omniStudioAllVersionsProcessingConsent": "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]",
+  "omniStudioAllVersionsProcessingConsentNotGiven": "You've not consented to migrate all versions of the Omnistudio components. We cannot proceed with the migration.",
+  "omniStudioAllVersionsProcessingConsentGiven": "You've consented to migrate all versions of the Omnistudio components.",
   "customLWCFlexCardReferenceUpdated": "Updated Custom LWC FlexCard reference: %s -> cf%s",
   "validatingDrVersioningDisabled": "Checking the Data Mapper versioning setting in your org.",
   "drVersioningDisabled": "Proceeding with the migration as the Data Mapper versioning setting is disabled.",

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

src/commands/omnistudio/migration/assess.ts

@@ -21,6 +21,7 @@ import { PreMigrate } from '../../../migration/premigrate';
 import { PostMigrate } from '../../../migration/postMigrate';
 import { CustomLabelsUtil } from '../../../utils/customLabels';
 import { initializeDataModelService, isFoundationPackage } from '../../../utils/dataModelService';
+
 import { ValidatorService } from '../../../utils/validatorService';
 
 Messages.importMessagesDirectory(__dirname);
@@ -69,7 +70,7 @@ export default class Assess extends OmniStudioBaseCommand {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   public async runAssess(): Promise<any> {
     DebugTimer.getInstance().start();
-    const allVersions = (this.flags.allversions || false) as boolean;
+    let allVersions = (this.flags.allversions || false) as boolean;
     const assessOnly = (this.flags.only || '') as string;
     const relatedObjects = (this.flags.relatedobjects || '') as string;
     const isExperienceBundleMetadataAPIProgramaticallyEnabled: { value: boolean } = { value: false };
@@ -94,6 +95,12 @@ export default class Assess extends OmniStudioBaseCommand {
     const namespace = orgs.packageDetails.namespace;
     let projectPath = '';
     const preMigrate: PreMigrate = new PreMigrate(namespace, conn, this.logger, messages, this.ux);
+
+    // Handle all versions prerequisite for standard data model
+    if (
+      DataModel()) {
+      allVersions = await preMigrate.handleAllVersionsPrerequisites(allVersions);
+    }
     if (relatedObjects) {
       objectsToProcess = relatedObjects.split(',').map((obj) => obj.trim());
       projectPath = await ProjectPathUtil.getProjectPath(messages, true);

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

@@ -18,22 +18,22 @@ export class PreMigrate extends BaseMigrationTool {
   }
 
   /**
-   * Ensures all versions are migrated when on standard data model.
+   * Ensures all versions are processed when on standard data model.
    * If the -a flag was not provided, prompts user for consent.
    *
    * @param allVersionsFlagFromCLI - The allVersions flag value from CLI (-a flag)
-   * @returns true if all versions should be migrated, false otherwise
+   * @returns true if all versions should be processed, false otherwise
    */
   public async handleAllVersionsPrerequisites(allVersionsFlagFromCLI: boolean): Promise<boolean> {
     if (allVersionsFlagFromCLI === false) {
-      // Get user consent to migrate allversions of OmniStudio components for standard data model migration
-      const omniStudioAllVersionsMigrationConsent = await this.getOmnistudioAllVersionsMigrationConsent();
-      if (!omniStudioAllVersionsMigrationConsent) {
-        Logger.error(this.messages.getMessage('omniStudioAllVersionsMigrationConsentNotGiven'));
+      // Get user consent to process allversions of OmniStudio components for standard data model migration
+      const omniStudioProcessAllVersionsConsent = await this.getOmnistudioProcessAllVersionsConsent();
+      if (!omniStudioProcessAllVersionsConsent) {
+        Logger.error(this.messages.getMessage('omniStudioAllVersionsProcessingConsentNotGiven'));
         process.exit(1);
       }
 
-      Logger.logVerbose(this.messages.getMessage('omniStudioAllVersionsMigrationConsentGiven'));
+      Logger.logVerbose(this.messages.getMessage('omniStudioAllVersionsProcessingConsentGiven'));
       return true;
     }
     return allVersionsFlagFromCLI;
@@ -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;
@@ -284,7 +288,7 @@ export class PreMigrate extends BaseMigrationTool {
    *
    * @returns Promise<boolean> - true if user consents, false otherwise
    */
-  private async getOmnistudioAllVersionsMigrationConsent(): Promise<boolean> {
+  private async getOmnistudioProcessAllVersionsConsent(): Promise<boolean> {
     const askWithTimeOut = PromptUtil.askWithTimeOut(this.messages);
     let validResponse = false;
     let consent = false;
@@ -293,7 +297,7 @@ export class PreMigrate extends BaseMigrationTool {
       try {
         const resp = await askWithTimeOut(
           Logger.prompt.bind(Logger),
-          this.messages.getMessage('omniStudioAllVersionsMigrationConsent')
+          this.messages.getMessage('omniStudioAllVersionsProcessingConsent')
         );
         const response = typeof resp === 'string' ? resp.trim().toLowerCase() : '';
 

src/migration/related/ApexMigration.ts

@@ -283,21 +283,27 @@ export class ApexMigration extends BaseRelatedObjectMigration {
     const implementsInterface = parser.implementsInterfaces;
     const tokenUpdates: TokenUpdater[] = [];
 
+    const hasCallable = implementsInterface.has(this.callableInterface);
+    const hasVlocityOpenInterface2 = implementsInterface.has(this.vlocityOpenInterface2);
+    const hasVlocityOpenInterface = implementsInterface.has(this.vlocityOpenInterface);
+
     // Case 1: Already implements just System.Callable - no changes needed
-    if (implementsInterface.has(this.callableInterface) && implementsInterface.size === 1) {
+    if (hasCallable && implementsInterface.size === 1) {
       Logger.info(assessMessages.getMessage('fileAlreadyImplementsCallable', [file.name]));
       return tokenUpdates;
     }
 
-    // Case 2: Already implements multiple interfaces including Callable - keep only System.Callable
-    if (implementsInterface.has(this.callableInterface) && implementsInterface.size > 1) {
+    // Case 2: Multiple interfaces need to be replaced with System.Callable:
+    // - Has System.Callable with other interfaces, OR
+    // - Has both VlocityOpenInterface and VlocityOpenInterface2
+    if ((hasCallable && implementsInterface.size > 1) || (hasVlocityOpenInterface2 && hasVlocityOpenInterface)) {
       Logger.logger.info(assessMessages.getMessage('apexFileHasMultipleInterfaces', [file.name]));
       // We need to identify the entire implements clause and replace it
       return this.replaceAllInterfaces(implementsInterface, tokenUpdates, parser, file.name);
     }
 
-    // Case 3: Implements VlocityOpenInterface2 - replace with System.Callable
-    if (implementsInterface.has(this.vlocityOpenInterface2)) {
+    // Case 3: Implements only VlocityOpenInterface2 - replace with System.Callable
+    if (hasVlocityOpenInterface2) {
       Logger.logger.info(assessMessages.getMessage('apexFileImplementsVlocityOpenInterface2', [file.name]));
       const tokens = implementsInterface.get(this.vlocityOpenInterface2);
       tokenUpdates.push(new RangeTokenUpdate(CALLABLE, tokens[0], tokens[1]));
@@ -306,7 +312,9 @@ export class ApexMigration extends BaseRelatedObjectMigration {
       } else {
         Logger.logger.info(assessMessages.getMessage('apexFileAlreadyHasCallMethod', [file.name]));
       }
-    } else if (implementsInterface.has(this.vlocityOpenInterface)) {
+    }
+    // Case 4: Implements only VlocityOpenInterface - replace with System.Callable
+    else if (hasVlocityOpenInterface) {
       Logger.logger.info(assessMessages.getMessage('fileImplementsVlocityOpenInterface', [file.name]));
       const tokens = implementsInterface.get(this.vlocityOpenInterface);
       tokenUpdates.push(new RangeTokenUpdate(CALLABLE, tokens[0], tokens[1]));