Merge pull request #373 from snehaljha-sf/assessment_fixes

Assessment fixes

Author: snehaljha-sf

messages/assess.json

@@ -123,15 +123,15 @@
   "errorEvaluatingExpression": "Error evaluating expression: %s, %s",
   "foundFlexiPages": "Found %s FlexiPages to assess",
   "assessingFlexiPages": "Assessing FlexiPages",
-  "completedProcessingAllFlexiPages": "Completed processing all flexipage files. Total processed: %s",
-  "completedProcessingFlexiPage": "Completed processing %s - Errors: %s",
-  "processingFlexiPage": "Processing flexipage file: %s",
-  "startingFlexiPageProcessing": "Starting to process flexipage: %s",
+  "completedProcessingAllFlexiPages": "Completed processing all FlexiPages. Total processed: %s",
+  "completedProcessingFlexiPage": "Completed processing %s. Errors: %s",
+  "processingFlexiPage": "Processing FlexiPage: %s",
+  "startingFlexiPageProcessing": "Starting to process FlexiPage: %s",
   "readFlexiPageContent": "Read file content, size: %s characters",
-  "updatedModifiedContent": "updated content in file: %s",
-  "generatedDiffForFile": "Generated diff for file: %s",
-  "errorProcessingFlexiPage": "Error processing flexipage file: %s, %s",
-  "flexipagesWithChanges": "Found %s flexipage files with changes",
+  "updatedModifiedContent": "updated content in %s file",
+  "generatedDiffForFile": "Generated difference for the file: %s",
+  "errorProcessingFlexiPage": "Error processing FlexiPage: %s, %s",
+  "flexipagesWithChanges": "Found %s FlexiPages with changes",
   "migratingFlexiPages": "Migrating FlexiPages",
   "experienceSiteMetadataConsent": "The consent for exp site is %s",
   "experienceSiteConsentNotProvidedWarning": "Consent for experience sites is not provided. Experience sites will not be processed",

messages/migrate.json

@@ -117,15 +117,15 @@
   "migrationConsentNotGiven": "Couldn't confirm whether assessment errors are resolved",
   "foundFlexiPages": "Found %s FlexiPages to migrate",
   "migratingFlexiPages": "Migrating FlexiPages",
-  "completedProcessingAllFlexiPages": "Completed processing all flexipage files. Total processed: %s",
-  "completedProcessingFlexiPage": "Completed processing %s - Errors: %s",
-  "processingFlexiPage": "Processing flexipage file: %s",
-  "startingFlexiPageProcessing": "Starting to process flexipage: %s",
+  "completedProcessingAllFlexiPages": "Completed processing all flexipages. Total processed: %s",
+  "completedProcessingFlexiPage": "Completed processing %s. Errors: %s",
+  "processingFlexiPage": "Processing FlexiPage: %s",
+  "startingFlexiPageProcessing": "Starting to process FlexiPage: %s",
   "readFlexiPageContent": "Read file content, size: %s characters",
-  "updatedModifiedContent": "updated content in file: %s",
-  "generatedDiffForFile": "Generated diff for file: %s",
-  "errorProcessingFlexiPage": "Error processing flexipage file: %s, %s",
-  "flexipagesWithChanges": "Found %s flexipage files with changes",
+  "updatedModifiedContent": "updated content in %s file",
+  "generatedDiffForFile": "Generated difference for the file: %s",
+  "errorProcessingFlexiPage": "Error processing FlexiPage: %s, %s",
+  "flexipagesWithChanges": "Found %s FlexiPages with changes",
   "omniGlobalAutoNumberPrefEnabled": "Successfully enabled OmniGlobalAutoNumberPref org preference",
   "errorEnablingOmniGlobalAutoNumberPref": "We couldn’t enable the Global Auto Number setting. Turn on the Global Auto Number setting manually, and try again. See <a href='https://help.salesforce.com/s/articleView?id=xcloud.os_standard_global_auto_number.htm&type=5' target='_blank'>Set Up Omni Global Auto Number</a>.",
   "performingPreMigrationChecks": "Performing pre-migration checks for Global Auto Number...",
@@ -188,16 +188,16 @@
   "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",
-  "autoDeployConsentMessage": "Do you want to auto deploy the related objects? [y/n]",
-  "errorDeployingComponents": "Error deploying related objects post migration",
+  "autoDeployConsentMessage": "Do you want to deploy the related objects automatically? [y/n]",
+  "errorDeployingComponents": "We couldn’t deploy related objects after migration.",
   "installingDependency": "Installing node dependency %s",
   "dependencyInstalled": "Node dependency %s installed",
   "deployingFromManifest": "Deploying from metadata packages",
