Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP Single file share view #8440

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 41 additions & 5 deletions packages/web-app-files/src/views/spaces/GenericSpace.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
<app-bar
:breadcrumbs="breadcrumbs"
:breadcrumbs-context-actions-items="[currentFolder]"
:display-view-mode-switch="true"
:has-bulk-actions="true"
:show-actions-on-selection="true"
:display-view-mode-switch="!isSingleFile"
:has-bulk-actions="!isSingleFile"
:show-actions-on-selection="!isSingleFile"
:has-sidebar-toggle="!isSingleFile"
:has-view-options="!isSingleFile"
:side-bar-open="sideBarOpen"
:space="space"
>
Expand Down Expand Up @@ -44,6 +46,9 @@
</span>
</template>
</no-content-message>
<div v-else-if="isSingleFile">
<single-shared-file :space="space" />
</div>
<resource-tiles
v-else-if="viewMode === ViewModeConstants.tilesView.name"
v-model:selectedIds="selectedResourcesIds"
Expand Down Expand Up @@ -180,6 +185,8 @@ import { ResourceTransfer, TransferType } from '../../helpers/resource'
import { FolderLoaderOptions } from '../../services/folder'
import { CreateTargetRouteOptions } from 'web-app-files/src/helpers/folderLink/types'

import SingleSharedFile from './SingleSharedFile.vue'

const visibilityObserver = new VisibilityObserver()

export default defineComponent({
Expand All @@ -200,7 +207,8 @@ export default defineComponent({
ResourceTable,
ResourceTiles,
SideBar,
SpaceHeader
SpaceHeader,
SingleSharedFile
},

mixins: [MixinAccessibleBreadcrumb, MixinFileActions],
Expand Down Expand Up @@ -381,6 +389,15 @@ export default defineComponent({
...mapGetters('Files', ['currentFolder', 'totalFilesCount', 'totalFilesSize']),
...mapGetters(['user', 'configuration']),

isSingleFile() {
if (
this.paginatedResources.length === 1 &&
(!this.currentFolder.fileId || this.currentFolder.path === this.paginatedResources[0].path)
) {
return true
}
return false
},
isEmpty() {
return this.paginatedResources.length < 1
},
Expand Down Expand Up @@ -408,6 +425,24 @@ export default defineComponent({
handler: function () {
this.performLoaderTask(true)
}
},
paginatedResources: function () {
if (this.isSingleFile) {
this.SET_FILE_SELECTION(this.paginatedResources)

const defaultAction = this.$_fileActions_getDefaultAction({
space: this.space,
resources: this.paginatedResources
}).label()

if (!this.$route.query.scrollTo && defaultAction !== 'Download') {
this.$_fileActions_triggerDefaultAction({
space: this.space,
resources: this.paginatedResources,
sameTab: true
})
}
}
}
},

Expand All @@ -417,7 +452,8 @@ export default defineComponent({
...mapMutations('Files', [
'REMOVE_FILES',
'REMOVE_FILES_FROM_SEARCHED',
'REMOVE_FILE_SELECTION'
'REMOVE_FILE_SELECTION',
'SET_FILE_SELECTION'
]),

async fileDropped(fileIdTarget) {
Expand Down
50 changes: 50 additions & 0 deletions packages/web-app-files/src/views/spaces/SingleSharedFile.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<template>
<div class="file-without-app">
<file-info />
<file-details :class="'oc-mb'" />
<file-actions />
</div>
</template>

<script lang="ts">
import { computed, defineComponent, PropType } from 'vue'
import { SpaceResource } from 'web-client/src/helpers'
import { mapGetters } from 'vuex'

import FileDetails from '../../components/SideBar/Details/FileDetails.vue'
import FileActions from '../../components/SideBar/Actions/FileActions.vue'
import FileInfo from '../../components/SideBar/FileInfo.vue'

export default defineComponent({
components: {
FileDetails,
FileActions,
FileInfo
},
provide() {
return {
// File info and details require this
resource: computed(() => this.highlightedFile),
// File actions require this
space: computed(() => this.space)
}
},
props: {
space: {
type: Object as PropType<SpaceResource>,
required: false,
default: null
}
},
computed: {
...mapGetters('Files', ['highlightedFile'])
}
})
</script>

<style lang="scss" scoped>
.file-without-app {
width: 50%;
margin: 0 auto;
}
</style>