decidim-assemblies 0.28.6 → 0.29.0.rc1

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

@@ -5,84 +5,23 @@ module Decidim
     module Admin
       # A command with all the business logic when updating an assembly
       # member in the system.
-      class UpdateAssemblyMember < Decidim::Command
-        include ::Decidim::AttachmentAttributesMethods
+      class UpdateAssemblyMember < Decidim::Commands::UpdateResource
+        fetch_file_attributes :non_user_avatar
 
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        # assembly_member - The AssemblyMember to update
-        def initialize(form, assembly_member)
-          @form = form
-          @assembly_member = assembly_member
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-          return broadcast(:invalid) unless assembly_member
-
-          assembly_member.assign_attributes(attributes)
-
-          if assembly_member.valid?
-            assembly_member.reload
-            update_assembly_member!
-            broadcast(:ok)
-          else
-            if assembly_member.errors.include? :non_user_avatar
-              form.errors.add(
-                :non_user_avatar,
-                assembly_member.errors[:non_user_avatar]
-              )
-            end
-
-            broadcast(:invalid)
-          end
-        end
+        fetch_form_attributes :full_name, :gender, :birthday, :birthplace, :ceased_date, :designation_date,
+                              :position, :position_other, :weight, :user
 
         private
 
-        attr_reader :form, :assembly_member
-
-        def attributes
-          form.attributes.slice(
-            "full_name",
-            "gender",
-            "birthday",
-            "birthplace",
-            "ceased_date",
-            "designation_date",
-            "position",
-            "position_other",
-            "weight"
-          ).symbolize_keys.merge(
-            user: form.user
-          ).merge(
-            attachment_attributes(:non_user_avatar)
-          )
-        end
-
-        def update_assembly_member!
-          log_info = {
+        def extra_params
+          {
             resource: {
-              title: assembly_member.full_name
+              title: resource.full_name
             },
             participatory_space: {
-              title: assembly_member.assembly.title
+              title: resource.assembly.title
             }
           }
-
-          Decidim.traceability.update!(
-            assembly_member,
-            form.current_user,
-            attributes,
-            log_info
-          )
         end
       end
     end

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

@@ -17,13 +17,13 @@ module Decidim
         end
 
         def new
-          enforce_permission_to :create, :assembly, assembly: parent_assembly
+          enforce_permission_to :create, :assembly
           @form = form(AssemblyForm).instance
           @form.parent_id = params[:parent_id]
         end
 
         def create
-          enforce_permission_to :create, :assembly, assembly: parent_assembly
+          enforce_permission_to :create, :assembly
           @form = form(AssemblyForm).from_params(params)
 
           CreateAssembly.call(@form) do
@@ -52,7 +52,7 @@ module Decidim
             assembly_id: current_assembly.id
           )
 
-          UpdateAssembly.call(current_assembly, @form) do
+          UpdateAssembly.call(@form, current_assembly) do
             on(:ok) do |assembly|
               flash[:notice] = I18n.t("assemblies.update.success", scope: "decidim.admin")
               redirect_to edit_assembly_path(assembly)
@@ -66,7 +66,7 @@ module Decidim
         end
 
         def copy
-          enforce_permission_to :create, :assembly, assembly: collection.find_by(id: params[:parent_id])
+          enforce_permission_to :create, :assembly
         end
 
         private
@@ -84,22 +84,7 @@ module Decidim
         alias current_participatory_space current_assembly
 
         def parent_assembly
-          @parent_assembly ||= collection.find_by(id: parent_assembly_id)
-        end
-
-        def parent_assembly_id
-          # Return the parent_id from Ransack parameters if it exists
-          return ransack_params[:parent_id_eq] if ransack_params[:parent_id_eq].present?
-
-          # If the assembly parameter is present, return its parent_id
-          return assembly_parent_id if params[:assembly].present?
-
-          # Otherwise, return the parent_id from the params hash
-          params[:parent_id]
-        end
-
-        def assembly_parent_id
-          params[:assembly][:parent_id]
+          @parent_assembly ||= collection.find_by(id: ransack_params[:parent_id_eq])
         end
 
         def assembly_params

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

@@ -5,8 +5,8 @@ module Decidim
     module Admin
       # Controller used to manage the available assemblies types for the current
       # organization.
