Fix desks template filter #4376
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -41,7 +41,12 @@ export class MoreTemplates extends React.PureComponent<IProps, IState> { | |||
| deskCriteria.push({[templateDesks]: {$in: [currentDeskId]}}); | |||
| } | |||
|
|
|||
| const criteria = {$or: [{$or: deskCriteria}, {user: sdApi.user.getCurrentUserId()}]}; | |||
| const criteria = { | |||
There was a problem hiding this comment.
can you use ISuperdeskQuery as here?
the logic also seems off inside criteria. I'd expect it to be
$or: [deskCriteria, {user: sdApi.user.getCurrentUserId()}]
why double $ors?
There was a problem hiding this comment.
I can't use ISuperdeskQuery, since we're working on the where filter which we don't do anything for in the ISuperdeskQuery or toElasticQuery. About the or - is because deskCriteria is an array of options.
tomaskikutis
approved these changes
Nov 14, 2023
scripts/core/query-formatting.ts
Outdated
| case '$exists': | ||
| return {terms: {exists: {[field]: value}}}; | ||
| case '$notExists': | ||
| return {terms: {must_not: {exists: {[field]: value}}}}; |
There was a problem hiding this comment.
let's remove notExists if we can do the same via $exists: false
tomaskikutis
approved these changes
Nov 14, 2023
thecalcc
merged commit 04772e9
into
superdesk:authoring-react-post-broadcasting
6 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SDESK-7085