Skip to content

Commit

Permalink
Add ResourceDetails component to GenericSpace for individual (public)…
Browse files Browse the repository at this point in the history
… shares
  • Loading branch information
pascalwengerter committed Feb 15, 2023
1 parent b9a3e39 commit a165f15
Show file tree
Hide file tree
Showing 3 changed files with 97 additions and 5 deletions.
7 changes: 7 additions & 0 deletions changelog/unreleased/enhancement-single-share-view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Enhancement: Open individually shared file in dedicated view

We have added functionality to open a single, publicly shared file in a different view (instead of showing it in a table).

https://github.com/owncloud/web/issues/8445
https://github.com/owncloud/web/pull/8440
https://github.com/owncloud/web/pull/8446
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 { Resource, SpaceResource } from 'web-client/src/helpers'
import FileActions from '../SideBar/Actions/FileActions.vue'
import FileDetails from '../SideBar/Details/FileDetails.vue'
import FileInfo from '../SideBar/FileInfo.vue'
export default defineComponent({
components: {
FileActions,
FileDetails,
FileInfo
},
provide() {
return {
resource: computed(() => this.singleResource),
space: computed(() => this.space)
}
},
props: {
singleResource: {
type: Object as PropType<Resource>,
required: false,
default: null
},
space: {
type: Object as PropType<SpaceResource>,
required: false,
default: null
}
}
})
</script>

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

45 changes: 40 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="displayFullAppBar"
:has-bulk-actions="displayFullAppBar"
:show-actions-on-selection="displayFullAppBar"
:has-sidebar-toggle="displayFullAppBar"
:has-view-options="displayFullAppBar"
:side-bar-open="sideBarOpen"
:space="space"
>
Expand Down Expand Up @@ -73,6 +75,11 @@
/>
</template>
</resource-tiles>
<resource-details
v-else-if="displayResourceAsSingleResource"
:single-resource="paginatedResources[0]"
:space="space"
/>
<resource-table
v-else
id="files-space-table"
Expand Down Expand Up @@ -161,6 +168,7 @@ import ListInfo from '../../components/FilesList/ListInfo.vue'
import NotFoundMessage from '../../components/FilesList/NotFoundMessage.vue'
import Pagination from '../../components/FilesList/Pagination.vue'
import QuickActions from '../../components/FilesList/QuickActions.vue'
import ResourceDetails from '../../components/FilesList/ResourceDetails.vue'
import ResourceTable from '../../components/FilesList/ResourceTable.vue'
import ResourceTiles from '../../components/FilesList/ResourceTiles.vue'
import SideBar from '../../components/SideBar/SideBar.vue'
Expand Down Expand Up @@ -197,6 +205,7 @@ export default defineComponent({
NotFoundMessage,
Pagination,
QuickActions,
ResourceDetails,
ResourceTable,
ResourceTiles,
SideBar,
Expand Down Expand Up @@ -381,12 +390,38 @@ export default defineComponent({
...mapGetters('Files', ['currentFolder', 'totalFilesCount', 'totalFilesSize']),
...mapGetters(['user', 'configuration']),
folderNotFound() {
return this.currentFolder === null
},
isEmpty() {
return this.paginatedResources.length < 1
},
folderNotFound() {
return this.currentFolder === null
isRunningOnEos() {
return !!this.configuration?.options?.runningOnEos
},
displayFullAppBar() {
return !this.displayResourceAsSingleResource
},
displayResourceAsSingleResource() {
if (this.paginatedResources.length !== 1) {
return false
}
if (
this.isRunningOnEos &&
(!this.currentFolder.fileId || this.currentFolder.path === this.paginatedResources[0].path)
) {
return true
}
if (isPublicSpaceResource(this.space) && !this.paginatedResources[0].isFolder) {
return true
}
return false
},
displayThumbnails() {
Expand Down

0 comments on commit a165f15

Please sign in to comment.