Skip to content

Add Meetings Content Block in Process Groups#6824

Closed
entantoencuanto wants to merge 53 commits intodevelopfrom
feature/process_groups_improvements-meetings_content_block
Closed

Add Meetings Content Block in Process Groups#6824
entantoencuanto wants to merge 53 commits intodevelopfrom
feature/process_groups_improvements-meetings_content_block

Conversation

@entantoencuanto
Copy link
Copy Markdown
Contributor

@entantoencuanto entantoencuanto commented Nov 6, 2020

🎩 What? Why?

  • Defines a highligted next meetings content block in decidim-meetings
  • Registers this block in participatory process groups landing page
  • Adds some system tests in participatory process group landing page

Note: This PR is built on top of feature/process_groups_improvements-html_content_blocks, the branch of #6823 PR.

📌 Related Issues

Link your PR to an issue

Testing

Enable the content block in a group landing page

📋 Checklist

🚨 Please review the guidelines for contributing to this repository.

  • ❓ CONSIDER adding a unit test if your PR resolves an issue.
  • ✔️ DO check open PR's to avoid duplicates.
  • ✔️ DO keep pull requests small so they can be easily reviewed.
  • ✔️ DO build locally before pushing.
  • ✔️ DO make sure tests pass.
  • ✔️ DO make sure any new changes are documented in docs/.
  • ✔️ DO add and modify seeds if necessary.
  • ✔️ DO add CHANGELOG upgrade notes if required.
  • ✔️ DO add to GraphQL API if there are new public fields.
  • ✔️ DO add link to MetaDecidim if it's a new feature.
  • ❌AVOID breaking the continuous integration build.
  • ❌AVOID making significant changes to the overall architecture.

📷 Screenshots

Please add screenshots of the changes you're proposing
Description

♥️ Thank you!

@entantoencuanto entantoencuanto mentioned this pull request Nov 6, 2020
Closed
12 tasks
@entantoencuanto entantoencuanto force-pushed the feature/process_groups_improvements-meetings_content_block branch from 3f7c6a1 to 2118484 Compare November 10, 2020 16:06
qlty-cloud-legacy[bot]
qlty-cloud-legacy bot reviewed Nov 10, 2020
View reviewed changes
decidim-core/app/assets/stylesheets/decidim/modules/_cards.scss Outdated
border-right: $card-border;
border-right: 0;
border-bottom: $card-border;

Copy link
Copy Markdown

@qlty-cloud-legacy qlty-cloud-legacy bot Nov 10, 2020

Choose a reason for hiding this comment

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

Don't leave trailing whitespace

decidim-core/app/assets/stylesheets/decidim/modules/_cards.scss Outdated
border-right: $card-border;
border-right: 0;
border-bottom: $card-border;

Copy link
Copy Markdown

@qlty-cloud-legacy qlty-cloud-legacy bot Nov 10, 2020

Choose a reason for hiding this comment

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

Unexpected whitespace at end of line (no-eol-whitespace)

@entantoencuanto entantoencuanto force-pushed the feature/process_groups_improvements-meetings_content_block branch from 2118484 to d2f5d96 Compare November 11, 2020 16:35
@entantoencuanto entantoencuanto marked this pull request as ready for review November 16, 2020 12:38
@andreslucena andreslucena changed the title Feature/process groups improvements meetings content block Add Meetings Content Block in Process Groups Nov 17, 2020
@entantoencuanto
Add migration to add a hashtag column to decidim_participatory_proces…
c75f95c 
…s_groups table
@entantoencuanto
Add factories and admin management from admin of groups hashtag
0e41cbe
@entantoencuanto
Add migration to include metadata columns in decicim_participatory_pr…
7fc382f 
…ocess_groups table
@entantoencuanto
Add factories and admin management from admin of groups metadata
5673fab 
The hashtag attribute has been moved to the metadata section in admin
form
@entantoencuanto
Add validation to group_url participatory process group form attribute
b581c56
@entantoencuanto
Change participatory_process_group homepage to display only content b…
cf14edf 
…locks
@entantoencuanto
Create and register title content block for groups homepage
c39be4b 
This content block contains title, description, number of participatory
processes and hashtag, external url and meta scope if present
@entantoencuanto
Add html content block and remove hero
acb4ddb
@entantoencuanto
Improve meta_scope obtaining in title cell
d92e2b0
@entantoencuanto
Avoid errors if group hashtag is nil
000200c
@entantoencuanto
Get resource in groups title_cell from model scoped_resource_id inste…
975af20 
…ad of controller
@entantoencuanto
Add title content block for groups cell tests
ca2e26e
@entantoencuanto
Add migration to change groups name column and serialized data in ver…
d952497 
…sions
@entantoencuanto
Replace references to name with title in participatory process groups
e433a08
@entantoencuanto
Update participatory process groups system test to check title block
b6efc87
@entantoencuanto
Add metadata content block cell to decidim-participatory_processes
10aabc8
@entantoencuanto
Register metadata content block in participatory process groups landi…
d009375 
…ng page
@entantoencuanto
Add system tests for metadata content block in participatory process …
b225157 
…groups landing page
@entantoencuanto
Remove no longer used proposals view hook for process groups
fd1e5de
@entantoencuanto
Remove no longer used accountability results view hook for process gr…
981e520 
…oups
@entantoencuanto
Remove no longer used meetings view hook for process groups
898b8de
@entantoencuanto
Fix translations issues
f8bfd16
@entantoencuanto
Fix rubocop offenses
ca44ff8
@entantoencuanto entantoencuanto force-pushed the feature/process_groups_improvements-meetings_content_block branch from 0d0d40d to ed470ee Compare November 30, 2020 14:46
@entantoencuanto
Add test for cta content block settings admin
685f677
@entantoencuanto
Add order_by_most_recent scope to proposals and results models
25843fc
@entantoencuanto
Add highlighted_proposals content block to decidim-proposals
a9ed4c1 
The content block cell is inherited from a generic content block which
is going to be used with other kind of resources.
@entantoencuanto
Add highlighted_results content block to decidim-accountability
ed21f76
@entantoencuanto
Add highlighted proposals and results content blocks to groups homepage
0d4f7cd
@entantoencuanto
Define m size card for accountability results
6378dd0
@entantoencuanto
Avoid errors on accountability breadcrumb helper
8ff19d7 
When query params are built with the methods provided by the
decidim/tags cell the category is passed within an array and this
generates an exception in the breadcrumb helper
@entantoencuanto
Add cell tests for result cards
01460e5
@entantoencuanto
Use m card to display results in highlighted results content block
8098aa1
@entantoencuanto
Add system tests for proposals and results content blocks in groups l…
b53c178 
…anding page
@entantoencuanto
Remove results count from proposals content block
7d08985
@entantoencuanto
Display participatory space class name in singular in card_m top
4956861
@entantoencuanto
Add module part to ResultsController class in admin
39fca4a
@entantoencuanto
Remove unused method
53b3db2
@entantoencuanto
Add 3 HTML content blocks to groups homepage
30305e9
@entantoencuanto
Define html content block for process groups homepage
4484bb3 
This block is inherited from the content block defined for the
organization homepage but content is wrapped with different
class section and a different id based on the manifest of the
block
@entantoencuanto
Add system test to check html block in groups landing page
dff59d3
@entantoencuanto
Define highlighted_list_item meeting card based on s size
1cbe80d
@entantoencuanto
Add highlighted_meetings content block to decidim-meetings
bd520f6
@entantoencuanto
Register highlighted_meetings content block in participatory process …
b5c3356 
…groups homepage
@entantoencuanto
Add system test for meetings content block in groups landing page
6a97d23
@entantoencuanto entantoencuanto force-pushed the feature/process_groups_improvements-meetings_content_block branch from ed470ee to 6a97d23 Compare November 30, 2020 19:10
@entantoencuanto
Merge branch 'develop' into feature/process_groups_improvements-meeti…
844f4cd 
…ngs_content_block

* develop: (22 commits)
  Fix email CTA alignment on Outlook and Windows Mail (#6895)
  Fix mailer meeting registration invitation using path instead of URL (#6965)
  Fix the data portability exporter when zip is not in the gemfile (#6969)
  Convert technical docs to Antora (#6526)
  New Crowdin updates (#6957)
  Bugfix - moderated meetings are displayed in the meetings index page  (#6927)
  Add HTML Content Blocks in Process Groups  (#6823)
  Prevent error in view due to optional html not showing (#6942)
  Improve layout for standalone T&C page (#6944)
  chore: move rubocop ruby config to own file (#6952)
  Fix some strings (#6958)
  Fix newsletter html containing style tag content (#6876)
  New Crowdin updates (#6945)
  New Crowdin updates (#6926)
  Localize a string in conference speaker (#6866)
  Fix broken dashboard action logs under certain conditions (#6857)
  Fix traceability logs with invalid record (#6879)
  Allow user to drag address on proposal map (#6291)
  New Crowdin updates (#6898)
  Update release notes documentation (#6809)
  ...
@entantoencuanto entantoencuanto mentioned this pull request Dec 3, 2020
Closed
12 tasks
@tramuntanal
Copy link
Copy Markdown
Contributor

tramuntanal commented Dec 4, 2020

@entantoencuanto conflicts arised, can you solve them please?

@tramuntanal
Copy link
Copy Markdown
Contributor

tramuntanal commented Dec 4, 2020

@entantoencuanto as commented here and as #6826 has already been merged, this PR can be closed

@tramuntanal tramuntanal closed this Dec 4, 2020
@tramuntanal tramuntanal deleted the feature/process_groups_improvements-meetings_content_block branch December 4, 2020 07:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@qlty-cloud-legacy qlty-cloud-legacy[bot] qlty-cloud-legacy[bot] 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.

See next meetings of a Process Group

3 participants

@entantoencuanto @tramuntanal @Leusev