Skip to content

Redesign: pending assemblies#10931

Merged
ferblape merged 18 commits intofeature/redesignfrom
feature/redesign-pending-assemblies
Jul 1, 2023
Merged

Redesign: pending assemblies#10931
ferblape merged 18 commits intofeature/redesignfrom
feature/redesign-pending-assemblies

Conversation

@entantoencuanto
Copy link
Copy Markdown
Contributor

@entantoencuanto entantoencuanto commented May 30, 2023 •
edited
Loading

🎩 What? Why?

This PR:

  • Adds the reference of the assembly in its landing page
  • Allows the declaration of the content blocks scope name with a resource in its registration manifest. In this way a resource like a participatory process group which is not a participatory process can be associated with the participatory_process_group_homepage scope name via manifest instead of doing it in Decidim::ContentBlocks::BaseCell in decidim-core
  • Removes the upcoming meeting metadata in assemblies card-g
  • Adds styles to parent assemblies breadcrumb

📌 Related Issues

Link your PR to an issue

Testing

Describe the best way to test or validate your PR.

📷 Screenshots

Please add screenshots of the changes you are proposing
Description

♥️ Thank you!

@entantoencuanto entantoencuanto added the project: redesign Barcelona City Council contract label May 30, 2023
@entantoencuanto entantoencuanto marked this pull request as ready for review June 8, 2023 12:30
@entantoencuanto
Merge branch 'feature/redesign' into feature/redesign-pending-assemblies
4ca15a7 
* feature/redesign: (70 commits)
  Fix failing specs
  Redesign sortitions (#10831)
  Redesign: data toggle (#10886)
  Redesign: collaborative drafts (#10729)
  Redesign: pending pages (#10944)
  Redesign: my account (#10904)
  use foundation classes instead of default html validation (#10921)
  Fix failings redesign specs
  Add gitpod support (#10641)
  Fix pipeline after #10409 (#10670)
  Upgrade webpack and other javascript libraries (#10643)
  New Crowdin updates (#10409)
  Refactor attachment title (#10103)
  Fix for exporting hidden moderated proposals (#10630)
  Fix Exception as admin on a Proposal with meeting author (#10628)
  Fix: Deleted and hidden comments are exported (#10629)
  Rename "terms and conditions" to "terms of service" (#10614)
  Upgrade Graphql to 2.0.19 and Graphql-Api to 3.0.1 (#10606)
  Standardize the format of the words "they will" (#10617)
  Fix the spec after word standardization (#10624)
  ...
@furilo
Copy link
Copy Markdown
Contributor

furilo commented Jun 16, 2023

@decidim/product we'll tackle the child assemblies breadcrumb/navigation in further PRs once we define it, so this doesn't get blocked.

@furilo furilo requested a review from a team June 16, 2023 13:43
@furilo
Copy link
Copy Markdown
Contributor

furilo commented Jun 22, 2023

@decidim/product so OK to pass it to maintainers?

carolromero
carolromero requested changes Jun 23, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@carolromero carolromero left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Hi @entantoencuanto! Just a couple of things more and we're ready:

  • In cards G, change the icon of the number of assemblies and use the one that corresponds to assemblies: ri-government-line

  • Also in g-cards fix the position of the number of assemblies so that it always appears in the same place.
    imatge

  • The last assemblies activity is not shown, maybe related to the content block? Feel free to move it to another PR if it doesn't apply to this PR.

@entantoencuanto
Allow passing multiple elements to context breadcrumb items
7f9bff9
@entantoencuanto
Add multiple levels breadcrumb on assemblies
2a52960
@entantoencuanto
Remove nav breadcrumb on assemblies
99069b8
@entantoencuanto
Add index to ids of breadcrumb dropdown buttons
ed64b38
@entantoencuanto
Merge branch 'feature/redesign' into feature/redesign-pending-assemblies
d668fe1 
* feature/redesign: (26 commits)
  Use the component name in the sidebar title (#11088)
  Redesign: layout center (#11068)
  Redesign: display only public users followings in following profile tab (#11051)
  Redesign: fix cards (#11072)
  Redesign: remove gcalendar warning (#10999)
  lock sass-embedded (#11077)
  Redesign: scopes picker (#11039)
  Redesign: pending notifications (#10926)
  Redesign: change the filters style (#11049)
  Redesign: secondary actions (#11067)
  Redesign: assembly members page (#10992)
  Redesign: update default static map size to 300px (#10953)
  Redesign: visual placeholder cards (#11038)
  Redesign: fix emoji popup position (#10957)
  Redesign: enable REDESIGN_ENABLED on ParticipatoryProcesses (#10983)
  Redesign: opinion buttons (#10998)
  Display a disabled message button in public profile if user blocks them instead of hidding it (#10984)
  Redesign: confirm modal Foundation-free (#10978)
  Redesign: initiatives (#10646)
  Redesign: surveys (#10922)
  ...
@entantoencuanto
Replace icon of assemblies counter metadata
7d2a129
@entantoencuanto
Reorder assemblies metadata card-g items
52e34d4
@entantoencuanto
Copy link
Copy Markdown
Contributor Author

entantoencuanto commented Jun 23, 2023

  • The last assemblies activity is not shown, maybe related to the content block? Feel free to move it to another PR if it doesn't apply to this PR.

After doing some research I think I've found the reason. This assembly is a private space and the activities cell hides all the items to users without the permissions to participate in the space. Probably logged in as admin@example.org the user can visit the private space, but no other permissions are granted. If you add admin@example.org as private participant of the assembly the activities should be visible

@ferblape
Copy link
Copy Markdown
Contributor

ferblape commented Jun 26, 2023

@carolromero the last comment from Edu is for you

@ferblape ferblape requested a review from carolromero June 26, 2023 03:02
@furilo
Copy link
Copy Markdown
Contributor

furilo commented Jun 26, 2023

@decidim/product you can check the assemblies breadcrumb https://decidim-redesign.populate.tools/assemblies/edu (#11089)

carolromero
carolromero requested changes Jun 26, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@carolromero carolromero left a comment

Choose a reason for hiding this comment

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

Hi @entantoencuanto, thanks for looking into this! Actually, as this assembly is configured as private and transparent, it makes sense to show the activity, which any participant can anyway browse.

So I think the expected behavior is:

  • Public assembly: anyone sees the assembly, including the last activity.
  • (Private) Transparent assembly: anyone sees the assembly, including the last activity.
  • Private assembly: only private participants see the assembly, including the last activity.

@entantoencuanto
Display action log items when the space is private but transparent
e78633b
@entantoencuanto
Merge branch 'feature/redesign' into feature/redesign-pending-assemblies
4a523df 
* feature/redesign:
  Remove widgets and embeds (#11096)
  Redesign / Complete card G cell specs (#11094)
  Redesign: processes assemblies metadata content blocks (#10637)
  Redesign: vertical margin inside the callouts (#11071)
  Redesign / Update package-lock  (#11091)
@ferblape ferblape requested a review from carolromero June 28, 2023 04:41
carolromero
carolromero approved these changes Jun 28, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@carolromero carolromero left a comment

Choose a reason for hiding this comment

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

Now it's working ok! thanks @entantoencuanto

@ferblape ferblape requested a review from fblupi June 28, 2023 09:26
@entantoencuanto
Fix condition
d9309b2 
If resource does not respond to can_participate? its associated action
log should be displayed
fblupi
fblupi approved these changes Jun 30, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@fblupi fblupi left a comment

Choose a reason for hiding this comment

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

LGTM!

@entantoencuanto entantoencuanto mentioned this pull request Jun 30, 2023
Merged
@ferblape ferblape merged commit 7d5cd87 into feature/redesign Jul 1, 2023
@ferblape ferblape deleted the feature/redesign-pending-assemblies branch July 1, 2023 04:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fblupi fblupi fblupi approved these changes

@carolromero carolromero carolromero approved these changes

@ferblape ferblape Awaiting requested review from ferblape

@furilo furilo Awaiting requested review from furilo

Assignees

No one assigned

Labels

project: redesign Barcelona City Council contract

Projects

No open projects
PX Redesign
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@entantoencuanto @furilo @ferblape @fblupi @carolromero @Crashillo