decidim-debates 0.27.4 → 0.28.0.rc5

data/config/locales/zh-TW.yml

@@ -51,7 +51,6 @@ zh-TW:
         confirm_destroy: 您確定嗎？
         destroy: 刪除
         edit: 編輯
-        new: 新增 %{name}
         title: 操作
       admin:
         debate_closes:
@@ -81,9 +80,6 @@ zh-TW:
             success: 辯論已成功更新
         exports:
           comments: 評論
-        models:
-          debate:
-            name: 辯論
       admin_log:
         debate:
           close: "%{user_name} 在 %{space_name} 空間關閉了 %{resource_name} 辯論。"
@@ -96,18 +92,14 @@ zh-TW:
           invalid: 關閉辯論時出現問題
           success: 辯論成功關閉
         close_debate_modal:
-          close: 關閉
           description: 這場辯論的總結或結論是什麼？
           send: 關閉辯論
-        closed: 關閉
         count:
           debates_count:
             other: "%{count} 場辯論"
         create:
           invalid: 建立辯論時出現問題。
           success: 辯論建立成功。
-        debate:
-          participate: 參與
         edit:
           back: 返回
           save: 保存更改
@@ -122,18 +114,11 @@ zh-TW:
           official: 官方
           origin: 起源
           participants: 參與者
-          scope: 範圍
           search: 搜尋
           state: 狀態
           state_values:
             closed: 關閉
             open: 開啟
-          user_groups: 群組
-        filters_small_view:
-          close_modal: 關閉視窗
-          filter: 篩選
-          filter_by: 篩選條件
-          unfold: 展開
         form:
           select_a_category: 請選擇一個類別
         index:
@@ -149,31 +134,20 @@ zh-TW:
           recent: 最近
           updated: 最近更新
         show:
-          back: 返回列表
           close_debate: 關閉辯論
-          date: 日期
           debate_closed: 關閉
           debate_conclusions_are: '此辯論已於 %{date} 結束，以下是總結結論：'
           edit_conclusions: 修改結論
           edit_debate: 編輯辯論
           groups_count: 群組
-          last_comment_by: 最後評論
-          no_comments_yet: 尚無留言
           open: 開放性辯論
           participants_count: 參與者
         update:
           invalid: 更新此辯論時發生問題。
           success: 辯論已成功更新
-        versions:
-          debates:
-            back_to_resource: 返回辯論
-          index:
-            title: 版本
-        versions_list:
-          back_to_resource: 返回辯論
       last_activity:
-        debate_updated_at_html: "<span>辯論已更新，連結網址為 %{link}</span>"
-        new_debate_at_html: "<span>新的辯論，連結網址為 %{link}</span>"
+        debate_updated: '辯論已更新:'
+        new_debate: '新辯論:'
       models:
         debate:
           fields:

data/lib/decidim/debates/component.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require "decidim/components/namer"
-
 Decidim.register_component(:debates) do |component|
   component.engine = Decidim::Debates::Engine
   component.admin_engine = Decidim::Debates::AdminEngine
   component.icon = "media/images/decidim_debates.svg"
+  component.icon_key = "discuss-line"
   component.permissions_class_name = "Decidim::Debates::Permissions"
 
   component.query_type = "Decidim::Debates::DebatesType"
@@ -14,14 +13,14 @@ Decidim.register_component(:debates) do |component|
   component.newsletter_participant_entities = ["Decidim::Debates::Debate"]
 
   component.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this component" if Decidim::Debates::Debate.where(component: instance).any?
+    raise StandardError, "Cannot remove this component" if Decidim::Debates::Debate.where(component: instance).any?
   end
 
   component.settings(:global) do |settings|
     settings.attribute :scopes_enabled, type: :boolean, default: false
     settings.attribute :scope_id, type: :scope
     settings.attribute :comments_enabled, type: :boolean, default: true
-    settings.attribute :comments_max_length, type: :integer, required: false
+    settings.attribute :comments_max_length, type: :integer, required: true
     settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
@@ -68,91 +67,8 @@ Decidim.register_component(:debates) do |component|
   end
 
   component.seeds do |participatory_space|
