Skip to content

Commit d06605b

Browse files
snehaljha-sfsnehaljha-sf
authored
Merge pull request #363 from sf-kishore-kurri/u/kkurri/W-18480479
feat: @W-18480479 : CX review feedback incorporated for labels
2 parents 97f1779 + f240a1e commit d06605b

File tree

11 files changed

+51
-49
lines changed

11 files changed

+51
-49
lines changed

‎messages/migrate.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"labelStatusFailed": "Failed",
115115
"labelStatusComplete": "Complete",
116116
"migrationConsentNotGiven": "Couldn't confirm whether assessment errors are resolved",
117-
"migrationConsentMessage": "Ensure that all items in the assessment report are marked as Green before proceeding with the migration. Do you want to proceed?",
117+
"migrationConsentMessage": "Make sure that all records listed in the Assessment Status column in the Assessment Report are marked as Green before proceeding with the migration. Do you want to proceed? Yes or No?",
118118
"truncationFailed": "Truncation failed for %s: %s",
119119
"invalidTypeMigrateErrorMessage": "We couldn't migrate your Omnistudio components in the %s namespace. Select the correct namespace and try again"
120120
}

‎src/migration/dataraptor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
288288
Logger.info(this.messages.getMessage('processingDataRaptor', [drName]));
289289
const warnings: string[] = [];
290290
const existingDRNameVal = new StringVal(drName, 'name');
291-
let assessmentStatus = 'Can be Automated';
291+
let assessmentStatus = 'Ready for migration';
292292

293293
if (!existingDRNameVal.isNameCleaned()) {
294294
warnings.push(
@@ -298,7 +298,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
298298
existingDRNameVal.cleanName(),
299299
])
300300
);
301-
assessmentStatus = 'Has Warnings';
301+
assessmentStatus = 'Warnings';
302302
}
303303
if (existingDataRaptorNames.has(existingDRNameVal.cleanName())) {
304304
warnings.push(this.messages.getMessage('duplicatedName') + ' ' + existingDRNameVal.cleanName());

‎src/migration/flexcard.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,13 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
180180
// Check for name changes due to API naming requirements
181181
const originalName: string = flexCardName;
182182
const cleanedName: string = this.cleanName(originalName);
183-
let assessmentStatus = 'Can be Automated';
183+
let assessmentStatus = 'Ready for migration';
184184
flexCardAssessmentInfo.name = this.allVersions ? `${cleanedName}_${version}` : cleanedName;
185185
if (cleanedName !== originalName) {
186186
flexCardAssessmentInfo.warnings.push(
187187
this.messages.getMessage('cardNameChangeMessage', [originalName, cleanedName])
188188
);
189-
assessmentStatus = 'Has Warnings';
189+
assessmentStatus = 'Warnings';
190190
}
191191

192192
// Check for duplicate names
@@ -204,7 +204,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
204204
flexCardAssessmentInfo.warnings.push(
205205
this.messages.getMessage('authordNameChangeMessage', [originalAuthor, cleanedAuthor])
206206
);
207-
assessmentStatus = 'Has Warnings';
207+
assessmentStatus = 'Warnings';
208208
}
209209
}
210210

@@ -235,7 +235,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
235235
flexCardAssessmentInfo.warnings.push(
236236
this.messages.getMessage('dataRaptorNameChangeMessage', [originalBundle, cleanedBundle])
237237
);
238-
flexCardAssessmentInfo.migrationStatus = 'Has Warnings';
238+
flexCardAssessmentInfo.migrationStatus = 'Warnings';
239239
}
240240
}
241241
} else if (dataSource.type === Constants.IntegrationProcedurePluralName) {
@@ -252,7 +252,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
252252
flexCardAssessmentInfo.warnings.push(
253253
this.messages.getMessage('integrationProcedureNameChangeMessage', [originalIpMethod, cleanedIpMethod])
254254
);
255-
flexCardAssessmentInfo.migrationStatus = 'Has Warnings';
255+
flexCardAssessmentInfo.migrationStatus = 'Warnings';
256256
}
257257

258258
// Add warning for IP references with more than 2 parts (which potentially need manual updates)
@@ -347,7 +347,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
347347
flexCardAssessmentInfo.warnings.push(
348348
this.messages.getMessage('omniScriptNameChangeMessage', [parts[i], cleanedParts[i]])
349349
);
350-
flexCardAssessmentInfo.migrationStatus = 'Has Warnings';
350+
flexCardAssessmentInfo.migrationStatus = 'Warnings';
351351
}
352352
}
353353
}
@@ -378,7 +378,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
378378
flexCardAssessmentInfo.warnings.push(
379379
this.messages.getMessage('omniScriptNameChangeMessage', [parts[i], cleanedParts[i]])
380380
);
381-
flexCardAssessmentInfo.migrationStatus = 'Has Warnings';
381+
flexCardAssessmentInfo.migrationStatus = 'Warnings';
382382
}
383383
}
384384
}