-  "manifestDeployFailed": "Metadata packages deployment failed, check logs or status for more details",
+  "manifestDeployFailed": "We couldn’t deploy metadata packages. Check the logs or the status for more details.",
   "installingRequiredDependencies": "Installing required node dependencies",
-  "creatingNPMConfigFile": "Creating npm config file",
+  "creatingNPMConfigFile": "Creating npm configuration file",
   "npmConfigFileCreated": "Npm config file created",
-  "authKeyEnvVarNotSet": "OMA_AUTH_KEY environment variable is not set, LWCs will not be deployed",
+  "authKeyEnvVarNotSet": "The OMA_AUTH_KEY environment variable isn’t set. LWCs won't be deployed.",
   "experienceSiteException": "Exception occurred while processing experience sites",
   "reservedKeysFoundInPropertySet": "Reserved keys found in any of output response transformation fields: %s.",
   "incompleteMigrationDetected": "We couldn't complete the migration process",
@@ -210,7 +210,7 @@
   "skipFlexcardAngularOmniScriptDependencyWarning": "Skipping FlexCard %s due to Angular Omniscript dependencies",
   "flexCardMigrationProcessingMessage": "Processing %s FlexCards for migration (%s skipped due to Angular dependencies)",
   "noMetadataToDeploy": "No metadata to deploy",
-  "manifestDeployementStarted": "Manifest deployment started with id: %s",
+  "manifestDeployementStarted": "Manifest deployment started with ID: %s",
   "migrationConsentMessage": "Make sure that all records listed in the Assessment Status column in the Assessment Report are marked as Green 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",

package.json

@@ -160,4 +160,4 @@
       "pre-push": "sf-husky-pre-push"
     }
   }
-}
+}

src/commands/omnistudio/migration/migrate.ts

