Assembly members #3008

rbngzlv · Mar 14, 2018

🎩 What? Why?

An assembly can have members (president, vice president, ...)

📌 Related Issues

Related to #2832

📋 Subtasks

Add admin log
Add seeds
Specs
Add CHANGELOG entry

📷 Screenshots

codecov · Mar 16, 2018

Codecov Report

❗️ No coverage uploaded for pull request base (master@d858433). Click here to learn what that means.
The diff coverage is 90.32%.

@@            Coverage Diff            @@
##             master    #3008   +/-   ##
=========================================
  Coverage          ?   97.52%           
=========================================
  Files             ?     1688           
  Lines             ?    40348           
  Branches          ?        0           
=========================================
  Hits              ?    39349           
  Misses            ?      999           
  Partials          ?        0

rbngzlv · Apr 20, 2018

Hi! I'm introducing a custom reusable component that uses ~~selectize.js~~ react-select under the hook to power a select box with autocomplete ajax functionality.

My idea is to add a form.autocomplete_select method that will render a ~~valid select input~~ div with some data attributes to make the use of this functionality easy for others.

I'm almost finished (not code uploaded yet) but I wanted to ask if there is any any concern about this.

rbngzlv · Apr 23, 2018

Hi, I need some opinions/guidance/help in my implementation of a autocomplete select with React. Can do a fast review on this commit, please? e0b710f

I need to implement specs, pass linters, etc. but in the meanwhile are the pieces in the right place?

/cc @decidim/lot-core @deivid-rodriguez

Edit: wrong commit link

oriolgual · Apr 24, 2018

oriolgual requested changes Apr 24, 2018

View changes

oriolgual · Apr 24, 2018

decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_members_controller.rb

+            format.json do
+              render json: [] && return if params.fetch(:term, "").empty?
+
+              query = current_organization.users&.order(name: :asc)


This code is very similar to another PR, maybe we should extract this?

@oriolgual What do you propose? Extract it to a concern? It's a good fit for an API endpoint, but it has no authentication, right?

Also, we would have to add the api as dependency for the admin ... 😕

oriolgual · Apr 24, 2018

decidim-assemblies/app/models/decidim/assembly_member.rb

+    include Decidim::Traceable
+    include Decidim::Loggable
+
+    GENDERS = %w(man woman).freeze


@decidim/product do we really need to save the gender? I'm not an expert but in terms of LOPD isn't this considered a different level of data?

Also, if we really want to know the gender of the members, maybe we should consider an extra field with a free text option.

Hi @oriolgual, this is a specific requirement from Barcelona Participation Regulation, which states that the composition of assemblies must be proportional in terms of age, gender and origin.

That said, I think a drop-down field with binary option is not a good solution. As the gender issue can be quite tricky (see the 71 gender options offered by Facebook) I would leave this field as an open text field.

In the end, it should serve to make parity issues visible. I understand that using an open text field is the simplest change.

oriolgual · Apr 24, 2018

decidim-assemblies/db/migrate/20180314143822_add_assembly_members.rb

+    create_table :decidim_assembly_members do |t|
+      t.references :decidim_assembly, index: true
+      t.references :decidim_user, index: true
+      t.integer :weight, null: false, default: 0


Please add an index here since it's the column used as default sorting.

oriolgual · Apr 24, 2018

decidim-assemblies/config/locales/en.yml

+        designation_mode: Designation mode
+        full_name: Full name
+        gender: Gender
+        origin: Origin


@decidim/product what do we actually need to save here? Where the member is native from? See https://www.wordnik.com/words/origin

@oriolgual sorry I forgot to answer this one. Yes, this refers to place of birth (again, data required from Barcelona Participation Regulations)

Maybe birthplace would be a better naming?

I'll be working on this today, I'll change this field to birthplace.

deivid-rodriguez · Apr 24, 2018

@rbngzlv Sorry I don't have time to review your work at the moment but at first glance it seems like a fantastic piece of job that's very interesting for other places of decidim as well, and helps up better integrating react in our workflows. Love what you're building 💪

mrcasals · May 3, 2018

mrcasals reviewed May 3, 2018

View changes

tramuntanal · May 7, 2018

@rbngzlv @isaacmg410 this PR is expected to be merged this week to enter v0.12. Do you expect to have it finished soon?

mrcasals · May 8, 2018

@rbngzlv some conflicts appeared, can you work on them?

I can help you if you need to, since those conflicts are related to #3029

rbngzlv · May 8, 2018

rbngzlv dismissed mrcasals’s stale review via `4bc1528` May 8, 2018

rbngzlv · May 8, 2018

@decidim/lot-core updated with master and conflicts fixed.

@mrcasals can you check my implementation for the new permissions system?

mrcasals · May 9, 2018

@rbngzlv yup, the permissions commit looks good to me! I'll check the rest of the PR too and try to merge it 😄

mrcasals · May 9, 2018

mrcasals requested changes May 9, 2018

View changes

mrcasals · May 9, 2018

decidim-assemblies/app/controllers/decidim/assemblies/assembly_members_controller.rb

+      helper_method :collection
+
+      def index
+        redirect_to "/404" if members.none?


