Skip to content

Commit 3c28646

Browse files
cs-rajcs-raj
authored
Merge pull request #1867 from contentstack/feat/DX-2333
Feat DX - 2333 - Added Summary for Audit Fix
2 parents df3beea + 87b5f5a commit 3c28646

File tree

12 files changed

+513
-467
lines changed

12 files changed

+513
-467
lines changed

‎package-lock.json‎

Lines changed: 213 additions & 198 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/contentstack-audit/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@contentstack/cli-audit",
3-
"version": "1.11.0",
3+
"version": "1.12.0",
44
"description": "Contentstack audit plugin",
55
"author": "Contentstack CLI",
66
"homepage": "https://github.com/contentstack/cli",

‎packages/contentstack-audit/src/audit-base-command.ts‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
104104
this.showOutputOnScreenWorkflowsAndExtension([
105105
{ module: 'Entries Changed Multiple Fields', missingRefs: missingMultipleFields },
106106
]);
107-
108107
}
109108
this.showOutputOnScreenWorkflowsAndExtension([{ module: 'Summary', missingRefs: this.summaryDataToPrint }]);
110109

@@ -186,7 +185,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
186185
fix: this.currentCommand === 'cm:stacks:audit:fix',
187186
};
188187

189-
let dataModuleWise: Record<string,any> = await new ModuleDataReader(cloneDeep(constructorParam)).run();
188+
let dataModuleWise: Record<string, any> = await new ModuleDataReader(cloneDeep(constructorParam)).run();
190189
for (const module of this.sharedConfig.flags.modules || this.sharedConfig.modules) {
191190
print([
192191
{
@@ -449,15 +448,16 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
449448
.map((key: string) => ({
450449
value: key,
451450
formatter: (cellValue: any) => {
452-
if (key === 'fixStatus' || key === 'Fixable') {
451+
if (key === 'fixStatus' || key === 'Fixable' || key === 'Fixed') {
453452
return chalk.green(typeof cellValue === 'object' ? JSON.stringify(cellValue) : cellValue);
454453
} else if (
455454
key === 'content_types' ||
456455
key === 'branches' ||
457456
key === 'missingCTSelectFieldValues' ||
458457
key === 'missingFieldUid' ||
459458
key === 'action' ||
460-
key === 'Non-Fixable'
459+
key === 'Non-Fixable' ||
460+
key === 'Not-Fixed'
461461
) {
462462
return chalk.red(typeof cellValue === 'object' ? JSON.stringify(cellValue) : cellValue);
463463
} else {
@@ -590,27 +590,45 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
590590

591591
for (const [key, refs] of missingRefs) {
592592
const uids = Object.keys(refs);
593-
if (key !== 'missingTitleFields') {
594-
uids.forEach((uid) => uidSet.add(uid));
595-
} else {
593+
594+
if (
595+
key === 'missingTitleFields' ||
596+
(!this.sharedConfig.fixSelectField &&
597+
key === 'missingSelectFeild' &&
598+
this.currentCommand === 'cm:stacks:audit:fix')
599+
) {
596600
uids.forEach((uid) => {
597601
if (uidSet.has(uid)) {
598602
uidSet.delete(uid);
599603
nonFixable.add(uid);
604+
} else {
605+
nonFixable.add(uid);
600606
}
601607
});
608+
} else {
609+
uids.forEach((uid) => uidSet.add(uid));
602610
}
603611
}
604612

605-
result.Passed = dataExported.Total - uidSet.size;
606-
result.Fixable = uidSet.size - nonFixable.size;
607-
result['Non-Fixable'] = nonFixable.size;
613+
result.Passed = dataExported.Total - (uidSet.size + nonFixable.size);
614+
if (this.currentCommand === 'cm:stacks:audit:fix') {
615+
result.Fixed = uidSet.size;
616+
result['Not-Fixed'] = nonFixable.size;
617+
} else {
618+
result.Fixable = uidSet.size;
619+
result['Non-Fixable'] = nonFixable.size;
620+
}
608621
} else {
609622
const missingCount = Object.keys(listOfMissingRefs).length;
610623
result.Passed = dataExported.Total - missingCount;
611624

612-
result.Fixable = missingCount > 0 && isFixable ? missingCount : 0;
613-
result['Non-Fixable'] = missingCount > 0 && !isFixable ? missingCount : 0;
625+
if (this.currentCommand === 'cm:stacks:audit:fix') {
626+
result.Fixed = missingCount > 0 && isFixable ? missingCount : 0;
627+
result['Not-Fixed'] = missingCount > 0 && !isFixable ? missingCount : 0;
628+
} else {
629+
result.Fixable = missingCount > 0 && isFixable ? missingCount : 0;
630+
result['Non-Fixable'] = missingCount > 0 && !isFixable ? missingCount : 0;
631+
}
614632
}
615633

616634
this.summaryDataToPrint.push(result);

‎packages/contentstack-audit/src/config/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ const config = {
110110
"Total",
111111
"Fixable",
112112
"Non-Fixable",
113+
"Fixed",
114+
"Not-Fixed",
113115
"Passed",
114116
],
115117
ReportTitleForEntries: {

‎packages/contentstack-audit/src/modules/modulesData.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default class ModuleDataReader {
4141
count = this.gfSchema.length;
4242
break;
4343
case 'assets':
44-
count = keys(await this.readEntryAssetsModule(this.folderPath,'assets')).length;
44+
count = await this.readEntryAssetsModule(join(this.folderPath,'assets'),'assets') || 0;
4545
break;
4646
case 'entries':
4747
{

‎packages/contentstack-audit/src/types/content-types.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ enum OutputColumn {
173173
"Total"="Total",
174174
"Passed"="Passed",
175175
"Fixable"="Fixable",
176-
"Non-Fixable"="Non-Fixable"
176+
"Non-Fixable"="Non-Fixable",
177+
"Fixed" = "Fixed",
178+
"Not-Fixed" = "Not-Fixed",
177179
}
178180

179181
export {

‎packages/contentstack-clone/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dependencies": {
88
"@colors/colors": "^1.6.0",
99
"@contentstack/cli-cm-export": "~1.16.0",
10-
"@contentstack/cli-cm-import": "~1.21.1",
10+
"@contentstack/cli-cm-import": "~1.21.2",
1111
"@contentstack/cli-command": "~1.5.0",
1212
"@contentstack/cli-utilities": "~1.11.0",
1313
"chalk": "^4.1.2",

‎packages/contentstack-import/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "@contentstack/cli-cm-import",
33
"description": "Contentstack CLI plugin to import content into stack",
4-
"version": "1.21.1",
4+
"version": "1.21.2",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
8-
"@contentstack/cli-audit": "~1.11.0",
8+
"@contentstack/cli-audit": "~1.12.0",
99
"@contentstack/cli-command": "~1.5.0",
1010
"@contentstack/cli-utilities": "~1.11.0",
11-
"@contentstack/management": "~1.20.1",
11+
"@contentstack/management": "~1.20.2",
1212
"@contentstack/cli-variants": "~1.2.0",
1313
"@oclif/core": "^4.2.7",
1414
"big-json": "^3.2.0",

‎packages/contentstack-seed/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
8-
"@contentstack/cli-cm-import": "~1.21.1",
8+
"@contentstack/cli-cm-import": "~1.21.2",
99
"@contentstack/cli-command": "~1.5.0",
1010
"@contentstack/cli-utilities": "~1.11.0",
11-
"@contentstack/management": "~1.20.1",
11+
"@contentstack/management": "~1.20.2",
1212
"inquirer": "8.2.6",
1313
"mkdirp": "^1.0.4",
1414
"tar": "^6.2.1",

‎packages/contentstack-utilities/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"author": "contentstack",
3333
"license": "MIT",
3434
"dependencies": {
35-
"@contentstack/management": "~1.20.1",
35+
"@contentstack/management": "~1.20.2",
3636
"@contentstack/marketplace-sdk": "^1.2.5",
3737
"@oclif/core": "^4.2.7",
3838
"axios": "^1.8.2",

0 commit comments

Comments
 (0)