-    admin_user = Decidim::User.find_by(
-      organization: participatory_space.organization,
-      email: "admin@example.org"
-    )
-
-    user = Decidim::User.find_by(
-      organization: participatory_space.organization,
-      email: "user@example.org"
-    )
-
-    params = {
-      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :debates).i18n_name,
-      manifest_name: :debates,
-      published_at: Time.current,
-      participatory_space: participatory_space
-    }
-
-    component = Decidim.traceability.perform_action!(
-      "publish",
-      Decidim::Component,
-      admin_user,
-      visibility: "all"
-    ) do
-      Decidim::Component.create!(params)
-    end
-
-    5.times do |x|
-      finite = x != 2
-      if finite
-        start_time = [rand(1..20).weeks.from_now, rand(1..20).weeks.ago].sample
-        end_time = start_time + [rand(1..4).hours, rand(1..20).days].sample
-      else
-        start_time = nil
-        end_time = nil
-      end
-      params = {
-        component: component,
-        category: participatory_space.categories.sample,
-        title: Decidim::Faker::Localized.sentence(word_count: 2),
-        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 3)
-        end,
-        instructions: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 3)
-        end,
-        start_time: start_time,
-        end_time: end_time,
-        author: component.organization
-      }
-
-      debate = Decidim.traceability.create!(
-        Decidim::Debates::Debate,
-        admin_user,
-        params,
-        visibility: "all"
-      )
-
-      Decidim::Comments::Seed.comments_for(debate)
-    end
-
-    closed_debate = Decidim::Debates::Debate.last
-    closed_debate.conclusions = Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.paragraph(sentence_count: 3)
-    end
-    closed_debate.closed_at = Time.current
-    closed_debate.save!
-
-    params = {
-      component: component,
-      category: participatory_space.categories.sample,
-      title: Decidim::Faker::Localized.sentence(word_count: 2),
-      description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(sentence_count: 3)
-      end,
-      instructions: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(sentence_count: 3)
-      end,
-      author: user
-    }
+    require "decidim/debates/seeds"
 
-    Decidim.traceability.create!(
-      Decidim::Debates::Debate,
-      user,
-      params,
-      visibility: "all"
-    )
+    Decidim::Debates::Seeds.new(participatory_space:).call
   end
 end

data/lib/decidim/debates/engine.rb

@@ -13,13 +13,19 @@ module Decidim
           member do
             post :close
           end
-          resources :versions, only: [:show, :index]
-          resource :widget, only: :show, path: "embed"
+          resources :versions, only: [:show]
         end
-        root to: "debates#index"
+        scope "/debates" do
+          root to: "debates#index"
+        end
+        get "/", to: redirect("debates", status: 301)
+      end
+
+      initializer "decidim_debates.register_icons" do
+        Decidim.icons.register(name: "Decidim::Debates::Debate", icon: "discuss-line", description: "Debate", category: "activity", engine: :debates)
       end
 
-      initializer "decidim_changes" do
+      initializer "decidim_debates.settings_changes" do
         config.to_prepare do
           Decidim::SettingsChange.subscribe "debates" do |changes|
             Decidim::Debates::SettingsChangeJob.perform_later(
@@ -31,12 +37,12 @@ module Decidim
         end
       end
 
-      initializer "decidim_meetings.add_cells_view_paths" do
+      initializer "decidim_debates.add_cells_view_paths" do
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Debates::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Debates::Engine.root}/app/views") # for partials
       end
 
-      initializer "decidim.debates.commented_debates_badge" do
+      initializer "decidim_debates.commented_debates_badge" do
         Decidim::Gamification.register_badge(:commented_debates) do |badge|
           badge.levels = [1, 5, 10, 30, 50]
 
@@ -45,7 +51,7 @@ module Decidim
           badge.reset = lambda do |user|
             debates = Decidim::Comments::Comment.where(
               author: user,
-              decidim_root_commentable_type: "Decidim::Debates::Debate"\
+              decidim_root_commentable_type: "Decidim::Debates::Debate"
             )
             debates.pluck(:decidim_root_commentable_id).uniq.count
           end
@@ -101,6 +107,22 @@ module Decidim
       initializer "decidim_debates.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_debates.authorization_transfer" do
+        config.to_prepare do
+          Decidim::AuthorizationTransfer.register(:debates) do |transfer|
+            transfer.move_records(Decidim::Debates::Debate, :decidim_author_id)
+          end
+        end
+      end
+
+      initializer "decidim_debates.moderation_content" do
+        config.to_prepare do
+          ActiveSupport::Notifications.subscribe("decidim.admin.block_user:after") do |_event_name, data|
+            Decidim::Debates::HideAllCreatedByAuthorJob.perform_later(**data)
+          end
+        end
+      end
     end
   end
 end

