Skip to content

Option picker for Masking Patient values #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dtphelan1 merged 4 commits into from
Oct 11, 2021
Merged

Option picker for Masking Patient values #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4515416
Picker for patient mask fields
julianxcarter Oct 5, 2021
36f45af
Mask options to-be now included in the picker
julianxcarter Oct 5, 2021
52b0846
Stray div removed
julianxcarter Oct 5, 2021
5e20db8
Id prop added to Form.Check component, MEF version updated
julianxcarter Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 4 additions & 23 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 49 additions & 20 deletions react-app/src/components/Extractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,29 @@ function Extractor(props) {
validExtractors: ['CSVCancerDiseaseStatusExtractor'],
},
{
mask: props.formData.constructorArgs.mask ? props.formData.constructorArgs.mask : '',
mask: props.formData.constructorArgs.mask ? props.formData.constructorArgs.mask : [],
label: 'Masked Fields',
type: 'dropdown',
included: false,
key: 'mask',
options: ['gender', 'mrn', 'name', 'address', 'birthDate', 'language', 'ethnicity', 'birthsex', 'race'],
options: [
'gender',
'mrn',
'name',
'address',
'birthDate',
'language',
'ethnicity',
'birthsex',
'race',
'telecom',
'multipleBirth',
'photo',
'contact',
'generalPractitioner',
'managingOrganization',
'link',
],
validExtractors: ['CSVPatientExtractor'],
},
];
Expand All @@ -87,6 +104,17 @@ function Extractor(props) {
props.onArgsChange(constructorArgs);
}

// Handles updates to multi-select arg fields such as "mask"
function updateOptions(argObj, changedValue, propertyName) {
const currentOptions = argObj[propertyName];
const changedIndex = currentOptions.indexOf(changedValue);
if (changedIndex > -1) {
currentOptions.splice(changedIndex, 1);
} else {
currentOptions.push(changedValue);
}
}

const getArg = (newArgs, key) => newArgs.find((temp) => key === temp.key);

function getArgsJSX() {
Expand Down Expand Up @@ -202,25 +230,9 @@ function Extractor(props) {
case 'dropdown':
return (
<Form.Group className="mb-3" controlId={arg.key} key={arg.key}>
<div>
<Form.Label>{arg.label}</Form.Label>
</div>
<Form.Text>
Enter field(s) as a list separated by a commas. The options are gender, mrn, name, address, birthDate,
language, ethnicity, birthsex, and race.
</Form.Text>
<div className="label-and-icon-container">
<Form.Control
type="text"
value={arg[arg.key]}
onChange={(e) => {
const newArgs = [...args];
const currentArg = getArg(newArgs, arg.key);
currentArg[arg.key] = e.target.value;
updateArgs(newArgs);
}}
className="arg-input-width-limit"
/>
<Form.Label>{arg.label}</Form.Label>
<Form.Text>Select fields to be masked in the extracted Patient resource</Form.Text>
<Trash2
onClick={() => {
const newArgs = [...args];
Expand All @@ -231,6 +243,23 @@ function Extractor(props) {
className="mouse-pointer"
/>
</div>
{arg.options.map((option) => (
<Form.Check
label={option}
name={option}
type="checkbox"
value={option}
key={`mask-${option}`}
id={`mask-${option}`}
className="arg-input-width-limit"
onChange={(e) => {
const newArgs = [...args];
const currentArg = getArg(newArgs, arg.key);
updateOptions(currentArg, e.target.value, arg.key);
updateArgs(newArgs);
}}
/>
))}
</Form.Group>
);
default:
Expand Down