Merge pull request #400 from snehaljha-sf/mvp_backport

GA backport to MVP

Author: snehaljha-sf

messages/assess.json

@@ -17,19 +17,19 @@
   "couldNotTruncate": "Could not truncate %s",
   "couldNotTruncateOmnniProcess": "Could not truncate OmniProcess. Please make sure your OS/IP is not referenced in an OmniScrirpt or Flex Card.",
   "invalidNameTypeSubtypeOrLanguage": "Not a valid Name, Type, SubType or Language",
-  "invalidOrRepeatingOmniscriptElementNames": "Invalid or Repeating Element Names for Same OmniScript",
+  "invalidOrRepeatingOmniscriptElementNames": "Invalid or Repeating Element Names for Same Omniscript",
   "invalidDataRaptorName": "Invalid name, can not have special characters",
-  "duplicatedCardName": "Duplicated Flex Card name",
-  "duplicatedDrName": "Duplicated DataMapper name",
-  "duplicatedOSName": "Duplicated OmniScript name",
+  "duplicatedCardName": "Duplicated Flexcard name",
+  "duplicatedDrName": "Duplicated Data Mapper name",
+  "duplicatedOSName": "Duplicated Omniscript name",
   "duplicatedName": "Duplicated name",
-  "errorWhileActivatingOs": "Could not activate OmniScript / Integration Procedure: ",
+  "errorWhileActivatingOs": "Could not activate Omniscript / Integration Procedure: ",
   "errorWhileActivatingCard": "Could not activate Card: ",
   "errorWhileUploadingCard": "An error ocurred while uploading Card: ",
-  "errorWhileCreatingElements": "An error ocurred while saving OmniScript elements: ",
+  "errorWhileCreatingElements": "An error ocurred while saving Omniscript elements: ",
   "allVersionsDescription": "Migrate all versions of a component",
   "changeMessage": " %s will be changed from %s to %s",
-  "angularOSWarning": " Angular OmniScript will not be migrated, please convert this to LWC based Omniscript",
+  "angularOSWarning": " Angular Omniscript will not be migrated, please convert this to LWC based Omniscript",
   "apexLwcGA": "Please select the type of component to assess: 'apex' for Apex classes, 'lwc' for Lightning Web Components, or 'apex,lwc' if you want to include both types.",
   "apexLwc": "Please select the type of component to assess: 'apex' for Apex classes.",
   "invalidNamespace": "The namespace you have passed is not valid namespace, the valid namespace of your org is ",
@@ -38,11 +38,11 @@
   "invalidRelatedObjectsOptionGA": "Invalid option provided for -r: %s. Valid options are apex, lwc.",
   "invalidRelatedObjectsOption": "Invalid option provided for -r: %s. Valid option is apex.",
   "formulaSyntaxError": "There was some problem while updating the formula syntax, please check the all the formula's syntax once : %s",
-  "errorDuringFlexCardAssessment": "Error during FlexCard assessment",
-  "errorDuringOmniScriptAssessment": "Error during OmniScript assessment",
-  "processingFlexCard": "Processing FlexCard: %s",
-  "processingDataRaptor": "Processing DataMapper: %s",
-  "processingOmniScript": "Processing OmniScript: %s",
+  "errorDuringFlexCardAssessment": "Error during Flexcards assessment",
+  "errorDuringOmniScriptAssessment": "Error during Omniscript assessment",
+  "processingFlexCard": "Processing Flexcards: %s",
+  "processingDataRaptor": "Processing Data Mappers: %s",
+  "processingOmniScript": "Processing Omniscripts: %s",
   "foundDataRaptorsToAssess": "Found %s Data Mappers to assess",
   "foundOmniScriptsToAssess": "Found %s %s to assess",
   "startingDataRaptorAssessment": "Starting Data Mappers assessment",
@@ -59,7 +59,7 @@
   "assessedFlexCardsCount": "Assessed %s Flexcards",
   "flexCardAssessmentCompleted": "Flexcards assessment completed",
   "omniScriptAssessment": "%s Assessment",
-  "assessedOmniScriptsCount": "Assessed %s OmniScripts",
+  "assessedOmniScriptsCount": "Assessed %s Omniscripts",
   "assessedIntegrationProceduresCount": "Assessed %s Integration Procedures",
   "omniScriptAssessmentCompleted": "%s assessment completed",
   "startingFlexCardAssessment": "Starting Flexcards assessment",
