Merge pull request #2867 from appwrite/fix/site-upload-invalid-reason

Fix generic invalid file error in site manual upload

Author: ChiragAgg5k

bun.lock

@@ -88,6 +88,7 @@
         "vitest": "^3.2.4"
     },
     "overrides": {
-        "vite": "npm:rolldown-vite@latest"
+        "vite": "npm:rolldown-vite@latest",
+        "minimatch": "10.2.1"
     }
 }

package.json

@@ -3,7 +3,7 @@ import type { Action } from 'svelte/action';
 
 export type PortalConfig = string | HTMLElement | undefined;
 
-export const portal: Action<HTMLElement, PortalConfig> = (el, target = 'body') => {
+export const portal: Action<HTMLElement, PortalConfig> = (el, target: PortalConfig = 'body') => {
     let targetEl;
 
     async function update(newTarget: PortalConfig) {
@@ -17,7 +17,7 @@ export const portal: Action<HTMLElement, PortalConfig> = (el, target = 'body') =
             if (targetEl === null) {
                 throw new Error(`No element found matching css selector: "${target}"`);
             }
-        } else if (target instanceof HTMLElement) {
+        } else if (typeof target === 'object' && target instanceof HTMLElement) {
             targetEl = target;
         } else {
             throw new TypeError(

src/lib/actions/portal.ts

@@ -1,4 +1,5 @@
 import type { Action } from 'svelte/action';
+import type { Instance } from 'tippy.js';
 import type { Props as TippyProps } from 'tippy.js';
 import tippy from 'tippy.js';
 
@@ -7,7 +8,8 @@ type Props = TippyProps & {
 };
 
 export const tooltip: Action<HTMLElement, Partial<Props>> = (node, config) => {
-    const instance = tippy(node, config);
+    const tippyInstance = tippy(node, config);
+    const instance: Instance = Array.isArray(tippyInstance) ? tippyInstance[0] : tippyInstance;
     if (config.disabled) instance.disable();
 
     return {

src/lib/actions/tooltip.ts

@@ -138,7 +138,22 @@
     }
 
     function handleInvalid(e: CustomEvent) {
-        const reason = e.detail?.reason ?? '';
+        let reason = e.detail?.reason ?? '';
+
+        if (!reason) {
+            const nativeEvent = e.detail as Event | undefined;
+            const input = (nativeEvent?.currentTarget ?? nativeEvent?.target) as
+                | HTMLInputElement
+                | undefined;
+            const pickedFiles = Array.from(input?.files ?? []);
+
+            if (pickedFiles.some((file) => file.size > maxSize)) {
+                reason = InvalidFileType.SIZE;
+            } else if (pickedFiles.some((file) => !file.name.toLowerCase().endsWith('.tar.gz'))) {
+                reason = InvalidFileType.EXTENSION;
+            }
+        }
+
         if (reason === InvalidFileType.EXTENSION) {
             addNotification({
                 type: 'error',
@@ -147,7 +162,7 @@
         } else if (reason === InvalidFileType.SIZE) {
             addNotification({
                 type: 'error',
-                message: 'File size exceeds 10MB'
+                message: `File size exceeds ${readableMaxSize.value}${readableMaxSize.unit}`
             });
         } else {
             addNotification({

src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte

@@ -1,4 +1,4 @@
-import { defineConfig } from 'vite';
+import { defineConfig } from 'vitest/config';
 import { sveltekit } from '@sveltejs/kit/vite';
 import { sentrySvelteKit } from '@sentry/sveltekit';
 import { svelteTesting } from '@testing-library/svelte/vite';