add search/translation options
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful

This commit is contained in:
FloatingGhost 2022-08-29 18:39:50 +01:00
parent a50a45f4c3
commit 5766a94562
8 changed files with 2761 additions and 2285 deletions

View file

@ -412,6 +412,7 @@ export default {
submit: 'Submit', submit: 'Submit',
settings: 'Settings', settings: 'Settings',
instance: 'Instance', instance: 'Instance',
search: 'Search',
upload: 'Upload', upload: 'Upload',
mailer: 'Mailer', mailer: 'Mailer',
linkFormatter: 'Link Formatter', linkFormatter: 'Link Formatter',
@ -425,7 +426,6 @@ export default {
mrf: 'MRF', mrf: 'MRF',
mediaProxy: 'Media Proxy', mediaProxy: 'Media Proxy',
metadata: 'Metadata', metadata: 'Metadata',
gopher: 'Gopher',
jobQueue: 'Job queue', jobQueue: 'Job queue',
webPush: 'Web push encryption', webPush: 'Web push encryption',
rateLimiters: 'Rate limiters', rateLimiters: 'Rate limiters',

View file

@ -16,5 +16,6 @@ export const tabs = [
{ label: 'Rate limiters', path: 'rate-limiters', tab: ':rate_limiters' }, { label: 'Rate limiters', path: 'rate-limiters', tab: ':rate_limiters' },
{ label: 'Web push encryption', path: 'web-push', tab: ':web_push' }, { label: 'Web push encryption', path: 'web-push', tab: ':web_push' },
{ label: 'Upload', path: 'upload', tab: ':upload' }, { label: 'Upload', path: 'upload', tab: ':upload' },
{ label: 'Search', path: 'search', tab: ':search' },
{ label: 'Other', path: 'other', tab: ':other' } { label: 'Other', path: 'other', tab: ':other' }
] ]

View file

@ -44,6 +44,17 @@
<el-form :model="streamerData" :label-position="labelPosition" :label-width="labelWidth"> <el-form :model="streamerData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="streamer" :data="streamerData"/> <setting :setting-group="streamer" :data="streamerData"/>
</el-form> </el-form>
<el-divider v-if="translator" class="divider thick-line"/>
<el-form :model="translatorData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="translator" :data="translatorData"/>
</el-form>
<el-form v-if="usesDeepL" :model="deeplData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="deepl" :data="deeplData"/>
</el-form>
<el-form v-if="usesLibreTranslate" :model="libretranslateData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="libre_translate" :data="libretranslateData"/>
</el-form>
<div class="submit-button-container"> <div class="submit-button-container">
<el-button class="submit-button" type="primary" @click="onSubmit">{{ $t('settings.submit') }}</el-button> <el-button class="submit-button" type="primary" @click="onSubmit">{{ $t('settings.submit') }}</el-button>
</div> </div>
@ -172,6 +183,30 @@ export default {
}, },
welcomeData() { welcomeData() {
return _.get(this.settings.settings, [':pleroma', ':welcome']) || {} return _.get(this.settings.settings, [':pleroma', ':welcome']) || {}
},
translator() {
return this.$store.state.settings.description.find(setting => setting.key === ':translator')
},
translatorData() {
return _.get(this.settings.settings, [':pleroma', ':translator']) || {}
},
usesDeepL() {
return (_.get(this.settings.settings, [':pleroma', ':translator', ':module']) || '').toLowerCase().endsWith('deepl')
},
usesLibreTranslate() {
return (_.get(this.settings.settings, [':pleroma', ':translator', ':module']) || '').toLowerCase().endsWith('libretranslate')
},
deepl() {
return this.$store.state.settings.description.find(setting => setting.key === ':deepl')
},
deeplData() {
return _.get(this.settings.settings, [':pleroma', ':deepl']) || {}
},
libre_translate() {
return this.$store.state.settings.description.find(setting => setting.key === ':libre_translate')
},
libretranslateData() {
return _.get(this.settings.settings, [':pleroma', ':libre_translate']) || {}
} }
}, },
async mounted() { async mounted() {

View file

@ -1,7 +1,13 @@
<template> <template>
<div v-if="!loading" :class="isSidebarOpen" class="form-container"> <div v-if="!loading" :class="isSidebarOpen" class="form-container">
<el-form v-if="!loading" :model="gopherData" :label-position="labelPosition" :label-width="labelWidth"> <el-form :model="searchData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="gopher" :data="gopherData"/> <setting :setting-group="search" :data="searchData"/>
</el-form>
<el-form v-if="isMeilisearch" :model="meilisearchData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="meilisearch" :data="meilisearchData"/>
</el-form>
<el-form v-if="isElasticsearch" :model="elasticsearchData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="elasticsearch" :data="elasticsearchData"/>
</el-form> </el-form>
<div class="submit-button-container"> <div class="submit-button-container">
<el-button class="submit-button" type="primary" @click="onSubmit">{{ $t('settings.submit') }}</el-button> <el-button class="submit-button" type="primary" @click="onSubmit">{{ $t('settings.submit') }}</el-button>
@ -16,17 +22,35 @@ import Setting from './Setting'
import _ from 'lodash' import _ from 'lodash'
export default { export default {
name: 'Gopher', name: 'Search',
components: { Setting }, components: { Setting },
computed: { computed: {
...mapGetters([ ...mapGetters([
'settings' 'settings'
]), ]),
gopher() { search() {
return this.settings.description.find(setting => setting.key === ':gopher') return this.settings.description.find(setting => setting.key === 'Pleroma.Search')
}, },
gopherData() { searchData() {
return _.get(this.settings.settings, [':pleroma', ':gopher']) || {} return _.get(this.settings.settings, [':pleroma', 'Pleroma.Search']) || {}
},
meilisearch() {
return this.settings.description.find(setting => setting.key === 'Pleroma.Search.Meilisearch')
},
isMeilisearch() {
return (_.get(this.settings.settings, [':pleroma', 'Pleroma.Search', ':module']) || '').toLowerCase().endsWith('meilisearch')
},
meilisearchData() {
return _.get(this.settings.settings, [':pleroma', 'Pleroma.Search.Meilisearch']) || {}
},
elasticsearch() {
return this.settings.description.find(setting => setting.key === 'Pleroma.Search.Elasticsearch.Cluster')
},
isElasticsearch() {
return (_.get(this.settings.settings, [':pleroma', 'Pleroma.Search', ':module']) || '').toLowerCase().endsWith('elasticsearch')
},
elasticsearchData() {
return _.get(this.settings.settings, [':pleroma', 'Pleroma.Search.Elasticsearch.Cluster']) || {}
}, },
isMobile() { isMobile() {
return this.$store.state.app.device === 'mobile' return this.$store.state.app.device === 'mobile'

View file

@ -4,7 +4,6 @@ export { default as Captcha } from './Captcha'
export { default as Emoji } from './Emoji' export { default as Emoji } from './Emoji'
export { default as Esshd } from './Esshd' export { default as Esshd } from './Esshd'
export { default as Frontend } from './Frontend' export { default as Frontend } from './Frontend'
export { default as Gopher } from './Gopher'
export { default as Http } from './Http' export { default as Http } from './Http'
export { default as Instance } from './Instance' export { default as Instance } from './Instance'
export { default as JobQueue } from './JobQueue' export { default as JobQueue } from './JobQueue'
@ -18,3 +17,4 @@ export { default as Other } from './Other'
export { default as RateLimiters } from './RateLimiters' export { default as RateLimiters } from './RateLimiters'
export { default as Upload } from './Upload' export { default as Upload } from './Upload'
export { default as WebPush } from './WebPush' export { default as WebPush } from './WebPush'
export { default as Search } from './Search'

View file

@ -68,6 +68,10 @@ export const tabs = description => {
label: 'settings.upload', label: 'settings.upload',
settings: ['Pleroma.Upload.Filter.AnonymizeFilename', 'Pleroma.Upload.Filter.Mogrify', 'Pleroma.Uploaders.S3', 'Pleroma.Uploaders.Local', 'Pleroma.Upload', ':s3'] settings: ['Pleroma.Upload.Filter.AnonymizeFilename', 'Pleroma.Upload.Filter.Mogrify', 'Pleroma.Uploaders.S3', 'Pleroma.Uploaders.Local', 'Pleroma.Upload', ':s3']
}, },
'search': {
label: 'settings.search',
settings: ['Pleroma.Search', 'Pleroma.Search.Meilisearch', 'Pleroma.Search.Elasticsearch.Cluster']
},
'other': { 'other': {
label: 'settings.other', label: 'settings.other',
settings: [':mime', 'Pleroma.User.Backup', 'Pleroma.Web.Plugs.RemoteIp', 'Pleroma.Web.Endpoint.MetricsExporter', ':modules', 'Pleroma.Web.ApiSpec.CastAndValidate', ':terms_of_services'] settings: [':mime', 'Pleroma.User.Backup', 'Pleroma.Web.Plugs.RemoteIp', 'Pleroma.Web.Endpoint.MetricsExporter', ':modules', 'Pleroma.Web.ApiSpec.CastAndValidate', ':terms_of_services']

View file

@ -9,7 +9,7 @@
<div class="docs-search-container"> <div class="docs-search-container">
<el-link <el-link
:underline="false" :underline="false"
href="https://docs-develop.pleroma.social/backend/administration/CLI_tasks/config/" href="https://docs.akkoma.dev/stable/administration/CLI_tasks/config/"
target="_blank"> target="_blank">
<el-button class="settings-docs-button"> <el-button class="settings-docs-button">
<span> <span>
@ -71,7 +71,6 @@ import {
Emoji, Emoji,
Esshd, Esshd,
Frontend, Frontend,
Gopher,
Http, Http,
Instance, Instance,
JobQueue, JobQueue,
@ -84,6 +83,7 @@ import {
Other, Other,
RateLimiters, RateLimiters,
Upload, Upload,
Search,
WebPush WebPush
} from './components' } from './components'
import RebootButton from '@/components/RebootButton' import RebootButton from '@/components/RebootButton'
@ -96,7 +96,6 @@ export default {
Emoji, Emoji,
Esshd, Esshd,
Frontend, Frontend,
Gopher,
Http, Http,
Instance, Instance,
JobQueue, JobQueue,
@ -110,6 +109,7 @@ export default {
RateLimiters, RateLimiters,
RebootButton, RebootButton,
Upload, Upload,
Search,
WebPush WebPush
}, },
data() { data() {

4958
yarn.lock

File diff suppressed because it is too large Load diff