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

sub_query Smart Search filter crashes if org has no smart searches yet. #1699

Merged
merged 1 commit into from
Dec 14, 2023
Merged

sub_query Smart Search filter crashes if org has no smart searches yet. #1699

Show file tree
Hide file tree
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
268 changes: 138 additions & 130 deletions src/features/smartSearch/components/filters/SubQuery/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,143 +127,151 @@ const SubQuery = ({
<Msg id={localMessageIds.examples.two} />
</>
)}
renderSentence={() => (
<Msg
id={localMessageIds.inputString}
values={{
addRemoveSelect: (
<StyledSelect
onChange={(e) => setOp(e.target.value as OPERATION)}
value={filter.op}
>
{Object.values(OPERATION).map((o) => (
<MenuItem key={o} value={o}>
<Msg id={messageIds.operators[o]} />
renderSentence={() =>
queries.length == 0 ? (
<Msg id={messageIds.filters.subQuery.noSmartSearches} />
) : (
Comment on lines +131 to +133
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens when there are no standalone smart search queries (queries) but there are call assignments?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This filter already takes callassignments into consideration, the queries variable here is an array made up of standalone queries, call assignment target queries, and call assignment "done" queries:
bild

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I went looking for it but clearly not thoroughly enough. Thanks for clarifying!

<Msg
id={localMessageIds.inputString}
values={{
addRemoveSelect: (
<StyledSelect
onChange={(e) => setOp(e.target.value as OPERATION)}
value={filter.op}
>
{Object.values(OPERATION).map((o) => (
<MenuItem key={o} value={o}>
<Msg id={messageIds.operators[o]} />
</MenuItem>
))}
</StyledSelect>
),
matchSelect: (
<StyledSelect
onChange={(e) =>
handleMatchOperatorChange(e.target.value as IN_OPERATOR)
}
value={operator || IN_OPERATOR.IN}
>
<MenuItem key={IN_OPERATOR.IN} value={IN_OPERATOR.IN}>
<Msg id={messageIds.filters.subQuery.matchSelect.in} />
</MenuItem>
))}
</StyledSelect>
),
matchSelect: (
<StyledSelect
onChange={(e) =>
handleMatchOperatorChange(e.target.value as IN_OPERATOR)
}
value={operator || IN_OPERATOR.IN}
>
<MenuItem key={IN_OPERATOR.IN} value={IN_OPERATOR.IN}>
<Msg id={messageIds.filters.subQuery.matchSelect.in} />
</MenuItem>
<MenuItem key={IN_OPERATOR.NOTIN} value={IN_OPERATOR.NOTIN}>
<Msg id={messageIds.filters.subQuery.matchSelect.notin} />
</MenuItem>
</StyledSelect>
),
query: !selectedQuery ? (
<Msg
id={localMessageIds.query.edit.none}
values={{
querySelect: (
<StyledSelect
SelectProps={{
renderValue: function getLabel() {
return (
<Msg id={localMessageIds.query.selectLabel.none} />
);
},
}}
value={NO_QUERY_SELECTED}
>
<MenuItem
key={NO_QUERY_SELECTED}
<MenuItem key={IN_OPERATOR.NOTIN} value={IN_OPERATOR.NOTIN}>
<Msg id={messageIds.filters.subQuery.matchSelect.notin} />
</MenuItem>
</StyledSelect>
),
query: !selectedQuery ? (
<Msg
id={localMessageIds.query.edit.none}
values={{
querySelect: (
<StyledSelect
SelectProps={{
renderValue: function getLabel() {
return (
<Msg
id={localMessageIds.query.selectLabel.none}
/>
);
},
}}
value={NO_QUERY_SELECTED}
>
<Msg id={localMessageIds.query.selectOptions.none} />
</MenuItem>
</StyledSelect>
),
titleSelect: <></>, // Not actually used, but required for interface consistency
}}
/>
) : (
<Msg
id={localMessageIds.query.edit[selectedQuery.type || 'none']}
values={{
querySelect: (
<StyledSelect
onChange={(e) =>
handleTypeChange(e.target.value as QUERY_TYPE)
}
SelectProps={{
renderValue: function getLabel(value) {
return (
<MenuItem
key={NO_QUERY_SELECTED}
value={NO_QUERY_SELECTED}
>
<Msg id={localMessageIds.query.selectOptions.none} />
</MenuItem>
</StyledSelect>
),
titleSelect: <></>, // Not actually used, but required for interface consistency
}}
/>
) : (
<Msg
id={localMessageIds.query.edit[selectedQuery.type || 'none']}
values={{
querySelect: (
<StyledSelect
onChange={(e) =>
handleTypeChange(e.target.value as QUERY_TYPE)
}
SelectProps={{
renderValue: function getLabel(value) {
return (
<Msg
id={
localMessageIds.query.selectLabel[
value as QUERY_TYPE
]
}
/>
);
},
}}
value={selectedQuery.type}
>
{standaloneQueries.length > 0 && (
<MenuItem
key={QUERY_TYPE.STANDALONE}
value={QUERY_TYPE.STANDALONE}
>
<Msg
id={
localMessageIds.query.selectLabel[
value as QUERY_TYPE
]
localMessageIds.query.selectOptions.standalone
}
/>
);
},
}}
value={selectedQuery.type}
>
{standaloneQueries.length && (
<MenuItem
key={QUERY_TYPE.STANDALONE}
value={QUERY_TYPE.STANDALONE}
>
<Msg
id={localMessageIds.query.selectOptions.standalone}
/>
</MenuItem>
)}
{targetGroupQueriesWithTitles.length && (
<MenuItem
key={QUERY_TYPE.TARGET}
value={QUERY_TYPE.TARGET}
>
<Msg
id={
localMessageIds.query.selectOptions
.callassignment_target
}
/>
</MenuItem>
)}
{purposeGroupQueriesWithTitles.length && (
<MenuItem
key={QUERY_TYPE.PURPOSE}
value={QUERY_TYPE.PURPOSE}
>
<Msg
id={
localMessageIds.query.selectOptions
.callassignment_goal
}
/>
</MenuItem>
)}
</StyledSelect>
),
titleSelect: (
<StyledSelect
onChange={(e) => handleOptionChange(+e.target.value)}
value={selectedQuery.id}
>
{renderedOptions.map((o) => (
<MenuItem key={o.id} value={o.id}>
{o.title}
</MenuItem>
))}
</StyledSelect>
),
}}
/>
),
}}
/>
)}
</MenuItem>
)}
{targetGroupQueriesWithTitles.length > 0 && (
<MenuItem
key={QUERY_TYPE.TARGET}
value={QUERY_TYPE.TARGET}
>
<Msg
id={
localMessageIds.query.selectOptions
.callassignment_target
}
/>
</MenuItem>
)}
{purposeGroupQueriesWithTitles.length > 0 && (
<MenuItem
key={QUERY_TYPE.PURPOSE}
value={QUERY_TYPE.PURPOSE}
>
<Msg
id={
localMessageIds.query.selectOptions
.callassignment_goal
}
/>
</MenuItem>
)}
</StyledSelect>
),
titleSelect: (
<StyledSelect
onChange={(e) => handleOptionChange(+e.target.value)}
value={selectedQuery.id}
>
{renderedOptions.map((o) => (
<MenuItem key={o.id} value={o.id}>
{o.title}
</MenuItem>
))}
</StyledSelect>
),
}}
/>
),
}}
/>
)
}
/>
);
};
Expand Down
3 changes: 3 additions & 0 deletions src/features/smartSearch/l10n/messageIds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,9 @@ export default makeMessages('feat.smartSearch', {
in: m('match'),
notin: m('do not match'),
},
noSmartSearches: m(
'There are no Smart Searches in this organisation yet.'
),
query: {
edit: {
callassignment_goal: m<{
Expand Down
Loading