decidim-assemblies 0.28.0 → 0.28.1

data/config/locales/tr-TR.yml

@@ -269,7 +269,6 @@ tr:
             select_parent_assembly: Bağlı olduğu kurulu seçin
             social_handlers: Sosyal
             title: Genel bilgi
-            visbility: görünürlük
         assemblies_types:
           form:
             title: Başlık
@@ -331,7 +330,7 @@ tr:
           'false': opak
           'true': şeffaf
         private_space: Bu özel bir kurul
-        related_participatory_processes: İlgili katılımcı süreçleri
+        related_participatory_processes: İlgili Katılımcı süreçler
     assembly_members:
       assembly_member:
         designated_on: Üzerinde belirlenen

data/config/locales/zh-CN.yml

@@ -248,7 +248,6 @@ zh-CN:
             select_parent_assembly: 选择父程序集
             social_handlers: 社交活动
             title: 一般信息
-            visbility: 可见性
         assemblies_types:
           form:
             title: 标题

data/config/locales/zh-TW.yml

@@ -274,7 +274,6 @@ zh-TW:
             select_parent_assembly: 選擇父組件
             social_handlers: 社群
             title: 基本資訊
-            visbility: 可見度
         assemblies_types:
           form:
             title: 標題
@@ -343,7 +342,7 @@ zh-TW:
           'false': 不透明
           'true': 透明
         private_space: 這是一個私人大會
-        related_participatory_processes: 相關參與過程
+        related_participatory_processes: 相關參與程序
         social_networks_title: 訪問大會
     assembly_members:
       assembly_member:

data/decidim-assemblies.gemspec

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+require "decidim/assemblies/version"
+
+Gem::Specification.new do |s|
+  s.version = Decidim::Assemblies.version
+  s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
+  s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
+  s.license = "AGPL-3.0"
+  s.homepage = "https://decidim.org"
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
+    "documentation_uri" => "https://docs.decidim.org/",
+    "funding_uri" => "https://opencollective.com/decidim",
+    "homepage_uri" => "https://decidim.org",
+    "source_code_uri" => "https://github.com/decidim/decidim"
+  }
+  s.required_ruby_version = "~> 3.1.0"
+
+  s.name = "decidim-assemblies"
+  s.summary = "Decidim assemblies module"
+  s.description = "Assemblies component for decidim."
+
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").select do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
+    end
+  end
+
+  s.add_dependency "decidim-core", Decidim::Assemblies.version
+
+  s.add_development_dependency "decidim-admin", Decidim::Assemblies.version
+  s.add_development_dependency "decidim-dev", Decidim::Assemblies.version
+  s.add_development_dependency "decidim-meetings", Decidim::Assemblies.version
+  s.add_development_dependency "decidim-proposals", Decidim::Assemblies.version
+end

data/lib/decidim/assemblies/admin_engine.rb

@@ -102,21 +102,9 @@ module Decidim
 
       initializer "decidim_assemblies_admin.menu" do
         Decidim::Assemblies::Menu.register_admin_menu_modules!
-      end
-
-      initializer "decidim_assemblies_admin.attachments_menu" do
-        Decidim::Assemblies::Menu.register_assemblies_admin_attachments_menu!
-      end
-
-      initializer "decidim_assemblies_admin.components_menu" do
+        Decidim::Assemblies::Menu.register_admin_assemblies_attachments_menu!
         Decidim::Assemblies::Menu.register_admin_assemblies_components_menu!
-      end
-
-      initializer "decidim_assemblies_admin.assembly_menu" do
         Decidim::Assemblies::Menu.register_admin_assembly_menu!
-      end
-
-      initializer "decidim_assemblies_admin.assemblies_menu" do
         Decidim::Assemblies::Menu.register_admin_assemblies_menu!
       end
     end

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

@@ -27,7 +27,22 @@ module Decidim
 
           Decidim.content_blocks.register(:assembly_homepage, :hero) do |content_block|
             content_block.cell = "decidim/content_blocks/participatory_space_hero"
+            content_block.settings_form_cell = "decidim/content_blocks/participatory_space_hero_settings_form"
             content_block.public_name_key = "decidim.content_blocks.hero.name"
+
+            content_block.images = [
+              {
+                name: :background_image,
+                uploader: "Decidim::BackgroundImageUploader"
+              }
+            ]
+
+            content_block.settings do |settings|
+              settings.attribute :button_text, type: :text, translated: true
+              settings.attribute :button_url, type: :text, translated: true
+            end
+
+            content_block.default!
           end
 
           Decidim.content_blocks.register(:assembly_homepage, :announcement) do |content_block|

