decidim-participatory_processes 0.23.0 → 0.24.0.rc1

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/show.erb

@@ -4,22 +4,8 @@
     <div class="row collapse">
       <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-3
         large-up-4 card-grid">
-        <% highlighted_processes.each do |process| %>
-          <div class="column">
-            <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card card--process card--mini" do %>
-              <div aria-hidden="true" class="card__image-top"
-                style="background-image:url(<%= process.hero_image.url %>)"></div>
-              <div class="card__content">
-                <span class="card__title card__link"><%= translated_attribute process.title %></span>
-                <% if process.active_step %>
-                  <span class="card--process__small">
-                    <%= t("active_step", scope: i18n_scope) %>
-                    <strong><%= translated_attribute process.active_step.title %></strong>
-                  </span>
-                <% end %>
-              </div>
-            <% end %>
-          </div>
+        <% highlighted_items.each do |item| %>
+          <%= card_for item, size: :s %>
         <% end %>
       </div>
     </div>

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/single_process.erb

@@ -1,43 +1,47 @@
-<% process = highlighted_processes.first %>
+<% process = highlighted_items.first %>
 <% title_id = "process_title" %>
 <section class="wrapper-home home-section">
   <div class="row" id="highlighted-processes">
     <h3 class="section-heading"><%= t("active_processes", scope: i18n_scope) %></h3>
     <div class="row collapse">
-      <div class="card card--full card--process">
-        <div class="row collapse card--process__row">
-          <div class="column large-6 card--process__column">
-            <div class="card__content">
-              <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
-                <h2 class="card__title" id="<%= title_id %>"><%= decidim_html_escape(translated_attribute(process.title)) %></h2>
-              <% end %>
-              <%= decidim_sanitize translated_attribute(process.short_description) %>
-              <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "button small hollow" do %>
-                <span class="show-for-sr"><%= decidim_html_escape(translated_attribute(process.title)) %></span>
-                <%= t("more_information", scope: i18n_scope) %>
-              <% end %>
+      <% if process.is_a? Decidim::ParticipatoryProcessGroup %>
+        <%= render partial: "decidim/participatory_processes/participatory_processes/promoted_process_group.html", locals: { promoted_process_group: process } %>
+      <% else %>
+        <div class="card card--full card--process">
+          <div class="row collapse card--process__row">
+            <div class="column large-6 card--process__column">
+              <div class="card__content">
+                <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
+                  <h2 class="card__title" id="<%= title_id %>"><%= decidim_html_escape(translated_attribute(process.title)) %></h2>
+                <% end %>
+                <%= decidim_sanitize translated_attribute(process.short_description) %>
+                <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "button small hollow" do %>
+                  <span class="show-for-sr"><%= decidim_html_escape(translated_attribute(process.title)) %></span>
+                  <%= t("more_information", scope: i18n_scope) %>
+                <% end %>
+              </div>
             </div>
-          </div>
-          <div class="column large-6 card--process__column">
-            <div class="card--full__image" style="background-image:url(<%= process.hero_image.url %>)">
-              <div class="card__content row collapse">
-                <div class="large-6 large-offset-6 columns">
-                  <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "button expanded button--sc" do %>
-                    <span class="show-for-sr"><%= t("participate_in", resource_name: translated_attribute(process.title), scope: i18n_scope) %></span>
-                    <span aria-hidden="true"><%= t("participate", scope: i18n_scope) %></span>
-                    <% if process.active_step %>
-                      <span class="button__info">
-                        <%= t("active_step", scope: i18n_scope) %>
-                        <strong><%= translated_attribute process.active_step.title %></strong>
-                      </span>
+            <div class="column large-6 card--process__column">
+              <div class="card--full__image" style="background-image:url(<%= process.hero_image.url %>)">
+                <div class="card__content row collapse">
+                  <div class="large-6 large-offset-6 columns">
+                    <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "button expanded button--sc" do %>
+                      <span class="show-for-sr"><%= t("participate_in", resource_name: translated_attribute(process.title), scope: i18n_scope) %></span>
+                      <span aria-hidden="true"><%= t("participate", scope: i18n_scope) %></span>
+                      <% if process.active_step %>
+                        <span class="button__info">
+                          <%= t("active_step", scope: i18n_scope) %>
+                          <strong><%= translated_attribute process.active_step.title %></strong>
+                        </span>
+                      <% end %>
                     <% end %>
