Skip to content
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

Jump to bottom

Query Node Editor fixes #97

Merged
merged 2 commits into from
Mar 27, 2018
Merged

Query Node Editor fixes #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc2dfc4
QueryNodeEditor related fixes
Mar 26, 2018
2ac91ce
Fix FormQueryNodeEditor being recreated on every edit
Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions frontend/lib/js/api/apiHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ export const transformElementsToApi = (conceptGroup) => conceptGroup.map(concept
: [];

return {
id: concept.id,
type: 'CONCEPT',
ids: concept.ids,
type: 'CONCEPT_LIST',
label: concept.label,
tables,
};
});
Expand Down
250 changes: 123 additions & 127 deletions frontend/lib/js/external-forms/form-concept-group/FormConceptGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ import {
CATEGORY_TREE_NODE
} from '../../common/constants/dndTypes';

import {
createConnectedFormQueryNodeEditor
} from '../form-query-node-editor';
import { FormQueryNodeEditor } from '../form-query-node-editor';

import FormConceptNode from './FormConceptNode';
import FormConceptNodeDropzone from './FormConceptNodeDropzone';
Expand Down Expand Up @@ -181,130 +179,128 @@ const switchFilterMode = (value, valueIdx, conceptIdx, tableIdx, filterIdx, mode
];
}