data/lib/decidim/assemblies/menu.rb

@@ -38,7 +38,7 @@ module Decidim
         end
       end
 
-      def self.register_assemblies_admin_attachments_menu!
+      def self.register_admin_assemblies_attachments_menu!
         Decidim.menu :assemblies_admin_attachments_menu do |menu|
           menu.add_item :assembly_attachments,
                         I18n.t("attachment_files", scope: "decidim.admin.menu.assemblies_submenu"),
@@ -58,10 +58,8 @@ module Decidim
       def self.register_admin_assemblies_components_menu!
         Decidim.menu :admin_assemblies_components_menu do |menu|
           current_participatory_space.components.each do |component|
-            caption = translated_attribute(component.name)
-            if component.primary_stat.present?
-              caption += content_tag(:span, component.primary_stat, class: component.primary_stat.zero? ? "component-counter component-counter--off" : "component-counter")
-            end
+            caption = decidim_escape_translated(component.name)
+            caption += content_tag(:span, component.primary_stat, class: "component-counter") if component.primary_stat.present?
 
             menu.add_item [component.manifest_name, component.id].join("_"),
                           caption.html_safe,
@@ -144,15 +142,25 @@ module Decidim
           menu.add_item :assemblies,
                         I18n.t("menu.assemblies", scope: "decidim.admin"),
                         decidim_admin_assemblies.assemblies_path,
-                        position: 1.0,
+                        position: 1,
                         active: is_active_link?(decidim_admin_assemblies.assemblies_path),
+                        icon_name: "government-line",
                         if: allowed_to?(:read, :assembly_list)
 
+          menu.add_item :import_assembly,
+                        I18n.t("actions.import_assembly", scope: "decidim.admin"),
+                        decidim_admin_assemblies.new_import_path,
+                        position: 2,
+                        active: is_active_link?(decidim_admin_assemblies.new_import_path),
+                        icon_name: "price-tag-3-line",
+                        if: allowed_to?(:import, :assembly)
+
           menu.add_item :assemblies_types,
                         I18n.t("menu.assemblies_types", scope: "decidim.admin"),
                         decidim_admin_assemblies.assemblies_types_path,
+                        position: 3,
                         active: is_active_link?(decidim_admin_assemblies.assemblies_types_path),
-                        position: 1.1,
+                        icon_name: "government-line",
                         if: allowed_to?(:manage, :assemblies_type)
         end
       end

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

@@ -9,50 +9,56 @@ FactoryBot.define do
   end
 
   factory :assemblies_type, class: "Decidim::AssembliesType" do
-    title { generate_localized_title }
+    transient do
+      skip_injection { false }
+    end
+    title { generate_localized_title(:assemblies_type_title, skip_injection:) }
     organization
   end
 
   factory :assembly, class: "Decidim::Assembly" do
-    title { generate_localized_title }
+    transient do
+      skip_injection { false }
+    end
+    title { generate_localized_title(:assembly_title, skip_injection:) }
     slug { generate(:assembly_slug) }
-    subtitle { generate_localized_title }
-    short_description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    subtitle { generate_localized_title(:assembly_subtitle, skip_injection:) }
+    short_description { generate_localized_description(:assembly_short_description, skip_injection:) }
+    description { generate_localized_description(:assembly_description, skip_injection:) }
     organization
     hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
     banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
     published_at { Time.current }
