From 695c75a1b80b8d956c22972eda195333eee6d558 Mon Sep 17 00:00:00 2001 From: skjnldsv Date: Thu, 5 Dec 2024 11:33:42 +0100 Subject: [PATCH 1/2] fix(files_versions): fix undefined success message Signed-off-by: skjnldsv --- apps/files_versions/src/views/VersionTab.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_versions/src/views/VersionTab.vue b/apps/files_versions/src/views/VersionTab.vue index 658b95c8e99a2..6b04cea70c813 100644 --- a/apps/files_versions/src/views/VersionTab.vue +++ b/apps/files_versions/src/views/VersionTab.vue @@ -200,7 +200,7 @@ export default { try { await restoreVersion(version) - if (version.label !== '') { + if (version?.label && version?.label !== '') { showSuccess(t('files_versions', `${version.label} restored`)) } else if (version.mtime === this.initialVersionMtime) { showSuccess(t('files_versions', 'Initial version restored')) From 4afc3d52092a525033e8109f4e1e058a07ed2557 Mon Sep 17 00:00:00 2001 From: skjnldsv Date: Thu, 5 Dec 2024 11:40:00 +0100 Subject: [PATCH 2/2] fix(files_versions): fix missing label Signed-off-by: skjnldsv --- .../files_versions/src/components/Version.vue | 20 +++++++++++++------ apps/files_versions/src/utils/versions.ts | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/apps/files_versions/src/components/Version.vue b/apps/files_versions/src/components/Version.vue index 177a9fef807d8..2ccd03bd8d4d3 100644 --- a/apps/files_versions/src/components/Version.vue +++ b/apps/files_versions/src/components/Version.vue @@ -209,20 +209,28 @@ export default defineComponent({ }, versionLabel(): string { - const label = this.version.label ?? '' + const label = this.version?.label ?? '' + // Current but empty label + if (this.isCurrent && label === '') { + return t('files_versions', 'Current version') + } + + // Current with label if (this.isCurrent) { - if (label === '') { - return t('files_versions', 'Current version') - } else { - return `${label} (${t('files_versions', 'Current version')})` - } + return `${label} (${t('files_versions', 'Current version')})` } + // First version with empty label if (this.isFirstVersion && label === '') { return t('files_versions', 'Initial version') } + // Unknown version with empty label + if (label === '') { + return t('files_versions', 'Unnamed version') + } + return label }, diff --git a/apps/files_versions/src/utils/versions.ts b/apps/files_versions/src/utils/versions.ts index b52f92ef4621c..567dfa72de2f4 100644 --- a/apps/files_versions/src/utils/versions.ts +++ b/apps/files_versions/src/utils/versions.ts @@ -18,7 +18,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 '' + 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