From f59b9e1b5f12d8a0e7ab043e71622fb014480bba Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Mon, 16 Sep 2024 13:28:30 +0200 Subject: [PATCH] frontend: adjust filemanager to new pankow api --- frontend/src/models/DirectoryModel.js | 2 ++ frontend/src/views/Home.vue | 29 +++------------------------ 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/frontend/src/models/DirectoryModel.js b/frontend/src/models/DirectoryModel.js index e435deeb6..5a6932ffe 100644 --- a/frontend/src/models/DirectoryModel.js +++ b/frontend/src/models/DirectoryModel.js @@ -59,6 +59,8 @@ export function createDirectoryModel(origin, accessToken, api) { // if we have an image, attach previewUrl if (item.mimeType.indexOf('image/') === 0) { item.previewUrl = `${origin}/api/v1/${api}/files/${encodeURIComponent(path + '/' + item.fileName)}?access_token=${accessToken}`; + } else { + item.previewUrl = ''; } item.owner = item.uid; diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue index 16155e3ff..14472cc0b 100644 --- a/frontend/src/views/Home.vue +++ b/frontend/src/views/Home.vue @@ -57,8 +57,6 @@ :delete-handler="deleteHandler" :rename-handler="renameHandler" :change-owner-handler="changeOwnerHandler" - :copy-handler="copyHandler" - :cut-handler="cutHandler" :paste-handler="pasteHandler" :download-handler="downloadHandler" :extract-handler="extractHandler" @@ -68,7 +66,6 @@ :upload-folder-handler="onUploadFolder" :drop-handler="onDrop" :items="items" - :clipboard="clipboard" :owners-model="ownersModel" :fallback-icon="fallbackIcon" :tr="$t" @@ -149,10 +146,6 @@ export default { activeDirectoryItem: {}, items: [], selectedItems: [], - clipboard: { - action: '', // copy or cut - files: [] - }, accessToken: localStorage.token, title: 'Cloudron', appLink: '', @@ -486,31 +479,15 @@ export default { await this.loadCwd(); }, - async copyHandler(files) { - if (!files) return; - - this.clipboard = { - action: 'copy', - files - }; - }, - async cutHandler(files) { - if (!files) return; - - this.clipboard = { - action: 'cut', - files - }; - }, - async pasteHandler(target) { - if (!this.clipboard.files || !this.clipboard.files.length) return; + async pasteHandler(action, files, target) { + if (!files || !files.length) return; const targetPath = (target && target.isDirectory) ? sanitize(this.cwd + '/' + target.fileName) : this.cwd; window.addEventListener('beforeunload', beforeUnloadListener, { capture: true }); this.$refs.pasteInProgressDialog.open(); - await this.directoryModel.paste(targetPath, this.clipboard.action, this.clipboard.files); + await this.directoryModel.paste(targetPath, action, files); this.clipboard = {}; await this.loadCwd();