From 7c3d568c39a4eb323cdb891ba8c9a8b17214e7b1 Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Wed, 2 Mar 2022 15:07:34 -0800 Subject: [PATCH 1/2] Allow legitimate falsy values in argument value This change allows for empty string (`''`, `""`), `0`, and `false` to be set as the `value` in `CdmArgumentDefinition` without causing a validation error. --- objectModel/TypeScript/Cdm/CdmArgumentDefinition.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objectModel/TypeScript/Cdm/CdmArgumentDefinition.ts b/objectModel/TypeScript/Cdm/CdmArgumentDefinition.ts index 6ad3dd40fb..83fc8adca1 100644 --- a/objectModel/TypeScript/Cdm/CdmArgumentDefinition.ts +++ b/objectModel/TypeScript/Cdm/CdmArgumentDefinition.ts @@ -89,7 +89,7 @@ export class CdmArgumentDefinition extends cdmObjectSimple { public validate(): boolean { // let bodyCode = () => { - if (!this.value) { + if (this.value === null || this.value === undefined || this.value = NaN) { let missingFields: string[] = ['value']; Logger.error(this.ctx, this.TAG, this.validate.name, this.atCorpusPath, cdmLogCode.ErrValdnIntegrityCheckFailure, missingFields.map((s: string) => `'${s}'`).join(', '), this.atCorpusPath); return false; From 58ed41f5b3b10e41cc6961771e0d64533f76665d Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Wed, 2 Mar 2022 15:14:31 -0800 Subject: [PATCH 2/2] Use comparison for NaN instead of assignment --- objectModel/TypeScript/Cdm/CdmArgumentDefinition.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objectModel/TypeScript/Cdm/CdmArgumentDefinition.ts b/objectModel/TypeScript/Cdm/CdmArgumentDefinition.ts index 83fc8adca1..f7284add5b 100644 --- a/objectModel/TypeScript/Cdm/CdmArgumentDefinition.ts +++ b/objectModel/TypeScript/Cdm/CdmArgumentDefinition.ts @@ -89,7 +89,7 @@ export class CdmArgumentDefinition extends cdmObjectSimple { public validate(): boolean { // let bodyCode = () => { - if (this.value === null || this.value === undefined || this.value = NaN) { + if (this.value === null || this.value === undefined || this.value === NaN) { let missingFields: string[] = ['value']; Logger.error(this.ctx, this.TAG, this.validate.name, this.atCorpusPath, cdmLogCode.ErrValdnIntegrityCheckFailure, missingFields.map((s: string) => `'${s}'`).join(', '), this.atCorpusPath); return false;