eris/admin-fe
1
0
Fork 0
forked from AkkomaGang/admin-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove Relays from the Settings

Browse source
This commit is contained in:
Angelina Filippova 2021-03-08 19:42:55 +08:00
parent e3d891612f
commit 6fb956adae
6 changed files with 2 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/store/modules/normalizers.js
View file

@ -308,12 +308,6 @@ export const formSearchObject = description => {
key: ':terms_of_services',
label: 'Terms of Services',
search: ['Terms of Services', ':terms_of_services']
}, {
groupKey: 'relays',
groupLabel: 'Relays',
key: ':relays',
label: 'Relays',
search: ['Relays', ':relays']
}]
return processedDescription.concat(searchDataForEditableDocs)
}

2
src/views/settings/components/Relays.vue → src/views/relays/index.vue
View file

@ -80,6 +80,6 @@ export default {
</script>
<style rel='stylesheet/scss' lang='scss'>
@import '../styles/main';
@import '../styles/settings';
@include settings
</style>

1
src/views/settings/components/index.js
View file

@ -16,6 +16,5 @@ export { default as Metadata } from './Metadata'
export { default as Mrf } from './MRF'
export { default as Other } from './Other'
export { default as RateLimiters } from './RateLimiters'
export { default as Relays } from './Relays'
export { default as Upload } from './Upload'
export { default as WebPush } from './WebPush'

4
src/views/settings/components/tabs.js
View file

@ -68,10 +68,6 @@ export const tabs = description => {
label: 'settings.rateLimiters',
settings: [':rate_limit']
},
'relays': {
label: 'settings.relays',
settings: ['relays']
},
'web-push': {
label: 'settings.webPush',
settings: [':vapid_details']

6
src/views/settings/index.vue
View file

@ -83,7 +83,6 @@ import {
Mrf,
Other,
RateLimiters,
Relays,
Upload,
WebPush
} from './components'
@ -109,7 +108,6 @@ export default {
Mrf,
Other,
RateLimiters,
Relays,
RebootButton,
Upload,
WebPush
@ -184,8 +182,6 @@ export default {
return this.$store.state.settings.description.findIndex(el => el.group === setting) !== -1
} else if (setting === 'Pleroma.Web.Auth.Authenticator' || setting === ':admin_token') {
return this.$store.state.settings.description.findIndex(el => el.children[0].key === setting) !== -1
} else if (setting === 'relays') {
return [setting]
} else {
return this.$store.state.settings.description.findIndex(el => el.key === setting) !== -1
}
@ -197,6 +193,6 @@ export default {
</script>
<style rel='stylesheet/scss' lang='scss' scoped>
@import './styles/main';
@import '../styles/settings';
@include settings
</style>

35
test/views/settings/formSearchObject.test.js
View file

@ -61,13 +61,6 @@ describe('Form search object', () => {
key: ':terms_of_services',
label: 'Terms of Services',
search: ['Terms of Services', ':terms_of_services']
},
{
groupKey: 'relays',
groupLabel: 'Relays',
key: ':relays',
label: 'Relays',
search: ['Relays', ':relays']
}
]
expect(_.isEqual(formSearchObject(description), expected)).toBeTruthy()
@ -116,13 +109,6 @@ describe('Form search object', () => {
key: ':terms_of_services',
label: 'Terms of Services',
search: ['Terms of Services', ':terms_of_services']
},
{
groupKey: 'relays',
groupLabel: 'Relays',
key: ':relays',
label: 'Relays',
search: ['Relays', ':relays']
}
]
expect(_.isEqual(formSearchObject(description), expected)).toBeTruthy()
@ -171,13 +157,6 @@ describe('Form search object', () => {
key: ':terms_of_services',
label: 'Terms of Services',
search: ['Terms of Services', ':terms_of_services']
},
{
groupKey: 'relays',
groupLabel: 'Relays',
key: ':relays',
label: 'Relays',
search: ['Relays', ':relays']
}
]
expect(_.isEqual(formSearchObject(description), expected)).toBeTruthy()
@ -215,13 +194,6 @@ describe('Form search object', () => {
key: ':terms_of_services',
label: 'Terms of Services',
search: ['Terms of Services', ':terms_of_services']
},
{
groupKey: 'relays',
groupLabel: 'Relays',
key: ':relays',
label: 'Relays',
search: ['Relays', ':relays']
}
]
expect(_.isEqual(formSearchObject(description), expected)).toBeTruthy()
@ -306,13 +278,6 @@ describe('Form search object', () => {
key: ':terms_of_services',
label: 'Terms of Services',
search: ['Terms of Services', ':terms_of_services']
},
{
groupKey: 'relays',
groupLabel: 'Relays',
key: ':relays',
label: 'Relays',
search: ['Relays', ':relays']
}
]
expect(_.isEqual(formSearchObject(description), expected)).toBeTruthy()