decidim-assemblies 0.23.1 → 0.24.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14a57e28c47e324ad6eccfae0739b11f694a592524897b3050b9c2298be03d9b
-  data.tar.gz: ef3a2ac737a5a09fda27ce64745897adc0e72ad6fffbd5d1d9532c178308aaf3
+  metadata.gz: cd7fb3a5b3f9d98cc9726e71eeed8299fd5bee6b658c78df23c86be5039102e0
+  data.tar.gz: d632427f79df83e271a36bd869028678210744e1e0fcb5b8da035a47088b61ac
 SHA512:
-  metadata.gz: c35cf008d9f11ed052bf64d1a5cd271893c8a75355ea721b716940055fe3e4872cb72f27918073fd6f0ae29ee5624e1e4ef14d634579f77ebd01e443a63588a7
-  data.tar.gz: '002951e359e52ced0da4355357b0418bd9a3e8b79ac65499a1dd6cd68a6de70a316e17b9135ce54f07b72866a00fb7666d83070cdc039ce6afa4a7bdf819f463'
+  metadata.gz: 47a29cd586c5b1eb0a2077bf7c0ea8b71c16b9d501a3347646faf6009a569e46960441e41808ddecb93eb5ee40aba4d9c44284033f80bb561b3f7f0f71557cbf
+  data.tar.gz: d0c7f59e15bf18dac4f571a795136bd14f5c36b665c2fe5bf6101385ea44d32340acc491dcc95920321cc082a45dbcfbfa559fc5d0f61c7890269128b7f6310c

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

@@ -41,10 +41,12 @@ module Decidim
       end
 
       def children_count_status
+        # rubocop: disable Style/StringConcatenation
         content_tag(
           :strong,
           t("layouts.decidim.assemblies.index.children")
         ) + " " + children_assemblies_visible_for_user
+        # rubocop: enable Style/StringConcatenation
       end
 
       def children_assemblies_visible_for_user

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

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

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This cell renders a Statistic of a Assemblies
+    class StatisticCell < Decidim::ViewModel
+      include ActionView::Helpers::NumberHelper
+
+      private
+
+      def stat_number
+        number_with_delimiter(model[:stat_number])
+      end
+
+      def stat_title
+        t(model[:stat_title], scope: "decidim.assemblies.statistics")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+<section class="row statistics" id="participatory_process-statistics">
+  <div class="columns large-8">
+    <div class="row column">
+      <h3 class="section-heading">
+        <%= stats_heading %>
+      </h3>
+
+      <div class="space-stats">
+        <% if model.present? %>
+          <%= cell("decidim/assemblies/statistic", collection: model) %>
+        <% else %>
+          <span class="muted"><%= no_stats %></span>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</section>

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This cell renders the Statistics of an Assembly
+    class StatisticsCell < Decidim::ViewModel
+      private
+
+      def stats_heading
+        t("statistics.headline", scope: "decidim.assemblies")
+      end
+
+      def no_stats
+        t("statistics.no_stats", scope: "decidim.assemblies")
+      end
+    end
+  end
+end

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

@@ -45,6 +45,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/assemblies/admin/create_assembly_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 CreateAssemblyAdmin < NotifyRoleAssignedToAssembly
+        include ::Decidim::Admin::CreateParticipatorySpaceAdminUserActions
+
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -14,34 +16,21 @@ module Decidim
         def initialize(form, current_user, assembly)
           @form = form
           @current_user = current_user
-          @assembly = assembly
+          @participatory_space = assembly
         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?
+        private
 
-          ActiveRecord::Base.transaction do
-            @user = @user ||= existing_user || new_user
-            create_role
-            add_admin_as_follower
-          end
+        attr_reader :form, :participatory_space, :current_user, :user
 
-          broadcast(:ok)
-        rescue ActiveRecord::RecordInvalid
-          form.errors.add(:email, :taken)
-          broadcast(:invalid)
+        def existing_role
+          Decidim::AssemblyUserRole.exists?(
+            role: form.role.to_sym,
+            user: user,
+            assembly: @participatory_process
+          )
         end
 
