From 3205c71522bf29574abd07deb0fe6861cc8a1439 Mon Sep 17 00:00:00 2001
From: annakovarskaya <annakovarskaya85@gmail.com>
Date: Sun, 11 Mar 2018 17:45:10 +0000
Subject: [PATCH 1/3] home task 4.2

---
 src/components/filters/select.js | 16 +++++++++-------
 src/reducer/articles.js          | 10 ++++++++--
 src/selectors/index.js           | 17 ++++++++++-------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/components/filters/select.js b/src/components/filters/select.js
index 1a91857..139056e 100644
--- a/src/components/filters/select.js
+++ b/src/components/filters/select.js
@@ -8,18 +8,20 @@ import 'react-select/dist/react-select.css'
 
 class SelectFilter extends Component {
     static propTypes = {
-        articles: PropTypes.array.isRequired
+        articles: PropTypes.object.isRequired
     };
 
     handleChange = selected => this.props.changeSelection(selected.map(option => option.value))
 
     render() {
         const { articles, selected } = this.props
-        const options = articles.map(article => ({
-            label: article.title,
-            value: article.id
-        }))
-
+        const options = [];
+        for(var id in articles) {
+          options.push({
+              label: articles[id].title,
+              value: id
+          })
+        }
         return <Select
             options={options}
             value={selected}
@@ -32,4 +34,4 @@ class SelectFilter extends Component {
 export default connect(state => ({
     selected: state.filters.selected,
     articles: state.articles
-}), { changeSelection })(SelectFilter)
\ No newline at end of file
+}), { changeSelection })(SelectFilter)
diff --git a/src/reducer/articles.js b/src/reducer/articles.js
index 1c2e629..4621f34 100644
--- a/src/reducer/articles.js
+++ b/src/reducer/articles.js
@@ -1,6 +1,12 @@
-import { normalizedArticles as defaultArticles } from '../fixtures'
+import { normalizedArticles } from '../fixtures'
 import { DELETE_ARTICLE } from '../constants'
 
+const defaultArticles = normalizedArticles.reduce((acc, article) => ({
+    ...acc,
+    [article.id]: article
+})
+, {})
+
 export default (articlesState = defaultArticles, action) => {
     const { type, payload } = action
 
@@ -11,4 +17,4 @@ export default (articlesState = defaultArticles, action) => {
         default:
             return articlesState
     }
-}
\ No newline at end of file
+}
diff --git a/src/selectors/index.js b/src/selectors/index.js
index d503ae7..f469583 100644
--- a/src/selectors/index.js
+++ b/src/selectors/index.js
@@ -8,12 +8,15 @@ const idSelector = (_, props) => props.id
 export const filtratedArticles = createSelector(articleListSelector, filtersSelector, (articles, filters) => {
     const {selected, dateRange: {from, to}} = filters
     console.log('---', 'recomputing filtration')
-
-    return articles.filter(article => {
-        const published = Date.parse(article.date)
-        return (!selected.length || selected.includes(article.id)) &&
-            (!from || !to || (published > from && published < to))
-    })
+    let filtratedArticlesArray = []
+    for (const id in articles){
+      const published = Date.parse(articles[id].date)
+      if ((!selected.length || selected.includes(articles[id])) &&
+          (!from || !to || (published > from && published < to))) {
+              filtratedArticlesArray.push(articles[id])
+          }
+    }
+    return filtratedArticlesArray
 })
 
-export const createCommentSelector = () => createSelector(commentsSelector, idSelector, (comments, id) => comments[id])
\ No newline at end of file
+export const createCommentSelector = () => createSelector(commentsSelector, idSelector, (comments, id) => comments[id])

From 06371786770836cc733059ed66a245ca596787fb Mon Sep 17 00:00:00 2001
From: annakovarskaya <annakovarskaya85@gmail.com>
Date: Sun, 11 Mar 2018 18:42:45 +0000
Subject: [PATCH 2/3] fixed ht 4.2

---
 src/reducer/articles.js | 4 +++-
 src/selectors/index.js  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/reducer/articles.js b/src/reducer/articles.js
