Skip to content

Commit c7c28bf

Browse files
snehaljha-sfsf-kishore-kurri
authored andcommitted
feat: report labels and error handling
1 parent 8f74b10 commit c7c28bf

27 files changed

+146
-129
lines changed

messages/assess.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
"processingLwcsForAssessment": "Processing LWCs for assessment",
8888
"successfullyProcessedLwcsForAssessment": "Successfully processed %s LWCs for assessment",
8989
"lwcAssessmentResults": "LWC assessment results: %s",
90-
"errorReadingFiles": "Error in reading files: %s",
91-
"errorProcessingFiles": "Error in processing files: %s",
90+
"errorReadingFiles": "Error in reading files",
91+
"errorProcessingFiles": "Error in processing files",
9292
"startingProcessRelatedObjects": "Starting processRelatedObjects for %s in project path: %s",
9393
"errorProcessingApexFile": "Error processing Apex file: %s",
9494
"fileUpdatedToAllowRemoteCalls": "File will be updated to allow remote calls",

messages/migrate.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,5 +145,8 @@
145145
"foundGlobalAutoNumbersToAssess": "Found %s Global Auto Numbers to assess",
146146
"unexpectedError": "An unexpected error occurred during processing",
147147
"migrationValidationFailed": "Post Migration validation failed.",
148-
"incompleteMigrationDetected": "Incomplete migration detected. Source objects: %s, Target objects: %s."
148+
"incompleteMigrationDetected": "Incomplete migration detected. Source objects: %s, Target objects: %s.",
149+
"labelStatusSkipped": "Skipped",
150+
"labelStatusFailed": "Failed",
151+
"labelStatusComplete": "Complete"
149152
}

src/commands/omnistudio/migration/assess.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ export default class Assess extends OmniStudioBaseCommand {
5757
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
5858
return await this.runAssess();
5959
} catch (error) {
60-
Logger.error(messages.getMessage('errorRunningAssess'));
61-
Logger.error(error);
60+
Logger.error(messages.getMessage('errorRunningAssess'), error);
6261
process.exit(1);
6362
}
6463
}

src/commands/omnistudio/migration/info.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ export default class Org extends SfdxCommand {
5454
try {
5555
return await this.runInfo();
5656
} catch (error) {
57-
Logger.error('Error running info');
58-
Logger.error(error);
57+
Logger.error(messages.getMessage('errorRunningInfo'), error);
5958
process.exit(1);
6059
}
6160
}

src/commands/omnistudio/migration/migrate.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ export default class Migrate extends OmniStudioBaseCommand {
7373
return await this.runMigration();
7474
} catch (e) {
7575
const error = e as Error;
76-
Logger.error(`Error running migrate ${error.message}`);
77-
Logger.error(error);
76+
Logger.error(messages.getMessage('errorRunningMigrate'), error);
7877
process.exit(1);
7978
}
8079
}
@@ -310,8 +309,7 @@ export default class Migrate extends OmniStudioBaseCommand {
310309
})
311310
);
312311
} catch (ex: any) {
313-
Logger.error(JSON.stringify(ex));
314-
Logger.error(ex.stack);
312+
Logger.error('Error migrating object', ex);
315313
objectMigrationResults.push({
316314
name: cls.getName(),
317315
data: [],
@@ -438,7 +436,7 @@ export default class Migrate extends OmniStudioBaseCommand {
438436
const obj = {
439437
id: record['Id'],
440438
name: migrationTool.getRecordName(record),
441-
status: 'Skipped',
439+
status: messages.getMessage('labelStatusSkipped'),
442440
errors: record['errors'],
443441
migratedId: undefined,
444442
warnings: [],
@@ -451,7 +449,10 @@ export default class Migrate extends OmniStudioBaseCommand {
451449
let errors: any[] = obj.errors || [];
452450
errors = errors.concat(recordResults.errors || []);
453451

454-
obj.status = !recordResults || recordResults.hasErrors ? 'Error' : 'Complete';
452+
obj.status =
453+
!recordResults || recordResults.hasErrors
454+
? messages.getMessage('labelStatusFailed')
455+
: messages.getMessage('labelStatusComplete');
455456
obj.errors = errors;
456457
obj.migratedId = recordResults.id;
457458
obj.warnings = recordResults.warnings;

src/javascripts/reportGeneratorUtility.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ function filterAndSearchTable(tableId) {
5555
const visibleRows = Array.from(table.rows).filter(
5656
(row) => row.style.display !== 'none' && row.id !== 'no-rows-message'
5757
);
58-
reportTable.querySelector('#row-count').textContent = `Showing ${visibleRows.length} record${
59-
visibleRows.length !== 1 ? 's' : ''
60-
}`;
58+
reportTable.querySelector('#row-count').textContent = `Total Records: ${visibleRows.length}`;
6159
return;
6260
}
6361

src/migration/dataraptor.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
8181
);
8282
drItem[this.namespacePrefix + 'Formula__c'] = originalString;
8383
} catch (ex) {
84-
Logger.error(JSON.stringify(ex));
85-
Logger.error(ex.stack);
84+
Logger.error('Error updating formula for data mapper', ex);
8685
Logger.logVerbose(
8786
this.messages.getMessage('formulaSyntaxError', [drItem[this.namespacePrefix + 'Formula__c']])
8887
);
@@ -216,8 +215,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
216215
const dataRaptorAssessmentInfos = this.processDRComponents(dataRaptors);
217216
return dataRaptorAssessmentInfos;
218217
} catch (err) {
219-
Logger.error(JSON.stringify(err));
220-
Logger.error(err.stack);
218+
Logger.error('Error assessing data mapper', err);
221219
}
222220
}
223221

@@ -259,8 +257,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
259257
apexDependencies: [],
260258
});
261259
const error = e as Error;
262-
Logger.error(JSON.stringify(error));
263-
Logger.error(error.stack);
260+
Logger.error('Error processing data mapper', error);
264261
}
265262
progressBar.update(++progressCounter);
266263
}
@@ -318,8 +315,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
318315
});
319316
}
320317
} catch (ex) {
321-
Logger.error(JSON.stringify(ex));
322-
Logger.error(ex.stack);
318+
Logger.error('Error processing formula for data mapper', ex);
323319
Logger.logVerbose(this.messages.getMessage('formulaSyntaxError', [formula]));
324320
}
325321
}

