@dnax/core 0.54.1 → 0.54.3

package/app/ctrl.ts

@@ -17,6 +17,7 @@ const actions = [
   "batch",
   "count",
   "search",
+  "listActivity",
 ];
 
 function getAction(action: string) {

package/app/hono.ts

@@ -210,7 +210,11 @@ function HonoInstance(): typeof app {
       return await next();
     }
 
-    if (col && (col?.access?.allAction || col?.access?.hasOwnProperty("*"))) {
+    if (
+      col &&
+      (col?.access?.allAction || col?.access?.hasOwnProperty("*")) &&
+      !col?.access?.hasOwnProperty(action)
+    ) {
       let accesFx = col?.access?.allAction || col?.access?.["*"];
       nextLifecyle = await accesFx({
         token: c.var["token"] || null,
@@ -368,11 +372,14 @@ function HonoInstance(): typeof app {
               rest.activity.save({
                 collection: collection,
                 data: {
-                  input: body,
+                  data: body,
                 },
                 action: "authCollection",
                 auth: true,
+                transaction: false,
+                role: sessionStorage().get().role || null,
                 user: sessionStorage().get().state?.user,
+                state: sessionStorage().get().state,
                 ip:
                   c.req.raw.headers?.get("CF-Connecting-IP") ||
                   c.req.raw.headers?.get("x-forwarded-for") ||
@@ -389,11 +396,14 @@ function HonoInstance(): typeof app {
               rest.activity.save({
                 collection: collection,
                 data: {
-                  input: body,
+                  data: body,
                 },
+                transaction: false,
                 action: "authCollection",
                 auth: false,
                 user: sessionStorage().get().state?.user,
+                state: sessionStorage().get().state,
+                role: sessionStorage().get().role || null,
                 ip:
                   c.req.raw.headers?.get("CF-Connecting-IP") ||
                   c.req.raw.headers?.get("x-forwarded-for") ||
@@ -572,6 +582,38 @@ function HonoInstance(): typeof app {
             });
           }
         }
+
+        if (action == "listActivity") {
+          if (col?.hooks?.beforeListActivity) {
+            await col?.hooks?.beforeListActivity({
+              io: Cfg.io,
+              data: body,
+              c: c,
+              rest: rest,
+              action: "listActivity",
+              params: body?.params,
+              session: sessionStorage(),
+              error: fn.error,
+            });
+          }
+          response = await rest.activity.list(collection, {
+            ...body?.params,
+          });
+
+          if (col?.hooks?.afterListActivity) {
+            await col?.hooks?.afterListActivity({
+              io: Cfg.io,
+              data: body,
+              c: c,
+              rest: rest,
+              action: "listActivity",
+              params: body?.params,
+              session: sessionStorage(),
+              error: fn.error,
+              result: response,
+            });
+          }
+        }
         if (action == "findOne") {
           response = await rest.findOne(
             collection,

package/driver/mongo/rest.ts

@@ -85,21 +85,34 @@ class useRest {
    */
   db: Tenant["database"]["db"];
   activity: {
-    save?: (activity: {
+    save: (activity: {
       collection?: string;
       data: {
-        input: any;
+        update?: any;
+        data?: any;
+        input?: any;
+        filter?: any;
+        ids?: string[];
+        id?: string;
       };
       action: string;
       ip?: string;
       user?: object;
+      state?: object;
+      transaction?: boolean;
+      internal?: boolean;
+      auth?: boolean;
+      role?: string | null | undefined;
     }) => Promise<any>;
-    list?: (filter?: {
-      $match: {};
-      $limit?: number;
-      $sort?: {};
-      $skip?: number;
-    }) => Promise<Array<any>>;
+    list: (
+      collection: string,
+      filter?: {
+        $match: {};
+        $limit?: number;
+        $sort?: {};
+        $skip?: number;
+      }
+    ) => Promise<Array<any>>;
   };
   meilisearch: {
     client: InstanceType<typeof MeiliSearch>;
@@ -121,7 +134,8 @@ class useRest {
         return await restActivity.save(this.#tenant, activityInput);
       },
       list: async (
-        activityFilter
+        collection: string,
+        params?: findParam
       ): Promise<
         {
           [key: string]: any;
@@ -146,8 +160,15 @@ class useRest {
           };
         }[]
       > => {
+        params = {
+          ...params,
+          $match: {
+            ...(params?.$match || {}),
+            collection: collection,
+          },
+        };
         return await restActivity
-          .list(this.#tenant, activityFilter || {})
+          .list(this.#tenant, params || {})
           .then((e) => e)
           .catch((err) => []);
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.54.1",
+  "version": "0.54.3",
   "module": "index.ts",
   "type": "module",
   "bin": {

package/types/index.ts

@@ -65,6 +65,7 @@ export type Actions =
   | "authCollection"
   | "aggregate"
   | "upload"
+  | "listActivity"
   | "search";
 
 type omitWhenType = "insertOne" | "insertMany" | "updateOne" | "updateMany";
@@ -399,6 +400,8 @@ export type Collection = {
     afterUpload?: hooksCtx;
     beforeSearch?: hooksCtx;
     afterSearch?: hooksCtx;
+    beforeListActivity?: hooksCtx;
+    afterListActivity?: hooksCtx;
   };
   access?: {
     "*"?: accessCtx;
@@ -417,6 +420,7 @@ export type Collection = {
     upload?: accessCtx;
     count?: accessCtx;
     search?: accessCtx;
+    activity?: accessCtx;
   };
   tenant_id?: string;
   slug: string;
@@ -604,7 +608,8 @@ export type Q = {
     | "batch"
     | "count"
     | "execToolkit"
-    | "search";
+    | "search"
+    | "listActivity";
 };
 
 export type routeOption = {