-                  <% end %>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
+      <% end %>
     </div>
   </div>
   <%= render "_all_processes" %>

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell.rb

@@ -4,32 +4,33 @@ module Decidim
   module ParticipatoryProcesses
     module ContentBlocks
       class HighlightedProcessesCell < Decidim::ViewModel
+        include Decidim::ApplicationHelper
         include Decidim::SanitizeHelper
+        include Decidim::CardHelper
+        include Cell::ViewModel::Partial
+        include ParticipatoryProcessHelper
+        include Decidim::ParticipatoryProcesses::Engine.routes.url_helpers
 
         delegate :current_user, to: :controller
 
         def show
-          if single_process?
+          if single_item?
             render "single_process"
-          elsif highlighted_processes.any?
+          elsif highlighted_items.any?
             render
           end
         end
 
-        def single_process?
-          highlighted_processes.to_a.length == 1
+        def single_item?
+          highlighted_items.length == 1
         end
 
         def max_results
           model.settings.max_results
         end
 
-        def highlighted_processes
-          @highlighted_processes ||= (
-            OrganizationPublishedParticipatoryProcesses.new(current_organization, current_user) |
-            HighlightedParticipatoryProcesses.new |
-            FilteredParticipatoryProcesses.new("active")
-          ).query.includes([:organization]).limit(max_results)
+        def highlighted_items
+          @highlighted_items ||= promoted_groups + highlighted_processes
         end
 
         def i18n_scope
@@ -39,6 +40,28 @@ module Decidim
         def decidim_participatory_processes
           Decidim::ParticipatoryProcesses::Engine.routes.url_helpers
         end
+
+        private
+
+        def highlighted_processes
+          @highlighted_processes ||= if highlighted_processes_max_results.zero?
+                                       []
+                                     else
+                                       (
+                                         OrganizationPublishedParticipatoryProcesses.new(current_organization, current_user) |
+                                         HighlightedParticipatoryProcesses.new |
+                                         FilteredParticipatoryProcesses.new("active")
+                                       ).query.includes([:organization]).limit(highlighted_processes_max_results)
+                                     end
+        end
+
+        def promoted_groups
+          @promoted_groups ||= (OrganizationParticipatoryProcessGroups.new(current_organization) | PromotedParticipatoryProcessGroups.new).query.limit(max_results)
+        end
+
+        def highlighted_processes_max_results
+          @highlighted_processes_max_results ||= max_results - promoted_groups.count
+        end
       end
     end
   end

data/app/cells/decidim/participatory_processes/filtered_participatory_processes/show.erb

@@ -0,0 +1,3 @@
+<% elements.each do |element| %>
+  <%= card_for element %>
+<% end %>

data/app/cells/decidim/participatory_processes/filtered_participatory_processes_cell.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This cell renders a set of filtered participatory processes from a base
+    # relation provided by the model
+    #
+    # The `model` must be a relation of participatory processes
+    #
+    # Available options:
+    #
+    # - `default_date_filter` => The date filter to use if not given by
+    #    params. If not provided is inferred from the model relation
+    #
+    # Example:
+    #
+    # cell(
+    #   "decidim/participatory_processes/filtered_participatory_processes",
+    #   group.participatory_processes.published,
+    #   date_filter: "active"
+    # )
+    class FilteredParticipatoryProcessesCell < Decidim::ViewModel
+      include Decidim::FilterResource
+      include Decidim::CardHelper
+
+      def elements
+        @elements ||= search.results
+      end
+
+      private
+
+      def search_klass
+        Decidim::ParticipatoryProcesses::ParticipatoryProcessSearch
+      end
+
+      def default_search_params
+        {
+          base_relation: model,
+          date: default_date_filter
+        }
+      end
+
+      def default_date_filter
+        @default_date_filter ||= options[:default_filter].presence || if model.any?(&:active?)
+                                                                        "active"
+                                                                      elsif model.any?(&:upcoming?)
+                                                                        "upcoming"
+                                                                      elsif model.any?(&:past?)
+                                                                        "past"
+                                                                      else
+                                                                        "all"
+                                                                      end
+      end
+    end
+  end
+end

