From e1ef14ab7d213876b271404306412a8777ecbb0e Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Sun, 4 Feb 2018 22:26:13 +0500
Subject: [PATCH 1/2] HT5.1 - Normalized articles structure applied

---
 src/components/Article/index.js  | 12 ++++++++++--
 src/components/ArticleList.js    |  8 ++++----
 src/components/CommentList.js    |  4 ++--
 src/components/Filters/Select.js | 10 ++++++----
 src/reducer/articles.js          | 16 ++++++++++++----
 src/selectors/index.js           | 10 ++++++++--
 6 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/src/components/Article/index.js b/src/components/Article/index.js
index a3e834e..12cfa69 100644
--- a/src/components/Article/index.js
+++ b/src/components/Article/index.js
@@ -5,6 +5,7 @@ import CSSTransition from 'react-addons-css-transition-group'
 import {connect} from 'react-redux'
 import CommentList from '../CommentList'
 import {deleteArticle} from '../../AC'
+import {createArticleSelector} from '../../selectors'
 import './style.css'
 
 class Article extends PureComponent {
@@ -85,5 +86,12 @@ class Article extends PureComponent {
 
 }
 
-
-export default connect(null, { deleteArticle })(Article)
\ No newline at end of file
+const createMapStateToProps = () => {
+    const articleSelector = createArticleSelector()
+    return (state, ownProps) => {
+        return {
+            article: articleSelector(state, ownProps)
+        }
+    }
+}
+export default connect(createMapStateToProps, { deleteArticle })(Article)
\ No newline at end of file
diff --git a/src/components/ArticleList.js b/src/components/ArticleList.js
index bc1c261..f306ae6 100644
--- a/src/components/ArticleList.js
+++ b/src/components/ArticleList.js
@@ -10,10 +10,10 @@ class ArticleList extends Accordion {
         console.log('---', 'rerendering article list')
         const {articles} = this.props
         if (!articles.length) return <h3>No Articles</h3>
-        const articleElements = articles.map((article) => <li key={article.id}>
-            <Article article={article}
-                     isOpen={article.id === this.state.openItemId}
-                     toggleOpen={this.toggleOpenItemMemoized(article.id)}
+        const articleElements = articles.map(({id}) => <li key={id}>
+            <Article id={id}
+                     isOpen={id === this.state.openItemId}
+                     toggleOpen={this.toggleOpenItemMemoized(id)}
             />
         </li>)
         return (
diff --git a/src/components/CommentList.js b/src/components/CommentList.js
index 8592d22..86c8704 100644
--- a/src/components/CommentList.js
+++ b/src/components/CommentList.js
@@ -6,7 +6,7 @@ import toggleOpen from '../decorators/toggleOpen'
 
 class CommentList extends Component {
     static propTypes = {
-        comments: PropTypes.array.isRequired,
+        comments: PropTypes.array,//.isRequired,
         //from toggleOpen decorator
         isOpen: PropTypes.bool,
         toggleOpen: PropTypes.func
@@ -24,7 +24,7 @@ class CommentList extends Component {
     }
 
     getBody() {
-        const {comments, isOpen} = this.props
+        const {comments = [], isOpen} = this.props
         if (!isOpen) return null
 
         const body = comments.length ? (
diff --git a/src/components/Filters/Select.js b/src/components/Filters/Select.js
index 1a91857..f49d684 100644
--- a/src/components/Filters/Select.js
+++ b/src/components/Filters/Select.js
@@ -8,16 +8,18 @@ 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
+//        console.log(articles)
+
+        const options = Object.values(articles).map(({title, id}) => ({
+            label: title,
+            value: id
         }))
 
         return <Select
diff --git a/src/reducer/articles.js b/src/reducer/articles.js
index 480a522..4d46ad8 100644
--- a/src/reducer/articles.js
+++ b/src/reducer/articles.js
@@ -1,13 +1,21 @@
 import { DELETE_ARTICLE } from '../constants'
 import {normalizedArticles as defaultArticles} from '../fixtures'
 
-export default (articlesState = defaultArticles, action) => {
-    const { type, payload } = action
+const articlesMap = defaultArticles.reduce((acc, article) => (
+//        article.comments = article.comments || [],
+        {...acc, [article.id]: article}
+    ), {});
+
+export default (articlesState = articlesMap, action) => {
+    const { type, payload } = action;
 
     switch (type) {
         case DELETE_ARTICLE:
-            return articlesState.filter(article => article.id !== payload.id)
+            const newState = {...articlesState};
+            delete newState[payload.id];
+            return newState;
     }
 
     return articlesState
-}
\ No newline at end of file
+}
+
diff --git a/src/selectors/index.js b/src/selectors/index.js
index 4e3172b..2f83d2e 100644
--- a/src/selectors/index.js
+++ b/src/selectors/index.js
@@ -10,13 +10,19 @@ export const createCommentSelector = () => createSelector(commentsSelector, idSe
     return comments[id]
 })
 
+export const createArticleSelector = () => createSelector(articlesSelector, idSelector, (articles, id) => {
+    console.log('---', 'searching for article', id)
+    return articles[id]
+})
+
 export const filtratedArticlesSelector = createSelector(articlesSelector, filtersSelector, (articles, filters) => {
     console.log('---', 'computing filters')
     const {selected, dateRange: {from, to}} = filters
 
-    return articles.filter(article => {
+    return Object.values(articles).filter(article => {
         const published = Date.parse(article.date)
         return (!selected.length || selected.includes(article.id)) &&
             (!from || !to || (published > from && published < to))
     })
-})
\ No newline at end of file
+})
+

From be027ed0540c815df96ead2e8204dae16d625764 Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 5 Feb 2018 01:51:20 +0500
Subject: [PATCH 2/2] HT5 Final: Random ID generator implemented, Comment
 submitting implemented

---
 src/AC/index.js                     |  9 ++++++++-
 src/components/Article/index.js     |  2 +-
 src/components/CommentForm/index.js | 13 ++++++++++++-
 src/components/CommentList.js       | 12 ++++++++----
 src/constants/index.js              |  4 +++-
 src/middlewares/randomizer.js       | 11 +++++++++++
 src/reducer/articles.js             | 14 ++++++++++++--
 src/reducer/comments.js             | 14 ++++++++++++--
 src/store/index.js                  |  3 ++-
 9 files changed, 69 insertions(+), 13 deletions(-)
 create mode 100644 src/middlewares/randomizer.js

diff --git a/src/AC/index.js b/src/AC/index.js
index dda2dd6..567710c 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({id, user, text, targetArticle}) {
+    return {
+        type: ADD_COMMENT,
+        payload: { id, user, text, targetArticle }
+    }
+}
diff --git a/src/components/Article/index.js b/src/components/Article/index.js
index 12cfa69..8f4e248 100644
--- a/src/components/Article/index.js
+++ b/src/components/Article/index.js
@@ -34,7 +34,7 @@ class Article extends PureComponent {
         const body = isOpen && (
             <div>
                 <section>{article.text}</section>
-                <CommentList comments = {article.comments} ref = {this.setCommentsRef} key = {this.state.count}/>
+                <CommentList targetArticle = {article.id} comments = {article.comments} ref = {this.setCommentsRef} key = {this.state.count}/>
             </div>
         )
         return (
diff --git a/src/components/CommentForm/index.js b/src/components/CommentForm/index.js
index 3685a10..49f6ce4 100644
--- a/src/components/CommentForm/index.js
+++ b/src/components/CommentForm/index.js
@@ -1,4 +1,7 @@
 import React, { Component } from 'react'
+import {connect} from 'react-redux'
+import {addComment} from '../../AC'
+
 import './style.css'
 
 class CommentForm extends Component {
@@ -26,6 +29,14 @@ class CommentForm extends Component {
 
     handleSubmit = ev => {
         ev.preventDefault()
+
+        const {addComment} = this.props;
+        addComment({
+            user: this.state.user,
+            text: this.state.text,
+            targetArticle: this.props.targetArticle
+        });
+
         this.setState({
             user: '',
             text: ''
@@ -58,4 +69,4 @@ const limits = {
     }
 }
 
-export default CommentForm
\ No newline at end of file
+export default connect(null, { addComment })(CommentForm)
\ No newline at end of file
diff --git a/src/components/CommentList.js b/src/components/CommentList.js
index 86c8704..9467210 100644
--- a/src/components/CommentList.js
+++ b/src/components/CommentList.js
@@ -6,11 +6,15 @@ import toggleOpen from '../decorators/toggleOpen'
 
 class CommentList extends Component {
     static propTypes = {
-        comments: PropTypes.array,//.isRequired,
+        comments: PropTypes.array.isRequired,
         //from toggleOpen decorator
         isOpen: PropTypes.bool,
         toggleOpen: PropTypes.func
-    }
+    };
+
+    static defaultProps = {
+        comments: []
+    };
 
     render() {
         const {isOpen, toggleOpen} = this.props
@@ -24,7 +28,7 @@ class CommentList extends Component {
     }
 
     getBody() {
-        const {comments = [], isOpen} = this.props
+        const {comments, isOpen} = this.props
         if (!isOpen) return null
 
         const body = comments.length ? (
@@ -36,7 +40,7 @@ class CommentList extends Component {
         return (
             <div>
                 {body}
-                <CommentForm />
+                <CommentForm targetArticle = {this.props.targetArticle}/>
             </div>
         )
     }
diff --git a/src/constants/index.js b/src/constants/index.js
index a2f0a80..dfd51bf 100644
--- a/src/constants/index.js
+++ b/src/constants/index.js
@@ -3,4 +3,6 @@ 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'
\ No newline at end of file
diff --git a/src/middlewares/randomizer.js b/src/middlewares/randomizer.js
new file mode 100644
index 0000000..8d0776c
--- /dev/null
+++ b/src/middlewares/randomizer.js
@@ -0,0 +1,11 @@
+import {ADD_COMMENT} from '../constants'
+
+const generateRandomId = (num = 10, str = '') => num ? generateRandomId(num - 1, str += String.fromCharCode(Math.round(Math.random() * 25) + 65)) : str;
+// можно добавить проверку на id, чтобы не было повторений, но это потом
+
+export default store => next => action => {
+    if (action.type === ADD_COMMENT) {
+        action.payload.id = generateRandomId();
+    }
+    next(action)
+}
\ No newline at end of file
diff --git a/src/reducer/articles.js b/src/reducer/articles.js
index 4d46ad8..8729d90 100644
--- a/src/reducer/articles.js
+++ b/src/reducer/articles.js
@@ -1,8 +1,8 @@
-import { DELETE_ARTICLE } from '../constants'
+import { DELETE_ARTICLE, ADD_COMMENT } from '../constants'
 import {normalizedArticles as defaultArticles} from '../fixtures'
 
 const articlesMap = defaultArticles.reduce((acc, article) => (
-//        article.comments = article.comments || [],
+    article.comments = article.comments || [],
         {...acc, [article.id]: article}
     ), {});
 
@@ -14,6 +14,16 @@ export default (articlesState = articlesMap, action) => {
             const newState = {...articlesState};
             delete newState[payload.id];
             return newState;
+
+        case ADD_COMMENT:
+            const targetArticle = {...articlesState[payload.targetArticle]};
+            targetArticle.comments = [...targetArticle.comments, payload.id];
+
+            return {
+                ...articlesState,
+                [payload.targetArticle]: targetArticle
+            }
+
     }
 
     return articlesState
diff --git a/src/reducer/comments.js b/src/reducer/comments.js
index 30bd10c..e634865 100644
--- a/src/reducer/comments.js
+++ b/src/reducer/comments.js
@@ -1,4 +1,4 @@
-import {  } from '../constants'
+import { ADD_COMMENT } from '../constants'
 import {normalizedComments as defaultComments} from '../fixtures'
 
 const commentsMap = defaultComments.reduce((acc, comment) => ({
@@ -7,10 +7,20 @@ const commentsMap = defaultComments.reduce((acc, comment) => ({
 }), {})
 
 export default (state = commentsMap, action) => {
-    const { type } = action
+    const { type, payload } = action
 
     switch (type) {
 
+        case ADD_COMMENT:
+            return {
+                ...state,
+                [payload.id] : {
+                    id: payload.id,
+                    user: payload.user,
+                    text: payload.text
+                }
+        }
+
     }
 
     return state
diff --git a/src/store/index.js b/src/store/index.js
index f83d367..ad039c0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,6 +1,7 @@
 import {createStore, applyMiddleware, compose} from 'redux'
 import rootReducer from '../reducer'
 import logger from '../middlewares/logger'
+import randomizer from '../middlewares/randomizer'
 
 const composeEnhancers =
     typeof window === 'object' &&
@@ -10,7 +11,7 @@ const composeEnhancers =
         }) : compose
 
 const enhancer = composeEnhancers(
-    applyMiddleware(logger)
+    applyMiddleware(logger, randomizer)
 )
 const store = createStore(rootReducer, enhancer)