Fix file tree remove

BrunoQuaresma · BrunoQuaresma · commit 2bbc919bcc44 · 2023-02-23T00:44:58.000Z
diff --git a/site/src/util/filetree.test.ts b/site/src/util/filetree.test.ts
@@ -30,7 +30,7 @@ test("getFileContent() return the file content from the file tree", () => {
   )
 })
 
-test("removeFile() removes a file from the file tree", () => {
+test("removeFile() removes a file from a folder", () => {
   let fileTree: FileTree = {
     "main.tf": "terraform content",
     images: {
@@ -48,6 +48,24 @@ test("removeFile() removes a file from the file tree", () => {
   expect(expectedFileTree).toEqual(fileTree)
 })
 
+test("removeFile() removes a file from root", () => {
+  let fileTree: FileTree = {
+    "main.tf": "terraform content",
+    images: {
+      "java.Dockerfile": "java dockerfile",
+      "python.Dockerfile": "python Dockerfile",
+    },
+  }
+  fileTree = removeFile("main.tf", fileTree)
+  const expectedFileTree = {
+    images: {
+      "java.Dockerfile": "java dockerfile",
+      "python.Dockerfile": "python Dockerfile",
+    },
+  }
+  expect(expectedFileTree).toEqual(fileTree)
+})
+
 test("moveFile() moves a file from in file tree", () => {
   let fileTree: FileTree = {
     "main.tf": "terraform content",
diff --git a/site/src/util/filetree.ts b/site/src/util/filetree.ts
@@ -21,7 +21,7 @@ export const existsFile = (path: string, fileTree: FileTree) => {
 
 export const removeFile = (path: string, fileTree: FileTree) => {
   const updatedFileTree = { ...fileTree }
-  unset(fileTree, path.split("/"))
+  unset(updatedFileTree, path.split("/"))
   return updatedFileTree
 }
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export const existsFile = (path: string, fileTree: FileTree) => {`
`21`	`21`
`22`	`22`	`export const removeFile = (path: string, fileTree: FileTree) => {`
`23`	`23`	`const updatedFileTree = { ...fileTree }`
`24`		`- unset(fileTree, path.split("/"))`
	`24`	`+ unset(updatedFileTree, path.split("/"))`
`25`	`25`	`return updatedFileTree`
`26`	`26`	`}`
`27`	`27`