decidim-assemblies 0.25.2 → 0.26.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9f0785e51c10fbc6abf7075024c2bb5387ef4932eea52faa562b2226483aea4
-  data.tar.gz: f7635ff559fd36465eed700ea9c6ebfc450c13d5a38b0994d527150776c1adc3
+  metadata.gz: 91d27dcd305a4a083dbce48b476f4b7c526d8bbd5046a9d5910e151b62067f92
+  data.tar.gz: e4cb17230e40ed515df5a0caccadbb7694aac5a375ae37c62571f0281ed55f1a
 SHA512:
-  metadata.gz: d767b77e6a1aa8ddccbe0f650032dc163a143d781a4eede6edb0a43bb98a3ed72800a95b2d93950d64177a5c87dc1b41ed53833e5f272cc9cd46f304abd1d341
-  data.tar.gz: bb76eb600fa75ee55611fe0d84f643081cef00a4154cf58fc5fb4967959350737a918aca20e821075d197a67edb535b336c3344ce80dda6d7b0ab647cd6238c6
+  metadata.gz: b42f86d303ee5e127fe27807d8b10ed6303db7b41684de40707f65095bb62b0af92470c650f1d25cb441776fa8703058fd7f60edaecf2c52a548184d2b95882a
+  data.tar.gz: 2511667b7a3410ecdab6f46f1dbbdb935f14ecdd2a9a01077bacf7d62e7266f9e9b0fe6eb3b817aefa474b2641fada8f5c5e4f762e7a72d240ed3957da3d15bf

data/app/cells/decidim/assemblies/assembly_member/show.erb

@@ -24,7 +24,7 @@
                   <% end %>
                 </div>
               <% else %>
-                <div class="author__avatar"><%= image_tag asset_pack_path("media/images/default-avatar.svg"), alt: "member-avatar" %></div>
+                <div class="author__avatar"><%= image_tag model.non_user_avatar_path, alt: "member-avatar" %></div>
                 <div>
                   <div class="author__name--container">
                     <div class="author__name">

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb

@@ -6,6 +6,10 @@ module Decidim
       class HighlightedAssembliesCell < Decidim::ViewModel
         delegate :current_user, to: :controller
 
+        cache :show, expires_in: 10.minutes, if: :perform_caching? do
+          cache_hash
+        end
+
         def show
           render if highlighted_assemblies.any?
         end
@@ -29,6 +33,14 @@ module Decidim
         def decidim_assemblies
           Decidim::Assemblies::Engine.routes.url_helpers
         end
+
+        private
+
+        def cache_hash
+          hash = []
+          hash.push(I18n.locale)
+          hash.join(Decidim.cache_key_separator)
+        end
       end
     end
   end

data/app/commands/decidim/assemblies/admin/create_assembly_member.rb

@@ -6,6 +6,8 @@ module Decidim
       # A command with all the business logic when creating a new assembly
       # member in the system.
       class CreateAssemblyMember < Rectify::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -25,16 +27,49 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
-          create_assembly_member!
-          notify_assembly_member_about_new_membership
+          if assembly_member_with_attributes.valid?
+            create_assembly_member!
+            notify_assembly_member_about_new_membership
 
-          broadcast(:ok)
+            broadcast(:ok)
+          else
+            if assembly_member_with_attributes.errors.include? :non_user_avatar
+              form.errors.add(
+                :non_user_avatar,
+                assembly_member_with_attributes.errors[:non_user_avatar]
+              )
+            end
+            broadcast(:invalid)
+          end
         end
 
         private
 
         attr_reader :form, :assembly, :current_user
 
