Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
feat: request pagination for resource(#1425)
CorrectRoadH424f10e180bb
diff --git a/api/resource.go b/api/resource.goindex 91b0183c7..3ee90d9d8 100644--- a/api/resource.go+++ b/api/resource.go@@ -45,6 +45,10 @@ type ResourceFind struct {Filename *string `json:"filename"`MemoID *intGetBlob bool++ // Pagination+ Limit *int+ Offset *int}type ResourcePatch struct {diff --git a/server/resource.go b/server/resource.goindex ec4022bb5..bd2c46b70 100644--- a/server/resource.go+++ b/server/resource.go@@ -256,6 +256,13 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {resourceFind := &api.ResourceFind{CreatorID: &userID,}+ if limit, err := strconv.Atoi(c.QueryParam("limit")); err == nil {+ resourceFind.Limit = &limit+ }+ if offset, err := strconv.Atoi(c.QueryParam("offset")); err == nil {+ resourceFind.Offset = &offset+ }+list, err := s.Store.FindResourceList(ctx, resourceFind)if err != nil {return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch resource list").SetInternal(err)diff --git a/store/resource.go b/store/resource.goindex 0d54a99c6..f5f3c3c7b 100644--- a/store/resource.go+++ b/store/resource.go@@ -312,6 +312,13 @@ func (s *Store) findResourceListImpl(ctx context.Context, tx *sql.Tx, find *api.GROUP BY resource.idORDER BY resource.id DESC`, strings.Join(fields, ", "), strings.Join(where, " AND "))+ if find.Limit != nil {+ query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)+ if find.Offset != nil {+ query = fmt.Sprintf("%s OFFSET %d", query, *find.Offset)+ }+ }+rows, err := tx.QueryContext(ctx, query, args...)if err != nil {return nil, FormatError(err)diff --git a/web/src/helpers/api.ts b/web/src/helpers/api.tsindex 38877d010..930fd0f33 100644--- a/web/src/helpers/api.ts+++ b/web/src/helpers/api.ts@@ -164,6 +164,17 @@ export function getResourceList() {return axios.get<ResponseObject<Resource[]>>("/api/resource");}+export function getResourceListWithLimit(resourceFind?: ResourceFind) {+ const queryList = [];+ if (resourceFind?.offset) {+ queryList.push(`offset=${resourceFind.offset}`);+ }+ if (resourceFind?.limit) {+ queryList.push(`limit=${resourceFind.limit}`);+ }+ return axios.get<ResponseObject<Resource[]>>(`/api/resource?${queryList.join("&")}`);+}+export function createResource(resourceCreate: ResourceCreate) {return axios.post<ResponseObject<Resource>>("/api/resource", resourceCreate);}diff --git a/web/src/locales/en.json b/web/src/locales/en.jsonindex 7e09cc211..144075d6f 100644--- a/web/src/locales/en.json+++ b/web/src/locales/en.json@@ -245,6 +245,8 @@"message": {"no-memos": "no memos π","memos-ready": "all memos are ready π",+ "no-resource": "no resource π",+ "resource-ready": "all resource are ready π","restored-successfully": "Restored successfully","memo-updated-datetime": "Memo created datetime changed.","invalid-created-datetime": "Invalid created datetime.",diff --git a/web/src/locales/zh-Hant.json b/web/src/locales/zh-Hant.jsonindex 7c902224f..8d66564c2 100644--- a/web/src/locales/zh-Hant.json+++ b/web/src/locales/zh-Hant.json@@ -218,6 +218,8 @@"message": {"no-memos": "ζ²ζ Memo δΊ π","memos-ready": "ζζ Memo ε·²ε°±η· π",+ "no-resource": "ζ²ζ Resource δΊ π",+ "memos-resource": "ζζ Resource ε·²ε°±η· π","restored-successfully": "ιεζε","memo-updated-datetime": "Memo ε»Ίη«ζ₯ζζιε·²ζ΄ζΉγ","invalid-created-datetime": "ε»Ίη«ηζ₯ζζιη‘ζγ",diff --git a/web/src/locales/zh.json b/web/src/locales/zh.jsonindex addb45b59..f6ead9941 100644--- a/web/src/locales/zh.json+++ b/web/src/locales/zh.json@@ -221,6 +221,8 @@"message": {"no-memos": "沑ζ Memo δΊ π","memos-ready": "ζζ Memo ε·²ε°±η»ͺ π",+ "no-resource": "沑ζ Resource δΊ π",+ "resource-ready": "ζζ Resource ε·²ε°±η»ͺ π","restored-successfully": "ζ’ε€ζε","memo-updated-datetime": "Memo εε»Ίζ₯ζζΆι΄ε·²ζ΄ζΉγ","invalid-created-datetime": "εε»Ίηζ₯ζζΆι΄ζ ζγ",diff --git a/web/src/pages/ResourcesDashboard.tsx b/web/src/pages/ResourcesDashboard.tsxindex 8e00db2e9..739053f20 100644--- a/web/src/pages/ResourcesDashboard.tsx+++ b/web/src/pages/ResourcesDashboard.tsx@@ -16,6 +16,7 @@ import { showCommonDialog } from "@/components/Dialog/CommonDialog";import showChangeResourceFilenameDialog from "@/components/ChangeResourceFilenameDialog";import showPreviewImageDialog from "@/components/PreviewImageDialog";import showCreateResourceDialog from "@/components/CreateResourceDialog";+import { DEFAULT_MEMO_LIMIT } from "@/helpers/consts";const ResourcesDashboard = () => {const { t } = useTranslation();@@ -26,16 +27,20 @@ const ResourcesDashboard = () => {const [listStyle, setListStyle] = useState<"GRID" | "TABLE">("GRID");const [queryText, setQueryText] = useState<string>("");const [dragActive, setDragActive] = useState(false);+ const [isComplete, setIsComplete] = useState<boolean>(false);useEffect(() => {resourceStore- .fetchResourceList()+ .fetchResourceListWithLimit(DEFAULT_MEMO_LIMIT)+ .then((fetchedResource) => {+ if (fetchedResource.length < DEFAULT_MEMO_LIMIT) {+ setIsComplete(true);+ }+ loadingState.setFinish();+ }).catch((error) => {console.error(error);toast.error(error.response.data.message);- })- .finally(() => {- loadingState.setFinish();});}, []);@@ -47,29 +52,31 @@ const ResourcesDashboard = () => {setSelectedList(selectedList.filter((resId) => resId !== resourceId));};- const handleDeleteUnusedResourcesBtnClick = () => {+ const handleDeleteUnusedResourcesBtnClick = async () => {let warningText = t("resources.warning-text-unused");- const unusedResources = resources.filter((resource) => {- if (resource.linkedMemoAmount === 0) {- warningText = warningText + `\n- ${resource.filename}`;- return true;- }- return false;- });- if (unusedResources.length === 0) {- toast.success(t("resources.no-unused-resources"));- return;- }- showCommonDialog({- title: t("resources.delete-resource"),- content: warningText,- style: "warning",- dialogName: "delete-unused-resources",- onConfirm: async () => {- for (const resource of unusedResources) {- await resourceStore.deleteResourceById(resource.id);+ await loadAllResources((allResources: Resource[]) => {+ const unusedResources = allResources.filter((resource) => {+ if (resource.linkedMemoAmount === 0) {+ warningText = warningText + `\n- ${resource.filename}`;+ return true;}- },+ return false;+ });+ if (unusedResources.length === 0) {+ toast.success(t("resources.no-unused-resources"));+ return;+ }+ showCommonDialog({+ title: t("resources.delete-resource"),+ content: warningText,+ style: "warning",+ dialogName: "delete-unused-resources",+ onConfirm: async () => {+ for (const resource of unusedResources) {+ await resourceStore.deleteResourceById(resource.id);+ }+ },+ });});};@@ -136,9 +143,44 @@ const ResourcesDashboard = () => {toast.success(t("message.succeed-copy-resource-link"));};- const handleSearchResourceInputChange = (query: string) => {- setQueryText(query);- setSelectedList([]);+ const handleFetchMoreResourceBtnClick = async () => {+ try {+ const fetchedResource = await resourceStore.fetchResourceListWithLimit(DEFAULT_MEMO_LIMIT, resources.length);+ if (fetchedResource.length < DEFAULT_MEMO_LIMIT) {+ setIsComplete(true);+ } else {+ setIsComplete(false);+ }+ } catch (error: any) {+ console.error(error);+ toast.error(error.response.data.message);+ }+ };++ const loadAllResources = async (resolve: (allResources: Resource[]) => void) => {+ if (!isComplete) {+ loadingState.setLoading();+ try {+ const allResources = await resourceStore.fetchResourceList();+ loadingState.setFinish();+ setIsComplete(true);+ resolve(allResources);+ } catch (error: any) {+ console.error(error);+ toast.error(error.response.data.message);+ }+ } else {+ resolve(resources);+ }+ };++ const handleSearchResourceInputChange = async (query: string) => {+ // to prevent first tiger when page is loaded+ if (query === queryText) return;+ await loadAllResources(() => {+ setQueryText(query);+ setSelectedList([]);+ });};const resourceList = useMemo(@@ -304,6 +346,23 @@ const ResourcesDashboard = () => {</div>)}</div>+ <div className="flex flex-col justify-start items-center w-full my-6">+ <p className="text-sm text-gray-400 italic">+ {isComplete ? (+ resources.length === 0 ? (+ t("message.no-resource")+ ) : (+ t("message.resource-ready")+ )+ ) : (+ <>+ <span className="cursor-pointer hover:text-green-600" onClick={handleFetchMoreResourceBtnClick}>+ {t("memo-list.fetch-more")}+ </span>+ </>+ )}+ </p>+ </div></div></div></section>diff --git a/web/src/store/module/resource.ts b/web/src/store/module/resource.tsindex 8b6c712d9..052af42ad 100644--- a/web/src/store/module/resource.ts+++ b/web/src/store/module/resource.ts@@ -1,6 +1,7 @@import store, { useAppSelector } from "../";-import { patchResource, setResources, deleteResource } from "../reducer/resource";+import { patchResource, setResources, deleteResource, upsertResources } from "../reducer/resource";import * as api from "../../helpers/api";+import { DEFAULT_MEMO_LIMIT } from "../../helpers/consts";const MAX_FILE_SIZE = 32 << 20;@@ -26,6 +27,16 @@ export const useResourceStore = () => {store.dispatch(setResources(resourceList));return resourceList;},+ async fetchResourceListWithLimit(limit = DEFAULT_MEMO_LIMIT, offset?: number): Promise<Resource[]> {+ const resourceFind: ResourceFind = {+ limit,+ offset,+ };+ const { data } = (await api.getResourceListWithLimit(resourceFind)).data;+ const resourceList = data.map((m) => convertResponseModelResource(m));+ store.dispatch(upsertResources(resourceList));+ return resourceList;+ },async createResource(resourceCreate: ResourceCreate): Promise<Resource> {const { data } = (await api.createResource(resourceCreate)).data;const resource = convertResponseModelResource(data);diff --git a/web/src/store/reducer/resource.ts b/web/src/store/reducer/resource.tsindex a6b5183d8..5b09b92fe 100644--- a/web/src/store/reducer/resource.ts+++ b/web/src/store/reducer/resource.ts@@ -1,4 +1,5 @@import { createSlice, PayloadAction } from "@reduxjs/toolkit";+import { uniqBy } from "lodash-es";interface State {resources: Resource[];@@ -16,6 +17,12 @@ const resourceSlice = createSlice({resources: action.payload,};},+ upsertResources: (state, action: PayloadAction<Resource[]>) => {+ return {+ ...state,+ resources: uniqBy([...state.resources, ...action.payload], "id"),+ };+ },patchResource: (state, action: PayloadAction<Partial<Resource>>) => {return {...state,@@ -42,6 +49,6 @@ const resourceSlice = createSlice({},});-export const { setResources, patchResource, deleteResource } = resourceSlice.actions;+export const { setResources, upsertResources, patchResource, deleteResource } = resourceSlice.actions;export default resourceSlice.reducer;diff --git a/web/src/types/modules/resource.d.ts b/web/src/types/modules/resource.d.tsindex 0ce5f9d01..0fd7618c2 100644--- a/web/src/types/modules/resource.d.ts+++ b/web/src/types/modules/resource.d.ts@@ -24,3 +24,8 @@ interface ResourcePatch {id: ResourceId;filename?: string;}++interface ResourceFind {+ offset?: number;+ limit?: number;+}