Skip to content

Add Metadata Content Block in Process Groups#6699

Merged
tramuntanal merged 29 commits intodevelopfrom
feature/process_groups_improvements-metadata_title_content_block
Dec 3, 2020
Merged

Add Metadata Content Block in Process Groups#6699
tramuntanal merged 29 commits intodevelopfrom
feature/process_groups_improvements-metadata_title_content_block

Conversation

@entantoencuanto
Copy link
Copy Markdown
Contributor

@entantoencuanto entantoencuanto commented Oct 16, 2020 •
edited
Loading

🎩 What? Why?

This PR:

  • Adds some metadata attributes to participatory process groups and updates the admin panel to manage them as described in Add Metadata in Process Groups #6474
  • Defines a new content block containing title description and part of metadata if present (Add title, description and Hashtag in Process Groups #6472)
  • Renames the column name with title in participatory process groups table and changes accordingly all translations, references in code and serialized data used by PaperTrail versions (included in the migration)
  • Adds some tests for the title cell
  • Removes not longer used view hooks for processess groups

📌 Related Issues

Link your PR to an issue

Testing

Describe the best way to test or validate your PR.

📋 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 force-pushed the feature/process_groups_improvements-metadata_title_content_block branch 5 times, most recently from 7008b20 to 5aba00f Compare October 23, 2020 21:01
@entantoencuanto entantoencuanto force-pushed the feature/process_groups_improvements-metadata_title_content_block branch from 5aba00f to de14187 Compare November 4, 2020 12:27
@entantoencuanto entantoencuanto mentioned this pull request Nov 6, 2020
Closed
12 tasks
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-metadata_title_content_block branch from 0a3f8f6 to 1a79a3f Compare November 10, 2020 16:04
@entantoencuanto entantoencuanto marked this pull request as ready for review November 16, 2020 11:21
@andreslucena andreslucena changed the title Feature/process groups improvements metadata title content block Add Metadata Content Block in Process Groups Nov 18, 2020
@entantoencuanto
Copy link
Copy Markdown
Contributor Author

entantoencuanto commented Nov 24, 2020

I'm going to resolve conflicts and notify you when ready

@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 entantoencuanto force-pushed the feature/process_groups_improvements-metadata_title_content_block branch from be6750d to 5908fb6 Compare November 24, 2020 12:40
@entantoencuanto entantoencuanto force-pushed the feature/process_groups_improvements-metadata_title_content_block branch from 5908fb6 to 9ced8c3 Compare November 24, 2020 14:14
@entantoencuanto
Copy link
Copy Markdown
Contributor Author

entantoencuanto commented Nov 24, 2020 •
edited
Loading

Hi, @tramuntanal, the PR is ready for review, I've rebuilt the PR rebased on develop removing changes in :es and :ca languages

@tramuntanal tramuntanal self-assigned this Nov 25, 2020
tramuntanal
tramuntanal previously approved these changes Nov 25, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@tramuntanal tramuntanal left a comment

Choose a reason for hiding this comment

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

LGTM!

@tramuntanal
Copy link
Copy Markdown
Contributor

tramuntanal commented Nov 25, 2020

Hi @decidim/product I see this PR is related to #6472, which has been approved, and #6474, which is pending approval.
We're waiting to merge until both issues are in Technical Review.

@tramuntanal
Copy link
Copy Markdown
Contributor

tramuntanal commented Dec 2, 2020

@decidim/product can you confirm this PR can be reviewed and merged?

@entantoencuanto can you solve conflicts meanwhile?

@entantoencuanto
Copy link
Copy Markdown
Contributor Author

entantoencuanto commented Dec 2, 2020

Well, actually the changes introduced by this PR are included in the recently merged PR #6823. The branch of each PR is built on top of the previous one. I'm sorry if it's an inconvenient, some branches have dependencies on the others.

@carolromero
Copy link
Copy Markdown
Member

carolromero commented Dec 3, 2020

@tramuntanal this is now ready for review and merge. Thank you

@tramuntanal
Copy link
Copy Markdown
Contributor

tramuntanal commented Dec 3, 2020

Thanks @carolromero for confirming everything is ok

@tramuntanal tramuntanal merged commit 7f2571e into develop Dec 3, 2020
@tramuntanal tramuntanal deleted the feature/process_groups_improvements-metadata_title_content_block branch December 3, 2020 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@qlty-cloud-legacy qlty-cloud-legacy[bot] qlty-cloud-legacy[bot] left review comments

@tramuntanal tramuntanal tramuntanal approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@tramuntanal tramuntanal

Labels

in-review module: participatory processes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Add Metadata in Process Groups Add title, description and Hashtag in Process Groups

5 participants

@entantoencuanto @tramuntanal @carolromero @mrcasals @Leusev