@knime/hub-features 1.1.4 → 1.2.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @knime/hub-features
 
+## 1.2.1
+
+### Patch Changes
+
+- Updated dependencies [eabff98]
+  - @knime/components@1.14.0
+
+## 1.2.0
+
+### Minor Changes
+
+- 4f06376: Add hub-specific processing state for for uploads
+
+### Patch Changes
+
+- Updated dependencies [4f06376]
+  - @knime/components@1.13.1
+  - @knime/utils@1.2.3
+
 ## 1.1.4
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knime/hub-features",
-  "version": "1.1.4",
+  "version": "1.2.1",
   "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)",
@@ -27,9 +27,9 @@
     "consola": "3.2.3",
     "ofetch": "^1.4.1",
     "typescript": "^5.4.5",
+    "@knime/components": "1.14.0",
     "@knime/styles": "1.1.1",
-    "@knime/components": "1.13.0",
-    "@knime/utils": "1.2.2"
+    "@knime/utils": "1.2.3"
   },
   "peerDependencies": {
     "vue": "3.x"

package/src/useFileUpload/useFileUpload.ts

@@ -1,4 +1,4 @@
-import { computed, ref } from "vue";
+import { computed, reactive, readonly, ref } from "vue";
 import { FetchError } from "ofetch";
 
 import { useUploadManager } from "@knime/components";
@@ -172,7 +172,32 @@ export const useFileUpload = (options: UseFileUploadOptions = {}) => {
     });
   };
 
-  const useUploadManagerResult = useUploadManager({
+  // contains upload ids for files that have a processing step which was not finished yet
+  const unprocessedUploads = reactive<Set<string>>(new Set());
+  const isFileWithProcessing = (file: File) =>
+    knimeFileFormats.KNWF.matches(file);
+
+  let useUploadManagerResult: ReturnType<typeof useUploadManager> | null = null;
+
+  const setProcessingCompleted = ({ uploadId }: { uploadId: string }) => {
+    unprocessedUploads.delete(uploadId);
+  };
+
+  const setProcessingFailed = ({
+    uploadId,
+    error,
+  }: {
+    uploadId: string;
+    error?: Error;
+  }) => {
+    unprocessedUploads.delete(uploadId);
+    useUploadManagerResult?.setFailed(
+      uploadId,
+      error ?? new Error("An error occurred when processing the file"),
+    );
+  };
+
+  useUploadManagerResult = useUploadManager({
     resolveFilePartUploadURL,
 
     onFileUploadComplete: ({ uploadId, filePartIds }) => {
@@ -183,7 +208,7 @@ export const useFileUpload = (options: UseFileUploadOptions = {}) => {
         })
         .catch((error) => {
           consola.error("Error attempting to complete upload", { error });
-          useUploadManagerResult.setFailed(uploadId, error as Error);
+          setProcessingFailed({ uploadId, error });
         });
     },
 
@@ -205,10 +230,27 @@ export const useFileUpload = (options: UseFileUploadOptions = {}) => {
     return files.slice(0, maxUploadQueueSize - totalPendingUploads.value);
   };
 
+  const { uploadState, ...uploadMangerResultRest } = useUploadManagerResult;
+
+  const uploadItems = computed(() => {
+    return Object.values(uploadState.value).map((uploadItem) => ({
+      ...uploadItem,
+      status:
+        uploadItem.status === "complete" &&
+        unprocessedUploads.has(uploadItem.id)
+          ? "processing"
+          : uploadItem.status,
+    }));
+  });
+
   const prepareQueueSize = ref(0);
 
   return {
-    ...useUploadManagerResult,
+    ...uploadMangerResultRest,
+    uploadItems,
+    unprocessedUploads: readonly(unprocessedUploads),
+    setProcessingCompleted,
+    setProcessingFailed,
 
     isPreparingUpload: computed(() => prepareQueueSize.value > 0),
     totalFilesBeingPrepared: computed(() => prepareQueueSize.value),
@@ -230,6 +272,12 @@ export const useFileUpload = (options: UseFileUploadOptions = {}) => {
           retryDelayMS: DEFAULT_RETRY_DELAY_MS,
         });
 
+        uploadPayload.forEach(({ uploadId, file }) => {
+          if (isFileWithProcessing(file)) {
+            unprocessedUploads.add(uploadId);
+          }
+        });
+
         useUploadManagerResult.start(parentId, uploadPayload);
       } catch (error) {
         if (error instanceof FetchError) {