Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

React_dynamic-list-of-posts #862

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ form to add new comments.
1. Implement comment deletion
- Delete the commnet immediately not waiting for the server response to improve the UX.
1. (*) Handle `Add` and `Delete` errors so the user can retry

[DEMO LINK](https://ArtemKravcov85.github.io/react_dynamic-list-of-posts/)
1 change: 0 additions & 1 deletion cypress.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"baseUrl": "http://localhost:3000",
"defaultCommandTimeout": 2000,
"video": true,
"viewportHeight": 1920,
"viewportWidth": 1080,
Expand Down
8 changes: 0 additions & 8 deletions cypress/support/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
import '@mate-academy/cypress-tools/support';

declare global {
namespace Cypress {
interface Chainable<Subject> {
byDataCy(name: string, text: string): Chainable<JQuery>;
}
}
}
18 changes: 0 additions & 18 deletions cypress/support/index.js
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
require('@mate-academy/cypress-tools/support');

Cypress.Commands.add(
'byDataCy',
{ prevSubject: 'optional' },

(subject, name, text = '') => {
const target = subject || cy;
const selector = `[data-cy="${name}"]`;

if (text) {
return target.contain(selector, text);
}

return subject
? subject.find(selector)
: cy.get(selector);
},
);
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@cypress/webpack-dev-server": "^1.8.4",
"@mate-academy/cypress-tools": "^1.0.5",
"@mate-academy/eslint-config-react-typescript": "^1.0.5",
"@mate-academy/scripts": "^1.2.3",
"@mate-academy/scripts": "^1.2.8",
"@mate-academy/students-ts-config": "*",
"@mate-academy/stylelint-config": "*",
"@types/node": "^17.0.23",
Expand Down
190 changes: 161 additions & 29 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,60 +1,192 @@
import React from 'react';
import 'bulma/bulma.sass';
import '@fortawesome/fontawesome-free/css/all.css';
import './App.scss';
import React, { useEffect, useState } from 'react';
import cn from 'classnames';

import classNames from 'classnames';
import { UserSelector } from './components/UserSelector';
import { PostsList } from './components/PostsList';
import { PostDetails } from './components/PostDetails';
import { UserSelector } from './components/UserSelector';
import { Loader } from './components/Loader';
import { User } from './types/User';
import {
addComment,
deleteComment,
getComments,
getUserPosts,
getUsers,
} from './api/api';
import { Post } from './types/Post';
import { Comment } from './types/Comment';

import './App.scss';
import 'bulma/bulma.sass';
import '@fortawesome/fontawesome-free/css/all.css';

export const App: React.FC = () => {
const [users, setUsers] = useState<User[]>([]);
const [userPosts, setUserPosts] = useState<Post[]>([]);
const [selectedUser, setSelectedUser] = useState<User | null>(null);
const [selectedPost, setSelectedPost] = useState<Post | null>(null);
const [comments, setComments] = useState<Comment[]>([]);

const [isCommentsLoading, setIsCommentsLoading] = useState(false);
const [isLoading, setIsLoading] = useState(false);
const [isError, setIsError] = useState(false);
const [isCommentError, setIsCommentError] = useState(false);
const [canWriteComment, setCanWriteComment] = useState(false);

useEffect(() => {
getUsers()
witflash marked this conversation as resolved.
Show resolved Hide resolved
.then((userFromServer: User[]) => setUsers(userFromServer))
.catch(() => setIsCommentError(true));
}, []);

const getUserPostsFromServer = (userId: number) => {
setIsLoading(true);

getUserPosts(userId)
.then((data) => {
setUserPosts(data);
setIsError(false);
})
.catch(() => setIsError(true))
.finally(() => setIsLoading(false));
};

const getCommentsFromServer = (postId: number) => {
setIsCommentsLoading(true);

getComments(postId)
.then((data) => {
setComments(data);
setIsCommentError(false);
})
.catch(() => setIsCommentError(true))
.finally(() => {
setIsLoading(false);
setIsCommentsLoading(false);
});
};

const handleUserSelect = (
event: React.MouseEvent<HTMLAnchorElement, MouseEvent>,
user: User,
) => {
event.preventDefault();

getUserPostsFromServer(user.id);
setSelectedUser(user);
setSelectedPost(null);
};

const handleSelectPost = (post: Post) => {
setSelectedPost((currentPost) => {
if (currentPost?.id === post.id) {
return null;
}

return post;
});

getCommentsFromServer(post.id);
setCanWriteComment(false);
};

const handleAddNewComment = async (
postId: number,
name: string,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function 'handleAddNewComment' should handle possible exceptions from 'addComment' function call with a try-catch or then/catch block.

email: string,
body: string,
) => {
const newComment = await addComment(postId, name, email, body);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newComment added directly to the state without any validation check. Perform validations before adding to the state.

const filteredComments
= comments.filter(comment => selectedPost?.id === comment.postId);

setComments([...filteredComments, newComment]);
};

const handleDeleteComment = (commentId: number) => {
deleteComment(commentId)
.then(() => {
const filteredComments
= comments.filter(comment => comment.id !== commentId);

setComments(filteredComments);
});
};

return (
<main className="section">
<div className="container">
<div className="tile is-ancestor">
<div className="tile is-parent">
<div className="tile is-child box is-success">
<div className="block">
<UserSelector />
<UserSelector
users={users}
handleUserSelect={handleUserSelect}
selectedUser={selectedUser}
/>
</div>

<div className="block" data-cy="MainContent">
<p data-cy="NoSelectedUser">
No user selected
</p>
{!selectedUser && (
<p data-cy="NoSelectedUser">No user selected</p>
)}

<Loader />
{isLoading && <Loader />}

<div
className="notification is-danger"
data-cy="PostsLoadingError"
>
Something went wrong!
</div>
{isError && !isLoading && (
<div
className="notification is-danger"
data-cy="PostsLoadingError"
>
Something went wrong!
</div>
)}

<div className="notification is-warning" data-cy="NoPostsYet">
No posts yet
</div>
{!userPosts.length
&& selectedUser
&& !isLoading
&& !isError
&& (
<div
className="notification is-warning"
data-cy="NoPostsYet"
>
No posts yet
</div>
)}

<PostsList />
{userPosts.length > 0 && !isLoading && (
<PostsList
userPosts={userPosts}
handleSelectPost={handleSelectPost}
selectedPost={selectedPost}
/>
)}
</div>
</div>
</div>

<div
data-cy="Sidebar"
className={classNames(
'tile',
'is-parent',
'is-8-desktop',
'Sidebar',
'Sidebar--open',
)}
className={cn('tile', 'is-parent', 'is-8-desktop', 'Sidebar', {
'Sidebar--open': selectedPost,
})}
>
<div className="tile is-child box is-success ">
<PostDetails />
{selectedPost && (
<PostDetails
selectedPost={selectedPost}
comments={comments}
isCommentError={isCommentError}
canWriteComment={canWriteComment}
setCanWriteComment={setCanWriteComment}
handleAddNewComment={handleAddNewComment}
handleDeleteComment={handleDeleteComment}
isCommentsLoading={isCommentsLoading}
/>
)}
</div>
</div>
</div>
Expand Down
34 changes: 34 additions & 0 deletions src/api/api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { Comment } from '../types/Comment';
import { Post } from '../types/Post';
import { User } from '../types/User';
import { client } from '../utils/fetchClient';

export const getUsers = () => {
return client.get<User[]>('/users');
};

export const getUserPosts = (userId: number) => {
return client.get<Post[]>(`/posts?userId=${userId}`);
};

export const getComments = (postId: number) => {
return client.get<Comment[]>(`/comments?postId=${postId}`);
};

export const addComment = (
postId: number,
name: string,
email: string,
body: string,
) => {
return client.post<Comment>('/comments', {
postId,
name,
email,
body,
});
};

export const deleteComment = (commentId: number) => {
return client.delete(`/comments/${commentId}`);
};
Loading
Loading