decidim-assemblies 0.19.0 → 0.22.0

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

@@ -14,6 +14,12 @@ module Decidim
             @processes_selected ||= current_assembly.linked_participatory_space_resources(:participatory_processes, "included_participatory_processes").pluck(:id)
           end
         end
+
+        # Public: A collection of Assemblies that can be selected as parent
+        # assemblies for another assembly; to be used in forms.
+        def parent_assemblies_for_select
+          @parent_assemblies_for_select ||= ParentAssembliesForSelect.for(current_organization, current_assembly)
+        end
       end
     end
   end

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

@@ -45,9 +45,12 @@ module Decidim
           html += "<span class='definition-data__title'>#{t("assemblies.show.social_networks", scope: "decidim")}</span>".html_safe
           Decidim::Assembly::SOCIAL_HANDLERS.each do |handler|
             handler_name = "#{handler}_handler"
-            if assembly.send(handler_name).present?
-              html += link_to handler.capitalize, "https://#{handler}.com/#{assembly.send(handler_name)}", target: "_blank", class: "", title: handler.capitalize, rel: "noopener"
-            end
+            next if assembly.send(handler_name).blank?
+
+            html += link_to handler.capitalize, "https://#{handler}.com/#{assembly.send(handler_name)}",
+                            target: "_blank",
+                            class: "",
+                            title: t("assemblies.show.social_networks_title", scope: "decidim") << " " << handler.capitalize.to_s, rel: "noopener"
           end
           html += "</div>".html_safe
         end

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

@@ -7,10 +7,10 @@ module Decidim
     # `filter` returns a Filter object from Decidim::FilterResource
     module FilterAssembliesHelper
       def available_filters
-        %w(all) + Assembly::ASSEMBLY_TYPES
+        @available_filters ||= [t("all", scope: "decidim.assemblies.filter")] + organization_assembly_types
       end
 
-      def filter_link(filter_name)
+      def filter_link(type_id)
         Decidim::Assemblies::Engine
           .routes
           .url_helpers
@@ -18,7 +18,7 @@ module Decidim
             filter: {
               scope_id: filter.scope_id,
               area_id: filter.area_id,
-              assembly_type: filter_name
+              type_id: type_id
             }
           )
       end
@@ -27,12 +27,15 @@ module Decidim
         t("help", scope: "decidim.assemblies.filter")
       end
 
-      def filter_name(filter_key)
-        t(filter_key, scope: "decidim.assemblies.filter")
+      def current_filter_name
+        type = AssembliesType.find_by(id: filter.type_id)
+        return translated_attribute type.title if type
+
+        t("all", scope: "decidim.assemblies.filter")
       end
 
-      def current_filter_name
-        filter_name(filter.assembly_type)
+      def organization_assembly_types
+        AssembliesType.where(organization: current_organization)&.map { |type| [translated_attribute(type.title), type.id] }
       end
     end
   end

data/app/models/decidim/assemblies_setting.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Assemblies setting.
+  class AssembliesSetting < ApplicationRecord
+    include Decidim::Traceable
+    include Decidim::Loggable
+
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Decidim::Organization"
+
+    def self.log_presenter_class_for(_log)
+      Decidim::Assemblies::AdminLog::AssembliesSettingPresenter
+    end
+  end
+end

data/app/models/decidim/assemblies_type.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Assembly type.
+  class AssembliesType < ApplicationRecord
+    include Decidim::Traceable
+    include Decidim::Loggable
+
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Decidim::Organization"
+
+    has_many :assemblies,
+             foreign_key: "decidim_assemblies_type_id",
+             class_name: "Decidim::Assembly",
+             dependent: :nullify
+
+    validates :title, presence: true
+
+    def self.log_presenter_class_for(_log)
+      Decidim::Assemblies::AdminLog::AssembliesTypePresenter
+    end
+  end
+end

data/app/models/decidim/assembly.rb

@@ -31,9 +31,9 @@ module Decidim
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
     include Decidim::HasPrivateUsers
+    include Decidim::Searchable
 
     SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github].freeze
-    ASSEMBLY_TYPES = %w(government executive consultative_advisory participatory working_group commission others).freeze
     CREATED_BY = %w(city_council public others).freeze
 
     belongs_to :organization,
@@ -43,6 +43,10 @@ module Decidim
                foreign_key: "decidim_area_id",
                class_name: "Decidim::Area",
                optional: true
