decidim-comments 0.0.2 → 0.0.3

data/app/frontend/entry.js

@@ -8,16 +8,9 @@ window.DecidimComments.renderCommentsComponent = (nodeId, props) => {
   var node = $(`#${nodeId}`)[0];
 
   ReactDOM.render(
-    React.createElement(Comments,props),
+    React.createElement(Comments, props),
     node
   );
-
-  function unmountComponent() {
-    ReactDOM.unmountComponentAtNode(node);
-    $(document).off('turbolinks:before-render', unmountComponent);
-  }
-
-  $(document).on('turbolinks:before-render', unmountComponent);
 };
 
 // Load component locales from yaml files

data/app/frontend/support/generate_user_data.js

@@ -0,0 +1,13 @@
+import { name } from 'faker/locale/en';
+
+/**
+ * Generate random user data to emulate a database real content
+ * @returns {Object} - An object representing user data
+ */
+const generateUserData = () => {
+  return {
+    name: name.findName()
+  };
+};
+
+export default generateUserData;

data/app/frontend/support/generate_user_group_data.js

@@ -0,0 +1,14 @@
+import { random, company } from 'faker/locale/en';
+
+/**
+ * Generate random user group data to emulate a database real content
+ * @returns {Object} - An object representing user group data
+ */
+const generateUserGrouprData = () => {
+  return {
+    id: random.uuid(),
+    name: company.companyName()
+  };
+};
+
+export default generateUserGrouprData;

data/app/helpers/decidim/comments/comments_helper.rb

@@ -28,22 +28,17 @@ module Decidim
       # props   - A hash corresponding to Comments component props
       def react_comments_component(node_id, props)
         content_tag("div", "", id: node_id) +
+          javascript_include_tag("decidim/comments/comments") +
           javascript_tag(%{
-            jQuery.ajax({
-              url: '#{asset_path("decidim/comments/comments.js")}',
-              dataType: 'script',
-              cache: true
-            }).then(function () {
-                window.DecidimComments.renderCommentsComponent(
-                  '#{node_id}',
-                  {
-                    commentableType: "#{props[:commentableType]}",
-                    commentableId: "#{props[:commentableId]}",
-                    options: JSON.parse("#{j(props[:options].to_json)}"),
-                    locale: "#{props[:locale]}"
-                  }
-                );
-              });
+            window.DecidimComments.renderCommentsComponent(
+              '#{node_id}',
+              {
+                commentableType: "#{props[:commentableType]}",
+                commentableId: "#{props[:commentableId]}",
+                options: JSON.parse("#{j(props[:options].to_json)}"),
+                locale: "#{props[:locale]}"
+              }
+            );
           })
       end
     end

data/app/models/decidim/comments/comment.rb

@@ -5,6 +5,8 @@ module Decidim
     # comment on them. The will be able to create conversations between users
     # to discuss or share their thoughts about the resource.
     class Comment < ApplicationRecord
+      include Decidim::Authorable
+
       # Limit the max depth of a comment tree. If C is a comment and R is a reply:
       # C          (depth 0)
       # |--R       (depth 1)
@@ -13,16 +15,16 @@ module Decidim
       #       |--R (depth 3)
       MAX_DEPTH = 3
 
-      belongs_to :author, foreign_key: "decidim_author_id", class_name: Decidim::User
       belongs_to :commentable, foreign_key: "decidim_commentable_id", foreign_type: "decidim_commentable_type", polymorphic: true
       has_many :replies, as: :commentable, foreign_key: "decidim_commentable_id", foreign_type: "decidim_commentable_type", class_name: Comment
       has_many :up_votes, -> { where(weight: 1) }, foreign_key: "decidim_comment_id", class_name: CommentVote, dependent: :destroy
       has_many :down_votes, -> { where(weight: -1) }, foreign_key: "decidim_comment_id", class_name: CommentVote, dependent: :destroy
+
       validates :author, :commentable, :body, presence: true
-      validate :commentable_can_have_replies
       validates :depth, numericality: { greater_than_or_equal_to: 0 }
       validates :alignment, inclusion: { in: [0, 1, -1] }
-      validate :same_organization
+
+      validate :commentable_can_have_replies
 
       before_save :compute_depth
 
@@ -61,10 +63,6 @@ module Decidim
       def compute_depth
         self.depth = commentable.depth + 1 if commentable.respond_to?(:depth)
       end
-
-      def same_organization
-        errors.add(:commentable, :invalid) unless author.organization == organization
-      end
     end
   end
 end

data/app/types/decidim/comments/comment_type.rb

@@ -16,7 +16,11 @@ module Decidim
         }
       end
 
