Skip to content

Add sorting by publishing date to initiatives#6016

Merged
jesusdb merged 7 commits intodecidim:developfrom
aspgems:feature/sort_initiatives_by_publishing_date
May 25, 2020
Merged

Add sorting by publishing date to initiatives#6016
jesusdb merged 7 commits intodecidim:developfrom
aspgems:feature/sort_initiatives_by_publishing_date

Conversation

@ace
Copy link
Copy Markdown
Contributor

@ace ace commented Apr 23, 2020 •
edited
Loading

🎩 What? Why?

Enable users and admins to sort initiatives by publishing date

📋 Subtasks

  • Add CHANGELOG entry
  • Add tests

Related metadecidim proposal: https://meta.decidim.org/processes/roadmap/f/122/proposals/15131

@ace ace marked this pull request as ready for review April 24, 2020 06:35
@ace ace mentioned this pull request Apr 24, 2020
Closed
3 tasks
@virgile-dev
Copy link
Copy Markdown
Contributor

virgile-dev commented Apr 27, 2020

Hello, @tramuntanal @carolromero this ready to be reviewed and merged :)

@carolromero
Copy link
Copy Markdown
Member

carolromero commented Apr 30, 2020

@virgile-dev checked on my side ✔️ I'm looking forward to seeing all the improvements on initiatives in production 😍

@virgile-dev
Copy link
Copy Markdown
Contributor

virgile-dev commented May 13, 2020

Hello @tramuntanal !
This is approved by product. Could you see to merge it ?

tramuntanal
tramuntanal previously approved these changes May 15, 2020
View reviewed changes
@tramuntanal
Copy link
Copy Markdown
Contributor

tramuntanal commented May 15, 2020

I've re-run many CI jobs that were stale to see if all tests succeed.
By the way @decidim/product , this PR also adds sorting by supports_count, I guess it is also interesting.

@carolromero
Copy link
Copy Markdown
Member

carolromero commented May 15, 2020

By the way @decidim/product , this PR also adds sorting by supports_count, I guess it is also interesting.

Thank you for letting us know @tramuntanal! We saw it on the staging env but I didn't know it was included in the PR, it's ok to add that option, yes

@ace
Copy link
Copy Markdown
Contributor Author

ace commented May 15, 2020 •
edited
Loading

I've re-run many CI jobs that were stale to see if all tests succeed.

Thanks @tramuntanal. That seems to be a pattern in all my PRs :(
Do you want to check anything before I resolve the conflicts (and CI runs once again?).

By the way @decidim/product , this PR also adds sorting by supports_count, I guess it is also interesting.

I forgot to add that to the PR description, my bad.

@tramuntanal
Copy link
Copy Markdown
Contributor

tramuntanal commented May 15, 2020

hi @ace , no worries.
Thanks for your fast response. Can you review the codecov/patch check please?
If you check the diff (https://codecov.io/gh/decidim/decidim/compare/f9112d322189a50678cb13213a7bc3648a460f4b...4d7b4343c095103ca9d8f0ee63c3eba2fcd0944f/diff) you'll see a couple of methods that need to be tested. You can ignore the `codecov/project' as it is not specific for this PR.

@ace
Copy link
Copy Markdown
Contributor Author

ace commented May 15, 2020

Hi @tramuntanal.
I'm not sure what is pending (also not sure I fully understand that diff :P).
It shows the code changes for the recently_published and supports_count search options, but those have specs in place. Maybe I'm missreading the diff or its colors or its meaning. Is there anything I'm missing?
Sometimes I have the feeling codecov tasks may be timing out before the actual specs end and showing inaccurate results, may that be the case?

@virgile-dev
Copy link
Copy Markdown
Contributor

virgile-dev commented May 22, 2020

@microstudi or @Leusev could you point us out what we need to do so we can merge this ?

@microstudi
Copy link
Copy Markdown
Contributor

microstudi commented May 22, 2020

@virgile-dev @ace I'll try to figure it out your question. Meanwhile, do you care to rebase develop in here?

@ace ace force-pushed the feature/sort_initiatives_by_publishing_date branch from 4d7b434 to 2449e3b Compare May 22, 2020 11:56
@ace
Copy link
Copy Markdown
Contributor Author

ace commented May 22, 2020

Done

@jesusdb
Copy link
Copy Markdown
Contributor

jesusdb commented May 25, 2020

Hi @ace, could you please check the conflicting files?

@jesusdb jesusdb self-requested a review May 25, 2020 11:02
jesusdb
jesusdb approved these changes May 25, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@jesusdb jesusdb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks good to me!

@jesusdb jesusdb merged commit 6069a77 into decidim:develop May 25, 2020
@ace ace deleted the feature/sort_initiatives_by_publishing_date branch May 26, 2020 09:43
ace pushed a commit to aspgems/decidim that referenced this pull request May 27, 2020
Merge branch 'develop' into feature/initiatives-signature-gauge
1d90f06 
* develop:
  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)
  Improve proposal preview: Use proposal card when previewing a proposal draft (decidim#6064)
  Newsletter templates fixes (decidim#6096)

# Conflicts:
#	decidim-initiatives/app/models/decidim/initiative.rb
#	decidim-initiatives/spec/system/admin/initiative_types_controller_spec.rb
ace pushed a commit to aspgems/decidim that referenced this pull request May 28, 2020
Merge branch 'feature/add_areas_to_initiatives' into deploy
cb2252c 
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@jesusdb jesusdb jesusdb approved these changes

@tramuntanal tramuntanal tramuntanal left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@ace @virgile-dev @carolromero @tramuntanal @microstudi @jesusdb