+    belongs_to :assembly_type,
+               foreign_key: "decidim_assemblies_type_id",
+               class_name: "Decidim::AssembliesType",
+               optional: true
     has_many :categories,
              foreign_key: "decidim_participatory_space_id",
              foreign_type: "decidim_participatory_space_type",
@@ -68,6 +72,18 @@ module Decidim
     after_create :set_parents_path
     after_update :set_parents_path, :update_children_paths, if: :saved_change_to_parent_id?
 
+    searchable_fields({
+                        scope_id: :decidim_scope_id,
+                        participatory_space: :itself,
+                        A: :title,
+                        B: :subtitle,
+                        C: :short_description,
+                        D: :description,
+                        datetime: :published_at
+                      },
+                      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
@@ -135,6 +151,13 @@ module Decidim
       closing_date < Date.current
     end
 
+    def user_roles(role_name = nil)
+      roles = Decidim::AssemblyUserRole.where(assembly: self)
+      return roles if role_name.blank?
+
+      roles.where(role: role_name)
+    end
+
     private
 
     # When an assembly changes their parent, we need to update the parents_path attribute
@@ -188,7 +211,7 @@ module Decidim
 
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
     ransacker :title do |parent|
-      Arel::Nodes::InfixOperation.new("->", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
+      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
     end
   end
 end

data/app/models/decidim/assembly_user_role.rb

@@ -11,7 +11,7 @@ module Decidim
     belongs_to :assembly, foreign_key: "decidim_assembly_id", class_name: "Decidim::Assembly", optional: true
     alias participatory_space assembly
 
-    ROLES = %w(admin collaborator moderator).freeze
+    ROLES = %w(admin collaborator moderator valuator).freeze
     validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :assembly] }
     validate :user_and_assembly_same_organization
 

data/app/permissions/decidim/assemblies/permissions.rb

@@ -30,16 +30,20 @@ module Decidim
         return permission_action unless permission_action.scope == :admin
 
         user_can_read_assembly_list?
+        user_can_list_assembly_list?
         user_can_read_current_assembly?
         user_can_create_assembly?
+        user_can_read_assemblies_setting?
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
+        assemblies_type_action?
 
         return permission_action unless assembly
 
         moderator_action?
         collaborator_action?
+        valuator_action?
         assembly_admin_action?
 
         permission_action
@@ -47,6 +51,21 @@ module Decidim
 
       private
 
+      def assemblies_type_action?
+        return unless [:assembly_type, :assemblies_type].include? permission_action.subject
+        return disallow! unless user.admin?
+
+        assembly_type = context.fetch(:assembly_type, nil)
+        case permission_action.action
+        when :destroy
+          assemblies_is_empty = assembly_type && assembly_type.assemblies.empty?
+
+          toggle_allow(assemblies_is_empty)
+        else
+          allow!
+        end
+      end
+
       # It's an admin user if it's an organization admin or is a space admin
       # for the current `assembly`.
       def admin_user?
@@ -148,6 +167,13 @@ module Decidim
         toggle_allow(user.admin?)
       end
 
+      def user_can_read_assemblies_setting?
+        return unless permission_action.action == :read &&
+                      permission_action.subject == :assemblies_setting
+
+        toggle_allow(user.admin?)
+      end
+
       # Everyone can read the assembly list
       def user_can_read_assembly_list?
         return unless read_assembly_list_permission_action?
@@ -155,6 +181,25 @@ module Decidim
         toggle_allow(user.admin? || has_manageable_assemblies?)
       end
 
+      # Checks whether the user can list the current given assembly or not.
+      #
+      # In case of user being admin of child assembly even parent assembly
+      # should be listed to be able to navigate to child assembly
+      def user_can_list_assembly_list?
+        return unless permission_action.action == :list &&
+                      permission_action.subject == :assembly
+
+        toggle_allow(user.admin? || allowed_list_of_assemblies?)
+      end
+
+      def allowed_list_of_assemblies?
+        assemblies = AssembliesWithUserRole.for(user)
+        parent_assemblies = assemblies.flat_map { |assembly| [assembly.id] + assembly.ancestors.pluck(:id) }
+
+        allowed_list_of_assemblies = Decidim::Assembly.where(id: assemblies + parent_assemblies)
+        allowed_list_of_assemblies.uniq.member?(assembly)
+      end
+
       def user_can_read_current_assembly?
         return unless read_assembly_list_permission_action?
         return if permission_action.subject == :assembly_list
@@ -177,6 +222,14 @@ module Decidim
         allow! if permission_action.action == :read || permission_action.action == :preview
       end
 
