@simitgroup/simpleapp-generator 2.0.2-c-alpha → 2.0.2-d-alpha

package/ReleaseNote.md

@@ -1,3 +1,8 @@
+[2.0.2d-alpha]
+
+1. fix pagination issue
+
+
 [2.0.2c-alpha]
 
 1. support environment variable off mongodb transaction

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.2c-alpha",
+  "version": "2.0.2d-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

package/templates/basic/nuxt/resource-bridge.service.ts.eta

@@ -79,12 +79,20 @@ export class MiniApp<%= pascalName %>BridgeService {
     <% if (value !== true && typeof value !== 'object') { return; } %>
 
     <% if(action === 'list') { %>
-      protected async handleList(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {
-        return (await this.api!.runSearch({
-          fields: message.params.body?.fields,
-          sorts: message.params.body?.sorts,
-          filter: message.params.body?.filters,
-        })).data;
+      protected async handleList(message: MiniAppBridgeMessageApi<MiniAppStudentActions>) {
+        const rawBody: any = message.params.body ?? {};
+        const pageSize = rawBody.pagination?.pageSize ?? rawBody.pageSize ?? 200;
+        const pageNo = rawBody.pagination?.pageNo ?? rawBody.pageNo ?? 0;
+        const res = await this.api!.runSearch({
+          filter: rawBody.filters,
+          fields: rawBody.fields,
+          sorts: rawBody.sorts,
+          pagination: {
+            pageSize,
+            pageNo,
+          },
+        } as any);
+        return res.data;
       }
     <% } else if(action === 'detail') { %>
       protected async handleDetail(message: MiniAppBridgeMessageApi<<%= typeActionName %>>) {

package/templates/nest/src/simple-app/_core/framework/base/simple-app.controller.ts.eta

@@ -51,8 +51,7 @@ export class SimpleAppController<TService extends ServiceType, TApiSchema> {
     return this.service.fullTextSearch(appuser, body);
   }
 
-  async _search(appuser: UserContext, searchObject: SearchBody, res?: Response) {
-    //return this.service.search(appuser, searchObject['filter'], searchObject['fields'], searchObject['sorts'], searchObject['lookup']);
+  async _search(appuser: UserContext, searchObject: SearchBody, res?: Response) {    
     const items = await this.service.searchWithPageInfo(
       appuser,
       searchObject['filter'],
@@ -61,11 +60,7 @@ export class SimpleAppController<TService extends ServiceType, TApiSchema> {
       searchObject['lookup'],
       searchObject['pagination'],
     );
-
-    if (res && searchObject['pagination']) {
-      const total = await this.service.getTotalCount(appuser, searchObject['filter'] || {});
-      this.service.setPaginationHeaders(res, total, searchObject['pagination']);
-    }
+    
     return items;
   }
 

package/templates/nest/src/simple-app/_core/framework/base/simple-app.service.ts.eta

@@ -413,15 +413,15 @@ export class SimpleAppService<T extends SchemaFields> {
     if (total !== undefined && total !== null && pagination) {
       const { pageSize, pageNo } = this.buildPagination(pagination);
       const pageCount = pageSize > 0 && total > 0 ? Math.ceil(total / pageSize) : (total > 0 ? 1 : 0);
-      res.setHeader('x-page-count', pageCount.toString());
-      res.setHeader('x-page-size', pageSize.toString());
-      res.setHeader('x-page-no', pageNo.toString());
-      res.setHeader('x-total-count', total.toString());
+      res.setHeader('x-page-count', pageCount);
+      res.setHeader('x-page-size', pageSize);
+      res.setHeader('x-page-no', pageNo);
+      res.setHeader('x-total-count', total);
     } else {
-      res.setHeader('x-page-count', '0');
-      res.setHeader('x-page-size', '0');
-      res.setHeader('x-page-no', '0');
-      res.setHeader('x-total-count', '0');
+      res.setHeader('x-page-count', 0);
+      res.setHeader('x-page-size', 0);
+      res.setHeader('x-page-no', 0);
+      res.setHeader('x-total-count', 0);
     }
   }
 

package/templates/nuxt/app.vue.eta

@@ -54,9 +54,9 @@ onMounted(async()=>{
     const currentgroup = useCookie('currentGroup').value
     //if no xorg, no enforce pick group
     if(getCurrentXorg()===''){
-      goTo('picktenant')
+      navigateTo('/picktenant')
     }else if(!currentgroup){
-      navigateTo('/pickgroup')
+      goTo('/pickgroup')
     }
     setGraphqlServer()
   }else{

package/templates/nuxt/plugins/18.simpleapp-custom-field-store.ts.eta

@@ -1,9 +1,9 @@
 import { AxiosInstance } from "axios";
 import { ShallowRef } from "vue";
-import { Customfield, CUSTOMFIELDApi } from "~/simpleapp/generate/openapi";
+import { CustomField, CUSTOMFIELDApi } from "~/simpleapp/generate/openapi";
 
 type CustomFieldStoreData = Pick<
-  Customfield,
+  CustomField,
   "_id" | "collectionName" | "form" | "list"
 >[];
 

package/templates/nuxt/types/others.ts.eta

@@ -79,6 +79,10 @@ export type SearchBody = {
 
   sorts?: any[];
   lookup?: { [key: string]: string };
+  pagination?: {
+    pageSize?: number;
+    pageNo?: number;
+  };
 };
 
 export type DynamicObject = {