From b7d66232f64d4d5f2cf315b9acb9f6d441308cab Mon Sep 17 00:00:00 2001 From: Kasper Seweryn Date: Sat, 30 Apr 2022 22:46:37 +0200 Subject: [PATCH] Remove vue 2 filters Fixes #1759 --- front/package.json | 1 - front/src/components/About.vue | 2 +- front/src/components/AboutPod.vue | 7 +- front/src/components/Home.vue | 2 +- front/src/components/audio/ChannelCard.vue | 2 +- front/src/components/audio/album/Card.vue | 6 +- front/src/components/audio/artist/Card.vue | 6 +- front/src/components/audio/track/Table.vue | 6 +- front/src/components/channels/UploadForm.vue | 8 +- front/src/components/channels/UploadModal.vue | 6 +- front/src/components/common/ActorLink.vue | 92 +++++++----- front/src/components/common/Duration.vue | 33 +++-- front/src/components/common/HumanDate.vue | 46 +++--- front/src/components/common/HumanDuration.vue | 22 ++- front/src/components/library/AlbumBase.vue | 6 +- front/src/components/library/FileUpload.vue | 12 +- front/src/components/library/TrackBase.vue | 2 +- front/src/components/library/TrackDetail.vue | 17 ++- .../components/manage/library/TagsTable.vue | 6 +- .../manage/library/UploadsTable.vue | 8 +- front/src/components/tags/List.vue | 75 ++++++---- front/src/init/filters.ts | 140 ------------------ front/src/types.ts | 8 + front/src/utils/filters.ts | 38 +++++ front/src/views/admin/ChannelDetail.vue | 10 +- front/src/views/admin/library/AlbumDetail.vue | 10 +- .../src/views/admin/library/ArtistDetail.vue | 10 +- .../src/views/admin/library/LibraryDetail.vue | 10 +- front/src/views/admin/library/TagDetail.vue | 6 +- front/src/views/admin/library/TrackDetail.vue | 10 +- .../src/views/admin/library/UploadDetail.vue | 15 +- .../views/admin/moderation/AccountsDetail.vue | 8 +- .../views/admin/moderation/DomainsDetail.vue | 8 +- front/src/views/content/Home.vue | 2 +- front/src/views/content/libraries/Card.vue | 6 +- .../views/content/libraries/FilesTable.vue | 17 ++- front/src/views/content/libraries/Quota.vue | 2 +- front/src/views/library/DetailBase.vue | 6 +- .../unit/specs/components/common.spec.js | 2 +- .../tests/unit/specs/filters/filters.spec.js | 47 +----- front/tests/unit/specs/store/auth.spec.js | 2 +- .../tests/unit/specs/store/favorites.spec.js | 2 +- front/tests/unit/specs/store/instance.spec.js | 2 +- front/tests/unit/specs/store/player.spec.js | 2 +- .../tests/unit/specs/store/playlists.spec.js | 2 +- front/tests/unit/specs/store/queue.spec.js | 2 +- front/tests/unit/specs/store/radios.spec.js | 2 +- front/yarn.lock | 16 +- 48 files changed, 368 insertions(+), 382 deletions(-) delete mode 100644 front/src/init/filters.ts create mode 100644 front/src/utils/filters.ts diff --git a/front/package.json b/front/package.json index 44d3112ec..34231d27b 100644 --- a/front/package.json +++ b/front/package.json @@ -82,7 +82,6 @@ "vite": "2.8.6", "vite-plugin-pwa": "0.12.0", "vue-jest": "3.0.7", - "vue-template-compiler": "2.6.14", "workbox-core": "6.5.3", "workbox-precaching": "6.5.3", "workbox-routing": "6.5.3", diff --git a/front/src/components/About.vue b/front/src/components/About.vue index ece6baf24..d954a9e2e 100644 --- a/front/src/components/About.vue +++ b/front/src/components/About.vue @@ -252,7 +252,7 @@ import { mapState } from 'vuex' import { get } from 'lodash-es' import showdown from 'showdown' -import { humanSize } from '~/init/filters' +import { humanSize } from '~/utils/filters' import SignupForm from '~/components/auth/SignupForm.vue' import LogoText from '~/components/LogoText.vue' diff --git a/front/src/components/AboutPod.vue b/front/src/components/AboutPod.vue index f94308cae..4c3d0dfdd 100644 --- a/front/src/components/AboutPod.vue +++ b/front/src/components/AboutPod.vue @@ -278,7 +278,7 @@ We render some markdown to html here, the content is set by the admin so we shou class="right aligned" > - {{ defaultUploadQuota * 1000 * 1000 | humanSize }} + {{ humanSize(defaultUploadQuota * 1000 * 1000) }}
- {{ album.release_date | moment('Y') }} · + {{ momentFormat(album.release_date, 'Y') }} · import PlayButton from '~/components/audio/PlayButton.vue' +import { momentFormat} from '~/utils/filters' export default { components: { @@ -67,6 +68,9 @@ export default { props: { album: { type: Object, required: true } }, + setup () { + return { momentFormat } + }, computed: { imageUrl () { if (this.album.cover && this.album.cover.urls.original) { diff --git a/front/src/components/audio/artist/Card.vue b/front/src/components/audio/artist/Card.vue index dcfc3c031..f4e00b0f8 100644 --- a/front/src/components/audio/artist/Card.vue +++ b/front/src/components/audio/artist/Card.vue @@ -22,7 +22,7 @@ class="discrete link" :to="{name: 'library.artists.detail', params: {id: artist.id}}" > - {{ artist.name|truncate(30) }} + {{ truncate(artist.name, 30) }} @@ -67,6 +67,7 @@ + - - diff --git a/front/src/components/common/Duration.vue b/front/src/components/common/Duration.vue index 92b8725c4..5983bae3e 100644 --- a/front/src/components/common/Duration.vue +++ b/front/src/components/common/Duration.vue @@ -1,26 +1,29 @@ + + - diff --git a/front/src/components/common/HumanDate.vue b/front/src/components/common/HumanDate.vue index 5dc267adf..93b20751e 100644 --- a/front/src/components/common/HumanDate.vue +++ b/front/src/components/common/HumanDate.vue @@ -1,32 +1,32 @@ + + - diff --git a/front/src/components/common/HumanDuration.vue b/front/src/components/common/HumanDuration.vue index 83119c82e..8505a6f91 100644 --- a/front/src/components/common/HumanDuration.vue +++ b/front/src/components/common/HumanDuration.vue @@ -1,12 +1,18 @@ + + - diff --git a/front/src/components/library/AlbumBase.vue b/front/src/components/library/AlbumBase.vue index 9d69e79b0..6b6ff7daf 100644 --- a/front/src/components/library/AlbumBase.vue +++ b/front/src/components/library/AlbumBase.vue @@ -141,7 +141,7 @@ v-if="object.release_date || (totalTracks > 0)" class="ui small hidden divider" /> - {{ object.release_date | moment('Y') }} · + {{ momentFormat(object.release_date, 'Y') }} ·