+      # Valuators can only read the assembly components
+      def valuator_action?
+        return unless can_manage_assembly?(role: :valuator)
+
+        allow! if permission_action.action == :read && permission_action.subject == :component
+        allow! if permission_action.action == :export && permission_action.subject == :component_data
+      end
+
       # Process admins can perform everything *inside* that assembly. They cannot
       # create a assembly or perform actions on assembly groups or other
       # assemblies.
@@ -214,7 +267,8 @@ module Decidim
           :assembly,
           :assembly_user_role,
           :assembly_member,
-          :space_private_user
+          :space_private_user,
+          :assemblies_setting
         ].include?(permission_action.subject)
         allow! if is_allowed
       end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module AdminLog
+      # This class holds the logic to present a `Decidim::AssembliesSetting`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    AssembliesSettingPresenter.new(action_log, view_helpers).present
+      class AssembliesSettingPresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "update"
+            "decidim.admin_log.assembly_setting.#{action}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module AdminLog
+      # This class holds the logic to present a `Decidim::AssembliesType`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    AssembliesTypePresenter.new(action_log, view_helpers).present
+      class AssembliesTypePresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          {
+            title: :i18n
+          }
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.assemblies_type"
+        end
+
+        def action_string
+          case action
+          when "create", "delete", "update"
+            "decidim.admin_log.assembly_type.#{action}"
+          else
+            super
+          end
+        end
+
+        def has_diff?
+          action == "delete" || super
+        end
+      end
+    end
+  end
+end

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

@@ -37,8 +37,7 @@ module Decidim
             target: :i18n,
             title: :i18n,
             purpose_of_action: :i18n,
-            assembly_type: :string,
-            assembly_type_other: :i8n,
+            decidim_assemblies_type_id: :assembly_type,
             creation_date: :date,
             created_by: :string,
             created_by_other: :i18n,

data/app/presenters/decidim/assemblies/assembly_stats_presenter.rb

@@ -38,7 +38,7 @@ module Decidim
 
       def render_stats_data(component_manifest, name, data, index)
         safe_join([
-                    index.zero? ? manifest_icon(component_manifest) : " /&nbsp".html_safe,
+                    index.zero? ? manifest_icon(component_manifest, role: "img", "aria-hidden": true) : " /&nbsp".html_safe,
                     content_tag(:span, "#{number_with_delimiter(data)} " + I18n.t(name, scope: "decidim.assemblies.statistics"),
                                 class: "#{name} process_stats-text")
                   ])

data/app/presenters/decidim/log/value_types/assembly_type_presenter.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Log
+    module ValueTypes
+      # This class presents the given value as a Decidim::AssembliesType. Check
+      # the `DefaultPresenter` for more info on how value
+      # presenters work.
+      class AssemblyTypePresenter < DefaultPresenter
+        # Public: Presents the value as a Decidim::AssembliesType. If the type can
+        # be found, it shows its title. Otherwise it shows its ID.
+        #
+        # Returns an HTML-safe String.
+        def present
+          return unless value
+          return h.translated_attribute(type.title) if type
+
+          I18n.t("not_found", id: value, scope: "decidim.log.value_types.assembly_type_presenter")
+        end
+
+        private
+
+        def type
+          @type ||= Decidim::AssembliesType.find_by(id: value)
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/assemblies/filtered_assemblies.rb

@@ -13,9 +13,9 @@ module Decidim
       end
 
       def query
-        return assemblies.all if @filter == "all"
+        return assemblies.all if @filter.blank?
 
-        assemblies.where(assembly_type: @filter)
+        assemblies.where(decidim_assemblies_type_id: @filter)
       end
     end
   end

data/app/queries/decidim/assemblies/parent_assemblies_for_select.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This query filters assemblies that can be assigned as parents for an assembly.
+    class ParentAssembliesForSelect < Rectify::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      def self.for(organization, assembly)
+        new(organization, assembly).query
+      end
+
+      # Initializes the class.
+      def initialize(organization, assembly)
+        @organization = organization
+        @assembly = assembly
+      end
+
+      # Finds the available assemblies
+      #
+      # Returns an ActiveRecord::Relation.
+      def query
+        available_assemblies = Assembly.where(organization: @organization).where.not(id: @assembly)
+
+        return available_assemblies if @assembly.blank?
+
+        available_assemblies.where.not(id: descendant_ids)
+      end
+
+      private
+
+      def descendant_ids
+        recursive_children(@assembly).flatten
+      end
+
+      def recursive_children(model)
+        model.children.map do |child|
+          [recursive_children(child), child.id]
+        end
+      end
+    end
+  end
+end