Commit 2cc1fbb0 authored by Chunchi Che's avatar Chunchi Che

add progress for loading mdpro deck

parent 755b5d03
Pipeline #27893 passed with stages
in 8 minutes and 48 seconds
import { useConfig } from "@/config"; import { useConfig } from "@/config";
import { pfetch } from "@/infra";
import { MdproDeck, MdproResp } from "./schema"; import { MdproDeck, MdproResp } from "./schema";
import { handleHttps, mdproHeaders } from "./util"; import { handleHttps, mdproHeaders } from "./util";
...@@ -15,14 +16,18 @@ export interface PersonalListReq { ...@@ -15,14 +16,18 @@ export interface PersonalListReq {
export async function getPersonalList( export async function getPersonalList(
req: PersonalListReq, req: PersonalListReq,
progressCallback?: (progress: number) => void,
): Promise<MdproResp<MdproDeck[]> | undefined> { ): Promise<MdproResp<MdproDeck[]> | undefined> {
const myHeaders = mdproHeaders(); const myHeaders = mdproHeaders();
myHeaders.append("token", req.token); myHeaders.append("token", req.token);
const resp = await fetch(`${mdproServer}/${API_PATH}/${req.userID}`, { const resp = await pfetch(`${mdproServer}/${API_PATH}/${req.userID}`, {
method: "GET", init: {
headers: myHeaders, method: "GET",
redirect: "follow", headers: myHeaders,
redirect: "follow",
},
progressCallback,
}); });
return await handleHttps(resp, API_PATH); return await handleHttps(resp, API_PATH);
......
import { useConfig } from "@/config"; import { useConfig } from "@/config";
import { pfetch } from "@/infra";
import { MdproDeckLike, MdproResp } from "./schema"; import { MdproDeckLike, MdproResp } from "./schema";
import { handleHttps, mdproHeaders } from "./util"; import { handleHttps, mdproHeaders } from "./util";
...@@ -30,6 +31,7 @@ interface RespData { ...@@ -30,6 +31,7 @@ interface RespData {
export async function pullDecks( export async function pullDecks(
req: PullReq = defaultPullReq, req: PullReq = defaultPullReq,
progressCallback?: (progress: number) => void,
): Promise<MdproResp<RespData> | undefined> { ): Promise<MdproResp<RespData> | undefined> {
const myHeaders = mdproHeaders(); const myHeaders = mdproHeaders();
...@@ -43,10 +45,13 @@ export async function pullDecks( ...@@ -43,10 +45,13 @@ export async function pullDecks(
const url = new URL(`${mdproServer}/${API_PATH}`); const url = new URL(`${mdproServer}/${API_PATH}`);
url.search = params.toString(); url.search = params.toString();
const resp = await fetch(url.toString(), { const resp = await pfetch(url.toString(), {
method: "GET", init: {
headers: myHeaders, method: "GET",
redirect: "follow", headers: myHeaders,
redirect: "follow",
},
progressCallback,
}); });
return await handleHttps(resp, API_PATH); return await handleHttps(resp, API_PATH);
......
...@@ -10,7 +10,7 @@ import { deleteDeck, getPersonalList, mgetDeck, pullDecks } from "@/api"; ...@@ -10,7 +10,7 @@ import { deleteDeck, getPersonalList, mgetDeck, pullDecks } from "@/api";
import { MdproDeckLike } from "@/api/mdproDeck/schema"; import { MdproDeckLike } from "@/api/mdproDeck/schema";
import { useConfig } from "@/config"; import { useConfig } from "@/config";
import { accountStore } from "@/stores"; import { accountStore } from "@/stores";
import { IconFont } from "@/ui/Shared"; import { IconFont, Loading } from "@/ui/Shared";
import { setSelectedDeck } from "../.."; import { setSelectedDeck } from "../..";
import { editDeckStore } from "../../store"; import { editDeckStore } from "../../store";
...@@ -25,6 +25,7 @@ interface Props { ...@@ -25,6 +25,7 @@ interface Props {
decks: MdproDeckLike[]; decks: MdproDeckLike[];
total: number; total: number;
onlyMine: boolean; onlyMine: boolean;
progress: number;
} }
// TODO: useConfig // TODO: useConfig
...@@ -37,6 +38,7 @@ const store = proxy<Props>({ ...@@ -37,6 +38,7 @@ const store = proxy<Props>({
decks: [], decks: [],
total: 0, total: 0,
onlyMine: false, onlyMine: false,
progress: 0.0,
}); });
export const DeckResults: React.FC = memo(() => { export const DeckResults: React.FC = memo(() => {
...@@ -44,29 +46,13 @@ export const DeckResults: React.FC = memo(() => { ...@@ -44,29 +46,13 @@ export const DeckResults: React.FC = memo(() => {
const { message } = App.useApp(); const { message } = App.useApp();
const { t: i18n } = useTranslation("DeckResults"); const { t: i18n } = useTranslation("DeckResults");
useEffect(() => { useEffect(() => {
resetProgress();
if (snap.onlyMine) { if (snap.onlyMine) {
// show only decks uploaded by myself // show only decks uploaded by myself
updatePersonalList(message); updatePersonalList(message);
} else { } else {
const update = async () => { updateMdproDeck();
const resp = await pullDecks({
page: snap.page,
size: PAGE_SIZE,
keyWord: snap.query !== "" ? snap.query : undefined,
sortLike: SORT_LIKE,
});
if (resp?.data) {
const { total, records: newDecks } = resp.data;
store.total = total;
store.decks = newDecks;
} else {
store.decks = [];
}
};
update();
} }
}, [snap.query, snap.page, snap.onlyMine]); }, [snap.query, snap.page, snap.onlyMine]);
...@@ -92,32 +78,38 @@ export const DeckResults: React.FC = memo(() => { ...@@ -92,32 +78,38 @@ export const DeckResults: React.FC = memo(() => {
return ( return (
<> <>
{snap.decks.length ? ( {snap.progress === 1 ? (
<div className={styles.container}> snap.decks.length ? (
<div className={styles["search-decks"]}> <div className={styles.container}>
{snap.decks.map((deck) => ( <div className={styles["search-decks"]}>
<MdproDeckBlock {snap.decks.map((deck) => (
key={deck.deckId} <MdproDeckBlock
deck={deck} key={deck.deckId}
onlyMine={snap.onlyMine} deck={deck}
onlyMine={snap.onlyMine}
/>
))}
</div>
<div style={{ textAlign: "center", padding: "0.625rem 0 1.25rem" }}>
<Pagination
current={snap.page}
onChange={onChangePage}
total={snap.total}
pageSize={PAGE_SIZE}
showLessItems
hideOnSinglePage
/> />
))} </div>
</div> </div>
<div style={{ textAlign: "center", padding: "0.625rem 0 1.25rem" }}> ) : (
<Pagination <div className={styles.empty}>
current={snap.page} <IconFont type="icon-empty" size={40} />
onChange={onChangePage} <div>{i18n("NoDeckGroupFound")}</div>
total={snap.total}
pageSize={PAGE_SIZE}
showLessItems
hideOnSinglePage
/>
</div> </div>
</div> )
) : ( ) : (
<div className={styles.empty}> <div className={styles.empty}>
<IconFont type="icon-empty" size={40} /> <Loading progress={snap.progress * 100} />
<div>{i18n("NoDeckGroupFound")}</div>
</div> </div>
)} )}
</> </>
...@@ -182,13 +174,38 @@ const MdproDeckBlock: React.FC<{ ...@@ -182,13 +174,38 @@ const MdproDeckBlock: React.FC<{
); );
}; };
const updateMdproDeck = async () => {
const resp = await pullDecks(
{
page: store.page,
size: PAGE_SIZE,
keyWord: store.query !== "" ? store.query : undefined,
sortLike: SORT_LIKE,
},
updateProgress,
);
if (resp?.data) {
const { total, records: newDecks } = resp.data;
store.total = total;
store.decks = newDecks;
} else {
store.decks = [];
}
finishProgress();
};
const updatePersonalList = async (message: MessageInstance) => { const updatePersonalList = async (message: MessageInstance) => {
const user = accountStore.user; const user = accountStore.user;
if (user) { if (user) {
const resp = await getPersonalList({ const resp = await getPersonalList(
userID: user.id, {
token: user.token, userID: user.id,
}); token: user.token,
},
updateProgress,
);
if (resp) { if (resp) {
if (resp.code !== 0 || resp.data === undefined) { if (resp.code !== 0 || resp.data === undefined) {
...@@ -231,8 +248,14 @@ const updatePersonalList = async (message: MessageInstance) => { ...@@ -231,8 +248,14 @@ const updatePersonalList = async (message: MessageInstance) => {
store.decks = []; store.decks = [];
store.total = 0; store.total = 0;
} }
finishProgress();
}; };
const resetProgress = () => (store.progress = 0);
const updateProgress = (progress: number) => (store.progress = progress * 0.9);
const finishProgress = () => (store.progress = 1);
const copyMdproDeckToEditing = async (mdproDeck: MdproDeckLike) => { const copyMdproDeckToEditing = async (mdproDeck: MdproDeckLike) => {
// currently the content of the deck, which we named `Ydk`, // currently the content of the deck, which we named `Ydk`,
// haven't been downloaded, so we need to fetch from server again by `mgetDeck` // haven't been downloaded, so we need to fetch from server again by `mgetDeck`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment