Merge pull request #347 from snehaljha-sf/mvp_alpha

Mvp alpha merge

Author: snehaljha-sf

messages/migrate.json

@@ -117,6 +117,8 @@
   "labelStatusSkipped": "Skipped",
   "labelStatusFailed": "Failed",
   "labelStatusComplete": "Complete",
+  "migrationConsentNotGiven": "Couldn't confirm whether assessment errors are resolved",
+  "migrationConsentMessage": "Ensure that all items in the assessment report are marked as Green before proceeding with the migration. Do you want to proceed?",
   "retrievingFlexiPages": "Retrieving FlexiPages",
   "successfullyRetrievedFlexiPages": "Successfully retrieved %s FlexiPages",
   "migratingFlexiPages": "Migrating FlexiPages",

package.json

@@ -17,6 +17,8 @@
     "@types/shelljs": "^0.8.15",
     "jsdom": "^25.0.0",
     "lodash.chunk": "^4.2.0",
+    "cli-progress": "^3.12.0",
+    "diff": "^5.1.0",
     "open": "^8.4.2",
     "shelljs": "^0.8.5",
     "tslib": "^2",
@@ -38,8 +40,6 @@
     "@typescript-eslint/eslint-plugin": "^4.2.0",
     "@typescript-eslint/parser": "^4.2.0",
     "chai": "^4.4.1",
-    "cli-progress": "^3.12.0",
-    "diff": "^5.1.0",
     "eslint": "^7.27.0",
     "eslint-config-oclif": "^3.1",
     "eslint-config-prettier": "^8",

src/commands/omnistudio/migration/assess.ts

