🐛 Build correct event filter for appeal and tags #245
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
arcalinea
temporarily deployed
to
fix-appeal-filter - ozone-staging PR #245
Render
Destroyed
foysalit
commented
Nov 21, 2024
| @@ -10,7 +10,7 @@ const EMPTY_ARR = [] | |||
| export const LabelSelector = (props: LabelsProps) => { | |||
| const { | |||
| id, | |||
| formId, | |||
| form, | |||
There was a problem hiding this comment.
just cleaning these up.
matthieusieben
approved these changes
Nov 22, 2024
Comment on lines
376
to
389
| if (!tagTypes.includes(type)) { | ||
| return { add, remove } | ||
| } | ||
|
|
||
| tagTypes.forEach((key) => { | ||
| if (type === key) { | ||
| if (TagBasedTypeFilters[key].add) { | ||
| add.push(TagBasedTypeFilters[key].add) | ||
| } | ||
| if (TagBasedTypeFilters[key].remove) { | ||
| remove.push(TagBasedTypeFilters[key].remove) | ||
| } | ||
| } | ||
| }) |
There was a problem hiding this comment.
Looks like that iteration is not really needed:
Suggested change
| if (!tagTypes.includes(type)) { | |
| return { add, remove } | |
| } | |
| tagTypes.forEach((key) => { | |
| if (type === key) { | |
| if (TagBasedTypeFilters[key].add) { | |
| add.push(TagBasedTypeFilters[key].add) | |
| } | |
| if (TagBasedTypeFilters[key].remove) { | |
| remove.push(TagBasedTypeFilters[key].remove) | |
| } | |
| } | |
| }) | |
| if (type in tagTypes && Object.hasOwn(tagTypes, type)) { | |
| if (TagBasedTypeFilters[type].add) { | |
| add.push(TagBasedTypeFilters[type].add) | |
| } | |
| if (TagBasedTypeFilters[type].remove) { | |
| remove.push(TagBasedTypeFilters[type].remove) | |
| } | |
| } |
Note that Object.hasOwn is not needed if the object is created using __proto__: null
Comment on lines
+358
to
+369
| const TagBasedTypeFilters = { | ||
| [MOD_EVENTS.DISABLE_DMS]: { add: DM_DISABLE_TAG, remove: '' }, | ||
| [MOD_EVENTS.ENABLE_DMS]: { remove: DM_DISABLE_TAG, add: '' }, | ||
| [MOD_EVENTS.DISABLE_VIDEO_UPLOAD]: { | ||
| add: VIDEO_UPLOAD_DISABLE_TAG, | ||
| remove: '', | ||
| }, | ||
| [MOD_EVENTS.ENABLE_VIDEO_UPLOAD]: { | ||
| remove: VIDEO_UPLOAD_DISABLE_TAG, | ||
| add: '', | ||
| }, | ||
| } |
There was a problem hiding this comment.
Using objects as a map is not ideal in javascript (because TagBasedTypeFilters['toString'] will be there and might cause abuse). You can make it safer by using a Map (best) or by removing the inheritance of Object.prototype like so (technically safe but funkier in terms of maintainability):
Suggested change
| const TagBasedTypeFilters = { | |
| [MOD_EVENTS.DISABLE_DMS]: { add: DM_DISABLE_TAG, remove: '' }, | |
| [MOD_EVENTS.ENABLE_DMS]: { remove: DM_DISABLE_TAG, add: '' }, | |
| [MOD_EVENTS.DISABLE_VIDEO_UPLOAD]: { | |
| add: VIDEO_UPLOAD_DISABLE_TAG, | |
| remove: '', | |
| }, | |
| [MOD_EVENTS.ENABLE_VIDEO_UPLOAD]: { | |
| remove: VIDEO_UPLOAD_DISABLE_TAG, | |
| add: '', | |
| }, | |
| } | |
| const TagBasedTypeFilters = { | |
| __proto__: null, // Allows safely using this as a "hashmap" | |
| [MOD_EVENTS.DISABLE_DMS]: { add: DM_DISABLE_TAG, remove: '' }, | |
| [MOD_EVENTS.ENABLE_DMS]: { remove: DM_DISABLE_TAG, add: '' }, | |
| [MOD_EVENTS.DISABLE_VIDEO_UPLOAD]: { | |
| add: VIDEO_UPLOAD_DISABLE_TAG, | |
| remove: '', | |
| }, | |
| [MOD_EVENTS.ENABLE_VIDEO_UPLOAD]: { | |
| remove: VIDEO_UPLOAD_DISABLE_TAG, | |
| add: '', | |
| }, | |
| } |
There was a problem hiding this comment.
hmm... agreed maps are better but not convinced we should be worried about this type of "abuse" in this context.
Comment on lines
231
to
233
| if (!queryParams.reportTypes) { | ||
| queryParams.reportTypes = [] | ||
| } |
There was a problem hiding this comment.
Nit: I personnaly like using the following notation.
Suggested change
| if (!queryParams.reportTypes) { | |
| queryParams.reportTypes = [] | |
| } | |
| queryParams.reportTypes ||= [] |
Comment on lines
+242
to
+246
| if (queryParams.addedTags) { | ||
| queryParams.addedTags.push(...add) | ||
| } else { | ||
| queryParams.addedTags = add | ||
| } |
There was a problem hiding this comment.
Nit: the ||= notation make things easier to read imo
Suggested change
| if (queryParams.addedTags) { | |
| queryParams.addedTags.push(...add) | |
| } else { | |
| queryParams.addedTags = add | |
| } | |
| queryParams.addedTags ||= [] | |
| queryParams.addedTags.push(...add) |
arcalinea
temporarily deployed
to
fix-appeal-filter - ozone-staging PR #245
Render
Destroyed
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.
This PR fixed event filters so that tag based events and appeal event filter work correctly. These are pseudo event types so there's no 1-to-1 mapping for these and the actual filter need to be built manually.