NoLog.cz/gancio-upstream
6
0
Fork 0
mirror of https://framagit.org/les/gancio.git synced 2025-01-31 16:42:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: improve trusted node display in Admin>Collection

Browse source
This commit is contained in:
lesion 2024-01-08 22:49:20 +01:00
parent 03508ad9df
commit dcb7498c67
No known key found for this signature in database
GPG key ID: 352918250B012177
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
components/admin/Collections.vue
View file

@ -46,24 +46,25 @@ v-container
v-row v-row
v-col(cols=4) v-col(cols=4)
//- @input.native='searchActors'
//- @focus='searchActors'
v-autocomplete(v-model='filterActors' v-autocomplete(v-model='filterActors'
cache-items cache-items
:prepend-inner-icon="mdiTagMultiple" :prepend-inner-icon="mdiTagMultiple"
chips small-chips multiple deletable-chips hide-no-data hide-selected persistent-hint chips small-chips multiple deletable-chips hide-no-data hide-selected persistent-hint
:disabled="!collection.id" :disabled="!collection.id"
placeholder='Local' placeholder='Local'
@input.native='searchActors'
@focus='searchActors'
return-object return-object
item-value='ap_id' item-value='ap_id'
item-text='instanceDomain'
:delimiters="[',', ';']" :delimiters="[',', ';']"
:items="actors" :items="actors"
:label="$t('common.trusted_instances')") :label="$t('common.trusted_instances')")
template(v-slot:item="{ item }") template(v-slot:item="{ item }")
v-list-item-content @{{ item?.object?.name }}@{{ item?.instanceDomain }} v-list-item-content @{{ item?.object?.preferredUsername }}@{{ item?.instanceDomain }}
template(v-slot:selection="{ item, on, attrs, selected, parent }") template(v-slot:selection="{ item, on, attrs, selected, parent }")
v-chip(v-bind="attrs" close :close-icon='mdiCloseCircle' @click:close='parent.selectItem(item)' v-chip(v-bind="attrs" close :close-icon='mdiCloseCircle' @click:close='parent.selectItem(item)'
:input-value="selected" label small) @{{ item?.object?.name }}@{{ item?.instanceDomain }} :input-value="selected" label small) @{{ item?.object?.preferredUsername }}@{{ item?.instanceDomain }}
v-col(cols=4) v-col(cols=4)
v-autocomplete(v-model='filterTags' v-autocomplete(v-model='filterTags'
@ -122,7 +123,7 @@ v-container
template(v-slot:item.places='{ item }') template(v-slot:item.places='{ item }')
v-chip.ma-1(small label v-for='place in item.places' v-text='place.name' :key='place.id' ) v-chip.ma-1(small label v-for='place in item.places' v-text='place.name' :key='place.id' )
template(v-slot:item.actors='{ item }') template(v-slot:item.actors='{ item }')
v-chip.ma-1(small label v-for='actor in item.actors' v-text='actor.name' :key='actor.ap_id' ) v-chip.ma-1(small label v-for='actor in item.actors' :key='actor.ap_id' ) @{{ actor.name }}@{{ actor?.domain }}
v-card-actions v-card-actions
@ -192,6 +193,7 @@ export default {
}, },
async fetch() { async fetch() {
this.collections = await this.$axios.$get('/collections?withFilters=true') this.collections = await this.$axios.$get('/collections?withFilters=true')
this.actors = await this.$axios.$get('/instances/trusted')
}, },
computed: { computed: {
...mapState(['settings']), ...mapState(['settings']),
@ -213,9 +215,9 @@ export default {
searchPlaces: debounce(async function (ev) { searchPlaces: debounce(async function (ev) {
this.places = await this.$axios.$get(`/place?search=${ev.target.value}`) this.places = await this.$axios.$get(`/place?search=${ev.target.value}`)
}, 100), }, 100),
searchActors: debounce(async function (ev) { // searchActors: debounce(async function (ev) {
this.actors = await this.$axios.$get(`/instances/trusted?search=${ev.target.value}`) // this.actors = await this.$axios.$get(`/instances/trusted?search=${ev.target.value}`)
}, 100), // }, 100),
// collectionFilters(collection) { // collectionFilters(collection) {
// return collection.filters.map(f => { // return collection.filters.map(f => {
// const tags = f.tags?.join(', ') // const tags = f.tags?.join(', ')
@ -228,7 +230,7 @@ export default {
this.loading = true this.loading = true
const tags = this.filterTags const tags = this.filterTags
const places = this.filterPlaces.map(p => ({ id: p.id, name: p.name })) const places = this.filterPlaces.map(p => ({ id: p.id, name: p.name }))
const actors = this.filterActors.map(a => ({ ap_id: a.ap_id, name: a.object.preferredUsername || a.object.username })) const actors = this.filterActors.map(a => ({ ap_id: a.ap_id, name: a.object?.preferredUsername ?? a.object?.username, domain: a.instanceDomain }))
const filter = { collectionId: this.collection.id, tags, places, actors } const filter = { collectionId: this.collection.id, tags, places, actors }
// tags and places are JSON field and there's no way to use them inside a unique constrain // tags and places are JSON field and there's no way to use them inside a unique constrain