Merge pull request #267 from salesforcecli/u/abhinavkumar2/demofeedbacks

@W-17258174@

Author: AbhinavKumar-sf

src/commands/omnistudio/migration/migrate.ts

@@ -8,6 +8,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import * as os from 'os';
+import * as fs from 'fs';
 import { flags } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
 import '../../../utils/prototypes';
@@ -72,13 +73,12 @@ export default class Migrate extends OmniStudioBaseCommand {
 
     // Let's time every step
     DebugTimer.getInstance().start();
-    // const includeApex = this.flags.apex
-    //   ? await this.ux.confirm('Do you want to include Apex migration? (yes/no)')
-    //   : false;
-
+    let projectPath: string;
+    let objectsToProcess: string[];
+    let targetApexNamespace: string;
     if (relatedObjects) {
       const validOptions = ['apex', 'lwc'];
-      const objectsToProcess = relatedObjects.split(',').map((obj) => obj.trim());
+      objectsToProcess = relatedObjects.split(',').map((obj) => obj.trim());
       // Validate input
       for (const obj of objectsToProcess) {
         if (!validOptions.includes(obj)) {
@@ -87,72 +87,20 @@ export default class Migrate extends OmniStudioBaseCommand {
       }
       // Ask for user consent
       const consent = await this.ux.confirm(
-        'By proceeding further, you hereby consent to the use, accept changes to your custom code, and the accompanying terms and conditions associated with the use of the OmniStudio Migration Tool. Do you want to proceed?'
+        'By proceeding further, you hereby consent to the use, accept changes to your custom code, and the accompanying terms and conditions associated with the use of the OmniStudio Migration Tool. Do you want to proceed? [y/n]'
       );
       if (!consent) {
-        this.ux.log('User declined consent. Aborting the process.');
+        this.ux.error(`User declined consent, will not process ${relatedObjects} .`);
       } else {
-        const projectPath = await this.ux.prompt('Enter the project path for processing:');
-        this.ux.log(`Using project path: ${projectPath}`);
-        OmnistudioRelatedObjectMigrationFacade.intializeProject(projectPath);
+        projectPath = await this.getProjectPath(relatedObjects, projectPath);
+        targetApexNamespace = await this.getTargetApexNamespace(objectsToProcess, targetApexNamespace);
       }
     }
 
     // const includeLwc = this.flags.lwc ? await this.ux.confirm('Do you want to include LWC migration? (yes/no)') : false;
     // Register the migration objects
     let migrationObjects: MigrationTool[] = [];
-    if (!migrateOnly) {
-      migrationObjects = [
-        new DataRaptorMigrationTool(namespace, conn, this.logger, messages, this.ux),
-        new OmniScriptMigrationTool(
-          OmniScriptExportType.All,
-          namespace,
-          conn,
-          this.logger,
-          messages,
-          this.ux,
-          allVersions
-        ),
-        new CardMigrationTool(namespace, conn, this.logger, messages, this.ux, allVersions),
-      ];
-    } else {
-      switch (migrateOnly) {
-        case 'os':
-          migrationObjects.push(
-            new OmniScriptMigrationTool(
-              OmniScriptExportType.OS,
-              namespace,
-              conn,
-              this.logger,
-              messages,
-              this.ux,
-              allVersions
-            )
-          );
-          break;
-        case 'ip':
-          migrationObjects.push(
-            new OmniScriptMigrationTool(
-              OmniScriptExportType.IP,
-              namespace,
-              conn,
-              this.logger,
-              messages,
-              this.ux,
-              allVersions
-            )
-          );
-          break;
-        case 'fc':
-          migrationObjects.push(new CardMigrationTool(namespace, conn, this.logger, messages, this.ux, allVersions));
-          break;
-        case 'dr':
-          migrationObjects.push(new DataRaptorMigrationTool(namespace, conn, this.logger, messages, this.ux));
-          break;
-        default:
-          throw new Error(messages.getMessage('invalidOnlyFlag'));
-      }
-    }
+    migrationObjects = this.getMigrationObjects(migrateOnly, migrationObjects, namespace, conn, allVersions);
     // Migrate individual objects
     const debugTimer = DebugTimer.getInstance();
     let objectMigrationResults: MigratedObject[] = [];
@@ -206,10 +154,12 @@ export default class Migrate extends OmniStudioBaseCommand {
       allVersions,
       this.org
     );
-    const relatedObjectMigrationResult = omnistudioRelatedObjectsMigration.migrateAll(objectMigrationResults, [
-      'lwc',
-      'apex',
-    ]);
+    const relatedObjectMigrationResult = omnistudioRelatedObjectsMigration.migrateAll(
+      objectMigrationResults,
+      objectsToProcess,
+      projectPath,
+      targetApexNamespace
+    );
     generatePackageXml.createChangeList(
       relatedObjectMigrationResult.apexAssessmentInfos,
       relatedObjectMigrationResult.lwcAssessmentInfos
@@ -223,6 +173,93 @@ export default class Migrate extends OmniStudioBaseCommand {
     return { objectMigrationResults };
   }
 
+  private getMigrationObjects(
+    migrateOnly: string,
+    migrationObjects: MigrationTool[],
+    namespace: string,
+    conn,
+    allVersions: any
+  ): MigrationTool[] {
+    if (!migrateOnly) {
+      migrationObjects = [
+        new DataRaptorMigrationTool(namespace, conn, this.logger, messages, this.ux),
+        new OmniScriptMigrationTool(
+          OmniScriptExportType.All,
+          namespace,
+          conn,
+          this.logger,
+          messages,
+          this.ux,
+          allVersions
+        ),
+        new CardMigrationTool(namespace, conn, this.logger, messages, this.ux, allVersions),
+      ];
+    } else {
+      switch (migrateOnly) {
+        case 'os':
+          migrationObjects.push(
+            new OmniScriptMigrationTool(
+              OmniScriptExportType.OS,
+              namespace,
+              conn,
+              this.logger,
+              messages,
+              this.ux,
+              allVersions
+            )
+          );
+          break;
+        case 'ip':
+          migrationObjects.push(
+            new OmniScriptMigrationTool(
+              OmniScriptExportType.IP,
+              namespace,
+              conn,
+              this.logger,
+              messages,
+              this.ux,
+              allVersions
+            )
+          );
+          break;
+        case 'fc':
+          migrationObjects.push(new CardMigrationTool(namespace, conn, this.logger, messages, this.ux, allVersions));
+          break;
+        case 'dr':
+          migrationObjects.push(new DataRaptorMigrationTool(namespace, conn, this.logger, messages, this.ux));
+          break;
+        default:
+          throw new Error(messages.getMessage('invalidOnlyFlag'));
+      }
+    }
+    return migrationObjects;
+  }
+
+  private async getProjectPath(relatedObjects: string, projectPath: string): Promise<string> {
+    const projectPathConfirmation = await this.ux
+      .confirm(`Do you have a sfdc project where ${relatedObjects} files are already retrieved from org - y
+          or you want tool to create a project omnistudio_migration in current directory for processing - n ? [y/n]`);
+    if (projectPathConfirmation) {
+      projectPath = await this.ux.prompt(`Enter the project path for processing ${relatedObjects} :`);
+      const projectJsonFile = 'sfdx-project.json';
+      if (!fs.existsSync(projectPath + '/' + projectJsonFile)) {
+        throw new Error(`Could not find any ${projectJsonFile} in  ${projectPath}.`);
+      }
+      this.ux.log(`Using project path: ${projectPath}`);
+    }
+    return projectPath;
+  }
+
+  private async getTargetApexNamespace(objectsToProcess: string[], targetApexNamespace: string): Promise<string> {
+    if (objectsToProcess.includes('apex')) {
+      targetApexNamespace = await this.ux.prompt(
+        'Enter the target namespace to be used for calling package Apex classes'
+      );
+      this.ux.log(`Using target namespace: ${targetApexNamespace} for calling package Apex classes`);
+    }
+    return targetApexNamespace;
+  }
+
   private mergeRecordAndUploadResults(
     migrationResults: MigrationResult,
     migrationTool: MigrationTool

src/migration/related/ApexMigration.ts

@@ -30,9 +30,10 @@ export class ApexMigration extends BaseRelatedObjectMigration {
   private readonly callableInterface: InterfaceImplements;
   private readonly vlocityOpenInterface2: InterfaceImplements;
   private readonly vlocityOpenInterface: InterfaceImplements;
-  private updatedNamespace = 'vlocity_ins';
-  public constructor(projectPath: string, namespace: string, org: Org) {
+  private updatedNamespace;
+  public constructor(projectPath: string, namespace: string, org: Org, targetApexNameSpace?: string) {
     super(projectPath, namespace, org);
+    this.updatedNamespace = targetApexNameSpace ? targetApexNameSpace : namespace;
     this.callableInterface = new InterfaceImplements(CALLABLE, this.namespace);
     this.vlocityOpenInterface2 = new InterfaceImplements(VLOCITY_OPEN_INTERFACE2, this.namespace);
     this.vlocityOpenInterface = new InterfaceImplements(VLOCITY_OPEN_INTERFACE, this.namespace);
@@ -49,10 +50,10 @@ export class ApexMigration extends BaseRelatedObjectMigration {
   public migrate(): ApexAssessmentInfo[] {
     const pwd = shell.pwd();
     shell.cd(this.projectPath);
-    const targetOrg: Org = this.org;
-    sfProject.retrieve(APEXCLASS, targetOrg.getUsername());
+    // const targetOrg: Org = this.org;
+    // sfProject.retrieve(APEXCLASS, targetOrg.getUsername());
     const apexAssessmentInfos = this.processApexFiles(this.projectPath);
-    sfProject.deploy(APEXCLASS, targetOrg.getUsername());
+    // sfProject.deploy(APEXCLASS, targetOrg.getUsername());
     shell.cd(pwd);
     return apexAssessmentInfos;
   }

src/migration/related/LwcMigration.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import * as shell from 'shelljs';
-import { Org } from '@salesforce/core';
 import { fileutil, File } from '../../utils/file/fileutil';
 import { sfProject } from '../../utils/sfcli/project/sfProject';
 import { Logger } from '../../utils/logger';
@@ -36,8 +35,8 @@ export class LwcMigration extends BaseRelatedObjectMigration {
   public migrate(): LWCAssessmentInfo[] {
     const pwd = shell.pwd();
     shell.cd(this.projectPath);
-    const targetOrg: Org = this.org;
-    sfProject.retrieve(LWCTYPE, targetOrg.getUsername());
+    // const targetOrg: Org = this.org;
+    // sfProject.retrieve(LWCTYPE, targetOrg.getUsername());
     const filesMap = this.processLwcFiles(this.projectPath);
     const LWCAssessmentInfos = this.processFiles(filesMap, 'migration');
     // sfProject.deploy(LWCTYPE, targetOrg.getUsername());
@@ -98,7 +97,9 @@ export class LwcMigration extends BaseRelatedObjectMigration {
             changeInfos,
             errors,
           };
-          jsonData.push(assesmentInfo);
+          if (changeInfos && changeInfos.length > 0) {
+            jsonData.push(assesmentInfo);
+          }
         }
       });
       return jsonData;

src/migration/related/OmnistudioRelatedObjectMigrationFacade.ts

@@ -4,6 +4,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Org } from '@salesforce/core';
 import '../../utils/prototypes';
+import * as shell from 'shelljs';
 import {
   ApexAssessmentInfo,
   DebugTimer,
@@ -22,6 +23,8 @@ import { LwcMigration } from './LwcMigration';
 // Load the specific messages for this file. Messages from @salesforce/command, @salesforce/core,
 // or any library that is using the messages framework can also be loaded this way.
 // const messages = Messages.loadMessages('@salesforce/plugin-omnistudio-related-object-migration-tool', 'migrate');
+const LWCTYPE = 'LightningComponentBundle';
+const APEXCLASS = 'Apexclass';
 
 const defaultProjectName = 'omnistudio_migration';
 export default class OmnistudioRelatedObjectMigrationFacade {
@@ -42,40 +45,64 @@ export default class OmnistudioRelatedObjectMigrationFacade {
   }
   public static intializeProject(projectPath?: string): string {
     if (projectPath) {
-      sfProject.create(defaultProjectName, projectPath);
-      return projectPath + '/' + defaultProjectName;
+      // sfProject.create(defaultProjectName, projectPath);
+      return projectPath;
     } else {
       sfProject.create(defaultProjectName);
       return process.cwd() + '/' + defaultProjectName;
     }
   }
+  public intializeProjectWithRetrieve(relatedObjects: string[], projectPath?: string): string {
+    if (projectPath) {
+      // sfProject.create(defaultProjectName, projectPath);
+      return projectPath;
+    } else {
+      sfProject.create(defaultProjectName);
+      projectPath = process.cwd() + '/' + defaultProjectName;
+      const pwd = shell.pwd();
+      shell.cd(projectPath);
+      if (relatedObjects.includes('lwc')) {
+        sfProject.retrieve(LWCTYPE, this.org.getUsername());
+      }
+      if (relatedObjects.includes('apex')) {
+        sfProject.retrieve(APEXCLASS, this.org.getUsername());
+      }
+      shell.cd(pwd);
+    }
+    return projectPath;
+  }
 
   public migrateAll(
     migrationResult: MigratedObject[],
     relatedObjects: string[],
-    projectPath?: string
+    projectPath?: string,
+    targetApexNamespace?: string
   ): RelatedObjectAssesmentInfo {
     // Start the debug timer
     DebugTimer.getInstance().start();
 
     // Declare an array of MigrationTool
-    const projectDirectory: string = OmnistudioRelatedObjectMigrationFacade.intializeProject(projectPath);
+    const projectDirectory: string = this.intializeProjectWithRetrieve(relatedObjects, projectPath);
     const debugTimer = DebugTimer.getInstance();
     debugTimer.start();
     // Initialize migration tools based on the relatedObjects parameter
-    const apexMigrator = this.createApexClassMigrationTool(projectDirectory);
+    const apexMigrator = this.createApexClassMigrationTool(projectDirectory, targetApexNamespace);
     const lwcMigrator = this.createLWCComponentMigrationTool(this.namespace, projectDirectory);
     let apexAssessmentInfos: ApexAssessmentInfo[] = [];
     let lwcAssessmentInfos: LWCAssessmentInfo[] = [];
     // Proceed with migration logic
     try {
-      apexAssessmentInfos = apexMigrator.migrate();
+      if (relatedObjects.includes('apex')) {
+        apexAssessmentInfos = apexMigrator.migrate();
+      }
     } catch (Error) {
       // Log the error
       Logger.logger.error(Error.message);
     }
     try {
-      lwcAssessmentInfos = lwcMigrator.migrate();
+      if (relatedObjects.includes('lwc')) {
+        lwcAssessmentInfos = lwcMigrator.migrate();
+      }
     } catch (Error) {
       // Log the error
       Logger.logger.error(Error.message);
@@ -98,8 +125,8 @@ export default class OmnistudioRelatedObjectMigrationFacade {
     return new LwcMigration(projectPath, this.namespace, this.org);
   }
 
-  private createApexClassMigrationTool(projectPath: string): ApexMigration {
+  private createApexClassMigrationTool(projectPath: string, targetApexNamespace?: string): ApexMigration {
     // Return an instance of ApexClassMigrationTool when implemented
-    return new ApexMigration(projectPath, this.namespace, this.org);
+    return new ApexMigration(projectPath, this.namespace, this.org, targetApexNamespace);
   }
 }