decidim-comments 0.0.6 → 0.0.7

data/app/frontend/support/schema.ts

@@ -0,0 +1,119 @@
+//  This file was automatically generated and should not be edited.
+/* tslint:disable */
+
+export interface AddCommentMutationVariables {
+  commentableId: string;
+  commentableType: string;
+  body: string;
+  alignment: number | null;
+  userGroupId: string | null;
+}
+
+export interface AddCommentMutation {
+  commentable: {
+    addComment: CommentThreadFragment & CommentFragment & CommentDataFragment & UpVoteFragment & DownVoteFragment,
+  } | null;
+}
+
+export interface DownVoteMutationVariables {
+  id: string;
+}
+
+export interface DownVoteMutation {
+  comment: {
+    downVote: CommentFragment & CommentDataFragment & UpVoteFragment & DownVoteFragment,
+  } | null;
+}
+
+export interface UpVoteMutationVariables {
+  id: string;
+}
+
+export interface UpVoteMutation {
+  comment: {
+    upVote: CommentFragment & CommentDataFragment & UpVoteFragment & DownVoteFragment,
+  } | null;
+}
+
+export interface GetCommentsQueryVariables {
+  commentableId: string;
+  commentableType: string;
+  orderBy: string | null;
+}
+
+export interface GetCommentsQuery {
+  session: AddCommentFormSessionFragment & {
+    user: {
+      name: string,
+      avatarUrl: string,
+      organizationName: string,
+    } | null,
+  } | null;
+  commentable: AddCommentFormCommentableFragment & {
+    acceptsNewComments: boolean,
+    commentsHaveAlignment: boolean,
+    commentsHaveVotes: boolean,
+    comments: Array< CommentThreadFragment & CommentFragment & CommentDataFragment & UpVoteFragment & DownVoteFragment & {
+      id: string,
+    } >,
+  };
+}
+
+export interface AddCommentFormCommentableFragment {
+  id: string;
+  type: string;
+}
+
+export interface AddCommentFormSessionFragment {
+  verifiedUserGroups: Array< {
+    id: string,
+    name: string,
+  } >;
+}
+
+export interface CommentDataFragment extends UpVoteFragment, DownVoteFragment {
+  id: string;
+  sgid: string;
+  type: string;
+  body: string;
+  createdAt: string;
+  author: {
+    name: string,
+    avatarUrl: string,
+  };
+  hasComments: boolean;
+  acceptsNewComments: boolean;
+  alignment: number | null;
+  alreadyReported: boolean;
+}
+
+export interface CommentThreadFragment extends CommentFragment, CommentDataFragment, UpVoteFragment, DownVoteFragment {
+  author: {
+    name: string,
+    avatarUrl: string
+  };
+  hasComments: boolean;
+}
+
+export interface CommentFragment extends CommentDataFragment, UpVoteFragment, DownVoteFragment {
+  comments: Array< CommentDataFragment & UpVoteFragment & DownVoteFragment & {
+    comments: Array< CommentDataFragment & UpVoteFragment & DownVoteFragment & {
+      comments: Array<CommentDataFragment & UpVoteFragment & DownVoteFragment>,
+    } >,
+  } >;
+}
+
+export interface DownVoteFragment {
+  id: string;
+  downVotes: number;
+  downVoted: boolean;
+  upVoted: boolean;
+}
+
+export interface UpVoteFragment {
+  id: string;
+  upVotes: number;
+  upVoted: boolean;
+  downVoted: boolean;
+}
+/* tslint:enable */

data/config/locales/eu.yml

@@ -1,9 +1,18 @@
 eu:
+  activerecord:
+    errors:
+      messages:
+        cannot_have_comments: ezin zaio iruzkinik egin
   decidim:
     comments:
       comment_notification_mailer:
+        comment_created:
+          new_comment_html: 'Iruzkin berri bat dago, <b>%{commenter}</b> iruzkingilearena, hemen: <b>%{commentable_link}</b>'
         hello: Kaixo, %{name},
+        manage_email_subscriptions_html: 'Halako mezurik jaso nahi ez baduzu, aldatu konfigurazioa hemen: %{link}.'
         notifications_settings_link: jakinarazpenen konfigurazio-orria
