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

Merge pull request 'fix/fetch-article-loop' (#178) from fix/fetch-article-loop into develop

Browse Source 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/178
This commit is contained in:
Daniel Weissmall 2022-11-12 14:11:20 +00:00
commit 335218fdd9
9 changed files with 69770 additions and 69713 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env Normal file
View File

@ -0,0 +1,6 @@
REACT_APP_CMS_BASE_URL=http://api.scipaper.ru
REACT_APP_CMS_APP_NAME=scipaper
REACT_APP_OPENID_PROVIDER_URL=http://auth.techpal.ru/auth/realms/master/protocol/openid-connect/auth?client_id=techpal&response_type=code
REACT_APP_INTEGRATOR_URL=http://api.scipaper.ru
REACT_APP_INTEGRATOR_API_VERSION=/v1
REACT_APP_GRAPHQL_URL=/graphql

4
.env.development
View File

@ -1,6 +1,6 @@
REACT_APP_CMS_BASE_URL=http://scipaper.ru
REACT_APP_CMS_BASE_URL=http://api.scipaper.ru
REACT_APP_CMS_APP_NAME=scipaper
REACT_APP_OPENID_PROVIDER_URL=http://auth.techpal.ru/auth/realms/master/protocol/openid-connect/auth?client_id=techpal&response_type=code
REACT_APP_INTEGRATOR_URL=http://scipaper.ru
REACT_APP_INTEGRATOR_URL=http://api.scipaper.ru
REACT_APP_INTEGRATOR_API_VERSION=/v1
REACT_APP_GRAPHQL_URL=/graphql

4
.env.production
View File

@ -1,6 +1,6 @@
REACT_APP_CMS_BASE_URL=http://scipaper.ru
REACT_APP_CMS_BASE_URL=http://api.scipaper.ru
REACT_APP_CMS_APP_NAME=scipaper
REACT_APP_OPENID_PROVIDER_URL=http://auth.techpal.ru/auth/realms/master/protocol/openid-connect/auth?client_id=techpal&response_type=code
REACT_APP_INTEGRATOR_URL=http://scipaper.ru
REACT_APP_INTEGRATOR_URL=http://api.scipaper.ru
REACT_APP_INTEGRATOR_API_VERSION=/v1
REACT_APP_GRAPHQL_URL=/graphql

139378
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

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

@ -1,18 +1,40 @@
import type { ArticleStore } from "../domain/articleStore";
import { getArticleUseCase } from "../useCases/getArticleUseCase";
import { useCallback, useEffect } from "react";
import { getArticle } from "article/data/articleAPIService";
import { Article } from "article/domain/articleEntity";
function useArticleViewModel(
store: ArticleStore,
fetchArticleUseCase: (
fetchArticleCallback: (id: string) => Promise<Article | null>,
setArticle: ArticleStore["setArticle"],
id: string,
) => Promise<Article | null>,
getArticleUseCase: (
getArticle: ArticleStore["getArticle"],
setArticle: ArticleStore["setArticle"],
id: Article["id"],
) => Promise<Article | null>,
id: string,
) {
let article: Article | null | undefined;
function useArticleViewModel(store: ArticleStore) {
const _getArticle = useCallback(
(id: string) => getArticleUseCase(store.getArticle, store.setArticle, id),
[store.getArticle, store.setArticle]
(id: string) => {
getArticleUseCase(store.getArticle, store.setArticle, id).then(async (value) => {
if (value == null) {
article = await fetchArticleUseCase(getArticle, store.setArticle, id);
return;
}
article = value;
});
},
[store.setArticle]
);
useEffect(() => {
if (store.article != undefined) {
_getArticle(store.article.id);
}
}, [store.article?.id]);
_getArticle(id);
}, [article]);
return {
article: store.article,

1
src/article/data/articleActions.ts
View File

@ -7,7 +7,6 @@ const setArticleAction = (article: Article) => (dispatch: any) =>
dispatch({ type: actionTypes.SET_ARTICLE, article });
const getArticleAction = (id: string) => (dispatch: any) => {
dispatch({ type: actionTypes.GET_ARTICLE });
return getArticleAPI(id)
.then((article) => {

16
src/article/useCases/fetchArticleUseCase.ts Normal file
View File

@ -0,0 +1,16 @@
import { Article } from "article/domain/articleEntity";
import { ArticleStore } from "article/domain/articleStore";
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 };

20
src/components/fetchAnArticle/AnArticle.tsx
View File

@ -10,18 +10,26 @@ import { SVGSearch } from "components/icons";
import BaseLayout from "components/BaseLayout";
import Typography from "components/typography/Typography";
import { useTranslation } from "react-i18next";
import { fetchArticleUseCase } from "article/useCases/fetchArticleUseCase";
import { getArticleUseCase } from "article/useCases/getArticleUseCase";
const AnArticle = () => {
const store = useArticleStore();
const { article, hasError, shouldShowLoading } = useArticleViewModel(store);
const { id } = useParams();
const { article, hasError, shouldShowLoading } = useArticleViewModel(
store,
fetchArticleUseCase,
getArticleUseCase,
id ?? '',
);
const { i18n, t } = useTranslation();
const { id } = useParams();
const newId = `${id}`;
// const { id } = useParams();
// const newId = `${id}`;
useEffect(() => {
store.getArticle(newId);
}, [id]);
// useEffect(() => {
// store.getArticle(newId);
// }, [id]);
if (hasError) {
return <NotFound />;

16
src/components/fetchAnArticle/AnArticleBody.tsx
View File

@ -13,15 +13,21 @@ import BaseLayout from "components/BaseLayout";
import Container from "components/Container";
import NotFound from "./NotFound";
import Markdown from "components/Markdown";
import { fetchArticleUseCase } from "article/useCases/fetchArticleUseCase";
import { getArticleUseCase } from "article/useCases/getArticleUseCase";
const AnArticleBody = () => {
const store = useArticleStore();
const { article, hasError, shouldShowLoading } = useArticleViewModel(store);
const { id } = useParams();
const newId = `${id}`;
useEffect(() => {
store.getArticle(newId);
}, [id]);
const { article, hasError, shouldShowLoading } = useArticleViewModel(
store,
fetchArticleUseCase,
getArticleUseCase,
id ?? '',
);
// useEffect(() => {
// store.getArticle(newId);
// }, [id]);
if (hasError) <NotFound />;
return (
<BaseLayout>