@@ -646,10 +646,10 @@ export default class Migrate extends OmniStudioBaseCommand {
     const mergedResults: MigratedRecordInfo[] = [];
 
     for (const record of Array.from(migrationResults.records.values())) {
-      const obj = {
+      const obj: MigratedRecordInfo = {
         id: record['Id'],
         name: migrationTool.getRecordName(record),
-        status: messages.getMessage('labelStatusSkipped'),
+        status: 'Skipped',
         errors: record['errors'],
         migratedId: undefined,
         warnings: [],
@@ -663,11 +663,11 @@ export default class Migrate extends OmniStudioBaseCommand {
         errors = errors.concat(recordResults.errors || []);
 
         if (recordResults?.skipped) {
-          obj.status = messages.getMessage('labelStatusSkipped');
+          obj.status = 'Skipped';
         } else if (!recordResults || recordResults.hasErrors) {
-          obj.status = messages.getMessage('labelStatusFailed');
+          obj.status = 'Failed';
         } else {
-          obj.status = messages.getMessage('labelStatusComplete');
+          obj.status = 'Complete';
         }
         obj.errors = errors;
         obj.migratedId = recordResults.id;

src/javascripts/reportGeneratorUtility.js

@@ -102,8 +102,11 @@ function filterAndSearchTable(tableId) {
   const visibleRows = Array.from(table.rows).filter(
     (row) => row.style.display !== 'none' && row.id !== 'no-rows-message'
   );
-  reportTable.querySelector('#row-count').textContent = `Showing ${visibleRows.length} record${
-    visibleRows.length !== 1 ? 's' : ''
+
+  // filter only distinct classes from visibleRows
+  const distinctClasses = [...new Set(visibleRows.map((row) => row.classList[0]))];
+  reportTable.querySelector('#row-count').textContent = `Showing ${distinctClasses.length} record${
+    distinctClasses.length !== 1 ? 's' : ''
   }`;
 }
 
@@ -153,6 +156,21 @@ document.addEventListener('DOMContentLoaded', () => {
   document.querySelectorAll('.rpt-table-container').forEach((tableContainer) => {
     filterAndSearchTable(tableContainer.id);
   });
+
+  document.querySelectorAll('tr').forEach((row) => {
+    row.addEventListener('mouseover', (event) => {
+      const className = event.currentTarget.classList[0];
+      document.querySelectorAll(`.${className}`).forEach((r) => {
+        r.classList.add('highlight');
+      });
+    });
+    row.addEventListener('mouseout', (event) => {
+      const className = event.currentTarget.classList[0];
+      document.querySelectorAll(`.${className}`).forEach((r) => {
+        r.classList.remove('highlight');
+      });
+    });
+  });
 });
 
 function openReport(ele) {

src/migration/dataraptor.ts

@@ -288,7 +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 = 'Ready for migration';
+    let assessmentStatus: 'Ready for migration' | 'Warnings' | 'Needs Manual Intervention' = 'Ready for migration';
 
     if (!existingDRNameVal.isNameCleaned()) {
       warnings.push(

src/migration/flexcard.ts

@@ -211,13 +211,13 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
       infos: [],
       warnings: [],
       errors: [],
-      migrationStatus: '',
+      migrationStatus: 'Ready for migration',
     };
 
     // Check for name changes due to API naming requirements
     const originalName: string = flexCardName;
     const cleanedName: string = this.cleanName(originalName);
-    let assessmentStatus = 'Ready for migration';
+    let assessmentStatus: 'Ready for migration' | 'Warnings' | 'Needs Manual Intervention' = 'Ready for migration';
     flexCardAssessmentInfo.name = this.allVersions ? `${cleanedName}_${version}` : cleanedName;
     if (cleanedName !== originalName) {
       flexCardAssessmentInfo.warnings.push(

src/migration/omniscript.ts

@@ -470,7 +470,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
     const existingSubTypeVal = new StringVal(existingSubType, 'sub type');
     const omniScriptName = omniscript[this.namespacePrefix + 'Name'];
     const existingOmniScriptNameVal = new StringVal(omniScriptName, 'name');
-    let assessmentStatus = 'Ready for migration';
+    let assessmentStatus: 'Ready for migration' | 'Warnings' | 'Needs Manual Intervention' = 'Ready for migration';
 
     const warnings: string[] = [];
 
@@ -627,7 +627,9 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
           value.migrationSuccess = true;
         }
 
-        let finalKey = `${nameMapping.oldType}${nameMapping.oldSubtype}${nameMapping.oldLanguage}`;
+        let finalKey = `${nameMapping.oldType}${nameMapping.oldSubtype}${this.cleanLanguageName(
+          nameMapping.oldLanguage
+        )}`;
 
         finalKey = finalKey.toLowerCase();
         if (storage.osStorage.has(finalKey)) {
@@ -647,6 +649,11 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
     StorageUtil.printAssessmentStorage();
   }
 
+  private cleanLanguageName(language: string): string {
+    // replace -, ( and ) and space with ''
+    return language.replace(/[-() ]/g, '');
+  }
+
   async migrate(): Promise<MigrationResult[]> {
     // Get All Records from OmniScript__c (IP & OS Parent Records)
     const omniscripts = await this.getAllOmniScripts();
@@ -1039,7 +1046,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
 
           let finalKey = `${oldrecord[this.namespacePrefix + 'Type__c']}${
             oldrecord[this.namespacePrefix + 'SubType__c']
-          }${oldrecord[this.namespacePrefix + 'Language__c']}`;
+          }${this.cleanLanguageName(oldrecord[this.namespacePrefix + 'Language__c'])}`;
 
           finalKey = finalKey.toLowerCase();
           if (storage.osStorage.has(finalKey)) {

src/migration/related/ExperienceSiteMigration.ts

@@ -120,7 +120,7 @@ export class ExperienceSiteMigration extends BaseRelatedObjectMigration {
       path: file.location,
       diff: JSON.stringify([]),
       hasOmnistudioContent: false,
-      status: 'Can be Automated',
+      status: 'Ready for migration',
     };
 
     const lookupComponentName = `${this.namespace}:vlocityLWCOmniWrapper`;
@@ -179,7 +179,7 @@ export class ExperienceSiteMigration extends BaseRelatedObjectMigration {
         path: file.location,
         diff: JSON.stringify([]),
         hasOmnistudioContent: false,
-        status: 'Errors',
+        status: 'Failed',
       };
 
       experienceSiteAssessmentInfos.push(experienceSiteAssessmentInfo);
@@ -256,7 +256,7 @@ export class ExperienceSiteMigration extends BaseRelatedObjectMigration {
       experienceSiteAssessmentInfo.warnings.push(
         'Target exists as empty string. Please check experience site configuration'
       );
-      experienceSiteAssessmentInfo.status = 'Errors';
+      experienceSiteAssessmentInfo.status = 'Needs Manual Intervention';
       return;
     }
 
@@ -287,7 +287,7 @@ export class ExperienceSiteMigration extends BaseRelatedObjectMigration {
     if (this.shouldAddWarning(targetDataFromStorageFC)) {
       const warningMsg: string = this.getWarningMessage(flexcardName, targetDataFromStorageFC);
       experienceSiteAssessmentInfo.warnings.push(warningMsg);
-      experienceSiteAssessmentInfo.status = 'Errors';
+      experienceSiteAssessmentInfo.status = 'Needs Manual Intervention';
     } else {
       component.componentName = TARGET_COMPONENT_NAME_FC;
 
@@ -316,7 +316,7 @@ export class ExperienceSiteMigration extends BaseRelatedObjectMigration {
     if (this.shouldAddWarning(targetDataFromStorage)) {
       const warningMsg: string = this.getWarningMessage(targetName, targetDataFromStorage);
       experienceSiteAssessmentInfo.warnings.push(warningMsg);
-      experienceSiteAssessmentInfo.status = 'Errors';
+      experienceSiteAssessmentInfo.status = 'Needs Manual Intervention';
     } else {
       component.componentName = TARGET_COMPONENT_NAME_OS;
 

src/migration/related/FlexipageMigration.ts

@@ -86,7 +86,7 @@ export class FlexipageMigration extends BaseRelatedObjectMigration {
   }
 
   /**
-   * Processes FlexiPage files in either assessment or migration mode.
+   * Processes FlexiPages in either assessment or migration mode.
    *
    * This method:
    * - Retrieves FlexiPage metadata from the Salesforce org
@@ -111,6 +111,9 @@ export class FlexipageMigration extends BaseRelatedObjectMigration {
       const filePath = path.join(flexiPageDir, file);
       try {
         const flexPageAssessmentInfo: FlexiPageAssessmentInfo = this.processFlexiPage(file, filePath, mode);
+        if (!flexPageAssessmentInfo) {
+          continue;
+        }
         flexPageAssessmentInfos.push(flexPageAssessmentInfo);
         Logger.logVerbose(
           this.messages.getMessage('completedProcessingFlexiPage', [
@@ -119,37 +122,39 @@ export class FlexipageMigration extends BaseRelatedObjectMigration {
           ])
         );
       } catch (error) {
+        let status: 'Failed' | 'Needs Manual Intervention' = 'Failed';
         if (error instanceof KeyNotFoundInStorageError) {
           Logger.error(`${error.componentType} ${error.key} can't be migrated`);
+          status = 'Needs Manual Intervention';
         } else if (error instanceof TargetPropertyNotFoundError) {
           Logger.error(error.message);
+          status = 'Needs Manual Intervention';
         } else if (error instanceof DuplicateKeyError) {
           Logger.error(`${error.componentType} ${error.key} is duplicate`);
+          status = 'Needs Manual Intervention';
         } else {
           Logger.error(this.messages.getMessage('errorProcessingFlexiPage', [file, error]));
           Logger.error(error);
+          status = 'Failed';
         }
         flexPageAssessmentInfos.push({
           name: file,
           errors: [error instanceof Error ? error.message : JSON.stringify(error)],
           path: filePath,
           diff: '',
-          status: mode === 'assess' ? 'Errors' : 'Failed',
+          status,
         });
       }
       progressBar.increment();
     }
     progressBar.stop();
     Logger.logVerbose(this.messages.getMessage('completedProcessingAllFlexiPages', [flexPageAssessmentInfos.length]));
-    const filteredResults = flexPageAssessmentInfos.filter(
-      (flexPageAssessmentInfo) => flexPageAssessmentInfo.status !== 'No Changes'
-    );
-    Logger.log(this.messages.getMessage('flexipagesWithChanges', [filteredResults.length]));
-    return filteredResults;
+    Logger.log(this.messages.getMessage('flexipagesWithChanges', [flexPageAssessmentInfos.length]));
+    return flexPageAssessmentInfos;
   }
 
   /**
-   * Processes a single FlexiPage file for assessment or migration.
+   * Processes a single FlexiPage for assessment or migration.
    *
    * This method:
    * - Reads the FlexiPage XML file content
@@ -159,8 +164,8 @@ export class FlexipageMigration extends BaseRelatedObjectMigration {
    * - Writes transformed content back to file in migration mode
    * - Handles errors and provides detailed error information
    *
-   * @param fileName - The name of the FlexiPage file
-   * @param filePath - The full path to the FlexiPage file
+   * @param fileName - The name of the FlexiPage
+   * @param filePath - The full path to the FlexiPage
    * @param mode - The processing mode: 'assess' or 'migrate'
    * @returns FlexiPage assessment information with status and error details
    */
@@ -172,13 +177,8 @@ export class FlexipageMigration extends BaseRelatedObjectMigration {
     const json = this.xmlUtil.parse(fileContent) as Flexipage;
     const transformedFlexiPage = transformFlexipageBundle(json, this.namespace, mode);
     if (transformedFlexiPage === false) {
-      return {
-        name: fileName,
-        errors: [],
-        path: filePath,
-        diff: '',
-        status: 'No Changes',
-      };
+      Logger.logVerbose(`No transformation needed on ${fileName}`);
+      return null;
     }
     const modifiedContent = this.xmlUtil.build(transformedFlexiPage, 'FlexiPage');
 
@@ -195,7 +195,7 @@ export class FlexipageMigration extends BaseRelatedObjectMigration {
       name: fileName,
       diff: JSON.stringify(diff),
       errors: [],
-      status: mode === 'assess' ? 'Can be Automated' : 'Complete',
+      status: mode === 'assess' ? 'Ready for migration' : 'Complete',
     };
   }
 }