@adminforth/upload 1.4.3 → 1.4.5

package/build.log

@@ -11,5 +11,5 @@ custom/preview.vue
 custom/tsconfig.json
 custom/uploader.vue
 
-sent 42,322 bytes  received 134 bytes  84,912.00 bytes/sec
-total size is 41,840  speedup is 0.99
+sent 42,976 bytes  received 134 bytes  86,220.00 bytes/sec
+total size is 42,487  speedup is 0.99

package/custom/imageGenerator.vue

@@ -57,6 +57,12 @@
                   </div>
                 </div>
 
+                <div v-if="errorMessage" class="absolute flex items-center justify-center w-full h-full z-50 bg-white/80 dark:bg-gray-900/80 rounded-lg">
+                  <div class="pt-20 text-red-500 dark:text-red-400 text-lg font-semibold">
+                    {{ errorMessage }}
+                  </div>
+                </div>
+
                 
                 <div id="gallery" class="relative w-full" data-carousel="static">
                   <!-- Carousel wrapper -->
@@ -118,7 +124,7 @@
             <!-- Modal footer -->
             <div class="flex items-center p-4 md:p-5 border-t border-gray-200 rounded-b dark:border-gray-600">
                 <button type="button" @click="confirmImage"
-                  :disabled="loading"
+                  :disabled="loading || images.length === 0"
                   class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center 
                   dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 
                   disabled:opacity-50 disabled:cursor-not-allowed"
@@ -248,6 +254,8 @@ const loadingTimer: Ref<number | null> = ref(null);
 
 const historicalRuns: Ref<number[]> = ref([]);
 
