decidim-assemblies 0.28.2 → 0.29.0.rc1

data/config/locales/pt.yml

@@ -44,7 +44,6 @@ pt:
         scope_id: Âmbito
         scopes_enabled: Âmbitos ativados
         short_description: Pequena descrição
-        show_statistics: Mostrar estatísticas
         slug: Campo de dados dinâmicos de URL
         special_features: Características especiais
         subtitle: Subtítulo
@@ -265,7 +264,6 @@ pt:
           form:
             existing_user: Participante existente
             explanation: 'Orientações para imagem:'
-            image_guide: De preferência uma imagem em formato paisagem sem texto algum.
             non_user: Não participante
             non_user_avatar_help: Deve obter o consentimento das pessoas antes de as publicar como membros.
             select_a_position: Selecione uma posição
@@ -318,11 +316,7 @@ pt:
       show:
         assembly_type: Tipo de reunião
         duration: Duração
-        is_transparent:
-          'false': opaco
-          'true': transparente
         private_space: Esta é uma reunião privada
-        related_participatory_processes: Processos participativos relacionados
     assembly_members:
       assembly_member:
         designated_on: Designado em

data/config/locales/ro-RO.yml

@@ -51,7 +51,6 @@ ro:
         scope_id: Domeniu de interes
         scopes_enabled: Domenii activate
         short_description: Descriere scurtă
-        show_statistics: Arată statistici
         slug: URL slug
         special_features: Funcționalități speciale
         subtitle: Subtitlu
@@ -287,7 +286,6 @@ ro:
           form:
             existing_user: Participant existent
             explanation: 'Îndrumare pentru imagine:'
-            image_guide: Este de preferat o imagine pe format orizontal care să nu conțină text deloc.
             non_user: Non participant
             non_user_avatar_help: Ar trebui să obţii consimţământul persoanelor înainte de a îi publica drept membri.
             select_a_position: Selectaţi o poziţie
@@ -357,11 +355,7 @@ ro:
       show:
         assembly_type: Tipul grupului de lucru
         duration: Durată
-        is_transparent:
-          'false': opac
-          'true': transparent
         private_space: Acesta este un grup de lucru privat
-        related_participatory_processes: Procese participative asociate
         social_networks_title: Vizitează adunarea pe
     assembly_members:
       assembly_member:

data/config/locales/ru.yml

@@ -43,7 +43,6 @@ ru:
         scope_id: Охват
         scopes_enabled: Охваты включены
         short_description: Краткое описание
-        show_statistics: Показывать статистику
         slug: Сокращенный веб-адрес
         special_features: Особенности
         subtitle: Подзаголовок
@@ -261,11 +260,7 @@ ru:
       show:
         assembly_type: Вид собрания
         duration: Длительность
-        is_transparent:
-          'false': непрозрачное
-          'true': прозрачное
         private_space: Это частное собрание
-        related_participatory_processes: Сопутствующие движения соучастия
     assembly_members:
       assembly_member:
         designated_on: 'Полномочия предоставлены:'

data/config/locales/sk.yml

@@ -44,7 +44,6 @@ sk:
         scope_id: Rozsah
         scopes_enabled: Povolené rozsahy
         short_description: Stručný opis
-        show_statistics: Zobraziť štatistiky
         slug: URL krátky odkaz
         special_features: Špeciálne funkcie
         subtitle: Podnadpis
@@ -135,8 +134,6 @@ sk:
         assemblies_types:
           form:
             title: Názov
-      show:
-        related_participatory_processes: Súvisiace participatívne procesy
     events:
       assemblies:
         create_assembly_member:

data/config/locales/sl.yml

@@ -41,7 +41,6 @@ sl:
         scope_id: Obseg
         scopes_enabled: Omogočeni obsegi
         short_description: Kratek opis
-        show_statistics: Pokaži statistike
         special_features: Posebne funkcije
         subtitle: Podnapis
         target: Kdor je prisostoval
@@ -190,7 +189,6 @@ sl:
       show:
         assembly_type: Vrsta združbe
         duration: Trajanje
-        related_participatory_processes: Povezani participativni procesi
     help:
       participatory_spaces:
         assemblies:

data/config/locales/sq-AL.yml

@@ -50,7 +50,6 @@ sq:
         scope_id: Qëllimi
         scopes_enabled: Fushveprimet e aktivizuara
         short_description: Përshkrim i shkurtër
-        show_statistics: Trego statistikat
         slug: Identifikues URL-je
         special_features: Karaktersitika të veçanta
         subtitle: Nëntitull
@@ -284,7 +283,7 @@ sq:
             slug_help_html: 'Për gjenerimin e URL së kësaj asambleje përdoren URL slugs. Pranohen vetëm gërma, numra dhe viza horizontale, dhe duhet të fillojë me gërmë. Shembull: %{url}'
             social_handlers: Rrjete sociale
             title: Informacion i përgjithshëm
-            visbility: Vizibiliteti
+            visibility: Vizibiliteti
         assemblies_types:
           form:
             title: Modifiko tipin e asamblesë
@@ -298,6 +297,7 @@ sq:
           form:
             existing_user: Pjesëmarrës ekzistues
             explanation: 'Udhëzime për imazhin:'
