Merge branch 'master' into current-file

ioedeveloper · web-flow · commit f265e4f82067 · 2022-01-25T15:33:24.000+01:00
diff --git a/libs/remix-ui/workspace/src/lib/actions/index.ts b/libs/remix-ui/workspace/src/lib/actions/index.ts
@@ -179,7 +179,7 @@ export const createNewFolder = async (path: string, rootDir: string) => {
   const exists = await fileManager.exists(dirName)
 
   if (exists) {
-    return dispatch(displayNotification('Rename File Failed', `A file or folder ${extractNameFromKey(path)} already exists at this location. Please choose a different name.`, 'Close', null, () => {}))
+    return dispatch(displayNotification('Failed to create folder', `A folder ${extractNameFromKey(path)} already exists at this location. Please choose a different name.`, 'Close', null, () => {}))
   }
   await fileManager.mkdir(dirName)
   path = path.indexOf(rootDir + '/') === 0 ? path.replace(rootDir + '/', '') : path

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ export const createNewFolder = async (path: string, rootDir: string) => {`
`179`	`179`	`const exists = await fileManager.exists(dirName)`
`180`	`180`
`181`	`181`	`if (exists) {`
`182`		- return dispatch(displayNotification('Rename File Failed', `A file or folder ${extractNameFromKey(path)} already exists at this location. Please choose a different name.`, 'Close', null, () => {}))
	`182`	+ return dispatch(displayNotification('Failed to create folder', `A folder ${extractNameFromKey(path)} already exists at this location. Please choose a different name.`, 'Close', null, () => {}))
`183`	`183`	`}`
`184`	`184`	`await fileManager.mkdir(dirName)`
`185`	`185`	`path = path.indexOf(rootDir + '/') === 0 ? path.replace(rootDir + '/', '') : path`