generateRollback flags logic moved to reportGenerator.ts itself

Author: RedisBot

src/utils/reportGenerator/reportGenerator.ts

@@ -22,8 +22,23 @@ export function generateHtmlTable<T>(reportFrameworkParameters: ReportFrameworkP
   const indexedKey: string = reportFrameworkParameters.indexedKey;
   const showMigrationBanner: boolean = reportFrameworkParameters.showMigrationBanner;
 
+<<<<<<< HEAD
   const transformedHeader: TableHeaderCell[][] = transform(headerColumns);
   const tableId = `report-table-${reportTableInstance++}`;
+=======
+export function generateHtmlTable<T>(
+  headerRows: HeaderColumn[],
+  columns: Array<TableColumn<T>>,
+  rows: T[],
+  reportHeader: ReportHeader[],
+  filters: Filter[] = [],
+  tableClass = 'slds-table slds-table_cell-buffer slds-table_bordered slds-table_striped slds-table_col-bordered',
+  ariaLabel = '',
+  rollbackFlags?: string[],
+  rollbackFlagName?: string
+): string {
+  const transformedHeader: TableHeaderCell[][] = transform(headerRows);
+>>>>>>> c749de5 (generateRollback flags logic moved to reportGenerator.ts itself)
 
   const thead = `
     <thead>
@@ -184,6 +199,7 @@ export function generateHtmlTable<T>(reportFrameworkParameters: ReportFrameworkP
   </div>
   `;
 
+<<<<<<< HEAD
   const ctaSumm = `
   ${ctaSummary
     .map(
@@ -201,6 +217,12 @@ export function generateHtmlTable<T>(reportFrameworkParameters: ReportFrameworkP
       <div class="slds-text-heading_large"> ${reportHeaderLabel} Report </div>
       ${ctaSummary && ctaSummary.length > 0 ? ctaButton : ''}
   </div>`;
+=======
+  let rollbackFlagsHtml = '';
+  if (rollbackFlags && rollbackFlagName) {
+    rollbackFlagsHtml = generateRollbackFlagsHtml(rollbackFlags, rollbackFlagName);
+  }
+>>>>>>> c749de5 (generateRollback flags logic moved to reportGenerator.ts itself)
 
   return `
    <div class="report-wrapper">
@@ -228,9 +250,13 @@ export function generateHtmlTable<T>(reportFrameworkParameters: ReportFrameworkP
         ${ctaSumm}
       </div>
     </div>
+<<<<<<< HEAD
     <script src="./reportGeneratorUtility.js" defer></script>
     <link rel="stylesheet" href="./reportGenerator.css">
   </div>
+=======
+    ${rollbackFlagsHtml}
+>>>>>>> c749de5 (generateRollback flags logic moved to reportGenerator.ts itself)
   `;
 }
 

src/utils/reportGenerator/reportInterfaces.ts

@@ -76,4 +76,6 @@ export interface ReportFrameworkParameters<T> {
   reportHeaderLabel: string;
   indexedKey?: string;
   showMigrationBanner: boolean;
+  rollbackFlags?: string[];
+  rollbackFlagName?: string;
 }

src/utils/resultsbuilder/IPAssessmentReporter.ts

@@ -1,11 +1,15 @@
 import { IPAssessmentInfo } from '../interfaces';
 import { generateHtmlTable } from '../reportGenerator/reportGenerator';
+<<<<<<< HEAD
 import {
   HeaderColumn,
   ReportFrameworkParameters,
   ReportHeaderFormat,
   TableColumn,
 } from '../reportGenerator/reportInterfaces';
+=======
+import { HeaderColumn, ReportHeaderFormat, TableColumn } from '../reportGenerator/reportInterfaces';
+>>>>>>> c749de5 (generateRollback flags logic moved to reportGenerator.ts itself)
 import { reportingHelper } from './reportingHelper';
 
 export class IPAssessmentReporter {
@@ -107,6 +111,7 @@ export class IPAssessmentReporter {
     const reportFrameworkParameters: ReportFrameworkParameters<IPAssessmentInfo> = {
       headerColumns: headerColumn,
       columns,
+<<<<<<< HEAD
       rows: ipAssessmentInfos,
       orgDetails: org,
       filters: [],
@@ -117,5 +122,16 @@ export class IPAssessmentReporter {
     // Render table
     const tableHtml = generateHtmlTable(reportFrameworkParameters);
     return `${tableHtml}`;
+=======
+      ipAssessmentInfos,
+      orgDetails,
+      undefined,
+      'Integration Procedure Assessment',
+      undefined,
+      rollbackFlags,
+      'RollbackIPChanges'
+    );
+    return `<div class="slds-text-heading_large">Integration Procedure Assessment Report</div>${tableHtml}`;
+>>>>>>> c749de5 (generateRollback flags logic moved to reportGenerator.ts itself)
   }
 }