fix: fix S3 deletation tags

Author: yaroslav8765

custom/imageGenerationCarousel.vue

@@ -212,11 +212,9 @@ onMounted(async () => {
   images.value.push((props.images || []));
   const temp = await getGenerationPrompt() || '';
   prompt.value = temp[props.fieldName];
-  console.log('Initial images:', images.value, "with id:", props.recordId, "and prompt:", prompt.value);
   await nextTick();
 
   const currentIndex = caurosel.value?.getActiveItem()?.position || 0;
-  console.log("Setting up carousel with currentIndex:", currentIndex);
   caurosel.value = new Carousel(
     document.getElementById('gallery'), 
     images.value.map((img, index) => {
@@ -273,20 +271,6 @@ onMounted(async () => {
   const recordId = props.record[props.meta.recorPkFieldName];
   if (!recordId) return;
 
-  // try {
-  //   const resp = await callAdminForthApi({
-  //     path: `/plugin/${props.meta.pluginInstanceId}/get_attachment_files`,
-  //     method: 'POST',
-  //     body: { recordId },
-  //   });
-
-  //   if (resp?.files?.length) {
-  //     attachmentFiles.value = resp.files;
-  //     console.log('attachmentFiles', attachmentFiles.value);
-  //   }
-  // } catch (err) {
-  //   console.error('Failed to fetch attachment files', err);
-  // }
 });
 
 async function slide(direction: number) {
@@ -345,7 +329,6 @@ async function getGenerationPrompt() {
       recordId: props.recordId,
     },
   });
-  console.log('Received generation prompts from server:', resp);
   return resp?.generationOptions || null;
 }
 

custom/visionAction.vue

@@ -105,7 +105,7 @@ const openDialog = async () => {
   }
   isLoading.value = true;
   await Promise.all([
-    //analyzeFields(),
+    analyzeFields(),
     generateImages()
   ]);
   isLoading.value = false;
@@ -406,7 +406,7 @@ async function generateImages() {
 
 
 async function uploadImage(imgBlob, id, fieldName) {
-  const file = new File([imgBlob], `generated_${fieldName}_${id}.${imgBlob.type}`, { type: imgBlob.type });
+  const file = new File([imgBlob], `generated_${fieldName}_${id}.${imgBlob.type.split('/').pop()}`, { type: imgBlob.type });
   const { name, size, type } = file;
   
   const extension = name.split('.').pop();

index.ts

@@ -5,7 +5,7 @@ import { json } from "stream/consumers";
 import Handlebars, { compile } from 'handlebars';
 import { RateLimiter } from "adminforth";
 
-const ADMINFORTH_NOT_YET_USED_TAG = 'adminforth-candidate-for-cleanup';
+let outputImageFields = [];
 
 
 export default class  BulkAiFlowPlugin extends AdminForthPlugin {
@@ -53,7 +53,6 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
   private checkRateLimit(fieldNameRateLimit: string | undefined, headers: Record<string, string | string[] | undefined>): { error?: string } | void {
     if (fieldNameRateLimit) {
       // rate limit
-      console.log('Checking rate limit', fieldNameRateLimit);
       const { error } = RateLimiter.checkRateLimit(
         this.pluginInstanceId,
         fieldNameRateLimit,
@@ -86,7 +85,7 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       }
     }
 
-    let outputImageFields = [];
+    outputImageFields = [];
     if (this.options.generateImages) {
       for (const [key, value] of Object.entries(this.options.generateImages)) {
         outputImageFields.push(key);
@@ -123,8 +122,6 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       ...(this.options.generateImages || {})
     };
 
-    // const compiledGenerationOptions = this.compileGenerationFieldTemplates(record);
-    // console.log('Compiled generation options prompt:', compiledGenerationOptions);
 
     const primaryKeyColumn = this.resourceConfig.columns.find((col) => col.primaryKey);
 
@@ -250,15 +247,36 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
       handler: async ( body ) => {
         const selectedIds = body.body.selectedIds || [];
         const fieldsToUpdate = body.body.fields || {};
-        console.log("Updating fields for IDs:", selectedIds, fieldsToUpdate);
-        const updates = selectedIds.map((ID, idx) =>
-          this.adminforth
-            .resource(this.resourceConfig.resourceId)
-            .update(ID, fieldsToUpdate[idx])
-        );
-
+        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]);
+                }
+              }
+            }
+          }
+          return this.adminforth.resource(this.resourceConfig.resourceId).update(ID, fieldsToUpdate[idx])
+        });
         await Promise.all(updates);
-
       return { ok: true };
       }
     });
@@ -323,7 +341,8 @@ export default class  BulkAiFlowPlugin extends AdminForthPlugin {
             let images;
               if (STUB_MODE) {
                 await new Promise((resolve) => setTimeout(resolve, 2000));
-                images = `https://picsum.photos/200/300?random=${Math.floor(Math.random() * 1000)}`;
+                //images = `https://picsum.photos/200/300?random=${Math.floor(Math.random() * 1000)}`;
+                images = "https://cdn.rafled.com/anime-icons/images/6d5f85159da70f7cb29c1121248031fb4a649588a9cd71ff1784653a1f64be31.jpg";
               } else {
                 const resp = await this.options.generateImages[key].adapter.generate(
                   {