+        reply_created:
+          new_reply_html: 'Iruzkin berri bat dago, <b>%{commenter}</b> iruzkingilearena, hemen: <b>%{commentable_link}</b>'
       mailer:
         comment_notification:
           comment_created:
@@ -12,6 +21,7 @@ eu:
             subject: Zure iruzkinetako bati erantzuna eman diote
     components:
       add_comment_form:
+        account_message: '<a href="%{sign_in_url}">Sartu zure kontuarekin</a> o <a href="%{sign_up_url}">erregistratu</a> zure iruzkina egiteko. '
         form:
           body:
             label: Iruzkina
@@ -19,23 +29,37 @@ eu:
           form_error: Testua behar da, eta ezin du izan %{length} karaktere baino gehiago.
           submit: Bidali
           user_group_id:
-            label: 'Iruzkindu honela:'
+            label: 'Egin iruzkina honako honen gisa:'
         opinion:
           neutral: Neutrala
-        title: Jarri hemen zure iruzkina
+        title: Egin hemen zure iruzkina
       comment:
         alignment:
           against: Aurka
           in_favor: Alde
         reply: Erantzuna
+        report:
+          action: Salatu
+          already_reported: Eduki hau jada salatuta dago, eta administratzaile batek berrikusiko du.
+          close: Itxi
+          description: Eduki hau desegokia da?
+          details: iruzkin gehigarriak
+          reasons:
+            does_not_belong: Bertan badago legez kontrako jardunik, suizidio-mehatxurik, informazio pertsonalik edo beste zernahi, zure ustez %{organization_name}-ri ez dagokionik.
+            offensive: Bertan badago arrazakeriarik, sexismorik, irainik, eraso pertsonalik, heriotza-mehatxurik, suizidio-eskaerarik edo beste edozein eratako gorroto-diskurtsorik.
+            spam: Bertan badago clickbait-ik, publizitaterik edo iruzurrik.
+          title: Salatu arazo bat
       comment_order_selector:
         order:
-          best_rated: Balorazio hoberena
+          best_rated: Balorazio hoberenak
           most_discussed: Eztabaidatuenak
-          older: Zaharrena
-          recent: Berri-berria
+          older: Zaharrenak
+          recent: Berrienak
         title: 'Ordenatu honen arabera:'
+      comment_thread:
+        title: 'Solasaldia honekin: %{authorName}'
       comments:
+        blocked_comments_warning: Oraingo faseko iruzkinak desaktibatuta daude, baina aurreko faseetako iruzkinak irakur ditzakezu.
         loading: Iruzkinak kargatzen...
         title: "%{count} iruzkin"
       featured_comment:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -86,50 +86,48 @@ files:
 - app/commands/decidim/comments/create_comment.rb
 - app/commands/decidim/comments/vote_comment.rb
 - app/forms/decidim/comments/comment_form.rb
