decidim-assemblies 0.27.6 → 0.28.0.rc4

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

@@ -16,7 +16,6 @@ module Decidim
         if permission_action.scope == :public
           public_list_assemblies_action?
           public_read_assembly_action?
-          public_embed_assembly_action?
           public_list_members_action?
           return permission_action
         end
@@ -35,7 +34,6 @@ module Decidim
         user_can_create_assembly?
         user_can_export_assembly?
         user_can_copy_assembly?
-        user_can_read_assemblies_setting?
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
@@ -43,6 +41,8 @@ module Decidim
 
         return permission_action unless assembly
 
+        user_can_read_private_users?
+
         moderator_action?
         collaborator_action?
         valuator_action?
@@ -53,6 +53,13 @@ module Decidim
 
       private
 
+      def user_can_read_private_users?
+        return unless permission_action.subject == :space_private_user
+        return unless assembly.private_space?
+
+        toggle_allow(user.admin? || can_manage_assembly?(role: :admin) || can_manage_assembly?(role: :collaborator))
+      end
+
       def assemblies_type_action?
         return unless [:assembly_type, :assemblies_type].include? permission_action.subject
         return disallow! unless user.admin?
@@ -68,13 +75,13 @@ module Decidim
         end
       end
 
-      # It's an admin user if it's an organization admin or is a space admin
+      # It is an admin user if it is an organization admin or is a space admin
       # for the current `assembly`.
       def admin_user?
         user.admin? || (assembly ? can_manage_assembly?(role: :admin) : has_manageable_assemblies?)
       end
 
-      # It's an admin assembly when assembly exists and the user is allowed to
+      # It is an admin assembly when assembly exists and the user is allowed to
       # manage the current assembly.
       def admin_assembly?
         assembly.present? && assembly_admin_allowed_assemblies.include?(assembly)
@@ -137,18 +144,7 @@ module Decidim
         allow!
       end
 
-      def public_embed_assembly_action?
-        return unless permission_action.action == :embed &&
-                      [:assembly, :participatory_space].include?(permission_action.subject) &&
-                      assembly
-
-        return disallow! unless assembly.published?
-        return disallow! if assembly.private_space && !assembly.is_transparent?
-
-        allow!
-      end
-
-      # All users with a relation to a assembly and organization admins can enter
+      # 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,
       # not the assembly groups one.
       def user_can_enter_space_area?
@@ -197,13 +193,6 @@ module Decidim
         toggle_allow(user.admin? || admin_assembly?)
       end
 
-      def user_can_read_assemblies_setting?
-        return unless permission_action.action == :read &&
-                      permission_action.subject == :assemblies_setting
-
-        toggle_allow(user.admin?)
-      end
-
       # Everyone can read the assembly list
       def user_can_read_assembly_list?
         return unless read_assembly_list_permission_action?
@@ -247,6 +236,7 @@ module Decidim
       # Collaborators can read/preview everything inside their assembly.
       def collaborator_action?
         return unless can_manage_assembly?(role: :collaborator)
+        return if permission_action.subject == :space_private_user
 
         allow! if permission_action.action == :read || permission_action.action == :preview
       end
@@ -275,7 +265,6 @@ module Decidim
           :assembly,
           :assembly_user_role,
           :assembly_member,
-          :space_private_user,
           :export_space,
           :import
         ].include?(permission_action.subject)
@@ -295,10 +284,8 @@ module Decidim
           :assembly,
           :assembly_user_role,
           :assembly_member,
-          :space_private_user,
           :export_space,