‎src/migration/omniscript.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
288288
}
289289
if (omniAssessmentInfo.type === 'OmniScript') {
290290
const type = omniscript[this.namespacePrefix + 'IsLwcEnabled__c'] ? 'LWC' : 'Angular';
291-
let migrationStatus = 'Can be Automated';
291+
let migrationStatus = 'Ready for migration';
292292
if (type === 'Angular') {
293293
omniAssessmentInfo.warnings.unshift(this.messages.getMessage('angularOSWarning'));
294294
migrationStatus = 'Need Manual Intervention';
@@ -433,7 +433,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
433433
const existingSubTypeVal = new StringVal(existingSubType, 'sub type');
434434
const omniScriptName = omniscript[this.namespacePrefix + 'Name'];
435435
const existingOmniScriptNameVal = new StringVal(omniScriptName, 'name');
436-
let assessmentStatus = 'Can be Automated';
436+
let assessmentStatus = 'Ready for migration';
437437

438438
const warnings: string[] = [];
439439

@@ -457,7 +457,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
457457
existingTypeVal.cleanName(),
458458
])
459459
);
460-
assessmentStatus = 'Has Warnings';
460+
assessmentStatus = 'Warnings';
461461
}
462462
if (!existingSubTypeVal.isNameCleaned()) {
463463
warnings.push(
@@ -467,7 +467,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
467467
existingSubTypeVal.cleanName(),
468468
])
469469
);
470-
assessmentStatus = 'Has Warnings';
470+
assessmentStatus = 'Warnings';
471471
}
472472
if (!existingOmniScriptNameVal.isNameCleaned()) {
473473
warnings.push(
@@ -477,11 +477,11 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
477477
existingOmniScriptNameVal.cleanName(),
478478
])
479479
);
480-
assessmentStatus = 'Has Warnings';
480+
assessmentStatus = 'Warnings';
481481
}
482482
if (existingOmniscriptNames.has(recordName)) {
483483
warnings.push(this.messages.getMessage('duplicatedName') + ' ' + recordName);
484-
assessmentStatus = 'Has Warnings';
484+
assessmentStatus = 'Warnings';
485485
} else {
486486
existingOmniscriptNames.add(recordName);
487487
}

