Don't nest uploaded projects

luke0623 · May 9, 2022 · 69d496d · 69d496d
1 parent 02de078
commit 69d496d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/services/orchest-webserver/client/src/components/DropZone.tsx b/services/orchest-webserver/client/src/components/DropZone.tsx
@@ -28,11 +28,13 @@ export const generateUploadFiles = ({
   projectUuid,
   root,
   path: targetFolderPath,
+  isProjectUpload,
   cancelableFetch,
 }: {
   projectUuid?: string;
   root: FileManagementRoot;
   path: string;
+  isProjectUpload?: boolean;
   cancelableFetch?: Fetcher<void>;
 }) => (
   files: File[] | FileList,
@@ -49,7 +51,7 @@ export const generateUploadFiles = ({
       : file.webkitRelativePath !== undefined &&
         file.webkitRelativePath.includes("/");
 
-    const path = !isUploadedAsFolder
+    let path = !isUploadedAsFolder
       ? targetFolderPath
       : `${targetFolderPath}${(isUploadedViaDropzone(file)
           ? file.path
@@ -58,7 +60,13 @@ export const generateUploadFiles = ({
           .split("/")
           .slice(0, -1)
           .filter((value) => value.length > 0)
-          .join("/")}/`;
+          // Do not nest the project directory content.
+          .slice(isProjectUpload ? 1 : 0)
+          .join("/")}`;
+
+    if (isUploadedAsFolder && !path.endsWith("/")) {
+      path = path + "/";
+    }
 
     let formData = new FormData();
     formData.append("file", file);

diff --git a/services/orchest-webserver/client/src/pipeline-view/file-manager/FileManager.tsx b/services/orchest-webserver/client/src/pipeline-view/file-manager/FileManager.tsx
@@ -160,6 +160,7 @@ export function FileManager() {
           projectUuid,
           root,
           path: lastSelectedFolder,
+          isProjectUpload: false,
         })(files, onUploaded)
       );
     },

diff --git a/services/orchest-webserver/client/src/projects-view/ImportDialog.tsx b/services/orchest-webserver/client/src/projects-view/ImportDialog.tsx
@@ -432,6 +432,7 @@ export const ImportDialog: React.FC<{
           projectUuid: undefined,
           root: "/data",
           path: `/${projectName}/`,
+          isProjectUpload: true,
           // Use cancelable fetch to prevent mutating states when user cancel uploading.
           cancelableFetch,
         })(files, onFileUploaded)