From f24d57d88d3d3fbb92bfd3c10aea00b1887a6686 Mon Sep 17 00:00:00 2001 From: Peter Papp Date: Mon, 23 Aug 2021 17:55:38 +0200 Subject: [PATCH] refactoring part 5 --- public/mix-manifest.json | 6 ++-- .../js/components/FilesView/FileItemGrid.vue | 32 +++++++++++-------- .../js/components/FilesView/FileItemList.vue | 1 - 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index b5efe9b1..865a85f1 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -134,7 +134,7 @@ "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c3a97969.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c3a97969.js?id=b1513a3d0291b8faaca0", "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~cd83f396.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~cd83f396.js?id=32b7688119a605747ee9", "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f23e39b6.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f23e39b6.js?id=5216516ba11c29601c91", - "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.js?id=6966f455db86cfa3ac1d", + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.js?id=414cf7cfd9ece84225da", "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js?id=47333b5619058331b4df", "/chunks/platform~chunks/shared/files.js": "/chunks/platform~chunks/shared/files.js?id=a1891e149640c9a838f4", "/chunks/platform~chunks/shared~chunks/shared/files.js": "/chunks/platform~chunks/shared~chunks/shared/files.js?id=1ed2d41883a929aa1bc7", @@ -525,5 +525,7 @@ "/chunks/shared/files.14333b3d60f45654b691.hot-update.js": "/chunks/shared/files.14333b3d60f45654b691.hot-update.js", "/chunks/shared/files.d967d179d27e7903ddaf.hot-update.js": "/chunks/shared/files.d967d179d27e7903ddaf.hot-update.js", "/chunks/shared/files.5a9af8986ff39f051f1a.hot-update.js": "/chunks/shared/files.5a9af8986ff39f051f1a.hot-update.js", - "/chunks/shared/files.4618b7b0d57385b7f2da.hot-update.js": "/chunks/shared/files.4618b7b0d57385b7f2da.hot-update.js" + "/chunks/shared/files.4618b7b0d57385b7f2da.hot-update.js": "/chunks/shared/files.4618b7b0d57385b7f2da.hot-update.js", + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.46500898f3858d352390.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.46500898f3858d352390.hot-update.js", + "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.c52a778b1010e0dd091a.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.c52a778b1010e0dd091a.hot-update.js" } diff --git a/resources/js/components/FilesView/FileItemGrid.vue b/resources/js/components/FilesView/FileItemGrid.vue index 630131e0..a35d76d7 100644 --- a/resources/js/components/FilesView/FileItemGrid.vue +++ b/resources/js/components/FilesView/FileItemGrid.vue @@ -215,13 +215,16 @@ export default { if (!this.mobileMultiSelect && this.$isMobile()) { - if (this.isFolder) { + if (this.isFolder) { + let route = this.$router.currentRoute.name - if (this.$isThisLocation('public')) { - this.$store.dispatch('browseShared', [{folder: this.item, back: false, init: false}]) - } else { - this.$store.dispatch('getFolder', [{folder: this.item, back: false, init: false}]) - } + if (route === 'Public') { + this.$router.push({name: 'Public', params: {token: this.$route.params.token, id: this.item.id}}) + } else if (route === 'Trash') { + this.$router.push({name: 'Trash', params: {id: this.item.id}}) + } else if (route === 'Files') { + this.$router.push({name: 'Files', params: {id: this.item.id}}) + } } else { if (this.isImage || this.isVideo || this.isAudio || this.isPdf) { @@ -250,15 +253,18 @@ export default { this.$downloadFile(this.item.file_url, this.item.name + '.' + this.item.mimetype) } else if (this.isFolder) { + // Clear selected items after open another folder + this.$store.commit('CLIPBOARD_CLEAR') - //Clear selected data after open another folder - this.$store.commit('CLIPBOARD_CLEAR') + let route = this.$router.currentRoute.name - if (this.$isThisLocation('public')) { - this.$store.dispatch('browseShared', [{folder: this.item, back: false, init: false}]) - } else { - this.$store.dispatch('getFolder', [{folder: this.item, back: false, init: false}]) - } + if (route === 'Public') { + this.$router.push({name: 'Public', params: {token: this.$route.params.token, id: this.item.id}}) + } else if (route === 'Trash') { + this.$router.push({name: 'Trash', params: {id: this.item.id}}) + } else if (route === 'Files') { + this.$router.push({name: 'Files', params: {id: this.item.id}}) + } } }, renameItem: debounce(function (e) { diff --git a/resources/js/components/FilesView/FileItemList.vue b/resources/js/components/FilesView/FileItemList.vue index 910083ad..48223175 100644 --- a/resources/js/components/FilesView/FileItemList.vue +++ b/resources/js/components/FilesView/FileItemList.vue @@ -229,7 +229,6 @@ export default { } else if (route === 'Files') { this.$router.push({name: 'Files', params: {id: this.item.id}}) } - } else { if (this.isImage || this.isVideo || this.isAudio || this.isPdf) {