decidim 0.0.4 → 0.0.5

data/decidim-budgets/app/views/decidim/budgets/projects/_projects.html.erb

@@ -1,8 +1,6 @@
 <div class="card card--list budget-list">
   <% projects.each do |project| %>
-    <div id="project-<%= project.id %>-item" class="card--list__item">
-      <%= render partial: 'project', locals: { project: project } %>
-    </div>
+    <%= render partial: 'project', locals: { project: project } %>
   <% end %>
 </div>
 <%= decidim_paginate projects, random_seed: random_seed %>

data/decidim-budgets/app/views/decidim/budgets/projects/index.html.erb

@@ -1,7 +1,3 @@
-<% add_meta_tags({
-  title: t(".meta_title", feature_name: translated_attribute(current_feature.name))
-}) %>
-
 <% if current_user.present? %>
   <div class="row column">
     <%= render partial: "budget_summary", locals: { include_heading: true } %>

data/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb

@@ -1,4 +1,7 @@
-<% provide(:title, translated_attribute(project.title)) %>
+<% add_decidim_meta_tags(
+  title: translated_attribute(project.title),
+  description: translated_attribute(project.description)
+) %>
 
 <div class="row column view-header">
   <% if current_user.present? %>
@@ -34,11 +37,7 @@
   </div>
 </div>
 
-<%= content_for :expanded do %>
-  <% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
-    <%= comments_for project, votable: true %>
-  <% end %>
-<% end %>
+<%= comments_for project %>
 
 <%= attachments_for project %>
 <%= javascript_include_tag("decidim/budgets/projects") %>

data/decidim-budgets/config/i18n-tasks.yml

@@ -2,4 +2,5 @@ base_locale: en
 locales: [en]
 ignore_unused:
 - "decidim.features.budgets.name"
+- "decidim.features.budgets.settings.*"
 - "activemodel.attributes.project.*"

data/decidim-budgets/config/locales/ca.yml

@@ -71,8 +71,6 @@ ca:
           category: Categoria
           scopes: Àmbits
           search: Cerca
-        index:
-          meta_title: "%{feature_name}"
         order_progress:
           vote: Votar
         order_selected_projects:
@@ -93,6 +91,13 @@ ca:
     features:
       budgets:
         name: Pressupostos
+        settings:
+          global:
+            comments_enabled: Comentaris habilitats
+            total_budget: Pressupost total
+            vote_threshold_percent: Percentatge del pressupost mínim per fer el vot
+          step:
+            comments_blocked: Comentaris bloquejats
     orders:
       checkout:
         error: S'ha produït un error en processar el teu vot

data/decidim-budgets/config/locales/en.yml

@@ -45,14 +45,17 @@ en:
             title: Title
       projects:
         budget_confirm:
-          are_you_sure: Do you agree? Once you have confirmed your vote, you can not change it.
+          are_you_sure: Do you agree? Once you have confirmed your vote, you can not
+            change it.
           cancel: Cancel
           confirm: Confirm
           description: These are the projects you have chosen to be part of the budget.
           title: Confirm vote
         budget_excess:
           close: Close
-          description: This project exceeds the maximum budget and can not be added. If you want, you can delete a project you have already selected to add, or make your vote with your preferences.
+          description: This project exceeds the maximum budget and can not be added.
+            If you want, you can delete a project you have already selected to add,
+            or make your vote with your preferences.
           ok: OK
           title: Maximum budget exceeded
         budget_summary:
@@ -60,9 +63,12 @@ en:
           assigned: 'Assigned:'
           cancel_order: delete your vote and start over
           checked_out:
-            description: You've already voted for the budget. If you've changed your mind, you can %{cancel_link}.
+            description: You've already voted for the budget. If you've changed your
+              mind, you can %{cancel_link}.
             title: Budget vote completed
-          description: What projects do you think we should allocate budget for? Assign at least %{minimum_budget} to the projects you want and vote with your preferences to define the budget.
+          description: What projects do you think we should allocate budget for? Assign
+            at least %{minimum_budget} to the projects you want and vote with your
+            preferences to define the budget.
           title: You decide the budget
         count:
           projects_count:
@@ -72,8 +78,6 @@ en:
           category: Category
           scopes: Scopes
           search: Search
-        index:
-          meta_title: "%{feature_name}"
         order_progress:
           vote: Vote
         order_selected_projects:
