decidim 0.3.2 → 0.4.0

data/decidim-admin/spec/shared/manage_processes_examples.rb

@@ -29,6 +29,12 @@ RSpec.shared_examples "manage processes examples" do
     end
   end
 
+  context "viewing a missing process" do
+    it_behaves_like "a 404 page" do
+      let(:target_path) { decidim_admin.participatory_process_path(99_999_999) }
+    end
+  end
+
   it "updates a participatory_process" do
     click_link translated(participatory_process.title)
 

data/decidim-admin/spec/spec_helper.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require "decidim/dev"
+
 ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 
+Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
+
 require "decidim/dev/test/base_spec_helper"
 
 Dir["#{__dir__}/support/**/*.rb"].each { |f| require f }

data/decidim-api/bin/rails

@@ -8,8 +8,8 @@ ENGINE_ROOT = File.expand_path("..", __dir__)
 ENGINE_PATH = File.expand_path("../lib/decidim/api/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __dir__)
+require "bundler/setup"
 
 require "rails/all"
 require "rails/engine/commands"

data/decidim-api/decidim-api.gemspec

@@ -9,15 +9,15 @@ require_relative "../decidim-core/lib/decidim/core/version"
 Gem::Specification.new do |s|
   Decidim.add_default_gemspec_properties(s)
 
-  s.name        = "decidim-api"
-  s.summary     = "API engine for decidim"
+  s.name = "decidim-api"
+  s.summary = "API engine for decidim"
   s.description = "API engine for decidim"
 
   s.files = Dir["{app,config,db,lib,vendor}/**/*", "Rakefile", "README.md"]
 
   s.add_dependency "rails", *Decidim.rails_version
   s.add_dependency "graphql", "~> 1.6.0"
-  s.add_dependency "graphiql-rails", "~> 1.4.1"
+  s.add_dependency "graphiql-rails", "~> 1.4.2"
   s.add_dependency "rack-cors", "~> 0.4.0"
   s.add_dependency "sprockets-es6", "~> 0.9.2"
 

data/decidim-api/spec/spec_helper.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require "decidim/dev"
+
 ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 
+Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
+
 require "decidim/dev/test/base_spec_helper"
 
 Dir["#{__dir__}/support/**/*.rb"].each { |f| require f }

data/decidim-api/spec/types/query_type_spec.rb

@@ -16,8 +16,8 @@ module Decidim
         let(:query) { %({ processes { id }}) }
 
         it "returns all the processes" do
-          expect(response["processes"]).to     include("id" => process1.id.to_s)
-          expect(response["processes"]).to     include("id" => process2.id.to_s)
+          expect(response["processes"]).to include("id" => process1.id.to_s)
+          expect(response["processes"]).to include("id" => process2.id.to_s)
           expect(response["processes"]).not_to include("id" => process3.id.to_s)
         end
       end

data/decidim-budgets/app/models/decidim/budgets/project.rb

@@ -36,6 +36,11 @@ module Decidim
       def confirmed_orders_count
         orders.finished.count
       end
+
+      # Public: Overrides the `notifiable?` Notifiable concern method.
+      def notifiable?(_context)
+        false
+      end
     end
   end
 end

data/decidim-budgets/bin/rails

@@ -8,8 +8,8 @@ ENGINE_ROOT = File.expand_path("..", __dir__)
 ENGINE_PATH = File.expand_path("../lib/decidim/budgets/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __dir__)
+require "bundler/setup"
 
 require "rails/all"
 require "rails/engine/commands"

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

@@ -4,7 +4,7 @@ fr:
       project:
         budget: Budget
         decidim_category_id: Catégorie
-        decidim_scope_id: Domaine d'application
+        decidim_scope_id: Zone d'application
         description: Description
         proposal_ids: Propositions liées
         title: Titre
@@ -73,7 +73,7 @@ fr:
         filters:
           category: Catégorie
           category_prompt: Sélectionner une catégorie
-          scopes: Domaines d'application
+          scopes: Zones d'application
           search: Rechercher
         filters_small_view:
           close_modal: Fermer la vue

data/decidim-budgets/decidim-budgets.gemspec

@@ -9,8 +9,8 @@ require_relative "../decidim-core/lib/decidim/core/version"
 Gem::Specification.new do |s|
   Decidim.add_default_gemspec_properties(s)
 
-  s.name        = "decidim-budgets"
-  s.summary     = "A budgets component for decidim's participatory processes."
+  s.name = "decidim-budgets"
+  s.summary = "A budgets component for decidim's participatory processes."
   s.description = s.summary
 
   s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md"]

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

@@ -41,7 +41,7 @@ Decidim.register_feature(:budgets) do |feature|
   end
 
   feature.seeds do
-    Decidim::ParticipatoryProcess.all.each do |process|
+    Decidim::ParticipatoryProcess.find_each do |process|
       next unless process.steps.any?
 
       feature = Decidim::Feature.create!(

data/decidim-budgets/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "decidim/dev"
+
 ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 
+Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
+
 require "decidim/dev/test/base_spec_helper"

data/decidim-comments/app/commands/decidim/comments/create_comment.rb

@@ -23,7 +23,7 @@ module Decidim
         return broadcast(:invalid) if form.invalid?
 
         create_comment
-        send_notification_to_author if has_author? && !same_author?
+        send_notification if @commentable.notifiable?(author: @author)
 
         broadcast(:ok, @comment)
       end
@@ -41,22 +41,18 @@ module Decidim
                                    decidim_user_group_id: form.user_group_id)
       end
 
-      def send_notification_to_author
-        if @comment.depth.positive? && @commentable.author.replies_notifications?
-          CommentNotificationMailer.reply_created(@comment, @commentable, @comment.root_commentable).deliver_later
-        elsif @comment.depth.zero? && @commentable.author.comments_notifications?
-          CommentNotificationMailer.comment_created(@comment, @commentable).deliver_later
+      def send_notification
+        if @comment.depth.positive?
+          @commentable.users_to_notify.each do |user|
+            CommentNotificationMailer.reply_created(user, @comment, @commentable, @comment.root_commentable).deliver_later
+          end
+        elsif @comment.depth.zero?
+          @commentable.users_to_notify.each do |user|
+            CommentNotificationMailer.comment_created(user, @comment, @commentable).deliver_later
+          end
         end
       end
 
-      def has_author?
-        @commentable.respond_to?(:author) && @commentable.author.present?
-      end
-
-      def same_author?
-        @author == @commentable.author
-      end
-
       def root_commentable(commentable)
         return commentable.root_commentable if commentable.is_a? Decidim::Comments::Comment
         commentable

data/decidim-comments/app/frontend/application/application.component.tsx

@@ -15,7 +15,7 @@ interface ApplicationProps {
  * @class
  * @augments Component
  */
-export default class Application extends React.Component<ApplicationProps, undefined> {
+export default class Application extends React.Component<ApplicationProps> {
   constructor(props: ApplicationProps) {
     const { locale } = props;
 

data/decidim-comments/app/frontend/comments/add_comment_form.component.test.tsx

@@ -1,7 +1,7 @@
 import { mount, ReactWrapper, shallow } from "enzyme";
 import * as React from "react";
 
-import { AddCommentForm } from "./add_comment_form.component";
+import { AddCommentForm, MAX_LENGTH } from "./add_comment_form.component";
 
 import generateUserData from "../support/generate_user_data";
 import generateUserGroupData from "../support/generate_user_group_data";
@@ -13,6 +13,7 @@ describe("<AddCommentForm />", () => {
     id: "1",
     type: "Decidim::DummyResource",
   };
+  const orderBy = "older";
   const addCommentStub = (): any => {
     return null;
   };
@@ -31,49 +32,44 @@ describe("<AddCommentForm />", () => {
   });
 
   it("should render a div with class add-comment", () => {
-    const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} />);
+    const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
     expect(wrapper.find("div.add-comment")).toBeDefined();
   });
 
   it("should have a reference to body textarea", () => {
-    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} />);
+    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
     expect((wrapper.instance() as AddCommentForm).bodyTextArea).toBeDefined();
   });
 
   it("should initialize with a state property disabled as true", () => {
-    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} />);
+    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
     expect(wrapper.state()).toHaveProperty("disabled", true);
   });
 
   it("should have a default prop showTitle as true", () => {
-    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} />);
+    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
     expect(wrapper.props()).toHaveProperty("showTitle", true);
   });
 
   it("should not render the title if prop showTitle is false", () => {
-    const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} showTitle={false} />);
+    const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} showTitle={false} rootCommentable={commentable} orderBy={orderBy} />);
     expect(wrapper.find("h5.section-heading").exists()).toBeFalsy();
   });
 
   it("should have a default prop submitButtonClassName as 'button button--sc'", () => {
-    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} />);
+    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
     expect(wrapper.props()).toHaveProperty("submitButtonClassName", "button button--sc");
   });
 
