Scipaper/Frontend
5
0
Fork 0
Code Issues 15 Pull Requests Packages Projects Releases Wiki Activity

Fixed 404 error on "article/info/$id" pages

Browse Source
This commit is contained in:
Daniel Weissmall 2022-11-12 23:55:00 +03:00
parent fecce76fe1
commit e20831fbfc
4 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/article/controller/articleViewModel.ts
View File

@ -1,6 +1,5 @@
import type { ArticleStore } from "../domain/articleStore"; import type { ArticleStore } from "../domain/articleStore";
import { useCallback, useEffect } from "react"; import { useCallback, useEffect } from "react";
import { Article } from "article/domain/articleEntity";
import { GetArticleUseCase } from "article/useCases/getArticleUseCase"; import { GetArticleUseCase } from "article/useCases/getArticleUseCase";
import { FetchArticleUseCase } from "article/useCases/fetchArticleUseCase"; import { FetchArticleUseCase } from "article/useCases/fetchArticleUseCase";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
@ -12,15 +11,17 @@ function useArticleViewModel(
) { ) {
const { id } = useParams(); const { id } = useParams();
const getArticle = useCallback( // const getArticle = useCallback(
() => { // () => {
getArticleUseCase.call(id ?? '').catch((_) => fetchArticleUseCase.call(id ?? '')); // getArticleUseCase.call(id ?? '').catch((_) => fetchArticleUseCase.call(id ?? ''));
console.log(id); // console.log(id);
}, // },
[id] // [id]
); // );
useEffect(getArticle, []); useEffect(() => {
getArticleUseCase.call(id ?? '').catch((_) => fetchArticleUseCase.call(id ?? ''));
}, []);
return { return {
article: store.currentArticle, article: store.currentArticle,

2
src/article/data/articleReducer.ts
View File

@ -17,7 +17,7 @@ const articleReducer = (
): ArticleStoreState => { ): ArticleStoreState => {
switch (action.type) { switch (action.type) {
case actionTypes.SET_ARTICLE: case actionTypes.SET_ARTICLE:
return { ...state, articles: action.updatedList, currentArticle: action.article }; return { ...state, articles: action.updatedList, currentArticle: action.article, hasError: typeof action.article === undefined };
case actionTypes.GET_ARTICLE: case actionTypes.GET_ARTICLE:
return { ...state, isLoading: true }; return { ...state, isLoading: true };
case actionTypes.GET_ARTICLE_SUCCESS: case actionTypes.GET_ARTICLE_SUCCESS:

13
src/article/useCases/fetchArticleUseCase.ts
View File

@ -26,17 +26,4 @@ class FetchArticleUseCase {
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
} }
const fetchArticleUseCase = async (
fetchArticleCallback: (id: string) => Promise<Article | null>,
setArticle: ArticleStore["setArticle"],
id: string,
): Promise<Article | null> => {
const article = await fetchArticleCallback(id);
if (article) {
await setArticle(article);
}
return article;
};
export { FetchArticleUseCase }; export { FetchArticleUseCase };
export { fetchArticleUseCase };

14
src/article/useCases/getArticleUseCase.ts
View File

@ -22,18 +22,4 @@ class GetArticleUseCase {
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
} }
const getArticleUseCase = async (
getArticle: ArticleStore["getArticle"],
setArticle: ArticleStore["setArticle"],
id: Article["id"]
): Promise<Article | null> => {
const article = await getArticle(id);
if (article) {
await setArticle(article);
}
return article;
};
export { GetArticleUseCase }; export { GetArticleUseCase };
export { getArticleUseCase };