feat: rename option on replace prompt

frontend/src/components/files/Listing.vue

@@ -268,15 +268,15 @@ export default {
         return
       }
 
-      let action = (overwrite) => {
-        api.copy(items, overwrite).then(() => {
+      let action = (overwrite, rename) => {
+        api.copy(items, overwrite, rename).then(() => {
           this.$store.commit('setReload', true)
         }).catch(this.$showError)
       }
 
       if (this.$store.state.clipboard.key === 'x') {
-        action = (overwrite) => {
-          api.move(items, overwrite).then(() => {
+        action = (overwrite, rename) => {
+          api.move(items, overwrite, rename).then(() => {
             this.$store.commit('setReload', true)
           }).catch(this.$showError)
         }
@@ -284,20 +284,26 @@ export default {
 
       let conflict = upload.checkConflict(items, this.req.items)
 
+      let overwrite = false
+      let rename = false
+
       if (conflict) {
         this.$store.commit('showHover', {
-          prompt: 'replace',
-          confirm: (event) => {
+          prompt: 'replace-rename',
+          confirm: (event, option) => {
+            overwrite = option == 'overwrite'
+            rename = option == 'rename'
+
             event.preventDefault()
             this.$store.commit('closeHovers')
-            action(true)
+            action(overwrite, rename)
           }
         })
 
         return
       }
 
-      action(false)
+      action(overwrite, rename)
     },
     resizeEvent () {
       // Update the columns size based on the window width.

frontend/src/components/files/ListingItem.vue

@@ -138,28 +138,34 @@ export default {
       let path = this.$route.path + base
       let baseItems = (await api.fetch(path)).items
 
-      let action = (overwrite) => {
-        api.move(items, overwrite).then(() => {
+      let action = (overwrite, rename) => {
+        api.move(items, overwrite, rename).then(() => {
           this.$store.commit('setReload', true)
         }).catch(this.$showError)
       }
 
       let conflict = upload.checkConflict(items, baseItems)
 
+      let overwrite = false
+      let rename = false
+
       if (conflict) {
         this.$store.commit('showHover', {
-          prompt: 'replace',
-          confirm: (event) => {
+          prompt: 'replace-rename',
+          confirm: (event, option) => {
+            overwrite = option == 'overwrite'
+            rename = option == 'rename'
+
             event.preventDefault()
             this.$store.commit('closeHovers')
-            action(true)
+            action(overwrite, rename)
           }
         })
 
         return
       }
 
-      action(false)
+      action(overwrite, rename)
     },
     click: function (event) {
       if (this.selectedCount !== 0) event.preventDefault()

frontend/src/components/prompts/Copy.vue

@@ -54,10 +54,10 @@ export default {
         })
       }
 
-      let action = async (overwrite) => {
+      let action = async (overwrite, rename) => {
         buttons.loading('copy')
 
-        await api.copy(items, overwrite).then(() => {
+        await api.copy(items, overwrite, rename).then(() => {
           buttons.success('copy')
           this.$router.push({ path: this.dest })
         }).catch((e) => {
@@ -69,20 +69,26 @@ export default {
       let dstItems = (await api.fetch(this.dest)).items
       let conflict = upload.checkConflict(items, dstItems)
 
+      let overwrite = false
+      let rename = false
+
       if (conflict) {
         this.$store.commit('showHover', {
-          prompt: 'replace',
-          confirm: (event) => {
+          prompt: 'replace-rename',
+          confirm: (event, option) => {
+            overwrite = option == 'overwrite'
+            rename = option == 'rename'
+
             event.preventDefault()
             this.$store.commit('closeHovers')
-            action(true)
+            action(overwrite, rename)
           }
         })
 
         return
       }
 
-      action(false)
+      action(overwrite, rename)
     }
   }
 }

frontend/src/components/prompts/Move.vue

@@ -52,10 +52,10 @@ export default {
         })
       }
 
-      let action = async (overwrite) => {
+      let action = async (overwrite, rename) => {
         buttons.loading('move')
 
-        await api.move(items, overwrite).then(() => {
+        await api.move(items, overwrite, rename).then(() => {
           buttons.success('move')
           this.$router.push({ path: this.dest })
         }).catch((e) => {
@@ -67,20 +67,26 @@ export default {
       let dstItems = (await api.fetch(this.dest)).items
       let conflict = upload.checkConflict(items, dstItems)
 
+      let overwrite = false
+      let rename = false
+
       if (conflict) {
         this.$store.commit('showHover', {
-          prompt: 'replace',
-          confirm: (event) => {
+          prompt: 'replace-rename',
+          confirm: (event, option) => {
+            overwrite = option == 'overwrite'
+            rename = option == 'rename'
+
             event.preventDefault()
             this.$store.commit('closeHovers')
-            action(true)
+            action(overwrite, rename)
           }
         })
 
         return
       }
 
-      action(false)
+      action(overwrite, rename)
     }
   }
 }

frontend/src/components/prompts/Prompts.vue

@@ -16,6 +16,7 @@ import Copy from './Copy'
 import NewFile from './NewFile'
 import NewDir from './NewDir'
 import Replace from './Replace'
+import ReplaceRename from './ReplaceRename'
 import Share from './Share'
 import Upload from './Upload'
 import { mapState } from 'vuex'
@@ -35,6 +36,7 @@ export default {
     NewDir,
     Help,
     Replace,
+    ReplaceRename,
     Upload
   },
   data: function () {
@@ -52,7 +54,7 @@ export default {
       return
 
       let prompt = this.$refs.currentComponent;
-      
+
       // Enter
       if (event.keyCode == 13) {
         switch (this.show) {
@@ -87,6 +89,7 @@ export default {
         'newDir',
         'download',
         'replace',
+        'replace-rename',
         'share',
         'upload'
       ].indexOf(this.show) >= 0;

frontend/src/components/prompts/ReplaceRename.vue

@@ -0,0 +1,35 @@
+<template>
+  <div class="card floating">
+    <div class="card-title">
+      <h2>{{ $t('prompts.replace') }}</h2>
+    </div>
+
+    <div class="card-content">
+      <p>{{ $t('prompts.replaceMessage') }}</p>
+    </div>
+
+    <div class="card-action">
+      <button class="button button--flat button--grey"
+        @click="$store.commit('closeHovers')"
+        :aria-label="$t('buttons.cancel')"
+        :title="$t('buttons.cancel')">{{ $t('buttons.cancel') }}</button>
+      <button class="button button--flat button--blue"
+        @click="(event) => showConfirm(event, 'rename')"
+        :aria-label="$t('buttons.rename')"
+        :title="$t('buttons.rename')">{{ $t('buttons.rename') }}</button>
+      <button class="button button--flat button--red"
+        @click="(event) => showConfirm(event, 'overwrite')"
+        :aria-label="$t('buttons.replace')"
+        :title="$t('buttons.replace')">{{ $t('buttons.replace') }}</button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'replace-rename',
+  computed: mapState(['showConfirm'])
+}
+</script>