@@ -115,8 +115,14 @@ export default class Assess extends OmniStudioBaseCommand {
     Logger.logVerbose(messages.getMessage('assessmentTargets', [String(this.flags.only || 'all')]));
     Logger.logVerbose(messages.getMessage('relatedObjectsInfo', [relatedObjects || 'none']));
     Logger.logVerbose(messages.getMessage('allVersionsFlagInfo', [String(allVersions)]));
-    // Assess OmniStudio components
-    await this.assessOmniStudioComponents(assesmentInfo, assessOnly, namespace, conn, allVersions);
+
+    try {
+      // Assess OmniStudio components
+      await this.assessOmniStudioComponents(assesmentInfo, assessOnly, namespace, conn, allVersions);
+    } catch (error) {
+      Logger.error(`Cannot assess OmniStudio components within ${namespace}`);
+      process.exit(1);
+    }
 
     let objectsToProcess: string[];
     // Assess related objects if specified

src/commands/omnistudio/migration/info.ts

@@ -89,7 +89,7 @@ export default class Org extends SfdxCommand {
 
     let outputString = '';
     if (trialExpirationDate) {
-      const date = new Date(trialExpirationDate).toDateString();
+      const date = new Date(trialExpirationDate).toLocaleString();
       outputString = messages.getMessage('greetingOrgInfoWithDate', [name, orgName, date]);
     } else {
       outputString = messages.getMessage('greetingOrgInfo', [name, orgName]);

src/commands/omnistudio/migration/migrate.ts

@@ -13,19 +13,21 @@ import { Connection, Messages } from '@salesforce/core';
 import OmniStudioBaseCommand from '../../basecommand';
 import { DataRaptorMigrationTool } from '../../../migration/dataraptor';
 import { DebugTimer, MigratedObject, MigratedRecordInfo } from '../../../utils';
-import { MigrationResult, MigrationTool } from '../../../migration/interfaces';
+import { InvalidEntityTypeError, MigrationResult, MigrationTool } from '../../../migration/interfaces';
 import { ResultsBuilder } from '../../../utils/resultsbuilder';
 import { CardMigrationTool } from '../../../migration/flexcard';
 import { OmniScriptExportType, OmniScriptMigrationTool } from '../../../migration/omniscript';
-import { GlobalAutoNumberMigrationTool } from '../../../migration/globalautonumber';
 import { Logger } from '../../../utils/logger';
 import OmnistudioRelatedObjectMigrationFacade from '../../../migration/related/OmnistudioRelatedObjectMigrationFacade';
 import { generatePackageXml } from '../../../utils/generatePackageXml';
 import { OmnistudioOrgDetails, OrgUtils } from '../../../utils/orgUtils';
 import { Constants } from '../../../utils/constants/stringContants';
 import { OrgPreferences } from '../../../utils/orgPreferences';
 import { ProjectPathUtil } from '../../../utils/projectPathUtil';
+import { PromptUtil } from '../../../utils/promptUtil';
+import { YES_SHORT, YES_LONG, NO_SHORT, NO_LONG } from '../../../utils/projectPathUtil';
 import { PostMigrate } from '../../../migration/postMigrate';
+import { GlobalAutoNumberMigrationTool } from '../../../migration/globalautonumber';
 
 // Initialize Messages with the current plugin directory
 Messages.importMessagesDirectory(__dirname);
@@ -116,6 +118,13 @@ export default class Migrate extends OmniStudioBaseCommand {
       Logger.log(`Could not enable Omni preferences: ${errMsg}`);
     }
 
+    // check for confirmation over assessed action items
+    const migrationConsent = await this.getMigrationConsent();
+    if (!migrationConsent) {
+      Logger.log(messages.getMessage('migrationConsentNotGiven'));
+      return;
+    }
+
     const namespace = orgs.packageDetails.namespace;
     // Let's time every step
     DebugTimer.getInstance().start();
@@ -201,7 +210,9 @@ export default class Migrate extends OmniStudioBaseCommand {
       objectsToProcess
     );
 
-    actionItems = await postMigrate.setDesignersToUseStandardDataModel(namespace);
+    if (!migrateOnly) {
+      actionItems = await postMigrate.setDesignersToUseStandardDataModel(namespace);
+    }
     await postMigrate.restoreExperienceAPIMetadataSettings(isExperienceBundleMetadataAPIProgramaticallyEnabled);
     const migrationActionItems = this.collectActionItems(objectMigrationResults);
     actionItems = [...actionItems, ...migrationActionItems];
@@ -212,13 +223,42 @@ export default class Migrate extends OmniStudioBaseCommand {
       conn.instanceUrl,
       orgs,
       messages,
-      actionItems
+      actionItems,
+      objectsToProcess
     );
 
     // Return results needed for --json flag
     return { objectMigrationResults };
   }
 
+  private async getMigrationConsent(): Promise<boolean> {
+    const askWithTimeOut = PromptUtil.askWithTimeOut(messages);
+    let validResponse = false;
+    let consent = false;
+
+    while (!validResponse) {
+      try {
+        const resp = await askWithTimeOut(Logger.prompt.bind(Logger), messages.getMessage('migrationConsentMessage'));
+        const response = typeof resp === 'string' ? resp.trim().toLowerCase() : '';
+
+        if (response === YES_SHORT || response === YES_LONG) {
+          consent = true;
+          validResponse = true;
+        } else if (response === NO_SHORT || response === NO_LONG) {
+          consent = false;
+          validResponse = true;
+        } else {
+          Logger.error(messages.getMessage('invalidYesNoResponse'));
+        }
+      } catch (err) {
+        Logger.error(messages.getMessage('requestTimedOut'));
+        process.exit(1);
+      }
+    }
+
+    return consent;
+  }
+
   private async handleExperienceSitePrerequisites(
     objectsToProcess: string[],
     conn: Connection,
@@ -316,10 +356,14 @@ export default class Migrate extends OmniStudioBaseCommand {
             };
           })
         );
