Conflicts resolved

Author: RedisBot

src/commands/omnistudio/migration/assess.ts

@@ -11,7 +11,8 @@ import { DebugTimer } from '../../../utils';
 import { Logger } from '../../../utils/logger';
 import OmnistudioRelatedObjectMigrationFacade from '../../../migration/related/OmnistudioRelatedObjectMigrationFacade';
 import { OmnistudioOrgDetails, OrgUtils } from '../../../utils/orgUtils';
-import { OrgPreferences } from '../../../utils/orgPreferences';
+import { OrgPreferences } from '../../../utils/orgpreferences';
+import { Constants } from '../../../utils/constants/stringContants';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-omnistudio-migration-tool', 'assess');
@@ -113,7 +114,7 @@ export default class Assess extends OmniStudioBaseCommand {
     } catch (error) {
       this.ux.log(error.message);
     }
-    await AssessmentReporter.generate(assesmentInfo, conn.instanceUrl, orgs);
+    await AssessmentReporter.generate(assesmentInfo, conn.instanceUrl, orgs, assessOnly, objectsToProcess);
     return assesmentInfo;
   }
 

src/utils/reportGenerator/reportGenerator.ts

@@ -22,23 +22,8 @@ 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>
@@ -199,7 +184,6 @@ export function generateHtmlTable<T>(
   </div>
   `;
 
-<<<<<<< HEAD
   const ctaSumm = `
   ${ctaSummary
     .map(
@@ -217,12 +201,11 @@ export function generateHtmlTable<T>(
       <div class="slds-text-heading_large"> ${reportHeaderLabel} Report </div>
       ${ctaSummary && ctaSummary.length > 0 ? ctaButton : ''}
   </div>`;
-=======
+
   let rollbackFlagsHtml = '';
-  if (rollbackFlags && rollbackFlagName) {
-    rollbackFlagsHtml = generateRollbackFlagsHtml(rollbackFlags, rollbackFlagName);
+  if (reportFrameworkParameters.rollbackFlags && reportFrameworkParameters.rollbackFlagName) {
+    rollbackFlagsHtml = generateRollbackFlagsHtml(reportFrameworkParameters.rollbackFlags, reportFrameworkParameters.rollbackFlagName);
   }
->>>>>>> c749de5 (generateRollback flags logic moved to reportGenerator.ts itself)
 
   return `
    <div class="report-wrapper">
@@ -250,13 +233,10 @@ export function generateHtmlTable<T>(
         ${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/resultsbuilder/DRAssessmentReporter.ts

@@ -128,11 +128,13 @@ export class DRAssessmentReporter {
       headerColumns: headerColumn,
       columns,
       rows: dataRaptorAssessmentInfos,
-      orgDetails: org,
+      orgDetails: orgDetails,
       filters,
       ctaSummary: [],
       reportHeaderLabel: 'Data Mapper Assessment',
       showMigrationBanner: true,
+      rollbackFlags,
+      rollbackFlagName: 'RollbackDRChanges',
     };
     // Render table
     const tableHtml = generateHtmlTable(reportFrameworkParameters);

src/utils/resultsbuilder/IPAssessmentReporter.ts

@@ -1,15 +1,11 @@
 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 {
@@ -111,27 +107,17 @@ export class IPAssessmentReporter {
     const reportFrameworkParameters: ReportFrameworkParameters<IPAssessmentInfo> = {
       headerColumns: headerColumn,
       columns,
-<<<<<<< HEAD
       rows: ipAssessmentInfos,
-      orgDetails: org,
+      orgDetails: orgDetails,
       filters: [],
       ctaSummary: [],
       reportHeaderLabel: 'Integration Procedure Assessment',
       showMigrationBanner: true,
+      rollbackFlags,
+      rollbackFlagName: 'RollbackIPChanges',
     };
     // 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)
   }
 }

src/utils/resultsbuilder/OSAssessmentReporter.ts

@@ -185,11 +185,13 @@ export class OSAssessmentReporter {
       headerColumns: headerColumn,
       columns,
       rows: osAssessmentInfos,
-      orgDetails: org,
+      orgDetails: orgDetails,
       filters,
       ctaSummary,
       reportHeaderLabel: 'Omniscript Assessment',
       showMigrationBanner: true,
+      rollbackFlags,
+      rollbackFlagName: 'RollbackOSChanges',
     };
 
     // Render table

src/utils/resultsbuilder/assessmentReporter.ts

@@ -7,7 +7,6 @@ import { ReportHeaderFormat } from '../reportGenerator/reportInterfaces';
 import { OmnistudioOrgDetails } from '../orgUtils';
 import { Constants } from '../constants/stringContants';
 import { pushAssestUtilites } from '../file/fileUtil';
-import { OrgPreferences } from '../orgpreferences';
 import { OSAssessmentReporter } from './OSAssessmentReporter';
 import { ApexAssessmentReporter } from './ApexAssessmentReporter';
 import { IPAssessmentReporter } from './IPAssessmentReporter';
@@ -33,35 +32,11 @@ export class AssessmentReporter {
     const lwcAssessmentFilePath = basePath + '/lwc_assessment.html';
     const orgDetails: ReportHeaderFormat[] = this.formattedOrgDetails(omnistudioOrgDetails);
 
-<<<<<<< HEAD
     if (!assessOnly) {
       this.createDocument(
         omniscriptAssessmentFilePath,
-        OSAssessmentReporter.generateOSAssesment(result.omniAssessmentInfo.osAssessmentInfos, instanceUrl, orgDetails)
+        OSAssessmentReporter.generateOSAssesment(result.omniAssessmentInfo.osAssessmentInfos, instanceUrl, orgDetails, omnistudioOrgDetails.rollbackFlags)
       );
-=======
-    this.createDocument(
-      omniscriptAssessmentFilePath,
-      OSAssessmentReporter.generateOSAssesment(
-        result.omniAssessmentInfo.osAssessmentInfos,
-        instanceUrl,
-        orgDetails,
-        omnistudioOrgDetails.rollbackFlags
-      )
-    );
-    this.createDocument(
-      flexcardAssessmentFilePath,
-      this.generateCardAssesment(result.flexCardAssessmentInfos, instanceUrl)
-    );
-    this.createDocument(
-      integrationProcedureAssessmentFilePath,
-      IPAssessmentReporter.generateIPAssesment(result.omniAssessmentInfo.ipAssessmentInfos, instanceUrl, orgDetails, omnistudioOrgDetails.rollbackFlags)
-    );
-    this.createDocument(
-      dataMapperAssessmentFilePath,
-      DRAssessmentReporter.generateDRAssesment(result.dataRaptorAssessmentInfos, instanceUrl, orgDetails, omnistudioOrgDetails.rollbackFlags)
-    );
->>>>>>> 451bd60 (Comments addressed)
 
       this.createDocument(
         flexcardAssessmentFilePath,
@@ -79,12 +54,12 @@ export class AssessmentReporter {
 
       this.createDocument(
         integrationProcedureAssessmentFilePath,
-        IPAssessmentReporter.generateIPAssesment(result.omniAssessmentInfo.ipAssessmentInfos, instanceUrl, orgDetails)
+        IPAssessmentReporter.generateIPAssesment(result.omniAssessmentInfo.ipAssessmentInfos, instanceUrl, orgDetails, omnistudioOrgDetails.rollbackFlags)
       );
 
       this.createDocument(
         dataMapperAssessmentFilePath,
-        DRAssessmentReporter.generateDRAssesment(result.dataRaptorAssessmentInfos, instanceUrl, orgDetails)
+        DRAssessmentReporter.generateDRAssesment(result.dataRaptorAssessmentInfos, instanceUrl, orgDetails, omnistudioOrgDetails.rollbackFlags)
       );
     } else {
       switch (assessOnly) {
@@ -94,7 +69,8 @@ export class AssessmentReporter {
             OSAssessmentReporter.generateOSAssesment(
               result.omniAssessmentInfo.osAssessmentInfos,
               instanceUrl,
-              orgDetails
+              orgDetails,
+              omnistudioOrgDetails.rollbackFlags
             )
           );
           break;
@@ -112,15 +88,16 @@ export class AssessmentReporter {
             IPAssessmentReporter.generateIPAssesment(
               result.omniAssessmentInfo.ipAssessmentInfos,
               instanceUrl,
-              orgDetails
+              orgDetails,
+              omnistudioOrgDetails.rollbackFlags
             )
           );
           break;
 
         case Constants.DataMapper:
           this.createDocument(
             dataMapperAssessmentFilePath,
-            DRAssessmentReporter.generateDRAssesment(result.dataRaptorAssessmentInfos, instanceUrl, orgDetails)
+            DRAssessmentReporter.generateDRAssesment(result.dataRaptorAssessmentInfos, instanceUrl, orgDetails, omnistudioOrgDetails.rollbackFlags)
           );
           break;
 
@@ -169,19 +146,6 @@ export class AssessmentReporter {
       //   location: 'lwc_assessment.html',
       // },
     ];
-<<<<<<< HEAD
-        // Check rollback flags
-    const enabledFlags = omnistudioOrgDetails.rollbackFlags || [];
-    if (enabledFlags.length > 0) {
-      const rollbackFlagsReportPath = basePath + '/rollback_flags_report.html';
-      this.createDocument(rollbackFlagsReportPath, this.generateRollbackFlagsReport(enabledFlags));
-      nameUrls.push({
-        name: 'Rollback Flags Report',
-        location: 'rollback_flags_report.html',
-      });
-    }
-=======
->>>>>>> 451bd60 (Comments addressed)
 
     await this.createMasterDocument(nameUrls, basePath);
     pushAssestUtilites('javascripts', basePath);

src/utils/resultsbuilder/index.ts

@@ -1,6 +1,5 @@
 import fs from 'fs';
 import open from 'open';
-<<<<<<< HEAD
 import { Logger } from '@salesforce/core';
 import { pushAssestUtilites } from '../file/fileUtil';
 import { ApexAssessmentInfo, MigratedObject, MigratedRecordInfo, RelatedObjectAssesmentInfo } from '../interfaces';
@@ -26,10 +25,6 @@ const apexConstants = { componentName: 'apex', title: 'Apex Classes Migration Re
 // const lwcConstants = { componentName: 'lwc', title: 'LWC Components Migration Result' };
 const migrationResultCSSfileName = 'reportGenerator.css';
 const migrationReportHTMLfileName = 'migration_report.html';
-=======
-import { ApexAssessmentInfo, LWCAssessmentInfo, MigratedObject, RelatedObjectAssesmentInfo } from '../interfaces';
-import { OmnistudioOrgDetails } from '../orgUtils';
->>>>>>> 451bd60 (Comments addressed)
 
 export class ResultsBuilder {
   private static logger: Logger = new Logger('ResultsBuilder');
@@ -38,11 +33,7 @@ export class ResultsBuilder {
     results: MigratedObject[],
     relatedObjectMigrationResult: RelatedObjectAssesmentInfo,
     instanceUrl: string,
-<<<<<<< HEAD
     orgDetails: OmnistudioOrgDetails
-=======
-    omnistudioOrgDetails: OmnistudioOrgDetails
->>>>>>> 451bd60 (Comments addressed)
   ): Promise<void> {
     this.logger.info('Generating directories');
     fs.mkdirSync(resultsDir, { recursive: true });
@@ -75,7 +66,6 @@ export class ResultsBuilder {
     const details: ComponentDetail[] = [];
 
     for (const result of results) {
-<<<<<<< HEAD
       const resultConstants = this.getResultConstant(result.name);
       details.push({
         name: resultConstants.componentName,
@@ -85,57 +75,6 @@ export class ResultsBuilder {
         error: result.data?.filter((record) => record.status === 'Error').length || 0,
         skip: result.data?.filter((record) => record.status === 'Skipped').length || 0,
       });
-=======
-      htmlBody += '<br />' + this.generateResult(result, instanceUrl);
-    }
-    htmlBody += '<br />' + this.generateApexAssesment(relatedObjectMigrationResult.apexAssessmentInfos);
-    // TODO: Uncomment code once MVP for migration is completed
-    // htmlBody += '<br />' + this.generateLwcAssesment(relatedObjectMigrationResult.lwcAssessmentInfos);
-
-    // Add rollback flags report if there are any enabled flags
-    const enabledFlags = omnistudioOrgDetails.rollbackFlags || [];
-    if (enabledFlags.length > 0) {
-      htmlBody += '<br />' + this.generateRollbackFlagsReport(enabledFlags);
-    }
-
-    const doc = this.generateDocument(htmlBody);
-    const fileUrl = process.cwd() + '/migrationresults.html';
-    fs.writeFileSync(fileUrl, doc);
-    await open('file://' + fileUrl);
-  }
-
-  private static generateDocument(resultsAsHtml: string): string {
-    const document = `
-        <html>
-            <head>
-                <title>OmniStudio Migration Results</title>
-                <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/design-system/2.17.5/styles/salesforce-lightning-design-system.min.css" />
-            </head>
-            <body>
-            <div style="margin: 20px;">
-                <div class="slds-text-heading_large">OmniStudio Migration Results</div>
-                    ${resultsAsHtml}
-                </div>
-            </div>
-            </body>
-        </html>
-        `;
-    return document;
-  }
-
-  private static generateResult(migrationResult: MigratedObject, instanceUrl: string): string {
-    let errorsBody = '';
-    let tableBody = '';
-
-    if (migrationResult.errors) {
-      errorsBody = migrationResult.errors
-        .map((e) => `<li class="slds-item slds-text-color_destructive">${e}</li>`)
-        .join('');
-      errorsBody = `
-              <div style="margin-block: 15px">
-                <ul class="slds-list_dotted">${errorsBody}</ul>
-              </div>`;
->>>>>>> 451bd60 (Comments addressed)
     }
 
     details.push({
@@ -409,7 +348,6 @@ export class ResultsBuilder {
     // this.generateReportForLwcResult(result.lwcAssessmentInfos, instanceUrl, orgDetails);
   }
 
-<<<<<<< HEAD
   private static generateReportForApexResult(
     result: ApexAssessmentInfo[],
     instanceUrl: string,
@@ -588,7 +526,6 @@ 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">
@@ -604,5 +541,4 @@ export class ResultsBuilder {
         </div>
       </div>`;
   }
->>>>>>> 451bd60 (Comments addressed)
 }