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: author displayname and avatar on versions #44109

Merged
merged 3 commits into from
Mar 15, 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
57 changes: 50 additions & 7 deletions apps/files_versions/src/components/Version.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
-->
<template>
<NcListItem class="version"
:name="versionLabel"
:force-display-actions="true"
:data-files-versions-version="version.fileVersion"
@click="click">
Expand All @@ -39,13 +38,30 @@
</div>
</template>

<!-- author -->
<template #name>
emoral435 marked this conversation as resolved.
Show resolved Hide resolved
<div class="version__info">
<div v-if="versionLabel" class="version__info__label">{{ versionLabel }}</div>
<div v-if="versionAuthor" class="version__info">
<div v-if="versionLabel">•</div>
<NcAvatar class="avatar"
:user="version.author"
:size="16"
:disable-menu="true"
:disable-tooltip="true"
:show-user-status="false" />
<div>{{ versionAuthor }}</div>
</div>
</div>
</template>

<!-- Version file size as subline -->
<template #subname>
<div class="version__info">
<div class="version__info version__info__subline">
<span :title="formattedDate">{{ version.mtime | humanDateFromNow }}</span>
<!-- Separate dot to improve alignement -->
<span class="version__info__size">•</span>
<span class="version__info__size">{{ version.size | humanReadableSize }}</span>
<span>•</span>
<span>{{ version.size | humanReadableSize }}</span>
</div>
</template>

Expand Down Expand Up @@ -113,11 +129,13 @@ import Pencil from 'vue-material-design-icons/Pencil.vue'

import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'

import { defineComponent, type PropType } from 'vue'
import { getRootUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'
import { getRootUrl, generateOcsUrl } from '@nextcloud/router'
import { joinPaths } from '@nextcloud/paths'
import { loadState } from '@nextcloud/initial-state'
import { Permission, formatFileSize } from '@nextcloud/files'
Expand All @@ -132,6 +150,7 @@ export default defineComponent({
components: {
NcActionLink,
NcActionButton,
NcAvatar,
NcListItem,
BackupRestore,
Download,
Expand All @@ -145,6 +164,10 @@ export default defineComponent({
tooltip: Tooltip,
},

created() {
this.fetchDisplayName()
},

filters: {
humanReadableSize(bytes: number): string {
return formatFileSize(bytes)
Expand Down Expand Up @@ -193,6 +216,7 @@ export default defineComponent({
previewLoaded: false,
previewErrored: false,
capabilities: loadState('core', 'capabilities', { files: { version_labeling: false, version_deletion: false } }),
versionAuthor: '',
}
},

Expand Down Expand Up @@ -279,6 +303,19 @@ export default defineComponent({
this.$emit('delete', this.version)
},

async fetchDisplayName() {
// check to make sure that we have a valid author - in case database did not migrate, null author, etc.
if (this.version.author) {
try {
const { data } = await axios.get(generateOcsUrl(`/cloud/users/${this.version.author}`))
this.versionAuthor = data.ocs.data.displayname
} catch (e) {
// Promise got rejected - default to null author to not try to load author profile
this.versionAuthor = null
}
}
},

click() {
if (!this.canView) {
window.location = this.downloadURL
Expand Down Expand Up @@ -309,10 +346,16 @@ export default defineComponent({
flex-direction: row;
align-items: center;
gap: 0.5rem;
color: var(--color-main-text);
font-weight: 500;

&__size {
color: var(--color-text-lighter);
&__label {
font-weight: 700;
}

&__subline {
color: var(--color-text-maxcontrast)
}
}

&__image {
Expand Down
2 changes: 2 additions & 0 deletions apps/files_versions/src/utils/versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import logger from '../utils/logger.js'
export interface Version {
fileId: string, // The id of the file associated to the version.
label: string, // 'Current version' or ''
author: string|null, // UID for the author of the version
filename: string, // File name relative to the version DAV endpoint
basename: string, // A base name generated from the mtime
mime: string, // Empty for the current version, else the actual mime type of the version
Expand Down Expand Up @@ -107,6 +108,7 @@ function formatVersion(version: any, fileInfo: any): Version {
return {
fileId: fileInfo.id,
label: version.props['version-label'],
author: version.props['version-author'] ?? null,
filename: version.filename,
basename: moment(mtime).format('LLL'),
mime: version.mime,
Expand Down
4 changes: 2 additions & 2 deletions dist/files_versions-files_versions.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_versions-files_versions.js.map

Large diffs are not rendered by default.

Loading