-  it("should have a default prop maxLength of 1000", () => {
-    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} />);
-    expect(wrapper.props()).toHaveProperty("maxLength", 1000);
-  });
-
   it("should use prop submitButtonClassName as a className prop for submit button", () => {
-    const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} submitButtonClassName="button small hollow" />);
+    const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} submitButtonClassName="button small hollow" rootCommentable={commentable} orderBy={orderBy} />);
     expect(wrapper.find('button[type="submit"]').hasClass("button")).toBeTruthy();
     expect(wrapper.find('button[type="submit"]').hasClass("small")).toBeTruthy();
     expect(wrapper.find('button[type="submit"]').hasClass("hollow")).toBeTruthy();
   });
 
   it("should enable the submit button if textarea is not blank", () => {
-    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} />);
+    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
     wrapper.find("textarea").simulate("change", {
       target: {
         value: "This is a comment",
@@ -83,7 +79,7 @@ describe("<AddCommentForm />", () => {
   });
 
   it("should disable the submit button if textarea is blank", () => {
-    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} />);
+    const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
     wrapper.find("textarea").simulate("change", {
       target: {
         value: "This will be deleted",
@@ -98,10 +94,21 @@ describe("<AddCommentForm />", () => {
   });
 
   it("should not render a div with class 'opinion-toggle'", () => {
-    const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} />);
+    const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
     expect(wrapper.find(".opinion-toggle").exists()).toBeFalsy();
   });
 
+  it("should render the remaining character count", () => {
+    const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
+    const commentBody = "This is a new comment!";
+    wrapper.find("textarea").simulate("change", {
+      target: {
+        value: commentBody,
+      },
+    });
+    expect(wrapper.find(".remaining-character-count").text()).toContain(MAX_LENGTH - commentBody.length);
+  });
+
   describe("submitting the form", () => {
     let addComment: jasmine.Spy;
     let onCommentAdded: jasmine.Spy ;
@@ -111,7 +118,7 @@ describe("<AddCommentForm />", () => {
     beforeEach(() => {
       addComment = jasmine.createSpy("addComment");
       onCommentAdded = jasmine.createSpy("onCommentAdded");
-      wrapper = mount(<AddCommentForm addComment={addComment} session={session} commentable={commentable} onCommentAdded={onCommentAdded} />);
+      wrapper = mount(<AddCommentForm addComment={addComment} session={session} commentable={commentable} onCommentAdded={onCommentAdded} rootCommentable={commentable} orderBy={orderBy} />);
       message = "This will be submitted";
       (wrapper.instance() as AddCommentForm).bodyTextArea.value = message;
     });
@@ -139,25 +146,25 @@ describe("<AddCommentForm />", () => {
   });
 
   it("should initialize state with a property alignment and value 0", () => {
-    const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} arguable={true} />);
+    const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} arguable={true} rootCommentable={commentable} orderBy={orderBy} />);
     expect(wrapper.state()).toHaveProperty("alignment", 0);
   });
 
   describe("when receiving an optional prop arguable with value true", () => {
     it("should render a div with class 'opinion-toggle'", () => {
-      const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} arguable={true} />);
+      const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} arguable={true} rootCommentable={commentable} orderBy={orderBy} />);
       expect(wrapper.find(".opinion-toggle")).toBeDefined();
     });
 
     it("should set state alignment to 1 if user clicks ok button and change its class", () => {
-      const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} arguable={true} />);
+      const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} arguable={true} rootCommentable={commentable} orderBy={orderBy} />);
       wrapper.find(".opinion-toggle--ok").simulate("click");
       expect(wrapper.find(".opinion-toggle--ok").hasClass("is-active")).toBeTruthy();
       expect(wrapper.state()).toHaveProperty("alignment", 1);
     });
 
     it("should set state alignment to -11 if user clicks ko button and change its class", () => {
-      const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} arguable={true} />);
+      const wrapper = shallow(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} arguable={true} rootCommentable={commentable} orderBy={orderBy} />);
       wrapper.find(".opinion-toggle--ko").simulate("click");
       expect(wrapper.find(".opinion-toggle--ko").hasClass("is-active")).toBeTruthy();
       expect(wrapper.state()).toHaveProperty("alignment", -1);
