@adminforth/bulk-ai-flow 1.2.0 → 1.3.0

package/build.log

@@ -11,5 +11,5 @@ custom/tsconfig.json
 custom/visionAction.vue
 custom/visionTable.vue
 
-sent 56,260 bytes  received 134 bytes  112,788.00 bytes/sec
-total size is 55,753  speedup is 0.99
+sent 56,599 bytes  received 134 bytes  113,466.00 bytes/sec
+total size is 56,099  speedup is 0.99

package/custom/imageGenerationCarousel.vue

@@ -339,7 +339,7 @@ async function getGenerationPrompt() {
     if(!resp) {
       emit('error', {
         isError: true,
-        errorMessage: "Something went wrong. Check your internet connection and try again."
+        errorMessage: "Error getting generation prompts."
     });
     }
     return resp?.generationOptions || null;
@@ -400,7 +400,7 @@ async function generateImages() {
       });
     emit('error', {
       isError: true,
-      errorMessage: error
+      errorMessage: "Error re-generating images"
     });
     }
     return;

package/custom/visionAction.vue

@@ -43,7 +43,7 @@
           />
           <div class="flex w-full items-end justify-end gap-4">
             <div class="h-full text-red-600 font-semibold flex items-center justify-center mb-2">
-              <p v-if="isError === true">{{ "Network error, please try again" }}</p>
+              <p v-if="isError === true">{{ errorMessage }}</p>
             </div>
             <button type="button" class="py-2.5 px-5 ms-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-lg border border-gray-200 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
               @click="closeDialog"
@@ -53,7 +53,7 @@
             <Button 
               class="w-64"
               @click="saveData"
-              :disabled="isLoading || checkedCount < 1"
+              :disabled="isLoading || checkedCount < 1 || isCriticalError"
               :loader="isLoading"
             >
             {{ checkedCount > 1 ? 'Save fields' : 'Save field' }}
@@ -106,6 +106,7 @@ const primaryKey = props.meta.primaryKey;
 const openGenerationCarousel = ref([]);
 const isLoading = ref(false);
 const isError = ref(false);
+const isCriticalError = ref(false);
 const errorMessage = ref('');
 const checkedCount = ref(0);
 
@@ -143,7 +144,7 @@ const openDialog = async () => {
 }
  
 watch(selected, (val) => {
-  //console.log('Selected changed:', val);
+  console.log('Selected changed:', val);
   checkedCount.value = val.filter(item => item.isChecked === true).length;
 }, { deep: true });
 
@@ -254,7 +255,7 @@ async function getRecords() {
   } catch (error) {
     console.error('Failed to get records:', error);
     isError.value = true;
-    errorMessage.value = `Failed to get records ${error}. Please, try to re-run the action.`;
+    errorMessage.value = `Failed to fetch records. Please, try to re-run the action.`;
     // Handle error appropriately
   }
 }
@@ -272,7 +273,7 @@ async function getImages() {
   } catch (error) {
     console.error('Failed to get images:', error);
     isError.value = true;
-    errorMessage.value = `Failed to get images ${error}. Please, try to re-run the action.`;
+    errorMessage.value = `Failed to fetch images. Please, try to re-run the action.`;
     // Handle error appropriately
   }
 }
@@ -353,9 +354,9 @@ async function analyzeFields() {
       }
     })
   } catch (error) {
-    console.error('Failed to get records:', error);
+    console.error('Failed to analyze image(s):', error);
     isError.value = true;
-    errorMessage.value = `Failed to get records ${error}. Please, try to re-run the action.`;
+    errorMessage.value = `Failed to fetch analyze image(s). Please, try to re-run the action.`;
   }
 }
 
@@ -388,9 +389,9 @@ async function analyzeFieldsNoImages() {
       }
     })
   } catch (error) {
-    console.error('Failed to get records:', error);
+    console.error('Failed to analyze fields:', error);
     isError.value = true;
-    errorMessage.value = `Failed to get records ${error}. Please, try to re-run the action.`;
+    errorMessage.value = `Failed to analyze fields. Please, try to re-run the action.`;
   }
 }
 