@@ -90,8 +90,8 @@
   "methodCallBundleNameUpdated": "Method call bundle name will be updated in %s for class %s method %s",
   "cardNameChangeMessage": "Card name will be changed from %s to %s to follow API naming standards",
   "authordNameChangeMessage": "Author name will be changed from %s to %s to follow API naming standards",
-  "omniScriptNameChangeMessage": "OmniScript reference part %s will be changed to %s during migration.",
-  "dataRaptorNameChangeMessage": "DataMapper reference %s will be changed to %s during migration.",
+  "omniScriptNameChangeMessage": "Omniscript reference name %s will be changed to %s during migration.",
+  "dataRaptorNameChangeMessage": "Data Mapper reference %s will be changed to %s during migration.",
   "integrationProcedureNameChangeMessage": "Integration Procedure reference %s will be changed to %s during migration.",
   "integrationProcedureManualUpdateMessage": "Integration Procedure reference %s may need manual updates after migration.",
   "duplicateCardNameMessage": "Potential duplicate: Another card has the same name %s after name cleaning. This may cause conflicts during migration",
@@ -118,5 +118,10 @@
   "unexpectedError": "Unexpected Assessment error",
   "errorEvaluatingExpression": "Error evaluating expression: %s, %s",
   "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"
+  "assessmentSuccessfulMessage": "Migration assessment for org %s is complete and reports are ready for review in the folder %s",
+  "inApexIpNameWillBeUpdated": "In Apex %s IP name %s will be updated to %s",
+  "inApexVariableAssignmentWillBeUpdated": "In Apex %s variable assignment %s = '%s' will be updated to %s",
+  "varDeclarationUpdated": "Variable initialization will be updated for target name",
+  "ipNameUpdateFailed": "IP reference %s can’t be updated",
+  "dmNameUpdateFailed": "DM reference %s can’t be updated"
 }

messages/migrate.json

@@ -17,15 +17,15 @@
   "couldNotTruncate": "Could not truncate %s",
   "couldNotTruncateOmnniProcess": "Could not truncate OmniProcess. Please make sure your OS/IP is not referenced in an OmniScrirpt or Flex Card.",
   "invalidNameTypeSubtypeOrLanguage": "Not a valid Name, Type, SubType or Language",
-  "invalidOrRepeatingOmniscriptElementNames": "Invalid or Repeating Element Names for Same OmniScript",
+  "invalidOrRepeatingOmniscriptElementNames": "Invalid or Repeating Element Names for Same Omniscript",
   "invalidDataRaptorName": "Invalid name, can not have special characters",
-  "duplicatedCardName": "Duplicated Flex Card name",
-  "duplicatedDrName": "Duplicated DataMapper name",
-  "duplicatedOSName": "Duplicated OmniScript name",
-  "errorWhileActivatingOs": "Could not activate OmniScript / Integration Procedure: ",
+  "duplicatedCardName": "Duplicated Flexcard name",
+  "duplicatedDrName": "Duplicated Data Mapper name",
+  "duplicatedOSName": "Duplicated Omniscript name",
+  "errorWhileActivatingOs": "Could not activate Omniscript / Integration Procedure: ",
   "errorWhileActivatingCard": "Could not activate Card: ",
   "errorWhileUploadingCard": "An error ocurred while uploading Card: ",
-  "errorWhileCreatingElements": "An error ocurred while saving OmniScript elements: ",
+  "errorWhileCreatingElements": "An error ocurred while saving Omniscript elements: ",
   "allVersionsDescription": "Migrate all versions of a component",
   "apexLwcGA": "Please select the type of components to migrate: 'apex' for Apex classes, 'lwc' for Lightning Web Components, or 'apex,lwc' if you want to include both types.",
   "apexLwc": "Please select the type of components to migrate: 'apex' for Apex classes.",
@@ -63,8 +63,8 @@
   "migratingComponent": "Migrating: %s",
   "migrationCompleted": "Migration completed: %s",
   "formulaSyntaxError": "There was some problem while updating the formula syntax, please check the all the formula's syntax once : %s",
