Address PR issues

owncloud · Oct 4, 2022 · d3f4448 · d3f4448
1 parent 45beec3
commit d3f4448
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -28,8 +28,7 @@ module.exports = {
     'no-new': 'off',
     'jest/no-standalone-expect': 'off',
     'node/no-callback-literal': 'off',
-    'unused-imports/no-unused-imports': 'error',
-    'no-useless-constructor': 0
+    'unused-imports/no-unused-imports': 'error'
   },
   globals: {
     require: false,

diff --git a/packages/web-app-files/src/helpers/resource/actions/upload.ts b/packages/web-app-files/src/helpers/resource/actions/upload.ts
@@ -162,13 +162,17 @@ export class ResourcesUpload extends ConflictDialog {
       for (const file of filesInFolder) {
         const newFolderName = resolveFileNameDuplicate(folder, '', this.currentFiles)
         file.meta.relativeFolder = file.meta.relativeFolder.replace(
-          `/${folder}`,
+          new RegExp(`/${folder}` + '$'),
+          `/${newFolderName}`
+        )
+        file.meta.relativePath = file.meta.relativePath.replace(
+          new RegExp(`/${folder}/` + '$'),
+          `/${newFolderName}/`
+        )
+        file.meta.tusEndpoint = file.meta.tusEndpoint.replace(
+          new RegExp(`/${folder}` + '$'),
           `/${newFolderName}`
         )
-        file.meta.relativePath = file.meta.relativePath.replace(`/${folder}/`, `/${newFolderName}/`)
-        file.meta.tusEndpoint = file.meta.tusEndpoint.replace(`/${folder}`, `/${newFolderName}`)
-        const data = file.data as any
-        data.relativePath = data.relativePath.replace(`/${folder}/`, `/${newFolderName}/`)
       }
     }
     if (files.length === 0) return

diff --git a/packages/web-app-files/src/helpers/resource/conflictHandling/conflictDialog.ts b/packages/web-app-files/src/helpers/resource/conflictHandling/conflictDialog.ts
@@ -9,6 +9,7 @@ interface FileConflict {
 }
 
 export class ConflictDialog {
+  /* eslint-disable */
   constructor(
     protected createModal: (modal: object) => void,
     protected hideModal: () => void,