decidim-assemblies 0.20.1 → 0.21.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/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_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

@@ -34,7 +34,6 @@ module Decidim
     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,
@@ -44,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",
@@ -148,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
@@ -201,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

@@ -35,11 +35,13 @@ module Decidim
 
         # 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 +49,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?
@@ -177,6 +194,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.

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/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,23 @@
+# 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
+
+      def query
+        Assembly.where(organization: @organization).where.not(id: @assembly)
+      end
+    end
+  end
+end

data/app/services/decidim/assemblies/assembly_search.rb

@@ -8,10 +8,10 @@ module Decidim
         super(Assembly.all, options)
       end
 
-      def search_assembly_type
-        return query if assembly_type == "all"
+      def search_type_id
+        return query if type_id.blank?
 
-        query.where(assembly_type: assembly_type)
+        query.where(decidim_assemblies_type_id: type_id)
       end
     end
   end

data/app/types/decidim/assemblies/assemblies_type_type.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This type represents an AssembliesType.
+    AssembliesTypeType = GraphQL::ObjectType.define do
+      name "AssembliesType"
+      description "An assemblies type"
+
+      field :id, !types.ID, "The assemblies type's unique ID"
+      field :title, !Decidim::Core::TranslatedFieldType, "The title of this assemblies type."
+      field :createdAt, !Decidim::Core::DateTimeType, "The time this assemblies type was created", property: :created_at
+      field :updatedAt, !Decidim::Core::DateTimeType, "The time this assemblies type was updated", property: :updated_at
+      field :assemblies, !types[Decidim::Assemblies::AssemblyType], "Assemblies with this assemblies type"
+    end
+  end
+end

data/app/types/decidim/assemblies/assembly_member_type.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This type represents a assembly.
+    AssemblyMemberType = GraphQL::ObjectType.define do
+      name "AssemblyMember"
+      description "An assembly member"
+
+      field :id, !types.ID, "Internal ID of the member"
+      field :fullName, types.String, "Full name of the member", property: :full_name
+      field :position, types.String, "Position of the member in the assembly"
+
+      field :user, Decidim::Core::UserType, "The corresponding decidim user", property: :user
+
+      field :createdAt, Decidim::Core::DateTimeType, "The time this member was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The time this member was updated", property: :updated_at
+
+      field :weight, types.Int, "Order of appearance in which it should be represented"
+      field :gender, types.String, "Gender of the member"
+      # field :birthday, Decidim::Core::DateType, "Birthday date of the member" # non-public currently
+      field :birthplace, types.String, "Birthplace of the member"
+      field :designationDate, Decidim::Core::DateType, "Date of designation of the member", property: :designation_date
+      # field :designationMode, types.String, "Mode in which the member was designated", property: :designation_mode # non-public currently
+      field :positionOther, types.String, "Custom position name", property: :position_other
+      field :ceasedDate, Decidim::Core::DateType, "Date of cease for the member", property: :ceased_date
+    end
+  end
+end

