Add option to use the old flexible pagination for submissions page

config-example.json

@@ -123,5 +123,6 @@
     "type": "like-google-fonts",
     "url": "https://fonts.loli.net"
   },
-  "no_cdn": false
+  "no_cdn": false,
+  "submissions_page_fast_pagination": false
 }

models/common.ts

@@ -136,11 +136,11 @@ export default class Model extends TypeORM.BaseEntity {
     return queryBuilder.getMany();
   }
 
-  static async queryPageWithLargeData<T extends TypeORM.BaseEntity>(this: TypeORM.ObjectType<T>,
+  static async queryPageFast<T extends TypeORM.BaseEntity>(this: TypeORM.ObjectType<T>,
-                                                                    queryBuilder: TypeORM.SelectQueryBuilder<T>,
+                                                           queryBuilder: TypeORM.SelectQueryBuilder<T>,
-                                                                    { currPageTop, currPageBottom, perPage },
+                                                           { currPageTop, currPageBottom, perPage },
-                                                                    idOrder: PaginationIDOrder,
+                                                           idOrder: PaginationIDOrder,
-                                                                    pageType: PaginationType) {
+                                                           pageType: PaginationType) {
     const queryBuilderBak = queryBuilder.clone();
 
     const result = {

modules/submission.js

@@ -103,11 +103,24 @@ app.get('/submissions', async (req, res) => {
       isFiltered = true;
     }
 
-    const queryResult = await JudgeState.queryPageWithLargeData(query, syzoj.utils.paginateLargeData(
+    let judge_state, paginate;
-      req.query.currPageTop, req.query.currPageBottom, syzoj.config.page.judge_state
+
-    ), -1, parseInt(req.query.page));
+    if (syzoj.config.submissions_page_fast_pagination) {
+      const queryResult = await JudgeState.queryPageFast(query, syzoj.utils.paginateFast(
+        req.query.currPageTop, req.query.currPageBottom, syzoj.config.page.judge_state
+      ), -1, parseInt(req.query.page));
+
+      judge_state = queryResult.data;
+      paginate = queryResult.meta;
+    } else {
+      paginate = syzoj.utils.paginate(
+        await JudgeState.countQuery(query),
+        req.query.page,
+        syzoj.config.page.judge_state
+      );
+      judge_state = await JudgeState.queryPage(paginate, query, { id: "DESC" }, true);
+    }
 
-    const judge_state = queryResult.data;
     await judge_state.forEachAsync(async obj => {
       await obj.loadRelationships();
       if (obj.problem.type !== 'submit-answer') obj.code_length = Buffer.from(obj.code).length;
@@ -124,11 +137,12 @@ app.get('/submissions', async (req, res) => {
         result: getRoughResult(x, displayConfig, true),
         running: false,
       })),
-      paginate: queryResult.meta,
+      paginate: paginate,
       pushType: 'rough',
       form: req.query,
       displayConfig: displayConfig,
-      isFiltered: isFiltered
+      isFiltered: isFiltered,
+      fast_pagination: syzoj.config.submissions_page_fast_pagination
     });
   } catch (e) {
     syzoj.log(e);

utility.js

@@ -245,7 +245,7 @@ module.exports = {
       }
     };
   },
-  paginateLargeData(currPageTop, currPageBottom, perPage) {
+  paginateFast(currPageTop, currPageBottom, perPage) {
     function parseIntOrNull(x) {
       if (typeof x === 'string') x = parseInt(x);
       if (typeof x !== 'number' || isNaN(x)) return null;

views/submissions.ejs

@@ -116,7 +116,11 @@
   </div>
   <% } else { %>
   <br>
-  <% include page_largedata %>
+  <% if (fast_pagination) { %>
+    <% include page_fast %>
+  <% } else { %>
+    <% include page %>
+  <% } %>
   <% } %>
 </div>