Skip to content

Commit 3ec207a

Browse files
committed
Fixed Audit check for global fields
1 parent f829c08 commit 3ec207a

File tree

5 files changed

+56
-46
lines changed

5 files changed

+56
-46
lines changed

.talismanrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ fileignoreconfig:
115115
- filename: pnpm-lock.yaml
116116
checksum: 85b652e6a8d386a7209294e67f91a570dbf9f96be396995d44cf4dbb54d073a4
117117
- filename: package-lock.json
118-
checksum: 68a3954c792ef99067c4cd4cf63c3021d31d5dd7862295650fdac37b3dc3c517
118+
checksum: c1556f7d4bcc426e0b821961b922a465c9f1cf8ef38e858e8beeeb591356746b
119+
- filename: packages/contentstack-audit/src/audit-base-command.ts
120+
checksum: 4544ad2869041340969c66500268c61f969e2ad907891c9a62b94fdae47134de
119121
- filename: packages/contentstack-migrate-rte/test/commands/json-migration.test.js
120122
checksum: 1f5ee5b39119667bd4830f9dbbbf757fb922f4ec3b7f6fad06bbfbf214fe7f73
121123
version: '1.0'

package-lock.json

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

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,10 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
259259

260260
break;
261261
case 'field-rules':
262+
// NOTE: We are using the fixed content-type for validation of field rules
263+
const data = this.getCtAndGfSchema();
264+
constructorParam.ctSchema = data.ctSchema;
265+
constructorParam.gfSchema = data.gfSchema;
262266
missingFieldRules = await new FieldRule(cloneDeep(constructorParam)).run();
263267
await this.prepareReport(module, missingFieldRules);
264268
this.getAffectedData('field-rules', dataModuleWise['content-types'], missingFieldRules);
@@ -456,7 +460,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
456460
key === 'missingCTSelectFieldValues' ||
457461
key === 'missingFieldUid' ||
458462
key === 'action' ||
459-
key === 'Non-Fixable' ||
463+
key === 'Non-Fixable' ||
460464
key === 'Not-Fixed'
461465
) {
462466
return chalk.red(typeof cellValue === 'object' ? JSON.stringify(cellValue) : cellValue);

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export default class ContentType {
149149
*/
150150
async writeFixContent() {
151151
let canWrite = true;
152-
152+
153153
if (!this.inMemoryFix && this.fix) {
154154
if (!this.config.flags['copy-dir'] && !this.config.flags['external-config']?.skipConfirm) {
155155
canWrite = this.config.flags.yes ?? (await cliux.confirm(commonMsg.FIX_CONFIRMATION));
@@ -574,6 +574,10 @@ export default class ContentType {
574574
});
575575
}
576576
}
577+
578+
if(field.schema && !isEmpty(field.schema)){
579+
field.schema = this.runFixOnSchema(tree, field.schema as ContentTypeSchemaType[]);
580+
}
577581
return refExist ? field : null;
578582
}
579583

packages/contentstack-audit/src/modules/field_rules.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export default class FieldRule {
8383
}
8484

8585
this.schema = this.moduleName === 'content-types' ? this.ctSchema : this.gfSchema;
86-
86+
8787
await this.prerequisiteData();
8888
await this.prepareEntryMetaData();
8989
for (const schema of this.schema ?? []) {

0 commit comments

Comments
 (0)