Harmonizes the design of initiatives search in FO#6090
Harmonizes the design of initiatives search in FO#6090jesusdb merged 10 commits intodecidim:developfrom
Conversation
|
@carolromero you can check this out on https://osp-decidim.dev.aspgems.com/initiatives |
|
@virgile-dev I'm not so sure about this one. I understand that there are different "levels" or categories of status:
So it seems to me that this change in the filters can be confusing. I don't have a clear solution, a priori I think it's better to leave only the upper level (as it is now), although maybe we can think of some alternative. Thoughts? cc @decidim/product |
|
Hello @carolromero
|
|
@virgile-dev sorry I'm late! Thank you for clarifying, sometimes I mess myself up with so many options 😬
@virgile-dev @ace what do you say? Do you think we can make that change? 🙏 |
|
@carolromero sure we can change the translations. Just to be clear you want us to change |
@virgile-dev that's right, to be consistent, yes. thanks! |
|
@ace could you apply the changes in locales that carol requested ? Thanks in advance ! |
|
@carolromero @virgile-dev The changes are on https://osp-decidim.dev.aspgems.com if you want to check them. |
|
Hi @ace, could you please check the remaining failing test? |
|
Hi @jesusdb. I think I need some guidance here. I saw that test, but it shouldn't be failing. It's complaining about unused l18n keys that are if fact used. |
Let me chime in here, this is a problem that comes back from time to time. You can force the identification of i18n keys by creating a comment somewhere in the code. For instance: # i18n-tasks-use t('decidim.admin.exports.formats.JSON')There's also the possibility to edit the |
|
Thanks @microstudi, those comments fixed the missing keys issue. Now it's complaining about a non-normalized locale file in the proposals module, should that be fixed here? |
Just do what the test says and it will fix it: |
|
Yeah, I did that but found out the offending file doesn't belong to this PR (not even the initiatives module, it's from proposals), that's why I'm not sure about fixing it here. |
|
Maybe it is related with the fact that some keys used in initiatives where moved to proposals recently (because they were used un both). Can you check what is changed by the i18n task? |
|
I'll recheck when I can get back to this branch, dealing with that nil in the other one :) |
|
Actually, I made the PR with the change, check this: #6013 |
|
@jesusdb could you check if can merge this now ? Thanks ! |
|
Could you check the changelog conflict, please? We're currently looking on a way to automate and fix the changelog conflicts to avoid these situations |
|
Done. That automation would be great, I can't remember how many times I've had this conflict in the last days :) |
|
Yes, it's a pain... This will change at the next version. PR won't have to deal with changelog anymore |
|
It seems coverage upload timed out, can you re-run? |
* feature/add_areas_to_initiatives: (30 commits) Adds areas to FO filters Fix lint issue Fixes rubocop issues Updates changelog Adds areas to initiatives Send notification when signature threshold reached (decidim#6098) Adds filter by initiative type to admin panel (decidim#6093) Require confirmation on exiting a survey mid-answering (decidim#6118) Information message when there isn't any Proposal (decidim#6063) Set email asset host dynamically (decidim#5888) Harmonizes the design of initiatives search in FO (decidim#6090) Include year in meetings card (decidim#6102) Add attachment enabled option to initiative types and initiatives (decidim#6036) Fix a flaky test in group profile conversations (decidim#6123) Add attachments to Initiatives (decidim#5844) Add initiatives export (decidim#6070) Improvements to conversations with more than one participant (decidim#6094) Elections module and election administration (decidim#6065) Separate forms in steps (decidim#6108) Add sorting by publishing date to initiatives (decidim#6016) ... # Conflicts: # decidim-initiatives/app/cells/decidim/initiatives/initiative_m_cell.rb # decidim-initiatives/app/commands/decidim/initiatives/admin/update_initiative.rb # decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb # decidim-initiatives/app/forms/decidim/initiatives/admin/initiative_form.rb # decidim-initiatives/app/helpers/decidim/initiatives/application_helper.rb # decidim-initiatives/app/models/decidim/initiative.rb # decidim-initiatives/app/services/decidim/initiatives/initiative_search.rb # decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb # decidim-initiatives/app/views/decidim/initiatives/initiatives/_filters.html.erb # decidim-initiatives/app/views/decidim/initiatives/initiatives/_tags.html.erb # decidim-initiatives/config/locales/en.yml # decidim-initiatives/db/migrate/20200514085422_add_area_to_initiatives.rb # decidim-initiatives/db/migrate/20200514102631_add_area_enabled_option_to_initiatives.rb # decidim-initiatives/spec/forms/initiative_form_spec.rb # decidim-initiatives/spec/services/decidim/initiatives/initiative_search_spec.rb # decidim-initiatives/spec/shared/update_initiative_type_example.rb # decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb # decidim-initiatives/spec/system/admin/initiative_types_controller_spec.rb # decidim-initiatives/spec/system/filter_initiatives_spec.rb
* develop: Send notification when signature threshold reached (decidim#6098) Adds filter by initiative type to admin panel (decidim#6093) Require confirmation on exiting a survey mid-answering (decidim#6118) Information message when there isn't any Proposal (decidim#6063) Set email asset host dynamically (decidim#5888) Harmonizes the design of initiatives search in FO (decidim#6090)
* Harmonizes the design of initiatives search in FO * Updates changelog * Removes unused i18n keys * Changes 'accepted/rejected' state texts to 'enough/not enough sigantures' * Fixes specs for label changes * Adds I18n keys in comment to avoid being detected as unused * Removes unused I18n keys


🎩 What? Why?
Adapt initiatives search filters to the recent design used in proposals.
📌 Related Issues
📋 Subtasks
CHANGELOGentry📷 Screenshots (optional)