@@ -428,19 +429,27 @@ async function saveData() {
       },
     });
 
-    if(res.ok) {
+    if(res.ok === true) {
       confirmDialog.value.close();
       props.updateList();
       props.clearCheckboxes();
+    } else if (res.ok === false) {
+      adminforth.alert({
+        message: 'You are not allowed to save.',
+        variant: 'danger',
+        timeout: 'unlimited',
+      });
+      isError.value = true;
+      errorMessage.value = `Failed to save data. You are not allowed to save.`;
     } else {
       console.error('Error saving data:', res);
       isError.value = true;
-      errorMessage.value = `Failed to save data ${res}. Please, try to re-run the action.`;
+      errorMessage.value = `Failed to save data. Please, try to re-run the action.`;
     }
   } catch (error) {
     console.error('Error saving data:', error);
     isError.value = true;
-    errorMessage.value = `Failed to save data ${error}. Please, try to re-run the action.`;
+    errorMessage.value = `Failed to save data. Please, try to re-run the action.`;
   } finally {
     isLoading.value = false;
   }
@@ -462,7 +471,8 @@ async function generateImages() {
   } catch (e) {
     console.error('Error generating images:', e);
     isError.value = true;
-    errorMessage.value = `Failed to generate images ${e}. Please, try to re-run the action.`;
+    isCriticalError.value = true;
+    errorMessage.value = `Failed to generate images. Please, try to re-run the action.`;
   }
   isAiResponseReceivedImage.value = props.checkboxes.map(() => true);
 
@@ -472,7 +482,8 @@ async function generateImages() {
   if (!res) {
     error = 'Error generating images, something went wrong';
     isError.value = true;
-    errorMessage.value = `Failed to generate images ${e}. Please, try to re-run the action.`;
+    isCriticalError.value = true;
+    errorMessage.value = `Failed to generate images. Please, try to re-run the action.`;
   }
 
   if (error) { 

package/dist/custom/imageGenerationCarousel.vue

@@ -339,7 +339,7 @@ async function getGenerationPrompt() {
     if(!resp) {
       emit('error', {
         isError: true,
-        errorMessage: "Something went wrong. Check your internet connection and try again."
+        errorMessage: "Error getting generation prompts."
     });
     }
     return resp?.generationOptions || null;
@@ -400,7 +400,7 @@ async function generateImages() {
       });
     emit('error', {
       isError: true,
-      errorMessage: error
+      errorMessage: "Error re-generating images"
     });
     }
     return;

package/dist/custom/visionAction.vue

@@ -43,7 +43,7 @@
           />
           <div class="flex w-full items-end justify-end gap-4">
             <div class="h-full text-red-600 font-semibold flex items-center justify-center mb-2">
-              <p v-if="isError === true">{{ "Network error, please try again" }}</p>
+              <p v-if="isError === true">{{ errorMessage }}</p>
             </div>
             <button type="button" class="py-2.5 px-5 ms-3 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-lg border border-gray-200 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-100 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
               @click="closeDialog"
@@ -53,7 +53,7 @@
             <Button 
               class="w-64"
               @click="saveData"
-              :disabled="isLoading || checkedCount < 1"
+              :disabled="isLoading || checkedCount < 1 || isCriticalError"
               :loader="isLoading"
             >
             {{ checkedCount > 1 ? 'Save fields' : 'Save field' }}
@@ -106,6 +106,7 @@ const primaryKey = props.meta.primaryKey;
 const openGenerationCarousel = ref([]);
 const isLoading = ref(false);
 const isError = ref(false);
+const isCriticalError = ref(false);
 const errorMessage = ref('');
 const checkedCount = ref(0);
 
@@ -143,7 +144,7 @@ const openDialog = async () => {
 }
  
 watch(selected, (val) => {
-  //console.log('Selected changed:', val);
+  console.log('Selected changed:', val);
   checkedCount.value = val.filter(item => item.isChecked === true).length;
 }, { deep: true });
 
@@ -254,7 +255,7 @@ async function getRecords() {
   } catch (error) {
     console.error('Failed to get records:', error);
     isError.value = true;
-    errorMessage.value = `Failed to get records ${error}. Please, try to re-run the action.`;
+    errorMessage.value = `Failed to fetch records. Please, try to re-run the action.`;
     // Handle error appropriately
   }
 }
