Merge pull request #323 from mdmehran-qureshi/prerelease/alpha

Blitz finding fixed

Author: mdmehran-qureshi

messages/assess.json

@@ -29,11 +29,13 @@
   "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",
-  "apexLwc": "Please select the type of components to assess: 'apex' for Apex classes, 'lwc' for Lightning Web Components, or 'apex,lwc' if you want to include both types.",
+  "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 ",
   "noPackageInstalled": "No package installed on given org.",
   "alreadyStandardModel": "The org is already on standard data model.",
-  "invalidRelatedObjectsOption": "Invalid option provided for -r: %s. Valid options are apex, lwc.",
+  "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",
@@ -81,9 +83,9 @@
   "errorProcessingFiles": "Error in processing files: %s",
   "startingProcessRelatedObjects": "Starting processRelatedObjects for %s in project path: %s",
   "errorProcessingApexFile": "Error processing Apex file: %s",
-  "fileUpdatedToAllowRemoteCalls": "File updated to allow remote calls",
-  "fileUpdatedToAllowCalls": "File updated to allow calls",
-  "fileImplementsVlocityOpenInterface": "file %s implements VlocityOpenInterface no changes will be applied",
+  "fileUpdatedToAllowRemoteCalls": "File will be updated to allow remote calls",
+  "fileUpdatedToAllowCalls": "File will be updated to allow calls",
+  "fileImplementsVlocityOpenInterface": "File %s implements VlocityOpenInterface no changes will be applied",
   "methodCallBundleNameUpdated": "Method call bundle name will be updated in %s for class %s method %s",
   "cardNameChangeMessage": "Card name will be changed from {0} to {1} to follow API naming standards",
   "authordNameChangeMessage": "Author name will be changed from {0} to {1} to follow API naming standards",

messages/migrate.json

@@ -29,11 +29,13 @@
   "errorWhileUploadingCard": "An error ocurred while uploading Card: ",
   "errorWhileCreatingElements": "An error ocurred while saving OmniScript elements: ",
   "allVersionsDescription": "Migrate all versions of a component",
-  "apexLwc": "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.",
+  "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.",
   "invalidNamespace": "The namespace you have passed is not valid namespace, the valid namespace of your org is ",
   "noPackageInstalled": "No package installed on given org.",
   "alreadyStandardModel": "The org is already on standard data model.",
-  "invalidRelatedObjectsOption": "Invalid option provided for -r: %s. Valid options are apex, lwc.",
+  "invalidRelatedObjectsOptionGA": "Invalid option provided for -r: %s. Valid options are apex, lwc.",
+  "invalidRelatedObjectsOption": "Invalid option provided for -r: %s. Valid option is apex.",
   "userConsentMessage": "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]",
   "userDeclinedConsent": "User declined consent, will not process %s .",
   "userConsentedToProceed": "User consented to proceed",

src/commands/omnistudio/migration/assess.ts

@@ -100,7 +100,7 @@ export default class Assess extends OmniStudioBaseCommand {
     }
     const orgs: OmnistudioOrgDetails = await OrgUtils.getOrgDetails(conn, this.flags.namespace);
 
