fix the script to treat the value 0 not as falsy values. #441
Conversation
justincorrigible
force-pushed
the
440_treatment_start_interval
branch
from
ed98b33 to
4eb8092
Compare
justincorrigible
force-pushed
the
440_treatment_start_interval
branch
2 times, most recently
from
e54e036 to
3e8ee4e
Compare
| "prettier": { | ||
| "printWidth": 120, | ||
| "trailingComma": "all", | ||
| "semi": true, | ||
| "singleQuote": true, | ||
| "tabWidth": 4, | ||
| "useTabs": true |
There was a problem hiding this comment.
to help with consistent styling
| const checkforInvalid = entry => { | ||
| const entryAsNumber = parseFloat($field); // to validate it as a numnber | ||
|
|
||
| const recordHasTreatments = !arrayItemsInSecondArray( | ||
| treatmentExceptionTypes, | ||
| treatmentTypes, | ||
| ); | ||
| return ( | ||
| [null, undefined, ''].includes($field) || // first dispose of the regular falsy values | ||
| (!isNaN(entryAsNumber) && entryAsNumber < 0) || // checks for valid numbers | ||
| /^\s+$/g.test(decodeURI(entry).replace(/^"(.*)"$/, '$1')) | ||
| ); // whitespace-filled strings | ||
| }; |
There was a problem hiding this comment.
This checkForInvalid function now checks beyond whitespace strings whether there's falsy values given, while allowing 0+ to pass.
There was a problem hiding this comment.
sorry @justincorrigible I forgot to mention that the intervals have been adjusted to accept negative numbers: #436
By definition, all intervals are allowed to accept integers including negative, positive and 0. For example:
- treatment_start_interval: https://github.com/icgc-argo/argo-dictionary/blob/develop/schemas/treatment.json#L127
- specimen_acquisition_interval: https://github.com/icgc-argo/argo-dictionary/blob/develop/schemas/specimen.json#L144
There was a problem hiding this comment.
ahh! good to know! the code should reflect that 👍
I'll make the changes and document as a comment for future reference
(using explanation in #432)
| [ | ||
| 'treatment_start_interval is submitted to be a fraction when treatment was given', | ||
| true, | ||
| loadObjects(treatment, { | ||
| treatment_start_interval: 0.5, | ||
| treatment_type: ['Surgery'], | ||
| }), | ||
| ], | ||
| [ | ||
| 'treatment_start_interval is submitted to be negative when treatment was given', | ||
| false, | ||
| loadObjects(treatment, { | ||
| treatment_start_interval: -0.2, | ||
| treatment_type: ['Ablation'], | ||
| }), | ||
| ], | ||
| ], |
There was a problem hiding this comment.
a couple of additional tests to ensure even fractions pass, but not negative numbers.
justincorrigible
force-pushed
the
440_treatment_start_interval
branch
from
3e8ee4e to
43b12c7
Compare
fix the treatment interval validation script to accept 0 (#441)
fix the treatment interval validation script to accept 0 (#441)
|
postmortem comment: this PR removed a parenthesis that wraps the script, which we've realised was mandatory, and had to re-add afterwards. Tabs indentation is okay though, which is great for accessibility. |
The issue (#440) arises because the script treats the value
0as falsy in the condition (!$field || $field === null || checkforEmpty($field)), so it incorrectly triggers the validation error.Steps To Test
Context:
Steps to test the behaviour:
0