Template path fix (#311)

snehaljha-sf · web-flow · commit 9ea7198bde64 · 2025-07-01T15:42:55.000+05:30
diff --git a/package.json b/package.json
@@ -96,11 +96,12 @@
   },
   "repository": "salesforcecli/plugin-omnistudio-migration-tool",
   "scripts": {
-    "build": "sf-build",
+    "build": "sf-build && yarn copy-assets",
+    "copy-assets": "shx cp -r src/templates lib/ && shx cp -r src/styles lib/ && shx cp -r src/javascripts lib/",
     "clean": "sf-clean",
     "clean-all": "sf-clean all",
     "clean:lib": "shx rm -rf lib && shx rm -rf coverage && shx rm -rf .nyc_output && shx rm -f oclif.manifest.json",
-    "compile": "sf-compile",
+    "compile": "sf-compile && yarn copy-assets",
     "docs": "sf-docs",
     "format": "sf-format",
     "lint": "sf-lint",
diff --git a/src/migration/omniscript.ts b/src/migration/omniscript.ts
@@ -386,7 +386,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
         const nameVal = `${elemName}`;
         const className = propertySet['remoteClass'];
         const methodName = propertySet['remoteMethod'];
-        dependenciesRA.push({ name: className + '.' + methodName, location: nameVal });
+        if (className && methodName) dependenciesRA.push({ name: className + '.' + methodName, location: nameVal });
       }
       // To handle radio , multiselect
       if (propertySet['optionSource'] && propertySet['optionSource']['type'] === 'Custom') {
diff --git a/src/utils/file/fileUtil.ts b/src/utils/file/fileUtil.ts
@@ -158,7 +158,7 @@ export class File {
  * - The source files remain in place after copying.
  */
 export function pushAssestUtilites(folderName: string, destDir: string): void {
-  const sourceDir = path.join(process.cwd(), 'src', folderName);
+  const sourceDir = path.join(__dirname, '..', '..', folderName);
 
   if (!fs.existsSync(destDir)) {
     Logger.warn(`Destination directory does not exist: ${destDir}`);
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
@@ -30,6 +30,13 @@ export class Logger {
     FileLogger.writeLog('VERBOSE', message);
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  public static captureVerboseData(message: string, data: any): void {
+    if (Logger.verbose) {
+      FileLogger.writeLog('VERBOSE DATA', `${message}: ${JSON.stringify(data)}`);
+    }
+  }
+
   public static get logger(): SfLogger {
     return Logger.sfLogger;
   }
diff --git a/src/utils/resultsbuilder/ApexAssessmentReporter.ts b/src/utils/resultsbuilder/ApexAssessmentReporter.ts
@@ -1,4 +1,5 @@
 import { ApexAssessmentInfo } from '../interfaces';
+import { Logger } from '../logger';
 import { OmnistudioOrgDetails } from '../orgUtils';
 import {
   FilterGroupParam,
@@ -16,6 +17,7 @@ export class ApexAssessmentReporter {
     apexAssessmentInfos: ApexAssessmentInfo[],
     omnistudioOrgDetails: OmnistudioOrgDetails
   ): ReportParam {
+    Logger.captureVerboseData('apex data:', apexAssessmentInfos);
     return {
       title: 'Apex Migration Assessment',
       heading: 'Apex',
diff --git a/src/utils/resultsbuilder/DRAssessmentReporter.ts b/src/utils/resultsbuilder/DRAssessmentReporter.ts
@@ -1,4 +1,5 @@
 import { DataRaptorAssessmentInfo } from '../interfaces';
+import { Logger } from '../logger';
 import { OmnistudioOrgDetails } from '../orgUtils';
 import {
   FilterGroupParam,
@@ -17,6 +18,7 @@ export class DRAssessmentReporter {
     instanceUrl: string,
     omnistudioOrgDetails: OmnistudioOrgDetails
   ): ReportParam {
+    Logger.captureVerboseData('DM data', dataRaptorAssessmentInfos);
     return {
       title: 'Data Mapper Migration Assessment',
       heading: 'Data Mapper',
diff --git a/src/utils/resultsbuilder/FlexcardAssessmentReporter.ts b/src/utils/resultsbuilder/FlexcardAssessmentReporter.ts
@@ -1,4 +1,5 @@
 import { FlexCardAssessmentInfo } from '../interfaces';
+import { Logger } from '../logger';
 import { OmnistudioOrgDetails } from '../orgUtils';
 import {
   FilterGroupParam,
@@ -17,6 +18,7 @@ export class FlexcardAssessmentReporter {
     instanceUrl: string,
     omnistudioOrgDetails: OmnistudioOrgDetails
   ): ReportParam {
+    Logger.captureVerboseData('fc data:', flexCardAssessmentInfos);
     return {
       title: 'Flexcard Migration Assessment',
       heading: 'Flexcard',
diff --git a/src/utils/resultsbuilder/IPAssessmentReporter.ts b/src/utils/resultsbuilder/IPAssessmentReporter.ts
@@ -1,4 +1,5 @@
 import { IPAssessmentInfo } from '../interfaces';
+import { Logger } from '../logger';
 import { OmnistudioOrgDetails } from '../orgUtils';
 import {
   FilterGroupParam,
@@ -17,6 +18,7 @@ export class IPAssessmentReporter {
     instanceUrl: string,
     omnistudioOrgDetails: OmnistudioOrgDetails
   ): ReportParam {
+    Logger.captureVerboseData('IP data', ipAssessmentInfos);
     return {
       title: 'Integration Procedure Migration Assessment',
       heading: 'Integration Procedure',
diff --git a/src/utils/resultsbuilder/OSAssessmentReporter.ts b/src/utils/resultsbuilder/OSAssessmentReporter.ts
@@ -1,4 +1,5 @@
 import { OSAssessmentInfo } from '../interfaces';
+import { Logger } from '../logger';
 import { OmnistudioOrgDetails } from '../orgUtils';
 import {
   FilterGroupParam,
@@ -17,6 +18,7 @@ export class OSAssessmentReporter {
     instanceUrl: string,
     omnistudioOrgDetails: OmnistudioOrgDetails
   ): ReportParam {
+    Logger.captureVerboseData('OS data:', OSAssessmentInfos);
     return {
       title: 'OmniScript Migration Assessment',
       heading: 'OmniScript',
diff --git a/src/utils/resultsbuilder/assessmentReporter.ts b/src/utils/resultsbuilder/assessmentReporter.ts
@@ -25,7 +25,10 @@ export class AssessmentReporter {
   private static dataMapperAssessmentFileName = 'datamapper_assessment.html';
   private static apexAssessmentFileName = 'apex_assessment.html';
   private static dashboardFileName = 'dashboard.html';
-  private static dashboardTemplate = path.join(process.cwd(), 'src/templates/dashboard.template');
+  private static templateDir = 'templates';
+  private static dashboardTemplateName = 'dashboard.template';
+  private static reportTemplateName = 'assessmentReport.template';
+  private static dashboardTemplate = path.join(__dirname, '..', '..', this.templateDir, this.dashboardTemplateName);
   // TODO: Uncomment code once MVP for migration is completed
   // private static lwcAssessmentFilePath = this.basePath + '/lwc_assessment.html';
   public static async generate(
@@ -39,7 +42,7 @@ export class AssessmentReporter {
     fs.mkdirSync(this.basePath, { recursive: true });
 
     const assessmentReportTemplate = fs.readFileSync(
-      process.cwd() + '/src/templates/assessmentReport.template',
+      path.join(__dirname, '..', '..', this.templateDir, this.reportTemplateName),
       'utf8'
     );
     if (!assessOnly) {
diff --git a/src/utils/resultsbuilder/index.ts b/src/utils/resultsbuilder/index.ts
@@ -1,25 +1,28 @@
 import fs from 'fs';
 import path from 'path';
 import open from 'open';
-import { Logger, Messages } from '@salesforce/core';
+import { Messages } from '@salesforce/core';
 import { pushAssestUtilites } from '../file/fileUtil';
 import { ApexAssessmentInfo, MigratedObject, MigratedRecordInfo, RelatedObjectAssesmentInfo } from '../interfaces';
 import { ReportParam } from '../reportGenerator/reportInterfaces';
 import { OmnistudioOrgDetails } from '../orgUtils';
 import { TemplateParser } from '../templateParser/generate';
 import { createFilterGroupParam, createRowDataParam } from '../reportGenerator/reportUtil';
+import { Logger } from '../logger';
 
 const resultsDir = path.join(process.cwd(), 'migration_report');
 // const lwcConstants = { componentName: 'lwc', title: 'LWC Components Migration Result' };
 const migrationReportHTMLfileName = 'dashboard.html';
-const reportTemplateFilePath = path.join(process.cwd(), 'src', 'templates', 'migrationReport.template');
-const dashboardTemplateFilePath = path.join(process.cwd(), 'src', 'templates', 'dashboard.template');
+const templateDir = 'templates';
+const reportTemplateName = 'migrationReport.template';
+const dashboardTemplateName = 'dashboard.template';
+const reportTemplateFilePath = path.join(__dirname, '..', '..', templateDir, reportTemplateName);
+const dashboardTemplateFilePath = path.join(__dirname, '..', '..', templateDir, dashboardTemplateName);
 const apexFileName = 'apex.html';
 
 export class ResultsBuilder {
   private static rowClass = 'data-row-';
   private static rowId = 0;
-  private static logger: Logger = new Logger('ResultsBuilder');
 
   public static async generateReport(
     results: MigratedObject[],
@@ -29,14 +32,14 @@ export class ResultsBuilder {
     messages: Messages
   ): Promise<void> {
     fs.mkdirSync(resultsDir, { recursive: true });
-    this.logger.info(messages.getMessage('generatingComponentReports'));
+    Logger.info(messages.getMessage('generatingComponentReports'));
     for (const result of results) {
       this.generateReportForResult(result, instanceUrl, orgDetails, messages);
     }
-    this.logger.info(messages.getMessage('generatingRelatedObjectReports'));
+    Logger.info(messages.getMessage('generatingRelatedObjectReports'));
     this.generateReportForRelatedObject(relatedObjectMigrationResult, instanceUrl, orgDetails, messages);
 
-    this.logger.info(messages.getMessage('generatingMigrationReportDashboard'));
+    Logger.info(messages.getMessage('generatingMigrationReportDashboard'));
     this.generateMigrationReportDashboard(orgDetails, results, relatedObjectMigrationResult, messages);
     pushAssestUtilites('javascripts', resultsDir);
     pushAssestUtilites('styles', resultsDir);
@@ -49,6 +52,7 @@ export class ResultsBuilder {
     orgDetails: OmnistudioOrgDetails,
     messages: Messages
   ): void {
+    Logger.captureVerboseData(`${result.name} data`, result);
     // Determine which rollback flag to use based on component type
     let rollbackFlagNames: string[] = [];
     const componentName = result.name.toLowerCase();
@@ -181,6 +185,7 @@ export class ResultsBuilder {
     orgDetails: OmnistudioOrgDetails,
     messages: Messages
   ): void {
+    Logger.captureVerboseData('apex data', result);
     const data: ReportParam = {
       title: 'Apex Classes',
       heading: 'Apex Classes',
diff --git a/src/utils/templateParser/generate.ts b/src/utils/templateParser/generate.ts
@@ -1,5 +1,6 @@
 import { Messages } from '@salesforce/core';
 import { DashboardParam, ReportParam } from '../reportGenerator/reportInterfaces';
+import { Logger } from '../logger';
 import { TemplateParserUtil } from './util';
 
 /**
@@ -21,6 +22,7 @@ export class TemplateParser {
       return template;
     }
 
+    Logger.captureVerboseData('sanitized param data:', data);
     const node = TemplateParserUtil.parseHtmlToNode(template, messages);
     const keypair = TemplateParserUtil.parseKeyPair(data, messages);
     const html = node.toHtml(keypair);
diff --git a/src/utils/templateParser/model/elementNode.ts b/src/utils/templateParser/model/elementNode.ts
@@ -106,6 +106,10 @@ export class ElementNode {
     const indexVarName = this.properties.get('index') || 'index';
 
     array.forEach((item, index) => {
+      if (item == null) {
+        Logger.warn('skipping item in for loop, found to be null or undefined');
+        return;
+      }
       this.addProps(props, index.toString(), item, itemVarName, indexVarName);
       html += this.children.map((child) => child.toHtml(props)).join('');
       this.removeProps(props, item, itemVarName, indexVarName);

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat`
`386`	`386`	const nameVal = `${elemName}`;
`387`	`387`	`const className = propertySet['remoteClass'];`
`388`	`388`	`const methodName = propertySet['remoteMethod'];`
`389`		`- dependenciesRA.push({ name: className + '.' + methodName, location: nameVal });`
	`389`	`+ if (className && methodName) dependenciesRA.push({ name: className + '.' + methodName, location: nameVal });`
`390`	`390`	`}`
`391`	`391`	`// To handle radio , multiselect`
`392`	`392`	`if (propertySet['optionSource'] && propertySet['optionSource']['type'] === 'Custom') {`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,13 @@ export class Logger {`
`30`	`30`	`FileLogger.writeLog('VERBOSE', message);`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ // eslint-disable-next-line @typescript-eslint/no-explicit-any`
	`34`	`+ public static captureVerboseData(message: string, data: any): void {`
	`35`	`+ if (Logger.verbose) {`
	`36`	+ FileLogger.writeLog('VERBOSE DATA', `${message}: ${JSON.stringify(data)}`);
	`37`	`+ }`
	`38`	`+ }`
	`39`	`+`
`33`	`40`	`public static get logger(): SfLogger {`
`34`	`41`	`return Logger.sfLogger;`
`35`	`42`	`}`