-      field :author, !AuthorType, "The comment's author"
+      field :author, !Decidim::Api::AuthorInterface, "The comment's author" do
+        resolve lambda { |obj, _args, _ctx|
+          obj.user_group || obj.author
+        }
+      end
 
       field :replies, !types[CommentType], "The comment's replies" do
         resolve lambda { |obj, _args, _ctx|

data/config/locales/ca.yml

@@ -11,6 +11,8 @@ ca:
             label: Comentari
             placeholder: Què en penses d'això?
           submit: Envia
+          user_group_id:
+            label: Comentar com a
         opinion:
           against: Hi estic en contra
           in_favor: Hi estic a favor
@@ -23,13 +25,15 @@ ca:
         reply: Respondre
       comment_order_selector:
         order:
-          most_voted: Més votat
+          best_rated: Més ben valorats
+          most_discussed: Més discutit
           older: Més antic
           recent: Recent
         title: 'Ordenar per:'
       comment_thread:
         title: Conversa amb %{authorName}
       comments:
+        loading: Carregant els comentaris ...
         title: "%{count} comentaris"
       featured_comment:
         title: Comentari destacat

data/config/locales/en.yml

@@ -12,6 +12,8 @@ en:
             label: Comment
             placeholder: What do you think about this?
           submit: Send
+          user_group_id:
+            label: Comment as
         opinion:
           against: I am against
           in_favor: I am in favor
@@ -24,7 +26,8 @@ en:
         reply: Reply
       comment_order_selector:
         order:
-          most_voted: Most voted
+          best_rated: Best rated
+          most_discussed: Most discussed
           older: Older
           recent: Recent
         title: 'Order by:'

data/config/locales/es.yml

@@ -11,6 +11,8 @@ es:
             label: Comentario
             placeholder: '¿Qué piensas sobre esto?'
           submit: Enviar
+          user_group_id:
+            label: Comentar como
         opinion:
           against: Estoy en contra
           in_favor: Estoy a favor
@@ -23,13 +25,15 @@ es:
         reply: Respuesta
       comment_order_selector:
         order:
-          most_voted: Más votado
+          best_rated: Mejor valoración
+          most_discussed: Más discutidos
           older: Más antiguo
           recent: Reciente
         title: 'Ordenar por:'
       comment_thread:
         title: Conversación con %{authorName}
       comments:
+        loading: Cargando los comentarios ...
         title: "%{count} comentarios"
       featured_comment:
         title: Comentario destacado

data/db/migrate/20170123102043_add_user_group_id_to_comments.rb

@@ -0,0 +1,5 @@
+class AddUserGroupIdToComments < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_comments_comments, :decidim_user_group_id, :integer, index: true
+  end
+end

data/lib/decidim/comments/engine.rb

@@ -5,7 +5,6 @@ require "active_support/all"
 require "decidim/core"
 require "jquery-rails"
 require "sassc-rails"
-require "turbolinks"
 require "foundation-rails"
 require "foundation_rails_helper"
 

data/lib/decidim/comments/mutation_extensions.rb

@@ -17,9 +17,10 @@ module Decidim
             argument :commentableType, !types.String, "The commentable's class name. i.e. `Decidim::ParticipatoryProcess`"
             argument :body, !types.String, "The comments's body"
             argument :alignment, types.Int, "The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'", default_value: 0
+            argument :userGroupId, types.ID, "The comment's user group id. Replaces the author."
 
             resolve lambda { |_obj, args, ctx|
-              params = { "comment" => { "body" => args[:body], "alignment" => args[:alignment] } }
+              params = { "comment" => { "body" => args[:body], "alignment" => args[:alignment], "user_group_id" => args[:userGroupId] } }
               form = Decidim::Comments::CommentForm.from_params(params)
               commentable = args[:commentableType].constantize.find(args[:commentableId])
               Decidim::Comments::CreateComment.call(form, ctx[:current_user], commentable) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -60,40 +60,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: turbolinks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -119,6 +99,7 @@ files:
 - app/frontend/application/icon.component.test.jsx
 - app/frontend/comments/add_comment_form.component.jsx
 - app/frontend/comments/add_comment_form.component.test.jsx
+- app/frontend/comments/add_comment_form.fragment.graphql
 - app/frontend/comments/add_comment_form.mutation.graphql
 - app/frontend/comments/comment.component.jsx
 - app/frontend/comments/comment.component.test.jsx
@@ -148,7 +129,8 @@ files:
 - app/frontend/entry.test.js
 - app/frontend/support/asset_url.js
 - app/frontend/support/generate_comments_data.js
-- app/frontend/support/generate_current_user_data.js
+- app/frontend/support/generate_user_data.js
+- app/frontend/support/generate_user_group_data.js
 - app/frontend/support/load_translations.js
 - app/frontend/support/require_all.js
 - app/frontend/support/resolve_graphql_query.js
@@ -161,7 +143,6 @@ files:
 - app/queries/decidim/comments/comments_with_replies.rb
 - app/resolvers/decidim/comments/vote_comment_resolver.rb
 - app/types/decidim/comments/add_comment_type.rb
-- app/types/decidim/comments/author_type.rb
 - app/types/decidim/comments/comment_mutation_type.rb
 - app/types/decidim/comments/comment_type.rb
 - config/i18n-tasks.yml
@@ -172,6 +153,7 @@ files:
 - db/migrate/20161214082645_add_depth_to_comments.rb
 - db/migrate/20161216102820_add_alignment_to_comments.rb
 - db/migrate/20161219150806_create_comment_votes.rb
+- db/migrate/20170123102043_add_user_group_id_to_comments.rb
 - db/seeds.rb
 - lib/decidim/comments.rb
 - lib/decidim/comments/engine.rb

data/app/frontend/support/generate_current_user_data.js

@@ -1,13 +0,0 @@
-import { name } from 'faker/locale/en';
-
-/**
- * Generate random current user data to emulate a database real content
- * @returns {Object} - An object representing current user data
- */
-const generateCurrentUserData = () => {
-  return {
-    name: name.findName()
-  };
-};
-
-export default generateCurrentUserData;

data/app/types/decidim/comments/author_type.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-module Decidim
-  module Comments
-    # This type represents an author who owns a resource
-    AuthorType = GraphQL::ObjectType.define do
-      name "Author"
-      description "An author"
-
-      field :name, !types.String, "The user's name"
-      field :avatarUrl, !types.String, "The user's avatar url" do
-        resolve ->(obj, _args, _ctx) { obj.avatar.url }
-      end
-    end
-  end
-end