Hometask5

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(articleId, comment) {
+    return {
+        type: ADD_COMMENT,
+        payload: { articleId, comment }
+    }
+}

src/components/Article/index.js

@@ -5,15 +5,13 @@ import CSSTransition from 'react-addons-css-transition-group'
 import {connect} from 'react-redux'
 import CommentList from '../CommentList'
 import {deleteArticle} from '../../AC'
+import {createFiltratedArticlesSelector} from '../../selectors'
 import './style.css'
 
 class Article extends PureComponent {
     static propTypes = {
-        article: PropTypes.shape({
-            title: PropTypes.string.isRequired,
-            text: PropTypes.string,
-            comments: PropTypes.array
-        }).isRequired,
+        id: PropTypes.string.isRequired,
+        article: PropTypes.object.isRequired,
         isOpen: PropTypes.bool,
         toggleOpen: PropTypes.func
     }
@@ -30,10 +28,13 @@ class Article extends PureComponent {
     render() {
         console.log('---', 'rerendering')
         const {article, isOpen, toggleOpen} = this.props
+
+        if(!Object.keys(article).length) return null
+
         const body = isOpen && (
             <div>
                 <section>{article.text}</section>
-                <CommentList comments = {article.comments} ref = {this.setCommentsRef} key = {this.state.count}/>
+                <CommentList articleId = {article.id} comments = {article.comments} ref = {this.setCommentsRef} key = {this.state.count}/>
             </div>
         )
         return (
@@ -63,8 +64,8 @@ class Article extends PureComponent {
     }
 
     handleDelete = () => {
-        const {deleteArticle,article} = this.props
-        deleteArticle(article.id)
+        const {deleteArticle, id} = this.props
+        deleteArticle(id)
     }
 
     increment = () => this.setState({
@@ -85,5 +86,14 @@ class Article extends PureComponent {
 
 }
 
+const mapStateToProps = (state, ownProps) => {
+    const filtratedArticlesSelector = createFiltratedArticlesSelector()
+    return (state, ownProps) => {
+        return {
+            article: filtratedArticlesSelector(state, ownProps)
+        }
+    }
+}
+
 
-export default connect(null, { deleteArticle })(Article)
+export default connect(mapStateToProps, { deleteArticle })(Article)

src/components/ArticleList.js

@@ -3,39 +3,39 @@ import PropTypes from 'prop-types'
 import Article from './Article'
 import Accordion from './common/Accordion'
 import {connect} from 'react-redux'
-import {filtratedArticlesSelector} from '../selectors'
+import {articlesSelector} from '../selectors'
 
 class ArticleList extends Accordion {
     render() {
         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)}
-            />
-        </li>)
+        if (!Object.keys(articles).length) return <h3>No Articles</h3>
+
+        const articleElements = Object.keys(articles).map(id =>
+            <Article id={id} key={id}
+                     isOpen={id === this.state.openItemId}
+                     toggleOpen={this.toggleOpenItemMemoized(id)}
+            />)
         return (
-            <ul>
+            <div>
                 {articleElements}
-            </ul>
+            </div>
         )
     }
 }
 
 
 ArticleList.defaultProps = {
-    articles: []
+    articles: {}
 }
 
 ArticleList.propTypes = {
-    articles: PropTypes.array.isRequired
+    articles: PropTypes.object.isRequired
 }
 
 export default connect(state => {
     console.log('---', 'connect updated')
     return {
-        articles: filtratedArticlesSelector(state)
+        articles: articlesSelector(state)
     }
 })(ArticleList)

src/components/CommentForm/index.js

@@ -1,4 +1,6 @@
 import React, { Component } from 'react'
+import {connect} from 'react-redux'
+import { addComment } from '../../AC'
 import './style.css'
 
 class CommentForm extends Component {
@@ -26,6 +28,11 @@ class CommentForm extends Component {
 
     handleSubmit = ev => {
         ev.preventDefault()
+        const { addComment, articleId } = this.props
+        const { user, text } = this.state
+
+        addComment(articleId, { user, text })
+
         this.setState({
             user: '',
             text: ''
@@ -58,4 +65,4 @@ const limits = {
     }
 }
 
-export default CommentForm
+export default connect(null,  {addComment})(CommentForm)

src/components/CommentList.js

@@ -12,6 +12,10 @@ class CommentList extends Component {
         toggleOpen: PropTypes.func
     }
 
+    static defaultProps = {
+        comments: []
+    }
+
     render() {
         const {isOpen, toggleOpen} = this.props
         const text = isOpen ? 'hide comments' : 'show comments'
@@ -24,7 +28,7 @@ class CommentList extends Component {
     }
 
     getBody() {
-        const {comments, isOpen} = this.props
+        const {comments, isOpen, articleId} = this.props
         if (!isOpen) return null
 
         const body = comments.length ? (
@@ -36,7 +40,7 @@ class CommentList extends Component {
         return (
             <div>
                 {body}
-                <CommentForm />
+                <CommentForm articleId={articleId} />
             </div>
         )
     }

src/components/Filters/Select.js

@@ -3,21 +3,22 @@ import PropTypes from 'prop-types'
 import Select from 'react-select'
 import { connect } from 'react-redux'
 import { changeSelection } from '../../AC'
+import { articlesSelector, filtersSelector } from '../../selectors'
 
 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 = Object.keys(articles).map(id => ({
+            label: articles[id].title,
+            value: id
         }))
 
         return <Select
@@ -30,6 +31,6 @@ class SelectFilter extends Component {
 }
 
 export default connect(state => ({
-    selected: state.filters.selected,
-    articles: state.articles
+    selected: filtersSelector(state).selected,
+    articles: articlesSelector(state)
 }), { changeSelection })(SelectFilter)

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'
+export const CHANGE_DATE_RANGE = 'CHANGE_DATE_RANGE'
+
+export const ADD_COMMENT = 'ADD_COMMENT'

src/middlewares/uniqueIds.js

@@ -0,0 +1,20 @@
+import { ADD_COMMENT } from '../constants'
+
+function generateId() {
+    return Math.random().toString(16).slice(2)
+}
+
+export default store => next => action => {
+    const { type, payload } = action
+
+    switch (type) {
+        case ADD_COMMENT: {
+            action.payload = {
+                ...payload,
+                comment: {...payload.comment, id: generateId()}
+            }
+        }
+    }
+
+    return next(action) 
+}

src/reducer/articles.js

@@ -1,12 +1,34 @@
-import { DELETE_ARTICLE } from '../constants'
+import { DELETE_ARTICLE, ADD_COMMENT } from '../constants'
 import {normalizedArticles as defaultArticles} from '../fixtures'
 
-export default (articlesState = defaultArticles, action) => {
+const articlesMap = defaultArticles.reduce((acc, article) => ({
+    ...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)
+            return Object.keys(articlesState).reduce((acc, id) => {
+                if (id !== payload.id) {
+                  return {...acc, [id]: articlesState[id]}
+                }
+                return acc;
+              }, {})
+
+        case ADD_COMMENT: {
+            const { articleId, comment } = payload
+            const { comments = [] } = articlesState[articleId]
+            return {
+                ...articlesState,
+                [articleId]: {
+                    ...articlesState[articleId],
+                    comments: [...comments, comment.id]
+                }
+            }
+        }
     }
 
     return articlesState

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,17 @@ const commentsMap = defaultComments.reduce((acc, comment) => ({
 }), {})
 
 export default (state = commentsMap, action) => {
-    const { type } = action
+    const { type, payload } = action
 
     switch (type) {
+        case ADD_COMMENT: {
+            const { comment } = payload
 
+            return {
+                ...state,
+                [comment.id]: { ...comment, id: comment.id}
+            }
+        }
     }
 
     return state

src/selectors/index.js

@@ -10,13 +10,13 @@ export const createCommentSelector = () => createSelector(commentsSelector, idSe
     return comments[id]
 })
 
-export const filtratedArticlesSelector = createSelector(articlesSelector, filtersSelector, (articles, filters) => {
+export const createFiltratedArticlesSelector = () => createSelector(articlesSelector, filtersSelector, idSelector, (articles, filters, id) => {
     console.log('---', 'computing filters')
     const {selected, dateRange: {from, to}} = filters
 
-    return articles.filter(article => {
-        const published = Date.parse(article.date)
-        return (!selected.length || selected.includes(article.id)) &&
-            (!from || !to || (published > from && published < to))
-    })
+    const published = Date.parse(articles[id].date)
+    if ((!selected.length || selected.includes(id)) &&
+            (!from || !to || (published > from && published < to))) return articles[id]
+
+    return {}
 })

src/store/index.js

@@ -1,6 +1,7 @@
 import {createStore, applyMiddleware, compose} from 'redux'
 import rootReducer from '../reducer'
 import logger from '../middlewares/logger'
+import uniqueIds  from '../middlewares/uniqueIds'
 
 const composeEnhancers =
     typeof window === 'object' &&
@@ -10,7 +11,7 @@ const composeEnhancers =
         }) : compose
 
 const enhancer = composeEnhancers(
-    applyMiddleware(logger)
+    applyMiddleware(logger, uniqueIds)
 )
 const store = createStore(rootReducer, enhancer)