Skip to content

Commit 5019453

Browse files
committed
Merge branch 'prerelease/develop-ga' into expSite_report_update
2 parents 239e7f4 + 8707926 commit 5019453

File tree

7 files changed

+36
-10
lines changed

7 files changed

+36
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@salesforce/plugin-omnistudio-migration-tool",
33
"description": "This SFDX plugin migrates FlexCard, OmniScript, DataRaptor, and Integration Procedure custom objects to standard objects.",
4-
"version": "2.0.0-rc.44",
4+
"version": "2.0.0-rc.45",
55
"author": "Salesforce",
66
"bugs": "https://github.com/forcedotcom/cli/issues",
77
"dependencies": {

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;
@@ -578,3 +579,11 @@ td {
578579
.no-display {
579580
display: none;
580581
}
582+
583+
.diff-cell {
584+
min-width: 30rem;
585+
}
586+
587+
.diff-cell:hover .expandModalButton {
588+
display: block;
589+
}

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
@@ -145,7 +145,8 @@ export class ExperienceSiteAssessmentReporter {
145145
1,
146146
false,
147147
undefined,
148-
FileDiffUtil.getDiffHTML(pageInfo.diff, pageInfo.name)
148+
FileDiffUtil.getDiffHTML(pageInfo.diff, pageInfo.name),
149+
'diff-cell'
149150
),
150151
createRowDataParam(
151152
'summary',

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
@@ -472,7 +472,17 @@ export class ResultsBuilder {
472472
undefined,
473473
item.status === 'Successfully migrated' ? 'text-success' : 'text-error'
474474
),
475-
createRowDataParam('diff', '', false, 1, 1, false, undefined, FileDiffUtil.getDiffHTML(item.diff, item.name)),
475+
createRowDataParam(
476+
'diff',
477+
'',
478+
false,
479+
1,
480+
1,
481+
false,
482+
undefined,
483+
FileDiffUtil.getDiffHTML(item.diff, item.name),
484+
'diff-cell'
485+
),
476486
createRowDataParam('error', 'error', false, 1, 1, false, undefined, item.errors),
477487
],
478488
})),
@@ -562,7 +572,8 @@ export class ResultsBuilder {
562572
1,
563573
false,
564574
undefined,
565-
FileDiffUtil.getDiffHTML(item.diff, item.name)
575+
FileDiffUtil.getDiffHTML(item.diff, item.name),
576+
'diff-cell'
566577
),
567578
createRowDataParam('infos', item.infos ? item.infos.join(', ') : '', false, 1, 1, false, undefined, [
568579
...item.infos,
@@ -698,7 +709,8 @@ export class ResultsBuilder {
698709
1,
699710
false,
700711
undefined,
701-
FileDiffUtil.getDiffHTML(fileChangeInfo.diff, fileChangeInfo.name)
712+
FileDiffUtil.getDiffHTML(fileChangeInfo.diff, fileChangeInfo.name),
713+
'diff-cell'
702714
),
703715
...(showCommon
704716
? [
@@ -1004,7 +1016,8 @@ export class ResultsBuilder {
10041016
1,
10051017
false,
10061018
undefined,
1007-
FileDiffUtil.getDiffHTML(page.diff, page.name)
1019+
FileDiffUtil.getDiffHTML(page.diff, page.name),
1020+
'diff-cell'
10081021
),
10091022
createRowDataParam('errors', page.errors ? page.errors.join(', ') : '', false, 1, 1, false, undefined, [
10101023
...(page.errors || []),

0 commit comments

Comments
 (0)