fix: flexipage report and log fix

Author: shaurabh-tiwari-git

messages/assess.json

@@ -138,6 +138,7 @@
   "flexipagesWithChanges": "Found %s FlexiPages with changes",
   "expSitesWithChanges": "Found %s Experience Cloud Sites with changes",
   "migratingFlexiPages": "Migrating FlexiPages",
+  "manualInterventionForFlexiPageAsDuplicateKey": "We couldn’t process the %s %s because a duplicate key was found in storage.",
   "experienceSiteMetadataConsent": "Your consent for migrating Experience Cloud sites is %s",
   "experienceSiteConsentNotProvidedWarning": "You’ve not provided consent and your Experience Cloud sites won’t be processed.",
   "relatedObjectsToProcessAfterExpSitesRemoval": "Objects to process after removing expsite are %s.",

src/migration/related/FlexipageMigration.ts

@@ -133,7 +133,9 @@ export class FlexipageMigration extends BaseRelatedObjectMigration {
           errors.add(error.message);
           status = mode === 'assess' ? 'Needs manual intervention' : 'Skipped';
         } else if (error instanceof DuplicateKeyError) {
-          errors.add(`${error.componentType} ${error.key} is duplicate`);
+          errors.add(
+            this.messages.getMessage('manualInterventionForFlexiPageAsDuplicateKey', [error.componentType, error.key])
+          );
           status = mode === 'assess' ? 'Needs manual intervention' : 'Skipped';
         } else {
           errors.add(this.messages.getMessage('errorProcessingFlexiPage', [file, error]));
@@ -192,7 +194,11 @@ export class FlexipageMigration extends BaseRelatedObjectMigration {
       Logger.logVerbose(this.messages.getMessage('updatedModifiedContent', [filePath]));
     }
 
-    const diff = new FileDiffUtil().getXMLDiff(fileContent, modifiedContent);
+    // Normalize trailing newlines to avoid false positives in diff
+    // Both original and modified content are normalized to remove trailing newlines
+    const normalizedOriginal = fileContent.replace(/\n+$/, '');
+    const normalizedModified = modifiedContent.replace(/\n+$/, '');
+    const diff = new FileDiffUtil().getXMLDiff(normalizedOriginal, normalizedModified);
     Logger.logVerbose(this.messages.getMessage('generatedDiffForFile', [fileName]));
 
     return {

src/utils/lwcparser/fileutils/FileDiffUtil.ts

@@ -166,15 +166,21 @@ export class FileDiffUtil {
     for (const block of diff) {
       if (block.added) {
         block.value.split('\n').forEach((line) => {
-          result.push({ old: null, new: line });
+          if (line.trim() !== '') {
+            result.push({ old: null, new: line });
+          }
         });
       } else if (block.removed) {
         block.value.split('\n').forEach((line) => {
-          result.push({ old: line, new: null });
+          if (line.trim() !== '') {
+            result.push({ old: line, new: null });
+          }
         });
       } else {
         block.value.split('\n').forEach((line) => {
-          result.push({ old: line, new: line });
+          if (line.trim() !== '') {
+            result.push({ old: line, new: line });
+          }
         });
       }
     }