-      } catch (error: any) {
-        const errMsg = error instanceof Error ? error.message : String(error);
+      } catch (ex: any) {
+        if (ex instanceof InvalidEntityTypeError) {
+          Logger.error(ex.message);
+          process.exit(1);
+        }
+        const errMsg = ex instanceof Error ? ex.message : String(ex);
         Logger.error(messages.getMessage('errorMigrationMessage', [errMsg]));
-        Logger.logVerbose(error);
+        Logger.logVerbose(ex);
         objectMigrationResults.push({
           name: cls.getName(),
           data: [],
@@ -459,10 +503,11 @@ export default class Migrate extends OmniStudioBaseCommand {
         let errors: any[] = obj.errors || [];
         errors = errors.concat(recordResults.errors || []);
 
-        obj.status =
-          !recordResults || recordResults.hasErrors
-            ? messages.getMessage('labelStatusFailed')
-            : messages.getMessage('labelStatusComplete');
+        obj.status = recordResults?.skipped
+          ? messages.getMessage('labelStatusSkipped')
+          : !recordResults || recordResults.hasErrors
+          ? messages.getMessage('labelStatusFailed')
+          : messages.getMessage('labelStatusComplete');
         obj.errors = errors;
         obj.migratedId = recordResults.id;
         obj.warnings = recordResults.warnings;

src/migration/dataraptor.ts

@@ -5,7 +5,14 @@ import DRMapItemMappings from '../mappings/DRMapItem';
 import { DebugTimer, oldNew, QueryTools } from '../utils';
 import { NetUtils } from '../utils/net';
 import { BaseMigrationTool } from './base';
-import { MigrationResult, MigrationTool, ObjectMapping, TransformData, UploadRecordResult } from './interfaces';
+import {
+  InvalidEntityTypeError,
+  MigrationResult,
+  MigrationTool,
+  ObjectMapping,
+  TransformData,
+  UploadRecordResult,
+} from './interfaces';
 import { DataRaptorAssessmentInfo } from '../../src/utils';
 
 import {
@@ -215,6 +222,9 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
       const dataRaptorAssessmentInfos = this.processDRComponents(dataRaptors);
       return dataRaptorAssessmentInfos;
     } catch (err) {
+      if (err instanceof InvalidEntityTypeError) {
+        throw err;
+      }
       Logger.error('Error assessing data mapper', err);
     }
   }
@@ -253,8 +263,10 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
           type: dataRaptor[this.namespacePrefix + 'Type__c'] || '',
           formulaChanges: [],
           infos: [],
-          warnings: [this.messages.getMessage('unexpectedError')],
+          warnings: [],
+          errors: [this.messages.getMessage('unexpectedError')],
           apexDependencies: [],
+          migrationStatus: 'Failed',
         });
         const error = e as Error;
         Logger.error('Error processing data mapper', error);
@@ -276,6 +288,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
     Logger.info(this.messages.getMessage('processingDataRaptor', [drName]));
     const warnings: string[] = [];
     const existingDRNameVal = new StringVal(drName, 'name');
+    let assessmentStatus = 'Can be Automated';
 
     if (!existingDRNameVal.isNameCleaned()) {
       warnings.push(
@@ -285,9 +298,11 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
           existingDRNameVal.cleanName(),
         ])
       );
+      assessmentStatus = 'Has Warnings';
     }
     if (existingDataRaptorNames.has(existingDRNameVal.cleanName())) {
       warnings.push(this.messages.getMessage('duplicatedName') + '  ' + existingDRNameVal.cleanName());
+      assessmentStatus = 'Need Manual Intervention';
     } else {
       existingDataRaptorNames.add(existingDRNameVal.cleanName());
     }
@@ -330,6 +345,8 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
       infos: [],
       apexDependencies: apexDependencies,
       warnings: warnings,
+      errors: [],
+      migrationStatus: assessmentStatus,
     };
     return dataRaptorAssessmentInfo;
   }
@@ -342,7 +359,14 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
       this.namespace,
       DataRaptorMigrationTool.DRBUNDLE_NAME,
       this.getDRBundleFields()
-    );
+    ).catch((err) => {
+      if (err.errorCode === 'INVALID_TYPE') {
+        throw new InvalidEntityTypeError(
+          `${DataRaptorMigrationTool.DRBUNDLE_NAME} type is not found under this namespace`
+        );
+      }
+      throw err;
+    });
   }
 
   // Get All Items
@@ -353,7 +377,10 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
       this.namespace,
       DataRaptorMigrationTool.DRMAPITEM_NAME,
       this.getDRMapItemFields()
-    );
+    ).catch((err) => {
+      Logger.error('Error querying data raptor items', err);
+      return [];
+    });
   }
 
   /*