@adminforth/bulk-ai-flow 1.24.4 → 1.25.0

package/build.log

@@ -14,5 +14,5 @@ custom/package.json
 custom/pnpm-lock.yaml
 custom/tsconfig.json
 
-sent 112,987 bytes  received 191 bytes  226,356.00 bytes/sec
-total size is 112,273  speedup is 0.99
+sent 113,881 bytes  received 191 bytes  228,144.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() {
@@ -446,8 +467,16 @@ function getActionLabel(actionType: GenerationAction) {
   return actionType.replace('_', ' ');
 }
 
+function getGenerationFailureGroupKey(actionType: GenerationAction, error: string) {
+  const normalizedError = error
+    .replace(/Please retry in [\d.]+s\.?/g, 'Please retry later.')
+    .replace(/\b\d+\.\d+s\b/g, '<duration>')
+    .replace(/\b[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\b/gi, '<uuid>');
+  return `${actionType}:${normalizedError}`;
+}
+
 function registerGenerationFailure(record: RecordState, actionType: GenerationAction, error: string) {
-  const key = `${actionType}:${error}`;
+  const key = getGenerationFailureGroupKey(actionType, error);
   let group = generationFailureGroups.get(key);
   if (!group) {
     group = {

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() {
@@ -446,8 +467,16 @@ function getActionLabel(actionType: GenerationAction) {
   return actionType.replace('_', ' ');
 }
 
+function getGenerationFailureGroupKey(actionType: GenerationAction, error: string) {
+  const normalizedError = error
+    .replace(/Please retry in [\d.]+s\.?/g, 'Please retry later.')
+    .replace(/\b\d+\.\d+s\b/g, '<duration>')
+    .replace(/\b[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\b/gi, '<uuid>');
+  return `${actionType}:${normalizedError}`;
+}
+
 function registerGenerationFailure(record: RecordState, actionType: GenerationAction, error: string) {
-  const key = `${actionType}:${error}`;
+  const key = getGenerationFailureGroupKey(actionType, error);
   let group = generationFailureGroups.get(key);
   if (!group) {
     group = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/bulk-ai-flow",
-  "version": "1.24.4",
+  "version": "1.25.0",
   "publishConfig": {
     "access": "public"
   },