@simitgroup/simpleapp-generator 2.0.2-f-alpha → 2.0.2-g-alpha

package/ReleaseNote.md

@@ -1,3 +1,8 @@
+[2.0.2g-alpha]
+
+1. fix search no header return pagination
+
+
 [2.0.2f-alpha]
 
 1. fix mini-app search condition

package/package.json

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

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

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