decidim 0.4.3 → 0.4.4

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec.shared_context "participatory process administration by admin" do
+  let!(:user) do
+    create(:user, :admin, :confirmed, organization: organization)
+  end
+
+  include_context "participatory process administration"
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+RSpec.shared_context "participatory process administration by process admin" do
+  let!(:user) do
+    create(:user,
+           :process_admin,
+           :confirmed,
+           organization: organization,
+           participatory_process: participatory_process)
+  end
+
+  include_context "participatory process administration"
+end

data/decidim-admin/spec/shared/{participatory_admin_shared_context.rb → participatory_process_administration_shared_context.rb}

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-RSpec.shared_context "participatory process admin" do
+RSpec.shared_context "participatory process administration" do
   let(:organization) { create(:organization) }
-  let!(:user) { create(:user, :admin, :confirmed, organization: organization) }
 
-  let(:participatory_process) { create(:participatory_process, organization: organization) }
-  let!(:process_admin) { create :user, :process_admin, :confirmed, organization: organization, participatory_process: participatory_process }
+  let!(:participatory_process) { create(:participatory_process, organization: organization) }
 
   let(:image1_filename) { "city.jpeg" }
   let(:image1_path) { Decidim::Dev.asset(image1_filename) }

data/decidim-api/decidim-api.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |s|
   s.add_dependency "sprockets-es6", "~> 0.9.2"
 
   s.add_development_dependency "decidim-dev", Decidim.version
+  s.add_development_dependency "decidim-core", Decidim.version
+  s.add_development_dependency "decidim-comments", Decidim.version
 end

data/decidim-api/lib/decidim/api/schema.rb

@@ -7,7 +7,7 @@ module Decidim
       query QueryType
       mutation MutationType
 
-      resolve_type lambda { |obj, _ctx|
+      resolve_type lambda { |_type, obj, _ctx|
         return Decidim::UserType if obj.is_a? Decidim::User
         return Decidim::UserGroupType if obj.is_a? Decidim::UserGroup
       }

data/decidim-api/lib/decidim/api/test/type_context.rb

@@ -19,7 +19,7 @@ RSpec.shared_context "graphql type" do
 
     GraphQL::Schema.define do
       query query_type
-      resolve_type ->(obj, ctx) {}
+      resolve_type ->(_type, _obj, _ctx) {}
     end
   end
 

data/decidim-api/spec/controllers/queries_controller_spec.rb

@@ -5,6 +5,8 @@ require "spec_helper"
 module Decidim
   module Api
     describe QueriesController, type: :controller do
+      routes { Decidim::Api::Engine.routes }
+
       let!(:participatory_process) { create(:participatory_process) }
       let!(:other_participatory_process) { create(:participatory_process) }
 

data/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb

@@ -25,6 +25,10 @@ module Decidim
 
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
+
+          return unless model.categorization
+
+          self.decidim_category_id = model.categorization.decidim_category_id
         end
 
         def process_scope

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

@@ -26,7 +26,7 @@
                <%= project.confirmed_orders_count %>
               </td>
               <td class="table-list__actions">
-                <%= icon_link_to "eye", decidim_budgets.project_path(id: project, feature_id: current_feature, participatory_process_id: current_participatory_process), t("actions.preview", scope: "decidim.budgets"), target: :blank, class: "action-icon--preview" %>
+                <%= icon_link_to "eye", resource_locator(project).path, t("actions.preview", scope: "decidim.budgets"), target: :blank, class: "action-icon--preview" %>
 
                 <% if can? :update, current_feature %>
                   <%= icon_link_to "pencil", edit_project_path(project), t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>

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

@@ -1,10 +1,10 @@
 <% if project.category.present? || project.scope.present? %>
   <ul class="tags tags--project" >
     <% if project.category.present? %>
-      <li><%= link_to translated_attribute(project.category.name), decidim_budgets.projects_path(filter: { category_id: project.category.id }) %></li>
+      <li><%= link_to translated_attribute(project.category.name), resource_locator(project).index(filter: { category_id: project.category.id }) %></li>
     <% end %>
     <% if project.scope.present? && !current_participatory_process.scope %>
-      <li><%= link_to project.scope.name, decidim_budgets.projects_path(filter: { scope_id: [project.scope.id] }) %></li>
+      <li><%= link_to project.scope.name, resource_locator(project).index(filter: { scope_id: [project.scope.id] }) %></li>
     <% end %>
   </ul>
 <% end %>

data/decidim-budgets/decidim-budgets.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.add_dependency "kaminari", "~> 1.0.1"
 
   s.add_development_dependency "decidim-dev", Decidim.version
-  s.add_development_dependency "decidim-proposals", Decidim.version
   s.add_development_dependency "decidim-admin", Decidim.version
+  s.add_development_dependency "decidim-proposals", Decidim.version
 end

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

@@ -47,42 +47,38 @@ Decidim.register_feature(:budgets) do |feature|
     settings.attribute :show_votes, type: :boolean, default: false
   end
 
-  feature.seeds do
-    Decidim::ParticipatoryProcess.find_each do |process|
-      next unless process.steps.any?
+  feature.seeds do |process|
+    feature = Decidim::Feature.create!(
+      name: Decidim::Features::Namer.new(process.organization.available_locales, :budgets).i18n_name,
+      manifest_name: :budgets,
+      published_at: Time.current,
+      participatory_process: process
+    )
 
-      feature = Decidim::Feature.create!(
-        name: Decidim::Features::Namer.new(process.organization.available_locales, :budgets).i18n_name,
-        manifest_name: :budgets,
-        published_at: Time.current,
-        participatory_process: process
+    3.times do
+      project = Decidim::Budgets::Project.create!(
+        feature: feature,
+        scope: process.organization.scopes.sample,
+        category: process.categories.sample,
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(3)
+        end,
+        budget: Faker::Number.number(8)
       )
-
-      3.times do
-        project = Decidim::Budgets::Project.create!(
-          feature: feature,
-          scope: process.organization.scopes.sample,
-          category: process.categories.sample,
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(3)
-          end,
-          budget: Faker::Number.number(8)
-        )
-        Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
-          attached_to: project
-        )
-        Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
-          attached_to: project
-        )
-        Decidim::Comments::Seed.comments_for(project)
-      end
+      Decidim::Attachment.create!(
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.sentence(5),
+        file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
+        attached_to: project
+      )
+      Decidim::Attachment.create!(
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.sentence(5),
+        file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
+        attached_to: project
+      )
+      Decidim::Comments::Seed.comments_for(project)
     end
   end
 end

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

@@ -4,11 +4,13 @@ require "spec_helper"
 
 describe Decidim::Budgets::RemoveLineItem do
   let(:user) { create(:user) }