I think we should raise ActionController::RoutingError, "No members for this assembly" here. In development we'd see the error, in production we'd be redirected to /404.

Thoughts?

mrcasals · May 9, 2018

decidim-assemblies/app/models/decidim/assemblies/abilities/admin/admin_ability.rb

+    module Abilities
+      module Admin
+        # Defines the abilities for an admin user. Intended to be used with `cancancan`.
+        class AdminAbility < Decidim::Abilities::AdminAbility


These ability classes should be removed

mrcasals · May 9, 2018

decidim-assemblies/app/models/decidim/assemblies/abilities/admin_ability.rb

+  module Assemblies
+    module Abilities
+      # Defines the abilities for an admin user. Intended to be used with `cancancan`.
+      class AdminAbility < Decidim::Abilities::AdminAbility


This should be removed

mrcasals · May 9, 2018

decidim-assemblies/app/models/decidim/assemblies/abilities/assembly_role_ability.rb

+    module Abilities
+      # Defines the abilities for any user that can manage assemblies (whatever their role).
+      # Intended to be used with `cancancan`.
+      class AssemblyRoleAbility


This should be removed

mrcasals · May 9, 2018

decidim-assemblies/app/models/decidim/assemblies/abilities/everyone_ability.rb

+    module Abilities
+      # Defines the base abilities related to assemblies for any user. Guest users
+      # will use these too. Intended to be used with `cancancan`.
+      class EveryoneAbility < Decidim::Abilities::EveryoneAbility


This should be removed

mrcasals · May 9, 2018

decidim-assemblies/app/views/decidim/assembly_members/_assembly_member.html.erb

@@ -0,0 +1,29 @@
+<% member_presenter = Decidim::AssemblyMemberPresenter.new(assembly_member) %>
+
+<div class="column">


Move this to a cell, maybe? 😄

I'm not sure about this, for now we're not going to reuse this view.

Anyway, if we want to have this moved to a cell, I can make the commitment to do it in a future PR, but not now. We need this feature to be merged before the end of this week, and we have two more related PR's pending. What do you think?

Sounds reasonable to me, 👍

mrcasals · May 9, 2018

mrcasals reviewed May 9, 2018

View changes

mrcasals · May 9, 2018

decidim-assemblies/app/models/decidim/assemblies/abilities/admin/assembly_admin_ability.rb

+      module Admin
+        # Defines the abilities for an assembly admin user. Intended to be used
+        # with `cancancan`.
+        class AssemblyAdminAbility < Decidim::Assemblies::Abilities::Admin::AssemblyRoleAbility


This one should be removed too

mrcasals · May 9, 2018

mrcasals reviewed May 9, 2018

View changes

mrcasals · May 9, 2018

@rbngzlv you need to update the test after adding the exception 😄

rbngzlv · May 9, 2018

rbngzlv dismissed mrcasals’s stale review via `783aed9` May 9, 2018

mrcasals · May 10, 2018

mrcasals approved these changes May 10, 2018

View changes

oriolgual · May 10, 2018

oriolgual approved these changes May 10, 2018

View changes

rbngzlv added in-progress space: assemblies lot: mods mods A labels Mar 14, 2018

rbngzlv self-assigned this Mar 14, 2018

rbngzlv force-pushed the feature/assembly_members branch from d2d76e4 to 0f424f6 Mar 16, 2018

oriolgual added status: WIP and removed status: WIP in-progress labels Mar 16, 2018

rbngzlv force-pushed the feature/assembly_members branch 5 times, most recently from 3b2d991 to 3292bbb Mar 21, 2018

rbngzlv force-pushed the feature/assembly_members branch 4 times, most recently from 18ed118 to bda7e91 Apr 5, 2018

rbngzlv referenced this pull request Apr 10, 2018
Merged
Move reusable javascript components from surveys to admin component #3194
1 of 1 task complete

rbngzlv force-pushed the feature/assembly_members branch 3 times, most recently from 0578433 to 5e9a8b5 Apr 19, 2018

rbngzlv force-pushed the feature/assembly_members branch 2 times, most recently from 72d64dd to e0b710f Apr 23, 2018

rbngzlv dismissed mrcasals’s stale review via 4bc1528 May 8, 2018

rbngzlv removed the status: WIP label May 8, 2018

rbngzlv added some commits May 9, 2018

Remove cancancan abilities

18e1ffa

raise ActionController::RoutingError instead of redirect

c446293

Merge branch 'master' into feature/assembly_members

Loading status checks…

4d0f2ad

wafflebot bot added the status: WIP label May 9, 2018

rbngzlv dismissed mrcasals’s stale review via 783aed9 May 9, 2018

Update spec

Loading status checks…

bc1aa2f

rbngzlv force-pushed the feature/assembly_members branch from 783aed9 to bc1aa2f May 9, 2018

wafflebot bot removed the status: WIP label May 10, 2018

rbngzlv deleted the feature/assembly_members branch May 10, 2018

mrcasals referenced this pull request May 31, 2018
Merged
Fix broken test #3551

mrcasals referenced this pull request Oct 18, 2018
Closed
Member List Assemblies admin panel #4300