@@ -170,7 +177,7 @@ describe("<AddCommentForm />", () => {
 
       beforeEach(() => {
         addComment = jasmine.createSpy("addComment");
-        wrapper = mount(<AddCommentForm addComment={addComment} session={session} commentable={commentable} arguable={true} />);
+        wrapper = mount(<AddCommentForm addComment={addComment} session={session} commentable={commentable} arguable={true} rootCommentable={commentable} orderBy={orderBy} />);
         message = "This will be submitted";
         (wrapper.instance() as AddCommentForm).bodyTextArea.value = message;
       });
@@ -198,12 +205,12 @@ describe("<AddCommentForm />", () => {
     });
 
     it("should have a reference to user_group_id select", () => {
-      const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} />);
+      const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
       expect((wrapper.instance() as AddCommentForm).userGroupIdSelect).toBeDefined();
     });
 
     it("should render a select with option tags for each verified user group", () => {
-      const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} />);
+      const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
       expect(wrapper.find("select").children("option").length).toBe(3);
     });
 
@@ -215,7 +222,7 @@ describe("<AddCommentForm />", () => {
 
       beforeEach(() => {
         addComment = jasmine.createSpy("addComment");
-        wrapper = mount(<AddCommentForm addComment={addComment} session={session} commentable={commentable} />);
+        wrapper = mount(<AddCommentForm addComment={addComment} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
         message = "This will be submitted";
         userGroupId = session.verifiedUserGroups[1].id;
         (wrapper.instance() as AddCommentForm).bodyTextArea.value = message;
@@ -246,7 +253,7 @@ describe("<AddCommentForm />", () => {
     });
 
     it("display a message to sign in or sign up", () => {
-      const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} />);
+      const wrapper = mount(<AddCommentForm addComment={addCommentStub} session={session} commentable={commentable} rootCommentable={commentable} orderBy={orderBy} />);
       expect(wrapper.find("span").text()).toContain("sign up");
     });
   });

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

@@ -21,21 +21,25 @@ interface AddCommentFormProps {
     user: any;
   } | null;
   commentable: AddCommentFormCommentableFragment;
+  rootCommentable: AddCommentFormCommentableFragment;
   showTitle?: boolean;
   submitButtonClassName?: string;
   autoFocus?: boolean;
-  maxLength?: number;
   arguable?: boolean;
   addComment?: (data: { body: string, alignment: number, userGroupId?: string }) => void;
   onCommentAdded?: () => void;
+  orderBy: string;
 }
 
 interface AddCommentFormState {
   disabled: boolean;
   error: boolean;
   alignment: number;
+  remainingCharacterCount: number;
 }
 