+const errorMessage: Ref<string | null> = ref(null);
+
 const historicalAverage: Ref<number | null> = computed(() => {
   if (historicalRuns.value.length === 0) return null;
   const sum = historicalRuns.value.reduce((a, b) => a + b, 0);
@@ -262,6 +270,7 @@ function formatTime(seconds: number): string {
 
 
 async function generateImages() {
+  errorMessage.value = null;
   loading.value = true;
   loadingTimer.value = 0;
   const start = Date.now();
@@ -271,7 +280,8 @@ async function generateImages() {
   }, 100);
   const currentIndex = caurosel.value?.getActiveItem()?.position || 0;
   
-  let resp;
+  let resp = null;
+  let error = null;
   try {
     resp = await callAdminForthApi({
       path: `/plugin/${props.meta.pluginInstanceId}/generate_images`,
@@ -287,15 +297,25 @@ async function generateImages() {
     historicalRuns.value.push(loadingTimer.value);
     clearInterval(ticker);
     loadingTimer.value = null;
-
-  }
-  if (resp.error) {
-    adminforth.alert({
-      message: $t('Error: {error}', { error: JSON.stringify(resp.error) }), 
-      variant: 'danger',
-      timeout: 15,
-    });
     loading.value = false;
+  }
+  if (resp?.error) {
+    error = resp.error;
+  }
+  if (!resp) {
+    error = $t('Error generating images, something went wrong');
+  }
+
+  if (error) {
+    if (images.value.length === 0) {
+      errorMessage.value = error;
+    } else {
+      adminforth.alert({
+        message: error,
+        variant: 'danger',
+        timeout: 'unlimited',
+      });
+    }
     return;
   }
 

package/dist/custom/imageGenerator.vue

@@ -57,6 +57,12 @@
                   </div>
                 </div>
 
+                <div v-if="errorMessage" class="absolute flex items-center justify-center w-full h-full z-50 bg-white/80 dark:bg-gray-900/80 rounded-lg">
+                  <div class="pt-20 text-red-500 dark:text-red-400 text-lg font-semibold">
+                    {{ errorMessage }}
+                  </div>
+                </div>
+
                 
                 <div id="gallery" class="relative w-full" data-carousel="static">
                   <!-- Carousel wrapper -->
@@ -118,7 +124,7 @@
             <!-- Modal footer -->
             <div class="flex items-center p-4 md:p-5 border-t border-gray-200 rounded-b dark:border-gray-600">
                 <button type="button" @click="confirmImage"
-                  :disabled="loading"
+                  :disabled="loading || images.length === 0"
                   class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center 
                   dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 
                   disabled:opacity-50 disabled:cursor-not-allowed"
@@ -248,6 +254,8 @@ const loadingTimer: Ref<number | null> = ref(null);
 
 const historicalRuns: Ref<number[]> = ref([]);
 
+const errorMessage: Ref<string | null> = ref(null);
+
 const historicalAverage: Ref<number | null> = computed(() => {
   if (historicalRuns.value.length === 0) return null;
   const sum = historicalRuns.value.reduce((a, b) => a + b, 0);
@@ -262,6 +270,7 @@ function formatTime(seconds: number): string {
 
 
 async function generateImages() {
+  errorMessage.value = null;
   loading.value = true;
   loadingTimer.value = 0;
   const start = Date.now();
@@ -271,7 +280,8 @@ async function generateImages() {
   }, 100);
   const currentIndex = caurosel.value?.getActiveItem()?.position || 0;
   
-  let resp;
+  let resp = null;
+  let error = null;
   try {
     resp = await callAdminForthApi({
       path: `/plugin/${props.meta.pluginInstanceId}/generate_images`,
@@ -287,15 +297,25 @@ async function generateImages() {
     historicalRuns.value.push(loadingTimer.value);
     clearInterval(ticker);
     loadingTimer.value = null;
-
-  }
-  if (resp.error) {
-    adminforth.alert({
-      message: $t('Error: {error}', { error: JSON.stringify(resp.error) }), 
-      variant: 'danger',
-      timeout: 15,
-    });
     loading.value = false;
+  }
+  if (resp?.error) {
+    error = resp.error;
+  }
+  if (!resp) {
+    error = $t('Error generating images, something went wrong');
+  }
+
+  if (error) {
+    if (images.value.length === 0) {
+      errorMessage.value = error;
+    } else {
+      adminforth.alert({
+        message: error,
+        variant: 'danger',
+        timeout: 'unlimited',
+      });
+    }
     return;
   }
 

package/dist/index.js

@@ -99,7 +99,7 @@ getBucketLifecycleConfiguration on bucket ${this.options.s3Bucket} in region ${t
             modifyResourceConfig: { get: () => super.modifyResourceConfig }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             _super.modifyResourceConfig.call(this, adminforth, resourceConfig);
             // after column to store the path of the uploaded file, add new VirtualColumn,
             // show only in edit and create views
@@ -162,14 +162,16 @@ getBucketLifecycleConfiguration on bucket ${this.options.s3Bucket} in region ${t
             }
             const pathColumn = resourceConfig.columns[pathColumnIndex];
             // add preview column to list
-            resourceConfig.columns[pathColumnIndex].components.list = {
-                file: this.componentPath('preview.vue'),
-                meta: pluginFrontendOptions,
-            };
-            resourceConfig.columns[pathColumnIndex].components.show = {
-                file: this.componentPath('preview.vue'),
-                meta: pluginFrontendOptions,
-            };
+            if (((_l = this.options.preview) === null || _l === void 0 ? void 0 : _l.usePreviewComponents) !== false) {
+                resourceConfig.columns[pathColumnIndex].components.list = {
+                    file: this.componentPath('preview.vue'),
+                    meta: pluginFrontendOptions,
+                };
+                resourceConfig.columns[pathColumnIndex].components.show = {
+                    file: this.componentPath('preview.vue'),
+                    meta: pluginFrontendOptions,
+                };
+            }
             // insert virtual column after path column if it is not already there
             const virtualColumnIndex = resourceConfig.columns.findIndex((column) => column.name === virtualColumn.name);
             if (virtualColumnIndex === -1) {

package/index.ts

@@ -165,15 +165,17 @@ getBucketLifecycleConfiguration on bucket ${this.options.s3Bucket} in region ${t
     const pathColumn = resourceConfig.columns[pathColumnIndex];
     
     // add preview column to list
-    resourceConfig.columns[pathColumnIndex].components.list = {
-      file: this.componentPath('preview.vue'),
-      meta: pluginFrontendOptions,
-    };
+    if (this.options.preview?.usePreviewComponents !== false) {
+      resourceConfig.columns[pathColumnIndex].components.list = {
+        file: this.componentPath('preview.vue'),
+        meta: pluginFrontendOptions,
+      };
 
-    resourceConfig.columns[pathColumnIndex].components.show = {
-      file: this.componentPath('preview.vue'),
-      meta: pluginFrontendOptions,
-    };
+      resourceConfig.columns[pathColumnIndex].components.show = {
+        file: this.componentPath('preview.vue'),
+        meta: pluginFrontendOptions,
+      };
+    }
 
     // insert virtual column after path column if it is not already there
     const virtualColumnIndex = resourceConfig.columns.findIndex((column: any) => column.name === virtualColumn.name);
@@ -484,7 +486,6 @@ getBucketLifecycleConfiguration on bucket ${this.options.s3Bucket} in region ${t
       path: `/plugin/${this.pluginInstanceId}/generate_images`,
       handler: async ({ body, adminUser, headers }) => {
         const { prompt, recordId } = body;
-
         if (this.options.generation.rateLimit?.limit) {
           // rate limit
           const { error } = RateLimiter.checkRateLimit(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/upload",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "Plugin for uploading files for adminforth",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/types.ts

@@ -65,6 +65,11 @@ export type PluginOptions = {
 
   preview?: {
 
+    /**
+     * Whether to use preview components provided by the plugin. BY default true
+     */
+    usePreviewComponents?: boolean,
+
     /**
      * Maximum width of the preview image
      */