decidim-assemblies 0.28.3 → 0.29.0.rc1

data/lib/decidim/api/assembly_type.rb

@@ -31,7 +31,6 @@ module Decidim
       field :target, Decidim::Core::TranslatedFieldType, "Who participates in this assembly", null: true
       field :participatory_scope, Decidim::Core::TranslatedFieldType, "What is decided on this assembly", null: true
       field :participatory_structure, Decidim::Core::TranslatedFieldType, "How it is decided on this assembly", null: true
-      field :show_statistics, Boolean, "If this assembly should show statistics", null: true
       field :scopes_enabled, Boolean, "If this assembly has scopes enabled", null: true
       field :private_space, Boolean, "If this assembly is a private space", null: true
       field :area, Decidim::Core::AreaApiType, "Area of this assembly", null: true
@@ -54,19 +53,19 @@ module Decidim
       field :twitter_handler, String, "Twitter handler", null: true
       field :instagram_handler, String, "Instagram handler", null: true
       field :facebook_handler, String, "Facebook handler", null: true
-      field :youtube_handler, String, "Youtube handler", null: true
-      field :github_handler, String, "Github handler", null: true
+      field :youtube_handler, String, "YouTube handler", null: true
+      field :github_handler, String, "GitHub handler", null: true
       field :announcement, Decidim::Core::TranslatedFieldType, "Highlighted announcement for this assembly", null: true
 
       field :members, [Decidim::Assemblies::AssemblyMemberType, { null: true }], "Members of this assembly", null: false
-      field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Childrens of this assembly", null: false
+      field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Children of this assembly", null: false
 
       def hero_image
-        object.attached_uploader(:hero_image).url
+        object.attached_uploader(:hero_image).path
       end
 
       def banner_image
-        object.attached_uploader(:banner_image).url
+        object.attached_uploader(:banner_image).path
       end
     end
   end

data/lib/decidim/assemblies/content_blocks/registry_manager.rb

@@ -82,7 +82,7 @@ module Decidim
             content_block.public_name_key = "decidim.content_blocks.last_activity.name"
             content_block.settings_form_cell = "decidim/content_blocks/last_activity_settings_form"
             content_block.settings do |settings|
-              settings.attribute :max_last_activity_users, type: :integer, default: Decidim::ContentBlocks::ParticipatorySpaceLastActivityCell::DEFAULT_MAX_LAST_ACTIVITY_USERS
+              settings.attribute :max_last_activity_users, type: :integer, default: Decidim.default_max_last_activity_users
             end
           end
 

data/lib/decidim/assemblies/engine.rb

@@ -60,6 +60,7 @@ module Decidim
 
       initializer "decidim_assemblies.menu" do
         Decidim::Assemblies::Menu.register_menu!
+        Decidim::Assemblies::Menu.register_mobile_menu!
         Decidim::Assemblies::Menu.register_home_content_block_menu!
       end
 

data/lib/decidim/assemblies/menu.rb

@@ -14,6 +14,17 @@ module Decidim
         end
       end
 
+      def self.register_mobile_menu!
+        Decidim.menu :mobile_menu do |menu|
+          menu.add_item :assemblies,
+                        I18n.t("menu.assemblies", scope: "decidim"),
+                        decidim_assemblies.assemblies_path,
+                        position: 2.2,
+                        if: OrganizationPublishedAssemblies.new(current_organization, current_user).any?,
+                        active: :inclusive
+        end
+      end
+
       def self.register_home_content_block_menu!
         Decidim.menu :home_content_block_menu do |menu|
           menu.add_item :assemblies,

data/lib/decidim/assemblies/seeds.rb

@@ -111,17 +111,7 @@ module Decidim
         # Create users with specific roles
         Decidim::AssemblyUserRole::ROLES.each do |role|
           email = "assembly_#{assembly.id}_#{role}@example.org"
-
-          user = Decidim::User.find_or_initialize_by(email:)
-          user.update!(
-            name: ::Faker::Name.name,
-            nickname: ::Faker::Twitter.unique.screen_name,
-            password: "decidim123456789",
-            organization:,
-            confirmed_at: Time.current,
-            locale: I18n.default_locale,
-            tos_agreement: true
-          )
+          user = find_or_initialize_user_by(email:)
 
           Decidim::AssemblyUserRole.find_or_create_by!(
             user:,

data/lib/decidim/assemblies/test/factories.rb

@@ -35,7 +35,6 @@ FactoryBot.define do
     target { generate_localized_title(:assembly_target, skip_injection:) }
     participatory_scope { generate_localized_title(:assembly_participatory_scope, skip_injection:) }
     participatory_structure { generate_localized_title(:assembly_participatory_structure, skip_injection:) }
-    show_statistics { true }
     private_space { false }
     purpose_of_action { generate_localized_description(:assembly_purpose_of_action, skip_injection:) }
     composition { generate_localized_description(:assembly_composition, skip_injection:) }

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.28.3"
+      "0.29.0.rc1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.28.3
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.29.0.rc1
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -121,7 +121,6 @@ files:
 - app/commands/decidim/assemblies/admin/create_assemblies_type.rb
 - app/commands/decidim/assemblies/admin/create_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assembly_member.rb
-- app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb
 - app/commands/decidim/assemblies/admin/destroy_assembly_member.rb
 - app/commands/decidim/assemblies/admin/import_assembly.rb
 - app/commands/decidim/assemblies/admin/update_assemblies_type.rb
@@ -248,7 +247,6 @@ files:
 - app/views/layouts/decidim/admin/assemblies_imports.html.erb
 - app/views/layouts/decidim/admin/assemblies_types.html.erb
 - app/views/layouts/decidim/admin/assembly.html.erb
-- app/views/layouts/decidim/assembly.html.erb
 - config/assets.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
@@ -352,6 +350,7 @@ files:
 - db/migrate/20210310120444_add_followable_counter_cache_to_assemblies.rb
 - db/migrate/20210507063604_add_announcement_to_assemblies.rb
 - db/migrate/20210907120249_remove_designation_mode_from_assembly_members.rb
+- db/migrate/20240712061153_change_show_statistics_from_decidim_assemblies.rb
 - decidim-assemblies.gemspec
 - lib/decidim/api/assemblies_type_type.rb
 - lib/decidim/api/assembly_member_type.rb
@@ -385,14 +384,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim assemblies module

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

@@ -1,45 +0,0 @@
-# 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 < Decidim::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 was not valid and we could not 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/views/layouts/decidim/assembly.html.erb

@@ -1,18 +0,0 @@
-<% add_decidim_page_title(translated_attribute(current_component.name)) if try(:current_component) %>
-<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
-<% add_decidim_meta_tags(
-  image_url: current_participatory_space.attached_uploader(:banner_image).path,
-  description: translated_attribute(current_participatory_space.short_description)
-) %>
-
-<%= append_javascript_pack_tag "decidim_assemblies" %>
-
-<%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
-
-<%= render "layouts/decidim/application" do %>
-  <main>
-    <%= yield %>
-  </main>
-<% end %>
-
-<% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>