+export const MAX_LENGTH = 500;
+
 /**
  * Renders a form to create new comments.
  * @class
@@ -47,7 +51,6 @@ export class AddCommentForm extends React.Component<AddCommentFormProps, AddComm
     submitButtonClassName: "button button--sc",
     arguable: false,
     autoFocus: false,
-    maxLength: 1000,
   };
 
   public bodyTextArea: HTMLTextAreaElement;
@@ -60,6 +63,7 @@ export class AddCommentForm extends React.Component<AddCommentFormProps, AddComm
       disabled: true,
       error: false,
       alignment: 0,
+      remainingCharacterCount: MAX_LENGTH,
     };
   }
 
@@ -124,7 +128,7 @@ export class AddCommentForm extends React.Component<AddCommentFormProps, AddComm
    */
   private _renderForm() {
     const { session, submitButtonClassName, commentable: { id, type } } = this.props;
-    const { disabled } = this.state;
+    const { disabled, remainingCharacterCount } = this.state;
 
     if (session) {
       return (
@@ -141,6 +145,9 @@ export class AddCommentForm extends React.Component<AddCommentFormProps, AddComm
             >
               {I18n.t("components.add_comment_form.form.submit")}
             </button>
+            <span className="remaining-character-count">
+              {I18n.t("components.add_comment_form.remaining_characters", { count:  remainingCharacterCount })}
+            </span>
           </div>
         </form>
       );
@@ -155,7 +162,7 @@ export class AddCommentForm extends React.Component<AddCommentFormProps, AddComm
    * @returns {Void|DOMElement} - The heading or an empty element
    */
   private _renderTextArea() {
-    const { commentable: { id, type }, autoFocus, maxLength } = this.props;
+    const { commentable: { id, type }, autoFocus } = this.props;
     const { error } = this.state;
     const className = classnames({ "is-invalid-input": error });
 
@@ -164,9 +171,9 @@ export class AddCommentForm extends React.Component<AddCommentFormProps, AddComm
       id: `add-comment-${type}-${id}`,
       className,
       rows: "4",
-      maxLength,
+      maxLength: MAX_LENGTH,
       required: "required",
-      pattern: `^(.){0,${maxLength}}$`,
+      pattern: `^(.){0,${MAX_LENGTH}}$`,
       placeholder: I18n.t("components.add_comment_form.form.body.placeholder"),
       onChange: (evt: React.ChangeEvent<HTMLTextAreaElement>) => this._checkCommentBody(evt.target.value),
     };
@@ -186,13 +193,12 @@ export class AddCommentForm extends React.Component<AddCommentFormProps, AddComm
    * @returns {Void|DOMElement} - The error or an empty element
    */
   private _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 })}
