Fixes #37987 - Filters dont inherit taxonomy on creation #10370
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
MariaAga
force-pushed
the
roles-taxonomy-on-create
branch
from
baf4134
to
f46f2a5
Compare
adamruzicka
reviewed
Nov 7, 2024
app/models/filter.rb
Outdated
| build_taxonomy_search | ||
| build_taxonomy_search_from_ids |
There was a problem hiding this comment.
Would keeping this and changing L198 in the new diff to use map instead of pluck help?
There was a problem hiding this comment.
Changing just build_taxonomy_search seem to work as well for create and edit filter
MariaAga
force-pushed
the
roles-taxonomy-on-create
branch
from
f46f2a5
to
319787a
Compare
MariaAga
force-pushed
the
roles-taxonomy-on-create
branch
from
319787a
to
e2698dc
Compare
ofedoren
reviewed
Nov 15, 2024
| filters = Filter.where(role_id: Role.where(origin: nil).or(Role.where(builtin: 2))).where(override: false).where(taxonomy_search: nil) | ||
|
|
||
| filters.each do |filter| | ||
| filter.build_taxonomy_search_from_ids |
There was a problem hiding this comment.
Suggested change
| filter.build_taxonomy_search_from_ids | |
| filter.build_taxonomy_search |
| location_test = FactoryBot.create(:location) | ||
| f.role = FactoryBot.create(:role, :organizations => [organization_test], :locations => [location_test]) | ||
| f.save | ||
| assert_equal f.taxonomy_search(), "(organization_id ^ (#{organization_test.id})) and (location_id ^ (#{location_test.id}))" |
There was a problem hiding this comment.
Suggested change
| assert_equal f.taxonomy_search(), "(organization_id ^ (#{organization_test.id})) and (location_id ^ (#{location_test.id}))" | |
| assert_equal f.taxonomy_search, "(organization_id ^ (#{organization_test.id})) and (location_id ^ (#{location_test.id}))" |
| @@ -29,7 +29,7 @@ const NewFiltersFormPage = ({ location: { search }, history }) => { | |||
| isNew | |||
| roleName={roleName || ''} | |||
| roleId={urlRoleId} | |||
| data={{}} | |||
| data={{ locations, organizations }} | |||
There was a problem hiding this comment.
Does
data.organizations?.map(o => o.id) || []mean it would always be [] since taxonomies weren't passed within data before your patch?..
There was a problem hiding this comment.
This is the new page, in the edit page we have data={response}
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.
To test:
before the pr: no taxonomy_search in the DB, and the filter is marked as unlimited
Added a migration to regenerate the taxonomy_search field of all filters which have override set to false to make them honor the organizations and locations set on the role.
Added a ui block on the unlimited checkbox if there are taxonomies in place.
Fixed "build_taxonomy_search" as it relayed on
locations, but on creation there are onlylocation_ids. Before this pr the workaround would be to edit and submit the filter (with no changes) since on editlocationsare already populated