+
   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

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

@@ -6,6 +6,6 @@ describe "Comments", type: :feature, perform_enqueued: true do
   let!(:feature) { create(:budget_feature, organization: organization) }
   let!(:commentable) { create(:project, feature: feature) }
 
-  let(:resource_path) { decidim_budgets.project_path(commentable, feature_id: feature, participatory_process_id: feature.participatory_process) }
+  let(:resource_path) { resource_locator(commentable).path }
   include_examples "comments"
 end

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

@@ -219,11 +219,7 @@ describe "Orders", type: :feature do
     let!(:project) { create(:project, feature: feature, budget: 25_000_000) }
 
     before do
-      visit decidim_budgets.project_path(
-        id: project.id,
-        participatory_process_id: participatory_process,
-        feature_id: feature
-      )
+      visit resource_locator(project).path
     end
 
     let(:attached_to) { project }

data/decidim-budgets/spec/forms/project_form_spec.rb

@@ -75,6 +75,12 @@ describe Decidim::Budgets::Admin::ProjectForm do
     it { is_expected.not_to be_valid }
   end
 
+  it "properly maps category id from model" do
+    project = create(:project, feature: current_feature, category: category)
+
+    expect(described_class.from_model(project).decidim_category_id).to eq(category_id)
+  end
+
   context "with proposals" do
     let(:proposals_feature) { create :feature, manifest_name: :proposals, participatory_process: participatory_process }
     let!(:proposal) { create :proposal, feature: proposals_feature }

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

@@ -35,7 +35,7 @@ RSpec.shared_examples "manage projects" do
       end
 
       within_window @new_window do
-        expect(current_path).to eq decidim_budgets.project_path(id: project.id, participatory_process_id: participatory_process.id, feature_id: current_feature.id)
+        expect(current_path).to eq resource_locator(project).path
         expect(page).to have_content(translated(project.title))
       end
     end

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

@@ -11,7 +11,7 @@ const { I18n, Translate } = require("react-i18nify");
 import {
   AddCommentFormCommentableFragment,
   AddCommentFormSessionFragment,
-  AddCommentMutation,
+  addCommentMutation,
   CommentFragment,
   GetCommentsQuery,
 } from "../support/schema";
