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

View File

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

View File

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

View File

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

View File

@ -220,19 +220,15 @@ export default {
filters: { type: Object, required: false, default: () => { return {} } } filters: { type: Object, required: false, default: () => { return {} } }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
return { return {
time, time,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 50,
search: { search: {
query: this.defaultQuery, query: this.defaultQuery,
tokens: parseTokens(normalizeQuery(this.defaultQuery)) tokens: parseTokens(normalizeQuery(this.defaultQuery))
}, },
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['creation_date', 'creation_date'], ['creation_date', 'creation_date'],
['name', 'name'] ['name', 'name']

View File

@ -205,19 +205,15 @@ export default {
filters: { type: Object, required: false, default: () => { return {} } } filters: { type: Object, required: false, default: () => { return {} } }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
return { return {
time, time,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 50,
search: { search: {
query: this.defaultQuery, query: this.defaultQuery,
tokens: parseTokens(normalizeQuery(this.defaultQuery)) tokens: parseTokens(normalizeQuery(this.defaultQuery))
}, },
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['creation_date', 'creation_date'], ['creation_date', 'creation_date'],
['release_date', 'release_date'], ['release_date', 'release_date'],

View File

@ -204,19 +204,15 @@ export default {
filters: { type: Object, required: false, default: () => { return {} } } filters: { type: Object, required: false, default: () => { return {} } }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
return { return {
time, time,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 50,
search: { search: {
query: this.defaultQuery, query: this.defaultQuery,
tokens: parseTokens(normalizeQuery(this.defaultQuery)) tokens: parseTokens(normalizeQuery(this.defaultQuery))
}, },
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['creation_date', 'creation_date'], ['creation_date', 'creation_date'],
['name', 'name'] ['name', 'name']

View File

@ -152,19 +152,15 @@ export default {
filters: { type: Object, required: false, default: () => { return {} } } filters: { type: Object, required: false, default: () => { return {} } }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
return { return {
time, time,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 25,
search: { search: {
query: this.defaultQuery, query: this.defaultQuery,
tokens: parseTokens(normalizeQuery(this.defaultQuery)) tokens: parseTokens(normalizeQuery(this.defaultQuery))
}, },
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['creation_date', 'creation_date'], ['creation_date', 'creation_date'],
['applied_date', 'applied_date'] ['applied_date', 'applied_date']

View File

@ -235,19 +235,15 @@ export default {
filters: { type: Object, required: false, default: () => { return {} } } filters: { type: Object, required: false, default: () => { return {} } }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
return { return {
time, time,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 50,
search: { search: {
query: this.defaultQuery, query: this.defaultQuery,
tokens: parseTokens(normalizeQuery(this.defaultQuery)) tokens: parseTokens(normalizeQuery(this.defaultQuery))
}, },
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['creation_date', 'creation_date'], ['creation_date', 'creation_date'],
['followers_count', 'followers'], ['followers_count', 'followers'],

View File

@ -168,21 +168,17 @@ export default {
filters: { type: Object, required: false, default: () => { return {} } } filters: { type: Object, required: false, default: () => { return {} } }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
return { return {
detailedUpload: null, detailedUpload: {},
showUploadDetailModal: false, showUploadDetailModal: false,
time, time,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 50,
search: { search: {
query: this.defaultQuery, query: this.defaultQuery,
tokens: parseTokens(normalizeQuery(this.defaultQuery)) tokens: parseTokens(normalizeQuery(this.defaultQuery))
}, },
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['creation_date', 'creation_date'], ['creation_date', 'creation_date'],
['name', 'name'], ['name', 'name'],

View File

@ -218,19 +218,15 @@ export default {
filters: { type: Object, required: false, default: () => { return {} } } filters: { type: Object, required: false, default: () => { return {} } }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
return { return {
time, time,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 50,
search: { search: {
query: this.defaultQuery, query: this.defaultQuery,
tokens: parseTokens(normalizeQuery(this.defaultQuery)) tokens: parseTokens(normalizeQuery(this.defaultQuery))
}, },
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['creation_date', 'creation_date'] ['creation_date', 'creation_date']
] ]

View File

@ -329,21 +329,17 @@ export default {
filters: { type: Object, required: false, default: function () { return {} } } filters: { type: Object, required: false, default: function () { return {} } }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
return { return {
detailedUpload: null, detailedUpload: {},
showUploadDetailModal: false, showUploadDetailModal: false,
time, time,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 50,
search: { search: {
query: this.defaultQuery, query: this.defaultQuery,
tokens: parseTokens(normalizeQuery(this.defaultQuery)) tokens: parseTokens(normalizeQuery(this.defaultQuery))
}, },
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['creation_date', 'creation_date'], ['creation_date', 'creation_date'],
['modification_date', 'modification_date'], ['modification_date', 'modification_date'],

View File

@ -191,19 +191,15 @@ export default {
filters: { type: Object, required: false, default: function () { return {} } } filters: { type: Object, required: false, default: function () { return {} } }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
return { return {
time, time,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 50,
search: { search: {
query: this.defaultQuery, query: this.defaultQuery,
tokens: parseTokens(normalizeQuery(this.defaultQuery)) tokens: parseTokens(normalizeQuery(this.defaultQuery))
}, },
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['creation_date', 'first_seen'], ['creation_date', 'first_seen'],
['last_fetch_date', 'last_seen'], ['last_fetch_date', 'last_seen'],

View File

@ -201,17 +201,13 @@ export default {
allowListEnabled: { type: Boolean, default: false } allowListEnabled: { type: Boolean, default: false }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
return { return {
time, time,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 50,
search: '', search: '',
allowed: null, allowed: null,
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['name', 'name'], ['name', 'name'],
['creation_date', 'first_seen'], ['creation_date', 'first_seen'],

View File

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

View File

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

View File

@ -174,17 +174,13 @@ export default {
filters: { type: Object, required: false, default: function () { return {} } } filters: { type: Object, required: false, default: function () { return {} } }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
return { return {
moment, moment,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 50,
search: '', search: '',
isOpen: null, isOpen: null,
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['expiration_date', 'expiration_date'], ['expiration_date', 'expiration_date'],
['creation_date', 'creation_date'] ['creation_date', 'creation_date']

View File

@ -217,16 +217,12 @@ export default {
filters: { type: Object, required: false, default: function () { return {} } } filters: { type: Object, required: false, default: function () { return {} } }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-date_joined')
return { return {
time, time,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 50,
search: '', search: '',
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['date_joined', 'date_joined'], ['date_joined', 'date_joined'],
['last_activity', 'last_activity'], ['last_activity', 'last_activity'],

View File

@ -31,7 +31,7 @@ export default {
mixins: [TranslationsMixin], mixins: [TranslationsMixin],
props: { props: {
value: { type: String, default: null }, value: { type: String, default: null },
all: { type: String, default: null }, all: { type: Boolean, default: null },
label: { type: Boolean }, label: { type: Boolean },
empty: { type: Boolean }, empty: { type: Boolean },
required: { type: Boolean }, required: { type: Boolean },

View File

@ -105,6 +105,66 @@ export default {
orderingDirection: '-', orderingDirection: '-',
ordering: 'creation_date' 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': { 'manage.moderation.requests.list': {
paginateBy: 25, paginateBy: 25,
orderingDirection: '-', orderingDirection: '-',

View File

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

View File

@ -107,7 +107,7 @@
<report-card <report-card
v-for="obj in result.results" v-for="obj in result.results"
:key="obj.uuid" :key="obj.uuid"
:obj="obj" :init-obj="obj"
@handled="fetchData" @handled="fetchData"
/> />
</div> </div>
@ -148,19 +148,15 @@ export default {
mode: { type: String, default: 'card' } mode: { type: String, default: 'card' }
}, },
data () { data () {
const defaultOrdering = this.getOrderingFromString(this.defaultOrdering || '-creation_date')
return { return {
time, time,
isLoading: false, isLoading: false,
result: null, result: null,
page: 1, page: 1,
paginateBy: 25,
search: { search: {
query: this.defaultQuery, query: this.defaultQuery,
tokens: parseTokens(normalizeQuery(this.defaultQuery)) tokens: parseTokens(normalizeQuery(this.defaultQuery))
}, },
orderingDirection: defaultOrdering.direction || '+',
ordering: defaultOrdering.field,
orderingOptions: [ orderingOptions: [
['creation_date', 'creation_date'], ['creation_date', 'creation_date'],
['applied_date', 'applied_date'] ['applied_date', 'applied_date']

View File

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