diff --git a/components/ui/SimpleList/SimpleList.html b/components/ui/SimpleList/SimpleList.html deleted file mode 100644 index a458aa8e32..0000000000 --- a/components/ui/SimpleList/SimpleList.html +++ /dev/null @@ -1,10 +0,0 @@ -
- -
diff --git a/components/ui/SimpleList/SimpleList.less b/components/ui/SimpleList/SimpleList.less deleted file mode 100644 index 7ec8ae2943..0000000000 --- a/components/ui/SimpleList/SimpleList.less +++ /dev/null @@ -1,33 +0,0 @@ -.simple-menu { - .menu-icon { - width: 15px; - margin-right: @light-spacing; - } - - .active { - &:extend(.background-primary); - &:extend(.font-secondary); - border-radius: @corner-rounding-smaller; - - &:hover { - &:extend(.background-primary); - } - } - - li { - cursor: pointer; - padding: (@light-spacing / 2) @light-spacing; - margin: 0.2rem -@light-spacing; - display: inline-flex; - align-items: center; - border-radius: @corner-rounding-smaller; - &:extend(.full-width); - - .dynamic-icon { - margin-right: @light-spacing; - } - &:hover { - background: @foreground; - } - } -} diff --git a/components/ui/SimpleList/SimpleList.vue b/components/ui/SimpleList/SimpleList.vue deleted file mode 100644 index 1226bbd20f..0000000000 --- a/components/ui/SimpleList/SimpleList.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/components/views/files/aside/Aside.html b/components/views/files/aside/Aside.html index ffc4d2b78b..6ca46899b8 100644 --- a/components/views/files/aside/Aside.html +++ b/components/views/files/aside/Aside.html @@ -17,14 +17,10 @@
- +
- +
diff --git a/components/views/files/aside/Aside.vue b/components/views/files/aside/Aside.vue index 61b654b125..76bb6b8991 100644 --- a/components/views/files/aside/Aside.vue +++ b/components/views/files/aside/Aside.vue @@ -1,6 +1,8 @@ + + diff --git a/components/views/files/file/File.vue b/components/views/files/file/File.vue index 5a6c1e6799..ca0623d2c4 100644 --- a/components/views/files/file/File.vue +++ b/components/views/files/file/File.vue @@ -119,7 +119,7 @@ export default Vue.extend({ * @description Open rename modal */ rename() { - this.$store.commit('ui/setRenameItem', this.item.name) + this.$store.commit('ui/setRenameItem', this.item) this.$store.commit('ui/toggleModal', { name: ModalWindows.RENAME_FILE, state: !this.ui.modals[ModalWindows.RENAME_FILE], diff --git a/components/views/files/list/List.html b/components/views/files/list/List.html index b25741af2e..0d4da5beb7 100644 --- a/components/views/files/list/List.html +++ b/components/views/files/list/List.html @@ -39,7 +39,7 @@ - (state as RootState).ui.renameItem, + }), ...mapGetters('ui', ['isFilesIndexLoading']), }, mounted() { - this.text = this.ui.renameCurrentName + if (!this.renameItem) { + this.error = this.$t('pages.files.errors.lost') as string + return + } + // extract data we need from store and then clear to avoid vuex outside mutation error + this.text = this.renameItem.name + this.currentName = this.renameItem.name + this.parent = this.renameItem.parent + this.$store.commit('ui/setRenameItem', undefined) this.$nextTick(() => { // extension string including . const extString = this.text.slice( @@ -49,7 +63,7 @@ export default Vue.extend({ */ async rename() { try { - this.$FileSystem.renameChild(this.ui.renameCurrentName, this.text) + this.$FileSystem.renameChild(this.currentName, this.text, this.parent) } catch (e: any) { this.error = this.$t(e?.message) as string return diff --git a/components/views/files/tree/Tree.html b/components/views/files/tree/Tree.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/components/views/files/tree/Tree.less b/components/views/files/tree/Tree.less deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/components/views/files/tree/Tree.vue b/components/views/files/tree/Tree.vue deleted file mode 100644 index 2c72c1e760..0000000000 --- a/components/views/files/tree/Tree.vue +++ /dev/null @@ -1,7 +0,0 @@ -