@knime/hub-features 1.0.9 → 1.0.10

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @knime/hub-features
 
+## 1.0.10
+
+### Patch Changes
+
+- 15a4479: - fix mimetype detection for KNIME formats (.knwf, .knar)
+  - enforce a max queue size when processing uploads
+- Updated dependencies [15a4479]
+- Updated dependencies [15a4479]
+  - @knime/utils@1.1.2
+  - @knime/components@1.8.2
+
 ## 1.0.9
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knime/hub-features",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Vue components & composables for shared hub features",
   "homepage": "https://knime.github.io/webapps-common/",
   "license": "GPL 3 and Additional Permissions according to Sec. 7 (SEE the file LICENSE)",
@@ -26,9 +26,9 @@
     "@vueuse/shared": "^10.10.0",
     "consola": "3.2.3",
     "typescript": "^5.4.5",
-    "@knime/components": "1.8.1",
+    "@knime/components": "1.8.2",
     "@knime/styles": "1.1.1",
-    "@knime/utils": "1.1.1"
+    "@knime/utils": "1.1.2"
   },
   "peerDependencies": {
     "vue": "3.x"

package/src/useFileUpload/useFileUpload.ts

@@ -1,17 +1,27 @@
-import { computed } from "vue";
+import { computed, ref } from "vue";
 
 import { useUploadManager } from "@knime/components";
-import { promise } from "@knime/utils";
+import { getFileMimeType, promise } from "@knime/utils";
+
+const DEFAULT_MAX_UPLOAD_QUEUE_SIZE = 10;
 
 const DEFAULT_API_BASE_URL = "/_/api";
 
 type UseFileUploadOptions = {
+  /**
+   * Max number of concurrent uploads allowed in the upload queue.
+   * When an upload is started with a number of files that exceed the pending
+   * uploads then only files up-to the max queue size will be processed and the rest
+   * will be ignored. This will also call the `onUploadQueueSizeExceeded` callback
+   */
+  maxUploadQueueSize?: number;
   apiBaseUrl?: string;
   onFileUploadComplete?: (
     uploadId: string,
     filePartIds: Record<number, string>,
   ) => void;
   onFileUploadFailed?: (uploadId: string, error: Error) => void;
+  onUploadQueueSizeExceeded?: (maxQueueSize: number) => void;
 };
 
 /**
@@ -100,7 +110,7 @@ export const useFileUpload = (options: UseFileUploadOptions = {}) => {
       Object.fromEntries(
         Object.entries(fileDictionary).map(([name, file]) => [
           name,
-          { itemContentType: file.type },
+          { itemContentType: getFileMimeType(file) },
         ]),
       );
 
@@ -163,7 +173,6 @@ export const useFileUpload = (options: UseFileUploadOptions = {}) => {
   };
 
   const useUploadManagerResult = useUploadManager({
-    prepareUpload,
     resolveFilePartUploadURL,
 
     onFileUploadComplete: ({ uploadId, filePartIds }) => {
@@ -174,12 +183,7 @@ export const useFileUpload = (options: UseFileUploadOptions = {}) => {
         })
         .catch((error) => {
           consola.error("Error attempting to complete upload", { error });
-          useUploadManagerResult.setFailed(
-            uploadId,
-            error instanceof Error
-              ? error
-              : new Error("Error attempting to complete upload"),
-          );
+          useUploadManagerResult.setFailed(uploadId, error as Error);
         });
     },
 
@@ -188,9 +192,44 @@ export const useFileUpload = (options: UseFileUploadOptions = {}) => {
     },
   });
 
+  const getEnqueueableFiles = (files: File[]): File[] => {
+    const { totalPendingUploads } = useUploadManagerResult;
+
+    const { maxUploadQueueSize = DEFAULT_MAX_UPLOAD_QUEUE_SIZE } = options;
+
+    if (files.length + totalPendingUploads.value > maxUploadQueueSize) {
+      options.onUploadQueueSizeExceeded?.(maxUploadQueueSize);
+    }
+
+    // only keep as many files as the queue allows
+    return files.slice(0, maxUploadQueueSize - totalPendingUploads.value);
+  };
+
+  const isPreparingUpload = ref(false);
+
   return {
     ...useUploadManagerResult,
 
+    isPreparingUpload: computed(() => isPreparingUpload.value),
+
+    start: async (parentId: string, files: File[]) => {
+      try {
+        isPreparingUpload.value = true;
+
+        // TODO: HUB-9102: improve error handling here. see ticket for details
+        const uploadPayload = await promise.retryPromise(() =>
+          prepareUpload(parentId, getEnqueueableFiles(files)),
+        );
+
+        isPreparingUpload.value = false;
+
+        useUploadManagerResult.start(parentId, uploadPayload);
+      } catch (error) {
+        // TODO: HUB-8152 process max file size error
+        consola.error(error);
+      }
+    },
+
     cancel: (uploadId: string) => {
       useUploadManagerResult.cancel(uploadId);
       cancelUpload(uploadId).catch((error) => {