-  "foundDataRaptorsToMigrate": "Found %s DataMappers to migrate",
-  "foundFlexCardsToMigrate": "Found %s FlexCards to migrate",
+  "foundDataRaptorsToMigrate": "Found %s Data Mappers to migrate",
+  "foundFlexCardsToMigrate": "Found %s Flexcards to migrate",
   "foundOmniScriptsToMigrate": "Found %s %s to migrate",
   "allVersionsInfo": "allVersions : %s",
   "migrationInitialization": "Migration Initialization: Using namespace: %s",
@@ -92,13 +92,13 @@
   "packageSelectionPrompt": "Enter the number of the package to use (1-%s):",
   "invalidPackageSelection": "Invalid selection. Please enter a number between 1 and %s.",
   "selectedPackage": "Selected package: %s (Version: %s)",
-  "dataRaptorNameChangeMessage": "DataMapper reference %s will be changed to %s during migration.",
+  "dataRaptorNameChangeMessage": "Data Mapper reference %s will be changed to %s during migration.",
   "integrationProcedureNameChangeMessage": "Integration Procedure reference %s will be changed to %s during migration.",
   "integrationProcedureManualUpdateMessage": "Integration Procedure reference %s may need manual updates after migration.",
   "cardAuthorNameChangeMessage": "Card author name has been modified to fit naming rules: %s",
   "cardNameChangeMessage": "Card name has been modified to fit naming rules: %s",
   "duplicateCardNameMessage": "Potential duplicate: Another card has the same name %s after name cleaning. This may cause conflicts during migration",
-  "angularOmniscriptWarningMessage": " Angular OmniScript will not be migrated, please convert this to LWC based Omniscript",
+  "angularOmniscriptWarningMessage": " Angular Omniscript will not be migrated, please convert this to LWC based Omniscript",
   "apexFileChangesApplied": "Applied changes to Apex class %s",
   "generatingComponentReports": "Generating report for components",
   "generatingRelatedObjectReports": "Generating report for related objects",
@@ -115,5 +115,6 @@
   "migrationConsentMessage": "Make sure that all records listed in the Assessment Status column in the Assessment Report are marked as Ready for migration before proceeding with the migration. Do you want to proceed? Yes or No?",
   "truncationFailed": "Truncation failed for %s: %s",
   "invalidTypeMigrateErrorMessage": "We couldn't migrate your Omnistudio components in the %s namespace. Select the correct namespace and try again",
-  "migrationSuccessfulMessage": "Migration process for org %s is complete and reports are ready for review in the folder %s"
+  "migrationSuccessfulMessage": "Migration process for org %s is complete and reports are ready for review in the folder %s",
+  "varDeclarationUpdated": "Variable initialization has been updated for target name"
 }

src/migration/base.ts

@@ -7,7 +7,7 @@ import { Stringutil } from '../utils/StringValue/stringutil';
 import { Logger } from '../utils/logger';
 import { TransformData, UploadRecordResult } from './interfaces';
 
