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

Author: snehaljha-sf

messages/assess.json

@@ -78,7 +78,7 @@
   "foundApexFilesInDirectory": "Found %s Apex files in directory: %s",
   "skippingNonApexFile": "Skipping non-Apex file: %s",
   "processingApexFile": "Processing Apex file: %s",
-  "skippingApexFileFewChanges": "Skipping Apex file: %s as it has less than 3 changes",
+  "skippingApexFileNoChanges": "Skipping Apex file: %s as it has no changes",
   "successfullyProcessedApexFile": "Successfully processed Apex file: %s",
   "fileNoOmnistudioCalls": "File %s does not have any omnistudio calls or remote calls. No changes will be applied.",
   "fileAlreadyImplementsCallable": "file %s already implements callable no changes will be applied",
@@ -183,5 +183,6 @@
   "missingInfo": "Info is missing",
   "errorCheckingGlobalAutoNumber": "We couldn’t check whether the Global Auto Number setting is enabled: %s. Try again later.",
   "errorMigrationMessage": "Error migrating object: %s",
-  "nameMappingUndefined": "Name Mapping is undefined"
+  "nameMappingUndefined": "Name Mapping is undefined",
+  "experienceSiteException": "Exception occurred while processing experience sites"
 }

messages/migrate.json

@@ -195,7 +195,6 @@
   "flexcardStorageProcessingStarted": "Started preparing storage for flexcards",
   "errorWhileProcessingFlexcardStorage": "Error occurred while processing key for flexcard storage",
   "missingInfo": "Info is missing",
-  "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",
   "nameMappingUndefined": "Name Mapping is undefined",
@@ -208,5 +207,6 @@
   "installingRequiredDependencies": "Installing required node dependencies",
   "creatingNPMConfigFile": "Creating npm config file",
   "npmConfigFileCreated": "Npm config file created",
-  "authKeyEnvVarNotSet": "OMA_AUTH_KEY environment variable is not set, LWCs will not be deployed"
+  "authKeyEnvVarNotSet": "OMA_AUTH_KEY environment variable is not set, LWCs will not be deployed",
+  "experienceSiteException": "Exception occurred while processing experience sites"
 }

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

src/commands/omnistudio/migration/assess.ts

