decidim-debates 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 809930ea2defd43aa312cc2161f9de53c415b7474a468ab5a0f85557e32049c0
-  data.tar.gz: 19cd83236ba7dbffb0f4840e528f2efc3b8f5a8e740d26ada593b3e465359143
+  metadata.gz: 24ecd1ca0fa6741a77421c6b5112305b9201676dd84b2919c2a9928d9dbd733d
+  data.tar.gz: 74033142cb4faa0833f9825c922b6aec32a9b2ed45f14928f6277686641b0405
 SHA512:
-  metadata.gz: ed9c919a1930c2df842ec3e67ab2ef7aa7d3dcf2f7df9bbb5997876fe4ef2f19a9fdeba5a1a652e07ee95a8507892acbb4dfb1bf689869658a0f0c8e22f26d57
-  data.tar.gz: 0ad70dcc09e894a57eebaa18fdada4949e5868e6ada66a6a2cba563b15bca6cfac4e6c0e60ed46afa16e37091bf10baa615e9fc6d1ffd1b889051a76b945088c
+  metadata.gz: 8816ad224e66345561250ca0b7c53639c1d3984262cc38642e4d194e3a4533687e38edeeb492765e51c078775f325237e3a05414109c9ce52cfea8378fc6cbd1
+  data.tar.gz: 422fb26a1ea59bd93f421527d7608c420d6b21c78c3c7353b49944af77b4c71d2a2cf221a4c39d1fcfdd514a2ccb7543ecc16a4587af3c42a72f755315783a6c

data/app/cells/decidim/debates/debate_m_cell.rb

@@ -17,6 +17,10 @@ module Decidim
         present(model).title
       end
 
+      def description
+        present(model).description(strip_tags: true)
+      end
+
       def resource_icon
         icon "debates", class: "icon--big"
       end

data/app/helpers/decidim/debates/application_helper.rb

@@ -7,6 +7,25 @@ module Decidim
     module ApplicationHelper
       include PaginateHelper
       include Decidim::Comments::CommentsHelper
+      include Decidim::RichTextEditorHelper
+
+      # If the debate is official or the rich text editor is enabled on the
+      # frontend, the debate description is considered as safe content.
+      def safe_content?
+        debate&.official? || rich_text_editor_in_public_views?
+      end
+
+      # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
+      def render_debate_description(debate)
+        description = present(debate).description(strip_tags: !safe_content?)
+
+        safe_content? ? decidim_sanitize(description) : simple_format(description)
+      end
+
+      # Returns :text_area or :editor based on current_component settings.
+      def text_editor_for_debate_description(form)
+        text_editor_for(form, :description)
+      end
     end
   end
 end

data/app/presenters/decidim/debates/debate_presenter.rb

@@ -27,6 +27,12 @@ module Decidim
         content = translated_attribute(debate.title)
         decidim_html_escape(content)
       end
+
+      def description(strip_tags: false)
+        content = translated_attribute(debate.description)
+        content = strip_tags(content) if strip_tags
+        content
+      end
     end
   end
 end

data/app/types/decidim/debates/debate_type.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    DebateType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::CategorizableInterface },
+        -> { Decidim::Comments::CommentableInterface },
+        -> { Decidim::Core::AuthorableInterface }
+      ]
+
+      name "Debate"
+      description "A debate"
+
+      field :id, !types.ID, "The internal ID for this debate"
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this debate"
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this debate"
+      field :instructions, Decidim::Core::TranslatedFieldType, "The instructions for this debate"
+      field :startTime, Decidim::Core::DateTimeType, "The start time for this debate", property: :start_time
+      field :endTime, Decidim::Core::DateTimeType, "The end time for this debate", property: :end_time
+      field :image, types.String, "The image of this debate"
+      field :createdAt, Decidim::Core::DateTimeType, "When this debate was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "When this debate was updated", property: :updated_at
+      field :informationUpdates, Decidim::Core::TranslatedFieldType, "The information updates for this debate", property: :information_updates
+      field :reference, types.String, "The reference for this debate"
+    end
+  end
+end

data/app/types/decidim/debates/debates_type.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    DebatesType = GraphQL::ObjectType.define do
+      interfaces [-> { Decidim::Core::ComponentInterface }]
+
+      name "Debates"
+      description "A debates component of a participatory space."
+
+      connection :debates, DebateType.connection_type do
+        resolve ->(component, _args, _ctx) {
+          DebatesTypeHelper.base_scope(component).includes(:component)
+        }
+      end
+
+      field(:debate, DebateType) do
+        argument :id, !types.ID
+
+        resolve ->(component, args, _ctx) {
+          DebatesTypeHelper.base_scope(component).find_by(id: args[:id])
+        }
+      end
+    end
+
+    module DebatesTypeHelper
+      def self.base_scope(component)
+        Debate.where(component: component)
+      end
+    end
+  end
+end

data/app/views/decidim/debates/debates/new.html.erb

@@ -16,7 +16,7 @@
           </div>
 
           <div class="field">
-            <%= form.text_area :description, rows: 10 %>
+            <%= text_editor_for_debate_description(form) %>
           </div>
 
           <% if current_participatory_space.categories&.any? %>

data/app/views/decidim/debates/debates/show.html.erb

@@ -42,7 +42,7 @@ edit_link(
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
-      <p><%= decidim_sanitize(simple_format(translated_attribute(debate.description))) %></p>
+      <%= render_debate_description(debate) %>
       <% if translated_attribute(debate.instructions).present? %>
         <div class="callout secondary">
           <%= decidim_sanitize(simple_format(translated_attribute(debate.instructions))) %>

data/config/locales/el.yml

@@ -0,0 +1 @@
+el:

data/lib/decidim/debates/component.rb

@@ -8,6 +8,7 @@ Decidim.register_component(:debates) do |component|
   component.icon = "decidim/debates/icon.svg"
   component.permissions_class_name = "Decidim::Debates::Permissions"
 
+  component.query_type = "Decidim::Debates::DebatesType"
   component.data_portable_entities = ["Decidim::Debates::Debate"]
 
   component.newsletter_participant_entities = ["Decidim::Debates::Debate"]
@@ -31,6 +32,11 @@ Decidim.register_component(:debates) do |component|
     Decidim::Debates::Debate.where(component: components).not_hidden.count
   end
 
+  component.register_stat :followers_count, tag: :followers, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, _start_at, _end_at|
+    debates_ids = Decidim::Debates::Debate.where(component: components).not_hidden.pluck(:id)
+    Decidim::Follow.where(decidim_followable_type: "Decidim::Debates::Debate", decidim_followable_id: debates_ids).count
+  end
+
   component.register_resource(:debate) do |resource|
     resource.model_class_name = "Decidim::Debates::Debate"
     resource.card = "decidim/debates/debate"

data/lib/decidim/debates/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-debates
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -75,28 +75,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 description: A debates component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -147,6 +147,8 @@ files:
 - app/queries/decidim/debates/metrics/debates_metric_manage.rb
 - app/serializers/decidim/debates/data_portability_debate_serializer.rb
 - app/services/decidim/debates/debate_search.rb
+- app/types/decidim/debates/debate_type.rb
+- app/types/decidim/debates/debates_type.rb
 - app/views/decidim/debates/admin/debates/_form.html.erb
 - app/views/decidim/debates/admin/debates/edit.html.erb
 - app/views/decidim/debates/admin/debates/index.html.erb
@@ -167,6 +169,7 @@ files:
 - config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
 - config/locales/es-MX.yml