decidim-participatory_processes 0.23.0 → 0.24.0.rc1

data/app/commands/decidim/participatory_processes/admin/create_participatory_process_group.rb

@@ -46,10 +46,19 @@ module Decidim
             ) do
               ParticipatoryProcessGroup.create(
                 organization: form.current_organization,
-                name: form.name,
+                title: form.title,
                 description: form.description,
+                hashtag: form.hashtag,
+                group_url: form.group_url,
                 hero_image: form.hero_image, # Keep after organization
-                participatory_processes: participatory_processes
+                participatory_processes: participatory_processes,
+                developer_group: form.developer_group,
+                local_area: form.local_area,
+                meta_scope: form.meta_scope,
+                participatory_scope: form.participatory_scope,
+                participatory_structure: form.participatory_structure,
+                target: form.target,
+                promoted: form.promoted
               )
             end
           end

data/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb

@@ -55,6 +55,7 @@ module Decidim
           {
             title: form.title,
             subtitle: form.subtitle,
+            weight: form.weight,
             slug: form.slug,
             hashtag: form.hashtag,
             promoted: form.promoted,

data/app/commands/decidim/participatory_processes/admin/update_participatory_process_group.rb

@@ -51,11 +51,20 @@ module Decidim
 
         def attributes
           {
-            name: form.name,
+            title: form.title,
             hero_image: form.hero_image,
             remove_hero_image: form.remove_hero_image,
             description: form.description,
-            participatory_processes: participatory_processes
+            hashtag: form.hashtag,
+            group_url: form.group_url,
+            participatory_processes: participatory_processes,
+            developer_group: form.developer_group,
+            local_area: form.local_area,
+            meta_scope: form.meta_scope,
+            participatory_scope: form.participatory_scope,
+            participatory_structure: form.participatory_structure,
+            target: form.target,
+            promoted: form.promoted
           }
         end
 

data/app/commands/decidim/participatory_processes/admin/update_participatory_process_step.rb

@@ -7,6 +7,7 @@ module Decidim
       # process in the system.
       class UpdateParticipatoryProcessStep < Rectify::Command
         attr_reader :step
+
         # Public: Initializes the command.
         #
         # step - the ParticipatoryProcessStep to update

data/app/controllers/decidim/participatory_processes/admin/imports_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # This controller allows importing things.
+      # It is targeted for customizations for importing things that lives under
+      # a participatory process.
+      class ImportsController < Decidim::Admin::ImportsController
+        include Concerns::ParticipatoryProcessAdmin
+      end
+    end
+  end
+end

data/app/controllers/decidim/participatory_processes/admin/moderations/reports_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      module Moderations
+        # This controller allows admins to manage moderation reports in a participatory process.
+        class ReportsController < Decidim::Admin::Moderations::ReportsController
+          include Concerns::ParticipatoryProcessAdmin
+
+          def permissions_context
+            super.merge(current_participatory_space: current_participatory_space)
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/participatory_processes/admin/participatory_process_group_landing_page_content_blocks_controller.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # Controller that allows to manage the content from the participatory process landing page content blocks
+      class ParticipatoryProcessGroupLandingPageContentBlocksController < Decidim::ParticipatoryProcesses::Admin::ApplicationController
+        include Decidim::Admin::LandingPageContentBlocks
+
+        layout "decidim/admin/participatory_process_group"
+
+        helper_method :participatory_process_group
+
+        private
+
+        def content_block_scope
+          :participatory_process_group_homepage
+        end
+
+        def scoped_resource
+          @scoped_resource ||= collection.find(params[:participatory_process_group_id])
+        end
+
+        def enforce_permission_to_update_resource
+          enforce_permission_to :update, :process_group, process_group: scoped_resource
+        end
+
+        def edit_resource_landing_page_path
+          edit_participatory_process_group_landing_page_path(scoped_resource)
+        end
+
+        def resource_landing_page_content_block_path
+          participatory_process_group_landing_page_content_block_path(scoped_resource, params[:id])
+        end
+
+        def submit_button_text
+          t("participatory_process_group_landing_page_content_blocks.edit.update", scope: "decidim.admin")
+        end
+
+        alias participatory_process_group scoped_resource
+
+        def collection
+          @collection ||= OrganizationParticipatoryProcessGroups.new(current_user.organization).query
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/participatory_processes/admin/participatory_process_group_landing_page_controller.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # Controller that allows managing the participatory process group landing
+      # page
+      class ParticipatoryProcessGroupLandingPageController < Decidim::ParticipatoryProcesses::Admin::ApplicationController
+        include Decidim::Admin::LandingPage
+
+        layout "decidim/admin/participatory_process_group"
+
+        helper_method :participatory_process_group
+
+        def content_block_scope
+          :participatory_process_group_homepage
+        end
+
+        def scoped_resource
+          @scoped_resource ||= collection.find(params[:participatory_process_group_id])
+        end
+
+        def enforce_permission_to_update_resource
+          enforce_permission_to :update, :process_group, process_group: scoped_resource
+        end
+
+        def resource_sort_url
+          participatory_process_group_landing_page_path(scoped_resource)
+        end
+
+        def active_content_blocks_title
+          t("participatory_process_group_landing_page.edit.active_content_blocks", scope: "decidim.admin")
+        end
+
+        def inactive_content_blocks_title
+          t("participatory_process_group_landing_page.edit.inactive_content_blocks", scope: "decidim.admin")
+        end
+
+        def resource_content_block_cell
+          "decidim/participatory_process_groups/content_block"
+        end
+
+        alias participatory_process_group scoped_resource
+
+        private
+
+        def collection
+          @collection ||= OrganizationParticipatoryProcessGroups.new(current_user.organization).query
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/participatory_processes/admin/participatory_process_groups_controller.rb

@@ -16,6 +16,7 @@ module Decidim
 
         def show
           enforce_permission_to :read, :process_group, process_group: participatory_process_group
+          render layout: "decidim/admin/participatory_process_group"
         end
 
         def new
@@ -44,6 +45,7 @@ module Decidim
           @participatory_process_group = collection.find(params[:id])
           enforce_permission_to :update, :process_group, process_group: @participatory_process_group
           @form = form(ParticipatoryProcessGroupForm).from_model(@participatory_process_group)
+          render layout: "decidim/admin/participatory_process_group"
         end
 
         def update
@@ -59,7 +61,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("participatory_process_groups.update.error", scope: "decidim.admin")
-              render :edit
+              render :edit, layout: "decidim/admin/participatory_process_group"
             end
           end
         end

data/app/controllers/decidim/participatory_processes/participatory_process_groups_controller.rb

@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     class ParticipatoryProcessGroupsController < Decidim::ParticipatoryProcesses::ApplicationController
       helper Decidim::SanitizeHelper
-      helper_method :participatory_processes, :group, :collection
+      helper_method :participatory_processes, :group
 
       before_action :set_group
 
@@ -27,7 +27,6 @@ module Decidim
                                        group.participatory_processes.published.public_spaces
                                      end
       end
-      alias collection participatory_processes
 
       def set_group
         @group = Decidim::ParticipatoryProcessGroup.find(params[:id])

data/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb

@@ -10,10 +10,11 @@ module Decidim
       include FilterResource
 
       helper_method :collection,
-                    :promoted_participatory_processes,
+                    :promoted_collection,
                     :participatory_processes,
                     :stats,
                     :metrics,
+                    :participatory_process_group,
                     :default_date_filter,
                     :related_processes,
                     :linked_assemblies
@@ -71,6 +72,14 @@ module Decidim
         @promoted_participatory_processes ||= published_processes | PromotedParticipatoryProcesses.new
       end
 
+      def promoted_participatory_process_groups
+        @promoted_participatory_process_groups ||= PromotedParticipatoryProcessGroups.new
+      end
+
+      def promoted_collection
+        @promoted_collection ||= promoted_participatory_processes.query + promoted_participatory_process_groups.query
+      end
+
       def collection
         @collection ||= participatory_processes + participatory_process_groups
       end
@@ -96,6 +105,10 @@ module Decidim
         @metrics ||= ParticipatoryProcessMetricChartsPresenter.new(participatory_process: current_participatory_space)
       end
 
+      def participatory_process_group
+        @participatory_process_group ||= current_participatory_space.participatory_process_group
+      end
+
       def default_date_filter
         return "active" if published_processes.any?(&:active?)
         return "upcoming" if published_processes.any?(&:upcoming?)

data/app/events/decidim/participatory_process_role_assigned_event.rb

@@ -10,7 +10,7 @@ module Decidim
     end
 
     def i18n_role
-      I18n.t(extra["role"], "decidim.admin.models.participatory_process_user_role.roles", default: extra["role"])
+      I18n.t(extra["role"], scope: "decidim.admin.models.participatory_process_user_role.roles", default: extra["role"])
     end
 
     def i18n_options

data/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb

@@ -32,6 +32,7 @@ module Decidim
         attribute :scope_id, Integer
         attribute :related_process_ids, Array[Integer]
         attribute :scope_type_max_depth_id, Integer
+        attribute :weight, Integer
 
         attribute :private_space, Boolean
         attribute :promoted, Boolean

data/app/forms/decidim/participatory_processes/admin/participatory_process_group_form.rb

@@ -10,20 +10,52 @@ module Decidim
         include TranslatableAttributes
         include Decidim::HasUploadValidations
 
-        translatable_attribute :name, String
         translatable_attribute :description, String
+        translatable_attribute :developer_group, String
+        translatable_attribute :local_area, String
+        translatable_attribute :meta_scope, String
+        translatable_attribute :title, String
+        translatable_attribute :participatory_scope, String
+        translatable_attribute :participatory_structure, String
+        translatable_attribute :target, String
+
+        attribute :group_url, String
+        attribute :hashtag, String
         attribute :participatory_process_ids, Array[Integer]
 
+        attribute :promoted, Boolean
+
         mimic :participatory_process_group
 
         attribute :hero_image
         attribute :remove_hero_image
 
-        validates :name, :description, translatable_presence: true
+        validates :title, :description, translatable_presence: true
 
         validates :hero_image, passthru: { to: Decidim::ParticipatoryProcessGroup }
 
+        validate :group_url_format
+
         alias organization current_organization
+
+        def group_url
+          return if super.blank?
+
+          return "http://#{super.strip}" unless super.match?(%r{\A(http|https)://}i)
+
+          super.strip
+        end
+
+        private
+
+        def group_url_format
+          return if group_url.blank?
+
+          uri = URI.parse(group_url)
+          errors.add :group_url, :invalid if !uri.is_a?(URI::HTTP) || uri.host.nil?
+        rescue URI::InvalidURIError
+          errors.add :group_url, :invalid
+        end
       end
     end
   end

data/app/forms/decidim/participatory_processes/admin/participatory_process_step_form.rb

@@ -20,7 +20,7 @@ module Decidim
         attribute :cta_path, String
 
         validates :title, translatable_presence: true
-        validates :cta_path, format: { with: %r{\A[a-zA-Z]+[a-zA-Z0-9\-\_/]+\z} }, allow_blank: true
+        validates :cta_path, format: { with: %r{\A[a-zA-Z]+[a-zA-Z0-9\-_/]+\z} }, allow_blank: true
 
         validates :start_date, date: { before: :end_date, allow_blank: true, if: proc { |obj| obj.end_date.present? } }
         validates :end_date, date: { after: :start_date, allow_blank: true, if: proc { |obj| obj.start_date.present? } }

data/app/forms/decidim/participatory_processes/admin/participatory_process_user_role_form.rb

@@ -17,7 +17,6 @@ module Decidim
         validates :role, inclusion: { in: Decidim::ParticipatoryProcessUserRole::ROLES }
 
         validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
-        validate :admin_uniqueness
 
         def roles
           Decidim::ParticipatoryProcessUserRole::ROLES.map do |role|
@@ -27,10 +26,6 @@ module Decidim
             ]
           end
         end
-
-        def admin_uniqueness
-          errors.add(:email, :taken) if context && context.current_organization && context.current_organization.admins.where(email: email).exists?
-        end
       end
     end
   end

data/app/helpers/decidim/participatory_processes/admin/participatory_processes_menu_helper.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      module ParticipatoryProcessesMenuHelper
+        include Decidim::Admin::SidebarMenuHelper
+
+        def participatory_process_menu
+          @participatory_process_menu ||= sidebar_menu(:admin_participatory_process_menu)
+        end
+
+        def participatory_process_group_menu
+          @participatory_process_group_menu ||= sidebar_menu(:admin_participatory_process_group_menu)
+        end
+
+        def participatory_processes_menu
+          @participatory_processes_menu ||= sidebar_menu(:admin_participatory_processes_menu)
+        end
+      end
+    end
+  end
+end

data/app/helpers/decidim/participatory_processes/admin/process_groups_for_select_helper.rb

@@ -14,7 +14,7 @@ module Decidim
         def process_groups_for_select
           @process_groups_for_select ||=
             OrganizationParticipatoryProcessGroups.new(current_organization).map do |group|
-              [translated_attribute(group.name), group.id]
+              [translated_attribute(group.title), group.id]
             end
         end
       end

data/app/helpers/decidim/participatory_processes/application_helper.rb

@@ -6,18 +6,6 @@ module Decidim
     #
     module ApplicationHelper
       include Decidim::ResourceHelper
-
-      # Public: Renders all hooks registered as `hook_name`.
-      #
-      #   Note: We're passing a deep copy of the view context to allow
-      #   us to extend it without polluting the original view context
-      #
-      # @param hook_name [Symbol] representing the name of the hook.
-      #
-      # @return [String] an HTML safe String
-      def render_participatory_processes_hook(hook_name)
-        Decidim::ParticipatoryProcesses.view_hooks.render(hook_name, deep_dup)
-      end
     end
   end
 end