@@ -75,7 +75,7 @@ export default class Assess extends OmniStudioBaseCommand {
     const conn = this.org.getConnection();
     let objectsToProcess: string[];
     // To-Do: Add LWC to valid options when GA is released
-    const validOptions = [Constants.Apex, Constants.ExpSites, Constants.FlexiPage];
+    const validOptions = [Constants.Apex, Constants.ExpSites, Constants.FlexiPage, Constants.LWC];
     if (apiVersion) {
       conn.setApiVersion(apiVersion);
     } else {
@@ -98,7 +98,7 @@ export default class Assess extends OmniStudioBaseCommand {
 
     const namespace = orgs.packageDetails.namespace;
     let projectPath = '';
-    const preMigrate: PreMigrate = new PreMigrate(this.org, namespace, conn, this.logger, messages, this.ux);
+    const preMigrate: PreMigrate = new PreMigrate(namespace, conn, this.logger, messages, this.ux);
     if (relatedObjects) {
       objectsToProcess = relatedObjects.split(',').map((obj) => obj.trim());
       projectPath = await ProjectPathUtil.getProjectPath(messages, true);
@@ -140,6 +140,8 @@ export default class Assess extends OmniStudioBaseCommand {
 
     // Assess related objects if specified
     if (relatedObjects) {
+      objectsToProcess = relatedObjects.split(',').map((obj) => obj.trim());
+
       // Validate input
       for (const obj of objectsToProcess) {
         if (!validOptions.includes(obj)) {

src/commands/omnistudio/migration/migrate.ts

@@ -134,7 +134,7 @@ export default class Migrate extends OmniStudioBaseCommand {
     let projectPath: string;
     let objectsToProcess: string[] = [];
     let targetApexNamespace: string;
-    const preMigrate: PreMigrate = new PreMigrate(this.org, namespace, conn, this.logger, messages, this.ux);
+    const preMigrate: PreMigrate = new PreMigrate(namespace, conn, this.logger, messages, this.ux);
     const isExperienceBundleMetadataAPIProgramaticallyEnabled: { value: boolean } = { value: false };
 
     let deploymentConfig = { autoDeploy: false, authKey: undefined };
@@ -249,7 +249,7 @@ export default class Migrate extends OmniStudioBaseCommand {
     targetApexNamespace: string;
     deploymentConfig: { autoDeploy: boolean; authKey: string | undefined };
   }> {
-    const validOptions = [Constants.Apex, Constants.ExpSites, Constants.FlexiPage];
+    const validOptions = [Constants.Apex, Constants.ExpSites, Constants.FlexiPage, Constants.LWC];
     const objectsToProcess = relatedObjects.split(',').map((obj) => obj.trim());
     // Validate input
     for (const obj of objectsToProcess) {
@@ -532,11 +532,13 @@ export default class Migrate extends OmniStudioBaseCommand {
         let errors: any[] = obj.errors || [];
         errors = errors.concat(recordResults.errors || []);
 
-        obj.status = recordResults?.skipped
-          ? messages.getMessage('labelStatusSkipped')
-          : !recordResults || recordResults.hasErrors
-          ? messages.getMessage('labelStatusFailed')
-          : messages.getMessage('labelStatusComplete');
+        if (recordResults?.skipped) {
+          obj.status = messages.getMessage('labelStatusSkipped');
+        } else if (!recordResults || recordResults.hasErrors) {
+          obj.status = messages.getMessage('labelStatusFailed');
+        } else {
+          obj.status = messages.getMessage('labelStatusComplete');
+        }
         obj.errors = errors;
         obj.migratedId = recordResults.id;
         obj.warnings = recordResults.warnings;

src/migration/base.ts

@@ -8,8 +8,7 @@ import { Logger } from '../utils/logger';
 import { TransformData, UploadRecordResult } from './interfaces';
 
 export type ComponentType = 'Data Mapper' | 'Flexcard' | 'Omniscript and Integration Procedure' | 'GlobalAutoNumber';
-
-export type RelatedObjectType = 'Flexipage' | 'ExperienceSites';
+export type RelatedObjectType = 'Flexipage' | 'ExperienceSites' | 'Lightning Web Components' | 'Apex Classes';
 
 /**
  * Creates a progress bar for migration/assessment operations

src/migration/flexcard.ts

@@ -113,7 +113,8 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
       const flexCards = await this.getAllActiveCards();
       Logger.log(this.messages.getMessage('foundFlexCardsToAssess', [flexCards.length]));
 
-      const flexCardsAssessmentInfos = this.processCardComponents(flexCards);
+      const flexCardsAssessmentInfos = await this.processCardComponents(flexCards);
+      this.prepareAssessmentStorageForFlexcards(flexCardsAssessmentInfos);
       return flexCardsAssessmentInfos;
     } catch (err) {
       if (err instanceof InvalidEntityTypeError) {
@@ -135,9 +136,6 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
       try {
         const flexCardAssessmentInfo = await this.processFlexCard(flexCard, uniqueNames);
         flexCardAssessmentInfos.push(flexCardAssessmentInfo);
-
-        // Prepare assessment storage for flexcards
-        this.prepareAssessmentStorageForFlexcards(flexCardAssessmentInfos);
       } catch (e) {
         flexCardAssessmentInfos.push({
           name: flexCard['Name'],
@@ -638,7 +636,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
           flexCardAssessmentInfo.nameMapping === undefined ||
           flexCardAssessmentInfo.nameMapping === null
         ) {
-          Logger.logVerbose(this.messages.getMessage('missingInfo'));
+          Logger.error(this.messages.getMessage('missingInfo'));
           return;
         }
 
@@ -647,8 +645,8 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
           isDuplicate: false,
         };
 
-        if (flexCardAssessmentInfo.warnings) {
-          value.error = flexCardAssessmentInfo.warnings;
+        if (flexCardAssessmentInfo.errors && flexCardAssessmentInfo.errors.length > 0) {
+          value.error = flexCardAssessmentInfo.errors;
           value.migrationSuccess = false;
         } else {
           value.migrationSuccess = true;
@@ -668,9 +666,8 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
         Logger.logVerbose(this.messages.getMessage('errorWhileProcessingFlexcardStorage'));
         Logger.error(error);
       }
-
-      StorageUtil.printMigrationStorage();
     }
+    StorageUtil.printAssessmentStorage();
   }
 
   private prepareStorageForFlexcards(
@@ -692,13 +689,13 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
 
         if (newrecord === undefined) {
           value.error = ['Migration Failed'];
-        }
-
-        if (newrecord.hasErrors) {
-          value.error = newrecord.errors;
-          value.migrationSuccess = false;
         } else {
-          value.migrationSuccess = true;
+          if (newrecord.hasErrors) {
+            value.error = newrecord.errors;
+            value.migrationSuccess = false;
+          } else {
+            value.migrationSuccess = true;
+          }
         }
 
         let finalKey = `${oldrecord['Name']}`;

src/migration/omniscript.ts

@@ -537,6 +537,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
 
   private updateStorageForOmniscriptAssessment(osAssessmentInfo: OSAssessmentInfo[]): void {
     if (osAssessmentInfo === undefined || osAssessmentInfo === null) {
+      Logger.error(this.messages.getMessage('missingInfo'));
       return;
     }
 
@@ -559,7 +560,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
           isDuplicate: false,
         };
 
-        if (Array.isArray(currentOsRecordInfo.errors) && currentOsRecordInfo.errors.length > 0) {
+        if (currentOsRecordInfo.errors && currentOsRecordInfo.errors.length > 0) {
           value.error = currentOsRecordInfo.errors;
           value.migrationSuccess = false;
         } else {
@@ -579,7 +580,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
           storage.osStorage.set(finalKey, value);
         }
       } catch (error) {
-        Logger.logVerbose(error);
+        Logger.error(error);
       }
     }
 
@@ -905,11 +906,16 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
             isDuplicate: false,
           };
 
-          if (newrecord.hasErrors) {
-            value.error = newrecord.errors;
+          // New record can be undefined
+          if (newrecord === undefined) {
             value.migrationSuccess = false;
           } else {
-            value.migrationSuccess = true;
+            if (newrecord.hasErrors) {
+              value.error = newrecord.errors;
+              value.migrationSuccess = false;
+            } else {
+              value.migrationSuccess = true;
+            }
           }
 
           let finalKey = `${oldrecord[this.namespacePrefix + 'Type__c']}${

src/migration/premigrate.ts

@@ -1,29 +1,16 @@
-/* eslint-disable */
-
-import { Connection, Messages, Org } from '@salesforce/core';
+import { Connection, Messages } from '@salesforce/core';
 import { UX } from '@salesforce/command';
 import { Logger } from '../utils/logger';
 import { Constants } from '../utils/constants/stringContants';
 import { OrgPreferences } from '../utils/orgPreferences';
-import { BaseMigrationTool } from './base';
 import { askStringWithTimeout } from '../utils/promptUtil';
+import { YES_SHORT, YES_LONG, NO_SHORT, NO_LONG } from '../utils/projectPathUtil';
+import { BaseMigrationTool } from './base';
 
 export class PreMigrate extends BaseMigrationTool {
-  private readonly org: Org;
-
   // Source Custom Object Names
-  constructor(org: Org, namespace: string, connection: Connection, logger: Logger, messages: Messages, ux: UX) {
+  public constructor(namespace: string, connection: Connection, logger: Logger, messages: Messages, ux: UX) {
     super(namespace, connection, logger, messages, ux);
-    this.org = org;
-  }
-
-  // Just to disable org is unused error coming
-  public printOrgDetails(): void {
-    try {
-      Logger.log(JSON.stringify(this.org));
-    } catch (e) {
-      Logger.log(e);
-    }
   }
 
   public async handleExperienceSitePrerequisites(
@@ -67,8 +54,9 @@ export class PreMigrate extends BaseMigrationTool {
   // This needs to be behind timeout
   private async getExpSiteMetadataEnableConsent(): Promise<boolean> {
     const question = this.messages.getMessage('consentForExperienceSites');
+    const validResponse = false;
 
-    while (true) {
+    while (!validResponse) {
       try {
         // Get string input from user with timeout
         const userInput = await askStringWithTimeout(
@@ -80,19 +68,18 @@ export class PreMigrate extends BaseMigrationTool {
         // Validate and convert the input
         const normalizedInput = userInput.trim().toLowerCase();
 
-        if (normalizedInput === 'y' || normalizedInput === 'yes') {
+        if (normalizedInput === YES_SHORT || normalizedInput === YES_LONG) {
           return true;
-        } else if (normalizedInput === 'n' || normalizedInput === 'no') {
+        } else if (normalizedInput === NO_SHORT || normalizedInput === NO_LONG) {
           return false;
         } else {
           // Invalid input - show error and continue loop to re-prompt
           Logger.error(this.messages.getMessage('invalidYesNoResponse'));
-          Logger.log('Please enter "y" or "yes" to consent, "n" or "no" to decline.');
         }
       } catch (error) {
         // Handle timeout or other errors
-        Logger.error(this.messages.getMessage('failedToGetConsentError', [error.message]));
-        throw error; // Re-throw to let caller handle timeout
+        Logger.error(this.messages.getMessage('requestTimedOut'));
+        process.exit(1);
       }
     }
   }