From 1e5cb09adaf3c1ede63c42f19b604b09ecb4c681 Mon Sep 17 00:00:00 2001 From: advplyr Date: Sat, 6 Jul 2024 16:28:36 -0500 Subject: [PATCH] Update changelog version to link to release, pass versionData into changelog modal --- client/components/app/SideRail.vue | 11 +----- .../components/modals/changelog/ViewModal.vue | 37 ++++++++++--------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/client/components/app/SideRail.vue b/client/components/app/SideRail.vue index b3985fc2..9720bc6b 100644 --- a/client/components/app/SideRail.vue +++ b/client/components/app/SideRail.vue @@ -121,7 +121,7 @@

{{ Source }}

- + @@ -152,9 +152,6 @@ export default { paramId() { return this.$route.params ? this.$route.params.id || '' : '' }, - dateFormat() { - return this.$store.state.serverSettings.dateFormat - }, currentLibraryId() { return this.$store.state.libraries.currentLibraryId }, @@ -222,12 +219,6 @@ export default { githubTagUrl() { return this.versionData.githubTagUrl }, - currentVersionChangelog() { - return this.versionData.currentVersionChangelog || 'No Changelog Available' - }, - currentVersionPubDate() { - return `${this.$formatDate(this.versionData.currentVersionPubDate, this.dateFormat)}` || 'Unknown release date' - }, streamLibraryItem() { return this.$store.state.streamLibraryItem }, diff --git a/client/components/modals/changelog/ViewModal.vue b/client/components/modals/changelog/ViewModal.vue index 05503c43..a61cc951 100644 --- a/client/components/modals/changelog/ViewModal.vue +++ b/client/components/modals/changelog/ViewModal.vue @@ -6,7 +6,9 @@
-

Changelog v{{ currentVersionNumber }} ({{ currentVersionPubDate }})

+

+ Changelog v{{ currentVersionNumber }} ({{ currentVersionPubDate }}) +

@@ -18,18 +20,9 @@ import { marked } from '@/static/libs/marked/index.js' export default { props: { value: Boolean, - changelog: String, - currentPubDate: String, - currentVersion: String - }, - watch: { - show: { - immediate: true, - handler(newVal) { - if (newVal) { - this.init() - } - } + versionData: { + type: Object, + default: () => {} } }, computed: { @@ -41,19 +34,27 @@ export default { this.$emit('input', val) } }, + dateFormat() { + return this.$store.state.serverSettings.dateFormat + }, + changelog() { + return this.versionData?.currentVersionChangelog || 'No Changelog Available' + }, compiledMarkedown() { return marked.parse(this.changelog, { gfm: true, breaks: true }) }, currentVersionPubDate() { - return this.currentPubDate + if (!this.versionData?.currentVersionPubDate) return 'Unknown release date' + return `${this.$formatDate(this.versionData.currentVersionPubDate, this.dateFormat)}` + }, + currentTagUrl() { + return this.versionData?.currentTagUrl }, currentVersionNumber() { - return this.currentVersion + return this.$config.version } }, - methods: { - init() {} - }, + methods: {}, mounted() {} }