export const FormConceptGroup = (props: PropsType) => {
const FormQueryNodeEditor = createConnectedFormQueryNodeEditor(props.formType, props.name);

return (
<div className="externalForms__concept-group">
<DropzoneList
label={props.label}
className="externalForms__dropzone-list"
itemClassName="externalForms__dropzone-list__item"
dropzoneClassName="externalForms__dropzone"
dropzoneText={props.attributeDropzoneText}
acceptedDropTypes={[CATEGORY_TREE_NODE]}
onDelete={(i) => props.input.onChange(removeValue(props.input.value, i))}
onDrop={(dropzoneProps, monitor) => {
const item = monitor.getItem();
export const FormConceptGroup = (props: PropsType) => (
<div className="externalForms__concept-group">
<DropzoneList
label={props.label}
className="externalForms__dropzone-list"
itemClassName="externalForms__dropzone-list__item"
dropzoneClassName="externalForms__dropzone"
dropzoneText={props.attributeDropzoneText}
acceptedDropTypes={[CATEGORY_TREE_NODE]}
onDelete={(i) => props.input.onChange(removeValue(props.input.value, i))}
onDrop={(dropzoneProps, monitor) => {
const item = monitor.getItem();

return props.input.onChange(
addConcept(
addValue(props.input.value, props.newValue),
props.input.value.length, // Assuming the last index has increased after addValue
item
)
);
}}
items={
props.input.value.map((row, i) =>
<div>
{ props.renderRowPrefix ? props.renderRowPrefix(props.input, row, i) : null }
<DynamicInputGroup
className="externalForms__concept-group__input-group"
key={i}
onAddClick={() => props.input.onChange(addConcept(props.input.value, i, null))}
onRemoveClick={j => props.input.onChange(
props.input.value && props.input.value[i].concepts.length === 1
? removeValue(props.input.value, i)
: removeConcept(props.input.value, i, j))
}
items={
row.concepts.map((concept, j) =>
concept
? <FormConceptNode
key={j}
valueIdx={i}
conceptIdx={j}
conceptNode={concept}
name={props.name}
hasActiveFilters={nodeHasActiveFilters(concept)}
onFilterClick={() =>
props.input.onChange(
setConceptProperties(props.input.value, i, j, { isEditing: true })
)
}
/>
: <FormConceptNodeDropzone
dropzoneText={props.conceptDropzoneText}
onDrop={(dropzoneProps, monitor) => {
const item = monitor.getItem();

return props.input.onChange(setConcept(props.input.value, i, j, item));
}}
/>
)
}
/>
</div>
)
}
/>
<FormQueryNodeEditor
datasetId={props.datasetId}
onCloseModal={(valueIdx, conceptIdx) =>
props.input.onChange(
setConceptProperties(props.input.value, valueIdx, conceptIdx, { isEditing: false })
)
}
onUpdateLabel={(valueIdx, conceptIdx, label) =>
props.input.onChange(
setConceptProperties(props.input.value, valueIdx, conceptIdx, { label })
)
}
onDropConcept={(valueIdx, conceptIdx, concept) => {
const node = props.input.value[valueIdx].concepts[conceptIdx];
props.input.onChange(
setConceptProperties(props.input.value, valueIdx, conceptIdx, {
ids: [...concept.ids, ...node.ids]
})
)
}}
onRemoveConcept={(valueIdx, conceptIdx, conceptId) => {
const node = props.input.value[valueIdx].concepts[conceptIdx];
props.input.onChange(
setConceptProperties(props.input.value, valueIdx, conceptIdx, {
ids: node.ids.filter(id => id !== conceptId)
})
return props.input.onChange(
addConcept(
addValue(props.input.value, props.newValue),
props.input.value.length, // Assuming the last index has increased after addValue
item
)
}}
onToggleTable={(valueIdx, conceptIdx, tableIdx, isExcluded) =>
props.input.onChange(
toggleTable(props.input.value, valueIdx, conceptIdx, tableIdx, isExcluded)
)
}
onSetFilterValue={(valueIdx, conceptIdx, tableIdx, filterIdx, filterValue) =>
props.input.onChange(
setFilterValue(
props.input.value,
valueIdx,
conceptIdx,
tableIdx,
filterIdx,
filterValue
)
)
}
onSwitchFilterMode={(valueIdx, conceptIdx, tableIdx, filterIdx, mode) =>
props.input.onChange(
switchFilterMode(props.input.value, valueIdx, conceptIdx, tableIdx, filterIdx, mode)
)
}
onResetAllFilters={(valueIdx, conceptIdx) =>
props.input.onChange(
resetAllFilters(props.input.value, valueIdx, conceptIdx)
);
}}
items={
props.input.value.map((row, i) =>
<div>
{ props.renderRowPrefix ? props.renderRowPrefix(props.input, row, i) : null }
<DynamicInputGroup
className="externalForms__concept-group__input-group"
key={i}
onAddClick={() => props.input.onChange(addConcept(props.input.value, i, null))}
onRemoveClick={j => props.input.onChange(
props.input.value && props.input.value[i].concepts.length === 1
? removeValue(props.input.value, i)
: removeConcept(props.input.value, i, j))
}
items={
row.concepts.map((concept, j) =>
concept
? <FormConceptNode
key={j}
valueIdx={i}
conceptIdx={j}
conceptNode={concept}
name={props.name}
hasActiveFilters={nodeHasActiveFilters(concept)}
onFilterClick={() =>
props.input.onChange(
setConceptProperties(props.input.value, i, j, { isEditing: true })
)
}
/>
: <FormConceptNodeDropzone
dropzoneText={props.conceptDropzoneText}
onDrop={(dropzoneProps, monitor) => {
const item = monitor.getItem();

return props.input.onChange(setConcept(props.input.value, i, j, item));
}}
/>
)
}
/>
</div>
)
}
/>
<FormQueryNodeEditor
formType={props.formType}
fieldName={props.name}
datasetId={props.datasetId}
onCloseModal={(valueIdx, conceptIdx) =>
props.input.onChange(
setConceptProperties(props.input.value, valueIdx, conceptIdx, { isEditing: false })
)
}
onUpdateLabel={(valueIdx, conceptIdx, label) =>
props.input.onChange(
setConceptProperties(props.input.value, valueIdx, conceptIdx, { label })
)
}
onDropConcept={(valueIdx, conceptIdx, concept) => {
const node = props.input.value[valueIdx].concepts[conceptIdx];
props.input.onChange(
setConceptProperties(props.input.value, valueIdx, conceptIdx, {
ids: [...concept.ids, ...node.ids]
})
)
}}
onRemoveConcept={(valueIdx, conceptIdx, conceptId) => {
const node = props.input.value[valueIdx].concepts[conceptIdx];
props.input.onChange(
setConceptProperties(props.input.value, valueIdx, conceptIdx, {
ids: node.ids.filter(id => id !== conceptId)
})
)
}}
onToggleTable={(valueIdx, conceptIdx, tableIdx, isExcluded) =>
props.input.onChange(
toggleTable(props.input.value, valueIdx, conceptIdx, tableIdx, isExcluded)
)
}
onSetFilterValue={(valueIdx, conceptIdx, tableIdx, filterIdx, filterValue) =>
props.input.onChange(
setFilterValue(
props.input.value,
valueIdx,
conceptIdx,
tableIdx,
filterIdx,
filterValue
)
}
/>
</div>
);
};
)
}
onSwitchFilterMode={(valueIdx, conceptIdx, tableIdx, filterIdx, mode) =>
props.input.onChange(
switchFilterMode(props.input.value, valueIdx, conceptIdx, tableIdx, filterIdx, mode)
)
}
onResetAllFilters={(valueIdx, conceptIdx) =>
props.input.onChange(
resetAllFilters(props.input.value, valueIdx, conceptIdx)
)
}
/>
</div>
);