index 4621f34..14e8970 100644
--- a/src/reducer/articles.js
+++ b/src/reducer/articles.js
@@ -12,7 +12,9 @@ export default (articlesState = defaultArticles, action) => {
 
     switch (type) {
         case DELETE_ARTICLE:
-            return articlesState.filter(article => article.id !== payload.id)
+            const articlesStateObj = articlesState
+            delete articlesStateObj[payload.id]
+            return articlesStateObj
 
         default:
             return articlesState
diff --git a/src/selectors/index.js b/src/selectors/index.js
index f469583..cc31b12 100644
--- a/src/selectors/index.js
+++ b/src/selectors/index.js
@@ -9,9 +9,10 @@ export const filtratedArticles = createSelector(articleListSelector, filtersSele
     const {selected, dateRange: {from, to}} = filters
     console.log('---', 'recomputing filtration')
     let filtratedArticlesArray = []
+    debugger;
     for (const id in articles){
       const published = Date.parse(articles[id].date)
-      if ((!selected.length || selected.includes(articles[id])) &&
+      if ((!selected.length || selected.includes(id)) &&
           (!from || !to || (published > from && published < to))) {
               filtratedArticlesArray.push(articles[id])
           }

From 554b401800fc56cd133a0dcc79d95b10de515bdf Mon Sep 17 00:00:00 2001
From: annakovarskaya <annakovarskaya85@gmail.com>
Date: Sun, 11 Mar 2018 20:06:25 +0000
Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D0=BE=20=D0=BD=D0=B0=D0=B6=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B8=D1=8E=20=D0=BD=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF?=
 =?UTF-8?q?=D0=BA=D1=83=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0?=
 =?UTF-8?q?=20=D0=B2=20=D0=BC=D0=B8=D0=B4=D0=BB=D0=B2=D0=B0=D1=80=D0=B5=20?=
 =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B8=D1=82=D1=81=D1=8F=20id,=20?=
 =?UTF-8?q?=D0=B2=20=D1=81=D1=82=D0=BE=D1=80=D0=B5=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=20=D1=81=20=D1=8D=D1=82=D0=B8=D0=BC=20?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=B4=D0=B8,=20=D0=B8=20=D0=B0=D0=B9=D0=B4=D0=B8?=
 =?UTF-8?q?=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=D1=81?=
 =?UTF-8?q?=D1=8F=20=D0=B2=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D1=81=D0=BE?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=81=D1=82=D0=B2=D1=83=D1=8E?=
 =?UTF-8?q?=D1=89=D0=B5=D0=B9=20=D1=81=D1=82=D0=B0=D1=82=D1=8C=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D1=81=D1=82=D0=BE=D1=80=D0=B5.=20=D0=9F=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B7=D0=BE=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B0=D1=81=D1=8C,=20=D0=BA=D0=B0=D0=BA=20=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D1=8F=D1=82=D1=8C=20=D1=81=D0=BF?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BE=D0=BA=20=D0=BA=D0=BE=D0=BC=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=86=D0=B5=20=D0=BF=D1=80=D0=B8=20=D0=BE=D0=B1=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D1=81=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AC/index.js                      |  9 ++++++++-
 src/components/article/index.js      | 12 ++++++++++--
 src/components/comment-list/index.js | 15 +++++++++++++--
 src/constants/index.js               |  3 ++-
 src/middlewares/generateId.js        |  4 ++++
 src/reducer/articles.js              |  9 +++++++--
 src/reducer/comments.js              | 15 +++++++++++++--
 src/store/index.js                   |  5 +++--
 8 files changed, 60 insertions(+), 12 deletions(-)
 create mode 100644 src/middlewares/generateId.js

diff --git a/src/AC/index.js b/src/AC/index.js
index dda2dd6..235100d 100644
--- a/src/AC/index.js
+++ b/src/AC/index.js
@@ -1,4 +1,4 @@
-import {INCREMENT, DELETE_ARTICLE, CHANGE_DATE_RANGE, CHANGE_SELECTION} from '../constants'
+import {INCREMENT, DELETE_ARTICLE, CHANGE_DATE_RANGE, CHANGE_SELECTION, ADD_COMMENT} from '../constants'
 
 export function increment() {
     return {
@@ -26,3 +26,10 @@ export function changeSelection(selected) {
         payload: { selected }
     }
 }
+
+export function addComment(comment, user, articleId) {
+    return {
+        type: ADD_COMMENT,
+        payload: { comment, user, articleId }
+    }
+}
diff --git a/src/components/article/index.js b/src/components/article/index.js
index 96261d8..32fe613 100644
--- a/src/components/article/index.js
+++ b/src/components/article/index.js
@@ -4,6 +4,8 @@ import CSSTransition from 'react-addons-css-transition-group'
 import { connect } from 'react-redux'
 import CommentList from '../comment-list'
 import { deleteArticle } from '../../AC'
+import { articleListSelector } from '../../selectors'
+
 import './style.css'
 
 class Article extends PureComponent {
@@ -58,7 +60,7 @@ function getBody(article) {
     return (
         <section className = "test__article--body">
             {article.text}
-            <CommentList comments={article.comments}/>
+            <CommentList comments={article.comments} articleId={article.id} />
         </section>
     )
 }
@@ -73,4 +75,10 @@ Article.propTypes = {
     onButtonClick: PropTypes.func
 }
 
-export default connect(null, { deleteArticle })(Article)
\ No newline at end of file
+export default connect(/*state => {
+    console.log('---', 'article connect')
+    console.log(this.props)
+    return {
+        article: articleListSelector(state)
+    }
+}*/null, { deleteArticle })(Article)
diff --git a/src/components/comment-list/index.js b/src/components/comment-list/index.js
index 91c4f08..7845b82 100644
--- a/src/components/comment-list/index.js
+++ b/src/components/comment-list/index.js
@@ -3,13 +3,15 @@ import PropTypes from 'prop-types'
 import CSSTransition from 'react-addons-css-transition-group'
 import Comment from '../comment'
 import toggleOpen from '../../decorators/toggleOpen'
+import { connect } from 'react-redux'
+import { addComment } from '../../AC'
 import './style.css'
 
 class CommentList extends Component {
     static defaultProps = {
         comments: []
     }
-
+addComment
     static propTypes = {
         comments: PropTypes.array.isRequired,
         //from toggleOpen decorator
@@ -51,6 +53,7 @@ class CommentList extends Component {
 
     getComments() {
         return (
+          <div>
             <ul>
                 {
                     this.props.comments.map(id =>
@@ -59,9 +62,17 @@ class CommentList extends Component {
                         </li>)
                 }
             </ul>
+            <button onClick = {this.handleAdd}>
+                add comment
+            </button>
+          </div>
         )
     }
+    handleAdd = () => {
+        const { addComment, comment, user, articleId } = this.props
+        addComment('comment', 'user', articleId)
+    }
 }
 
 
-export default toggleOpen(CommentList)
\ No newline at end of file
+export default connect(null, { addComment })(toggleOpen(CommentList))
diff --git a/src/constants/index.js b/src/constants/index.js
index a2f0a80..85c7c5b 100644
--- a/src/constants/index.js
+++ b/src/constants/index.js
@@ -3,4 +3,5 @@ export const INCREMENT = 'INCREMENT'
 export const DELETE_ARTICLE = 'DELETE_ARTICLE'
 
 export const CHANGE_SELECTION = 'CHANGE_SELECTION'
-export const CHANGE_DATE_RANGE = 'CHANGE_DATE_RANGE'
\ No newline at end of file
+export const CHANGE_DATE_RANGE = 'CHANGE_DATE_RANGE'
+export const ADD_COMMENT = 'ADD_COMMENT'
diff --git a/src/middlewares/generateId.js b/src/middlewares/generateId.js
new file mode 100644
index 0000000..7f84249
--- /dev/null
+++ b/src/middlewares/generateId.js
@@ -0,0 +1,4 @@
+export default store => next => action => {
+    if (action.type === 'ADD_COMMENT') action.payload.id = Math.random().toString(36).substring(7);
+    next(action);
+}
diff --git a/src/reducer/articles.js b/src/reducer/articles.js
index 14e8970..33adaa4 100644
--- a/src/reducer/articles.js
+++ b/src/reducer/articles.js
@@ -1,5 +1,5 @@
 import { normalizedArticles } from '../fixtures'
-import { DELETE_ARTICLE } from '../constants'
+import { DELETE_ARTICLE, ADD_COMMENT } from '../constants'
 
 const defaultArticles = normalizedArticles.reduce((acc, article) => ({
     ...acc,
@@ -9,10 +9,15 @@ const defaultArticles = normalizedArticles.reduce((acc, article) => ({
 
 export default (articlesState = defaultArticles, action) => {
     const { type, payload } = action
+    let articlesStateObj;
 
     switch (type) {
+      case ADD_COMMENT:
+          articlesStateObj = articlesState
+          articlesStateObj[payload.articleId].comments.push(payload.id)
+          return articlesStateObj
         case DELETE_ARTICLE:
-            const articlesStateObj = articlesState
+            articlesStateObj = articlesState
             delete articlesStateObj[payload.id]
             return articlesStateObj
 
diff --git a/src/reducer/comments.js b/src/reducer/comments.js
index 0bd398a..4d3177b 100644
--- a/src/reducer/comments.js
+++ b/src/reducer/comments.js
@@ -1,5 +1,6 @@
 import {} from '../constants'
 import { normalizedComments } from '../fixtures'
+import { ADD_COMMENT } from '../constants'
 
 const defaultComments = normalizedComments.reduce((acc, comment) => ({
     ...acc,
@@ -8,11 +9,21 @@ const defaultComments = normalizedComments.reduce((acc, comment) => ({
 , {})
 
 export default (commentsState = defaultComments, action) => {
-    const {type} = action
+    const {type, payload} = action
+    let newCommentsState={};
 
     switch (type) {
 
+      case ADD_COMMENT:
+          debugger;
+          newCommentsState = commentsState
+          newCommentsState[payload.id] = {
+            id: payload.id,
+            user: payload.user,
+            text: payload.comment
+          }
+          return newCommentsState
         default:
             return commentsState
     }
-}
\ No newline at end of file
+}
diff --git a/src/store/index.js b/src/store/index.js
index e3ddcc8..8e1218e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,12 +1,13 @@
 import { createStore, applyMiddleware } from 'redux'
 import reducer from '../reducer'
 import logger from '../middlewares/logger'
+import generateId from '../middlewares/generateId'
 
-const enhancer = applyMiddleware(logger)
+const enhancer = applyMiddleware(logger, generateId)
 
 const store = createStore(reducer, enhancer)
 
 //dev only, no need in prod
 window.store = store
 
-export default store
\ No newline at end of file
+export default store