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

feat(files): add Viewer Files ressource handler #44012

Merged
merged 4 commits into from
Mar 7, 2024
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,17 @@ Vue.mixin({
},
})

registerWidget('file', (el, { richObjectType, richObject, accessible }) => {
registerWidget('file', (el, { richObjectType, richObject, accessible, interactive }) => {
const Widget = Vue.extend(FileWidget)
new Widget({
propsData: {
richObjectType,
richObject,
accessible,
interactive,
},
}).$mount(el)
})
}, { hasInteractiveView: true })

registerCustomPickerElement('files', (el, { providerId, accessible }) => {
const Element = Vue.extend(FileReferencePickerElement)
Expand Down
226 changes: 181 additions & 45 deletions apps/files/src/views/ReferenceFileWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,50 +21,155 @@

<template>
<div v-if="!accessible" class="widget-file widget-file--no-access">
<div class="widget-file--image widget-file--image--icon icon-folder" />
<div class="widget-file--details">
<p class="widget-file--title">
<span class="widget-file__image widget-file__image--icon">
<FolderIcon v-if="isFolder" :size="88" />
<FileIcon v-else :size="88" />
</span>
<span class="widget-file__details">
<p class="widget-file__title">
{{ t('files', 'File cannot be accessed') }}
</p>
<p class="widget-file--description">
<p class="widget-file__description">
{{ t('files', 'The file could not be found or you do not have permissions to view it. Ask the sender to share it.') }}
</p>
</div>
</span>
</div>

<!-- Live preview if a handler is available -->
<component :is="viewerHandler.component"
v-else-if="interactive && viewerHandler && !failedViewer"
:active="false /* prevent video from autoplaying */"
:can-swipe="false"
:can-zoom="false"
:is-embedded="true"
v-bind="viewerFile"
:file-list="[viewerFile]"
:is-full-screen="false"
:is-sidebar-shown="false"
class="widget-file widget-file--interactive"
@error="failedViewer = true" />

<!-- The file is accessible -->
<a v-else
class="widget-file"
class="widget-file widget-file--link"
:href="richObject.link"
@click.prevent="navigate">
<div class="widget-file--image" :class="filePreviewClass" :style="filePreview" />
<div class="widget-file--details">
<p class="widget-file--title">{{ richObject.name }}</p>
<p class="widget-file--description">{{ fileSize }}<br>{{ fileMtime }}</p>
<p class="widget-file--link">{{ filePath }}</p>
</div>
target="_blank"
@click="navigate">
<span class="widget-file__image" :class="filePreviewClass" :style="filePreviewStyle">
<template v-if="!previewUrl">
<FolderIcon v-if="isFolder" :size="88" />
<FileIcon v-else :size="88" />
</template>
</span>
<span class="widget-file__details">
<p class="widget-file__title">{{ richObject.name }}</p>
<p class="widget-file__description">{{ fileSize }}<br>{{ fileMtime }}</p>
<p class="widget-file__link">{{ filePath }}</p>
</span>
</a>
</template>
<script>
import { generateUrl } from '@nextcloud/router'

<script lang="ts">
import { defineComponent, type Component, type PropType } from 'vue'
import { generateRemoteUrl, generateUrl } from '@nextcloud/router'
import { getCurrentUser } from '@nextcloud/auth'
import { getFilePickerBuilder } from '@nextcloud/dialogs'
import { Node } from '@nextcloud/files'
import FileIcon from 'vue-material-design-icons/File.vue'
import FolderIcon from 'vue-material-design-icons/Folder.vue'
import path from 'path'

export default {
// see lib/private/Collaboration/Reference/File/FileReferenceProvider.php
type Ressource = {
id: number
name: string
size: number
path: string
link: string
mimetype: string
mtime: number // as unix timestamp
'preview-available': boolean
}

type ViewerHandler = {
id: string
group: string
mimes: string[]
component: Component
}

/**
* Minimal mock of the legacy Viewer FileInfo
* TODO: replace by Node object
*/
type ViewerFile = {
filename: string // the path to the root folder
basename: string // the file name
lastmod: Date // the last modification date
size: number // the file size in bytes
type: string
mime: string
fileid: number
failed: boolean
loaded: boolean
davPath: string
source: string
}

export default defineComponent({
name: 'ReferenceFileWidget',
components: {
FolderIcon,
FileIcon,
},
props: {
richObject: {
type: Object,
type: Object as PropType<Ressource>,
required: true,
},
accessible: {
type: Boolean,
default: true,
},
interactive: {
type: Boolean,
default: true,
},
},

data() {
return {
previewUrl: window.OC.MimeType.getIconUrl(this.richObject.mimetype),
previewUrl: null as string | null,
failedViewer: false,
}
},

computed: {
availableViewerHandlers(): ViewerHandler[] {
return (window?.OCA?.Viewer?.availableHandlers || []) as ViewerHandler[]
},
viewerHandler(): ViewerHandler | undefined {
return this.availableViewerHandlers
.find(handler => handler.mimes.includes(this.richObject.mimetype))
},
viewerFile(): ViewerFile {
const davSource = generateRemoteUrl(`dav/files/${getCurrentUser()?.uid}/${this.richObject.path}`)
.replace(/\/\/$/, '/')
return {
filename: this.richObject.path,
basename: this.richObject.name,
lastmod: new Date(this.richObject.mtime * 1000),
size: this.richObject.size,
type: 'file',
mime: this.richObject.mimetype,
fileid: this.richObject.id,
failed: false,
loaded: true,
davPath: davSource,
source: davSource,
}
},

fileSize() {
return window.OC.Util.humanFileSize(this.richObject.size)
},
Expand All @@ -74,26 +179,26 @@ export default {
filePath() {
return path.dirname(this.richObject.path)
},
filePreview() {
filePreviewStyle() {
if (this.previewUrl) {
return {
backgroundImage: 'url(' + this.previewUrl + ')',
}
}

return {
backgroundImage: 'url(' + window.OC.MimeType.getIconUrl(this.richObject.mimetype) + ')',
}

return {}
},
filePreviewClass() {
if (this.previewUrl) {
return 'widget-file--image--preview'
return 'widget-file__image--preview'
}
return 'widget-file--image--icon'
return 'widget-file__image--icon'

},
isFolder() {
return this.richObject.mimetype === 'httpd/unix-directory'
},
},

mounted() {
if (this.richObject['preview-available']) {
const previewUrl = generateUrl('/core/preview?fileId={fileId}&x=250&y=250', {
Expand All @@ -110,43 +215,74 @@ export default {
}
},
methods: {
navigate() {
if (OCA.Viewer && OCA.Viewer.mimetypes.indexOf(this.richObject.mimetype) !== -1) {
OCA.Viewer.open({ path: this.richObject.path })
return
navigate(event) {
if (this.isFolder) {
event.stopPropagation()
event.preventDefault()
this.openFilePicker()
}
window.location = this.richObject.link
},

openFilePicker() {
const picker = getFilePickerBuilder(t('settings', 'Your files'))
.allowDirectories(true)
.setMultiSelect(false)
.addButton({
id: 'open',
label: this.t('settings', 'Open in files'),
callback(nodes: Node[]) {
if (nodes[0]) {
window.open(generateUrl('/f/{fileid}', {
fileid: nodes[0].fileid,
}))
}
},
type: 'primary',
})
.disableNavigation()
.startAt(this.richObject.path)
.build()
picker.pick()
},
},
}
})
</script>

<style lang="scss" scoped>
.widget-file {
display: flex;
flex-grow: 1;
color: var(--color-main-text) !important;
text-decoration: none !important;
padding: 0 !important;

&--image {
min-width: 40%;
&__image {
width: 30%;
min-width: 160px;
max-width: 320px;
background-position: center;
background-size: cover;
background-repeat: no-repeat;

&.widget-file--image--icon {
&--icon {
min-width: 88px;
background-size: 44px;
max-width: 88px;
padding: 12px;
padding-right: 0;
display: flex;
align-items: center;
justify-content: center;
}
}

&--title {
&__title {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-weight: bold;
}

&--details {
&__details {
padding: 12px;
flex-grow: 1;
display: flex;
Expand All @@ -158,7 +294,7 @@ export default {
}
}

&--description {
&__description {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
Expand All @@ -167,16 +303,16 @@ export default {
-webkit-box-orient: vertical;
}

// No preview, standard link to ressource
&--link {
color: var(--color-text-maxcontrast);
}

&.widget-file--no-access {
padding: 12px;

.widget-file--details {
padding: 0;
}
&--interactive {
position: relative;
height: 400px;
max-height: 50vh;
margin: 0;
}
}
</style>
4 changes: 4 additions & 0 deletions apps/settings/js/map-test.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/css/server.css

Large diffs are not rendered by default.

Loading
Loading