decidim-assemblies 0.19.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,
@@ -64,11 +68,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/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_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/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/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/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_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/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/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