-export type ComponentType = 'DataMappers' | 'Flexcards' | 'Omniscripts' | 'Integration Procedures';
+export type ComponentType = 'Data Mappers' | 'Flexcards' | 'Omniscripts' | 'Integration Procedures';
 
 /**
  * Creates a progress bar for migration/assessment operations

src/migration/dataraptor.ts

@@ -32,7 +32,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
   static readonly OMNIDATATRANSFORMITEM_NAME = 'OmniDataTransformItem';
 
   getName(): string {
-    return 'DataMappers';
+    return 'Data Mappers';
   }
 
   getRecordName(record: string) {
@@ -101,7 +101,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
       (dr) => dr[this.namespacePrefix + 'Type__c'] !== 'Migration'
     ).length;
     Logger.log(this.messages.getMessage('foundDataRaptorsToMigrate', [nonMigrationDataRaptors]));
-    const progressBar = createProgressBar('Migrating', 'DataMappers');
+    const progressBar = createProgressBar('Migrating', 'Data Mappers');
     progressBar.start(nonMigrationDataRaptors, progressCounter);
     for (let dr of dataRaptors) {
       // Skip if Type is "Migration"
@@ -193,7 +193,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
     progressBar.stop();
 
     return {
-      name: 'Data Mapper',
+      name: 'Data Mappers',
       results: drUploadInfo,
       records: originalDrRecords,
     };
@@ -237,7 +237,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
     const existingDataRaptorNames = new Set<string>();
     const dataRaptorItemsMap = await this.getAllDRToItemsMap();
 
-    const progressBar = createProgressBar('Assessing', 'DataMappers');
+    const progressBar = createProgressBar('Assessing', 'Data Mappers');
     let progressCounter = 0;
     let nonMigrationDataRaptors = dataRaptors.filter(
       (dr) => dr[this.namespacePrefix + 'Type__c'] !== 'Migration'

src/migration/related/ApexMigration.ts

@@ -130,16 +130,45 @@ export class ApexMigration extends BaseRelatedObjectMigration {
     parser.parse();
     const tokenUpdates: TokenUpdater[] = [];
     const tokenUpdatesForRemoteCalls = this.processApexFileForRemotecalls(file, parser);
-    const tokeUpdatesForMethodCalls = this.processApexFileForMethodCalls(file, parser);
+    const ipNameUpdateFailed = new Set<string>();
+    const dmNameUpdateFailed = new Set<string>();
+    const tokenUpdatesForMethodCalls = this.processApexFileForMethodCalls(file, parser, ipNameUpdateFailed);
+    const tokenUpdatesForSimpleVarDeclarations = this.processApexFileForSimpleVarDeclarations(
+      parser,
+      ipNameUpdateFailed,
+      dmNameUpdateFailed
+    );
     const updateMessages: string[] = [];
 
     if (tokenUpdatesForRemoteCalls && tokenUpdatesForRemoteCalls.length > 0) {
       tokenUpdates.push(...tokenUpdatesForRemoteCalls);
       updateMessages.push(assessMessages.getMessage('fileUpdatedToAllowRemoteCalls'));
     }
-    if (tokeUpdatesForMethodCalls && tokeUpdatesForMethodCalls.length > 0) {
+    if (tokenUpdatesForMethodCalls && tokenUpdatesForMethodCalls.length > 0) {
       updateMessages.push(assessMessages.getMessage('fileUpdatedToAllowCalls'));
-      tokenUpdates.push(...tokeUpdatesForMethodCalls);
+      tokenUpdates.push(...tokenUpdatesForMethodCalls);
+    }
+
+    if (tokenUpdatesForSimpleVarDeclarations && tokenUpdatesForSimpleVarDeclarations.length > 0) {
+      if (type === 'migration') {
+        updateMessages.push(migrateMessages.getMessage('varDeclarationUpdated'));
+      } else {
+        updateMessages.push(assessMessages.getMessage('varDeclarationUpdated'));
+      }
+      tokenUpdates.push(...tokenUpdatesForSimpleVarDeclarations);
+    }
+
+    const warnings: string[] = [];
+
+    if (ipNameUpdateFailed.size > 0) {
+      ipNameUpdateFailed.forEach((name) => {
+        warnings.push(assessMessages.getMessage('ipNameUpdateFailed', [name]));
+      });
+    }
+    if (dmNameUpdateFailed.size > 0) {
+      dmNameUpdateFailed.forEach((name) => {
+        warnings.push(assessMessages.getMessage('dmNameUpdateFailed', [name]));
+      });
     }
     let difference = [];
     if (tokenUpdates && tokenUpdates.length > 0) {
@@ -156,11 +185,11 @@ export class ApexMigration extends BaseRelatedObjectMigration {
     if (updateMessages.length === 0) {
       Logger.info(assessMessages.getMessage('fileNoOmnistudioCalls', [file.name]));
     }
-    const warningMessage: string[] = this.processNonReplacableMethodCalls(file, parser);
+    warnings.push(...this.processNonReplacableMethodCalls(file, parser));
     return {
       name: file.name,
       errors: [],
-      warnings: warningMessage,
+      warnings,
       infos: updateMessages,
       path: file.location,
       diff: JSON.stringify(difference),
@@ -247,7 +276,11 @@ export class ApexMigration extends BaseRelatedObjectMigration {
     return tokenUpdates;
   }
 
-  private processApexFileForMethodCalls(file: File, parser: ApexASTParser): TokenUpdater[] {
+  private processApexFileForMethodCalls(
+    file: File,
+    parser: ApexASTParser,
+    ipNameUpdateFailed: Set<string>
+  ): TokenUpdater[] {
     const namespaceChanges = parser.namespaceChanges;
     const tokenUpdates: TokenUpdater[] = [];
     if (namespaceChanges && namespaceChanges.has(this.namespace)) {
@@ -267,6 +300,24 @@ export class ApexMigration extends BaseRelatedObjectMigration {
         tokenUpdates.push(new SingleTokenUpdate(newName, token));
       }
     }
+
+    const ipParameters = methodParameters.get(ParameterType.IP_NAME);
+    if (ipParameters) {
+      for (const token of ipParameters) {
+        const oldName = token.text;
+        const parts = oldName.split('_');
+        if (parts.length !== 2) {
+          ipNameUpdateFailed.add(oldName);
+          continue;
+        }
+        const newName = `'${parts.map((p) => Stringutil.cleanName(p)).join('_')}'`;
+        if (newName === oldName) {
+          continue;
+        }
+        Logger.info(assessMessages.getMessage('inApexIpNameWillBeUpdated', [file.name, oldName, newName]));
+        tokenUpdates.push(new SingleTokenUpdate(newName, token));
+      }
+    }
     return tokenUpdates;
   }
 
@@ -297,6 +348,51 @@ export class ApexMigration extends BaseRelatedObjectMigration {
             }
     `;
   }
+
+  private processApexFileForSimpleVarDeclarations(
+    parser: ApexASTParser,
+    ipNameUpdateFailed: Set<string>,
+    dmNameUpdateFailed: Set<string>
+  ): TokenUpdater[] {
+    const simpleVarDeclarations = parser.simpleVarDeclarations;
+    const tokenUpdates: TokenUpdater[] = [];
+    // check and update for DM
+    const dmVarInMethodCalls = parser.dmVarInMethodCalls;
+    for (const varName of dmVarInMethodCalls) {
+      const varToken = simpleVarDeclarations.get(varName);
+      if (!varToken) {
+        dmNameUpdateFailed.add(varName);
+        continue;
+      }
+      const newName = `'${Stringutil.cleanName(varToken.text.substring(1, varToken.text.length - 1))}'`;
+      if (newName === varToken.text) {
+        continue;
+      }
+      tokenUpdates.push(new SingleTokenUpdate(newName, varToken));
+    }
+    // check and update for IP
+    const ipVarInMethodCalls = parser.ipVarInMethodCalls;
+    for (const varName of ipVarInMethodCalls) {
+      const varToken = simpleVarDeclarations.get(varName);
+      if (!varToken) {
+        ipNameUpdateFailed.add(varName);
+        continue;
+      }
+      const oldName = varToken.text.substring(1, varToken.text.length - 1);
+      const parts = oldName.split('_');
+      if (parts.length !== 2) {
+        ipNameUpdateFailed.add(varName);
+        continue;
+      }
+      const newName = `'${parts.map((p) => Stringutil.cleanName(p)).join('_')}'`;
+      if (newName === varToken.text) {
+        continue;
+      }
+      tokenUpdates.push(new SingleTokenUpdate(newName, varToken));
+    }
+
+    return tokenUpdates;
+  }
   /*
     private mapTOName(apexAssessmentInfos: ApexAssessmentInfo[]): string[] {
       return apexAssessmentInfos.map((apexAssessmentInfo) => {

src/styles/reportGenerator.css

@@ -265,6 +265,8 @@ html {
   position: relative;
   overflow-y: auto;
   overflow-x: auto;
+  display: flex;
+  flex-direction: column;
 }
 
 .closeButton {
@@ -280,6 +282,8 @@ html {
   align-items: center;
   justify-content: center;
   z-index: 1050;
+  border-radius: 3px;
+  padding-right: 0;
 }
 
 .modalHeader {
@@ -291,6 +295,11 @@ html {
 }
 
 .modalContent {
+  overflow: auto;
+}
+
+.modalContent p {
+  margin: 0;
   margin-top: 20px;
 }
 
@@ -393,7 +402,7 @@ html {
   display: flex;
   flex-direction: column;
   gap: 10px;
-  height: 14rem;
+  min-height: 14rem;
   min-width: 25rem;
   background-color: #fff;
 }