@adminforth/bulk-ai-flow 1.23.0 → 1.23.2

package/build.log

@@ -13,5 +13,5 @@ custom/package-lock.json
 custom/package.json
 custom/tsconfig.json
 
-sent 103,527 bytes  received 172 bytes  207,398.00 bytes/sec
-total size is 102,891  speedup is 0.99
+sent 103,782 bytes  received 172 bytes  207,908.00 bytes/sec
+total size is 103,137  speedup is 0.99

package/custom/VisionAction.vue

@@ -36,7 +36,7 @@
         { 
           label: t('Cancel'), 
           options: {
-            class: 'bg-white hover:!bg-gray-100 !text-gray-900 hover:!text-gray-800 dark:!bg-gray-800 dark:!text-gray-100 dark:hover:!bg-gray-700 !border-gray-200'
+            class: 'bg-white hover:!bg-gray-100 !text-gray-900 hover:!text-gray-800 dark:!bg-gray-800 dark:!text-gray-100 dark:hover:!bg-gray-700 !border-gray-200 dark:!border-gray-600'
           }, 
           onclick: (dialog) => confirmDialog.tryToHideModal() 
         },
@@ -60,7 +60,7 @@
             {
               label: t('Cancel'),
               options: {
-                class: 'w-2/5 bg-white hover:!bg-gray-100 !text-gray-900 hover:!text-gray-800 dark:!bg-gray-800 dark:!text-gray-100 dark:hover:!bg-gray-700 !border-gray-200'
+                class: 'w-2/5 bg-white hover:!bg-gray-100 !text-gray-900 hover:!text-gray-800 dark:!bg-gray-800 dark:!text-gray-100 dark:hover:!bg-gray-700 !border-gray-200 dark:!border-gray-600'
               },
               onclick: (dialog) => confirmDialog.tryToHideModal()
             },
@@ -81,13 +81,13 @@
           <div v-if="isGenerationPaused" class="flex flex-col gap-2 mb-2">
             <div class="flex items-center gap-2">
               <button
-                class="h-8 px-3 py-1.5 text-sm rounded-md bg-gradient-to-r from-purple-500 via-purple-600 to-purple-700 text-white"
+                class="h-8 px-3 py-1.5 text-sm rounded-md bg-gradient-to-r from-purple-500 via-purple-600 to-purple-700 text-white hover:bg-gradient-to-br focus:ring-4 focus:outline-none focus:ring-purple-300 dark:focus:ring-purple-800 border-none ml-2"
                 @click="resumeGeneration"
               >
                 {{ t('Resume generation') }}
               </button>
               <button
-                class="h-8 px-3 py-1.5 text-sm rounded-md bg-white hover:bg-gray-100 text-gray-900 border border-gray-200"
+                class="h-8 px-3 py-1.5 text-sm rounded-md bg-white hover:bg-gray-100 text-gray-900 border border-gray-200 dark:bg-gray-800 dark:text-gray-100 dark:hover:bg-gray-700 dark:border-gray-600"
                 @click="cancelGeneration"
               >
                 {{ t('Cancel generation') }}

package/dist/custom/VisionAction.vue

@@ -36,7 +36,7 @@
         { 
           label: t('Cancel'), 
           options: {
-            class: 'bg-white hover:!bg-gray-100 !text-gray-900 hover:!text-gray-800 dark:!bg-gray-800 dark:!text-gray-100 dark:hover:!bg-gray-700 !border-gray-200'
+            class: 'bg-white hover:!bg-gray-100 !text-gray-900 hover:!text-gray-800 dark:!bg-gray-800 dark:!text-gray-100 dark:hover:!bg-gray-700 !border-gray-200 dark:!border-gray-600'
           }, 
           onclick: (dialog) => confirmDialog.tryToHideModal() 
         },
@@ -60,7 +60,7 @@
             {
               label: t('Cancel'),
               options: {
-                class: 'w-2/5 bg-white hover:!bg-gray-100 !text-gray-900 hover:!text-gray-800 dark:!bg-gray-800 dark:!text-gray-100 dark:hover:!bg-gray-700 !border-gray-200'
+                class: 'w-2/5 bg-white hover:!bg-gray-100 !text-gray-900 hover:!text-gray-800 dark:!bg-gray-800 dark:!text-gray-100 dark:hover:!bg-gray-700 !border-gray-200 dark:!border-gray-600'
               },
               onclick: (dialog) => confirmDialog.tryToHideModal()
             },
@@ -81,13 +81,13 @@
           <div v-if="isGenerationPaused" class="flex flex-col gap-2 mb-2">
             <div class="flex items-center gap-2">
               <button
