decidim-assemblies 0.21.0 → 0.22.0

data/app/cells/decidim/assemblies/assembly_m/footer.erb

@@ -2,14 +2,14 @@
   <div class="card__support">
     <% if has_assembly_type? %>
       <div class="card__support__data--left">
-      <div class="text-uppercase"><%= t("assemblies.show.assembly_type", scope: "decidim") %></div>
+        <div><%= t("assemblies.show.assembly_type", scope: "decidim") %></div>
         <div class="text-ellipsis"><strong><%= assembly_type %></strong></div>
       </div>
     <% end %>
     <%= link_to(
       t(model.cta_button_text_key, scope: "layouts.decidim.assemblies.assembly"),
       resource_path,
-      class: "card__button button button--sc secondary light small"
+      class: "card__button button button--sc small"
     ) %>
   </div>
 </div>

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

@@ -36,6 +36,10 @@ module Decidim
         [:creation_date, :follow, :children_count]
       end
 
+      def creation_date_status
+        l(model.creation_date, format: :decidim_short) if model.creation_date
+      end
+
       def children_count_status
         content_tag(
           :strong,

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

@@ -1,5 +1,5 @@
 <div class="column">
-  <article class="card card--member">
+  <div class="card card--member">
     <div class="card__content">
       <div class="card__header collapse">
         <div class="author-data author-data--big">
@@ -7,7 +7,7 @@
             <div class="author author--flex">
               <% if has_profile? %>
                 <%= link_to profile_url, class: "author__avatar" do %>
-                  <%= image_tag model.avatar_url(:big) %>
+                  <%= image_tag model.avatar_url(:big), alt: "member-avatar" %>
                 <% end %>
                 <div>
                   <div class="author__name--container">
@@ -24,7 +24,7 @@
                   <% end %>
                 </div>
               <% else %>
-                <div class="author__avatar"><%= image_tag asset_path("decidim/default-avatar.svg") %></div>
+                <div class="author__avatar"><%= image_tag asset_path("decidim/default-avatar.svg"), alt: "member-avatar" %></div>
                 <div>
                   <div class="author__name--container">
                     <div class="author__name">
@@ -49,5 +49,5 @@
         <div class="text-small mt-s"><%= personal_information %></div>
       </div>
     </div>
-  </article>
+  </div>
 </div>

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb

@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section">
+<section class="wrapper-home home-section" xmlns="http://www.w3.org/1999/xhtml">
   <div class="row" id="highlighted-assemblies">
     <h3 class="section-heading"><%= t("active_assemblies", scope: i18n_scope) %></h3>
     <div class="row collapse">
@@ -6,17 +6,13 @@
         large-up-4 card-grid">
         <% highlighted_assemblies.each do |assembly| %>
           <div class="column">
-            <article class="card card--assembly card--mini">
-              <%= link_to decidim_assemblies.assembly_path(assembly), class: "card__link" do %>
-                <div class="card__image-top"
-                  style="background-image:url(<%= assembly.hero_image.url %>)"></div>
-              <% end %>
+            <%= link_to decidim_assemblies.assembly_path(assembly), class: "card card--assembly card--mini" do %>
+              <div aria-hidden="true" class="card__image-top"
+                style="background-image:url(<%= assembly.hero_image.url %>)"></div>
               <div class="card__content">
-                <%= link_to decidim_assemblies.assembly_path(assembly), class: "card__link" do %>
-                  <h4 class="card__title"><%= translated_attribute assembly.title %></h4>
-                <% end %>
+                <span class="card__title card__link"><%= translated_attribute assembly.title %></span>
               </div>
-            </article>
+            <% end %>
           </div>
         <% end %>
       </div>
@@ -25,7 +21,10 @@
   <div class="row" id="see-all-assemblies">
     <div class="columns small-centered small-12
       smallmedium-8 medium-6 large-4">
-      <%= link_to t("see_all_assemblies", scope: i18n_scope), decidim_assemblies.assemblies_path, class: "button expanded hollow button--sc home-section__cta" %>
+      <%= link_to t("see_all_assemblies", scope: i18n_scope),
+                  decidim_assemblies.assemblies_path,
+                  class: "button expanded hollow button--sc home-section__cta",
+                  title: t("assemblies_button_title", scope: i18n_scope) %>
     </div>
   </div>
 </section>

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb

@@ -18,6 +18,7 @@ module Decidim
           @highlighted_assemblies ||= OrganizationPrioritizedAssemblies
                                       .new(current_organization, current_user)
                                       .query
+                                      .includes([:organization])
                                       .limit(max_results)
         end
 

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # process admin in the system.
-      class CreateAssemblyAdmin < Rectify::Command
+      class CreateAssemblyAdmin < NotifyRoleAssignedToAssembly
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -57,6 +57,7 @@ module Decidim
               assembly: @assembly
             )
           end