data/lib/decidim/debates/seeds.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require "decidim/components/namer"
+
+module Decidim
+  module Debates
+    class Seeds
+      attr_reader :participatory_space
+
+      def initialize(participatory_space:)
+        @participatory_space = participatory_space
+      end
+
+      def call
+        admin_user = Decidim::User.find_by(
+          organization: participatory_space.organization,
+          email: "admin@example.org"
+        )
+
+        user = Decidim::User.find_by(
+          organization: participatory_space.organization,
+          email: "user@example.org"
+        )
+
+        params = {
+          name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :debates).i18n_name,
+          manifest_name: :debates,
+          published_at: Time.current,
+          participatory_space:
+        }
+
+        component = Decidim.traceability.perform_action!(
+          "publish",
+          Decidim::Component,
+          admin_user,
+          visibility: "all"
+        ) do
+          Decidim::Component.create!(params)
+        end
+
+        5.times do |x|
+          finite = x != 2
+          if finite
+            start_time = [rand(1..20).weeks.from_now, rand(1..20).weeks.ago].sample
+            end_time = start_time + [rand(1..4).hours, rand(1..20).days].sample
+          else
+            start_time = nil
+            end_time = nil
+          end
+          params = {
+            component:,
+            category: participatory_space.categories.sample,
+            title: Decidim::Faker::Localized.sentence(word_count: 2),
+            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+              Decidim::Faker::Localized.paragraph(sentence_count: 3)
+            end,
+            instructions: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+              Decidim::Faker::Localized.paragraph(sentence_count: 3)
+            end,
+            start_time:,
+            end_time:,
+            author: component.organization
+          }
+
+          debate = Decidim.traceability.create!(
+            Decidim::Debates::Debate,
+            admin_user,
+            params,
+            visibility: "all"
+          )
+
+          Decidim::Comments::Seed.comments_for(debate)
+        end
+
+        closed_debate = Decidim::Debates::Debate.last
+        closed_debate.conclusions = Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(sentence_count: 3)
+        end
+        closed_debate.closed_at = Time.current
+        closed_debate.save!
+
+        params = {
+          component:,
+          category: participatory_space.categories.sample,
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(sentence_count: 3)
+          end,
+          instructions: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(sentence_count: 3)
+          end,
+          author: user
+        }
+
+        Decidim.traceability.create!(
+          Decidim::Debates::Debate,
+          user,
+          params,
+          visibility: "all"
+        )
+      end
+    end
+  end
+end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/components/namer"
+
 def generate_localized_debate_title
   Decidim::Faker::Localized.localized { "<script>alert(\"TITLE\");</script> #{generate(:title)}" }
 end
@@ -20,7 +22,7 @@ FactoryBot.define do
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
     information_updates { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
     instructions { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_debate_title } }
-    component { build(:component, manifest_name: "debates") }
+    component { build(:debates_component) }
     author { component.try(:organization) }
 
     trait :open_ama do
@@ -64,10 +66,11 @@ FactoryBot.define do
   factory :debates_component, parent: :component do
     name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :debates).i18n_name }
     manifest_name { :debates }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
+    participatory_space { create(:participatory_process, :with_steps, organization:) }
     settings do
       {
-        comments_enabled: true
+        comments_enabled: true,
+        comments_max_length: organization.comments_max_length
       }
     end
 

data/lib/decidim/debates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-debates version.
   module Debates
     def self.version
-      "0.27.4"
+      "0.28.0.rc5"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.27.4
+  version: 0.28.0.rc5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -19,56 +19,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.4
+        version: 0.28.0.rc5
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -82,14 +82,10 @@ files:
 - README.md
 - Rakefile
 - app/cells/decidim/debates/debate_activity_cell.rb
+- app/cells/decidim/debates/debate_card_metadata_cell.rb
 - app/cells/decidim/debates/debate_cell.rb
-- app/cells/decidim/debates/debate_m/data.erb
-- app/cells/decidim/debates/debate_m/footer.erb
-- app/cells/decidim/debates/debate_m/multiple_dates.erb
-- app/cells/decidim/debates/debate_m/open_date.erb
-- app/cells/decidim/debates/debate_m/single_date.erb
-- app/cells/decidim/debates/debate_m/tags.erb
-- app/cells/decidim/debates/debate_m_cell.rb
+- app/cells/decidim/debates/debate_l_cell.rb
+- app/cells/decidim/debates/debate_s_cell.rb
 - app/cells/decidim/debates/reported_content/show.erb
 - app/cells/decidim/debates/reported_content_cell.rb
 - app/commands/decidim/debates/admin/close_debate.rb
@@ -105,7 +101,6 @@ files:
 - app/controllers/decidim/debates/debates_controller.rb
 - app/controllers/decidim/debates/orderable.rb
 - app/controllers/decidim/debates/versions_controller.rb
-- app/controllers/decidim/debates/widgets_controller.rb
 - app/events/decidim/debates/close_debate_event.rb
 - app/events/decidim/debates/create_debate_event.rb
 - app/events/decidim/debates/creation_disabled_event.rb