@@ -344,7 +344,7 @@ 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, AddCommentFormProps>(addCommentMutation, {
+const AddCommentFormWithMutation = graphql<addCommentMutation, AddCommentFormProps>(addCommentMutation, {
   props: ({ ownProps, mutate }) => ({
     addComment: ({ body, alignment, userGroupId }: { body: string, alignment: number, userGroupId: string }) => {
       if (mutate) {
@@ -386,7 +386,7 @@ const AddCommentFormWithMutation = graphql<AddCommentMutation, AddCommentFormPro
               },
             },
           },
-          update: (store, { data }: { data: AddCommentMutation }) => {
+          update: (store, { data }: { data: addCommentMutation }) => {
             const variables = {
               commentableId: ownProps.rootCommentable.id,
               commentableType: ownProps.rootCommentable.type,

data/decidim-comments/app/frontend/support/schema.ts

@@ -1,55 +1,688 @@
-//  This file was automatically generated and should not be edited.
 /* tslint:disable */
+//  This file was automatically generated and should not be edited.
 
-export interface AddCommentMutationVariables {
-  commentableId: string;
-  commentableType: string;
-  body: string;
-  alignment: number | null;
-  userGroupId: string | null;
-}
+export type addCommentMutationVariables = {
+  commentableId: string,
+  commentableType: string,
+  body: string,
+  alignment?: number | null,
+  userGroupId?: string | null,
+};
 
-export interface AddCommentMutation {
+export type addCommentMutation = {
   // A commentable
-  commentable: {
+  commentable:  {
     // Add a new comment to a commentable
-    addComment: CommentThreadFragment & CommentFragment & CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment,
-  } | null;
-}
+    addComment:  {
+      // Check if the commentable has comments
+      hasComments: boolean,
+      // The Comment's unique ID
+      id: string,
+      // The Comment's signed global id
+      sgid: string,
+      // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+      type: string,
+      // The comment message
+      body: string,
+      // The creation date of the comment
+      createdAt: string,
+      // The comment's author
+      author: ( {
+          // The author's name
+          name: string,
+          // The author's avatar url
+          avatarUrl: string,
+          // Whether the author is verified or not
+          isVerified: boolean,
+          // Whether the author is a user or another kind of author (User Group)
+          isUser: boolean,
+          // Whether the author's account has been deleted or not
+          deleted: boolean,
+        } | {
+          // The author's name
+          name: string,
+          // The author's avatar url
+          avatarUrl: string,
+          // Whether the author is verified or not
+          isVerified: boolean,
+          // Whether the author is a user or another kind of author (User Group)
+          isUser: boolean,
+          // Whether the author's account has been deleted or not
+          deleted: boolean,
+        }
+      ),
+      // Whether the object can have new comments or not
+      acceptsNewComments: boolean,
+      // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+      alignment: number | null,
+      // Check if the current user has reported the comment
+      alreadyReported: boolean,
+      // The number of comment's upVotes
+      upVotes: number,
+      // Check if the current user has upvoted the comment
+      upVoted: boolean,
+      // Check if the current user has downvoted the comment
+      downVoted: boolean,
+      // The number of comment's downVotes
+      downVotes: number,
+      comments:  Array< {
+        // The Comment's unique ID
+        id: string,
+        // The Comment's signed global id
+        sgid: string,
+        // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+        type: string,
+        // The comment message
+        body: string,
+        // The creation date of the comment
+        createdAt: string,
+        // The comment's author
+        author: ( {
+            // The author's name
+            name: string,
+            // The author's avatar url
+            avatarUrl: string,
+            // Whether the author is verified or not
+            isVerified: boolean,
+            // Whether the author is a user or another kind of author (User Group)
+            isUser: boolean,
+            // Whether the author's account has been deleted or not
+            deleted: boolean,
+          } | {
+            // The author's name
+            name: string,
+            // The author's avatar url
+            avatarUrl: string,
+            // Whether the author is verified or not
+            isVerified: boolean,
+            // Whether the author is a user or another kind of author (User Group)
+            isUser: boolean,
+            // Whether the author's account has been deleted or not
+            deleted: boolean,
+          }
+        ),
+        // Check if the commentable has comments
+        hasComments: boolean,
+        // Whether the object can have new comments or not
+        acceptsNewComments: boolean,
+        // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+        alignment: number | null,
+        // Check if the current user has reported the comment
+        alreadyReported: boolean,
+        // The number of comment's upVotes
+        upVotes: number,
+        // Check if the current user has upvoted the comment
+        upVoted: boolean,
+        // Check if the current user has downvoted the comment
+        downVoted: boolean,
+        // The number of comment's downVotes
+        downVotes: number,
+        comments:  Array< {
+          // The Comment's unique ID
+          id: string,
+          // The Comment's signed global id
+          sgid: string,
+          // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+          type: string,
+          // The comment message
+          body: string,
+          // The creation date of the comment
+          createdAt: string,
+          // The comment's author
+          author: ( {
+              // The author's name
+              name: string,
+              // The author's avatar url
+              avatarUrl: string,
+              // Whether the author is verified or not
+              isVerified: boolean,
+              // Whether the author is a user or another kind of author (User Group)
+              isUser: boolean,
+              // Whether the author's account has been deleted or not
+              deleted: boolean,
+            } | {
+              // The author's name
+              name: string,
+              // The author's avatar url
+              avatarUrl: string,
+              // Whether the author is verified or not
+              isVerified: boolean,
+              // Whether the author is a user or another kind of author (User Group)
+              isUser: boolean,
+              // Whether the author's account has been deleted or not
+              deleted: boolean,
+            }
+          ),
+          // Check if the commentable has comments
+          hasComments: boolean,
+          // Whether the object can have new comments or not
+          acceptsNewComments: boolean,
+          // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+          alignment: number | null,
+          // Check if the current user has reported the comment
+          alreadyReported: boolean,
+          // The number of comment's upVotes
+          upVotes: number,
+          // Check if the current user has upvoted the comment
+          upVoted: boolean,
+          // Check if the current user has downvoted the comment
+          downVoted: boolean,
+          // The number of comment's downVotes
+          downVotes: number,
+          comments:  Array< {
+            // The Comment's unique ID
+            id: string,
+            // The Comment's signed global id
+            sgid: string,
+            // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+            type: string,
+            // The comment message
+            body: string,
+            // The creation date of the comment
+            createdAt: string,
+            // The comment's author
+            author: ( {
+                // The author's name
+                name: string,
+                // The author's avatar url
+                avatarUrl: string,
+                // Whether the author is verified or not
+                isVerified: boolean,
+                // Whether the author is a user or another kind of author (User Group)
+                isUser: boolean,
+                // Whether the author's account has been deleted or not
+                deleted: boolean,
+              } | {
+                // The author's name
+                name: string,
+                // The author's avatar url
+                avatarUrl: string,
+                // Whether the author is verified or not
+                isVerified: boolean,
+                // Whether the author is a user or another kind of author (User Group)
+                isUser: boolean,
+                // Whether the author's account has been deleted or not
+                deleted: boolean,
+              }
+            ),
+            // Check if the commentable has comments
+            hasComments: boolean,
+            // Whether the object can have new comments or not
+            acceptsNewComments: boolean,
+            // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+            alignment: number | null,
+            // Check if the current user has reported the comment
+            alreadyReported: boolean,
+            // The number of comment's upVotes
+            upVotes: number,
+            // Check if the current user has upvoted the comment
+            upVoted: boolean,
+            // Check if the current user has downvoted the comment
+            downVoted: boolean,
+            // The number of comment's downVotes
+            downVotes: number,
+          } >,
+        } >,
+      } >,
+    } | null,
+  } | null,
+};
 
-export interface DownVoteMutationVariables {
-  id: string;
-}
+export type DownVoteMutationVariables = {
+  id: string,
+};
 
-export interface DownVoteMutation {
+export type DownVoteMutation = {
   // A comment
-  comment: {
-    downVote: CommentFragment & CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment,
-  } | null;
-}
+  comment:  {
+    downVote:  {
+      // The Comment's unique ID
+      id: string,
+      // The Comment's signed global id
+      sgid: string,
+      // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+      type: string,
+      // The comment message
+      body: string,
+      // The creation date of the comment
+      createdAt: string,
+      // The comment's author
+      author: ( {
+          // The author's name
+          name: string,
+          // The author's avatar url
+          avatarUrl: string,
+          // Whether the author is verified or not
+          isVerified: boolean,
+          // Whether the author is a user or another kind of author (User Group)
+          isUser: boolean,
+          // Whether the author's account has been deleted or not
+          deleted: boolean,
+        } | {
+          // The author's name
+          name: string,
+          // The author's avatar url
+          avatarUrl: string,
+          // Whether the author is verified or not
+          isVerified: boolean,
+          // Whether the author is a user or another kind of author (User Group)
+          isUser: boolean,
+          // Whether the author's account has been deleted or not
+          deleted: boolean,
+        }
+      ),
+      // Check if the commentable has comments
+      hasComments: boolean,
+      // Whether the object can have new comments or not
+      acceptsNewComments: boolean,
+      // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+      alignment: number | null,
+      // Check if the current user has reported the comment
+      alreadyReported: boolean,
+      // The number of comment's upVotes
+      upVotes: number,
+      // Check if the current user has upvoted the comment
+      upVoted: boolean,
+      // Check if the current user has downvoted the comment
+      downVoted: boolean,
+      // The number of comment's downVotes
+      downVotes: number,
+      comments:  Array< {
+        // The Comment's unique ID
+        id: string,
+        // The Comment's signed global id
+        sgid: string,
+        // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+        type: string,
+        // The comment message
+        body: string,
+        // The creation date of the comment
+        createdAt: string,
+        // The comment's author
+        author: ( {
+            // The author's name
+            name: string,
+            // The author's avatar url
+            avatarUrl: string,
+            // Whether the author is verified or not
+            isVerified: boolean,
+            // Whether the author is a user or another kind of author (User Group)
+            isUser: boolean,
+            // Whether the author's account has been deleted or not
+            deleted: boolean,
+          } | {
+            // The author's name
+            name: string,
+            // The author's avatar url
+            avatarUrl: string,
+            // Whether the author is verified or not
+            isVerified: boolean,
+            // Whether the author is a user or another kind of author (User Group)
+            isUser: boolean,
+            // Whether the author's account has been deleted or not
+            deleted: boolean,
+          }
+        ),
+        // Check if the commentable has comments
+        hasComments: boolean,
+        // Whether the object can have new comments or not
+        acceptsNewComments: boolean,
+        // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+        alignment: number | null,
+        // Check if the current user has reported the comment
+        alreadyReported: boolean,
+        // The number of comment's upVotes
+        upVotes: number,
+        // Check if the current user has upvoted the comment
+        upVoted: boolean,
+        // Check if the current user has downvoted the comment
+        downVoted: boolean,
+        // The number of comment's downVotes
+        downVotes: number,
+        comments:  Array< {
+          // The Comment's unique ID
+          id: string,
+          // The Comment's signed global id
+          sgid: string,
+          // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+          type: string,
+          // The comment message
+          body: string,
+          // The creation date of the comment
+          createdAt: string,
+          // The comment's author
+          author: ( {
+              // The author's name
+              name: string,
+              // The author's avatar url
+              avatarUrl: string,
+              // Whether the author is verified or not
+              isVerified: boolean,
+              // Whether the author is a user or another kind of author (User Group)
+              isUser: boolean,
+              // Whether the author's account has been deleted or not
+              deleted: boolean,
+            } | {
+              // The author's name
+              name: string,
+              // The author's avatar url
+              avatarUrl: string,
+              // Whether the author is verified or not
+              isVerified: boolean,
+              // Whether the author is a user or another kind of author (User Group)
+              isUser: boolean,
+              // Whether the author's account has been deleted or not
+              deleted: boolean,
+            }
+          ),
+          // Check if the commentable has comments
+          hasComments: boolean,
+          // Whether the object can have new comments or not
+          acceptsNewComments: boolean,
+          // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+          alignment: number | null,
+          // Check if the current user has reported the comment
+          alreadyReported: boolean,
+          // The number of comment's upVotes
+          upVotes: number,
+          // Check if the current user has upvoted the comment
+          upVoted: boolean,
+          // Check if the current user has downvoted the comment
+          downVoted: boolean,
+          // The number of comment's downVotes
+          downVotes: number,
+          comments:  Array< {
+            // The Comment's unique ID
+            id: string,
+            // The Comment's signed global id
+            sgid: string,
+            // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+            type: string,
+            // The comment message
+            body: string,
+            // The creation date of the comment
+            createdAt: string,
+            // The comment's author
+            author: ( {
+                // The author's name
+                name: string,
+                // The author's avatar url
+                avatarUrl: string,
+                // Whether the author is verified or not
+                isVerified: boolean,
+                // Whether the author is a user or another kind of author (User Group)
+                isUser: boolean,
+                // Whether the author's account has been deleted or not
+                deleted: boolean,
+              } | {
+                // The author's name
+                name: string,
+                // The author's avatar url
+                avatarUrl: string,
+                // Whether the author is verified or not
+                isVerified: boolean,
+                // Whether the author is a user or another kind of author (User Group)
+                isUser: boolean,
+                // Whether the author's account has been deleted or not
+                deleted: boolean,
+              }
+            ),
+            // Check if the commentable has comments
+            hasComments: boolean,
+            // Whether the object can have new comments or not
+            acceptsNewComments: boolean,
+            // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+            alignment: number | null,
+            // Check if the current user has reported the comment
+            alreadyReported: boolean,
+            // The number of comment's upVotes
+            upVotes: number,
+            // Check if the current user has upvoted the comment
+            upVoted: boolean,
+            // Check if the current user has downvoted the comment
+            downVoted: boolean,
+            // The number of comment's downVotes
+            downVotes: number,
+          } >,
+        } >,
+      } >,
+    },
+  } | null,
+};
 
-export interface UpVoteMutationVariables {
-  id: string;
-}
+export type UpVoteMutationVariables = {
+  id: string,
+};
 
-export interface UpVoteMutation {
+export type UpVoteMutation = {
   // A comment
-  comment: {
-    upVote: CommentFragment & CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment,
-  } | null;
-}
+  comment:  {
+    upVote:  {
+      // The Comment's unique ID
+      id: string,
+      // The Comment's signed global id
+      sgid: string,
+      // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+      type: string,
+      // The comment message
+      body: string,
+      // The creation date of the comment
+      createdAt: string,
+      // The comment's author
+      author: ( {
+          // The author's name
+          name: string,
+          // The author's avatar url
+          avatarUrl: string,
+          // Whether the author is verified or not
+          isVerified: boolean,
+          // Whether the author is a user or another kind of author (User Group)
+          isUser: boolean,
+          // Whether the author's account has been deleted or not
+          deleted: boolean,
+        } | {
+          // The author's name
+          name: string,
+          // The author's avatar url
+          avatarUrl: string,
+          // Whether the author is verified or not
+          isVerified: boolean,
+          // Whether the author is a user or another kind of author (User Group)
+          isUser: boolean,
+          // Whether the author's account has been deleted or not
+          deleted: boolean,
+        }
+      ),
+      // Check if the commentable has comments
+      hasComments: boolean,
+      // Whether the object can have new comments or not
+      acceptsNewComments: boolean,
+      // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+      alignment: number | null,
+      // Check if the current user has reported the comment
+      alreadyReported: boolean,
+      // The number of comment's upVotes
+      upVotes: number,
+      // Check if the current user has upvoted the comment
+      upVoted: boolean,
+      // Check if the current user has downvoted the comment
+      downVoted: boolean,
+      // The number of comment's downVotes
+      downVotes: number,
+      comments:  Array< {
+        // The Comment's unique ID
+        id: string,
+        // The Comment's signed global id
+        sgid: string,
+        // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+        type: string,
+        // The comment message
+        body: string,
+        // The creation date of the comment
+        createdAt: string,
+        // The comment's author
+        author: ( {
+            // The author's name
+            name: string,
+            // The author's avatar url
+            avatarUrl: string,
+            // Whether the author is verified or not
+            isVerified: boolean,
+            // Whether the author is a user or another kind of author (User Group)
+            isUser: boolean,
+            // Whether the author's account has been deleted or not
+            deleted: boolean,
+          } | {
+            // The author's name
+            name: string,
+            // The author's avatar url
+            avatarUrl: string,
+            // Whether the author is verified or not
+            isVerified: boolean,
+            // Whether the author is a user or another kind of author (User Group)
+            isUser: boolean,
+            // Whether the author's account has been deleted or not
+            deleted: boolean,
+          }
+        ),
+        // Check if the commentable has comments
+        hasComments: boolean,
+        // Whether the object can have new comments or not
+        acceptsNewComments: boolean,
+        // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+        alignment: number | null,
+        // Check if the current user has reported the comment
+        alreadyReported: boolean,
+        // The number of comment's upVotes
+        upVotes: number,
+        // Check if the current user has upvoted the comment
+        upVoted: boolean,
+        // Check if the current user has downvoted the comment
+        downVoted: boolean,
+        // The number of comment's downVotes
+        downVotes: number,
+        comments:  Array< {
+          // The Comment's unique ID
+          id: string,
+          // The Comment's signed global id
+          sgid: string,
+          // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+          type: string,
+          // The comment message
+          body: string,
+          // The creation date of the comment
+          createdAt: string,
+          // The comment's author
+          author: ( {
+              // The author's name
+              name: string,
+              // The author's avatar url
+              avatarUrl: string,
+              // Whether the author is verified or not
+              isVerified: boolean,
+              // Whether the author is a user or another kind of author (User Group)
+              isUser: boolean,
+              // Whether the author's account has been deleted or not
+              deleted: boolean,
+            } | {
+              // The author's name
+              name: string,
+              // The author's avatar url
+              avatarUrl: string,
+              // Whether the author is verified or not
+              isVerified: boolean,
+              // Whether the author is a user or another kind of author (User Group)
+              isUser: boolean,
+              // Whether the author's account has been deleted or not
+              deleted: boolean,
+            }
+          ),
+          // Check if the commentable has comments
+          hasComments: boolean,
+          // Whether the object can have new comments or not
+          acceptsNewComments: boolean,
+          // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+          alignment: number | null,
+          // Check if the current user has reported the comment
+          alreadyReported: boolean,
+          // The number of comment's upVotes
+          upVotes: number,
+          // Check if the current user has upvoted the comment
+          upVoted: boolean,
+          // Check if the current user has downvoted the comment
+          downVoted: boolean,
+          // The number of comment's downVotes
+          downVotes: number,
+          comments:  Array< {
+            // The Comment's unique ID
+            id: string,
+            // The Comment's signed global id
+            sgid: string,
+            // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+            type: string,
+            // The comment message
+            body: string,
+            // The creation date of the comment
+            createdAt: string,
+            // The comment's author
+            author: ( {
+                // The author's name
+                name: string,
+                // The author's avatar url
+                avatarUrl: string,
+                // Whether the author is verified or not
+                isVerified: boolean,
+                // Whether the author is a user or another kind of author (User Group)
+                isUser: boolean,
+                // Whether the author's account has been deleted or not
+                deleted: boolean,
+              } | {
+                // The author's name
+                name: string,
+                // The author's avatar url
+                avatarUrl: string,
+                // Whether the author is verified or not
+                isVerified: boolean,
+                // Whether the author is a user or another kind of author (User Group)
+                isUser: boolean,
+                // Whether the author's account has been deleted or not
+                deleted: boolean,
+              }
+            ),
+            // Check if the commentable has comments
+            hasComments: boolean,
+            // Whether the object can have new comments or not
+            acceptsNewComments: boolean,
+            // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+            alignment: number | null,
+            // Check if the current user has reported the comment
+            alreadyReported: boolean,
+            // The number of comment's upVotes
+            upVotes: number,
+            // Check if the current user has upvoted the comment
+            upVoted: boolean,
+            // Check if the current user has downvoted the comment
+            downVoted: boolean,
+            // The number of comment's downVotes
+            downVotes: number,
+          } >,
+        } >,
+      } >,
+    },
+  } | null,
+};
 
-export interface GetCommentsQueryVariables {
-  commentableId: string;
-  commentableType: string;
-  orderBy: string | null;
-}
+export type GetCommentsQueryVariables = {
+  commentableId: string,
+  commentableType: string,
+  orderBy?: string | null,
+};
 
-export interface GetCommentsQuery {
+export type GetCommentsQuery = {
   // Return's information about the logged in user
-  session: AddCommentFormSessionFragment & {
+  session:  {
     // The current user
-    user: {
+    user:  {
       // The user's name
       name: string,
       // The user's avatar url
@@ -57,104 +690,756 @@ export interface GetCommentsQuery {
       // The user's organization name
       organizationName: string,
     } | null,
-  } | null;
-  commentable: AddCommentFormCommentableFragment & {
+    // The current user verified user groups
+    verifiedUserGroups:  Array< {
+      // The user group's id
+      id: string,
+      // The user group's name
+      name: string,
+    } >,
+  } | null,
+  commentable:  {
     // Whether the object can have new comments or not
     acceptsNewComments: boolean,
     // Whether the object comments have alignment or not
     commentsHaveAlignment: boolean,
     // Whether the object comments have votes or not
     commentsHaveVotes: boolean,
-    comments: Array< CommentThreadFragment & CommentFragment & CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment & {
+    comments:  Array< {
       // The Comment's unique ID
       id: string,
+      // Check if the commentable has comments
+      hasComments: boolean,
+      // The Comment's signed global id
+      sgid: string,
+      // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+      type: string,
+      // The comment message
+      body: string,
+      // The creation date of the comment
+      createdAt: string,
+      // The comment's author
+      author: ( {
+          // The author's name
+          name: string,
+          // The author's avatar url
+          avatarUrl: string,
+          // Whether the author is verified or not
+          isVerified: boolean,
+          // Whether the author is a user or another kind of author (User Group)
+          isUser: boolean,
+          // Whether the author's account has been deleted or not
+          deleted: boolean,
+        } | {
+          // The author's name
+          name: string,
+          // The author's avatar url
+          avatarUrl: string,
+          // Whether the author is verified or not
+          isVerified: boolean,
+          // Whether the author is a user or another kind of author (User Group)
+          isUser: boolean,
+          // Whether the author's account has been deleted or not
+          deleted: boolean,
+        }
+      ),
+      // Whether the object can have new comments or not
+      acceptsNewComments: boolean,
+      // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+      alignment: number | null,
+      // Check if the current user has reported the comment
+      alreadyReported: boolean,
+      // The number of comment's upVotes
+      upVotes: number,
+      // Check if the current user has upvoted the comment
+      upVoted: boolean,
+      // Check if the current user has downvoted the comment
+      downVoted: boolean,
+      // The number of comment's downVotes
+      downVotes: number,
+      comments:  Array< {
+        // The Comment's unique ID
+        id: string,
+        // The Comment's signed global id
+        sgid: string,
+        // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+        type: string,
+        // The comment message
+        body: string,
+        // The creation date of the comment
+        createdAt: string,
+        // The comment's author
+        author: ( {
+            // The author's name
+            name: string,
+            // The author's avatar url
+            avatarUrl: string,
+            // Whether the author is verified or not
+            isVerified: boolean,
+            // Whether the author is a user or another kind of author (User Group)
+            isUser: boolean,
+            // Whether the author's account has been deleted or not
+            deleted: boolean,
+          } | {
+            // The author's name
+            name: string,
+            // The author's avatar url
+            avatarUrl: string,
+            // Whether the author is verified or not
+            isVerified: boolean,
+            // Whether the author is a user or another kind of author (User Group)
+            isUser: boolean,
+            // Whether the author's account has been deleted or not
+            deleted: boolean,
+          }
+        ),
+        // Check if the commentable has comments
+        hasComments: boolean,
+        // Whether the object can have new comments or not
+        acceptsNewComments: boolean,
+        // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+        alignment: number | null,
+        // Check if the current user has reported the comment
+        alreadyReported: boolean,
+        // The number of comment's upVotes
+        upVotes: number,
+        // Check if the current user has upvoted the comment
+        upVoted: boolean,
+        // Check if the current user has downvoted the comment
+        downVoted: boolean,
+        // The number of comment's downVotes
+        downVotes: number,
+        comments:  Array< {
+          // The Comment's unique ID
+          id: string,
+          // The Comment's signed global id
+          sgid: string,
+          // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+          type: string,
+          // The comment message
+          body: string,
+          // The creation date of the comment
+          createdAt: string,
+          // The comment's author
+          author: ( {
+              // The author's name
+              name: string,
+              // The author's avatar url
+              avatarUrl: string,
+              // Whether the author is verified or not
+              isVerified: boolean,
+              // Whether the author is a user or another kind of author (User Group)
+              isUser: boolean,
+              // Whether the author's account has been deleted or not
+              deleted: boolean,
+            } | {
+              // The author's name
+              name: string,
+              // The author's avatar url
+              avatarUrl: string,
+              // Whether the author is verified or not
+              isVerified: boolean,
+              // Whether the author is a user or another kind of author (User Group)
+              isUser: boolean,
+              // Whether the author's account has been deleted or not
+              deleted: boolean,
+            }
+          ),
+          // Check if the commentable has comments
+          hasComments: boolean,
+          // Whether the object can have new comments or not
+          acceptsNewComments: boolean,
+          // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+          alignment: number | null,
+          // Check if the current user has reported the comment
+          alreadyReported: boolean,
+          // The number of comment's upVotes
+          upVotes: number,
+          // Check if the current user has upvoted the comment
+          upVoted: boolean,
+          // Check if the current user has downvoted the comment
+          downVoted: boolean,
+          // The number of comment's downVotes
+          downVotes: number,
+          comments:  Array< {
+            // The Comment's unique ID
+            id: string,
+            // The Comment's signed global id
+            sgid: string,
+            // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+            type: string,
+            // The comment message
+            body: string,
+            // The creation date of the comment
+            createdAt: string,
+            // The comment's author
+            author: ( {
+                // The author's name
+                name: string,
+                // The author's avatar url
+                avatarUrl: string,
+                // Whether the author is verified or not
+                isVerified: boolean,
+                // Whether the author is a user or another kind of author (User Group)
+                isUser: boolean,
+                // Whether the author's account has been deleted or not
+                deleted: boolean,
+              } | {
+                // The author's name
+                name: string,
+                // The author's avatar url
+                avatarUrl: string,
+                // Whether the author is verified or not
+                isVerified: boolean,
+                // Whether the author is a user or another kind of author (User Group)
+                isUser: boolean,
+                // Whether the author's account has been deleted or not
+                deleted: boolean,
+              }
+            ),
+            // Check if the commentable has comments
+            hasComments: boolean,
+            // Whether the object can have new comments or not
+            acceptsNewComments: boolean,
+            // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+            alignment: number | null,
+            // Check if the current user has reported the comment
+            alreadyReported: boolean,
+            // The number of comment's upVotes
+            upVotes: number,
+            // Check if the current user has upvoted the comment
+            upVoted: boolean,
+            // Check if the current user has downvoted the comment
+            downVoted: boolean,
+            // The number of comment's downVotes
+            downVotes: number,
+          } >,
+        } >,
+      } >,
     } >,
-  };
-}
+    // The commentable's ID
+    id: string,
+    // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+    type: string,
+  },
+};
 
-export interface AddCommentFormCommentableFragment {
+export type AddCommentFormCommentableFragment = {
   // The commentable's ID
-  id: string;
+  id: string,
   // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
-  type: string;
-}
+  type: string,
+};
 
-export interface AddCommentFormSessionFragment {
+export type AddCommentFormSessionFragment = {
   // The current user verified user groups
-  verifiedUserGroups: Array< {
+  verifiedUserGroups:  Array< {
     // The user group's id
     id: string,
     // The user group's name
     name: string,
-  } >;
-}
+  } >,
+};
 
-export interface CommentFragment extends CommentDataFragment, UpVoteButtonFragment, DownVoteButtonFragment {
-  comments: Array< CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment & {
-    comments: Array< CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment & {
-      comments: Array<CommentDataFragment & UpVoteButtonFragment & DownVoteButtonFragment>,
+export type CommentFragment = {
+  // The Comment's unique ID
+  id: string,
+  // The Comment's signed global id
+  sgid: string,
+  // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+  type: string,
+  // The comment message
+  body: string,
+  // The creation date of the comment
+  createdAt: string,
+  // The comment's author
+  author: ( {
+      // The author's name
+      name: string,
+      // The author's avatar url
+      avatarUrl: string,
+      // Whether the author is verified or not
+      isVerified: boolean,
+      // Whether the author is a user or another kind of author (User Group)
+      isUser: boolean,
+      // Whether the author's account has been deleted or not
+      deleted: boolean,
+    } | {
+      // The author's name
+      name: string,
+      // The author's avatar url
+      avatarUrl: string,
+      // Whether the author is verified or not
+      isVerified: boolean,
+      // Whether the author is a user or another kind of author (User Group)
+      isUser: boolean,
+      // Whether the author's account has been deleted or not
+      deleted: boolean,
+    }
+  ),
+  // Check if the commentable has comments
+  hasComments: boolean,
+  // Whether the object can have new comments or not
+  acceptsNewComments: boolean,
+  // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+  alignment: number | null,
+  // Check if the current user has reported the comment
+  alreadyReported: boolean,
+  // The number of comment's upVotes
+  upVotes: number,
+  // Check if the current user has upvoted the comment
+  upVoted: boolean,
+  // Check if the current user has downvoted the comment
+  downVoted: boolean,
+  // The number of comment's downVotes
+  downVotes: number,
+  comments:  Array< {
+    // The Comment's unique ID
+    id: string,
+    // The Comment's signed global id
+    sgid: string,
+    // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+    type: string,
+    // The comment message
+    body: string,
+    // The creation date of the comment
+    createdAt: string,
+    // The comment's author
+    author: ( {
+        // The author's name
+        name: string,
+        // The author's avatar url
+        avatarUrl: string,
+        // Whether the author is verified or not
+        isVerified: boolean,
+        // Whether the author is a user or another kind of author (User Group)
+        isUser: boolean,
+        // Whether the author's account has been deleted or not
+        deleted: boolean,
+      } | {
+        // The author's name
+        name: string,
+        // The author's avatar url
+        avatarUrl: string,
+        // Whether the author is verified or not
+        isVerified: boolean,
+        // Whether the author is a user or another kind of author (User Group)
+        isUser: boolean,
+        // Whether the author's account has been deleted or not
+        deleted: boolean,
+      }
+    ),
+    // Check if the commentable has comments
+    hasComments: boolean,
+    // Whether the object can have new comments or not
+    acceptsNewComments: boolean,
+    // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+    alignment: number | null,
+    // Check if the current user has reported the comment
+    alreadyReported: boolean,
+    // The number of comment's upVotes
+    upVotes: number,
+    // Check if the current user has upvoted the comment
+    upVoted: boolean,
+    // Check if the current user has downvoted the comment
+    downVoted: boolean,
+    // The number of comment's downVotes
+    downVotes: number,
+    comments:  Array< {
+      // The Comment's unique ID
+      id: string,
+      // The Comment's signed global id
+      sgid: string,
+      // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+      type: string,
+      // The comment message
+      body: string,
+      // The creation date of the comment
+      createdAt: string,
+      // The comment's author
+      author: ( {
+          // The author's name
+          name: string,
+          // The author's avatar url
+          avatarUrl: string,
+          // Whether the author is verified or not
+          isVerified: boolean,
+          // Whether the author is a user or another kind of author (User Group)
+          isUser: boolean,
+          // Whether the author's account has been deleted or not
+          deleted: boolean,
+        } | {
+          // The author's name
+          name: string,
+          // The author's avatar url
+          avatarUrl: string,
+          // Whether the author is verified or not
+          isVerified: boolean,
+          // Whether the author is a user or another kind of author (User Group)
+          isUser: boolean,
+          // Whether the author's account has been deleted or not
+          deleted: boolean,
+        }
+      ),
+      // Check if the commentable has comments
+      hasComments: boolean,
+      // Whether the object can have new comments or not
+      acceptsNewComments: boolean,
+      // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+      alignment: number | null,
+      // Check if the current user has reported the comment
+      alreadyReported: boolean,
+      // The number of comment's upVotes
+      upVotes: number,
+      // Check if the current user has upvoted the comment
+      upVoted: boolean,
+      // Check if the current user has downvoted the comment
+      downVoted: boolean,
+      // The number of comment's downVotes
+      downVotes: number,
+      comments:  Array< {
+        // The Comment's unique ID
+        id: string,
+        // The Comment's signed global id
+        sgid: string,
+        // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+        type: string,
+        // The comment message
+        body: string,
+        // The creation date of the comment
+        createdAt: string,
+        // The comment's author
+        author: ( {
+            // The author's name
+            name: string,
+            // The author's avatar url
+            avatarUrl: string,
+            // Whether the author is verified or not
+            isVerified: boolean,
+            // Whether the author is a user or another kind of author (User Group)
+            isUser: boolean,
+            // Whether the author's account has been deleted or not
+            deleted: boolean,
+          } | {
+            // The author's name
+            name: string,
+            // The author's avatar url
+            avatarUrl: string,
+            // Whether the author is verified or not
+            isVerified: boolean,
+            // Whether the author is a user or another kind of author (User Group)
+            isUser: boolean,
+            // Whether the author's account has been deleted or not
+            deleted: boolean,
+          }
+        ),
+        // Check if the commentable has comments
+        hasComments: boolean,
+        // Whether the object can have new comments or not
+        acceptsNewComments: boolean,
+        // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+        alignment: number | null,
+        // Check if the current user has reported the comment
+        alreadyReported: boolean,
+        // The number of comment's upVotes
+        upVotes: number,
+        // Check if the current user has upvoted the comment
+        upVoted: boolean,
+        // Check if the current user has downvoted the comment
+        downVoted: boolean,
+        // The number of comment's downVotes
+        downVotes: number,
+      } >,
     } >,
-  } >;
-}
+  } >,
+};
 
-export interface CommentDataFragment extends UpVoteButtonFragment, DownVoteButtonFragment {
+export type CommentDataFragment = {
   // The Comment's unique ID
-  id: string;
+  id: string,
   // The Comment's signed global id
-  sgid: string;
+  sgid: string,
   // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
-  type: string;
+  type: string,
   // The comment message
-  body: string;
+  body: string,
   // The creation date of the comment
-  createdAt: string;
+  createdAt: string,
   // The comment's author
-  author: {
-    // The author's name
-    name: string,
-    // The author's avatar url
-    avatarUrl: string,
-    // Whether the author is verified or not
-    isVerified: boolean,
-    // Whether the author is a user or another kind of author (User Group)
-    isUser: boolean,
-    // Whether the author's account has been deleted or not
-    deleted: boolean,
-  };
+  author: ( {
+      // The author's name
+      name: string,
+      // The author's avatar url
+      avatarUrl: string,
+      // Whether the author is verified or not
+      isVerified: boolean,
+      // Whether the author is a user or another kind of author (User Group)
+      isUser: boolean,
+      // Whether the author's account has been deleted or not
+      deleted: boolean,
+    } | {
+      // The author's name
+      name: string,
+      // The author's avatar url
+      avatarUrl: string,
+      // Whether the author is verified or not
+      isVerified: boolean,
+      // Whether the author is a user or another kind of author (User Group)
+      isUser: boolean,
+      // Whether the author's account has been deleted or not
+      deleted: boolean,
+    }
+  ),
   // Check if the commentable has comments
-  hasComments: boolean;
+  hasComments: boolean,
   // Whether the object can have new comments or not
-  acceptsNewComments: boolean;
+  acceptsNewComments: boolean,
   // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
-  alignment: number | null;
+  alignment: number | null,
   // Check if the current user has reported the comment
-  alreadyReported: boolean;
-}
+  alreadyReported: boolean,
+  // The number of comment's upVotes
+  upVotes: number,
+  // Check if the current user has upvoted the comment
+  upVoted: boolean,
+  // Check if the current user has downvoted the comment
+  downVoted: boolean,
+  // The number of comment's downVotes
+  downVotes: number,
+};
 
-export interface CommentThreadFragment extends CommentFragment, CommentDataFragment, UpVoteButtonFragment, DownVoteButtonFragment {
+export type CommentThreadFragment = {
   // Check if the commentable has comments
-  hasComments: boolean;
-}
+  hasComments: boolean,
+  // The Comment's unique ID
+  id: string,
+  // The Comment's signed global id
+  sgid: string,
+  // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+  type: string,
+  // The comment message
+  body: string,
+  // The creation date of the comment
+  createdAt: string,
+  // The comment's author
+  author: ( {
+      // The author's name
+      name: string,
+      // The author's avatar url
+      avatarUrl: string,
+      // Whether the author is verified or not
+      isVerified: boolean,
+      // Whether the author is a user or another kind of author (User Group)
+      isUser: boolean,
+      // Whether the author's account has been deleted or not
+      deleted: boolean,
+    } | {
+      // The author's name
+      name: string,
+      // The author's avatar url
+      avatarUrl: string,
+      // Whether the author is verified or not
+      isVerified: boolean,
+      // Whether the author is a user or another kind of author (User Group)
+      isUser: boolean,
+      // Whether the author's account has been deleted or not
+      deleted: boolean,
+    }
+  ),
+  // Whether the object can have new comments or not
+  acceptsNewComments: boolean,
+  // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+  alignment: number | null,
+  // Check if the current user has reported the comment
+  alreadyReported: boolean,
+  // The number of comment's upVotes
+  upVotes: number,
+  // Check if the current user has upvoted the comment
+  upVoted: boolean,
+  // Check if the current user has downvoted the comment
+  downVoted: boolean,
+  // The number of comment's downVotes
+  downVotes: number,
+  comments:  Array< {
+    // The Comment's unique ID
+    id: string,
+    // The Comment's signed global id
+    sgid: string,
+    // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+    type: string,
+    // The comment message
+    body: string,
+    // The creation date of the comment
+    createdAt: string,
+    // The comment's author
+    author: ( {
+        // The author's name
+        name: string,
+        // The author's avatar url
+        avatarUrl: string,
+        // Whether the author is verified or not
+        isVerified: boolean,
+        // Whether the author is a user or another kind of author (User Group)
+        isUser: boolean,
+        // Whether the author's account has been deleted or not
+        deleted: boolean,
+      } | {
+        // The author's name
+        name: string,
+        // The author's avatar url
+        avatarUrl: string,
+        // Whether the author is verified or not
+        isVerified: boolean,
+        // Whether the author is a user or another kind of author (User Group)
+        isUser: boolean,
+        // Whether the author's account has been deleted or not
+        deleted: boolean,
+      }
+    ),
+    // Check if the commentable has comments
+    hasComments: boolean,
+    // Whether the object can have new comments or not
+    acceptsNewComments: boolean,
+    // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+    alignment: number | null,
+    // Check if the current user has reported the comment
+    alreadyReported: boolean,
+    // The number of comment's upVotes
+    upVotes: number,
+    // Check if the current user has upvoted the comment
+    upVoted: boolean,
+    // Check if the current user has downvoted the comment
+    downVoted: boolean,
+    // The number of comment's downVotes
+    downVotes: number,
+    comments:  Array< {
+      // The Comment's unique ID
+      id: string,
+      // The Comment's signed global id
+      sgid: string,
+      // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+      type: string,
+      // The comment message
+      body: string,
+      // The creation date of the comment
+      createdAt: string,
+      // The comment's author
+      author: ( {
+          // The author's name
+          name: string,
+          // The author's avatar url
+          avatarUrl: string,
+          // Whether the author is verified or not
+          isVerified: boolean,
+          // Whether the author is a user or another kind of author (User Group)
+          isUser: boolean,
+          // Whether the author's account has been deleted or not
+          deleted: boolean,
+        } | {
+          // The author's name
+          name: string,
+          // The author's avatar url
+          avatarUrl: string,
+          // Whether the author is verified or not
+          isVerified: boolean,
+          // Whether the author is a user or another kind of author (User Group)
+          isUser: boolean,
+          // Whether the author's account has been deleted or not
+          deleted: boolean,
+        }
+      ),
+      // Check if the commentable has comments
+      hasComments: boolean,
+      // Whether the object can have new comments or not
+      acceptsNewComments: boolean,
+      // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+      alignment: number | null,
+      // Check if the current user has reported the comment
+      alreadyReported: boolean,
+      // The number of comment's upVotes
+      upVotes: number,
+      // Check if the current user has upvoted the comment
+      upVoted: boolean,
+      // Check if the current user has downvoted the comment
+      downVoted: boolean,
+      // The number of comment's downVotes
+      downVotes: number,
+      comments:  Array< {
+        // The Comment's unique ID
+        id: string,
+        // The Comment's signed global id
+        sgid: string,
+        // The commentable's class name. i.e. `Decidim::ParticipatoryProcess`
+        type: string,
+        // The comment message
+        body: string,
+        // The creation date of the comment
+        createdAt: string,
+        // The comment's author
+        author: ( {
+            // The author's name
+            name: string,
+            // The author's avatar url
+            avatarUrl: string,
+            // Whether the author is verified or not
+            isVerified: boolean,
+            // Whether the author is a user or another kind of author (User Group)
+            isUser: boolean,
+            // Whether the author's account has been deleted or not
+            deleted: boolean,
+          } | {
+            // The author's name
+            name: string,
+            // The author's avatar url
+            avatarUrl: string,
+            // Whether the author is verified or not
+            isVerified: boolean,
+            // Whether the author is a user or another kind of author (User Group)
+            isUser: boolean,
+            // Whether the author's account has been deleted or not
+            deleted: boolean,
+          }
+        ),
+        // Check if the commentable has comments
+        hasComments: boolean,
+        // Whether the object can have new comments or not
+        acceptsNewComments: boolean,
+        // The comment's alignment. Can be 0 (neutral), 1 (in favor) or -1 (against)'
+        alignment: number | null,
+        // Check if the current user has reported the comment
+        alreadyReported: boolean,
+        // The number of comment's upVotes
+        upVotes: number,
+        // Check if the current user has upvoted the comment
+        upVoted: boolean,
+        // Check if the current user has downvoted the comment
+        downVoted: boolean,
+        // The number of comment's downVotes
+        downVotes: number,
+      } >,
+    } >,
+  } >,
+};
 
-export interface DownVoteButtonFragment {
+export type DownVoteButtonFragment = {
   // The Comment's unique ID
-  id: string;
+  id: string,
   // The number of comment's downVotes
-  downVotes: number;
+  downVotes: number,
   // Check if the current user has downvoted the comment
-  downVoted: boolean;
+  downVoted: boolean,
   // Check if the current user has upvoted the comment
-  upVoted: boolean;
-}
+  upVoted: boolean,
+};
 
-export interface UpVoteButtonFragment {
+export type UpVoteButtonFragment = {
   // The Comment's unique ID
-  id: string;
+  id: string,
   // The number of comment's upVotes
-  upVotes: number;
+  upVotes: number,
   // Check if the current user has upvoted the comment
-  upVoted: boolean;
+  upVoted: boolean,
   // Check if the current user has downvoted the comment
-  downVoted: boolean;
-}
+  downVoted: boolean,
+};
 /* tslint:enable */