-        private
-
-        attr_reader :form, :assembly, :current_user, :user
-
         def create_role
           Decidim.traceability.perform_action!(
             :create,
@@ -54,60 +43,11 @@ module Decidim
             Decidim::AssemblyUserRole.find_or_create_by!(
               role: form.role.to_sym,
               user: user,
-              assembly: @assembly
+              assembly: participatory_space
             )
           end
           send_notification user
         end
-
-        def existing_user
-          return @existing_user if defined?(@existing_user)
-
-          @existing_user = User.find_by(
-            email: form.email,
-            organization: assembly.organization
-          )
-
-          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: assembly.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?(assembly)
-
-          form = Decidim::FollowForm
-                 .from_params(followable_gid: assembly.to_signed_global_id.to_s)
-                 .with_context(
-                   current_organization: assembly.organization,
-                   current_user: user
-                 )
-
-          Decidim::CreateFollow.new(form, user).call
-        end
       end
     end
   end

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

@@ -94,7 +94,8 @@ module Decidim
             facebook_handler: form.facebook_handler,
             instagram_handler: form.instagram_handler,
             youtube_handler: form.youtube_handler,
-            github_handler: form.github_handler
+            github_handler: form.github_handler,
+            weight: form.weight
           }.merge(uploader_attributes)
         end
 

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # This controller allows importing things.
+      # It is targeted for customizations for importing things that lives under
+      # an assembly.
+      class ImportsController < Decidim::Admin::ImportsController
+        include Concerns::AssemblyAdmin
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      module Moderations
+        # This controller allows admins to manage moderation reports in an assembly.
+        class ReportsController < Decidim::Admin::Moderations::ReportsController
+          include Concerns::AssemblyAdmin
+        end
+      end
+    end
+  end
+end

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

@@ -77,7 +77,7 @@ module Decidim
       end
 
       def parent_assemblies
-        search.results.parent_assemblies.order(promoted: :desc)
+        search.results.parent_assemblies.order(weight: :asc, promoted: :desc)
       end
 
       def stats

data/app/events/decidim/role_assigned_to_assembly_event.rb

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

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

@@ -45,6 +45,7 @@ module Decidim
         attribute :parent_id, Integer
         attribute :participatory_processes_ids, Array[Integer]
         attribute :scope_id, Integer
+        attribute :weight, Integer, default: 0
 
         attribute :is_transparent, Boolean
         attribute :promoted, Boolean
@@ -79,6 +80,8 @@ module Decidim
         validates :banner_image, passthru: { to: Decidim::Assembly }
         validates :hero_image, passthru: { to: Decidim::Assembly }
 
+        validates :weight, presence: true
+
         alias organization current_organization
 
         def ensure_parent_cannot_be_child

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

@@ -16,7 +16,6 @@ module Decidim
         validates :role, inclusion: { in: Decidim::AssemblyUserRole::ROLES }
 
         validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
-        validate :admin_uniqueness
 
         def roles
           Decidim::AssemblyUserRole::ROLES.map do |role|
@@ -26,10 +25,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/assemblies/admin/assemblies_admin_menu_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      module AssembliesAdminMenuHelper
+        include Decidim::Admin::SidebarMenuHelper
+
+        def admin_assemblies_menu
+          @admin_assemblies_menu ||= sidebar_menu(:admin_assemblies_menu)
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/assembly.rb

@@ -67,7 +67,7 @@ module Decidim
     has_many :components, as: :participatory_space, dependent: :destroy
 
     has_many :children, foreign_key: "parent_id", class_name: "Decidim::Assembly", inverse_of: :parent, dependent: :destroy
-    belongs_to :parent, foreign_key: "parent_id", class_name: "Decidim::Assembly", inverse_of: :children, optional: true, counter_cache: :children_count
+    belongs_to :parent, class_name: "Decidim::Assembly", inverse_of: :children, optional: true, counter_cache: :children_count
 
     validates_upload :hero_image
     mount_uploader :hero_image, Decidim::HeroImageUploader
