Ht4v2

README.md

@@ -32,7 +32,8 @@
 
 ## HT4
 
-1. Переписать редьюсеры **review** и **restaurant** на key=>value (аналогично **products**)
+1. Переписать редьюсеры **review** и **restaurant**
+   на key=>value (аналогично **products**)
 2. Добавить **users** редьюсер
 3. Починить отображение **Review** компонента (взять данные из редьюсеров **review** и **users**)
 4. Написать **middleware** для генерации **[uuid](https://github.com/uuidjs/uuid)**

package.json

@@ -18,6 +18,7 @@
     "redux": "^4.0.5",
     "redux-devtools-extension": "^2.13.8",
     "reselect": "^4.0.0",
+    "uuid": "^8.3.2",
     "web-vitals": "^0.2.4"
   },
   "scripts": {

src/components/basket/basket.js

@@ -42,10 +42,17 @@ function Basket({ title = 'Basket', total, orderProducts }) {
     </div>
   );
 }
+const mapStateToProps = (state) => {
+  return {
+    total: totalSelector(state),
+    orderProducts: orderProductsSelector(state),
+  };
+};
+export default connect(mapStateToProps)(Basket);
 
-export default connect((state) => {
+/*export default connect((state) => {
   return {
     total: totalSelector(state),
     orderProducts: orderProductsSelector(state),
   };
-})(Basket);
+})(Basket);*/

src/components/restaurant/restaurant.js

@@ -1,22 +1,41 @@
-import React, { useMemo } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import Menu from '../menu';
 import Reviews from '../reviews';
 import Banner from '../banner';
 import Rate from '../rate';
 import Tabs from '../tabs';
+import { useDispatch, useSelector } from 'react-redux';
+import { setRestaurantActive } from '../../redux/actions';
 
 const Restaurant = ({ restaurant }) => {
+  const dispatch = useDispatch();
+  useEffect(() => {
+    dispatch(setRestaurantActive(restaurant.id));
+  }, [restaurant.id]);
+
   const { name, menu, reviews } = restaurant;
+  const allReviews = useSelector((state) => state.reviews);
+  const filteredReviews = useMemo(() => {
+    return Object.keys(allReviews).filter((allReviewKey) =>
+      reviews.includes(allReviewKey)
+    );
+  }, [allReviews, reviews]);
 
   const averageRating = useMemo(() => {
-    const total = reviews.reduce((acc, { rating }) => acc + rating, 0);
+    const total = filteredReviews
+      .map((reviewId) => allReviews[reviewId].rating)
+      .reduce((acc, rating) => acc + rating, 0);
+
     return Math.round(total / reviews.length);
-  }, [reviews]);
+  }, [reviews, allReviews]);
 
   const tabs = [
     { title: 'Menu', content: <Menu menu={menu} /> },
-    { title: 'Reviews', content: <Reviews reviews={reviews} /> },
+    {
+      title: 'Reviews',
+      content: <Reviews filteredReviews={filteredReviews} />,
+    },
   ];
 
   return (

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 { allRestaurantsSelector } from '../../redux/selectors';
 
 const Restaurants = ({ restaurants }) => {
   const tabs = restaurants.map((restaurant) => ({
@@ -14,13 +15,9 @@ const Restaurants = ({ restaurants }) => {
 };
 
 Restaurants.propTypes = {
-  restaurants: PropTypes.arrayOf(
-    PropTypes.shape({
-      id: PropTypes.string.isRequired,
-    }).isRequired
-  ).isRequired,
+  restaurants: PropTypes.arrayOf(PropTypes.string.isRequired).isRequired,
 };
 
 export default connect((state) => ({
-  restaurants: state.restaurants,
+  restaurants: allRestaurantsSelector(state),
 }))(Restaurants);

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

@@ -3,17 +3,24 @@ import useForm from '../../../hooks/use-form';
 
 import Rate from '../../rate';
 import styles from './review-form.module.css';
-import { connect } from 'react-redux';
+import { connect, useSelector } from 'react-redux';
 import Button from '../../button';
+import { postReview } from '../../../redux/actions';
 
-const INITIAL_VALUES = { name: '', text: '', rating: 5 };
+const INITIAL_VALUES = { yourName: '', text: '', rating: 5 };
 
 const ReviewForm = ({ onSubmit }) => {
   const { values, handlers, reset } = useForm(INITIAL_VALUES);
 
+  const activeRestaurantId = useSelector(
+    (state) => state.restaurants.activeRestaurantId
+  );
+  const reviewState = useSelector((state) => state.reviews);
+  const { error, errorMessage } = reviewState;
+
   const handleSubmit = (ev) => {
     ev.preventDefault();
-    onSubmit(values);
+    onSubmit(values, activeRestaurantId);
     reset();
   };
 
@@ -25,8 +32,9 @@ const ReviewForm = ({ onSubmit }) => {
           <input
             placeholder="Your name"
             className={styles.message}
-            {...handlers.name}
+            {...handlers.yourName}
           />
+          {error && <p className={styles.errorMessage}>{errorMessage}</p>}
         </div>
         <div className={styles.reviewFormItem}>
           <textarea
@@ -42,7 +50,7 @@ const ReviewForm = ({ onSubmit }) => {
           </span>
         </div>
         <div className={styles.publish}>
-          <Button primary block>
+          <Button error={error} primary block>
             PUBLISH REVIEW
           </Button>
         </div>
@@ -51,6 +59,10 @@ const ReviewForm = ({ onSubmit }) => {
   );
 };
 
-export default connect(null, () => ({
-  onSubmit: (values) => console.log(values), // TODO
-}))(ReviewForm);
+const mapDispatchToProps = (dispatch) => {
+  return {
+    onSubmit: (values, activeRestaurantId) =>
+      dispatch(postReview(values, activeRestaurantId)),
+  };
+};
+export default connect(null, mapDispatchToProps)(ReviewForm);

src/components/reviews/review-form/review-form.module.css

@@ -67,3 +67,6 @@
     margin-bottom: 10px;
   }
 }
+.errorMessage {
+  color: red;
+}

src/components/reviews/review/review.js

@@ -3,24 +3,41 @@ import PropTypes from 'prop-types';
 
 import Rate from '../../rate';
 import styles from './review.module.css';
+import { useSelector } from 'react-redux';
 
-const Review = ({ user, text, rating }) => (
-  <div className={styles.review} data-id="review">
-    <div className={styles.content}>
-      <div>
-        <h4 className={styles.name} data-id="review-user">
-          {user}
-        </h4>
-        <p className={styles.comment} data-id="review-text">
-          {text}
-        </p>
-      </div>
-      <div className={styles.rate}>
-        <Rate value={rating} />
+const Review = ({ id }) => {
+  /*
+id: "5909796d-5030-4e36-adec-68b8f9ec2d96"
+rating: 5
+text: "Not bad"
+userId: "a304959a-76c0-4b34-954a-b38dbf310360"
+ */
+
+  const reviews = useSelector((state) => state.reviews);
+  const users = useSelector((state) => state.users);
+  const review = reviews[id];
+  const { text, rating } = review;
+  const userId = review.userId;
+  const user = users[userId].name;
+
+  return (
+    <div className={styles.review} data-id="review">
+      <div className={styles.content}>
+        <div>
+          <h4 className={styles.name} data-id="review-user">
+            {user}
+          </h4>
+          <p className={styles.comment} data-id="review-text">
+            {text}
+          </p>
+        </div>
+        <div className={styles.rate}>
+          <Rate value={rating} />
+        </div>
       </div>
     </div>
-  </div>
-);
+  );
+};
 
 Review.propTypes = {
   user: PropTypes.string,

src/components/reviews/reviews.js

@@ -1,15 +1,18 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import Review from './review';
 import ReviewForm from './review-form';
 import styles from './reviews.module.css';
+import { connect } from 'react-redux';
+import { allReviewsSelector } from '../../redux/selectors';
 
-const Reviews = ({ reviews }) => {
+const Reviews = ({ filteredReviews }) => {
   return (
     <div className={styles.reviews}>
-      {reviews.map((review) => (
-        <Review key={review.id} {...review} />
+      {filteredReviews.map((review) => (
+        <Review key={review} id={review} />
       ))}
+
       <ReviewForm />
     </div>
   );

src/redux/actions.js

@@ -1,5 +1,19 @@
-import { INCREMENT, DECREMENT, REMOVE } from './constants';
+import {
+  INCREMENT,
+  DECREMENT,
+  REMOVE,
+  POST_REVIEW,
+  SET_ACTIVE_RESTAURANT,
+} from './constants';
 
 export const increment = (id) => ({ type: INCREMENT, payload: { id } });
 export const decrement = (id) => ({ type: DECREMENT, payload: { id } });
 export const remove = (id) => ({ type: REMOVE, payload: { id } });
+export const postReview = ({ yourName, text, rating }, activeRestaurantId) => ({
+  type: POST_REVIEW,
+  payload: { yourName, text, rating, activeRestaurantId },
+});
+export const setRestaurantActive = (id) => ({
+  type: SET_ACTIVE_RESTAURANT,
+  payload: { id },
+});

src/redux/constants.js

@@ -1,3 +1,5 @@
 export const INCREMENT = 'INCREMENT';
 export const DECREMENT = 'DECREMENT';
 export const REMOVE = 'REMOVE';
+export const POST_REVIEW = 'POST_REVIEW';
+export const SET_ACTIVE_RESTAURANT = 'SET_ACTIVE_RESTAURANT';

src/redux/middleware/generateId.js

@@ -0,0 +1,15 @@
+import { v4 as uuidv4 } from 'uuid';
+import restaurants from '../reducer/restaurants';
+
+export default (store) => (next) => (action) => {
+  if (action.type === 'POST_REVIEW') {
+    const newReviewId = uuidv4();
+    const newUserId = uuidv4();
+    action.payload.id = newReviewId;
+    action.payload.userId = newUserId;
+    //action.payload.restaurantId = store.getState().restaurants.activeRestaurantId
+    next(action);
+  } else {
+    next(action);
+  }
+};

src/redux/reducer/index.js

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

src/redux/reducer/products.js

@@ -4,6 +4,7 @@ const defaultProducts = normalizedProducts.reduce(
   (acc, product) => ({ ...acc, [product.id]: product }),
   {}
 );
+
 export default (products = defaultProducts, action) => {
   const { type } = action;
 

src/redux/reducer/restaurants.js

@@ -1,9 +1,34 @@
-import { normalizedRestaurants as defaultRestaurants } from '../../fixtures';
+import { normalizedRestaurants } from '../../fixtures';
+import { POST_REVIEW, SET_ACTIVE_RESTAURANT } from '../constants';
+
+const defaultRestaurants = normalizedRestaurants.reduce(
+  (acc, restaurant) => ({
+    ...acc,
+    [restaurant.id]: restaurant,
+  }),
+  {}
+);
 
 export default (restaurants = defaultRestaurants, action) => {
-  const { type } = action;
+  const { type, payload } = action;
 
   switch (type) {
+    case SET_ACTIVE_RESTAURANT:
+      return { ...restaurants, activeRestaurantId: payload.id };
+      break;
+    case POST_REVIEW:
+      if (!payload.yourName) {
+        return { ...restaurants };
+        break;
+      }
+      const activeRestaurantId = payload.activeRestaurantId;
+      const restaurant = restaurants[activeRestaurantId];
+      restaurant.reviews.push(payload.id);
+      return {
+        ...restaurants,
+        [payload.activeRestaurantId]: restaurant,
+      };
+      break;
     default:
       return restaurants;
   }

src/redux/reducer/reviews.js

@@ -1,9 +1,37 @@
-import { normalizedReviews as defaultReviews } from '../../fixtures';
+import { normalizedReviews } from '../../fixtures';
+import { POST_REVIEW } from '../constants';
+
+const defaultReviews = normalizedReviews.reduce(
+  (acc, review) => ({ ...acc, [review.id]: review }),
+  {}
+);
+defaultReviews.error = true;
 
 export default (reviews = defaultReviews, action) => {
-  const { type } = action;
+  const { type, payload } = action;
 
   switch (type) {
+    case POST_REVIEW:
+      if (!payload.yourName) {
+        return {
+          ...reviews,
+          error: true,
+          errorMessage: 'name is required',
+          text: payload.text,
+        };
+      }
+      return {
+        ...reviews,
+        error: false,
+        errorMessage: '',
+        [payload.id]: {
+          id: payload.id,
+          rating: payload.rating,
+          text: payload.text,
+          userId: payload.userId,
+        },
+      };
+      break;
     default:
       return reviews;
   }