decidim-assemblies 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bce95b5a50ca5a51acc8ec5006c31433e1221e6c4261797ceeb55a4440df460
-  data.tar.gz: 33e3a8271d02f6f50816d6a554212877d50ecccd96835e291b9e24675011d1ad
+  metadata.gz: 59b7c6152c1d1c2c96dc32b800435039413c4a9ad9e91150dd5101251af5fdba
+  data.tar.gz: 9d4370974c2dacb07d232fee8dcde3aa92a3b74e86b7aaf836860c32a3120ec2
 SHA512:
-  metadata.gz: fe93f7eab23f14845eb11443873be2dff139b860c021284197a50b1bbc0dd4e49715cd0a357cd903c0a5123221c74db4c2e832b8993878fba4b611613eaed698
-  data.tar.gz: f2aa517dd035ff6c746e545f15f54e7c93ddc3778ae90c63f29444554ee1fc8c9d8d60679f69a2864f629ecb7e60721d36e7b7185ce0b9f305fbe1e72412f6d3
+  metadata.gz: 84c422de10b4da4aac9d0e3e7ec291bd32664641d8a163ab68072615c5d23816a7c804939b1023b930c9fbfec93cccdcb5a990a1ed62e28ba2ec5ce4c3e283ea
+  data.tar.gz: 918d1933d6bc85ff6d3044a4db73a7576b187b5731e00fc2c9789e671466bbe560590410c72a4178280c9c50336195650633a63bdfa28f29332aa382df8a0b33

data/app/cells/decidim/assemblies/assembly_m_cell.rb

@@ -64,11 +64,7 @@ module Decidim
       end
 
       def assembly_type
-        if model.assembly_type == "others"
-          translated_attribute(model.assembly_type_other)
-        else
-          t("assembly_types.#{model.assembly_type}", scope: "decidim.assemblies").to_s
-        end
+        translated_attribute model.assembly_type.title
       end
     end
   end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A command with all the business logic when creating a new assembly
+      # type in the system.
+      class CreateAssembliesType < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          create_assemblies_type!
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form
+
+        def create_assemblies_type!
+          Decidim.traceability.create!(
+            AssembliesType,
+            form.current_user,
+            organization: form.current_organization,
+            title: form.title
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -67,7 +67,6 @@ module Decidim
             purpose_of_action: form.purpose_of_action,
             composition: form.composition,
             assembly_type: form.assembly_type,
-            assembly_type_other: form.assembly_type_other,
             creation_date: form.creation_date,
             created_by: form.created_by,
             created_by_other: form.created_by_other,
@@ -104,7 +103,7 @@ module Decidim
         end
 
         def link_participatory_processes(assembly)
-          assembly.link_participatory_spaces_resources(participatory_processes(assembly), "included_participatory_processes")
+          assembly.link_participatory_space_resources(participatory_processes(assembly), "included_participatory_processes")
         end
       end
     end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A command with all the business logic when destroying an assembly
+      # type in the system.
+      class DestroyAssembliesType < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # assemblies_type - the AssemblyMember to destroy
+        # current_user - the user performing the action
+        def initialize(assemblies_type, current_user)
+          @assemblies_type = assemblies_type
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          destroy_assembly_type!
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :current_user
+
+        def destroy_assembly_type!
+          Decidim.traceability.perform_action!(
+            "delete",
+            @assemblies_type,
+            current_user
+          ) do
+            @assemblies_type.destroy!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A command with all the business logic when updating a new assembly
+      # type in the system.
+      class UpdateAssembliesType < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # assemblies_type - A assemblies_type object to update.
+        # form - A form object with the params.
+        def initialize(assemblies_type, form)
+          @assemblies_type = assemblies_type
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          update_assemblies_type!
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form
+
+        def update_assemblies_type!
+          Decidim.traceability.update!(
+            @assemblies_type,
+            form.current_user,
+            title: form.title
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -84,7 +84,6 @@ module Decidim
             purpose_of_action: form.purpose_of_action,
             composition: form.composition,
             assembly_type: form.assembly_type,
-            assembly_type_other: form.assembly_type_other,
             creation_date: form.creation_date,
             created_by: form.created_by,
             created_by_other: form.created_by_other,
@@ -108,7 +107,7 @@ module Decidim
         end
 
         def link_participatory_processes(assembly)
-          assembly.link_participatory_spaces_resources(participatory_processes(assembly), "included_participatory_processes")
+          assembly.link_participatory_space_resources(participatory_processes(assembly), "included_participatory_processes")
         end
 
         # Resets the children counter cache to its correct value using an SQL count query.

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Assemblies
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          # Unless we are explicitly looking for child assemblies, we filter them out.
+          def base_query
+            return collection if ransack_params[:parent_id_eq]
+
+            collection.parent_assemblies
+          end
+
+          def extra_filters
+            [:parent_id_eq]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,13 +6,13 @@ module Decidim
       # Controller that allows managing assemblies.
       #
       class AssembliesController < Decidim::Assemblies::Admin::ApplicationController
-        include Decidim::Paginable
-        helper_method :current_assembly, :parent_assembly, :parent_assemblies, :current_participatory_space, :query
+        include Decidim::Assemblies::Admin::Filterable
+        helper_method :current_assembly, :parent_assembly, :current_participatory_space
         layout "decidim/admin/assemblies"
 
         def index
           enforce_permission_to :read, :assembly_list
-          @assemblies = collection
+          @assemblies = filtered_collection
         end
 
         def new
@@ -28,7 +28,7 @@ module Decidim
           CreateAssembly.call(@form) do
             on(:ok) do |assembly|
               flash[:notice] = I18n.t("assemblies.create.success", scope: "decidim.admin")
-              redirect_to assemblies_path(parent_id: assembly.parent_id)
+              redirect_to assemblies_path(q: { parent_id_eq: assembly.parent_id })
             end
 
             on(:invalid) do
@@ -70,35 +70,20 @@ module Decidim
 
         private
 
-        def organization_assemblies
-          @organization_assemblies ||= OrganizationAssemblies.new(current_user.organization).query
-        end
-
-        def query
-          organization_assemblies
-            .where(parent_id: params[:parent_id])
-            .ransack(params[:q])
-        end
-
         def collection
-          @collection ||= paginate(query.result)
+          @collection ||= OrganizationAssemblies.new(current_user.organization).query
         end
 
         def current_assembly
-          scope = organization_assemblies
-          @current_assembly ||= scope.where(slug: params[:slug]).or(
-            scope.where(id: params[:slug])
+          @current_assembly ||= collection.where(slug: params[:slug]).or(
+            collection.where(id: params[:slug])
           ).first
         end
 
         alias current_participatory_space current_assembly
 
         def parent_assembly
-          @parent_assembly ||= organization_assemblies.find_by(id: params[:parent_id])
-        end
-
-        def parent_assemblies
-          @parent_assemblies ||= organization_assemblies.where.not(id: current_assembly)
+          @parent_assembly ||= collection.find_by(id: ransack_params[:parent_id_eq])
         end
 
         def assembly_params

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

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller used to manage the available assemblies types for the current
+      # organization.
+      # As this substitues former i18n simple hash we need to keep these i18n keys for migrations
+      # and rollbakcs. So let i18n-tasks know about:
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.government')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.commission')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.consultative_advisory')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.executive')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.others')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.participatory')
+      # i18n-tasks-use t('decidim.assemblies.assembly_types.working_group')
+      # This comment (and the i18n keys) may be removed in future versions
+      class AssembliesTypesController < Decidim::Assemblies::Admin::ApplicationController
+        helper_method :available_assemblies_types, :current_assembly_type
+        layout "decidim/admin/assemblies"
+
+        # GET /admin/assemblies_types
+        def index
+          enforce_permission_to :index, :assembly_type
+        end
+
+        # GET /admin/assemblies_types/new
+        def new
+          enforce_permission_to :create, :assembly_type
+          @form = assembly_type_form.instance
+        end
+
+        # POST /admin/assemblies_types
+        def create
+          enforce_permission_to :create, :assembly_type
+          @form = assembly_type_form.from_params(params)
+
+          CreateAssembliesType.call(@form) do
+            on(:ok) do |_assembly_type|
+              flash[:notice] = I18n.t("assemblies_types.create.success", scope: "decidim.admin")
+              redirect_to assemblies_types_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assemblies_types.create.error", scope: "decidim.admin")
+              render :new
+            end
+          end
+        end
+
+        # GET /admin/assemblies_types/:id/edit
+        def edit
+          enforce_permission_to :edit, :assembly_type, assembly_type: current_assembly_type
+          @form = assembly_type_form
+                  .from_model(current_assembly_type,
+                              assembly_type: current_assembly_type)
+        end
+
+        # PUT /admin/assemblies_types/:id
+        def update
+          enforce_permission_to :update, :assembly_type, assembly_type: current_assembly_type
+
+          @form = assembly_type_form
+                  .from_params(params, assembly_type: current_assembly_type)
+
+          UpdateAssembliesType.call(current_assembly_type, @form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assemblies_types.update.success", scope: "decidim.admin")
+              redirect_to assemblies_types_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assemblies_types.update.error", scope: "decidim.admin")
+              render :edit
+            end
+          end
+        end
+
+        # DELETE /admin/assemblies_types/:id
+        def destroy
+          enforce_permission_to :destroy, :assembly_type, assembly_type: current_assembly_type
+
+          DestroyAssembliesType.call(current_assembly_type, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assemblies_types.destroy.success", scope: "decidim.admin")
+              redirect_to assemblies_types_path
+            end
+          end
+        end
+
+        private
+
+        def available_assemblies_types
+          @available_assemblies_types ||= AssembliesType.where(organization: current_organization)
+        end
+
+        def current_assembly_type
+          @current_assembly_type ||= AssembliesType.find(params[:id])
+        end
+
+        def assembly_type_form
+          form(Decidim::Assemblies::Admin::AssembliesTypeForm)
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/assemblies_controller.rb

@@ -56,7 +56,7 @@ module Decidim
         {
           scope_id: nil,
           area_id: nil,
-          assembly_type: "all"
+          type_id: nil
         }
       end
 

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A form object used to create assembly type from the admin dashboard.
+      class AssembliesTypeForm < Form
+        include TranslatableAttributes
+
+        mimic :assemblies_type
+
+        translatable_attribute :title, String
+        validates :title, translatable_presence: true
+      end
+    end
+  end
+end

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

@@ -9,12 +9,10 @@ module Decidim
       class AssemblyForm < Form
         include TranslatableAttributes
 
-        ASSEMBLY_TYPES = %w(government executive consultative_advisory participatory working_group commission others).freeze
         CREATED_BY = %w(city_council public others).freeze
 
         mimic :assembly
 
-        translatable_attribute :assembly_type_other, String
         translatable_attribute :composition, String
         translatable_attribute :closing_date_reason, String
         translatable_attribute :created_by_other, String
@@ -32,7 +30,6 @@ module Decidim
         translatable_attribute :target, String
         translatable_attribute :title, String
 
-        attribute :assembly_type, String
         attribute :created_by, String
         attribute :facebook_handler, String
         attribute :github_handler, String
@@ -42,6 +39,7 @@ module Decidim
         attribute :twitter_handler, String
         attribute :youtube_handler, String
 
+        attribute :decidim_assemblies_type_id, Integer
         attribute :area_id, Integer
         attribute :parent_id, Integer
         attribute :participatory_processes_ids, Array[Integer]
@@ -69,8 +67,8 @@ module Decidim
         validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
 
         validate :slug_uniqueness
+        validate :same_type_organization, if: ->(form) { form.decidim_assemblies_type_id }
 
-        validates :assembly_type_other, translatable_presence: true, if: ->(form) { form.assembly_type == "others" }
         validates :created_by_other, translatable_presence: true, if: ->(form) { form.created_by == "others" }
         validates :title, :subtitle, :description, :short_description, translatable_presence: true
 
@@ -94,12 +92,8 @@ module Decidim
         end
 
         def assembly_types_for_select
-          ASSEMBLY_TYPES.map do |type|
-            [
-              I18n.t("assembly_types.#{type}", scope: "decidim.assemblies"),
-              type
-            ]
-          end
+          @assembly_types_for_select ||= organization_assembly_types
+                                          &.map { |type| [translated_attribute(type.title), type.id] }
         end
 
         def created_by_for_select
@@ -121,8 +115,16 @@ module Decidim
                                     &.sort_by { |arr| arr[0] }
         end
 
+        def assembly_type
+          AssembliesType.find_by(id: decidim_assemblies_type_id)
+        end
+
         private
 
+        def organization_assembly_types
+          AssembliesType.where(organization: current_organization)
+        end
+
         def organization_participatory_processes
           Decidim.find_participatory_space_manifest(:participatory_processes)
                  .participatory_spaces.call(current_organization)
@@ -140,6 +142,13 @@ module Decidim
 
           errors.add(:slug, :taken)
         end
+
+        def same_type_organization
+          return unless assembly_type
+          return if assembly_type.organization == current_organization
+
+          errors.add(:assembly_type, :invalid)
+        end
       end
     end
   end