-          :import,
-          :assemblies_setting
+          :import
         ].include?(permission_action.subject)
         allow! if is_allowed
       end

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::AssembliesSetting`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::AssembliesType`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::AssemblyMember`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Assembly`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::AssemblyUserRole`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

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

@@ -3,6 +3,8 @@
 module Decidim
   module Assemblies
     class AssemblyPresenter < SimpleDelegator
+      include Decidim::TranslationsHelper
+
       def hero_image_url
         assembly.attached_uploader(:hero_image).url(host: assembly.organization.host)
       end
@@ -11,6 +13,42 @@ module Decidim
         assembly.attached_uploader(:banner_image).url(host: assembly.organization.host)
       end
 
+      def area_name
+        return if assembly.area.blank?
+
+        Decidim::AreaPresenter.new(assembly.area).translated_name_with_type
+      end
+
+      def creation_date
+        formatted_date(assembly.creation_date)
+      end
+
+      def included_at
+        formatted_date(assembly.included_at)
+      end
+
+      def closing_date
+        formatted_date(assembly.closing_date)
+      end
+
+      def duration
+        return I18n.t("indefinite_duration", scope: "decidim.assemblies.assemblies.description") if (date = assembly.duration).blank?
+
+        formatted_date(date)
+      end
+
+      def assembly_type
+        return if assembly.assembly_type.blank?
+
+        translated_attribute(assembly.assembly_type.title)
+      end
+
+      def formatted_date(date)
+        return if date.blank?
+
+        I18n.l(date, format: :decidim_short)
+      end
+
       def assembly
         __getobj__
       end

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

@@ -6,50 +6,11 @@ module Decidim
     class AssemblyStatsPresenter < Decidim::StatsPresenter
       include Decidim::IconHelper
 
-      def assembly
-        __getobj__.fetch(:assembly)
-      end
-
-      # 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.concat(comments_stats(:assemblies))
-        highlighted_stats = highlighted_stats.reject(&:empty?)
-        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)
-      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.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 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 participatory_space = __getobj__.fetch(:assembly)
 
-      def published_components
-        @published_components ||= Component.where(participatory_space: assembly).published
-      end
+      def participatory_space_sym = :assemblies
     end
   end
 end

data/app/presenters/decidim/assembly_member_presenter.rb

@@ -9,7 +9,7 @@ module Decidim
       (Time.current.strftime("%Y%m%d").to_i - birthday.strftime("%Y%m%d").to_i) / 10_000 if birthday
     end
 
-    delegate :profile_url, :avatar_url, to: :user, allow_nil: true
+    delegate :profile_url, to: :user, allow_nil: true
 
     def name
       user ? user.name : full_name
@@ -33,16 +33,30 @@ module Decidim
       I18n.t(__getobj__.position, scope: "decidim.admin.models.assembly_member.positions", default: "")
     end
 
-    def non_user_avatar_path
-      return non_user_avatar.default_url unless non_user_avatar.attached?
+    def avatar_url(variant = nil)
+      return user.avatar_url(variant) if user.present?
 
-      non_user_avatar.path
+      non_user_avatar_path(variant)
+    end
+
+    def non_user_avatar_path(variant = nil)
+      return non_user_avatar.default_url(variant) unless non_user_avatar.attached?
+
+      non_user_avatar.path(variant:)
     end
 
     def non_user_avatar
       attached_uploader(:non_user_avatar)
     end
 
+    def has_tooltip?
+      false
+    end
+
+    def deleted?
+      false
+    end
+
     private
 
     def user

data/app/queries/decidim/assemblies/admin/admin_users.rb

@@ -50,7 +50,7 @@ module Decidim
           if assembly
             [assembly]
           else
-            Decidim::Assembly.where(organization: organization)
+            Decidim::Assembly.where(organization:)
           end
         end
       end

data/app/queries/decidim/assemblies/assemblies_with_user_role.rb

@@ -39,8 +39,8 @@ module Decidim
       attr_reader :user, :role
 
       def assembly_ids
-        user_roles = AssemblyUserRole.where(user: user) if role == :any
-        user_roles = AssemblyUserRole.where(user: user, role: role) if role != :any
+        user_roles = AssemblyUserRole.where(user:) if role == :any
+        user_roles = AssemblyUserRole.where(user:, role:) if role != :any
         user_roles.pluck(:decidim_assembly_id)
       end
     end

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

@@ -17,15 +17,15 @@ module Decidim
       #   - title: The +title+ for the new Assembly
       #   - slug: The +slug+ for the new Assembly
       #
-      # Returns a Assembly.
+      # Returns an Assembly instance.
       def import(attributes, _user, opts)
         title = opts[:title]
         slug = opts[:slug]
         Decidim.traceability.perform_action!(:create, Assembly, @user, visibility: "all") do
           @imported_assembly = Assembly.new(
             organization: @organization,
-            title: title,
-            slug: slug,
+            title:,
+            slug:,
             hashtag: attributes["hashtag"],
             subtitle: attributes["subtitle"],
             short_description: attributes["short_description"],

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

@@ -8,7 +8,7 @@ module Decidim
       include Decidim::ResourceHelper
       include Decidim::TranslationsHelper
 
-      # Public: Initializes the serializer with a assembly.
+      # Public: Initializes the serializer with an Assembly instance.
       def initialize(assembly)
         @assembly = assembly
       end