src/migration/flexcard.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
113113
const flexCardsAssessmentInfos = this.processCardComponents(flexCards);
114114
return flexCardsAssessmentInfos;
115115
} catch (err) {
116-
Logger.error(this.messages.getMessage('errorDuringFlexCardAssessment'));
117-
Logger.error(JSON.stringify(err));
118-
Logger.error(err.stack);
116+
Logger.error(this.messages.getMessage('errorDuringFlexCardAssessment'), err);
119117
}
120118
}
121119

@@ -145,8 +143,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
145143
warnings: [this.messages.getMessage('unexpectedError')],
146144
});
147145
const error = e as Error;
148-
Logger.error(JSON.stringify(error));
149-
Logger.error(error.stack);
146+
Logger.error('Error processing flex card', error);
150147
}
151148
progressBar.update(++progressCounter);
152149
}

src/migration/omniscript.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
202202
);
203203
return omniAssessmentInfos;
204204
} catch (err) {
205-
Logger.error(this.messages.getMessage('errorDuringOmniScriptAssessment'));
206-
Logger.error(JSON.stringify(err));
207-
Logger.error(err.stack);
205+
Logger.error(this.messages.getMessage('errorDuringOmniScriptAssessment'), err);
208206
}
209207
}
210208

@@ -275,8 +273,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
275273
});
276274
}
277275
const error = e as Error;
278-
Logger.error(JSON.stringify(error));
279-
Logger.error(error.stack);
276+
Logger.error('Error processing omniscripts', error);
280277
continue;
281278
}
282279
if (omniAssessmentInfo.type === 'OmniScript') {
@@ -573,8 +570,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
573570
);
574571
ipElement[`${this.namespacePrefix}PropertySet__c`] = originalString;
575572
} catch (ex) {
576-
Logger.error(JSON.stringify(ex));
577-
Logger.error(ex.stack);
573+
Logger.error('Error processing formula for integration procedure', ex);
578574
Logger.logVerbose(
579575
this.messages.getMessage('formulaSyntaxError', [ipElement[`${this.namespacePrefix}PropertySet__c`]])
580576
);

src/migration/related/ApexMigration.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,7 @@ export class ApexMigration extends BaseRelatedObjectMigration {
105105
fileAssessmentInfo.push(apexAssementInfo);
106106
Logger.logVerbose(assessMessages.getMessage('successfullyProcessedApexFile', [file.name]));
107107
} catch (err) {
108-
Logger.error(assessMessages.getMessage('errorProcessingApexFile', [file.name]));
109-
Logger.error(JSON.stringify(err));
110-
if (err instanceof Error) {
111-
Logger.error(err.stack);
112-
}
108+
Logger.error(assessMessages.getMessage('errorProcessingApexFile', [file.name]), err);
113109
}
114110
Logger.logVerbose(assessMessages.getMessage('successfullyProcessedApexFile', [file.name]));
115111
}

0 commit comments

Comments
 (0)