@@ -94,6 +98,13 @@ en:
     features:
       budgets:
         name: Budgets
+        settings:
+          global:
+            comments_enabled: Comments enabled
+            total_budget: Total budget
+            vote_threshold_percent: Vote threshold percent
+          step:
+            comments_blocked: Comments blocked
     orders:
       checkout:
         error: An error ocurred while processing your vote

data/decidim-budgets/config/locales/es.yml

@@ -71,8 +71,6 @@ es:
           category: Categoría
           scopes: Ámbitos
           search: Buscar
-        index:
-          meta_title: "%{feature_name}"
         order_progress:
           vote: Votar
         order_selected_projects:
@@ -93,6 +91,13 @@ es:
     features:
       budgets:
         name: Presupuestos
+        settings:
+          global:
+            comments_enabled: Comentarios habilitados
+            total_budget: Presupuesto total
+            vote_threshold_percent: Porcentaje mínimo del presupuesto
+          step:
+            comments_blocked: Comentarios bloqueados
     orders:
       checkout:
         error: Se ha producido un error al procesar tu voto

data/decidim-budgets/lib/decidim/budgets/feature.rb

@@ -22,11 +22,11 @@ Decidim.register_feature(:budgets) do |feature|
   feature.settings(:global) do |settings|
     settings.attribute :total_budget, type: :integer, default: 100_000_000
     settings.attribute :vote_threshold_percent, type: :integer, default: 70
-    settings.attribute :comments_always_enabled, type: :boolean, default: true
+    settings.attribute :comments_enabled, type: :boolean, default: true
   end
 
   feature.settings(:step) do |settings|
-    settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :comments_blocked, type: :boolean, default: false
   end
 
   feature.seeds do

data/decidim-budgets/spec/commands/add_line_item_spec.rb

@@ -2,8 +2,9 @@ require "spec_helper"
 
 describe Decidim::Budgets::AddLineItem do
   let(:user) { create(:user) }
-  let(:feature) { create(:budget_feature, organization: user.organization) }
-  let(:project) { create(:project, feature: feature) }
+  let(:feature) { create(:budget_feature, organization: user.organization, settings: settings) }
+  let(:project) { create(:project, feature: feature, budget: 60_000) }
+  let(:settings) { { "total_budget" => 100_000, vote_threshold_percent: 50 }}
   let(:order) { nil }
 
   subject { described_class.new(order, project, user) }
@@ -39,7 +40,19 @@ describe Decidim::Budgets::AddLineItem do
   end
 
   context "when the order is checked out" do
-    let!(:order) { create(:order,user: user, feature: feature, checked_out_at: Time.zone.now) }
+    let(:projects) do
+      build_list(:project, 2, budget: 30_000, feature: feature)
+    end
+
+    let!(:order) do
+      order = create(:order,
+                    user: user,
+                    feature: feature)
+      order.projects << projects
+      order.checked_out_at = Time.current
+      order.save!
+      order
+    end
 
     it "broadcasts invalid" do
       expect { subject.call }.to broadcast(:invalid)

data/decidim-budgets/spec/commands/cancel_order_spec.rb

@@ -9,7 +9,13 @@ describe Decidim::Budgets::CancelOrder do
     )
   end
   let(:project) { create(:project, feature: feature, budget: 90_000_000) }
-  let(:order) { create(:order, user: user, feature: feature, checked_out_at: Time.zone.now) }
+  let(:order) do
+    order = create(:order, user: user, feature: feature)
+    order.projects << project
+    order.checked_out_at = Time.zone.now
+    order.save!
+    order
+  end
 
   subject { described_class.new(order) }
 

data/decidim-budgets/spec/commands/checkout_spec.rb

@@ -8,9 +8,16 @@ describe Decidim::Budgets::Checkout do
       organization: user.organization
     )
   end
+
   let(:project) { create(:project, feature: feature, budget: 90_000_000) }
-  let(:order) { create(:order, user: user, feature: feature) }
-  let!(:line_item) { create(:line_item, order: order, project: project)}
+
+  let(:order) do
+    order = create(:order, user: user, feature: feature)
+    order.projects << project
+    order.save!
+    order
+  end
+
   let(:current_order) { order }
 
   subject { described_class.new(current_order, feature) }