‎src/utils/resultsbuilder/ApexAssessmentReporter.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ export class ApexAssessmentReporter {
3636
public static getSummaryData(apexAssessmentInfos: ApexAssessmentInfo[]): SummaryItemDetailParam[] {
3737
return [
3838
{
39-
name: 'Can be Automated',
39+
name: 'Ready for migration',
4040
count: apexAssessmentInfos.filter(
4141
(apexAssessmentInfo) => !apexAssessmentInfo.warnings || apexAssessmentInfo.warnings.length === 0
4242
).length,
4343
cssClass: 'text-success',
4444
},
4545
{
46-
name: 'Has Warnings',
46+
name: 'Warnings',
4747
count: apexAssessmentInfos.filter((info) => info.warnings && info.warnings.length > 0).length,
4848
cssClass: 'text-warning',
4949
},
@@ -72,7 +72,7 @@ export class ApexAssessmentReporter {
7272
),
7373
createRowDataParam(
7474
'status',
75-
apexAssessmentInfo.warnings.length > 0 ? 'Has Warnings' : 'Can be Automated',
75+
apexAssessmentInfo.warnings.length > 0 ? 'Warnings' : 'Ready for migration',
7676
false,
7777
1,
7878
1,

‎src/utils/resultsbuilder/DRAssessmentReporter.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,23 @@ export class DRAssessmentReporter {
3939
public static getSummaryData(dataRaptorAssessmentInfos: DataRaptorAssessmentInfo[]): SummaryItemDetailParam[] {
4040
return [
4141
{
42-
name: 'Can be Automated',
42+
name: 'Ready for migration',
4343
count: dataRaptorAssessmentInfos.filter(
4444
(dataRaptorAssessmentInfo) =>
4545
!dataRaptorAssessmentInfo.warnings || dataRaptorAssessmentInfo.warnings.length === 0
4646
).length,
4747
cssClass: 'text-success',
4848
},
4949
{
50-
name: 'Has Warnings',
50+
name: 'Warnings',
5151
count: dataRaptorAssessmentInfos.filter(
5252
(dataRaptorAssessmentInfo) =>
5353
dataRaptorAssessmentInfo.warnings && dataRaptorAssessmentInfo.warnings.length > 0
5454
).length,
5555
cssClass: 'text-warning',
5656
},
5757
{
58-
name: 'Has Errors',
58+
name: 'Failed',
5959
count: dataRaptorAssessmentInfos.filter(
6060
(dataRaptorAssessmentInfo) => dataRaptorAssessmentInfo.errors && dataRaptorAssessmentInfo.errors.length > 0
6161
).length,
@@ -175,7 +175,7 @@ export class DRAssessmentReporter {
175175
false,
176176
undefined,
177177
undefined,
178-
dataRaptorAssessmentInfo.migrationStatus === 'Can be Automated' ? 'text-success' : 'text-error'
178+
dataRaptorAssessmentInfo.migrationStatus === 'Ready for migration' ? 'text-success' : 'text-error'
179179
),
180180
createRowDataParam(
181181
'summary',

‎src/utils/resultsbuilder/FlexcardAssessmentReporter.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@ export class FlexcardAssessmentReporter {
3535
public static getSummaryData(flexCardAssessmentInfos: FlexCardAssessmentInfo[]): SummaryItemDetailParam[] {
3636
return [
3737
{
38-
name: 'Can be Automated',
38+
name: 'Ready for migration',
3939
count: flexCardAssessmentInfos.filter(
4040
(flexCardAssessmentInfo) => !flexCardAssessmentInfo.warnings || flexCardAssessmentInfo.warnings.length === 0
4141
).length,
4242
cssClass: 'text-success',
4343
},
4444
{
45-
name: 'Has Warnings',
45+
name: 'Warnings',
4646
count: flexCardAssessmentInfos.filter(
4747
(flexCardAssessmentInfo) => flexCardAssessmentInfo.warnings && flexCardAssessmentInfo.warnings.length > 0
4848
).length,
4949
cssClass: 'text-warning',
5050
},
5151
{
52-
name: 'Has Errors',
52+
name: 'Failed',
5353
count: flexCardAssessmentInfos.filter(
5454
(flexCardAssessmentInfo) => flexCardAssessmentInfo.errors && flexCardAssessmentInfo.errors.length > 0
5555
).length,
@@ -172,7 +172,7 @@ export class FlexcardAssessmentReporter {
172172
false,
173173
undefined,
174174
undefined,
175-
flexCardAssessmentInfo.migrationStatus === 'Can be Automated' ? 'text-success' : 'text-error'
175+
flexCardAssessmentInfo.migrationStatus === 'Ready for migration' ? 'text-success' : 'text-error'
176176
),
177177
createRowDataParam(
178178
'summary',

‎src/utils/resultsbuilder/IPAssessmentReporter.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,21 @@ export class IPAssessmentReporter {
3939
public static getSummaryData(ipAssessmentInfos: IPAssessmentInfo[]): SummaryItemDetailParam[] {
4040
return [
4141
{
42-
name: 'Can be Automated',
43-
count: ipAssessmentInfos.filter((ipAssessmentInfo) => ipAssessmentInfo.migrationStatus === 'Can be Automated')
44-
.length,
42+
name: 'Ready for migration',
43+
count: ipAssessmentInfos.filter(
44+
(ipAssessmentInfo) => ipAssessmentInfo.migrationStatus === 'Ready for migration'
45+
).length,
4546
cssClass: 'text-success',
4647
},
4748
{
48-
name: 'Has Warnings',
49+
name: 'Warnings',
4950
count: ipAssessmentInfos.filter(
5051
(ipAssessmentInfo) => ipAssessmentInfo.warnings && ipAssessmentInfo.warnings.length > 0
5152
).length,
5253
cssClass: 'text-warning',
5354
},
5455
{
55-
name: 'Has Errors',
56+
name: 'Failed',
5657
count: ipAssessmentInfos.filter(
5758
(ipAssessmentInfo) => ipAssessmentInfo.errors && ipAssessmentInfo.errors.length > 0
5859
).length,
@@ -77,7 +78,7 @@ export class IPAssessmentReporter {
7778
false,
7879
undefined,
7980
undefined,
80-
ipAssessmentInfo.migrationStatus === 'Can be Automated' ? 'text-success' : 'text-error'
81+
ipAssessmentInfo.migrationStatus === 'Ready for migration' ? 'text-success' : 'text-error'
8182
),
8283
createRowDataParam(
8384
'summary',

‎src/utils/resultsbuilder/OSAssessmentReporter.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ export class OSAssessmentReporter {
3939
public static getSummaryData(osAssessmentInfos: OSAssessmentInfo[]): SummaryItemDetailParam[] {
4040
return [
4141
{
42-
name: 'Can be Automated',
43-
count: osAssessmentInfos.filter((osAssessmentInfo) => osAssessmentInfo.migrationStatus === 'Can be Automated')
44-
.length,
42+
name: 'Ready for migration',
43+
count: osAssessmentInfos.filter(
44+
(osAssessmentInfo) => osAssessmentInfo.migrationStatus === 'Ready for migration'
45+
).length,
4546
cssClass: 'text-success',
4647
},
4748
{
@@ -52,10 +53,10 @@ export class OSAssessmentReporter {
5253
cssClass: 'text-warning',
5354
},
5455
{
55-
name: 'Has Errors',
56+
name: 'Failed',
5657
count: osAssessmentInfos.filter(
5758
(osAssessmentInfo) =>
58-
osAssessmentInfo.migrationStatus !== 'Can be Automated' &&
59+
osAssessmentInfo.migrationStatus !== 'Ready for migration' &&
5960
osAssessmentInfo.migrationStatus !== 'Need Manual Intervention'
6061
).length,
6162
cssClass: 'text-error',
@@ -76,7 +77,7 @@ export class OSAssessmentReporter {
7677
false,
7778
undefined,
7879
undefined,
79-
info.migrationStatus !== 'Can be Automated' ? 'invalid-icon' : ''
80+
info.migrationStatus !== 'Ready for migration' ? 'invalid-icon' : ''
8081
),
8182
createRowDataParam('recordId', info.id, false, 1, 1, true, `${instanceUrl}/${info.id}`),
8283
createRowDataParam('newName', info.name || '', false, 1, 1, false),
@@ -90,7 +91,7 @@ export class OSAssessmentReporter {
9091
false,
9192
undefined,
9293
undefined,
93-
info.migrationStatus === 'Can be Automated' ? 'text-success' : 'text-error'
94+
info.migrationStatus === 'Ready for migration' ? 'text-success' : 'text-error'
9495
),
9596
createRowDataParam(
9697
'summary',

‎src/utils/resultsbuilder/index.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export class ResultsBuilder {
9393
assessmentDate: new Date().toLocaleString(),
9494
total: result.data?.length || 0,
9595
filterGroups: [
96-
createFilterGroupParam('Filter By Status', 'status', ['Successfully Completed', 'Failed', 'Skipped']),
96+
createFilterGroupParam('Filter By Status', 'status', ['Successfully migrated', 'Failed', 'Skipped']),
9797
],
9898
headerGroups: [
9999
{
@@ -160,7 +160,7 @@ export class ResultsBuilder {
160160
createRowDataParam('migratedName', item.migratedName, false, 1, 1, false),
161161
createRowDataParam(
162162
'status',
163-
item.status === 'Complete' ? 'Successfully Completed' : item.status,
163+
item.status === 'Complete' ? 'Successfully migrated' : item.status,
164164
false,
165165
1,
166166
1,
@@ -170,7 +170,7 @@ export class ResultsBuilder {
170170
),
171171
createRowDataParam(
172172
'errors',
173-
item.errors ? 'Has Errors' : 'Has No Errors',
173+
item.errors ? 'Failed' : 'Has No Errors',
174174
false,
175175
1,
176176
1,
@@ -180,7 +180,7 @@ export class ResultsBuilder {
180180
),
181181
createRowDataParam(
182182
'summary',
183-
item.warnings ? 'Has Warnings' : 'Has No Warnings',
183+
item.warnings ? 'Warnings' : 'Has No Warnings',
184184
false,
185185
1,
186186
1,
@@ -229,7 +229,7 @@ export class ResultsBuilder {
229229
},
230230
assessmentDate: new Date().toLocaleString(),
231231
total: result.length,
232-
filterGroups: [createFilterGroupParam('Filter by Errors', 'warnings', ['Has Errors', 'Has No Errors'])],
232+
filterGroups: [createFilterGroupParam('Filter by Errors', 'warnings', ['Failed', 'Has No Errors'])],
233233
headerGroups: [
234234
{
235235
header: [
@@ -288,7 +288,7 @@ export class ResultsBuilder {
288288
),
289289
createRowDataParam(
290290
'warnings',
291-
item.warnings ? 'Has Errors' : 'Has No Errors',
291+
item.warnings ? 'Failed' : 'Has No Errors',
292292
false,
293293
1,
294294
1,
@@ -368,7 +368,7 @@ export class ResultsBuilder {
368368
if (item.status === 'Skipped') skip++;
369369
});
370370
return [
371-
{ name: 'Successfully Completed', count: complete, cssClass: 'text-success' },
371+
{ name: 'Successfully migrated', count: complete, cssClass: 'text-success' },
372372
{ name: 'Failed', count: error, cssClass: 'text-error' },
373373
{ name: 'Skipped', count: skip, cssClass: 'text-warning' },
374374
];
@@ -384,7 +384,7 @@ export class ResultsBuilder {
384384
else error++;
385385
});
386386
return [
387-
{ name: 'Successfully Completed', count: complete, cssClass: 'text-success' },
387+
{ name: 'Successfully migrated', count: complete, cssClass: 'text-success' },
388388
{ name: 'Failed', count: error, cssClass: 'text-error' },
389389
];
390390
}

0 commit comments

Comments
 (0)