@adminforth/bulk-ai-flow 1.24.5 → 1.25.1

package/build.log

@@ -14,5 +14,5 @@ custom/package.json
 custom/pnpm-lock.yaml
 custom/tsconfig.json
 
-sent 113,381 bytes  received 191 bytes  227,144.00 bytes/sec
-total size is 112,667  speedup is 0.99
+sent 113,871 bytes  received 191 bytes  228,124.00 bytes/sec
+total size is 113,167  speedup is 0.99

package/custom/VisionAction.vue

@@ -12,10 +12,8 @@
     :class="popupMode === 'generation' ? 'lg:w-auto !lg:max-w-[1600px]' 
       : popupMode === 'settings' ? 'lg:w-[1000px] !lg:max-w-[1000px]' 
         : 'lg:w-[500px] !lg:max-w-[500px]'"
-    :beforeCloseFunction="closeDialog"
+    :beforeCloseFunction="handleBeforeClose"
     :closable="false"
-    :askForCloseConfirmation="popupMode === 'generation' ? true : false"
-    :closeConfirmationText="t('Are you sure you want to close without saving?')"
     :buttons="popupMode === 'generation' ? generationModeButtons : popupMode === 'settings' ? [
           {
             label: t('Save settings'),
@@ -185,6 +183,7 @@ import { useFiltersStore } from '@/stores/filters';
 
 const coreStore = useCoreStore();
 const filtersStore = useFiltersStore();
+const showCloseConfirmModal = ref(false);
 
 const { t } = useI18n();
 const props = defineProps<{
@@ -319,7 +318,7 @@ const generationModeButtons = computed(() => {
       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 dark:!border-gray-600'
       }, 
-      onclick: (dialog) => confirmDialog.value.tryToHideModal() 
+      onclick: async (dialog) => { await handleBeforeClose(dialog); } 
     },
   ]
 
@@ -336,6 +335,28 @@ const generationModeButtons = computed(() => {
   return arrayToReturn;
 });
 
+const handleBeforeClose = async (dialog?: any) => {
+  if (popupMode.value === 'generation') {
+    const confirmed = await adminforth.confirm({
+      title: t('Close without saving?'),
+      message: t('Are you sure you want to close without saving?'),
+      yes: t('Yes'),
+      no: t('Cancel'),
+    });
+
+  if (confirmed) {
+    closeDialog();
+      
+    if (confirmDialog.value && typeof confirmDialog.value.hide === 'function') {
+      confirmDialog.value.hide();
+    } else if (dialog && typeof dialog.hide === 'function') {
+      dialog.hide();
+    }
+    return true; 
+  }
+    return false;
+  }
+}
 
 const isSavingCurrent = ref(false);
 function checkIfDialogOpen() {

package/dist/custom/VisionAction.vue

@@ -12,10 +12,8 @@
     :class="popupMode === 'generation' ? 'lg:w-auto !lg:max-w-[1600px]' 
       : popupMode === 'settings' ? 'lg:w-[1000px] !lg:max-w-[1000px]' 
         : 'lg:w-[500px] !lg:max-w-[500px]'"
-    :beforeCloseFunction="closeDialog"
+    :beforeCloseFunction="handleBeforeClose"
     :closable="false"
-    :askForCloseConfirmation="popupMode === 'generation' ? true : false"
-    :closeConfirmationText="t('Are you sure you want to close without saving?')"
     :buttons="popupMode === 'generation' ? generationModeButtons : popupMode === 'settings' ? [
           {
             label: t('Save settings'),
@@ -185,6 +183,7 @@ import { useFiltersStore } from '@/stores/filters';
 
 const coreStore = useCoreStore();
 const filtersStore = useFiltersStore();
+const showCloseConfirmModal = ref(false);
 
 const { t } = useI18n();
 const props = defineProps<{
@@ -319,7 +318,7 @@ const generationModeButtons = computed(() => {
       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 dark:!border-gray-600'
       }, 
-      onclick: (dialog) => confirmDialog.value.tryToHideModal() 
+      onclick: async (dialog) => { await handleBeforeClose(dialog); } 
     },
   ]
 
@@ -336,6 +335,28 @@ const generationModeButtons = computed(() => {
   return arrayToReturn;
 });
 
+const handleBeforeClose = async (dialog?: any) => {
+  if (popupMode.value === 'generation') {
+    const confirmed = await adminforth.confirm({
+      title: t('Close without saving?'),
+      message: t('Are you sure you want to close without saving?'),
+      yes: t('Yes'),
+      no: t('Cancel'),
+    });
+
+  if (confirmed) {
+    closeDialog();
+      
+    if (confirmDialog.value && typeof confirmDialog.value.hide === 'function') {
+      confirmDialog.value.hide();
+    } else if (dialog && typeof dialog.hide === 'function') {
+      dialog.hide();
+    }
+    return true; 
+  }
+    return false;
+  }
+}
 
 const isSavingCurrent = ref(false);
 function checkIfDialogOpen() {

package/dist/index.js

@@ -989,16 +989,34 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/get-job-status`,
-            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers }) {
+            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers, response }) {
                 const jobId = body.jobId;
                 if (!jobId) {
-                    return { error: "Can't find job id" };
+                    response.setStatus(400);
+                    return {
+                        ok: false,
+                        error: "Can't find job id",
+                    };
                 }
                 const job = jobs.get(jobId);
                 if (!job) {
-                    return { error: "Job not found" };
+                    response.setStatus(404);
+                    return {
+                        ok: false,
+                        error: "Job not found",
+                    };
                 }
-                return { ok: true, job };
+                if (job.status === 'failed') {
+                    response.setStatus(500);
+                    return {
+                        ok: false,
+                        error: job.error
+                    };
+                }
+                return {
+                    ok: true,
+                    job,
+                };
             })
         });
         server.endpoint({

package/index.ts

@@ -1017,16 +1017,37 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/get-job-status`,
-      handler: async ({ body, adminUser, headers }) => {
+      handler: async ({ body, adminUser, headers, response }) => {
         const jobId = body.jobId;
         if (!jobId) {
-          return { error: "Can't find job id" };
+          response.setStatus(400);
+
+          return {
+            ok: false,
+            error: "Can't find job id",
+          };
         }
         const job = jobs.get(jobId);
         if (!job) {
-          return { error: "Job not found" };
+          response.setStatus(404);
+
+          return {
+            ok: false,
+            error: "Job not found",
+          };
         }
-        return { ok: true, job };
+        if (job.status === 'failed') {
+          response.setStatus(500);
+
+          return {
+            ok: false,
+            error: job.error
+          };
+        }
+        return {
+          ok: true,
+          job,
+        };
       }
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/bulk-ai-flow",
-  "version": "1.24.5",
+  "version": "1.25.1",
   "publishConfig": {
     "access": "public"
   },
@@ -25,7 +25,7 @@
   "description": "Bulk AI workflow plugin for AdminForth for batch field generation and image processing",
   "devDependencies": {
     "@types/node": "latest",
-    "adminforth": "^2.42.0",
+    "adminforth": "^2.60.2",
     "semantic-release": "^24.2.1",
     "semantic-release-slack-bot": "^4.0.2",
     "typescript": "^5.7.3"