data/decidim-budgets/spec/commands/remove_line_item_spec.rb

@@ -2,10 +2,19 @@ require "spec_helper"
 
 describe Decidim::Budgets::RemoveLineItem do
   let(:user) { create(:user) }
-  let(:feature) { create(:budget_feature, organization: user.organization) }
-  let(:project) { create(:project, feature: feature) }
-  let(:order) { create(:order, user: user, feature: feature) }
-  let(:line_item) { create(:line_item, order: order, project: project) }
+  let(:feature) do
+    create(:budget_feature,
+           organization: user.organization,
+           settings: { "total_budget" => 100_000, "vote_threshold_percent": 50})
+  end
+  let(:project) { create(:project, feature: feature, budget: 100) }
+
+  let(:order) do
+    order = create(:order, user: user, feature: feature)
+    order.projects << project
+    order.save!
+    order
+  end
 
   subject { described_class.new(order, project) }
 
@@ -22,7 +31,9 @@ describe Decidim::Budgets::RemoveLineItem do
   end
 
   context "when the order is checked out" do
-    let!(:order) { create(:order,user: user, feature: feature, checked_out_at: Time.zone.now) }
+    before do
+      order.update_attribute :checked_out_at, Time.current
+    end
 
     it "broadcasts invalid" do
       expect { subject.call }.to broadcast(:invalid)

data/decidim-budgets/spec/features/orders_spec.rb

@@ -123,7 +123,7 @@ describe "Orders", type: :feature do
 
           expect(page).to have_selector '.budget-list__data--added', count: 2
 
-          within "#order-progress .budget-summary__progressbox" do
+          within "#order-progress .budget-summary__progressbox:not(.budget-summary__progressbox--fixed)" do
             page.find('.button.small').click
           end
 
@@ -143,7 +143,13 @@ describe "Orders", type: :feature do
     end
 
     context "and has a finished order" do
-      let!(:order) { create(:order, user: user, feature: feature, checked_out_at: Time.current) }
+      let!(:order) do
+        order = create(:order, user: user, feature: feature)
+        order.projects << projects
+        order.checked_out_at = Time.current
+        order.save!
+        order
+      end
 
       it "can cancel the order" do
         visit_feature

data/decidim-budgets/spec/models/order_spec.rb

@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe Decidim::Budgets::Order do
-  let(:order) { build :order }
+  let!(:order) { create :order, feature: create(:budget_feature) }
   subject { order }
 
   describe "validations" do
@@ -26,6 +26,34 @@ describe Decidim::Budgets::Order do
       new_order = build :order, user: subject.user, feature: subject.feature
       expect(new_order).to be_invalid
     end
+
+    it "can't exceed a maximum order value" do
+      project1 = create(:project, feature: subject.feature, budget: 100)
+      project2 = create(:project, feature: subject.feature, budget: 20)
+
+      subject.projects << project1
+      subject.projects << project2
+
+      subject.feature.settings = {
+        "total_budget" => 100, "vote_threshold" => 50
+      }
+
+      expect(subject).to be_invalid
+    end
+
+    it "can't be lower than a minimum order value when checked out" do
+      project1 = create(:project, feature: subject.feature, budget: 20)
+
+      subject.projects << project1
+
+      subject.feature.settings = {
+        "total_budget" => 100, "vote_threshold" => 50
+      }
+
+      expect(subject).to be_valid
+      subject.checked_out_at = Time.current
+      expect(subject).to be_invalid
+    end
   end
 
   describe "#total_budget" do
@@ -33,6 +61,7 @@ describe Decidim::Budgets::Order do
       subject.projects << build(:project, feature: subject.feature)
 
       expect(subject.total_budget).to eq(subject.projects.sum(&:budget))
+      expect(subject)
     end
   end
 
@@ -42,4 +71,4 @@ describe Decidim::Budgets::Order do
       expect(subject).to be_checked_out
     end
   end
-end
+end

data/decidim-budgets/spec/shared/admin_shared_context.rb

@@ -1,7 +1,7 @@
 RSpec.shared_context "admin" do
   let(:organization) { create(:organization) }
   let!(:user) { create(:user, :admin, :confirmed, organization: organization, email: "admin@decidim.org") }
