decidim 0.0.2 → 0.0.3

data/decidim-comments/app/frontend/comments/up_vote_button.component.jsx

@@ -12,15 +12,26 @@ import commentDataFragment from './comment_data.fragment.graphql';
 import upVoteFragment      from './up_vote.fragment.graphql';
 import downVoteFragment    from './down_vote.fragment.graphql';
 
-export const UpVoteButton = ({ comment: { upVotes, upVoted, downVoted }, upVote }) => (
-  <VoteButton
-    buttonClassName="comment__votes--up"
-    iconName="icon-chevron-top"
-    votes={upVotes} 
-    voteAction={upVote} 
-    disabled={upVoted || downVoted}
-  />
-);
+export const UpVoteButton = ({ comment: { upVotes, upVoted, downVoted }, upVote }) => {
+  let selectedClass = '';
+
+  if (upVoted) {
+    selectedClass = 'is-vote-selected';
+  } else if (downVoted) {
+     selectedClass = 'is-vote-notselected';
+  }
+
+  return (
+    <VoteButton
+      buttonClassName="comment__votes--up"
+      iconName="icon-chevron-top"
+      votes={upVotes}
+      voteAction={upVote}
+      disabled={upVoted || downVoted}
+      selectedClass={selectedClass}
+    />
+  );
+}
 
 UpVoteButton.fragments = {
   comment: gql`
@@ -58,10 +69,10 @@ const UpVoteButtonWithMutation = graphql(gql`
         }
       },
       updateQueries: {
-        GetComments: (prev, { mutationResult: { data } }) => {          
+        GetComments: (prev, { mutationResult: { data } }) => {
           const commentReducer = (comment) => {
             const replies = comment.replies || [];
-            
+
             if (comment.id === ownProps.comment.id) {
               return data.comment.upVote;
             }
@@ -78,7 +89,7 @@ const UpVoteButtonWithMutation = graphql(gql`
         }
       }
     })
-  })  
+  })
 })(UpVoteButton);
 
 export default UpVoteButtonWithMutation;

data/decidim-comments/app/frontend/comments/vote_button.component.jsx

@@ -1,18 +1,26 @@
-import { PropTypes } from 'react';
+import { Component, PropTypes } from 'react';
 import Icon          from '../application/icon.component';
 
-const VoteButton = ({ buttonClassName, iconName, votes, voteAction, disabled }) => (
-  <button className={buttonClassName} onClick={() => voteAction()} disabled={disabled}>
-    <Icon name={iconName} iconExtraClassName="icon--small" />
-    { ` ${votes}` }
-  </button>
-);
+class VoteButton extends Component {
+  render() {
+    const { buttonClassName, iconName, votes, voteAction, disabled, selectedClass } = this.props;
+    let voteClasses = `${buttonClassName} ${selectedClass}`;
+
+    return (
+      <button className={voteClasses} onClick={() => voteAction()} disabled={disabled}>
+        <Icon name={iconName} iconExtraClassName="icon--small" />
+        { ` ${votes}` }
+      </button>
+    );
+  }
+}
 
 VoteButton.propTypes = {
   buttonClassName: PropTypes.string.isRequired,
   iconName: PropTypes.string.isRequired,
   votes: PropTypes.number.isRequired,
   voteAction: PropTypes.func.isRequired,
+  selectedClass: PropTypes.string,
   disabled: PropTypes.bool
 };
 

data/decidim-comments/app/frontend/comments/vote_button_component.test.jsx

@@ -21,7 +21,7 @@ describe("<VoteButton />", () => {
   });
 
   it("should render a Icon component with the correct name prop", () => {
-    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} />); 
+    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} />);
     expect(wrapper.find(Icon)).to.have.prop("name").equal('vote-icon');
   });
 
@@ -32,7 +32,12 @@ describe("<VoteButton />", () => {
   });
 
   it("should disable the button based on the disabled prop", () => {
-    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} disabled />);    
+    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} disabled />);
     expect(wrapper.find('button')).to.be.disabled();
   })
+
+  it("should render a button with the given selectedClass", () => {
+    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} disabled selectedClass="is-vote-selected" />);
+    expect(wrapper.find('.is-vote-selected')).to.be.present();
+  })
 });

data/decidim-comments/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/decidim-comments/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/decidim-comments/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/decidim-comments/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/decidim-comments/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/decidim-comments/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/decidim-comments/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/decidim-comments/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/decidim-comments/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/decidim-comments/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/decidim-comments/decidim-comments.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.add_dependency "decidim-core", Decidim.version
   s.add_dependency "rails", *Decidim.rails_version
   s.add_dependency "jquery-rails", "~> 4.0"
-  s.add_dependency "turbolinks", *Decidim.rails_version
 
   s.add_development_dependency "decidim-dev", Decidim.version
 end

data/decidim-comments/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/decidim-comments/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

data/decidim-comments/spec/commands/create_comment_spec.rb

@@ -10,11 +10,13 @@ module Decidim
         let(:commentable) { create :participatory_process, organization: organization }
         let(:body) { ::Faker::Lorem.paragraph }
         let(:alignment) { 1 }
+        let(:user_group_id) { nil }
         let(:form_params) do
           {
             "comment" => {
               "body" => body,
-              "alignment" => alignment
+              "alignment" => alignment,
+              "user_group_id" => user_group_id
             }
           }
         end
@@ -37,7 +39,7 @@ module Decidim
           it "doesn't create a comment" do
             expect do
               command.call
-            end.to_not change { Comment.count }
+            end.not_to change { Comment.count }
           end
         end
 
@@ -51,7 +53,8 @@ module Decidim
               author: author,
               commentable: commentable,
               body: body,
-              alignment: alignment
+              alignment: alignment,
+              decidim_user_group_id: user_group_id
             }).and_call_original
             expect do
               command.call

data/decidim-comments/spec/commands/vote_comment_spec.rb

@@ -23,7 +23,7 @@ module Decidim
           it "doesn't create a comment vote" do
             expect do
               command.call
-            end.to_not change { CommentVote.count }
+            end.not_to change { CommentVote.count }
           end
         end
 
@@ -39,7 +39,7 @@ module Decidim
           it "doesn't create a comment vote" do
             expect do
               command.call
-            end.to_not change { CommentVote.count }
+            end.not_to change { CommentVote.count }
           end
         end
 
@@ -74,7 +74,7 @@ module Decidim
               it "doesn't create a comment vote" do
                 expect do
                   command.call
-                end.to_not change { CommentVote.count }
+                end.not_to change { CommentVote.count }
               end
             end
 
@@ -90,7 +90,7 @@ module Decidim
               it "doesn't create a comment vote" do
                 expect do
                   command.call
-                end.to_not change { CommentVote.count }
+                end.not_to change { CommentVote.count }
               end
             end
 

data/decidim-comments/spec/features/comments_spec.rb

@@ -36,7 +36,7 @@ describe "Comments", type: :feature do
     visit decidim.dummy_path(participatory_process)
     page.find("div.order-by__dropdown.order-by__dropdown--right").hover
     within "div.order-by__dropdown.order-by__dropdown--right" do
-      click_link "Best Rated"
+      click_link "Best rated"
     end
 
     within "#comments" do
@@ -47,7 +47,7 @@ describe "Comments", type: :feature do
   context "when not authenticated" do
     it "user should not see the form to add comments" do
       visit decidim.dummy_path(participatory_process)
-      expect(page).to_not have_selector(".add-comment form")
+      expect(page).not_to have_selector(".add-comment form")
     end
   end
 
@@ -76,6 +76,30 @@ describe "Comments", type: :feature do
       end
     end
 
+    context "when the user has verified organizations" do
+      let(:user_group) { create(:user_group, :verified) }
+
+      before do
+        create(:user_group_membership, user: user, user_group: user_group)
+      end
+
+      it "user can add a new comment as a user group" do
+        visit decidim.dummy_path(participatory_process)
+        expect(page).to have_selector(".add-comment form")
+
+        within ".add-comment form" do
+          fill_in "add-comment-#{participatory_process.class.name}-#{participatory_process.id}", with: "This is a new comment"
+          select user_group.name, from: "Comment as"
+          click_button "Send"
+        end
+
+        within "#comments" do
+          expect(page).to have_content user_group.name
+          expect(page).to have_content "This is a new comment"
+        end
+      end
+    end
+
     it "user can reply a comment" do
       comment = create(:comment, commentable: participatory_process)
       visit decidim.dummy_path(participatory_process)
@@ -84,7 +108,7 @@ describe "Comments", type: :feature do
  
       within "#comments #comment_#{comment.id}" do
         click_button "Reply"
-        fill_in "add-comment-#{comment.class.name}-#{comment.id}", with: "This is a reply"
+        find("textarea").set("This is a reply")
         click_button "Send"
 
         expect(page).to have_content "This is a reply"