cc-core-cli 1.0.120 → 1.0.121

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-core-cli",
-  "version": "1.0.120",
+  "version": "1.0.121",
   "description": "Command Line Interface tool for generating project templates for the (Your Platform's Name) platform.",
   "main": "bin/index.js",
   "scripts": {

package/template/core/src/core/core.controller.ts

@@ -154,20 +154,26 @@ export class CoreController {
     @Param() params: any,
     @Query() query: any
   ): Promise<any> {
+    const { keywords, filters, page, page_size, sort, grouping } = query;
+    const searchKey = `${keywords || ""}${
+      _.isEmpty(filters) ? "" : JSON.stringify(filters)
+    }${page || ""}${page_size || ""}${sort || ""}${grouping || ""}`;
     if (
       !["mail_setting"].includes(params.entity) &&
       params.entity.indexOf("_setting") !== -1
     ) {
       return this.serviceSetting.getSetting(params.entity, params.key);
     } else {
-      if (/^(?=[a-f\d]{24}$)(\d+[a-f]|[a-f]+\d)/i.test(params.key)) {
+      if (
+        /^(?=[a-f\d]{24}$)(\d+[a-f]|[a-f]+\d)/i.test(params.key) ||
+        _.isEmpty(searchKey)
+      ) {
         return this.service.findOne(
           params.entity,
           params.key,
           this._convertFields(query.fields)
         );
       }
-      const { keywords, filters, page, page_size, sort, grouping } = query;
       return this.service.searchWithLayout(
         params.entity,
         params.key,

package/template/core/src/main.ts

@@ -255,7 +255,6 @@ async function bootstrap() {
 
   // Serve specific file for "/"
   fastify.get("/", (request, reply) => {
-    console.log("Serving / from custom route");
     reply
       .type("text/html")
       .sendFile("index.html", path.join(process.cwd(), "storage/documents"));