+          send_notification user
         end
 
         def existing_user

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

@@ -25,9 +25,8 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
-          transaction do
-            create_assembly_member!
-          end
+          create_assembly_member!
+          notify_assembly_member_about_new_membership
 
           broadcast(:ok)
         end
@@ -67,6 +66,16 @@ module Decidim
             log_info
           )
         end
+
+        def notify_assembly_member_about_new_membership
+          data = {
+            event: "decidim.events.assemblies.create_assembly_member",
+            event_class: Decidim::Assemblies::CreateAssemblyMemberEvent,
+            resource: assembly,
+            followers: [form.user]
+          }
+          Decidim::EventsManager.publish(data)
+        end
       end
     end
   end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A command to notify users when a role is assigned for an assembly
+      class NotifyRoleAssignedToAssembly < Rectify::Command
+        def send_notification(user)
+          Decidim::EventsManager.publish(
+            event: "decidim.events.assembly.role_assigned",
+            event_class: Decidim::RoleAssignedToAssemblyEvent,
+            resource: form.current_participatory_space,
+            affected_users: [user],
+            extra: {
+              role: form.role
+            }
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A command with all the business logic when updating assemblies
+      # settings in admin area.
+      class UpdateAssembliesSetting < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # assemblies_setting - A assemblies_setting object to update.
+        # form - A form object with the params.
+        def initialize(assemblies_settings, form)
+          @assemblies_settings = assemblies_settings
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form or assemblies_settings isn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid? || assemblies_settings.invalid?
+
+          update_assemblies_setting!
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form, :assemblies_settings
+
+        def update_assemblies_setting!
+          Decidim.traceability.update!(
+            @assemblies_settings,
+            form.current_user,
+            enable_organization_chart: form.enable_organization_chart
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updated a participatory
       # process admin in the system.
-      class UpdateAssemblyAdmin < Rectify::Command
+      class UpdateAssemblyAdmin < NotifyRoleAssignedToAssembly
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -45,6 +45,7 @@ module Decidim
             { role: form.role },
             log_info
           )
+          send_notification user_role.user
         end
       end
     end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller used to manage the assemblies settings for the current
+      # organization.
+      class AssembliesSettingsController < Decidim::Assemblies::Admin::ApplicationController
+        layout "decidim/admin/assemblies"
+
+        # GET /admin/assemblies_settings/edit
+        def edit
+          enforce_permission_to :edit, :assemblies_setting, assemblies_settings: current_assemblies_settings
+          @form = assemblies_settings_form.from_model(current_assemblies_settings)
+        end
+
+        # PUT /admin/assemblies_settings/:id
+        def update
+          enforce_permission_to :update, :assemblies_setting, assemblies_settings: current_assemblies_settings
+
+          @form = assemblies_settings_form
+                  .from_params(params, assemblies_settings: current_assemblies_settings)
+
+          UpdateAssembliesSetting.call(current_assemblies_settings, @form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assemblies_settings.update.success", scope: "decidim.admin")
+              redirect_to edit_assemblies_settings_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assemblies_settings.update.error", scope: "decidim.admin")
+              render :edit
+            end
+          end
+        end
+
+        private
+
+        def current_assemblies_settings
+          @current_assemblies_settings ||= Decidim::AssembliesSetting.find_or_create_by!(decidim_organization_id: current_organization.id)
+        end
+
+        def assemblies_settings_form
+          form(Decidim::Assemblies::Admin::AssembliesSettingForm)
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Decidim
       participatory_space_layout only: :show
       include FilterResource
 
-      helper_method :parent_assemblies, :promoted_assemblies, :stats, :assembly_participatory_processes
+      helper_method :parent_assemblies, :promoted_assemblies, :stats, :assembly_participatory_processes, :current_assemblies_settings
 
       def index
         enforce_permission_to :list, :assembly
@@ -87,6 +87,10 @@ module Decidim
       def assembly_participatory_processes
         @assembly_participatory_processes ||= @current_participatory_space.linked_participatory_space_resources(:participatory_processes, "included_participatory_processes")
       end
+
+      def current_assemblies_settings
+        @current_assemblies_settings ||= Decidim::AssembliesSetting.find_or_create_by(decidim_organization_id: current_organization.id)
+      end
     end
   end
 end

data/app/events/decidim/assemblies/create_assembly_member_event.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    class CreateAssemblyMemberEvent < Decidim::Events::SimpleEvent
+      i18n_attributes :resource_name
+
+      def resource_name
+        @resource_name ||= translated_attribute(assembly.title)
+      end
+
+      def assembly
+        @assembly ||= resource
+      end
+    end
+  end
+end

data/app/events/decidim/role_assigned_to_assembly_event.rb

@@ -0,0 +1,28 @@
+# frozen-string_literal: true
+
+module Decidim
+  class RoleAssignedToAssemblyEvent < Decidim::Events::SimpleEvent
+    include Decidim::Events::NotificationEvent
+    include Decidim::Events::AuthorEvent
+
+    def notification_title
+      I18n.t("notification_title", i18n_options).html_safe
+    end
+
+    def i18n_role
+      I18n.t(extra["role"], "decidim.admin.models.assembly_user_role.roles", default: extra["role"])
+    end
+
+    def i18n_options
+      {
+        resource_path: resource_path,
+        resource_title: resource_title,
+        resource_url: resource_url,
+        scope: event_name,
+        participatory_space_title: participatory_space_title,
+        participatory_space_url: participatory_space_url,
+        role: i18n_role
+      }
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A form object used to create assembly setting from the admin dashboard.
+      class AssembliesSettingForm < Form
+        mimic :assemblies_setting
+
+        attribute :enable_organization_chart, Boolean
+      end
+    end
+  end
+end

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

@@ -62,7 +62,10 @@ module Decidim
         attribute :remove_hero_image
 
         validates :area, presence: true, if: proc { |object| object.area_id.present? }
-        validates :parent, presence: true, if: ->(form) { form.parent_id.present? }
+
+        validates :parent, presence: true, if: ->(form) { form.parent.present? }
+        validate :ensure_parent_cannot_be_child, if: ->(form) { form.parent.present? }
+
         validates :scope, presence: true, if: proc { |object| object.scope_id.present? }
         validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
 
@@ -79,6 +82,13 @@ module Decidim
                   file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
                   file_content_type: { allow: ["image/jpeg", "image/png"] }
 
+        def ensure_parent_cannot_be_child
+          return if id.blank?
+
+          available_assemblies = Decidim::Assemblies::ParentAssembliesForSelect.for(current_organization, Assembly.find(id))
+          errors.add(:parent, :invalid) unless available_assemblies.include? parent
+        end
+
         def map_model(model)
           self.scope_id = model.decidim_scope_id
         end
@@ -93,7 +103,7 @@ module Decidim
 
         def assembly_types_for_select
           @assembly_types_for_select ||= organization_assembly_types
-                                          &.map { |type| [translated_attribute(type.title), type.id] }
+                                             &.map { |type| [translated_attribute(type.title), type.id] }
         end
 
         def created_by_for_select
@@ -111,8 +121,8 @@ module Decidim
 
         def processes_for_select
           @processes_for_select ||= organization_participatory_processes
-                                    &.map { |pp| [translated_attribute(pp.title), pp.id] }
-                                    &.sort_by { |arr| arr[0] }
+                                        &.map { |pp| [translated_attribute(pp.title), pp.id] }
+                                        &.sort_by { |arr| arr[0] }
         end
 
         def assembly_type

data/app/helpers/decidim/assemblies/assemblies_helper.rb

@@ -45,9 +45,12 @@ module Decidim
           html += "<span class='definition-data__title'>#{t("assemblies.show.social_networks", scope: "decidim")}</span>".html_safe
           Decidim::Assembly::SOCIAL_HANDLERS.each do |handler|
             handler_name = "#{handler}_handler"
-            if assembly.send(handler_name).present?
-              html += link_to handler.capitalize, "https://#{handler}.com/#{assembly.send(handler_name)}", target: "_blank", class: "", title: handler.capitalize, rel: "noopener"
-            end
+            next if assembly.send(handler_name).blank?
+
+            html += link_to handler.capitalize, "https://#{handler}.com/#{assembly.send(handler_name)}",
+                            target: "_blank",
+                            class: "",
+                            title: t("assemblies.show.social_networks_title", scope: "decidim") << " " << handler.capitalize.to_s, rel: "noopener"
           end
           html += "</div>".html_safe
         end

data/app/models/decidim/assemblies_setting.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Assemblies setting.
+  class AssembliesSetting < ApplicationRecord
+    include Decidim::Traceable
+    include Decidim::Loggable
+
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Decidim::Organization"
+
+    def self.log_presenter_class_for(_log)
+      Decidim::Assemblies::AdminLog::AssembliesSettingPresenter
+    end
+  end
+end