@@ -272,7 +273,7 @@ async function getImages() {
   } catch (error) {
     console.error('Failed to get images:', error);
     isError.value = true;
-    errorMessage.value = `Failed to get images ${error}. Please, try to re-run the action.`;
+    errorMessage.value = `Failed to fetch images. Please, try to re-run the action.`;
     // Handle error appropriately
   }
 }
@@ -353,9 +354,9 @@ async function analyzeFields() {
       }
     })
   } catch (error) {
-    console.error('Failed to get records:', error);
+    console.error('Failed to analyze image(s):', error);
     isError.value = true;
-    errorMessage.value = `Failed to get records ${error}. Please, try to re-run the action.`;
+    errorMessage.value = `Failed to fetch analyze image(s). Please, try to re-run the action.`;
   }
 }
 
@@ -388,9 +389,9 @@ async function analyzeFieldsNoImages() {
       }
     })
   } catch (error) {
-    console.error('Failed to get records:', error);
+    console.error('Failed to analyze fields:', error);
     isError.value = true;
-    errorMessage.value = `Failed to get records ${error}. Please, try to re-run the action.`;
+    errorMessage.value = `Failed to analyze fields. Please, try to re-run the action.`;
   }
 }
 
@@ -428,19 +429,27 @@ async function saveData() {
       },
     });
 
-    if(res.ok) {
+    if(res.ok === true) {
       confirmDialog.value.close();
       props.updateList();
       props.clearCheckboxes();
+    } else if (res.ok === false) {
+      adminforth.alert({
+        message: 'You are not allowed to save.',
+        variant: 'danger',
+        timeout: 'unlimited',
+      });
+      isError.value = true;
+      errorMessage.value = `Failed to save data. You are not allowed to save.`;
     } else {
       console.error('Error saving data:', res);
       isError.value = true;
-      errorMessage.value = `Failed to save data ${res}. Please, try to re-run the action.`;
+      errorMessage.value = `Failed to save data. Please, try to re-run the action.`;
     }
   } catch (error) {
     console.error('Error saving data:', error);
     isError.value = true;
-    errorMessage.value = `Failed to save data ${error}. Please, try to re-run the action.`;
+    errorMessage.value = `Failed to save data. Please, try to re-run the action.`;
   } finally {
     isLoading.value = false;
   }
@@ -462,7 +471,8 @@ async function generateImages() {
   } catch (e) {
     console.error('Error generating images:', e);
     isError.value = true;
-    errorMessage.value = `Failed to generate images ${e}. Please, try to re-run the action.`;
+    isCriticalError.value = true;
+    errorMessage.value = `Failed to generate images. Please, try to re-run the action.`;
   }
   isAiResponseReceivedImage.value = props.checkboxes.map(() => true);
 
