hw 4

package.json

@@ -12,7 +12,8 @@
     "react-scripts": "4.0.3",
     "redux": "^4.1.2",
     "redux-devtools-extension": "^2.13.9",
-    "reselect": "^4.1.5"
+    "reselect": "^4.1.5",
+    "uuid": "^8.3.2"
   },
   "scripts": {
     "start": "react-scripts start",

src/components/basket/basket.js

@@ -42,9 +42,11 @@ function Basket({ title = 'Basket', total, orderProducts }) {
   );
 }
 
-export default connect((state) => {
+const mapStateToProps = (state) => {
   return {
     total: totalSelector(state),
     orderProducts: orderProductsSelector(state),
   };
-})(Basket);
+};
+
+export default connect(mapStateToProps)(Basket);

src/components/menu/menu.js

@@ -8,11 +8,7 @@ import styles from './menu.module.css';
 
 class Menu extends Component {
   static propTypes = {
-    menu: PropTypes.arrayOf(
-      PropTypes.shape({
-        id: PropTypes.string.isRequired,
-      }).isRequired
-    ).isRequired,
+    menu: PropTypes.arrayOf(PropTypes.string.isRequired).isRequired,
   };
 
   state = { error: null };

src/components/product/product.js

@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
 import styles from './product.module.css';
 import Button from '../button';
 import { decrement, increment } from '../../redux/actions';
+import { amountSelector, productSelector } from '../../redux/selectors';
 
 function Product({ product, amount, decrement, increment, fetchData }) {
   useEffect(() => {
@@ -57,8 +58,8 @@ Product.propTypes = {
 };
 
 const mapStateToProps = (state, props) => ({
-  amount: state.order[props.id] || 0,
-  product: state.products[props.id],
+  amount: amountSelector(state, props),
+  product: productSelector(state, props),
 });
 
 // const mapDispatchToProps = {

src/components/restaurant/restaurant.js

@@ -1,21 +1,22 @@
-import { useMemo, useState } from 'react';
-import PropTypes from 'prop-types';
-import Menu from '../menu';
-import Reviews from '../reviews';
+import {
+  averageRatingSelector,
+  restaurantSelector,
+} from '../../redux/selectors';
+
 import Banner from '../banner';
+import Menu from '../menu';
+import PropTypes from 'prop-types';
 import Rate from '../rate';
+import Reviews from '../reviews';
 import Tabs from '../tabs';
+import { connect } from 'react-redux';
+import { useState } from 'react';
 
-const Restaurant = ({ restaurant }) => {
+const Restaurant = ({ restaurant, averageRating }) => {
   const { id, name, menu, reviews } = restaurant;
 
   const [activeTab, setActiveTab] = useState('menu');
 
-  const averageRating = useMemo(() => {
-    const total = reviews.reduce((acc, { rating }) => acc + rating, 0);
-    return Math.round(total / reviews.length);
-  }, [reviews]);
-
   const tabs = [
     { id: 'menu', label: 'Menu' },
     { id: 'reviews', label: 'Reviews' },
@@ -28,7 +29,7 @@ const Restaurant = ({ restaurant }) => {
       </Banner>
       <Tabs tabs={tabs} activeId={activeTab} onChange={setActiveTab} />
       {activeTab === 'menu' && <Menu menu={menu} key={id} />}
-      {activeTab === 'reviews' && <Reviews reviews={reviews} />}
+      {activeTab === 'reviews' && <Reviews reviews={reviews} restId={id} />}
     </div>
   );
 };
@@ -38,12 +39,14 @@ Restaurant.propTypes = {
     id: PropTypes.string.isRequired,
     name: PropTypes.string,
     menu: PropTypes.array,
-    reviews: PropTypes.arrayOf(
-      PropTypes.shape({
-        rating: PropTypes.number.isRequired,
-      }).isRequired
-    ).isRequired,
+    reviews: PropTypes.array,
   }).isRequired,
+  averageRating: PropTypes.number,
 };
 
-export default Restaurant;
+const mapStateToProps = (state, props) => ({
+  restaurant: restaurantSelector(state, props),
+  averageRating: averageRatingSelector(state, props),
+});
+
+export default connect(mapStateToProps)(Restaurant);

src/components/restaurants/restaurants.js

@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import Restaurant from '../restaurant';
 import Tabs from '../tabs';
+import { restaurantsListSelector } from '../../redux/selectors';
 
 function Restaurants({ restaurants }) {
   const [activeId, setActiveId] = useState(restaurants[0].id);
@@ -12,15 +13,10 @@ function Restaurants({ restaurants }) {
     [restaurants]
   );
 
-  const activeRestaurant = useMemo(
-    () => restaurants.find((restaurant) => restaurant.id === activeId),
-    [activeId, restaurants]
-  );
-
   return (
     <div>
       <Tabs tabs={tabs} onChange={setActiveId} activeId={activeId} />
-      <Restaurant restaurant={activeRestaurant} />
+      <Restaurant id={activeId} />
     </div>
   );
 }
@@ -35,7 +31,7 @@ Restaurants.propTypes = {
 };
 
 const mapStateToProps = (state) => ({
-  restaurants: state.restaurants,
+  restaurants: restaurantsListSelector(state),
 });
 
 export default connect(mapStateToProps)(Restaurants);

src/components/reviews/review-form/review-form.js

@@ -1,10 +1,10 @@
-import { connect } from 'react-redux';
-
-import useForm from '../../../hooks/use-form';
-import Rate from '../../rate';
 import Button from '../../button';
-
+import PropTypes from 'prop-types';
+import Rate from '../../rate';
+import { addReview } from '../../../redux/actions';
+import { connect } from 'react-redux';
 import styles from './review-form.module.css';
+import useForm from '../../../hooks/use-form';
 
 const INITIAL_VALUES = { name: '', text: '', rating: 3 };
 
@@ -51,6 +51,12 @@ const ReviewForm = ({ onSubmit }) => {
   );
 };
 
-export default connect(null, () => ({
-  onSubmit: (values) => console.log(values), // TODO
-}))(ReviewForm);
+ReviewForm.propTypes = {
+  onSubmit: PropTypes.func.isRequired,
+};
+
+const mapDispatchToProps = (dispatch, props) => ({
+  onSubmit: (review) => dispatch(addReview(review, props.restId)),
+});
+
+export default connect(null, mapDispatchToProps)(ReviewForm);

src/components/reviews/review/review.js

@@ -1,8 +1,11 @@
+import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
 import Rate from '../../rate';
 import styles from './review.module.css';
 
+import { reviewWitUserSelector } from '../../../redux/selectors';
+
 const Review = ({ user, text, rating }) => (
   <div className={styles.review} data-id="review">
     <div className={styles.content}>
@@ -31,4 +34,12 @@ Review.defaultProps = {
   user: 'Anonymous',
 };
 
-export default Review;
+// const mapStateToProps = (state, props) => ({
+//   ...reviewWitUserSelector(state, props),
+// });
+
+// const mapStateToProps = (state, props) => reviewWitUserSelector(state, props);
+
+const mapStateToProps = reviewWitUserSelector;
+
+export default connect(mapStateToProps)(Review);

src/components/reviews/reviews.js

@@ -3,23 +3,20 @@ import Review from './review';
 import ReviewForm from './review-form';
 import styles from './reviews.module.css';
 
-const Reviews = ({ reviews }) => {
+const Reviews = ({ reviews, restId }) => {
   return (
     <div className={styles.reviews}>
-      {reviews.map((review) => (
-        <Review key={review.id} {...review} />
+      {reviews.map((id) => (
+        <Review key={id} id={id} />
       ))}
-      <ReviewForm />
+      <ReviewForm restId={restId} />
     </div>
   );
 };
 
 Reviews.propTypes = {
-  reviews: PropTypes.arrayOf(
-    PropTypes.shape({
-      id: PropTypes.string.isRequired,
-    }).isRequired
-  ).isRequired,
+  restId: PropTypes.string,
+  reviews: PropTypes.arrayOf(PropTypes.string.isRequired).isRequired,
 };
 
 export default Reviews;

src/redux/actions.js

@@ -1,5 +1,12 @@
-import { DECREMENT, INCREMENT, REMOVE } from './constants';
+import { ADD_REVIEW, DECREMENT, INCREMENT, REMOVE } from './constants';
 
 export const increment = (id) => ({ type: INCREMENT, id });
 export const decrement = (id) => ({ type: DECREMENT, id });
 export const remove = (id) => ({ type: REMOVE, id });
+
+export const addReview = (review, restId) => ({
+  type: ADD_REVIEW,
+  review,
+  restId,
+  generateId: ['reviewId', 'userId'],
+});

src/redux/constants.js

@@ -1,3 +1,4 @@
 export const INCREMENT = 'INCREMENT';
 export const DECREMENT = 'DECREMENT';
 export const REMOVE = 'REMOVE';
+export const ADD_REVIEW = 'ADD_REVIEW';

src/redux/middleware/generateId.js

@@ -0,0 +1,11 @@
+import { v4 as uuid } from 'uuid';
+
+export default (store) => (next) => (action) => {
+  if (!action.generateId) return next(action);
+
+  const { generateId, ...rest } = action;
+  next({
+    ...rest,
+    ...generateId.reduce((acc, key) => ({ ...acc, [key]: uuid() }), {}),
+  });
+};

src/redux/reducer/index.js

@@ -1,12 +1,14 @@
 import { combineReducers } from 'redux';
 import order from './order';
-import restaurants from './restaurants';
 import products from './products';
+import restaurants from './restaurants';
 import reviews from './reviews';
+import users from './users';
 
 export default combineReducers({
   order,
   restaurants,
   products,
   reviews,
+  users,
 });

src/redux/reducer/products.js

@@ -1,15 +1,11 @@
+import { arrToMap } from '../utils';
 import { normalizedProducts } from '../../fixtures';
 
-const defaultProducts = normalizedProducts.reduce(
-  (acc, product) => ({ ...acc, [product.id]: product }),
-  {}
-);
-
-export default (products = defaultProducts, action) => {
+export default (state = arrToMap(normalizedProducts), action) => {
   const { type } = action;
 
   switch (type) {
     default:
-      return products;
+      return state;
   }
 };

src/redux/reducer/restaurants.js

@@ -1,10 +1,22 @@
-import { normalizedRestaurants as defaultRestaurants } from '../../fixtures';
+import { ADD_REVIEW } from '../constants';
+import { arrToMap } from '../utils';
+import { normalizedRestaurants } from '../../fixtures';
 
-export default (restaurants = defaultRestaurants, action) => {
-  const { type } = action;
+export default (state = arrToMap(normalizedRestaurants), action) => {
+  const { type, restId, reviewId } = action;
 
   switch (type) {
+    case ADD_REVIEW:
+      const restaurant = state[restId];
+      return {
+        ...state,
+        [restId]: {
+          ...restaurant,
+          reviews: [...restaurant.reviews, reviewId],
+        },
+      };
+
     default:
-      return restaurants;
+      return state;
   }
 };

src/redux/reducer/reviews.js

@@ -1,10 +1,18 @@
-import { normalizedReviews as defaultReviews } from '../../fixtures';
+import { ADD_REVIEW } from '../constants';
+import { arrToMap } from '../utils';
+import { normalizedReviews } from '../../fixtures';
 
-export default (reviews = defaultReviews, action) => {
-  const { type } = action;
+export default (state = arrToMap(normalizedReviews), action) => {
+  const { type, review, reviewId, userId } = action;
 
   switch (type) {
+    case ADD_REVIEW:
+      const { text, rating } = review;
+      return {
+        ...state,
+        [reviewId]: { id: reviewId, userId, text, rating },
+      };
     default:
-      return reviews;
+      return state;
   }
 };

src/redux/reducer/users.js

@@ -0,0 +1,19 @@
+import { ADD_REVIEW } from '../constants';
+import { arrToMap } from '../utils';
+import { normalizedUsers } from '../../fixtures';
+
+export default (state = arrToMap(normalizedUsers), action) => {
+  const { type, review, userId } = action;
+
+  switch (type) {
+    case ADD_REVIEW:
+      const { name } = review;
+      return {
+        ...state,
+        [userId]: { id: userId, name },
+      };
+
+    default:
+      return state;
+  }
+};