+          {I18n.t("components.add_comment_form.form.form_error", { length: MAX_LENGTH })}
         </span>
       );
     }
@@ -298,8 +304,10 @@ export class AddCommentForm extends React.Component<AddCommentFormProps, AddComm
    * @returns {Void} - Returns nothing
    */
   private _checkCommentBody(body: string) {
-    const { maxLength } = this.props;
-    this.setState({ disabled: body === "", error: body === "" || (maxLength !== undefined && body.length > maxLength) });
+    this.setState({
+      disabled: body === "", error: body === "" || body.length > MAX_LENGTH,
+      remainingCharacterCount: MAX_LENGTH - body.length,
+    });
   }
 
   /**
@@ -334,89 +342,107 @@ export class AddCommentForm extends React.Component<AddCommentFormProps, AddComm
 }
 
 const addCommentMutation = require("../mutations/add_comment.mutation.graphql");
+const getCommentsQuery = require("../queries/comments.query.graphql");
 
-const AddCommentFormWithMutation = graphql(addCommentMutation, {
+const AddCommentFormWithMutation = graphql<AddCommentMutation, AddCommentFormProps>(addCommentMutation, {
   props: ({ ownProps, mutate }) => ({
-    addComment: ({ body, alignment, userGroupId }: { body: string, alignment: number, userGroupId: string }) => mutate({
-      variables: {
-        commentableId: ownProps.commentable.id,
-        commentableType: ownProps.commentable.type,
-        body,
-        alignment,
-        userGroupId,
-      },
-      optimisticResponse: {
-        commentable: {
-          __typename: "CommentableMutation",
-          addComment: {
-            __typename: "Comment",
-            id: uuid(),
-            sgid: uuid(),
-            type: "Decidim::Comments::Comment",
-            createdAt: new Date().toISOString(),
+    addComment: ({ body, alignment, userGroupId }: { body: string, alignment: number, userGroupId: string }) => {
+      if (mutate) {
+        mutate({
+          variables: {
+            commentableId: ownProps.commentable.id,
+            commentableType: ownProps.commentable.type,
             body,
             alignment,
-            author: {
-              __typename: "User",
-              name: ownProps.session.user.name,
-              avatarUrl: ownProps.session.user.avatarUrl,
-              deleted: false,
+            userGroupId,
+          },
+          optimisticResponse: {
+            commentable: {
+              __typename: "CommentableMutation",
+              addComment: {
+                __typename: "Comment",
+                id: uuid(),
+                sgid: uuid(),
+                type: "Decidim::Comments::Comment",
+                createdAt: new Date().toISOString(),
+                body,
+                alignment,
+                author: {
+                  __typename: "User",
+                  name: ownProps.session && ownProps.session.user.name,
+                  avatarUrl: ownProps.session && ownProps.session.user.avatarUrl,
+                  deleted: false,
+                  isVerified: true,
+                  isUser: true,
+                },
+                comments: [],
+                hasComments: false,
+                acceptsNewComments: false,
+                upVotes: 0,
+                upVoted: false,
+                downVotes: 0,
+                downVoted: false,
+                alreadyReported: false,
+              },
             },
-            comments: [],
-            hasComments: false,
-            acceptsNewComments: false,
-            upVotes: 0,
-            upVoted: false,
-            downVotes: 0,
-            downVoted: false,
-            alreadyReported: false,
           },
-        },
-      },
-      updateQueries: {
-        GetComments: (prev: GetCommentsQuery, { mutationResult: { data } }: { mutationResult: { data: AddCommentMutation }}) => {
-          const { id, type } = ownProps.commentable;
-          const newComment = data.commentable && data.commentable.addComment;
-          let comments = [];
-
-          const commentReducer = (comment: CommentFragment): CommentFragment => {
-            const replies = comment.comments || [];
-
-            if (newComment && comment.id === id) {
+          update: (store, { data }: { data: AddCommentMutation }) => {
+            const variables = {
+              commentableId: ownProps.rootCommentable.id,
+              commentableType: ownProps.rootCommentable.type,
+              orderBy: ownProps.orderBy,
+            };
+            const prev = store.readQuery<GetCommentsQuery>({
+              query: getCommentsQuery,
+              variables,
+             });
+            const { id, type } = ownProps.commentable;
+            const newComment = data.commentable && data.commentable.addComment;
+            let comments = [];
+
+            const commentReducer = (comment: CommentFragment): CommentFragment => {
+              const replies = comment.comments || [];
+
+              if (newComment && comment.id === id) {
+                return {
+                  ...comment,
+                  hasComments: true,
+                  comments: [
+                    ...replies,
+                    newComment,
+                  ],
+                };
+              }
               return {
                 ...comment,
-                hasComments: true,
-                comments: [
-                  ...replies,
-                  newComment,
-                ],
+                comments: replies.map(commentReducer),
               };
-            }
-            return {
-              ...comment,
-              comments: replies.map(commentReducer),
             };
-          };
-
-          if (type === "Decidim::Comments::Comment") {
-            comments = prev.commentable.comments.map(commentReducer);
-          } else {
-            comments = [
-              ...prev.commentable.comments,
-              newComment,
-            ];
-          }
-
-          return {
-            ...prev,
-            commentable: {
-              ...prev.commentable,
-              comments,
-            },
-          };
-        },
-      },
-    }),
+
+            if (type === "Decidim::Comments::Comment") {
+                comments = prev.commentable.comments.map(commentReducer);
+              } else {
+                comments = [
+                  ...prev.commentable.comments,
+                  newComment,
+                ];
+              }
+
+            store.writeQuery({
+              query: getCommentsQuery,
+              data: {
+                ...prev,
+                commentable: {
+                  ...prev.commentable,
+                  comments,
+                },
+              },
+              variables,
+            });
+          },
+        });
+      }
+    },
   }),
 })(AddCommentForm);