-  let(:participatory_process) { create(:participatory_process, organization: organization) }
+  let(:participatory_process) { create(:participatory_process, :with_steps, organization: organization) }
   let(:process_admin) { create :user, :confirmed, organization: organization }
   let!(:user_role) { create :participatory_process_user_role, user: process_admin, participatory_process: participatory_process }
   let(:current_feature) { create :feature, participatory_process: participatory_process, manifest_name: "budgets" }

data/decidim-comments/README.md

@@ -9,7 +9,7 @@ The Comments component is exposed as a Rails helper:
 ```ruby
 <%= comments_for @commentable %>
 ```
- 
+
 In order to use the helper in your templates you need to include the comments helpers in your application helper:
 
 ```ruby

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

@@ -1,20 +1,21 @@
-/* eslint-disable no-return-assign, react/no-unused-prop-types */
-import { Component, PropTypes } from 'react';
-import { graphql }              from 'react-apollo';
-import gql                      from 'graphql-tag';
-import { I18n }                 from 'react-i18nify';
-import uuid                     from 'uuid';
-import classnames               from 'classnames';
-
-import Icon                     from '../application/icon.component';
-
-import addCommentMutation       from './add_comment_form.mutation.graphql';
-import commentThreadFragment    from './comment_thread.fragment.graphql'
-import commentFragment          from './comment.fragment.graphql';
-import commentDataFragment      from './comment_data.fragment.graphql';
-import upVoteFragment           from './up_vote.fragment.graphql';
-import downVoteFragment         from './down_vote.fragment.graphql';
-import addCommentFormFragment   from './add_comment_form.fragment.graphql';
+/* eslint-disable no-return-assign, react/no-unused-prop-types, max-lines */
+import { Component, PropTypes }          from 'react';
+import { graphql }                       from 'react-apollo';
+import gql                               from 'graphql-tag';
+import { I18n, Translate }               from 'react-i18nify';
+import uuid                              from 'uuid';
+import classnames                        from 'classnames';
+
+import Icon                              from '../application/icon.component';
+
+import addCommentMutation                from './add_comment_form.mutation.graphql';
+import commentThreadFragment             from './comment_thread.fragment.graphql'
+import commentFragment                   from './comment.fragment.graphql';
+import commentDataFragment               from './comment_data.fragment.graphql';
+import upVoteFragment                    from './up_vote.fragment.graphql';
+import downVoteFragment                  from './down_vote.fragment.graphql';
+import addCommentFormSessionFragment     from './add_comment_form_session.fragment.graphql';
+import addCommentFormCommentableFragment from './add_comment_form_commentable.fragment.graphql';
 
 /**
  * Renders a form to create new comments.
@@ -27,46 +28,18 @@ export class AddCommentForm extends Component {
 
     this.state = {
       disabled: true,
+      error: false,
       alignment: 0
     };
   }
 
-  componentDidMount() {
-    if ($(document).foundation) {
-      $(this.form).foundation();
-    }
-  }
-
   render() {
-    const { submitButtonClassName, commentableType, commentableId, maxLength } = this.props;
-    const { disabled } = this.state;
-
     return (
       <div className="add-comment">
         {this._renderHeading()}
+        {this._renderAccountMessage()}
         {this._renderOpinionButtons()}
-        <form
-          onSubmit={(evt) => this._addComment(evt)}
-          data-abide
-          data-live-validate="true"
-          data-validate-on-blur="true"
-          ref={(form) => this.form = form}
-        >
-          {this._renderCommentAs()}
-          <div className="field">
-            <label className="show-for-sr" htmlFor={`add-comment-${commentableType}-${commentableId}`}>{ I18n.t("components.add_comment_form.form.body.label") }</label>
-            {this._renderTextArea()}
-            <span className="form-error">
-              { I18n.t("components.add_comment_form.form.form_error", { length: maxLength }) }
-            </span>
-            <input
-              type="submit"
-              className={submitButtonClassName}
-              value={I18n.t("components.add_comment_form.form.submit")}
-              disabled={disabled}
-            />
-          </div>
-        </form>
+        {this._renderForm()}
       </div>
     );
   }
@@ -90,17 +63,75 @@ export class AddCommentForm extends Component {
     return null;
   }
 
+  /**
+   * Render a message telling the user to sign in or sign up to leave a comment.
+   * @private
+   * @returns {Void|DOMElement} - The message or an empty element.
+   */
+  _renderAccountMessage() {
+    const { session } = this.props;
+
+    if (!session) {
+      return (
+        <p>
+          <Translate
+            value="components.add_comment_form.account_message"
+            sign_in_url="/users/sign_in"
+            sign_up_url="/users/sign_up"
+            dangerousHTML
+          />
+        </p>
+      );
+    }
+
+    return null;
+  }
+
+  /**
+   * Render the add comment form if session is present.
+   * @private
+   * @returns {Void|DOMElement} - The add comment form on an empty element.
+   */
+  _renderForm() {
+    const { session, submitButtonClassName, commentable: { id, type } } = this.props;
+    const { disabled } = this.state;
+
+    if (session) {
+      return (
+        <form onSubmit={(evt) => this._addComment(evt)}>
+          {this._renderCommentAs()}
+          <div className="field">
+            <label className="show-for-sr" htmlFor={`add-comment-${type}-${id}`}>{ I18n.t("components.add_comment_form.form.body.label") }</label>
+            {this._renderTextArea()}
+            {this._renderTextAreaError()}
+            <input
+              type="submit"
+              className={submitButtonClassName}
+              value={I18n.t("components.add_comment_form.form.submit")}
+              disabled={disabled}
+            />
+          </div>
+        </form>
+      );
+    }
+
+    return null;
+  }
+
   /**
    * Render the form heading based on showTitle prop
    * @private
    * @returns {Void|DOMElement} - The heading or an empty element
    */
   _renderTextArea() {
-    const { commentableType, commentableId, autoFocus, maxLength } = this.props;
+    const { commentable: { id, type }, autoFocus, maxLength } = this.props;
+    const { error } = this.state;
+    const className = classnames({ 'is-invalid-input': error });
 
     let textAreaProps = {
       ref: (textarea) => {this.bodyTextArea = textarea},
-      id: `add-comment-${commentableType}-${commentableId}`,
+      id: `add-comment-${type}-${id}`,
+      className,
       rows: "4",
       maxLength,
       required: "required",
@@ -117,13 +148,33 @@ export class AddCommentForm extends Component {
     );
   }
 
+  /**
+   * Render the text area form error if state has an error
+   * @private
+   * @returns {Void|DOMElement} - The error or an empty element
+   */
+  _renderTextAreaError() {
+    const { maxLength } = this.props;
+    const { error } = this.state;
+
+    if (error) {
+      return (
+        <span className="form-error is-visible">
+          { I18n.t("components.add_comment_form.form.form_error", { length: maxLength }) }
+        </span>
+      );
+    }
+
+    return null;
+  }
+
   /**
    * Render opinion buttons or not based on the arguable prop
    * @private
    * @returns {Void|DOMElement} - Returns nothing or a wrapper with buttons
    */
   _renderOpinionButtons() {
-    const { arguable } = this.props;
+    const { session, arguable } = this.props;
     const { alignment } = this.state;
     const buttonClassName = classnames('button', 'tiny', 'button--muted');
     const okButtonClassName = classnames(buttonClassName, 'opinion-toggle--ok', {
@@ -136,7 +187,7 @@ export class AddCommentForm extends Component {
       'is-active': alignment === 0
     });
 
-    if (arguable) {
+    if (session && arguable) {
       return (
         <div className="opinion-toggle button-group">
           <button
@@ -170,18 +221,18 @@ export class AddCommentForm extends Component {
    * @returns {Void|DOMElement} - Returns nothing or a form field.
    */
   _renderCommentAs() {
-    const { session, commentableType, commentableId } = this.props;
+    const { session, commentable: { id, type } } = this.props;
     const { user, verifiedUserGroups } = session;
 
     if (verifiedUserGroups.length > 0) {
       return (
         <div className="field">
-          <label htmlFor={`add-comment-${commentableType}-${commentableId}-user-group-id`}>
+          <label htmlFor={`add-comment-${type}-${id}-user-group-id`}>
             { I18n.t('components.add_comment_form.form.user_group_id.label') }
           </label>
           <select
             ref={(select) => {this.userGroupIdSelect = select}}
-            id={`add-comment-${commentableType}-${commentableId}-user-group-id`}
+            id={`add-comment-${type}-${id}-user-group-id`}
           >
             <option value="">{ user.name }</option>
             {
@@ -204,7 +255,8 @@ export class AddCommentForm extends Component {
    * @returns {Void} - Returns nothing
    */
   _checkCommentBody(body) {
-    this.setState({ disabled: body === '' });
+    const { maxLength } = this.props;
+    this.setState({ disabled: body === '', error: body === '' || body.length > maxLength });
   }
 
   /**
@@ -247,9 +299,11 @@ AddCommentForm.propTypes = {
         name: PropTypes.string.isRequired
       })
     ).isRequired
-  }).isRequired,
-  commentableId: PropTypes.string.isRequired,
-  commentableType: PropTypes.string.isRequired,
+  }),
+  commentable: PropTypes.shape({
+    id: PropTypes.string.isRequired,
+    type: PropTypes.string.isRequired
+  }),
   showTitle: PropTypes.bool.isRequired,
   submitButtonClassName: PropTypes.string.isRequired,
   onCommentAdded: PropTypes.func,
@@ -268,8 +322,11 @@ AddCommentForm.defaultProps = {
 };
 
 AddCommentForm.fragments = {
-  user: gql`
-    ${addCommentFormFragment}
+  session: gql`
+    ${addCommentFormSessionFragment}
+  `,
+  commentable: gql`
+    ${addCommentFormCommentableFragment}
   `
 };
 