+            image_guide: Preferohet imazh me format portret (vertikal) pa tekst.
             non_user: Mospjesëmarrës
             non_user_avatar_help: Duhet të marrësh pëlqimin e personit para se ta publikosh si anëtar.
             select_a_position: Zgjidh një pozicion
@@ -382,7 +382,6 @@ sq:
         assembly_type: Tipi i asamblesë
         duration: Kohëzgjatja
         private_space: Kjo është asamble private
-        related_participatory_processes: Procese pjesëmarrëse të përafërta
         social_networks_title: Vizito asamblenë në
     assembly_members:
       assembly_member:

data/config/locales/sv.yml

@@ -49,7 +49,6 @@ sv:
         scope_id: Omfång
         scopes_enabled: Omfång är aktiverade
         short_description: Kort beskrivning
-        show_statistics: Visa statistik
         slug: URL-slug
         special_features: Specialfunktioner
         subtitle: Underrubrik
@@ -272,7 +271,6 @@ sv:
           form:
             existing_user: Befintlig deltagare
             explanation: 'Vägledning för bild:'
-            image_guide: Helst en porträttbild utan text.
             non_user: Ej deltagande
             non_user_avatar_help: Du bör få samtycke av personerna innan du publicerar dem som medlem.
             select_a_position: Välj en position
@@ -342,11 +340,7 @@ sv:
       show:
         assembly_type: Typ av grupp
         duration: Varaktighet
-        is_transparent:
-          'false': ogenomskinlig
-          'true': transparent
         private_space: Detta är en privat grupp
-        related_participatory_processes: Relaterade dialoger
     assembly_members:
       assembly_member:
         designated_on: Utsedd den

data/config/locales/tr-TR.yml

@@ -51,7 +51,6 @@ tr:
         scope_id: kapsam
         scopes_enabled: Kapsamlar etkin
         short_description: Kısa Açıklama
-        show_statistics: İstatistikleri göster
         slug: URL sümüklü böcek
         special_features: Özel özellikler
         subtitle: Alt Başlık
@@ -325,11 +324,7 @@ tr:
       show:
         assembly_type: Kurul türü
         duration: Süre
-        is_transparent:
-          'false': opak
-          'true': şeffaf
         private_space: Bu özel bir kurul
-        related_participatory_processes: İlgili Katılımcı süreçler
     assembly_members:
       assembly_member:
         designated_on: Üzerinde belirlenen

data/config/locales/uk.yml

@@ -43,7 +43,6 @@ uk:
         scope_id: Обсяг
         scopes_enabled: Обсяги увімкнено
         short_description: Стислий опис
-        show_statistics: Показувати статистику
         slug: Скорочена веб-адреса
         special_features: Особливості
         subtitle: Підзаголовок
@@ -261,11 +260,7 @@ uk:
       show:
         assembly_type: Різновид зборів
         duration: Тривалість
-        is_transparent:
-          'false': непрозорі
-          'true': прозорі
         private_space: Це приватні збори
-        related_participatory_processes: Пов'язані рухи співучасті
     assembly_members:
       assembly_member:
         designated_on: 'Надано повноваження:'

data/config/locales/zh-CN.yml

@@ -44,7 +44,6 @@ zh-CN:
         scope_id: 范围
         scopes_enabled: 范围已启用
         short_description: 简短描述
-        show_statistics: 显示统计
         slug: URL 名称
         special_features: 特殊功能
         subtitle: 字幕
@@ -301,11 +300,7 @@ zh-CN:
       show:
         assembly_type: 程序集类型
         duration: 期限
-        is_transparent:
-          'false': 不透明度
-          'true': 透明度
         private_space: 这是一个私人装饰
-        related_participatory_processes: 相关的参与进程
     assembly_members:
       assembly_member:
         designated_on: 指定于

data/config/locales/zh-TW.yml

@@ -51,7 +51,6 @@ zh-TW:
         scope_id: 範圍
         scopes_enabled: 啟用範圍
         short_description: 簡短說明
-        show_statistics: 顯示統計資料
         slug: URL名稱
         special_features: 特殊功能
         subtitle: 子標題
@@ -280,7 +279,6 @@ zh-TW:
           form:
             existing_user: 現有參與者
             explanation: '圖像的指導'
-            image_guide: 最好是沒有任何文字的肖像圖像
             non_user: 非參與者
             non_user_avatar_help: 在發佈他們為會員之前，您應該徵得他們的同意
             select_a_position: 選擇一個位置
@@ -337,11 +335,7 @@ zh-TW:
       show:
         assembly_type: 大會類型
         duration: 持續時間
-        is_transparent:
-          'false': 不透明
-          'true': 透明
         private_space: 這是一個私人大會
-        related_participatory_processes: 相關參與程序
         social_networks_title: 訪問大會
     assembly_members:
       assembly_member:

data/db/migrate/20240712061153_change_show_statistics_from_decidim_assemblies.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ChangeShowStatisticsFromDecidimAssemblies < ActiveRecord::Migration[7.0]
+  def up
+    change_column_default :decidim_assemblies, :show_statistics, from: false, to: true
+  end
+
+  def down
+    change_column_default :decidim_assemblies, :show_statistics, from: true, to: false
+  end
+end

data/decidim-assemblies.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-assemblies"
   s.summary = "Decidim assemblies module"

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,12 +53,12 @@ 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).path

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.2"
+      "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.2
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        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.2
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        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.2
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        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.2
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        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.2
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        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 %>