-    meta_scope { Decidim::Faker::Localized.word }
-    developer_group { generate_localized_title }
-    local_area { generate_localized_title }
-    target { generate_localized_title }
-    participatory_scope { generate_localized_title }
-    participatory_structure { generate_localized_title }
+    meta_scope { generate_localized_word(:assembly_meta_scope, skip_injection:) }
+    developer_group { generate_localized_title(:assembly_developer_group, skip_injection:) }
+    local_area { generate_localized_title(:assembly_local_area, skip_injection:) }
+    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 { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    composition { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    purpose_of_action { generate_localized_description(:assembly_purpose_of_action, skip_injection:) }
+    composition { generate_localized_description(:assembly_composition, skip_injection:) }
     creation_date { 1.month.ago }
     created_by { "others" }
-    created_by_other { Decidim::Faker::Localized.word }
+    created_by_other { generate_localized_word(:assembly_created_by_other, skip_injection:) }
     duration { 2.months.from_now.at_midnight }
     included_at { 1.month.ago }
     closing_date { 2.months.from_now.at_midnight }
-    closing_date_reason { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    internal_organisation { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    closing_date_reason { generate_localized_description(:assembly_closing_date_reason, skip_injection:) }
+    internal_organisation { generate_localized_description(:assembly_internal_organisation, skip_injection:) }
     is_transparent { true }
-    special_features { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    special_features { generate_localized_description(:assembly_special_features, skip_injection:) }
     twitter_handler { "others" }
     facebook_handler { "others" }
     instagram_handler { "others" }
     youtube_handler { "others" }
     github_handler { "others" }
     weight { 1 }
-    announcement { generate_localized_title }
+    announcement { generate_localized_title(:assembly_announcement, skip_injection:) }
 
     trait :with_type do
-      assembly_type { create :assemblies_type, organization: }
+      assembly_type { create :assemblies_type, organization:, skip_injection: }
     end
 
     trait :promoted do
@@ -68,7 +74,7 @@ FactoryBot.define do
     end
 
     trait :with_parent do
-      parent { create :assembly, organization: }
+      parent { create :assembly, organization:, skip_injection: }
     end
 
     trait :public do
@@ -97,6 +103,7 @@ FactoryBot.define do
             organization: assembly.organization,
             scope_name: :assembly_homepage,
             manifest_name:,
+            skip_injection: evaluator.skip_injection,
             scoped_resource_id: assembly.id
           )
         end
@@ -105,13 +112,17 @@ FactoryBot.define do
   end
 
   factory :assembly_user_role, class: "Decidim::AssemblyUserRole" do
+    transient do
+      skip_injection { false }
+    end
     user
-    assembly { create :assembly, organization: user.organization }
+    assembly { create :assembly, organization: user.organization, skip_injection: }
     role { "admin" }
   end
 
   factory :assembly_admin, parent: :user, class: "Decidim::User" do
     transient do
+      skip_injection { false }
       assembly { create(:assembly) }
     end
 
@@ -122,12 +133,14 @@ FactoryBot.define do
       create :assembly_user_role,
              user:,
              assembly: evaluator.assembly,
+             skip_injection: evaluator.skip_injection,
              role: :admin
     end
   end
 
   factory :assembly_moderator, parent: :user, class: "Decidim::User" do
     transient do
+      skip_injection { false }
       assembly { create(:assembly) }
     end
 
@@ -138,12 +151,14 @@ FactoryBot.define do
       create :assembly_user_role,
              user:,
              assembly: evaluator.assembly,
-             role: :moderator
+             role: :moderator,
+             skip_injection: evaluator.skip_injection
     end
   end
 
   factory :assembly_collaborator, parent: :user, class: "Decidim::User" do
     transient do
+      skip_injection { false }
       assembly { create(:assembly) }
     end
 
@@ -154,12 +169,14 @@ FactoryBot.define do
       create :assembly_user_role,
              user:,
              assembly: evaluator.assembly,
-             role: :collaborator
+             role: :collaborator,
+             skip_injection: evaluator.skip_injection
     end
   end
 
   factory :assembly_valuator, parent: :user, class: "Decidim::User" do
     transient do
+      skip_injection { false }
       assembly { create(:assembly) }
     end
 
@@ -170,12 +187,16 @@ FactoryBot.define do
       create :assembly_user_role,
              user:,
              assembly: evaluator.assembly,
-             role: :valuator
+             role: :valuator,
+             skip_injection: evaluator.skip_injection
     end
   end
 
   factory :assembly_member, class: "Decidim::AssemblyMember" do
-    assembly { create(:assembly) }
+    transient do
+      skip_injection { false }
+    end
+    assembly { create(:assembly, skip_injection:) }
 
     full_name { Faker::Name.name }
     gender { Faker::Lorem.word }
@@ -189,7 +210,7 @@ FactoryBot.define do
     end
 
     trait :with_user do
-      user { create(:user, organization: assembly.organization) }
+      user { create(:user, organization: assembly.organization, skip_injection:) }
     end
   end
 end

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.0"
+      "0.28.1"
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-04-30 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.0
+        version: 0.28.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -250,7 +250,6 @@ files:
 - app/views/layouts/decidim/admin/assembly.html.erb
 - app/views/layouts/decidim/assembly.html.erb
 - config/assets.rb
-- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -283,6 +282,7 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
+- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -352,6 +352,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
+- decidim-assemblies.gemspec
 - lib/decidim/api/assemblies_type_type.rb
 - lib/decidim/api/assembly_member_type.rb
 - lib/decidim/api/assembly_type.rb
@@ -376,23 +377,23 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: Decidim assemblies module
 test_files: []

data/config/environment.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-# Empty line for playing nice with tpope/vim-rails