diff --git a/changes/changelog.d/1649.bugfix b/changes/changelog.d/1649.bugfix new file mode 100644 index 000000000..897a5b8d6 --- /dev/null +++ b/changes/changelog.d/1649.bugfix @@ -0,0 +1 @@ +Fixed omputed properties already defined in components data (#1649) diff --git a/front/src/components/library/EditCard.vue b/front/src/components/library/EditCard.vue index a8fde61cf..e248d2eed 100644 --- a/front/src/components/library/EditCard.vue +++ b/front/src/components/library/EditCard.vue @@ -267,7 +267,7 @@ export default { }, updatedFields () { - if (!this.obj.target) { + if (!this.obj || this.obj.target) { return [] } const payload = this.obj.payload diff --git a/front/src/components/library/ImportStatusModal.vue b/front/src/components/library/ImportStatusModal.vue index b20531f21..839c7fa3d 100644 --- a/front/src/components/library/ImportStatusModal.vue +++ b/front/src/components/library/ImportStatusModal.vue @@ -6,7 +6,7 @@
diff --git a/front/src/components/manage/ChannelsTable.vue b/front/src/components/manage/ChannelsTable.vue index 129860c1e..9399240be 100644 --- a/front/src/components/manage/ChannelsTable.vue +++ b/front/src/components/manage/ChannelsTable.vue @@ -220,19 +220,15 @@ export default { filters: { type: Object, required: false, default: () => { return {} } } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date') return { time, isLoading: false, result: null, page: 1, - paginateBy: 50, search: { query: this.defaultQuery, tokens: parseTokens(normalizeQuery(this.defaultQuery)) }, - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['creation_date', 'creation_date'], ['name', 'name'] diff --git a/front/src/components/manage/library/AlbumsTable.vue b/front/src/components/manage/library/AlbumsTable.vue index bdaaf9c68..8ccc63d5e 100644 --- a/front/src/components/manage/library/AlbumsTable.vue +++ b/front/src/components/manage/library/AlbumsTable.vue @@ -205,19 +205,15 @@ export default { filters: { type: Object, required: false, default: () => { return {} } } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date') return { time, isLoading: false, result: null, page: 1, - paginateBy: 50, search: { query: this.defaultQuery, tokens: parseTokens(normalizeQuery(this.defaultQuery)) }, - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['creation_date', 'creation_date'], ['release_date', 'release_date'], diff --git a/front/src/components/manage/library/ArtistsTable.vue b/front/src/components/manage/library/ArtistsTable.vue index fa332278d..ba2118287 100644 --- a/front/src/components/manage/library/ArtistsTable.vue +++ b/front/src/components/manage/library/ArtistsTable.vue @@ -204,19 +204,15 @@ export default { filters: { type: Object, required: false, default: () => { return {} } } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date') return { time, isLoading: false, result: null, page: 1, - paginateBy: 50, search: { query: this.defaultQuery, tokens: parseTokens(normalizeQuery(this.defaultQuery)) }, - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['creation_date', 'creation_date'], ['name', 'name'] diff --git a/front/src/components/manage/library/EditsCardList.vue b/front/src/components/manage/library/EditsCardList.vue index d253aaf69..7a19df986 100644 --- a/front/src/components/manage/library/EditsCardList.vue +++ b/front/src/components/manage/library/EditsCardList.vue @@ -152,19 +152,15 @@ export default { filters: { type: Object, required: false, default: () => { return {} } } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date') return { time, isLoading: false, result: null, page: 1, - paginateBy: 25, search: { query: this.defaultQuery, tokens: parseTokens(normalizeQuery(this.defaultQuery)) }, - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['creation_date', 'creation_date'], ['applied_date', 'applied_date'] diff --git a/front/src/components/manage/library/LibrariesTable.vue b/front/src/components/manage/library/LibrariesTable.vue index 3c3cc77c4..0700a5782 100644 --- a/front/src/components/manage/library/LibrariesTable.vue +++ b/front/src/components/manage/library/LibrariesTable.vue @@ -235,19 +235,15 @@ export default { filters: { type: Object, required: false, default: () => { return {} } } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date') return { time, isLoading: false, result: null, page: 1, - paginateBy: 50, search: { query: this.defaultQuery, tokens: parseTokens(normalizeQuery(this.defaultQuery)) }, - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['creation_date', 'creation_date'], ['followers_count', 'followers'], diff --git a/front/src/components/manage/library/TagsTable.vue b/front/src/components/manage/library/TagsTable.vue index a7f1f5759..8a5bd87ea 100644 --- a/front/src/components/manage/library/TagsTable.vue +++ b/front/src/components/manage/library/TagsTable.vue @@ -168,21 +168,17 @@ export default { filters: { type: Object, required: false, default: () => { return {} } } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date') return { - detailedUpload: null, + detailedUpload: {}, showUploadDetailModal: false, time, isLoading: false, result: null, page: 1, - paginateBy: 50, search: { query: this.defaultQuery, tokens: parseTokens(normalizeQuery(this.defaultQuery)) }, - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['creation_date', 'creation_date'], ['name', 'name'], diff --git a/front/src/components/manage/library/TracksTable.vue b/front/src/components/manage/library/TracksTable.vue index 1d565ca19..3989015b3 100644 --- a/front/src/components/manage/library/TracksTable.vue +++ b/front/src/components/manage/library/TracksTable.vue @@ -218,19 +218,15 @@ export default { filters: { type: Object, required: false, default: () => { return {} } } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date') return { time, isLoading: false, result: null, page: 1, - paginateBy: 50, search: { query: this.defaultQuery, tokens: parseTokens(normalizeQuery(this.defaultQuery)) }, - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['creation_date', 'creation_date'] ] diff --git a/front/src/components/manage/library/UploadsTable.vue b/front/src/components/manage/library/UploadsTable.vue index 31f964833..f0d08794f 100644 --- a/front/src/components/manage/library/UploadsTable.vue +++ b/front/src/components/manage/library/UploadsTable.vue @@ -329,21 +329,17 @@ export default { filters: { type: Object, required: false, default: function () { return {} } } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date') return { - detailedUpload: null, + detailedUpload: {}, showUploadDetailModal: false, time, isLoading: false, result: null, page: 1, - paginateBy: 50, search: { query: this.defaultQuery, tokens: parseTokens(normalizeQuery(this.defaultQuery)) }, - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['creation_date', 'creation_date'], ['modification_date', 'modification_date'], diff --git a/front/src/components/manage/moderation/AccountsTable.vue b/front/src/components/manage/moderation/AccountsTable.vue index 2170f635c..076689bb4 100644 --- a/front/src/components/manage/moderation/AccountsTable.vue +++ b/front/src/components/manage/moderation/AccountsTable.vue @@ -191,19 +191,15 @@ export default { filters: { type: Object, required: false, default: function () { return {} } } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date') return { time, isLoading: false, result: null, page: 1, - paginateBy: 50, search: { query: this.defaultQuery, tokens: parseTokens(normalizeQuery(this.defaultQuery)) }, - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['creation_date', 'first_seen'], ['last_fetch_date', 'last_seen'], diff --git a/front/src/components/manage/moderation/DomainsTable.vue b/front/src/components/manage/moderation/DomainsTable.vue index be3953a6d..a4c9c7d25 100644 --- a/front/src/components/manage/moderation/DomainsTable.vue +++ b/front/src/components/manage/moderation/DomainsTable.vue @@ -201,17 +201,13 @@ export default { allowListEnabled: { type: Boolean, default: false } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date') return { time, isLoading: false, result: null, page: 1, - paginateBy: 50, search: '', allowed: null, - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['name', 'name'], ['creation_date', 'first_seen'], diff --git a/front/src/components/manage/moderation/NoteForm.vue b/front/src/components/manage/moderation/NoteForm.vue index 20632c8dd..1b767675d 100644 --- a/front/src/components/manage/moderation/NoteForm.vue +++ b/front/src/components/manage/moderation/NoteForm.vue @@ -49,7 +49,7 @@ import showdown from 'showdown' export default { props: { - target: { type: String, required: true } + target: { type: Object, required: true } }, data () { return { diff --git a/front/src/components/manage/moderation/NotesThread.vue b/front/src/components/manage/moderation/NotesThread.vue index 69fcb5f6f..12acc07eb 100644 --- a/front/src/components/manage/moderation/NotesThread.vue +++ b/front/src/components/manage/moderation/NotesThread.vue @@ -62,7 +62,7 @@ import showdown from 'showdown' export default { props: { - notes: { type: String, required: true } + notes: { type: Array, required: true } }, data () { return { diff --git a/front/src/components/manage/users/InvitationsTable.vue b/front/src/components/manage/users/InvitationsTable.vue index 289af6398..b3b64cabc 100644 --- a/front/src/components/manage/users/InvitationsTable.vue +++ b/front/src/components/manage/users/InvitationsTable.vue @@ -174,17 +174,13 @@ export default { filters: { type: Object, required: false, default: function () { return {} } } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date') return { moment, isLoading: false, result: null, page: 1, - paginateBy: 50, search: '', isOpen: null, - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['expiration_date', 'expiration_date'], ['creation_date', 'creation_date'] diff --git a/front/src/components/manage/users/UsersTable.vue b/front/src/components/manage/users/UsersTable.vue index ed1f1491b..4d8168428 100644 --- a/front/src/components/manage/users/UsersTable.vue +++ b/front/src/components/manage/users/UsersTable.vue @@ -217,16 +217,12 @@ export default { filters: { type: Object, required: false, default: function () { return {} } } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-date_joined') return { time, isLoading: false, result: null, page: 1, - paginateBy: 50, search: '', - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['date_joined', 'date_joined'], ['last_activity', 'last_activity'], diff --git a/front/src/components/moderation/ReportCategoryDropdown.vue b/front/src/components/moderation/ReportCategoryDropdown.vue index e15bc50d2..c3fcc552c 100644 --- a/front/src/components/moderation/ReportCategoryDropdown.vue +++ b/front/src/components/moderation/ReportCategoryDropdown.vue @@ -31,7 +31,7 @@ export default { mixins: [TranslationsMixin], props: { value: { type: String, default: null }, - all: { type: String, default: null }, + all: { type: Boolean, default: null }, label: { type: Boolean }, empty: { type: Boolean }, required: { type: Boolean }, diff --git a/front/src/store/ui.js b/front/src/store/ui.js index 5738f8ec7..174563f58 100644 --- a/front/src/store/ui.js +++ b/front/src/store/ui.js @@ -105,6 +105,66 @@ export default { orderingDirection: '-', ordering: 'creation_date' }, + 'manage.channels': { + paginateBy: 50, + orderingDirection: '-', + ordering: 'creation_date' + }, + 'manage.library.tags': { + paginateBy: 50, + orderingDirection: '-', + ordering: 'creation_date' + }, + 'manage.library.uploads': { + paginateBy: 50, + orderingDirection: '-', + ordering: 'creation_date' + }, + 'manage.library.libraries': { + paginateBy: 50, + orderingDirection: '-', + ordering: 'creation_date' + }, + 'manage.library.tracks': { + paginateBy: 50, + orderingDirection: '-', + ordering: 'creation_date' + }, + 'manage.library.albums': { + paginateBy: 50, + orderingDirection: '-', + ordering: 'creation_date' + }, + 'manage.library.artists': { + paginateBy: 50, + orderingDirection: '-', + ordering: 'creation_date' + }, + 'manage.library.edits': { + paginateBy: 25, + orderingDirection: '-', + ordering: 'creation_date' + }, + 'manage.users.users.list': { + paginateBy: 50, + orderingDirection: '-', + ordering: 'creation_date' + }, + 'manage.users.invitations.list': { + paginateBy: 50, + orderingDirection: '-', + ordering: 'creation_date' + }, + 'manage.moderation.accounts.list': { + paginateBy: 50, + orderingDirection: '-', + ordering: 'creation_date' + }, + 'manage.moderation.domains.list': { + paginateBy: 50, + orderingDirection: '-', + ordering: 'creation_date' + }, 'manage.moderation.requests.list': { paginateBy: 25, orderingDirection: '-', diff --git a/front/src/views/admin/library/UploadDetail.vue b/front/src/views/admin/library/UploadDetail.vue index b332c0ec3..3c701c32a 100644 --- a/front/src/views/admin/library/UploadDetail.vue +++ b/front/src/views/admin/library/UploadDetail.vue @@ -392,7 +392,7 @@ export default { data () { return { time, - detailedUpload: null, + detailedUpload: {}, showUploadDetailModal: false, isLoading: true, object: null, diff --git a/front/src/views/admin/moderation/ReportsList.vue b/front/src/views/admin/moderation/ReportsList.vue index 54675070d..bf9bdca45 100644 --- a/front/src/views/admin/moderation/ReportsList.vue +++ b/front/src/views/admin/moderation/ReportsList.vue @@ -107,7 +107,7 @@
@@ -148,19 +148,15 @@ export default { mode: { type: String, default: 'card' } }, data () { - const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date') return { time, isLoading: false, result: null, page: 1, - paginateBy: 25, search: { query: this.defaultQuery, tokens: parseTokens(normalizeQuery(this.defaultQuery)) }, - orderingDirection: defaultOrdering.direction || '+', - ordering: defaultOrdering.field, orderingOptions: [ ['creation_date', 'creation_date'], ['applied_date', 'applied_date'] diff --git a/front/src/views/content/libraries/FilesTable.vue b/front/src/views/content/libraries/FilesTable.vue index 9e794961a..e38e61344 100644 --- a/front/src/views/content/libraries/FilesTable.vue +++ b/front/src/views/content/libraries/FilesTable.vue @@ -299,7 +299,7 @@ export default { data () { return { time, - detailedUpload: null, + detailedUpload: {}, showUploadDetailModal: false, isLoading: false, result: null,