-      # As this substitues former i18n simple hash we need to keep these i18n keys for migrations
-      # and rollbakcs. So let i18n-tasks know about:
+      # As this substitutes former i18n simple hash we need to keep these i18n keys for migrations
+      # and rollbacks. So let i18n-tasks know about:
       # i18n-tasks-use t('decidim.assemblies.assembly_types.government')
       # i18n-tasks-use t('decidim.assemblies.assembly_types.commission')
       # i18n-tasks-use t('decidim.assemblies.assembly_types.consultative_advisory')
@@ -63,7 +63,7 @@ module Decidim
           @form = assembly_type_form
                   .from_params(params, assembly_type: current_assembly_type)
 
-          UpdateAssembliesType.call(current_assembly_type, @form) do
+          UpdateAssembliesType.call(@form, current_assembly_type) do
             on(:ok) do
               flash[:notice] = I18n.t("assemblies_types.update.success", scope: "decidim.admin")
               redirect_to assemblies_types_path
@@ -80,7 +80,7 @@ module Decidim
         def destroy
           enforce_permission_to :destroy, :assembly_type, assembly_type: current_assembly_type
 
-          DestroyAssembliesType.call(current_assembly_type, current_user) do
+          Decidim::Commands::DestroyResource.call(current_assembly_type, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("assemblies_types.destroy.success", scope: "decidim.admin")
               redirect_to assemblies_types_path

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

@@ -10,8 +10,6 @@ module Decidim
 
         layout "decidim/admin/assemblies"
 
-        helper_method :parent_assembly
-
         private
 
         def content_block_scope
@@ -31,10 +29,6 @@ module Decidim
         def resource_landing_page_content_block_path
           assembly_landing_page_content_block_path(scoped_resource, params[:id])
         end
-
-        def parent_assembly
-          scoped_resource.parent
-        end
       end
     end
   end

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

@@ -23,7 +23,7 @@ module Decidim
           enforce_permission_to :create, :assembly_member
           @form = form(AssemblyMemberForm).from_params(params)
 
-          CreateAssemblyMember.call(@form, current_user, current_assembly) do
+          CreateAssemblyMember.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("assembly_members.create.success", scope: "decidim.admin")
               redirect_to assembly_members_path(current_assembly)

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

@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     module Admin
       # Controller that allows managing assembly private users
-      # on assembies
+      # on assemblies
       class ParticipatorySpacePrivateUsersController < Decidim::Assemblies::Admin::ApplicationController
         include Concerns::AssemblyAdmin
         include Decidim::Admin::Concerns::HasPrivateUsers

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

@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     module Admin
       # Controller that allows importing assembly private users
-      # on assembies
+      # on assemblies
       class ParticipatorySpacePrivateUsersCsvImportsController < Decidim::Admin::ApplicationController
         include Concerns::AssemblyAdmin
         include Decidim::Admin::Concerns::HasPrivateUsersCsvImport

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

@@ -2,7 +2,10 @@
 
 module Decidim
   module Assemblies
-    # The main admin application controller for assemblies
+    # The main application controller for assemblies
+    #
+    # This controller is the abstract class from which all other controllers of
+    # this engine inherit.
     class ApplicationController < Decidim::ApplicationController
       helper Decidim::ApplicationHelper
       helper Decidim::Assemblies::AssembliesHelper

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

@@ -6,9 +6,6 @@ module Decidim
     class AssembliesController < Decidim::Assemblies::ApplicationController
       include ParticipatorySpaceContext
       include AssemblyBreadcrumb
-
-      participatory_space_layout only: :show
-
       include FilterResource
       include Paginable
       include HasParticipatorySpaceContentBlocks

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

@@ -6,8 +6,6 @@ module Decidim
       include ParticipatorySpaceContext
       include AssemblyBreadcrumb
 
-      participatory_space_layout only: :index
-
       helper_method :collection
 
       def index

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

@@ -14,23 +14,23 @@ module Decidim
 
         mimic :assembly
 
-        translatable_attribute :composition, Decidim::Attributes::RichText
-        translatable_attribute :closing_date_reason, Decidim::Attributes::RichText
+        translatable_attribute :composition, String
+        translatable_attribute :closing_date_reason, String
         translatable_attribute :created_by_other, String
-        translatable_attribute :description, Decidim::Attributes::RichText
+        translatable_attribute :description, String
         translatable_attribute :developer_group, String
-        translatable_attribute :internal_organisation, Decidim::Attributes::RichText
+        translatable_attribute :internal_organisation, String
         translatable_attribute :local_area, String
         translatable_attribute :meta_scope, String
         translatable_attribute :participatory_scope, String
         translatable_attribute :participatory_structure, String
-        translatable_attribute :purpose_of_action, Decidim::Attributes::RichText
-        translatable_attribute :short_description, Decidim::Attributes::RichText
-        translatable_attribute :special_features, Decidim::Attributes::RichText
+        translatable_attribute :purpose_of_action, String
+        translatable_attribute :short_description, String
+        translatable_attribute :special_features, String
         translatable_attribute :subtitle, String
         translatable_attribute :target, String
         translatable_attribute :title, String
-        translatable_attribute :announcement, Decidim::Attributes::RichText
+        translatable_attribute :announcement, String
 
         attribute :created_by, String
         attribute :facebook_handler, String
@@ -51,7 +51,6 @@ module Decidim
         attribute :is_transparent, Boolean
         attribute :promoted, Boolean
         attribute :private_space, Boolean
-        attribute :show_statistics, Boolean
         attribute :scopes_enabled, Boolean
 
         attribute :closing_date, Decidim::Attributes::LocalizedDate

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

@@ -12,32 +12,6 @@ module Decidim
       include Decidim::FiltersHelper
       include FilterAssembliesHelper
 
-      # Public: Returns the characteristics of an assembly in a readable format like
-      # "title: close, no public, no transparent and is restricted to the members of the assembly"
-      # deprecated
-      def participatory_processes_for_assembly(assembly_participatory_processes)
-        html = ""
-        html += %( <div class="section"> ).html_safe
-        html += %( <h4>#{t("assemblies.show.related_participatory_processes", scope: "decidim")}</h4> ).html_safe
-        html += %( <div class="row small-up-1 medium-up-2 card-grid"> ).html_safe
-        assembly_participatory_processes.each do |assembly_participatory_process|
-          html += render partial: "decidim/participatory_processes/participatory_process", locals: { participatory_process: assembly_participatory_process }
-        end
-        html += %( </div> ).html_safe
-        html += %( </div> ).html_safe
-
-        html.html_safe
-      end
-
-      def assembly_features(assembly)
-        html = "".html_safe
-        html += "<strong>#{translated_attribute(assembly.title)}: </strong>".html_safe
-        html += t("assemblies.show.private_space", scope: "decidim").to_s.html_safe
-        html += ", #{t("assemblies.show.is_transparent.#{assembly.is_transparent}", scope: "decidim")}".html_safe if assembly.is_transparent?
-        html += " #{decidim_sanitize_editor translated_attribute(assembly.special_features)}".html_safe
-        html.html_safe
-      end
-
       # Items to display in the navigation of an assembly
       def assembly_nav_items(participatory_space)
         components = participatory_space.components.published.or(Decidim::Component.where(id: try(:current_component)))

data/app/models/decidim/assembly.rb

@@ -122,11 +122,6 @@ module Decidim
       Decidim::Assemblies::AdminLog::AssemblyPresenter
     end
 
-    # This is a overwrite for Decidim::ParticipatorySpaceResourceable.visible?
-    def visible?
-      published? && (!private_space? || (private_space? && is_transparent?))
-    end
-
     def hashtag
       attributes["hashtag"].to_s.delete("#")
     end
@@ -154,7 +149,7 @@ module Decidim
     end
 
     def user_roles(role_name = nil)
-      roles = Decidim::AssemblyUserRole.order_by_name.where(assembly: self_and_ancestors)
+      roles = Decidim::AssemblyUserRole.where(assembly: self_and_ancestors)
       return roles if role_name.blank?
 
       roles.where(role: role_name)

data/app/permissions/decidim/assemblies/permissions.rb

@@ -3,8 +3,6 @@
 module Decidim
   module Assemblies
     class Permissions < Decidim::DefaultPermissions
-      include Decidim::UserRoleChecker
-
       def permissions
         user_can_enter_space_area?
 
@@ -36,7 +34,6 @@ module Decidim
         user_can_create_assembly?
         user_can_export_assembly?
         user_can_copy_assembly?
-        user_can_upload_images_in_assembly?
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
@@ -148,7 +145,7 @@ module Decidim
       end
 
       # All users with a relation to an assembly and organization admins can enter
-      # the space area. The sapce area is considered to be the assemblies zone,
+      # the space area. The space area is considered to be the assemblies zone,
       # not the assembly groups one.
       def user_can_enter_space_area?
         return unless permission_action.action == :enter &&
@@ -179,7 +176,7 @@ module Decidim
         return unless permission_action.action == :create &&
                       permission_action.subject == :assembly
 
-        toggle_allow(user.admin? || admin_assembly?)
+        toggle_allow(user.admin? || admin_assembly? || user_role == "admin")
       end
 
       def user_can_export_assembly?
@@ -317,11 +314,6 @@ module Decidim
           Decidim::Assembly.where(id: assemblies + child_assemblies)
         end
       end
-
-      # Checks if the assigned admins can upload images on the editor
-      def user_can_upload_images_in_assembly?
-        allow! if user&.admin_terms_accepted? && user_has_any_role?(user, assembly, broad_check: true) && (permission_action.subject == :editor_image)
-      end
     end
   end
 end

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

@@ -31,7 +31,6 @@ module Decidim
             reference: :string,
             scopes_enabled: :boolean,
             short_description: :i18n,
-            show_statistics: :boolean,
             slug: :default,
             subtitle: :i18n,
             target: :i18n,

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

@@ -6,11 +6,11 @@ module Decidim
       include Decidim::TranslationsHelper
 
       def hero_image_url
-        assembly.attached_uploader(:hero_image).url
+        assembly.attached_uploader(:hero_image).url(host: assembly.organization.host)
       end
 
       def banner_image_url
-        assembly.attached_uploader(:banner_image).url
+        assembly.attached_uploader(:banner_image).url(host: assembly.organization.host)
       end
 
       def area_name

data/app/serializers/decidim/assemblies/assembly_importer.rb

@@ -36,7 +36,6 @@ module Decidim
             target: attributes["target"],
             participatory_scope: attributes["participatory_scope"],
             participatory_structure: attributes["participatory_structure"],
-            show_statistics: attributes["show_statistics"],
             scopes_enabled: attributes["scopes_enabled"],
             private_space: attributes["private_space"],
             reference: attributes["reference"],

data/app/serializers/decidim/assemblies/assembly_serializer.rb

@@ -33,9 +33,8 @@ module Decidim
           local_area: assembly.local_area,
           target: assembly.target,
           decidim_scope_id: assembly.decidim_scope_id,
-          paticipatory_scope: assembly.participatory_scope,
+          paticipatory_scope: assembly.participatory_scope, # intentionally misspelled
           participatory_structure: assembly.participatory_structure,
-          show_statistics: assembly.show_statistics,
           scopes_enabled: assembly.scopes_enabled,
           private_space: assembly.private_space,
           reference: assembly.reference,

data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb

@@ -181,17 +181,17 @@
     </div>
   </div>
 
-  <div class="card" data-component="accordion" id="accordion-visbility">
+  <div class="card" data-component="accordion" id="accordion-visibility">
     <div class="card-divider">
-      <button class="card-divider-button" data-open="true" data-controls="panel-visbility" type="button">
+      <button class="card-divider-button" data-open="true" data-controls="panel-visibility" type="button">
         <%= icon "arrow-right-s-line" %>
-        <h2 class="card-title" id="visbility">
-          <%= t("visbility", scope: "decidim.assemblies.admin.assemblies.form") %>
+        <h2 class="card-title" id="visibility">
+          <%= t("visibility", scope: "decidim.assemblies.admin.assemblies.form") %>
         </h2>
       </button>
     </div>
 
-    <div id="panel-visbility" class="card-section">
+    <div id="panel-visibility" class="card-section">
       <% if params[:parent_id].present? %>
         <%= form.hidden_field :parent_id, value: @form.parent_id %>
       <% else %>
@@ -273,10 +273,6 @@
                               label: t("social_handlers",
                                        scope: "decidim.assemblies.admin.assemblies.form") %>
       </div>
-
-      <div class="row column">
-        <%= form.check_box :show_statistics %>
-      </div>
     </div>
   </div>
 </div>

data/app/views/decidim/assemblies/admin/assemblies/index.html.erb

@@ -77,7 +77,7 @@
                <% else %>
                  <span class="action-space icon"></span>
                <% end %>
-               <% if assembly.children.count.positive? || allowed_to?(:read, :assembly, assembly:) %>
+               <% if assembly.children.count.positive? || allowed_to?(:create, :assembly) %>
                  <%= icon_link_to "government-line",
                                   url_for(query_params_with(parent_id_eq: assembly.id)),
                                   t("decidim.admin.titles.assemblies"),
@@ -85,7 +85,7 @@
                <% else %>
                  <span class="action-space icon"></span>
                <% end %>
-               <% if allowed_to? :copy, :assembly, assembly: assembly, assembly: parent_assembly %>
+              <% if allowed_to? :copy, :assembly, assembly: assembly %>
                 <%= icon_link_to "file-copy-line", new_assembly_copy_path(assembly), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
               <% else %>
                 <span class="action-space icon"></span>

data/app/views/decidim/assemblies/admin/assembly_members/index.html.erb

@@ -18,7 +18,7 @@
           <th><%= t("models.assembly_member.fields.position", scope: "decidim.admin") %></th>
           <th><%= t("models.assembly_member.fields.designation_date", scope: "decidim.admin") %></th>
           <th><%= t("models.assembly_member.fields.ceased_date", scope: "decidim.admin") %></th>
-          <th class="actions"></th>
+          <th></th>
         </tr>
       </thead>
       <tbody>

data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb

@@ -18,7 +18,7 @@
           <th><%= sort_link(query, :last_sign_in_at, t("models.user.fields.last_sign_in_at", scope: "decidim.admin"), default_order: :desc) %></th>
           <th><%= sort_link(query, :invitation_accepted_at, t("models.user.fields.invitation_accepted_at", scope: "decidim.admin"), default_order: :desc) %></th>
           <th><%= sort_link(query, :role, t("models.assembly_user_role.fields.role", scope: "decidim.admin"), default_order: :desc) %></th>
-          <th class="actions"></th>
+          <th></th>
         </tr>
       </thead>
       <tbody>

data/app/views/decidim/assemblies/assemblies/show.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_meta_tags({
-                           image_url: current_participatory_space.attached_uploader(:hero_image).url,
+                           title: translated_attribute(current_participatory_space.title),
+                           image_url: current_participatory_space.attached_uploader(:hero_image).path,
                            description: translated_attribute(current_participatory_space.short_description),
-                           url: assembly_url(current_participatory_space),
-                           twitter_handler: current_organization.twitter_handler
+                           url: assembly_url(current_participatory_space)
                          }) %>
 
 <%
@@ -14,23 +14,27 @@ edit_link(
 )
 %>
 
-<% if current_participatory_space.private_space? %>
-  <section class="participatory-space__block-reference alert">
-    <%= t("private_space", scope: "decidim.assemblies.show") %>
-  </section>
-<% end %>
+<%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
 
-<div class="participatory-space__container">
+<main>
+  <% if current_participatory_space.private_space? %>
+    <section class="participatory-space__block-reference alert">
+      <%= t("private_space", scope: "decidim.assemblies.show") %>
+    </section>
+  <% end %>
 
-  <%= participatory_space_floating_help %>
+  <div class="participatory-space__container">
 
-  <% active_content_blocks.each do |content_block| %>
-    <% next unless content_block.manifest %>
-    <%= cell content_block.manifest.cell, content_block %>
-  <% end %>
+    <%= participatory_space_floating_help %>
 
-</div>
+    <% active_content_blocks.each do |content_block| %>
+      <% next unless content_block.manifest %>
+      <%= cell content_block.manifest.cell, content_block %>
+    <% end %>
 
-<section class="participatory-space__block-reference">
-  <%= resource_reference(current_participatory_space) %>
-</section>
+  </div>
+
+  <section class="participatory-space__block-reference">
+    <%= resource_reference(current_participatory_space) %>
+  </section>
+</main>

data/app/views/decidim/assemblies/assembly_members/index.html.erb

@@ -1,4 +1,5 @@
-<% add_decidim_meta_tags(title: t("assembly_members.index.title", scope: "decidim")) %>
+<% add_decidim_page_title(t("assembly_members.index.title", scope: "decidim")) %>
+<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
 
 <%
 edit_link(

data/app/views/layouts/decidim/admin/assemblies.html.erb

@@ -1,6 +1,6 @@
 <% content_for :breadcrumb_context_menu do %>
   <div class="process-title-content-breadcrumb-container-right">
-    <% if allowed_to? :create, :assembly, assembly: parent_assembly %>
+    <% if allowed_to? :create, :assembly %>
       <% link = defined?(parent_assembly) ? new_assembly_path(parent_id: parent_assembly&.id) : new_assembly_path %>
       <%= link_to link, class: "button button__sm button__transparent process-title-content-breadcrumb-container-right-link" do %>
         <%= icon "add-line", class: "w-4 h-4" %>