- gate implementation

- protected shared view fix
This commit is contained in:
Čarodej
2021-09-24 10:52:19 +02:00
parent d40108f6a9
commit 19cc01131b
84 changed files with 876 additions and 406 deletions
+3 -3
View File
@@ -90,7 +90,7 @@ const FunctionHelpers = {
// Push items to file queue
[...files].map(item => {
this.$store.commit('ADD_FILES_TO_QUEUE', {
folder_id: store.getters.currentFolder ? store.getters.currentFolder.data.id : '',
parent_id: store.getters.currentFolder ? store.getters.currentFolder.data.id : '',
file: item,
})
});
@@ -111,7 +111,7 @@ const FunctionHelpers = {
// Push items to file queue
[...event.dataTransfer.items].map(item => {
this.$store.commit('ADD_FILES_TO_QUEUE', {
folder_id: parent_id ? parent_id : '',
parent_id: parent_id ? parent_id : '',
file: item.getAsFile(),
})
});
@@ -160,7 +160,7 @@ const FunctionHelpers = {
// Set form data
formData.set('filename', item.file.name);
formData.set('file', chunk, source_name);
formData.set('folder_id', item.folder_id)
formData.set('parent_id', item.parent_id)
formData.set('is_last', isLast);
// Upload chunks
+1 -1
View File
@@ -185,7 +185,7 @@ const actions = {
commit('SHIFT_FROM_FILE_QUEUE')
// Check if user is in uploading folder, if yes, than show new file
if ((! getters.currentFolder && !response.data.data.attributes.folder_id) || response.data.data.attributes.folder_id === getters.currentFolder.data.id) {
if ((! getters.currentFolder && !response.data.data.attributes.parent_id) || response.data.data.attributes.parent_id === getters.currentFolder.data.id) {
// Add uploaded item into view
commit('ADD_NEW_ITEMS', response.data)
+3 -2
View File
@@ -24,10 +24,11 @@
<DragUI />
<Alert />
<NavigationSharePanel v-if="sharedDetail"/>
<NavigationSharePanel v-if="sharedDetail && $router.currentRoute.name === 'Public'"/>
<div @contextmenu.prevent.capture="contextMenu($event, undefined)" id="file-view">
<DesktopToolbar/>
<!--TODO: fix desktopbar on authentication screen-->
<router-view :key="$route.fullPath" />
</div>
</div>
@@ -101,7 +102,7 @@
let type = response.data.data.attributes.type
let routeName = this.$router.currentRoute.name
let isProtected = response.data.data.attributes.is_protected
let isProtected = response.data.data.attributes.protected
// Show public file browser
if (type === 'folder' && !isProtected && routeName !== 'Public') {
@@ -65,9 +65,9 @@
.then(response => {
// Show file browser
if (response.data.data.attributes.type === 'folder' && this.$router.currentRoute.name !== 'SharedFileBrowser') {
this.$router.push({name: 'SharedFileBrowser'})
}
if (response.data.data.attributes.type === 'folder' && this.$router.currentRoute.name !== 'Public') {
this.$router.replace({name: 'Public', params: {token: this.$route.params.token, id: response.data.data.attributes.item_id}})
}
// Show single file
if (response.data.data.attributes.type !== 'folder' && this.$router.currentRoute.name !== 'SharedSingleFile') {