-- app/frontend/application/apollo_client.js
-- app/frontend/application/application.component.jsx
-- app/frontend/application/application.component.test.jsx
-- app/frontend/application/icon.component.jsx
-- app/frontend/application/icon.component.test.jsx
-- app/frontend/comments/add_comment_form.component.jsx
-- app/frontend/comments/add_comment_form.component.test.jsx
-- app/frontend/comments/add_comment_form.mutation.graphql
-- app/frontend/comments/add_comment_form_commentable.fragment.graphql
-- app/frontend/comments/add_comment_form_session.fragment.graphql
-- app/frontend/comments/comment.component.jsx
-- app/frontend/comments/comment.component.test.jsx
-- app/frontend/comments/comment.fragment.graphql
-- app/frontend/comments/comment_data.fragment.graphql
-- app/frontend/comments/comment_order_selector.component.jsx
-- app/frontend/comments/comment_order_selector.component.test.jsx
-- app/frontend/comments/comment_thread.component.jsx
-- app/frontend/comments/comment_thread.component.test.jsx
-- app/frontend/comments/comment_thread.fragment.graphql
-- app/frontend/comments/comments.component.jsx
-- app/frontend/comments/comments.component.test.jsx
-- app/frontend/comments/comments.query.graphql
-- app/frontend/comments/down_vote.fragment.graphql
-- app/frontend/comments/down_vote.mutation.graphql
-- app/frontend/comments/down_vote_button.component.jsx
-- app/frontend/comments/down_vote_button.component.test.jsx
-- app/frontend/comments/featured_comment.component.jsx
-- app/frontend/comments/featured_comment.component.test.jsx
-- app/frontend/comments/up_vote.fragment.graphql
-- app/frontend/comments/up_vote.mutation.graphql
-- app/frontend/comments/up_vote_button.component.jsx
-- app/frontend/comments/up_vote_button.component.test.jsx
-- app/frontend/comments/vote_button.component.jsx
-- app/frontend/comments/vote_button_component.test.jsx
-- app/frontend/entry.js
-- app/frontend/entry.test.js
-- app/frontend/support/asset_url.js
-- app/frontend/support/generate_comments_data.js
-- app/frontend/support/generate_user_data.js
-- app/frontend/support/generate_user_group_data.js
-- app/frontend/support/load_translations.js
-- app/frontend/support/require_all.js
-- app/frontend/support/resolve_graphql_query.js
-- app/frontend/support/stub_component.js
+- app/frontend/application/apollo_client.ts
+- app/frontend/application/application.component.test.tsx
+- app/frontend/application/application.component.tsx
+- app/frontend/application/icon.component.test.tsx
+- app/frontend/application/icon.component.tsx
+- app/frontend/comments/add_comment_form.component.test.tsx
+- app/frontend/comments/add_comment_form.component.tsx
+- app/frontend/comments/comment.component.test.tsx
+- app/frontend/comments/comment.component.tsx
+- app/frontend/comments/comment_order_selector.component.test.tsx
+- app/frontend/comments/comment_order_selector.component.tsx
+- app/frontend/comments/comment_thread.component.test.tsx
+- app/frontend/comments/comment_thread.component.tsx
+- app/frontend/comments/comments.component.test.tsx
+- app/frontend/comments/comments.component.tsx
+- app/frontend/comments/down_vote_button.component.test.tsx
+- app/frontend/comments/down_vote_button.component.tsx
+- app/frontend/comments/up_vote_button.component.test.tsx
+- app/frontend/comments/up_vote_button.component.tsx
+- app/frontend/comments/vote_button.component.tsx
+- app/frontend/comments/vote_button_component.test.tsx
+- app/frontend/entry.ts
+- app/frontend/fragments/add_comment_form_commentable.fragment.graphql
+- app/frontend/fragments/add_comment_form_session.fragment.graphql
+- app/frontend/fragments/comment.fragment.graphql
+- app/frontend/fragments/comment_data.fragment.graphql
+- app/frontend/fragments/comment_thread.fragment.graphql
+- app/frontend/fragments/down_vote_button.fragment.graphql
+- app/frontend/fragments/up_vote_button.fragment.graphql
+- app/frontend/mutations/add_comment.mutation.graphql
+- app/frontend/mutations/down_vote.mutation.graphql
+- app/frontend/mutations/up_vote.mutation.graphql
+- app/frontend/queries/comments.query.graphql
+- app/frontend/support/asset_url.ts
+- app/frontend/support/generate_comments_data.ts
+- app/frontend/support/generate_user_data.ts
+- app/frontend/support/generate_user_group_data.ts
+- app/frontend/support/graphql_transformer.js
+- app/frontend/support/load_translations.ts
+- app/frontend/support/require_all.ts
+- app/frontend/support/resolve_graphql_query.ts
+- app/frontend/support/schema.ts
 - app/mailers/decidim/comments/comment_notification_mailer.rb
 - app/models/decidim/comments/abilities/admin_user.rb
 - app/models/decidim/comments/abilities/process_admin_user.rb
@@ -188,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Pluggable comments system for some components.

data/app/frontend/application/application.component.jsx

@@ -1,37 +0,0 @@
-import { Component, PropTypes } from 'react';
-import { ApolloProvider }       from 'react-apollo';
-import { I18n }                 from 'react-i18nify';
-import moment                   from 'moment';
-
-import apolloClient             from './apollo_client';
-
-/**
- * Wrapper component for all React applications using Apollo
- * @class
- * @augments Component
- */
-export default class Application extends Component {
-  constructor(props) {
-    const { locale } = props;
-
-    I18n.setLocale(locale);
-    moment.locale(locale);
-
-    super(props);
-  }
-
-  render() {
-    const { children } = this.props;
-
-    return (
-      <ApolloProvider client={apolloClient}>
-        {children}
-      </ApolloProvider>
-    );
-  }
-}
-
-Application.propTypes = {
-  children: PropTypes.element.isRequired,
-  locale: PropTypes.string.isRequired
-};