isaacmg410 referenced this pull request Oct 24, 2018
Merged
add paginate on admin assembly members #4369
4 of 4 tasks complete

decidim/decidim

Join GitHub today

Assembly members #3008

Conversation

rbngzlv commented Mar 14, 2018 • edited

🎩 What? Why?

📌 Related Issues

📋 Subtasks

📷 Screenshots

rbngzlv added in-progress space: assemblies lot: mods mods A labels Mar 14, 2018

rbngzlv self-assigned this Mar 14, 2018

rbngzlv force-pushed the feature/assembly_members branch from d2d76e4 to 0f424f6 Mar 16, 2018

This comment has been minimized.

codecov bot commented Mar 16, 2018 • edited

Codecov Report

oriolgual added status: WIP and removed status: WIP in-progress labels Mar 16, 2018

rbngzlv force-pushed the feature/assembly_members branch 5 times, most recently from 3b2d991 to 3292bbb Mar 21, 2018

rbngzlv force-pushed the feature/assembly_members branch 4 times, most recently from 18ed118 to bda7e91 Apr 5, 2018

rbngzlv referenced this pull request Apr 10, 2018

rbngzlv force-pushed the feature/assembly_members branch 3 times, most recently from 0578433 to 5e9a8b5 Apr 19, 2018

This comment has been minimized.

rbngzlv commented Apr 20, 2018 • edited

rbngzlv force-pushed the feature/assembly_members branch 2 times, most recently from 72d64dd to e0b710f Apr 23, 2018

This comment has been minimized.

rbngzlv commented Apr 23, 2018 • edited

oriolgual requested changes Apr 24, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

deivid-rodriguez commented Apr 24, 2018 • edited

mrcasals reviewed May 3, 2018 View changes

This comment has been minimized.

tramuntanal commented May 7, 2018

This comment has been minimized.

mrcasals commented May 8, 2018

rbngzlv added some commits May 8, 2018

rbngzlv dismissed mrcasals’s stale review via 4bc1528 May 8, 2018

This comment has been minimized.

rbngzlv commented May 8, 2018

rbngzlv removed the status: WIP label May 8, 2018

This comment has been minimized.

mrcasals commented May 9, 2018

mrcasals requested changes May 9, 2018 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

mrcasals reviewed May 9, 2018 View changes

This comment has been minimized.

rbngzlv added some commits May 9, 2018

wafflebot bot added the status: WIP label May 9, 2018

mrcasals reviewed May 9, 2018 View changes

This comment has been minimized.

mrcasals commented May 9, 2018

rbngzlv dismissed mrcasals’s stale review via 783aed9 May 9, 2018

rbngzlv force-pushed the feature/assembly_members branch from 783aed9 to bc1aa2f May 9, 2018

mrcasals approved these changes May 10, 2018 View changes

oriolgual approved these changes May 10, 2018 View changes

Hide details View details oriolgual merged commit 4656577 into master May 10, 2018 27 checks passed

27 checks passed

wafflebot bot removed the status: WIP label May 10, 2018

rbngzlv deleted the feature/assembly_members branch May 10, 2018

isaacmg410 added a commit to CodiTramuntana/decidim that referenced this pull request May 25, 2018

mrcasals referenced this pull request May 31, 2018

mrcasals referenced this pull request Oct 18, 2018

isaacmg410 referenced this pull request Oct 24, 2018

rbngzlv commented Mar 14, 2018 •

edited

rbngzlv force-pushed the feature/assembly_members branch from `d2d76e4` to `0f424f6` Mar 16, 2018

codecov bot commented Mar 16, 2018 •

edited

rbngzlv force-pushed the feature/assembly_members branch 5 times, most recently from `3b2d991` to `3292bbb` Mar 21, 2018

rbngzlv force-pushed the feature/assembly_members branch 4 times, most recently from `18ed118` to `bda7e91` Apr 5, 2018

rbngzlv force-pushed the feature/assembly_members branch 3 times, most recently from `0578433` to `5e9a8b5` Apr 19, 2018

rbngzlv commented Apr 20, 2018 •

edited

rbngzlv force-pushed the feature/assembly_members branch 2 times, most recently from `72d64dd` to `e0b710f` Apr 23, 2018

rbngzlv commented Apr 23, 2018 •

edited

oriolgual requested changes Apr 24, 2018

View changes

deivid-rodriguez commented Apr 24, 2018 •

edited

mrcasals reviewed May 3, 2018

View changes

rbngzlv dismissed mrcasals’s stale review via `4bc1528` May 8, 2018

mrcasals requested changes May 9, 2018

View changes

mrcasals reviewed May 9, 2018

View changes

mrcasals reviewed May 9, 2018

View changes

rbngzlv dismissed mrcasals’s stale review via `783aed9` May 9, 2018

rbngzlv force-pushed the feature/assembly_members branch from `783aed9` to `bc1aa2f` May 9, 2018

mrcasals approved these changes May 10, 2018

View changes

oriolgual approved these changes May 10, 2018

View changes

oriolgual merged commit `4656577` into master May 10, 2018
27 checks passed