@@ -117,9 +112,11 @@ files:
 - app/helpers/decidim/debates/admin/application_helper.rb
 - app/helpers/decidim/debates/application_helper.rb
 - app/helpers/decidim/debates/debate_cells_helper.rb
+- app/jobs/decidim/debates/hide_all_created_by_author_job.rb
 - app/jobs/decidim/debates/settings_change_job.rb
 - app/models/decidim/debates/application_record.rb
 - app/models/decidim/debates/debate.rb
+- app/packs/entrypoints/decidim_debates.js
 - app/packs/entrypoints/decidim_debates_admin.js
 - app/packs/images/decidim/debates/decidim_debates.svg
 - app/packs/images/decidim/gamification/badges/decidim_gamification_badges_commented_debates.svg
@@ -143,11 +140,8 @@ files:
 - app/views/decidim/debates/admin/debates/index.html.erb
 - app/views/decidim/debates/admin/debates/new.html.erb
 - app/views/decidim/debates/debates/_close_debate_modal.html.erb
-- app/views/decidim/debates/debates/_count.html.erb
 - app/views/decidim/debates/debates/_debate.html.erb
 - app/views/decidim/debates/debates/_debates.html.erb
-- app/views/decidim/debates/debates/_filters.html.erb
-- app/views/decidim/debates/debates/_filters_small_view.html.erb
 - app/views/decidim/debates/debates/_form.html.erb
 - app/views/decidim/debates/debates/edit.html.erb
 - app/views/decidim/debates/debates/index.html.erb
@@ -224,9 +218,11 @@ files:
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/so-SO.yml
+- config/locales/sq-AL.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/sw-KE.yml
+- config/locales/th-TH.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -263,12 +259,18 @@ files:
 - lib/decidim/debates/api.rb
 - lib/decidim/debates/component.rb
 - lib/decidim/debates/engine.rb
+- lib/decidim/debates/seeds.rb
 - lib/decidim/debates/test/factories.rb
 - lib/decidim/debates/version.rb
-homepage: https://github.com/decidim/decidim
+homepage: https://decidim.org
 licenses:
 - AGPL-3.0
-metadata: {}
+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
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -277,14 +279,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Decidim debates module

data/app/cells/decidim/debates/debate_m/data.erb

@@ -1,10 +0,0 @@
-<% if debate_date.present? %>
-  <div class="card__icondata">
-    <ul class="card-data">
-      <li class="card-data__item">
-        <%= icon "datetime", class: "icon--big", role: "img", aria_label: t("decidim.debates.debates.show.date") %>
-      </li>
-      <%= debate_date %>
-    </ul>
-  </div>
-<% end %>

data/app/cells/decidim/debates/debate_m/footer.erb

@@ -1,10 +0,0 @@
-<div class="card__footer">
-  <div class="card__support">
-    <% if presenter.last_comment_by %>
-      <% author = presenter.last_comment_by %>
-      <%= cell "decidim/author", author, from: model, author_name_text: t(".commented_time_ago", time: presenter.last_comment_at), context: { extra_classes: ["author-data--small"] } %>
-    <% end %>
-
-    <%= link_to t("participate", scope: "decidim.debates.debates.debate"), resource_path, class: "card__button button button--sc small" %>
-  </div>
-</div>

data/app/cells/decidim/debates/debate_m/multiple_dates.erb

@@ -1,17 +0,0 @@
-<li class="card-data__item">
-  <div class="card-data__item--multiple">
-    <div>
-      <strong>
-        <%= l start_date, format: :decidim_with_month_name %>
-      </strong>
-      <%= formatted_start_time %>
-    </div>
-    <%= icon "arrow-thin-right", class: "icon--big muted", role: "img", "aria-hidden": true %>
-    <div>
-      <strong>
-        <%= l end_date, format: :decidim_with_month_name %>
-      </strong>
-      <%= formatted_end_time %>
-    </div>
-  </div>
-</li>

data/app/cells/decidim/debates/debate_m/open_date.erb

@@ -1,7 +0,0 @@
-<li class="card-data__item">
-  <div>
-    <strong>
-      <%= t("decidim.debates.debates.show.open") %>
-    </strong>
-  </div>
-</li>

data/app/cells/decidim/debates/debate_m/single_date.erb

@@ -1,9 +0,0 @@
-<li class="card-data__item">
-  <div>
-    <strong>
-      <%= l start_date, format: :decidim_with_month_name %>
-    </strong>
-    &nbsp;·&nbsp;
-    <%= formatted_start_time %> - <%= formatted_end_time %>
-  </div>
-</li>

data/app/cells/decidim/debates/debate_m/tags.erb

@@ -1 +0,0 @@
-<%= render partial: "decidim/shared/tags.html", locals: { resource: model, tags_class_extra: "tags--debate" } %>