Skip to content

OPG Entity Fix #1050

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

Closed
sbernabe1 wants to merge 1 commit into from
Closed

OPG Entity Fix #1050

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
103 changes: 68 additions & 35 deletions src/datasources/entity-ds/EntityClauseEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,34 +17,34 @@ export const EntityClauseEditor = ({ setFilter, loading, propertiesAsArray, clau
const updatedFilter = new API.Filter();
updatedFilter.limit = 10;

// Build the filter. This could be extracted to a helper function.
// Build the filter
clauses.forEach((d, i) => {
// comparator could be: '{ id, label }' or else '{ value: { i, l } }'
// Handle comparator structure - could be { id, label } or { value: { i, l } }
let comparatorValue = clauses[i].comparator?.value

if (!comparatorValue && clauses[i].comparator?.id) {
comparatorValue = {
id: clauses[i].comparator.id,
label: clauses[i].comparator.label,
l: clauses[i].comparator.label,
i: clauses[i].comparator.id
}
comparatorValue = {
id: clauses[i].comparator.id,
label: clauses[i].comparator.label,
l: clauses[i].comparator.label,
i: clauses[i].comparator.id
}
}

if ((d.type === OnmsEntityType.AND || d.type === OnmsEntityType.FIRST) && comparatorValue) {
updatedFilter.withAndRestriction(
new API.Restriction(
clauses[i].attribute?.value?.id,
clauses[i].attribute?.id || clauses[i].attribute?.value?.id,
comparatorValue,
clauses[i].comparedString || clauses[i].comparedValue.value
clauses[i].comparedString || clauses[i].comparedValue?.value
)
)
} else if (d.type === OnmsEntityType.OR && comparatorValue) {
updatedFilter.withOrRestriction(
new API.Restriction(
clauses[i].attribute?.value?.id,
clauses[i].attribute?.id || clauses[i].attribute?.value?.id,
comparatorValue,
clauses[i].comparedString || clauses[i].comparedValue.value
clauses[i].comparedString || clauses[i].comparedValue?.value
)
)
}
Expand All @@ -56,27 +56,60 @@ export const EntityClauseEditor = ({ setFilter, loading, propertiesAsArray, clau

return (
<>
{clauses.map((clause, index) => {
return (
<>
<EntityClause
key={index}
clause={clauses[index]}
setAttribute={(col, val) => dispatchClauses({ type: ClauseActionType.update, index: col, property: 'attribute', value: val })}
setComparator={(col, val) => dispatchClauses({ type: ClauseActionType.update, index: col, property: 'comparator', value: val })}
setComparedValue={(col, val) => dispatchClauses({ type: ClauseActionType.update, index: col, property: 'comparedValue', value: val })}
setComparedString={(col, val) => dispatchClauses({ type: ClauseActionType.update, index: col, property: 'comparedString', value: val })}
setClauseType={(col, val) => dispatchClauses({ type: ClauseActionType.update, index: col, property: 'type', value: val })}
dispatchClauses={dispatchClauses}
loading={loading}
index={index}
propertiesAsArray={propertiesAsArray}
hasMultipleClauses={clauses.length > 1}
/>

<div className='spacer' />
</>
)
})}
</>)
{clauses.map((clause, index) => (
<React.Fragment key={index}>
<EntityClause
clause={clause}
setAttribute={(col, val) => dispatchClauses({
type: ClauseActionType.update,
index: col,
property: 'attribute',
value: {
id: (val.value as any)?.id,
label: val.label,
value: val.value // Preserve full metadata
}
})}
setComparator={(col, val) => dispatchClauses({
type: ClauseActionType.update,
index: col,
property: 'comparator',
value: {
id: (val.value as any)?.id || (val.value as any)?.i,
label: val.label || (val.value as any)?.l
}
})}
setComparedValue={(col, val) => dispatchClauses({
type: ClauseActionType.update,
index: col,
property: 'comparedValue',
value: {
value: typeof val.value === 'object' && val.value !== null
? (val.value as any).id || val.value
: val.value
}
})}
setComparedString={(col, val) => dispatchClauses({
type: ClauseActionType.update,
index: col,
property: 'comparedString',
value: val
})}
setClauseType={(col, val) => dispatchClauses({
type: ClauseActionType.update,
index: col,
property: 'type',
value: val
})}
dispatchClauses={dispatchClauses}
loading={loading}
index={index}
propertiesAsArray={propertiesAsArray}
hasMultipleClauses={clauses.length > 1}
/>
<div className='spacer' />
</React.Fragment>
))}
</>
)
};