From f3a38c30c682ff483ffeb1a7ae5369769a057cab Mon Sep 17 00:00:00 2001
From: Black-Hole <158blackhole@gmail.com>
Date: Sat, 15 Jan 2022 10:37:29 +0800
Subject: [PATCH] fix(renderer-app,web): pan list result incorrect when file
 number more then 50 (#1299)

---
 .../renderer-app/src/api-middleware/flatServer/storage.ts    | 1 +
 desktop/renderer-app/src/pages/CloudStoragePage/store.tsx    | 5 ++++-
 desktop/renderer-app/src/utils/drag-and-drop/image.ts        | 5 ++++-
 web/flat-web/src/api-middleware/flatServer/storage.ts        | 1 +
 web/flat-web/src/pages/CloudStoragePage/store.tsx            | 5 ++++-
 web/flat-web/src/utils/drag-and-drop/image.ts                | 5 ++++-
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/desktop/renderer-app/src/api-middleware/flatServer/storage.ts b/desktop/renderer-app/src/api-middleware/flatServer/storage.ts
index cc225c62db1..e8436490811 100644
--- a/desktop/renderer-app/src/api-middleware/flatServer/storage.ts
+++ b/desktop/renderer-app/src/api-middleware/flatServer/storage.ts
@@ -4,6 +4,7 @@ import { post } from "./utils";
 
 export interface ListFilesPayload {
     page: number;
+    order: "ASC" | "DESC";
 }
 interface ListFilesResponse {
     totalUsage: number;
diff --git a/desktop/renderer-app/src/pages/CloudStoragePage/store.tsx b/desktop/renderer-app/src/pages/CloudStoragePage/store.tsx
index aebc1ccd5f7..8dfcaa37313 100644
--- a/desktop/renderer-app/src/pages/CloudStoragePage/store.tsx
+++ b/desktop/renderer-app/src/pages/CloudStoragePage/store.tsx
@@ -318,7 +318,10 @@ export class CloudStorageStore extends CloudStorageStoreBase {
         this.clearRefreshFilesNowTimeout();
 
         try {
-            const { totalUsage, files: cloudFiles } = await listFiles({ page: 1 });
+            const { totalUsage, files: cloudFiles } = await listFiles({
+                page: 1,
+                order: "DESC",
+            });
 
             runInAction(() => {
                 this.totalUsage = totalUsage;
diff --git a/desktop/renderer-app/src/utils/drag-and-drop/image.ts b/desktop/renderer-app/src/utils/drag-and-drop/image.ts
index 8a1a0e3c0ba..7d1e88565fe 100644
--- a/desktop/renderer-app/src/utils/drag-and-drop/image.ts
+++ b/desktop/renderer-app/src/utils/drag-and-drop/image.ts
@@ -33,7 +33,10 @@ export async function onDropImage(file: File, x: number, y: number, room: Room):
     const getSize = getImageSize(file);
     const task = new UploadTask(file);
     await task.upload();
-    const { files } = await listFiles({ page: 1 });
+    const { files } = await listFiles({
+        page: 1,
+        order: "DESC",
+    });
     const cloudFile = files.find(f => f.fileUUID === task.fileUUID);
 
     hideLoading();
diff --git a/web/flat-web/src/api-middleware/flatServer/storage.ts b/web/flat-web/src/api-middleware/flatServer/storage.ts
index cc225c62db1..e8436490811 100644
--- a/web/flat-web/src/api-middleware/flatServer/storage.ts
+++ b/web/flat-web/src/api-middleware/flatServer/storage.ts
@@ -4,6 +4,7 @@ import { post } from "./utils";
 
 export interface ListFilesPayload {
     page: number;
+    order: "ASC" | "DESC";
 }
 interface ListFilesResponse {
     totalUsage: number;
diff --git a/web/flat-web/src/pages/CloudStoragePage/store.tsx b/web/flat-web/src/pages/CloudStoragePage/store.tsx
index efeb426a0db..c912024a724 100644
--- a/web/flat-web/src/pages/CloudStoragePage/store.tsx
+++ b/web/flat-web/src/pages/CloudStoragePage/store.tsx
@@ -318,7 +318,10 @@ export class CloudStorageStore extends CloudStorageStoreBase {
         this.clearRefreshFilesNowTimeout();
 
         try {
-            const { totalUsage, files: cloudFiles } = await listFiles({ page: 1 });
+            const { totalUsage, files: cloudFiles } = await listFiles({
+                page: 1,
+                order: "DESC",
+            });
 
             runInAction(() => {
                 this.totalUsage = totalUsage;
diff --git a/web/flat-web/src/utils/drag-and-drop/image.ts b/web/flat-web/src/utils/drag-and-drop/image.ts
index 8a1a0e3c0ba..7d1e88565fe 100644
--- a/web/flat-web/src/utils/drag-and-drop/image.ts
+++ b/web/flat-web/src/utils/drag-and-drop/image.ts
@@ -33,7 +33,10 @@ export async function onDropImage(file: File, x: number, y: number, room: Room):
     const getSize = getImageSize(file);
     const task = new UploadTask(file);
     await task.upload();
-    const { files } = await listFiles({ page: 1 });
+    const { files } = await listFiles({
+        page: 1,
+        order: "DESC",
+    });
     const cloudFile = files.find(f => f.fileUUID === task.fileUUID);
 
     hideLoading();