data/app/cells/decidim/participatory_processes/process_cell.rb

@@ -12,7 +12,12 @@ module Decidim
       private
 
       def card_size
-        "decidim/participatory_processes/process_m"
+        case @options[:size]
+        when :s
+          "decidim/participatory_processes/process_s"
+        else
+          "decidim/participatory_processes/process_m"
+        end
       end
     end
   end

data/app/cells/decidim/participatory_processes/process_filters_cell.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     class ProcessFiltersCell < Decidim::ViewModel
-      ALL_FILTERS = %w(active past upcoming all).freeze
+      ALL_FILTERS = %w(active upcoming past all).freeze
 
       def filter_link(filter)
         Decidim::ParticipatoryProcesses::Engine

data/app/cells/decidim/participatory_processes/process_group_cell.rb

@@ -12,7 +12,12 @@ module Decidim
       private
 
       def card_size
-        "decidim/participatory_processes/process_group_m"
+        case @options[:size]
+        when :s
+          "decidim/participatory_processes/process_group_s"
+        else
+          "decidim/participatory_processes/process_group_m"
+        end
       end
     end
   end

data/app/cells/decidim/participatory_processes/process_group_m_cell.rb

@@ -16,7 +16,7 @@ module Decidim
       end
 
       def title
-        translated_attribute model.name
+        translated_attribute model.title
       end
 
       def resource_path
@@ -36,10 +36,12 @@ module Decidim
       end
 
       def processes_count_status
+        # rubocop: disable Style/StringConcatenation
         content_tag(
           :strong,
           t("layouts.decidim.participatory_process_groups.participatory_process_group.processes_count")
         ) + " " + processes_visible_for_user
+        # rubocop: enable Style/StringConcatenation
       end
 
       def processes_visible_for_user

data/app/cells/decidim/participatory_processes/process_group_s/image.erb

@@ -0,0 +1 @@
+<div aria-hidden="true" class="card__image-top" style="background-image:url(<%= resource_image_path %>)"></div>

data/app/cells/decidim/participatory_processes/process_group_s/show.erb

@@ -0,0 +1,8 @@
+<div class="column" id="<%= dom_id(model) %>">
+  <%= link_to resource_path, class: "card card--process card--stack card--mini" do %>
+    <%= render :image if has_image? %>
+    <div class="card__content">
+      <span class="card__title card__link"><%= title %></span>
+    </div>
+  <% end %>
+</div>

data/app/cells/decidim/participatory_processes/process_group_s_cell.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This cell renders the Small (:s) process group card
+    # for an given instance of a ParticipatoryProcessGroup
+    class ProcessGroupSCell < Decidim::CardMCell
+      private
+
+      def has_image?
+        model.hero_image.url.present?
+      end
+
+      def resource_path
+        Decidim::ParticipatoryProcesses::Engine.routes.url_helpers.participatory_process_group_path(model)
+      end
+
+      def resource_image_path
+        model.hero_image.url
+      end
+    end
+  end
+end

data/app/cells/decidim/participatory_processes/process_s/image.erb

@@ -0,0 +1 @@
+<div aria-hidden="true" class="card__image-top" style="background-image:url(<%= resource_image_path %>)"></div>

data/app/cells/decidim/participatory_processes/process_s/show.erb

@@ -0,0 +1,14 @@
+<div class="column" id="<%= dom_id(model) %>">
+  <%= link_to resource_path, class: "card card--process card--mini" do %>
+    <%= render :image if has_image? %>
+    <div class="card__content">
+      <span class="card__title card__link"><%= title %></span>
+      <% if has_step? %>
+        <span class="card--process__small">
+          <%= t("active_step", scope: i18n_scope) %>
+          <strong><%= step_title %></strong>
+        </span>
+      <% end %>
+    </div>
+  <% end %>
+</div>

data/app/cells/decidim/participatory_processes/process_s_cell.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This cell renders the Small (:s) process card
+    # for an given instance of a ParticipatoryProcess
+    class ProcessSCell < Decidim::CardMCell
+      private
+
+      def has_image?
+        model.hero_image.url.present?
+      end
+
+      def has_step?
+        model.active_step.present?
+      end
+
+      def resource_path
+        Decidim::ParticipatoryProcesses::Engine.routes.url_helpers.participatory_process_path(model)
+      end
+
+      def resource_image_path
+        model.hero_image.url
+      end
+
+      def step_title
+        translated_attribute model.active_step.title
+      end
+
+      def i18n_scope
+        "decidim.participatory_processes.pages.home.highlighted_processes"
+      end
+    end
+  end
+end