-                class="h-8 px-3 py-1.5 text-sm rounded-md bg-gradient-to-r from-purple-500 via-purple-600 to-purple-700 text-white"
+                class="h-8 px-3 py-1.5 text-sm rounded-md bg-gradient-to-r from-purple-500 via-purple-600 to-purple-700 text-white hover:bg-gradient-to-br focus:ring-4 focus:outline-none focus:ring-purple-300 dark:focus:ring-purple-800 border-none ml-2"
                 @click="resumeGeneration"
               >
                 {{ t('Resume generation') }}
               </button>
               <button
-                class="h-8 px-3 py-1.5 text-sm rounded-md bg-white hover:bg-gray-100 text-gray-900 border border-gray-200"
+                class="h-8 px-3 py-1.5 text-sm rounded-md bg-white hover:bg-gray-100 text-gray-900 border border-gray-200 dark:bg-gray-800 dark:text-gray-100 dark:hover:bg-gray-700 dark:border-gray-600"
                 @click="cancelGeneration"
               >
                 {{ t('Cancel generation') }}

package/dist/index.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { AdminForthFilterOperators, AdminForthPlugin, Filters } from "adminforth";
-import { suggestIfTypo } from "adminforth";
+import { suggestIfTypo, filtersTools } from "adminforth";
 import Handlebars from 'handlebars';
 import { RateLimiter } from "adminforth";
 import { randomUUID } from "crypto";
@@ -1035,7 +1035,30 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/get_filtered_ids`,
-            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers }) {
+            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers, query, cookies, requestUrl }) {
+                var _b, _c;
+                const resource = this.resourceConfig;
+                for (const hook of ((_c = (_b = resource.hooks) === null || _b === void 0 ? void 0 : _b.list) === null || _c === void 0 ? void 0 : _c.beforeDatasourceRequest) || []) {
+                    const filterTools = filtersTools.get(body);
+                    body.filtersTools = filterTools;
+                    const resp = yield hook({
+                        resource,
+                        query: body,
+                        adminUser,
+                        //@ts-ignore
+                        filtersTools: filterTools,
+                        extra: {
+                            body, query, headers, cookies, requestUrl
+                        },
+                        adminforth: this.adminforth,
+                    });
+                    if (!resp || (!resp.ok && !resp.error)) {
+                        throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
+                    }
+                    if (resp.error) {
+                        return { error: resp.error };
+                    }
+                }
                 const filters = body.filters;
                 const normalizedFilters = { operator: AdminForthFilterOperators.AND, subFilters: [] };
                 if (filters) {

package/index.ts

@@ -1,11 +1,12 @@
 import { AdminForthFilterOperators, AdminForthPlugin, Filters } from "adminforth";
 import type { IAdminForth, IHttpServer, AdminForthComponentDeclaration, AdminForthResource } from "adminforth";
-import { suggestIfTypo } from "adminforth";
+import { suggestIfTypo, filtersTools } from "adminforth";
 import type { PluginOptions } from './types.js';
 import Handlebars from 'handlebars';
 import { RateLimiter } from "adminforth";
 import { randomUUID } from "crypto";
 
+
 const STUB_MODE = false;
 const jobs = new Map(); 
 export default class  BulkAiFlowPlugin extends AdminForthPlugin {
@@ -1068,7 +1069,30 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/get_filtered_ids`,
-      handler: async ({ body, adminUser, headers }) => {
+      handler: async ({ body, adminUser, headers, query, cookies, requestUrl }) => {
+        const resource = this.resourceConfig;
+
+        for (const hook of resource.hooks?.list?.beforeDatasourceRequest || []) {
+          const filterTools = filtersTools.get(body);
+          body.filtersTools = filterTools;
+          const resp = await hook({
+            resource,
+            query: body,
+            adminUser,
+            //@ts-ignore
+            filtersTools: filterTools, 
+            extra: {
+              body, query, headers, cookies, requestUrl
+            },
+            adminforth: this.adminforth,
+          });
+          if (!resp || (!resp.ok && !resp.error)) {
+            throw new Error(`Hook must return object with {ok: true} or { error: 'Error' } `);
+          }
+          if (resp.error) {
+            return { error: resp.error };
+          }
+        }
         const filters = body.filters;
 
         const normalizedFilters = { operator: AdminForthFilterOperators.AND, subFilters: [] };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/bulk-ai-flow",
-  "version": "1.23.0",
+  "version": "1.23.2",
   "publishConfig": {
     "access": "public"
   },
@@ -30,7 +30,7 @@
     "handlebars": "^4.7.8"
   },
   "peerDependencies": {
-    "adminforth": "next"
+    "adminforth": "^2.21.1"
   },
   "release": {
     "plugins": [