Fixes #37987 - Filters dont inherit taxonomy on creation #10370
Conversation
MariaAga
force-pushed
the
roles-taxonomy-on-create
branch
from
baf4134 to
f46f2a5
Compare
MariaAga
force-pushed
the
roles-taxonomy-on-create
branch
2 times, most recently
from
319787a to
e2698dc
Compare
| 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.
| filter.build_taxonomy_search_from_ids | |
| filter.build_taxonomy_search |
test/models/filter_test.rb
Outdated
| 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.
| 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}
MariaAga
force-pushed
the
roles-taxonomy-on-create
branch
from
e2698dc to
1579997
Compare
|
thanks @ofedoren, updated |
|
Draft until I finish "remove taxonimoes override from filter" |
|
|
||
| <FormGroup | ||
| label={__('Locations')} | ||
| helperText={__('Taxonomies are inherited from the role')} |
There was a problem hiding this comment.
Instead of "Taxonomies are inherited...", how about adding a line like that after Organizations and Locations each? So: "Organizations are inherited..." and "Locations are inherited ...". It's two lines instead of one but I'm concerned about the term taxonomies: will everyone know that it refers to orgs and locs?
Also, looking at the web UI, due to the layout of the page (indentation) and the formatting, it might look like "Taxonomies are inherited..." relates only to Locations.
There was a problem hiding this comment.
Yeah, thats a better way, I'll change it
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