data/app/types/decidim/assemblies/assembly_type.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This type represents a assembly.
+    AssemblyType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ParticipatorySpaceInterface },
+        -> { Decidim::Core::AttachableInterface },
+        -> { Decidim::Core::ParticipatorySpaceResourceableInterface }
+      ]
+
+      name "Assembly"
+      description "An assembly"
+
+      field :id, !types.ID, "The internal ID for this assembly"
+      field :subtitle, Decidim::Core::TranslatedFieldType, "The subtitle of this assembly"
+      field :shortDescription, Decidim::Core::TranslatedFieldType, "The sort description of this assembly", property: :short_description
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this assembly"
+      field :slug, !types.String, "The slug of this assembly"
+      field :hashtag, types.String, "The hashtag for this assembly"
+      field :createdAt, !Decidim::Core::DateTimeType, "The time this assembly was created", property: :created_at
+      field :updatedAt, !Decidim::Core::DateTimeType, "The time this assembly was updated", property: :updated_at
+      field :publishedAt, !Decidim::Core::DateTimeType, "The time this assembly was published", property: :published_at
+      field :reference, !types.String, "Reference for this assembly"
+      field :categories, !types[Decidim::Core::CategoryType], "Categories for this assembly"
+
+      field :heroImage, types.String, "The hero image for this assembly", property: :hero_image
+      field :bannerImage, types.String, "The banner image for this assembly", property: :banner_image
+      field :promoted, types.Boolean, "If this assembly is promoted (therefore in the homepage)"
+      field :developerGroup, Decidim::Core::TranslatedFieldType, "The promoter group of this assembly", property: :developer_group
+      field :metaScope, Decidim::Core::TranslatedFieldType, "The scope metadata of this assembly", property: :meta_scope
+      field :localArea, Decidim::Core::TranslatedFieldType, "The organization area of this assembly", property: :local_area
+      field :target, Decidim::Core::TranslatedFieldType, "Who participates in this assembly"
+      field :participatoryScope, Decidim::Core::TranslatedFieldType, "What is decided on this assembly", property: :participatory_scope
+      field :participatoryStructure, Decidim::Core::TranslatedFieldType, "How it is decided on this assembly", property: :participatory_structure
+      field :showStatistics, types.Boolean, "If this assembly should show statistics", property: :show_statistics
+      field :scopesEnabled, types.Boolean, "If this assembly has scopes enabled", property: :scopes_enabled
+      field :privateSpace, types.Boolean, "If this assembly is a private space", property: :private_space
+      field :area, Decidim::Core::AreaApiType, "Area of this assembly"
+      field :parent, Decidim::Assemblies::AssemblyType, "The parent assembly of this assembly"
+      field :parentsPath, types.String, "Assembly hierarchy representation", property: :parents_path
+      field :childrenCount, types.Int, "Number of children assemblies", property: :children_count
+      field :purposeOfAction, Decidim::Core::TranslatedFieldType, "Purpose of action", property: :purpose_of_action
+      field :composition, Decidim::Core::TranslatedFieldType, "Composition of this assembly"
+      field :assemblyType, Decidim::Assemblies::AssembliesTypeType, "Type of the assembly", property: :assembly_type
+      field :creationDate, Decidim::Core::DateType, "Creation date of this assembly", property: :creation_date
+      field :createdBy, types.String, "The creator of this assembly", property: :created_by
+      field :createdByOther, Decidim::Core::TranslatedFieldType, "Custom creator", property: :created_by_other
+      field :duration, Decidim::Core::DateType, "Duration of this assembly"
+      field :includedAt, Decidim::Core::DateType, "Included at", property: :included_at
+      field :closingDate, Decidim::Core::DateType, "Closing date of the assembly", property: :closing_date
+      field :closingDateReason, Decidim::Core::TranslatedFieldType, "Closing date reason of this assembly", property: :closing_date_reason
+      field :internalOrganisation, Decidim::Core::TranslatedFieldType, "Internal organisation of this assembly", property: :internal_organisation
+      field :isTransparent, types.Boolean, "If this assembly is transparent", property: :is_transparent
+      field :specialFeatures, Decidim::Core::TranslatedFieldType, "Special features of this assembly", property: :special_features
+      field :twitterHandler, types.String, "Twitter handler", property: :twitter_handler
+      field :instagramHandler, types.String, "Instagram handler", property: :instagram_handler
+      field :facebookHandler, types.String, "Facebook handler", property: :facebook_handler
+      field :youtubeHandler, types.String, "Youtube handler", property: :youtube_handler
+      field :githubHandler, types.String, "Github handler", property: :github_handler
+
+      field :members, !types[Decidim::Assemblies::AssemblyMemberType], "Members of this assembly"
+      field :children, !types[Decidim::Assemblies::AssemblyType], "Childrens of this assembly"
+    end
+  end
+end

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

@@ -1,15 +1,17 @@
 <div id="assemblies-filter" class="inline-filters">
-  <label>
-    <span><%= help_text %></span>
-    <button id="button-text" data-toggle="inline-filter-sort"><%= current_filter_name %></button>
-    <div id="inline-filter-sort" class="dropdown-pane" data-position="bottom" data-alignment="right" data-dropdown data-auto-focus="true">
-      <ul class="list-reset">
-        <% available_filters.each do |filter| %>
-          <%= link_to filter_link(filter), remote: true do %>
-            <li><%= filter_name(filter) %></li>
+  <% if available_filters.any? %>
+    <label>
+      <span><%= help_text %></span>
+      <button id="button-text" data-toggle="inline-filter-sort"><%= current_filter_name %></button>
+      <div id="inline-filter-sort" class="dropdown-pane" data-position="bottom" data-alignment="right" data-dropdown data-auto-focus="true">
+        <ul class="list-reset">
+          <% available_filters.each do |title, id| %>
+            <%= link_to filter_link(id), remote: true do %>
+              <li><%= title %></li>
+            <% end %>
           <% end %>
-        <% end %>
-      </ul>
-    </div>
-  </label>
+        </ul>
+      </div>
+    </label>
+  <% end %>
 </div>