@@ -284,48 +341,51 @@ const AddCommentFormWithMutation = graphql(gql`
   props: ({ ownProps, mutate }) => ({
     addComment: ({ body, alignment, userGroupId }) => mutate({
       variables: {
-        commentableId: ownProps.commentableId,
-        commentableType: ownProps.commentableType,
+        commentableId: ownProps.commentable.id,
+        commentableType: ownProps.commentable.type,
         body,
         alignment,
         userGroupId
       },
       optimisticResponse: {
-        __typename: 'Mutation',
-        addComment: {
-          __typename: 'Comment',
-          id: uuid(),
-          createdAt: new Date().toISOString(),
-          body,
-          alignment: alignment,
-          author: {
-            __typename: 'Author',
-            name: ownProps.session.user.name,
-            avatarUrl: ownProps.session.user.avatarUrl
-          },
-          replies: [],
-          hasReplies: false,
-          canHaveReplies: false,
-          upVotes: 0,
-          upVoted: false,
-          downVotes: 0,
-          downVoted: false
+        commentable: {
+          __typename: 'CommentableMutation',
+          addComment: {
+            __typename: 'Comment',
+            id: uuid(),
+            type: "Decidim::Comments::Comment",
+            createdAt: new Date().toISOString(),
+            body,
+            alignment: alignment,
+            author: {
+              __typename: 'User',
+              name: ownProps.session.user.name,
+              avatarUrl: ownProps.session.user.avatarUrl
+            },
+            comments: [],
+            hasComments: false,
+            acceptsNewComments: false,
+            upVotes: 0,
+            upVoted: false,
+            downVotes: 0,
+            downVoted: false
+          }
         }
       },
       updateQueries: {
         GetComments: (prev, { mutationResult: { data } }) => {
-          const { commentableId, commentableType } = ownProps;
-          const newComment = data.addComment;
+          const { id, type } = ownProps.commentable;
+          const newComment = data.commentable.addComment;
           let comments = [];
 
           const commentReducer = (comment) => {
-            const replies = comment.replies || [];
+            const replies = comment.comments || [];
 
-            if (comment.id === commentableId) {
+            if (comment.id === id) {
               return {
                 ...comment,
-                hasReplies: true,
-                replies: [
+                hasComments: true,
+                comments: [
                   ...replies,
                   newComment
                 ]
@@ -333,22 +393,25 @@ const AddCommentFormWithMutation = graphql(gql`
             }
             return {
               ...comment,
-              replies: replies.map(commentReducer)
+              comments: replies.map(commentReducer)
             };
           };
 
-          if (commentableType === "Decidim::Comments::Comment") {
-            comments = prev.comments.map(commentReducer);
+          if (type === "Decidim::Comments::Comment") {
+            comments = prev.commentable.comments.map(commentReducer);
           } else {
             comments = [
-              ...prev.comments,
+              ...prev.commentable.comments,
               newComment
             ];
           }
 
           return {
             ...prev,
-            comments
+            commentable: {
+              ...prev.commentable,
+              comments
+            }
           };
         }
       }