MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve "Computed properties already defined in data"

This commit is contained in:
Marcos Peña 2021-12-19 17:37:48 +00:00 committed by Georg Krause
parent e4debe06e5
commit 312ceb9cfb
22 changed files with 71 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/1649.bugfix Normal file
View File

@ -0,0 +1 @@
Fixed omputed properties already defined in components data (#1649)

2
front/src/components/library/EditCard.vue
View File

@ -267,7 +267,7 @@ export default {
},
updatedFields () {
if (!this.obj.target) {
if (!this.obj || this.obj.target) {
return []
}
const payload = this.obj.payload

2
front/src/components/library/ImportStatusModal.vue
View File

@ -6,7 +6,7 @@
</translate>
</h4>
<div
v-if="upload"
v-if="Object.keys(upload).length > 0"
class="content"
>
<div class="description">

4
front/src/components/manage/ChannelsTable.vue
View File

@ -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']

4
front/src/components/manage/library/AlbumsTable.vue
View File

@ -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'],

4
front/src/components/manage/library/ArtistsTable.vue
View File

@ -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']

4
front/src/components/manage/library/EditsCardList.vue
View File

@ -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']

4
front/src/components/manage/library/LibrariesTable.vue
View File

@ -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'],

6
front/src/components/manage/library/TagsTable.vue
View File

@ -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'],

4
front/src/components/manage/library/TracksTable.vue
View File

@ -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']
]

6
front/src/components/manage/library/UploadsTable.vue
View File

@ -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'],

4
front/src/components/manage/moderation/AccountsTable.vue
View File

@ -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'],

4
front/src/components/manage/moderation/DomainsTable.vue
View File

@ -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'],

2
front/src/components/manage/moderation/NoteForm.vue
View File

@ -49,7 +49,7 @@ import showdown from 'showdown'
export default {
props: {
target: { type: String, required: true }
target: { type: Object, required: true }
},
data () {
return {

2
front/src/components/manage/moderation/NotesThread.vue
View File

@ -62,7 +62,7 @@ import showdown from 'showdown'
export default {
props: {
notes: { type: String, required: true }
notes: { type: Array, required: true }
},
data () {
return {

4
front/src/components/manage/users/InvitationsTable.vue
View File

@ -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']

4
front/src/components/manage/users/UsersTable.vue
View File

@ -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'],

2
front/src/components/moderation/ReportCategoryDropdown.vue
View File

@ -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 },

60
front/src/store/ui.js
View File

@ -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: '-',

2
front/src/views/admin/library/UploadDetail.vue
View File

@ -392,7 +392,7 @@ export default {
data () {
return {
time,
detailedUpload: null,
detailedUpload: {},
showUploadDetailModal: false,
isLoading: true,
object: null,

6
front/src/views/admin/moderation/ReportsList.vue
View File

@ -107,7 +107,7 @@
<report-card
v-for="obj in result.results"
:key="obj.uuid"
:obj="obj"
:init-obj="obj"
@handled="fetchData"
/>
</div>
@ -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']

2
front/src/views/content/libraries/FilesTable.vue
View File

@ -299,7 +299,7 @@ export default {
data () {
return {
time,
detailedUpload: null,
detailedUpload: {},
showUploadDetailModal: false,
isLoading: false,
result: null,