Skip to content

Commit 96c3430

Browse files
authored
Merge pull request #403 from snehaljha-sf/file_diff_change
feat: file diff td with new UX changes
2 parents 270e274 + fb4d931 commit 96c3430

File tree

6 files changed

+35
-9
lines changed

6 files changed

+35
-9
lines changed

src/styles/reportGenerator.css

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,11 @@ html {
306306
.expandModalButton {
307307
position: absolute;
308308
top: 5px;
309-
right: 5px;
309+
right: 1.5rem;
310310
width: 30px;
311311
height: 30px;
312312
opacity: 0.7;
313+
display: none;
313314
}
314315
.report-wrapper {
315316
display: flex;
@@ -574,3 +575,11 @@ td {
574575
.normal-td-padding {
575576
padding-left: 0.5rem !important;
576577
}
578+
579+
.diff-cell {
580+
min-width: 30rem;
581+
}
582+
583+
.diff-cell:hover .expandModalButton {
584+
display: block;
585+
}

src/utils/resultsbuilder/ApexAssessmentReporter.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ export class ApexAssessmentReporter {
108108
1,
109109
false,
110110
undefined,
111-
FileDiffUtil.getDiffHTML(apexAssessmentInfo.diff, apexAssessmentInfo.name)
111+
FileDiffUtil.getDiffHTML(apexAssessmentInfo.diff, apexAssessmentInfo.name),
112+
'diff-cell'
112113
),
113114
createRowDataParam(
114115
'comments',

src/utils/resultsbuilder/ExperienceSiteAssessmentReporter.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ export class ExperienceSiteAssessmentReporter {
119119
1,
120120
false,
121121
undefined,
122-
FileDiffUtil.getDiffHTML(experienceSiteAssessmentInfo.diff, experienceSiteAssessmentInfo.name)
122+
FileDiffUtil.getDiffHTML(experienceSiteAssessmentInfo.diff, experienceSiteAssessmentInfo.name),
123+
'diff-cell'
123124
),
124125
createRowDataParam('summary', '', false, 1, 1, false, undefined, experienceSiteAssessmentInfo.warnings),
125126
],

src/utils/resultsbuilder/FlexipageAssessmentReporter.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ export class FlexipageAssessmentReporter {
142142
1,
143143
false,
144144
undefined,
145-
FileDiffUtil.getDiffHTML(flexipageAssessmentInfo.diff, flexipageAssessmentInfo.name)
145+
FileDiffUtil.getDiffHTML(flexipageAssessmentInfo.diff, flexipageAssessmentInfo.name),
146+
'diff-cell'
146147
),
147148
createRowDataParam(
148149
'errors',

src/utils/resultsbuilder/LWCAssessmentReporter.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ export class LWCAssessmentReporter {
111111
1,
112112
false,
113113
undefined,
114-
FileDiffUtil.getDiffHTML(fileChangeInfo.diff, fileChangeInfo.name)
114+
FileDiffUtil.getDiffHTML(fileChangeInfo.diff, fileChangeInfo.name),
115+
'diff-cell'
115116
),
116117
...(fileIndex === 0
117118
? [

src/utils/resultsbuilder/index.ts

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,8 @@ export class ResultsBuilder {
398398
1,
399399
false,
400400
undefined,
401-
FileDiffUtil.getDiffHTML(item.diff, this.rowId.toString())
401+
FileDiffUtil.getDiffHTML(item.diff, this.rowId.toString()),
402+
'diff-cell'
402403
),
403404
createRowDataParam(
404405
'errors',
@@ -493,7 +494,17 @@ export class ResultsBuilder {
493494
undefined,
494495
item.status === 'Successfully migrated' ? 'text-success' : 'text-error'
495496
),
496-
createRowDataParam('diff', '', false, 1, 1, false, undefined, FileDiffUtil.getDiffHTML(item.diff, item.name)),
497+
createRowDataParam(
498+
'diff',
499+
'',
500+
false,
501+
1,
502+
1,
503+
false,
504+
undefined,
505+
FileDiffUtil.getDiffHTML(item.diff, item.name),
506+
'diff-cell'
507+
),
497508
createRowDataParam('error', 'error', false, 1, 1, false, undefined, item.errors),
498509
],
499510
})),
@@ -583,7 +594,8 @@ export class ResultsBuilder {
583594
1,
584595
false,
585596
undefined,
586-
FileDiffUtil.getDiffHTML(item.diff, item.name)
597+
FileDiffUtil.getDiffHTML(item.diff, item.name),
598+
'diff-cell'
587599
),
588600
createRowDataParam('infos', item.infos ? item.infos.join(', ') : '', false, 1, 1, false, undefined, [
589601
...item.infos,
@@ -719,7 +731,8 @@ export class ResultsBuilder {
719731
1,
720732
false,
721733
undefined,
722-
FileDiffUtil.getDiffHTML(fileChangeInfo.diff, fileChangeInfo.name)
734+
FileDiffUtil.getDiffHTML(fileChangeInfo.diff, fileChangeInfo.name),
735+
'diff-cell'
723736
),
724737
...(showCommon
725738
? [

0 commit comments

Comments
 (0)