Comments addressed

Author: RedisBot

src/commands/omnistudio/migration/migrate.ts

@@ -91,11 +91,11 @@ export default class Migrate extends OmniStudioBaseCommand {
 
     // Enable Omni preferences
     try {
+      orgs.rollbackFlags = await OrgPreferences.checkRollbackFlags(conn);
       await OrgPreferences.enableOmniPreferences(conn);
     } catch (error) {
       const errMsg = error instanceof Error ? error.message : String(error);
-      this.ux.error(`Could not enable Omni preferences: ${errMsg}`);
-      throw error;
+      this.ux.log(`Could not enable Omni preferences: ${errMsg}`);
     }
 
     const namespace = orgs.packageDetails.namespace;

src/utils/interfaces.ts

@@ -162,5 +162,5 @@ export interface QueryResult {
     };
     DeveloperName: string;
     Value: string;
-  }>;
+  }>
 }

src/utils/orgpreferences.ts src/utils/orgPreferences.tssrc/utils/orgpreferences.ts renamed to src/utils/orgPreferences.ts

@@ -13,7 +13,8 @@ export class DRAssessmentReporter {
   public static generateDRAssesment(
     dataRaptorAssessmentInfos: DataRaptorAssessmentInfo[],
     instanceUrl: string,
-    org: ReportHeaderFormat[]
+    org: ReportHeaderFormat[],
+    rollbackFlags?: string[]
   ): string {
     // Header Column
     const headerColumn: HeaderColumn[] = [

src/utils/resultsbuilder/DRAssessmentReporter.ts

@@ -12,7 +12,8 @@ export class IPAssessmentReporter {
   public static generateIPAssesment(
     ipAssessmentInfos: IPAssessmentInfo[],
     instanceUrl: string,
-    org: ReportHeaderFormat[]
+    org: ReportHeaderFormat[],
+    rollbackFlags?: string[]
   ): string {
     // Define multi-row headers
     const headerColumn: HeaderColumn[] = [

src/utils/resultsbuilder/IPAssessmentReporter.ts

@@ -14,7 +14,8 @@ export class OSAssessmentReporter {
   public static generateOSAssesment(
     osAssessmentInfos: OSAssessmentInfo[],
     instanceUrl: string,
-    org: ReportHeaderFormat[]
+    org: ReportHeaderFormat[],
+    rollbackFlags?: string[]
   ): string {
     // Header Column
     const headerColumn: HeaderColumn[] = [

src/utils/resultsbuilder/OSAssessmentReporter.ts

@@ -29,16 +29,39 @@ export class AssessmentReporter {
     const integrationProcedureAssessmentFilePath = basePath + '/integration_procedure_assessment.html';
     const dataMapperAssessmentFilePath = basePath + '/datamapper_assessment.html';
     const apexAssessmentFilePath = basePath + '/apex_assessment.html';
-    const rollbackFlagsReportPath = basePath + '/rollback_flags_report.html';
     // TODO: Uncomment code once MVP for migration is completed
     // 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)
       );
+=======
+    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,
@@ -146,6 +169,7 @@ export class AssessmentReporter {
       //   location: 'lwc_assessment.html',
       // },
     ];
+<<<<<<< HEAD
         // Check rollback flags
     const enabledFlags = omnistudioOrgDetails.rollbackFlags || [];
     if (enabledFlags.length > 0) {
@@ -156,6 +180,8 @@ export class AssessmentReporter {
         location: 'rollback_flags_report.html',
       });
     }
+=======
+>>>>>>> 451bd60 (Comments addressed)
 
     await this.createMasterDocument(nameUrls, basePath);
     pushAssestUtilites('javascripts', basePath);
@@ -300,23 +326,4 @@ export class AssessmentReporter {
         </div>`;
     return tableBody;
   }
-  private static generateRollbackFlagsReport(enabledFlags: string[]): string {
-    return `
-      <div class="slds-box rollback-flags-warning">
-        <div class="slds-text-heading_medium">
-          <svg class="slds-icon slds-icon_small slds-m-right_x-small" aria-hidden="true">
-            <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#warning"></use>
-          </svg>
-          Warning: Rollback Flags Enabled
-        </div>
-        <p>The following rollback flags are currently enabled and will be disabled during migration:</p>
-        <ul>
-          ${enabledFlags.map((flag) => `<li>${flag}</li>`).join('')}
-        </ul>
-        <p>
-          <strong>Note:</strong> These flags will not be supported after migration. For assistance, please contact support.
-        </p>
-      </div>
-    `;
-  }
 }

src/utils/resultsbuilder/assessmentReporter.ts

@@ -1,5 +1,6 @@
 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';
@@ -25,6 +26,10 @@ 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');
@@ -33,7 +38,11 @@ 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 });
@@ -66,6 +75,7 @@ export class ResultsBuilder {
     const details: ComponentDetail[] = [];
 
     for (const result of results) {
+<<<<<<< HEAD
       const resultConstants = this.getResultConstant(result.name);
       details.push({
         name: resultConstants.componentName,
@@ -75,6 +85,57 @@ 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({
@@ -348,6 +409,7 @@ export class ResultsBuilder {
     // this.generateReportForLwcResult(result.lwcAssessmentInfos, instanceUrl, orgDetails);
   }
 
+<<<<<<< HEAD
   private static generateReportForApexResult(
     result: ApexAssessmentInfo[],
     instanceUrl: string,
@@ -526,4 +588,21 @@ 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>`;
+  }
+>>>>>>> 451bd60 (Comments addressed)
 }

src/utils/resultsbuilder/index.ts

@@ -1,7 +1,7 @@
 import { expect } from '@salesforce/command/lib/test';
 import { Connection } from '@salesforce/core';
 import sinon = require('sinon');
-import { OrgPreferences } from '../../src/utils/orgpreferences';
+import { OrgPreferences } from '../../src/utils/orgPreferences';
 
 describe('OrgPreferences', () => {
   let connection: Connection;