+        def assembly_member_with_attributes
+          @assembly_member_with_attributes ||= Decidim::AssemblyMember.new(assembly_member_attributes)
+        end
+
+        def assembly_member_attributes
+          form.attributes.slice(
+            :full_name,
+            :gender,
+            :birthday,
+            :birthplace,
+            :ceased_date,
+            :designation_date,
+            :position,
+            :position_other,
+            :weight
+          ).merge(
+            assembly: assembly,
+            user: form.user
+          ).merge(
+            attachment_attributes(:non_user_avatar)
+          )
+        end
+
         def create_assembly_member!
           log_info = {
             resource: {
@@ -48,21 +83,7 @@ module Decidim
           @assembly_member = Decidim.traceability.create!(
             Decidim::AssemblyMember,
             current_user,
-            form.attributes.slice(
-              :full_name,
-              :gender,
-              :birthday,
-              :birthplace,
-              :ceased_date,
-              :designation_date,
-              :designation_mode,
-              :position,
-              :position_other,
-              :weight
-            ).merge(
-              assembly: assembly,
-              user: form.user
-            ),
+            assembly_member_attributes,
             log_info
           )
         end

data/app/commands/decidim/assemblies/admin/update_assembly_member.rb

@@ -6,6 +6,8 @@ module Decidim
       # A command with all the business logic when updating an assembly
       # member in the system.
       class UpdateAssemblyMember < Rectify::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -25,14 +27,46 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
           return broadcast(:invalid) unless assembly_member
 
-          update_assembly_member!
-          broadcast(:ok)
+          assembly_member.assign_attributes(attributes)
+
+          if assembly_member.valid?
+            assembly_member.reload
+            update_assembly_member!
+            broadcast(:ok)
+          else
+            if assembly_member.errors.include? :non_user_avatar
+              form.errors.add(
+                :non_user_avatar,
+                assembly_member.errors[:non_user_avatar]
+              )
+            end
+
+            broadcast(:invalid)
+          end
         end
 
         private
 
         attr_reader :form, :assembly_member
 
+        def attributes
+          form.attributes.slice(
+            :full_name,
+            :gender,
+            :birthday,
+            :birthplace,
+            :ceased_date,
+            :designation_date,
+            :position,
+            :position_other,
+            :weight
+          ).merge(
+            user: form.user
+          ).merge(
+            attachment_attributes(:non_user_avatar)
+          )
+        end
+
         def update_assembly_member!
           log_info = {
             resource: {
@@ -46,20 +80,7 @@ module Decidim
           Decidim.traceability.update!(
             assembly_member,
             form.current_user,
-            form.attributes.slice(
-              :full_name,
-              :gender,
-              :birthday,
-              :birthplace,
-              :ceased_date,
-              :designation_date,
-              :designation_mode,
-              :position,
-              :position_other,
-              :weight
-            ).merge(
-              user: form.user
-            ),
+            attributes,
             log_info
           )
         end

data/app/controllers/concerns/decidim/assemblies/admin/filterable.rb

@@ -23,6 +23,26 @@ module Decidim
           def extra_filters
             [:parent_id_eq]
           end
+
+          def filters
+            [:private_space_eq, :published_at_null, :decidim_assemblies_type_id_eq]
+          end
+
+          def filters_with_values
+            {
+              private_space_eq: [true, false],
+              published_at_null: [true, false],
+              decidim_assemblies_type_id_eq: AssembliesType.where(organization: current_organization).pluck(:id)
+            }
+          end
+
+          def dynamically_translated_filters
+            [:decidim_assemblies_type_id_eq]
+          end
+
+          def translated_decidim_assemblies_type_id_eq(id)
+            translated_attribute(Decidim::AssembliesType.find(id).title)
+          end
         end
       end
     end

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

@@ -7,6 +7,7 @@ module Decidim
       #
       class AssemblyMembersController < Decidim::Assemblies::Admin::ApplicationController
         include Concerns::AssemblyAdmin
+        layout "decidim/admin/assembly_members"
 
         def index
           enforce_permission_to :index, :assembly_member

data/app/controllers/decidim/assemblies/admin/assembly_user_roles_controller.rb

@@ -7,10 +7,11 @@ module Decidim
       #
       class AssemblyUserRolesController < Decidim::Assemblies::Admin::ApplicationController
         include Concerns::AssemblyAdmin
+        include Decidim::Admin::Officializations::Filterable
 
         def index
           enforce_permission_to :index, :assembly_user_role
-          @assembly_user_roles = collection
+          @assembly_user_roles = filtered_collection
         end
 
         def new
@@ -90,11 +91,18 @@ module Decidim
 
         private
 
+        def search_field_predicate
+          :name_or_nickname_or_email_cont
+        end
+
+        def filters
+          [:invitation_accepted_at_present, :last_sign_in_at_present]
+        end
+
         def collection
           @collection ||= Decidim::AssemblyUserRole
-                          .includes(:user)
+                          .joins(:user)
                           .where(assembly: current_assembly)
-                          .order(:role, "decidim_users.name")
         end
       end
     end

data/app/forms/decidim/assemblies/admin/assembly_member_form.rb

@@ -10,12 +10,13 @@ module Decidim
 
         attribute :weight, Integer, default: 0
         attribute :full_name, String
+        attribute :non_user_avatar
+        attribute :remove_non_user_avatar, Boolean, default: false
         attribute :gender, String
-        attribute :birthday, Decidim::Attributes::TimeWithZone
+        attribute :birthday, Decidim::Attributes::LocalizedDate
         attribute :birthplace, String
         attribute :ceased_date, Decidim::Attributes::LocalizedDate
         attribute :designation_date, Decidim::Attributes::LocalizedDate
-        attribute :designation_mode, String
         attribute :position, String
         attribute :position_other, String
         attribute :user_id, Integer
@@ -23,6 +24,18 @@ module Decidim
 
         validates :designation_date, presence: true
         validates :full_name, presence: true, unless: proc { |object| object.existing_user }
+        validates :non_user_avatar, passthru: {
+          to: Decidim::AssemblyMember,
+          with: {
+            # The member gets its organization context through the assembly
+            # object which is why we need to create a dummy assembly in order
+            # to pass the correct organization context to the file upload
+            # validators.
+            assembly: lambda do |form|
+              Decidim::Assembly.new(organization: form.current_organization)
+            end
+          }
+        }
         validates :position, presence: true, inclusion: { in: Decidim::AssemblyMember::POSITIONS }
         validates :position_other, presence: true, if: ->(form) { form.position == "other" }
         validates :ceased_date, date: { after: :designation_date, allow_blank: true }

data/app/helpers/decidim/assemblies/assemblies_helper.rb

@@ -34,7 +34,7 @@ module Decidim
         html += "<strong>#{translated_attribute(assembly.title)}: </strong>".html_safe
         html += t("assemblies.show.private_space", scope: "decidim").to_s.html_safe
         html += ", #{t("assemblies.show.is_transparent.#{assembly.is_transparent}", scope: "decidim")}".html_safe if assembly.is_transparent?
-        html += " #{decidim_sanitize translated_attribute(assembly.special_features)}".html_safe
+        html += " #{decidim_sanitize_editor translated_attribute(assembly.special_features)}".html_safe
         html.html_safe
       end
 

data/app/models/decidim/assembly.rb

@@ -93,21 +93,6 @@ module Decidim
                       index_on_create: ->(_assembly) { false },
                       index_on_update: ->(assembly) { assembly.visible? })
 
-    # Overwriting existing method Decidim::HasPrivateUsers.visible_for
-    def self.visible_for(user)
-      if user
-        return all if user.admin?
-
-        left_outer_joins(:participatory_space_private_users).where(
-          %{private_space = false OR
-          (private_space = true AND is_transparent = true) OR
-          decidim_participatory_space_private_users.decidim_user_id = ?}, user.id
-        ).distinct
-      else
-        public_spaces
-      end
-    end
-
     # Overwriting existing method Decidim::HasPrivateUsers.public_spaces
     def self.public_spaces
       where(private_space: false).or(where(private_space: true).where(is_transparent: true)).published

data/app/models/decidim/assembly_member.rb

@@ -6,6 +6,7 @@ module Decidim
   class AssemblyMember < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::HasUploadValidations
 
     POSITIONS = %w(president vice_president secretary other).freeze
 
@@ -13,6 +14,11 @@ module Decidim
     belongs_to :assembly, foreign_key: "decidim_assembly_id", class_name: "Decidim::Assembly"
     alias participatory_space assembly
 
+    has_one_attached :non_user_avatar
+    validates_avatar :non_user_avatar, uploader: Decidim::AvatarUploader
+
+    delegate :organization, to: :assembly
+
     default_scope { order(weight: :asc, created_at: :asc) }
 
     scope :not_ceased, -> { where("ceased_date >= ? OR ceased_date IS NULL", Time.zone.today) }
@@ -20,5 +26,9 @@ module Decidim
     def self.log_presenter_class_for(_log)
       Decidim::Assemblies::AdminLog::AssemblyMemberPresenter
     end
+
+    def remove_non_user_avatar
+      false
+    end
   end
 end

data/app/models/decidim/assembly_user_role.rb

@@ -19,6 +19,26 @@ module Decidim
       Decidim::Assemblies::AdminLog::AssemblyUserRolePresenter
     end
 
+    ransacker :name do
+      Arel.sql(%{("decidim_users"."name")::text})
+    end
+
+    ransacker :nickname do
+      Arel.sql(%{("decidim_users"."nickname")::text})
+    end
+
+    ransacker :email do
+      Arel.sql(%{("decidim_users"."email")::text})
+    end
+
+    ransacker :invitation_accepted_at do
+      Arel.sql(%{("decidim_users"."invitation_accepted_at")::text})
+    end
+
+    ransacker :last_sign_in_at do
+      Arel.sql(%{("decidim_users"."last_sign_in_at")::text})
+    end
+
     private
 
     # Private: check if the process and the user have the same organization

data/app/packs/src/decidim/assemblies/admin/assembly_members.js

@@ -13,6 +13,16 @@ $(() => {
     }
   });
 
+  createFieldDependentInputs({
+    controllerField: $assemblyMemberType,
+    wrapperSelector: ".user-fields",
+    dependentFieldsSelector: ".user-fields--non-user-avatar",
+    dependentInputSelector: "input",
+    enablingCondition: ($field) => {
+      return $field.val() === "false"
+    }
+  });
+
   createFieldDependentInputs({
     controllerField: $assemblyMemberType,
     wrapperSelector: ".user-fields",

data/app/presenters/decidim/assemblies/admin_log/assembly_member_presenter.rb

@@ -22,7 +22,6 @@ module Decidim
             birthday: :date,
             birthplace: :string,
             designation_date: :date,
-            designation_mode: :string,
             position: "Decidim::Assemblies::AdminLog::ValueTypes::MemberPositionPresenter",
             position_other: :string,
             weight: :integer,

data/app/presenters/decidim/assembly_member_presenter.rb

@@ -33,6 +33,16 @@ module Decidim
       I18n.t(__getobj__.position, scope: "decidim.admin.models.assembly_member.positions", default: "")
     end
 
+    def non_user_avatar_path
+      return non_user_avatar.default_url unless non_user_avatar.attached?
+
+      non_user_avatar.path
+    end
+
+    def non_user_avatar
+      attached_uploader(:non_user_avatar)
+    end
+
     private
 
     def user

data/app/views/decidim/assemblies/admin/assemblies/index.html.erb

@@ -48,7 +48,7 @@
             <tr>
               <td>
                 <% if assembly.promoted? %>
-                  <span data-tooltip class="icon-state icon-highlight" aria-haspopup="true" data-disable-hover="false" title="<%= t("models.assembly.fields.promoted", scope: "decidim.admin") %>">
+                  <span data-tooltip class="icon-state icon-highlight" data-disable-hover="false" title="<%= t("models.assembly.fields.promoted", scope: "decidim.admin") %>">
                     <%= icon "star", role: "img", "aria-hidden": true %>
                   </span>
                 <% end %>

data/app/views/decidim/assemblies/admin/assembly_members/_form.html.erb

@@ -15,6 +15,10 @@
         <%= form.text_field :full_name, autofocus: true %>
       </div>
 
+      <div class="row column user-fields--non-user-avatar">
+        <%= form.upload :non_user_avatar, help_i18n_messages: ["non_user_avatar_help", "image_guide"], help_i18n_scope: "decidim.assemblies.admin.assembly_members.form" %>
+      </div>
+
       <div class="row column user-fields--user-picker">
         <% prompt_options = { url: decidim_admin.user_entities_organization_url, placeholder: t(".select_user") } %>
         <%= form.autocomplete_select(:user_id, form.object.user.presence,  { multiple: false }, prompt_options) do |user|
@@ -41,10 +45,6 @@
       <%= form.date_field :designation_date %>
     </div>
 
-    <div class="row column">
-      <%= form.text_field :designation_mode %>
-    </div>
-
     <div class="row column">
       <%= form.date_field :ceased_date %>
     </div>

data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb

@@ -7,17 +7,18 @@
       <% end %>
     </h2>
   </div>
+  <%= admin_filter_selector %>
 
   <div class="card-section">
     <div class="table-scroll">
-      <table class="stack">
+      <table class="stack table-list">
         <thead>
           <tr>
-            <th><%= t("models.assembly_user_role.fields.name", scope: "decidim.admin") %></th>
-            <th><%= t("models.assembly_user_role.fields.email", scope: "decidim.admin") %></th>
-            <th><%= t("models.user.fields.invitation_sent_at", scope: "decidim.admin") %></th>
-            <th><%= t("models.user.fields.invitation_accepted_at", scope: "decidim.admin") %></th>
-            <th><%= t("models.assembly_user_role.fields.role", scope: "decidim.admin") %></th>
+            <th><%= sort_link(query, :name,t("models.assembly_user_role.fields.name", scope: "decidim.admin"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :email, t("models.assembly_user_role.fields.email", scope: "decidim.admin"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :last_sign_in_at, t("models.user.fields.last_sign_in_at", scope: "decidim.admin"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :invitation_accepted_at, t("models.user.fields.invitation_accepted_at", scope: "decidim.admin"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :role, t("models.assembly_user_role.fields.role", scope: "decidim.admin"), default_order: :desc) %></th>
             <th class="actions"></th>
           </tr>
         </thead>

data/app/views/decidim/assemblies/assemblies/_promoted_assembly.html.erb

@@ -5,7 +5,7 @@
         <%= link_to assembly_path(promoted_assembly), class: "card__link" do %>
           <h2 class="card__title"><%= translated_attribute promoted_assembly.title %></h2>
         <% end %>
-        <%= decidim_sanitize html_truncate(translated_attribute(promoted_assembly.short_description), length: 630, separator: "...") %>
+        <%= decidim_sanitize_editor html_truncate(translated_attribute(promoted_assembly.short_description), length: 630, separator: "...") %>
         <%= link_to assembly_path(promoted_assembly), class: "button small hollow card__button" do %>
           <%= t("assemblies.promoted_assembly.more_info", scope: "layouts.decidim") %>
         <% end %>

data/app/views/decidim/assemblies/assemblies/show.html.erb

@@ -36,9 +36,9 @@ edit_link(
     <div class="columns medium-7 mediumlarge-8">
       <div class="section">
         <div class="lead">
-          <%= decidim_sanitize translated_attribute(current_participatory_space.short_description) %>
+          <%= decidim_sanitize_editor translated_attribute(current_participatory_space.short_description) %>
         </div>
-        <%= decidim_sanitize translated_attribute(current_participatory_space.description) %>
+        <%= decidim_sanitize_editor translated_attribute(current_participatory_space.description) %>
 
         <% if current_participatory_space.private_space? %>
           <%= assembly_features(current_participatory_space) %>
@@ -56,21 +56,21 @@ edit_link(
           <% if translated_attribute(current_participatory_space.purpose_of_action).present? %>
             <div class="section">
               <h3 class="section-heading"><%= t("purpose_of_action", scope: "decidim.assemblies.show") %></h3>
-              <%= decidim_sanitize translated_attribute(current_participatory_space.purpose_of_action) %>
+              <%= decidim_sanitize_editor translated_attribute(current_participatory_space.purpose_of_action) %>
             </div>
           <% end %>
 
           <% if translated_attribute(current_participatory_space.internal_organisation).present? %>
             <div class="section">
               <h3 class="section-heading"><%= t("internal_organisation", scope: "decidim.assemblies.show") %></h3>
-              <%= decidim_sanitize translated_attribute(current_participatory_space.internal_organisation) %>
+              <%= decidim_sanitize_editor translated_attribute(current_participatory_space.internal_organisation) %>
             </div>
           <% end %>
 
           <% if translated_attribute(current_participatory_space.composition).present? %>
             <div class="section">
               <h3 class="section-heading"><%= t("composition", scope: "decidim.assemblies.show") %></h3>
-              <%= decidim_sanitize translated_attribute(current_participatory_space.composition) %>
+              <%= decidim_sanitize_editor translated_attribute(current_participatory_space.composition) %>
             </div>
           <% end %>
           <div class="section text-center">
@@ -203,7 +203,7 @@ edit_link(
             <span class="definition-data__title"><%= t("closing_date", scope: "decidim.assemblies.show") %></span>
             <%= l(current_participatory_space.closing_date, format: :decidim_short) %>
             <br>
-            <%= decidim_sanitize translated_attribute(current_participatory_space.closing_date_reason) %>
+            <%= decidim_sanitize_editor translated_attribute(current_participatory_space.closing_date_reason) %>
           </div>
         <% end %>
 

data/app/views/decidim/assemblies/assembly_members/index.html.erb

@@ -1,5 +1,14 @@
 <% add_decidim_meta_tags(title: t("assembly_members.index.title", scope: "decidim")) %>
 
+<%
+edit_link(
+  decidim_admin_assemblies.assembly_members_path(current_participatory_space.slug),
+  :update,
+  :assembly,
+  assembly: current_participatory_space
+)
+%>
+
 <div class="section row column">
   <div class="flex--sbe">
     <h3 class="section-heading"><%= t(".members") %> <span class="text-muted">(<%= collection.size %>)</span></h3>

data/app/views/layouts/decidim/admin/assembly_members.html.erb

@@ -0,0 +1,18 @@
+<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
+<% content_for :sidebar_menu_nav do %>
+  <%= sidebar_menu(:admin_assembly_menu).render do
+    public_page_link decidim_assemblies.assembly_assembly_members_path(current_participatory_space)
+  end %>
+<% end %>
+
+<%= render "layouts/decidim/admin/application" do %>
+  <div class="process-title">
+    <div class="process-title-content">
+      <%= link_to translated_attribute(current_participatory_space.title), decidim_assemblies.assembly_path(current_participatory_space), target: "_blank" %>
+    </div>
+  </div>
+
+  <div class="process-content">
+    <%= yield %>
+  </div>
+<% end %>

data/config/locales/ar.yml

@@ -56,7 +56,6 @@ ar:
         birthplace: مكان الازدياد
         ceased_date: تاريخ التوقف
         designation_date: تاريخ التعيين
-        designation_mode: وضع التعيين
         full_name: الاسم الكامل
         gender: الجنس
         position: الموقع

data/config/locales/ca.yml

@@ -59,9 +59,9 @@ ca:
         birthplace: Lloc de naixement
         ceased_date: Data de cessament
         designation_date: Data de designació
-        designation_mode: Mode de designació
         full_name: Nom complet
         gender: Gènere
+        non_user_avatar: Avatar
         position: Posició
         user_id: Participant o grup
       assembly_user_role:
@@ -182,6 +182,9 @@ ca:
         update:
           error: S'ha produït un error en actualitzar una administradora per a aquesta assemblea.
           success: L'administradora s'ha actualitzat correctament per a aquesta assemblea.
+      filters:
+        decidim_assemblies_type_id_eq:
+          label: Tipus d'assemblea
       menu:
         assemblies: Assemblees
         assemblies_settings: Configuració
@@ -296,6 +299,7 @@ ca:
         assembly_members:
           form:
             existing_user: Participant existent
+            explanation: 'Instruccions per a la imatge:'
             non_user: No participant
             select_a_position: Selecciona una posició
             select_user: Selecciona una participant