-    if (!orgs.hasValidNamespace) {
+    if (!orgs.hasValidNamespace && this.flags.namespace) {
       Logger.warn(messages.getMessage('invalidNamespace') + orgs.packageDetails.namespace);
     }
 
@@ -131,7 +131,7 @@ export default class Assess extends OmniStudioBaseCommand {
     };
 
     Logger.log(messages.getMessage('assessmentInitialization', [String(namespace)]));
-    Logger.logVerbose(messages.getMessage('apiVersionInfo', [String(apiVersion)]));
+    Logger.log(messages.getMessage('apiVersionInfo', [String(apiVersion)]));
     Logger.logVerbose(messages.getMessage('assessmentTargets', [String(this.flags.only || 'all')]));
     Logger.logVerbose(messages.getMessage('relatedObjectsInfo', [relatedObjects || 'none']));
     Logger.logVerbose(messages.getMessage('allVersionsFlagInfo', [String(allVersions)]));
@@ -141,13 +141,15 @@ export default class Assess extends OmniStudioBaseCommand {
     let objectsToProcess: string[];
     // Assess related objects if specified
     if (relatedObjects) {
-      const validOptions = [Constants.Apex, Constants.LWC];
+      // To-Do: Add LWC to valid options when GA is released
+      const validOptions = [Constants.Apex];
       objectsToProcess = relatedObjects.split(',').map((obj) => obj.trim());
 
       // Validate input
       for (const obj of objectsToProcess) {
         if (!validOptions.includes(obj)) {
-          Logger.warn(messages.getMessage('invalidRelatedObjectsOption', [String(obj)]));
+          Logger.error(messages.getMessage('invalidRelatedObjectsOption', [String(obj)]));
+          process.exit(1);
         }
       }
 

src/commands/omnistudio/migration/migrate.ts

@@ -96,7 +96,7 @@ export default class Migrate extends OmniStudioBaseCommand {
 
     const orgs: OmnistudioOrgDetails = await OrgUtils.getOrgDetails(conn, this.flags.namespace);
 
-    if (!orgs.hasValidNamespace) {
+    if (!orgs.hasValidNamespace && this.flags.namespace) {
       Logger.warn(messages.getMessage('invalidNamespace') + orgs.packageDetails.namespace);
     }
 
@@ -125,12 +125,14 @@ export default class Migrate extends OmniStudioBaseCommand {
     let objectsToProcess: string[] = [];
     let targetApexNamespace: string;
     if (relatedObjects) {
-      const validOptions = [Constants.Apex, Constants.LWC];
+      // To-Do: Add LWC to valid options when GA is released
+      const validOptions = [Constants.Apex];
       objectsToProcess = relatedObjects.split(',').map((obj) => obj.trim());
       // Validate input
       for (const obj of objectsToProcess) {
         if (!validOptions.includes(obj)) {
-          Logger.warn(messages.getMessage('invalidRelatedObjectsOption', [obj]));
+          Logger.error(messages.getMessage('invalidRelatedObjectsOption', [obj]));
+          process.exit(1);
         }
       }
       // Ask for user consent
@@ -145,7 +147,7 @@ export default class Migrate extends OmniStudioBaseCommand {
     }
 
     Logger.log(messages.getMessage('migrationInitialization', [String(namespace)]));
-    Logger.logVerbose(messages.getMessage('apiVersionInfo', [apiVersion]));
+    Logger.log(messages.getMessage('apiVersionInfo', [apiVersion]));
     Logger.logVerbose(messages.getMessage('migrationTargets', [migrateOnly || 'all']));
     Logger.logVerbose(messages.getMessage('relatedObjectsInfo', [relatedObjects || 'none']));
     Logger.logVerbose(messages.getMessage('allVersionsFlagInfo', [String(allVersions)]));

src/migration/flexcard.ts

@@ -117,10 +117,8 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
     progressBar.start(flexCards.length, progressCounter);
     const uniqueNames = new Set<string>();
 
-    const limitedFlexCards = flexCards.slice(0, 200);
-
     // Now process each OmniScript and its elements
-    for (const flexCard of limitedFlexCards) {
+    for (const flexCard of flexCards) {
       try {
         const flexCardAssessmentInfo = await this.processFlexCard(flexCard, uniqueNames);
         flexCardAssessmentInfos.push(flexCardAssessmentInfo);
@@ -143,6 +141,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
       }
       progressBar.update(++progressCounter);
     }
+    progressBar.stop();
     return flexCardAssessmentInfos;
   }
 
@@ -242,7 +241,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
     } else if (dataSource.type === Constants.ApexRemoteComponentName) {
       const remoteClass = dataSource.value?.remoteClass;
       const remoteMethod = dataSource.value?.remoteMethod;
-      Logger.logVerbose(`Remote Action name: ${remoteClass}.${remoteMethod}`);
+      Logger.info(`Remote Action name: ${remoteClass}.${remoteMethod}`);
 
       // Avoid duplicates
       if (!flexCardAssessmentInfo.dependenciesApexRemoteAction.includes(`${remoteClass}.${remoteMethod}`)) {
@@ -367,7 +366,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
       // Check customlwcname property first
       if (component.property.customlwcname) {
         const customLwcName = component.property.customlwcname;
-        Logger.logVerbose(`Custom LWC name: ${customLwcName}`);
+        Logger.info(`Custom LWC name: ${customLwcName}`);
 
         // Avoid duplicates
         if (!flexCardAssessmentInfo.dependenciesLWC.includes(customLwcName)) {

src/utils/orgUtils/index.ts

@@ -353,15 +353,13 @@ export class OrgUtils {
       const selectedPackage = installedOmniPackages[selectedIndex];
       packageDetails.version = `${selectedPackage.MajorVersion}.${selectedPackage.MinorVersion}`;
       packageDetails.namespace = selectedPackage.NamespacePrefix;
-      hasValidNamespace = true;
 
       Logger.log(messages.getMessage('selectedPackage', [selectedPackage.NamespacePrefix, packageDetails.version]));
     } else if (installedOmniPackages.length === 1) {
       // Only one package found, use it automatically
       const pkg = installedOmniPackages[0];
       packageDetails.version = `${pkg.MajorVersion}.${pkg.MinorVersion}`;
       packageDetails.namespace = pkg.NamespacePrefix;
-      hasValidNamespace = true;
     }
 
     //Execute apex rest resource to get omnistudio org permission