data/app/cells/decidim/participatory_processes/statistic/show.erb

@@ -1,9 +1,9 @@
-<div class="process-stats__data">
-  <span class="process-stats__number">
+<div class="space-stats__data">
+  <span class="space-stats__number">
     <%= stat_number %>
   </span>
 
-  <h4 class="process-stats__title">
+  <h4 class="space-stats__title">
     <%= stat_title %>
   </h4>
 </div>

data/app/cells/decidim/participatory_processes/statistics/show.erb

@@ -5,7 +5,7 @@
         <%= stats_heading %>
       </h3>
 
-      <div class="process-stats">
+      <div class="space-stats">
         <% if model.present? %>
           <%= cell("decidim/participatory_processes/statistic", collection: model) %>
         <% else %>

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

@@ -44,6 +44,7 @@ module Decidim
             organization: form.current_organization,
             title: form.title,
             subtitle: form.subtitle,
+            weight: form.weight,
             slug: form.slug,
             hashtag: form.hashtag,
             description: form.description,

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

@@ -6,6 +6,8 @@ module Decidim
       # A command with all the business logic when creating a new participatory
       # process admin in the system.
       class CreateParticipatoryProcessAdmin < NotifyRoleAssignedToParticipatoryProcess
+        include ::Decidim::Admin::CreateParticipatorySpaceAdminUserActions
+
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -15,33 +17,12 @@ module Decidim
         def initialize(form, current_user, participatory_process)
           @form = form
           @current_user = current_user
-          @participatory_process = participatory_process
-        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?
-
-          ActiveRecord::Base.transaction do
-            @user = existing_user || new_user
-            existing_role || create_role
-            add_admin_as_follower
-          end
-
-          broadcast(:ok)
-        rescue ActiveRecord::RecordInvalid
-          form.errors.add(:email, :taken)
-          broadcast(:invalid)
+          @participatory_space = participatory_process
         end
 
         private
 
-        attr_reader :form, :participatory_process, :current_user, :user
+        attr_reader :form, :participatory_space, :current_user, :user
 
         def create_role
           extra_info = {
@@ -52,7 +33,7 @@ module Decidim
           role_params = {
             role: form.role.to_sym,
             user: user,
-            participatory_process: @participatory_process
+            participatory_process: participatory_space
           }
 
           Decidim.traceability.create!(
@@ -65,60 +46,11 @@ module Decidim
         end
 
         def existing_role
-          Decidim::ParticipatoryProcessUserRole.find_by(
+          Decidim::ParticipatoryProcessUserRole.exists?(
             role: form.role.to_sym,
             user: user,
-            participatory_process: @participatory_process
-          )
-        end
-
-        def existing_user
-          return @existing_user if defined?(@existing_user)
-
-          @existing_user = User.find_by(
-            email: form.email,
-            organization: participatory_process.organization
+            participatory_process: participatory_space
           )
-
-          InviteUserAgain.call(@existing_user, invitation_instructions) if @existing_user && !@existing_user.invitation_accepted?
-
-          @existing_user
-        end
-
-        def new_user
-          @new_user ||= InviteUser.call(user_form) do
-            on(:ok) do |user|
-              return user
-            end
-          end
-        end
-
-        def user_form
-          OpenStruct.new(name: form.name,
-                         email: form.email.downcase,
-                         organization: participatory_process.organization,
-                         admin: false,
-                         invited_by: current_user,
-                         invitation_instructions: invitation_instructions)
-        end
-
-        def invitation_instructions
-          return "invite_admin" if form.role == "admin"
-
-          "invite_collaborator"
-        end
-
-        def add_admin_as_follower
-          return if user.follows?(participatory_process)
-
-          form = Decidim::FollowForm
-                 .from_params(followable_gid: participatory_process.to_signed_global_id.to_s)
-                 .with_context(
-                   current_organization: participatory_process.organization,
-                   current_user: user
-                 )
-
-          Decidim::CreateFollow.new(form, user).call
         end
       end
     end