data/app/frontend/application/application.component.test.jsx

@@ -1,33 +0,0 @@
-import { shallow } from 'enzyme';
-import { I18n }    from 'react-i18nify';
-import moment      from 'moment';
-
-import Application from './application.component';
-
-describe('<Application />', () => {
-  afterEach(() => {
-    I18n.setLocale('en');
-  });
-
-  it("should set I18n locale to locale prop", () => {
-    sinon.spy(I18n, 'setLocale');
-    const locale = "ca";
-    shallow(
-      <Application locale={locale}>
-        <div>My application</div>
-      </Application>
-    );
-    expect(I18n.setLocale).to.have.been.calledWith(locale);
-  });
-
-  it("should set moment locale to locale prop", () => {
-    sinon.spy(moment, 'locale');
-    const locale = "ca";
-    shallow(
-      <Application locale={locale}>
-        <div>My application</div>
-      </Application>
-    );
-    expect(moment.locale).to.have.been.calledWith(locale);
-  });
-});

data/app/frontend/application/icon.component.jsx

@@ -1,26 +0,0 @@
-import { PropTypes } from 'react';
-
-import assetUrl      from '../support/asset_url';
-
-const Icon = ({ name, iconExtraClassName }) => {
-  if (navigator.userAgent.match(/PhantomJS/)) {
-    return <span className={`icon ${iconExtraClassName} ${name}`}>{name}</span>;
-  }
-
-  return (
-    <svg className={`icon ${iconExtraClassName} ${name}`}>
-      <use xmlnsXlink="http://www.w3.org/1999/xlink" xlinkHref={`${assetUrl('icons.svg')}#${name}`} />
-    </svg>
-  );
-};
-
-Icon.defaultProps = {
-  iconExtraClassName: 'icon--before'
-};
-
-Icon.propTypes = {
-  name: PropTypes.string.isRequired,
-  iconExtraClassName: PropTypes.string.isRequired
-};
-
-export default Icon;

data/app/frontend/application/icon.component.test.jsx

@@ -1,53 +0,0 @@
-import { shallow, mount } from 'enzyme';
-
-import Icon               from './icon.component';
-
-describe("<Icon /", () => {
-  beforeEach(() => {
-    window.DecidimComments = {
-      assets: {
-        'icons.svg': '/assets/icons.svg'
-      }
-    };
-  })
-
-  describe("if navigator user agent is not PhantomJS", () => {
-    let currentNavigator = null;
-
-    beforeEach(() => {
-      currentNavigator = window.navigator;
-      window.navigator = {
-        userAgent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.98 Safari/537.36"
-      };
-    });
-
-    it("should render a svg with class defined by prop className", () => {
-      const wrapper = shallow(<Icon name="icon-thumb-down" />);
-      expect(wrapper.find('svg.icon-thumb-down')).to.be.present();    
-    });
-
-    it("should render a svg icon using the 'icons.svg' url and name", () => {
-      const wrapper = shallow(<Icon name="icon-thumb-up" />);
-      expect(wrapper.find('svg use')).to.have.attr('xlink:href').equal('/assets/icons.svg#icon-thumb-up');
-    });
-
-    afterEach(() => {
-      window.navigator = currentNavigator;
-    });
-  });
-
-  it("should render a simple span with the icon name", () => {
-    const wrapper = shallow(<Icon name="icon-thumb-up" />);
-    expect(wrapper.find('span')).to.have.text('icon-thumb-up');
-  });
-
-  it("should have a default prop iconExtraClassName with value 'icon--before'", () => {
-    const wrapper = mount(<Icon name="icon-thumb-up" />);
-    expect(wrapper).to.have.prop('iconExtraClassName').equal('icon--before');    
-  });
-
-  it("should render the svg with an extra class defined by iconExtraClassName", () => {
-    const wrapper = mount(<Icon name="icon-thumb-up" iconExtraClassName="icon--small" />);
-    expect(wrapper.find('.icon--small')).to.be.present();
-  });
-});