Conflicts resolved and rollbackFlag report added in new design

Author: RedisBot

src/utils/reportGenerator/reportGenerator.ts

@@ -21,6 +21,9 @@ export function generateHtmlTable<T>(reportFrameworkParameters: ReportFrameworkP
   const reportHeaderLabel: string = reportFrameworkParameters.reportHeaderLabel;
   const indexedKey: string = reportFrameworkParameters.indexedKey;
   const showMigrationBanner: boolean = reportFrameworkParameters.showMigrationBanner;
+  const rollbackFlags: string[] = reportFrameworkParameters.rollbackFlags || [];
+  const rollbackFlagName: string = reportFrameworkParameters.rollbackFlagName;
+  const commandType: 'assess' | 'migrate' = reportFrameworkParameters.commandType || 'assess';
 
   const transformedHeader: TableHeaderCell[][] = transform(headerColumns);
   const tableId = `report-table-${reportTableInstance++}`;
@@ -203,8 +206,12 @@ export function generateHtmlTable<T>(reportFrameworkParameters: ReportFrameworkP
   </div>`;
 
   let rollbackFlagsHtml = '';
-  if (reportFrameworkParameters.rollbackFlags && reportFrameworkParameters.rollbackFlagName) {
-    rollbackFlagsHtml = generateRollbackFlagsHtml(reportFrameworkParameters.rollbackFlags, reportFrameworkParameters.rollbackFlagName);
+  if (rollbackFlags && rollbackFlagName) {
+    const flagNames = rollbackFlagName.split(',').map(flag => flag.trim());
+    const matchingFlags = flagNames.filter(flag => rollbackFlags.includes(flag));
+    if (matchingFlags.length > 0) {
+      rollbackFlagsHtml = generateRollbackFlagsHtml(rollbackFlags, matchingFlags.join(', '), commandType);
+    }
   }
 
   return `
@@ -307,20 +314,26 @@ function createIndexedRow<T>(row: T, indexedKey: string, columns: Array<TableCol
   }
   return rows;
 }
-export function generateRollbackFlagsHtml(rollbackFlags: string[], flagName: string): string {
-  if (!rollbackFlags.includes(flagName)) {
+export function generateRollbackFlagsHtml(rollbackFlags: string[], flagNames: string, commandType: 'assess' | 'migrate' = 'assess'): string {
+  const flagNameArray = flagNames.split(',').map(flag => flag.trim());
+  const matchingFlags = flagNameArray.filter(flag => rollbackFlags.includes(flag));
+  
+  if (matchingFlags.length === 0) {
     return '';
   }
+  
+  const actionText = commandType === 'migrate' ? matchingFlags.length > 1 ? 'were' : 'was' : 'will be';
+  
   return `
     <div class="slds-box" style="background-color: white; margin-top: 20px;">
       <div class="slds-text-heading_medium">Rollback Flags Disabled</div>
       <div style="margin-block: 15px">
-        <p>The following rollback flag will be disabled during migration:</p>
+        <p>The following rollback flag${matchingFlags.length > 1 ? 's' : ''} ${actionText} disabled during migration:</p>
         <ul class="slds-list_dotted">
-          <li class="slds-item slds-text-color_destructive">${flagName}</li>
+          ${matchingFlags.map(flag => `<li class="slds-item slds-text-color_destructive">${flag}</li>`).join('')}
         </ul>
         <p>
-          <strong>Note:</strong> This flag will no longer be supported after migration. For assistance, please contact support.
+          <strong>Note:</strong> ${matchingFlags.length > 1 ? 'These ' : 'This '} flag${matchingFlags.length > 1 ? 's will' : ' will'} no longer be supported after migration. For assistance, please contact support.
         </p>
       </div>
     </div>`;

src/utils/reportGenerator/reportInterfaces.ts

@@ -78,4 +78,5 @@ export interface ReportFrameworkParameters<T> {
   showMigrationBanner: boolean;
   rollbackFlags?: string[];
   rollbackFlagName?: string;
+  commandType?: 'assess' | 'migrate';
 }

src/utils/resultsbuilder/DRAssessmentReporter.ts

@@ -124,7 +124,7 @@ export class DRAssessmentReporter {
       },
     ];
 
-    const reportFrameworkParameters: ReportFrameworkParameters<DRAssessmentReporter> = {
+    const reportFrameworkParameters: ReportFrameworkParameters<DataRaptorAssessmentInfo> = {
       headerColumns: headerColumn,
       columns,
       rows: dataRaptorAssessmentInfos,
@@ -135,6 +135,7 @@ export class DRAssessmentReporter {
       showMigrationBanner: true,
       rollbackFlags,
       rollbackFlagName: 'RollbackDRChanges',
+      commandType: 'assess',
     };
     // Render table
     const tableHtml = generateHtmlTable(reportFrameworkParameters);

src/utils/resultsbuilder/IPAssessmentReporter.ts

@@ -115,6 +115,7 @@ export class IPAssessmentReporter {
       showMigrationBanner: true,
       rollbackFlags,
       rollbackFlagName: 'RollbackIPChanges',
+      commandType: 'assess',
     };
     // Render table
     const tableHtml = generateHtmlTable(reportFrameworkParameters);

src/utils/resultsbuilder/OSAssessmentReporter.ts

@@ -192,6 +192,7 @@ export class OSAssessmentReporter {
       showMigrationBanner: true,
       rollbackFlags,
       rollbackFlagName: 'RollbackOSChanges',
+      commandType: 'assess',
     };
 
     // Render table

src/utils/resultsbuilder/index.ts

@@ -46,6 +46,7 @@ export class ResultsBuilder {
 
     this.logger.info('Generating migration report dashboard');
     this.generateMigrationReportDashboard(orgDetails, this.getFormattedDetails(results, relatedObjectMigrationResult));
+    
     this.logger.info('Pushing assets');
     pushAssestUtilites('javascripts', resultsDir);
     pushAssestUtilites('styles', resultsDir);
@@ -319,6 +320,16 @@ export class ResultsBuilder {
     ];
 
     this.logger.info(`Generating table body for result: ${result.name}`);
+    
+    // Determine which rollback flag to use based on component type
+    let rollbackFlagNames: string[] = [];
+    const componentName = result.name.toLowerCase();
+    if (componentName.includes('datamapper') || componentName.includes('data mapper')) {
+      rollbackFlagNames = ['RollbackDRChanges'];
+    } else if (componentName.includes('omniscript') || componentName.includes('integration procedure')) {
+      rollbackFlagNames = ['RollbackOSChanges', 'RollbackIPChanges'];
+    }
+    
     const reportFrameworkParameters: ReportFrameworkParameters<MigratedRecordInfo> = {
       headerColumns,
       columns,
@@ -328,6 +339,9 @@ export class ResultsBuilder {
       ctaSummary: [],
       reportHeaderLabel: `${resultConstants.title}`,
       showMigrationBanner: true,
+      rollbackFlags: orgDetails.rollbackFlags,
+      rollbackFlagName: rollbackFlagNames.join(','),
+      commandType: 'migrate',
     };
 
     tablebody = generateHtmlTable(reportFrameworkParameters);
@@ -428,6 +442,9 @@ export class ResultsBuilder {
       ctaSummary: [],
       reportHeaderLabel: `${apexConstants.title}`,
       showMigrationBanner: false,
+      rollbackFlags: orgDetails.rollbackFlags,
+      rollbackFlagName: 'RollbackApexChanges',
+      commandType: 'migrate',
     };
 
     const html = `<html>${this.createHeadWithScript(
@@ -526,19 +543,4 @@ export class ResultsBuilder {
   //       </html>`;
   //     fs.writeFileSync(resultsDir + '/' + lwcConstants.componentName + '.html', html);
   //   }
-  private static generateRollbackFlagsReport(enabledFlags: string[]): string {
-    return `
-      <div class="slds-box" style="background-color: white">
-        <div class="slds-text-heading_medium">Rollback Flags Disabled</div>
-        <div style="margin-block: 15px">
-          <p>The following rollback flags were disabled during migration:</p>
-          <ul class="slds-list_dotted">
-            ${enabledFlags.map((flag) => `<li class="slds-item slds-text-color_destructive">${flag}</li>`).join('')}
-          </ul>
-          <p>
-            <strong>Note:</strong> These flags are no longer supported after migration. For assistance, please contact support.
-          </p>
-        </div>
-      </div>`;
-  }
 }