@@ -215,9 +215,9 @@ module Decidim
     # rubocop:disable Rails/SkipsModelValidations
     def update_children_paths
       self.class.where(
-        ["#{self.class.table_name}.parents_path <@ :old_path AND #{self.class.table_name}.id != :id", old_path: parents_path_before_last_save, id: id]
+        ["#{self.class.table_name}.parents_path <@ :old_path AND #{self.class.table_name}.id != :id", { old_path: parents_path_before_last_save, id: id }]
       ).update_all(
-        ["parents_path = :new_path || subpath(parents_path, nlevel(:old_path))", new_path: parents_path, old_path: parents_path_before_last_save]
+        ["parents_path = :new_path || subpath(parents_path, nlevel(:old_path))", { new_path: parents_path, old_path: parents_path_before_last_save }]
       )
     end
     # rubocop:enable Rails/SkipsModelValidations

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

@@ -34,8 +34,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

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

@@ -43,8 +43,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

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

@@ -70,8 +70,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "unpublish" || super
+        def diff_actions
+          super + %w(unpublish)
         end
       end
     end

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

@@ -44,8 +44,8 @@ module Decidim
           ).changeset
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

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

@@ -2,46 +2,56 @@
 
 module Decidim
   module Assemblies
-    # A presenter to render statistics in the homepage.
+    # A presenter to render statistics in an Assembly.
     class AssemblyStatsPresenter < Rectify::Presenter
       attribute :assembly, Decidim::Assembly
-      include IconHelper
+      include Decidim::IconHelper
 
-      # Public: Render a collection of primary stats.
-      def highlighted
-        highlighted_stats = component_stats(priority: StatsRegistry::HIGH_PRIORITY)
-        highlighted_stats = highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
+      # Public: returns a collection of stats (Hash) for the Assembly Home.
+      def collection
+        highlighted_stats = assembly_participants_stats
+        highlighted_stats.concat(assembly_followers_stats(priority: StatsRegistry::HIGH_PRIORITY))
+        highlighted_stats.concat(component_stats(priority: StatsRegistry::HIGH_PRIORITY))
+        highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
         highlighted_stats = highlighted_stats.reject(&:empty?)
-        highlighted_stats = highlighted_stats.reject { |_manifest, _name, data| data.zero? }
-        grouped_highlighted_stats = highlighted_stats.group_by { |stats| stats.first.name }
-
-        safe_join(
-          grouped_highlighted_stats.map do |_manifest_name, stats|
-            content_tag :div, class: "process_stats-item" do
-              safe_join(
-                stats.each_with_index.map do |stat, index|
-                  render_stats_data(stat[0], stat[1], stat[2], index)
-                end
-              )
+        highlighted_stats = highlighted_stats.reject { |_stat_manifest, _stat_title, stat_number| stat_number.zero? }
+        grouped_highlighted_stats = highlighted_stats.group_by(&:first)
+
+        statistics = []
+        grouped_highlighted_stats.each do |_manifest_name, stats|
+          stats.each_with_index.each do |stat, _index|
+            stat.each_with_index.map do |_item, subindex|
+              next unless (subindex % 3).zero?
+              next if stat[subindex + 2].zero?
+
+              statistics << { stat_title: stat[subindex + 1], stat_number: stat[subindex + 2] }
             end
           end
-        )
+        end
+        statistics
       end
 
       private
 
+      def assembly_participants_stats
+        Decidim.stats.only([:participants_count]).with_context(assembly)
+               .map { |stat_title, stat_number| [assembly.manifest.name, stat_title, stat_number] }
+      end
+
       def component_stats(conditions)
         Decidim.component_manifests.map do |component_manifest|
-          component_manifest.stats.filter(conditions).with_context(published_components).map { |name, data| [component_manifest, name, data] }.flatten
+          component_manifest.stats.except([:proposals_accepted])
+                            .filter(conditions)
+                            .with_context(published_components)
+                            .map { |stat_title, stat_number| [component_manifest.name, stat_title, stat_number] }.flatten
         end
       end
 
-      def render_stats_data(component_manifest, name, data, index)
-        safe_join([
-                    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")
-                  ])
+      def assembly_followers_stats(conditions)
+        Decidim.stats.only([:followers_count])
+               .filter(conditions)
+               .with_context(assembly)
+               .map { |stat_title, stat_number| [assembly.manifest.name, stat_title, stat_number] }
       end
 
       def published_components