@@ -472,7 +482,8 @@ async function generateImages() {
   if (!res) {
     error = 'Error generating images, something went wrong';
     isError.value = true;
-    errorMessage.value = `Failed to generate images ${e}. Please, try to re-run the action.`;
+    isCriticalError.value = true;
+    errorMessage.value = `Failed to generate images. Please, try to re-run the action.`;
   }
 
   if (error) { 

package/dist/index.js

@@ -293,44 +293,49 @@ export default class BulkAiFlowPlugin extends AdminForthPlugin {
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/update_fields`,
             handler: (body) => __awaiter(this, void 0, void 0, function* () {
-                const selectedIds = body.body.selectedIds || [];
-                const fieldsToUpdate = body.body.fields || {};
-                const outputImageFields = [];
-                if (this.options.generateImages) {
-                    for (const [key, value] of Object.entries(this.options.generateImages)) {
-                        outputImageFields.push(key);
+                if (this.options.isAllowedToSave !== false) {
+                    const selectedIds = body.body.selectedIds || [];
+                    const fieldsToUpdate = body.body.fields || {};
+                    const outputImageFields = [];
+                    if (this.options.generateImages) {
+                        for (const [key, value] of Object.entries(this.options.generateImages)) {
+                            outputImageFields.push(key);
+                        }
                     }
-                }
-                const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
-                const updates = selectedIds.map((ID, idx) => __awaiter(this, void 0, void 0, function* () {
-                    const oldRecord = yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ(primaryKeyColumn.name, ID)]);
-                    for (const [key, value] of Object.entries(outputImageFields)) {
-                        const columnPlugin = this.adminforth.activatedPlugins.find(p => p.resourceConfig.resourceId === this.resourceConfig.resourceId &&
-                            p.pluginOptions.pathColumnName === value);
-                        if (columnPlugin) {
-                            if (columnPlugin.pluginOptions.storageAdapter.objectCanBeAccesedPublicly()) {
-                                if (oldRecord[value]) {
-                                    // put tag to delete old file
-                                    try {
-                                        yield columnPlugin.pluginOptions.storageAdapter.markKeyForDeletation(oldRecord[value]);
+                    const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
+                    const updates = selectedIds.map((ID, idx) => __awaiter(this, void 0, void 0, function* () {
+                        const oldRecord = yield this.adminforth.resource(this.resourceConfig.resourceId).get([Filters.EQ(primaryKeyColumn.name, ID)]);
+                        for (const [key, value] of Object.entries(outputImageFields)) {
+                            const columnPlugin = this.adminforth.activatedPlugins.find(p => p.resourceConfig.resourceId === this.resourceConfig.resourceId &&
+                                p.pluginOptions.pathColumnName === value);
+                            if (columnPlugin) {
+                                if (columnPlugin.pluginOptions.storageAdapter.objectCanBeAccesedPublicly()) {
+                                    if (oldRecord[value]) {
+                                        // put tag to delete old file
+                                        try {
+                                            yield columnPlugin.pluginOptions.storageAdapter.markKeyForDeletation(oldRecord[value]);
+                                        }
+                                        catch (e) {
+                                            // file might be e.g. already deleted, so we catch error
+                                            console.error(`Error setting tag to true for object ${oldRecord[value]}. File will not be auto-cleaned up`, e);
+                                        }
                                     }
-                                    catch (e) {
-                                        // file might be e.g. already deleted, so we catch error
-                                        console.error(`Error setting tag to true for object ${oldRecord[value]}. File will not be auto-cleaned up`, e);
+                                    if (fieldsToUpdate[idx][key] !== null) {
+                                        // remove tag from new file
+                                        // in this case we let it crash if it fails: this is a new file which just was uploaded. 
+                                        yield columnPlugin.pluginOptions.storageAdapter.markKeyForNotDeletation(fieldsToUpdate[idx][value]);
                                     }
                                 }
-                                if (fieldsToUpdate[idx][key] !== null) {
-                                    // remove tag from new file
-                                    // in this case we let it crash if it fails: this is a new file which just was uploaded. 
-                                    yield columnPlugin.pluginOptions.storageAdapter.markKeyForNotDeletation(fieldsToUpdate[idx][value]);
-                                }
                             }
                         }
-                    }
-                    return this.adminforth.resource(this.resourceConfig.resourceId).update(ID, fieldsToUpdate[idx]);
-                }));
-                yield Promise.all(updates);
-                return { ok: true };
+                        return this.adminforth.resource(this.resourceConfig.resourceId).update(ID, fieldsToUpdate[idx]);
+                    }));
+                    yield Promise.all(updates);
+                    return { ok: true };
+                }
+                else {
+                    return { ok: false };
+                }
             })
         });
         server.endpoint({

package/index.ts

@@ -339,45 +339,49 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/update_fields`,
       handler: async ( body ) => {
-        const selectedIds = body.body.selectedIds || [];
-        const fieldsToUpdate = body.body.fields || {};
-        const outputImageFields = [];
-        if (this.options.generateImages) {
-          for (const [key, value] of Object.entries(this.options.generateImages)) {
-            outputImageFields.push(key);
+        if(this.options.isAllowedToSave !== false) {
+          const selectedIds = body.body.selectedIds || [];
+          const fieldsToUpdate = body.body.fields || {};
+          const outputImageFields = [];
+          if (this.options.generateImages) {
+            for (const [key, value] of Object.entries(this.options.generateImages)) {
+              outputImageFields.push(key);
+            }
           }
-        }
-        const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
-        const updates = selectedIds.map(async (ID, idx) => {
-          const oldRecord = await this.adminforth.resource(this.resourceConfig.resourceId).get( [Filters.EQ(primaryKeyColumn.name, ID)] );
-          for (const [key, value] of Object.entries(outputImageFields)) {
-            const columnPlugin = this.adminforth.activatedPlugins.find(p => 
-              p.resourceConfig!.resourceId === this.resourceConfig.resourceId &&
-              p.pluginOptions.pathColumnName === value
-            );
-            if (columnPlugin) {
-              if(columnPlugin.pluginOptions.storageAdapter.objectCanBeAccesedPublicly()) {
-                if (oldRecord[value]) {
-                  // put tag to delete old file
-                  try {
-                    await columnPlugin.pluginOptions.storageAdapter.markKeyForDeletation(oldRecord[value]);
-                  } catch (e) {
-                    // file might be e.g. already deleted, so we catch error
-                    console.error(`Error setting tag to true for object ${oldRecord[value]}. File will not be auto-cleaned up`, e);
+          const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
+          const updates = selectedIds.map(async (ID, idx) => {
+            const oldRecord = await this.adminforth.resource(this.resourceConfig.resourceId).get( [Filters.EQ(primaryKeyColumn.name, ID)] );
+            for (const [key, value] of Object.entries(outputImageFields)) {
+              const columnPlugin = this.adminforth.activatedPlugins.find(p => 
+                p.resourceConfig!.resourceId === this.resourceConfig.resourceId &&
+                p.pluginOptions.pathColumnName === value
+              );
+              if (columnPlugin) {
+                if(columnPlugin.pluginOptions.storageAdapter.objectCanBeAccesedPublicly()) {
+                  if (oldRecord[value]) {
+                    // put tag to delete old file
+                    try {
+                      await columnPlugin.pluginOptions.storageAdapter.markKeyForDeletation(oldRecord[value]);
+                    } catch (e) {
+                      // file might be e.g. already deleted, so we catch error
+                      console.error(`Error setting tag to true for object ${oldRecord[value]}. File will not be auto-cleaned up`, e);
+                    }
+                  }
+                  if (fieldsToUpdate[idx][key] !== null) {
+                  // remove tag from new file
+                  // in this case we let it crash if it fails: this is a new file which just was uploaded. 
+                    await  columnPlugin.pluginOptions.storageAdapter.markKeyForNotDeletation(fieldsToUpdate[idx][value]);
                   }
-                }
-                if (fieldsToUpdate[idx][key] !== null) {
-                // remove tag from new file
-                // in this case we let it crash if it fails: this is a new file which just was uploaded. 
-                  await  columnPlugin.pluginOptions.storageAdapter.markKeyForNotDeletation(fieldsToUpdate[idx][value]);
                 }
               }
             }
-          }
-          return this.adminforth.resource(this.resourceConfig.resourceId).update(ID, fieldsToUpdate[idx])
-        });
-        await Promise.all(updates);
-      return { ok: true };
+            return this.adminforth.resource(this.resourceConfig.resourceId).update(ID, fieldsToUpdate[idx])
+          });
+          await Promise.all(updates);
+          return { ok: true };
+        } else {
+          return { ok: false }
+        }
       }
     });
 

package/package.json

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

package/types.ts

@@ -47,4 +47,9 @@ export interface PluginOptions {
      * As rateLimit on generateImages, but applied to bulk generations  
      **/
     bulkGenerationRateLimit?: string, 
+
+    /**
+     * Whether the user is allowed to save the generated images
+     */
+    isAllowedToSave?: boolean
 }