diff --git a/api/funkwhale_api/instance/dynamic_preferences_registry.py b/api/funkwhale_api/instance/dynamic_preferences_registry.py index 0edb94482d0bb090ed15b79156b565e9ea33c1f7..844fbb08b8b7d4816eb3ef9576d18ab9dc0c2fee 100644 --- a/api/funkwhale_api/instance/dynamic_preferences_registry.py +++ b/api/funkwhale_api/instance/dynamic_preferences_registry.py @@ -58,15 +58,6 @@ class RavenDSN(types.StringPreference): field_kwargs = {"required": False} -@global_preferences_registry.register -class RavenEnabled(types.BooleanPreference): - show_in_api = True - section = raven - name = "front_enabled" - default = False - verbose_name = "Report front-end errors with Raven" - - @global_preferences_registry.register class InstanceNodeinfoEnabled(types.BooleanPreference): show_in_api = False diff --git a/front/package.json b/front/package.json index 72cd6c71cbdb638821437682853920605a06ffc9..adeb1fb19d6bc64a4bee8b1f099245fc285875db 100644 --- a/front/package.json +++ b/front/package.json @@ -20,7 +20,6 @@ "lodash": "^4.17.10", "masonry-layout": "^4.2.2", "moment": "^2.22.2", - "raven-js": "^3.26.4", "semantic-ui-css": "^2.4.1", "showdown": "^1.8.6", "vue": "^2.5.17", diff --git a/front/src/App.vue b/front/src/App.vue index ed2f4e36f437412e96e09e8694cd021ae7331e0f..55cfab6e9f6dfc00660c3fcbb9dff48492fa1462 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -43,10 +43,6 @@ :version="version" @show:shortcuts-modal="showShortcutsModal = !showShortcutsModal" ></app-footer> - <raven - v-if="$store.state.instance.settings.raven.front_enabled.value" - :dsn="$store.state.instance.settings.raven.front_dsn.value" - ></raven> <playlist-modal v-if="$store.state.auth.authenticated"></playlist-modal> <shortcuts-modal @update:show="showShortcutsModal = $event" :show="showShortcutsModal"></shortcuts-modal> <GlobalEvents @keydown.h.exact="showShortcutsModal = !showShortcutsModal"/> @@ -63,7 +59,6 @@ import GlobalEvents from '@/components/utils/global-events' import Sidebar from '@/components/Sidebar' import AppFooter from '@/components/Footer' -import Raven from '@/components/Raven' import ServiceMessages from '@/components/ServiceMessages' import locales from './locales' @@ -75,7 +70,6 @@ export default { components: { Sidebar, AppFooter, - Raven, PlaylistModal, ShortcutsModal, GlobalEvents, diff --git a/front/src/components/Raven.vue b/front/src/components/Raven.vue deleted file mode 100644 index f45d0ed22bee60d746599c1c340695cf00b346a6..0000000000000000000000000000000000000000 --- a/front/src/components/Raven.vue +++ /dev/null @@ -1,40 +0,0 @@ -<template> - <div class="raven"></div> -</template> - -<script> -import Raven from 'raven-js' -import RavenVue from 'raven-js/plugins/vue' -import Vue from 'vue' -import logger from '@/logging' - -export default { - props: ['dsn'], - created () { - Raven.uninstall() - this.setUp() - }, - destroyed () { - Raven.uninstall() - }, - methods: { - setUp () { - Raven.uninstall() - logger.default.info('Installing raven...') - Raven.config(this.dsn).addPlugin(RavenVue, Vue).install() - } - }, - watch: { - dsn: function () { - this.setUp() - } - } -} -</script> - -<!-- Add "scoped" attribute to limit CSS to this component only --> -<style scoped > -.raven { - display: none; -} -</style> diff --git a/front/src/store/instance.js b/front/src/store/instance.js index a1a1530a9f31029acd526bb21f47519194e0d78a..72a960cd05db64b21ff8585cc32a48112d94aef4 100644 --- a/front/src/store/instance.js +++ b/front/src/store/instance.js @@ -40,14 +40,6 @@ export default { enabled: { value: true } - }, - raven: { - front_enabled: { - value: false - }, - front_dsn: { - value: null - } } } }, diff --git a/front/src/views/admin/Settings.vue b/front/src/views/admin/Settings.vue index 890eba9fdfc5b8d8f30362ecb1b2d089c37925a0..779bb7459bd0d9e6966370f22cdd74cc789f77f7 100644 --- a/front/src/views/admin/Settings.vue +++ b/front/src/views/admin/Settings.vue @@ -142,11 +142,6 @@ export default { "instance__nodeinfo_stats_enabled", "instance__nodeinfo_private" ] - }, - { - label: errorLabel, - id: "reporting", - settings: ["raven__front_enabled", "raven__front_dsn"] } ] } diff --git a/front/tests/unit/specs/store/instance.spec.js b/front/tests/unit/specs/store/instance.spec.js index b60b1fd477e888f3a4a70b98d940fb05dccebdcb..7b70982fcdbd3069dd34dd94e84fb76394272125 100644 --- a/front/tests/unit/specs/store/instance.spec.js +++ b/front/tests/unit/specs/store/instance.spec.js @@ -18,11 +18,11 @@ describe('store/instance', () => { describe('mutations', () => { it('settings', () => { - const state = {settings: {raven: {front_dsn: {value: 'test'}}}} - let settings = {raven: {front_enabled: {value: true}}} + const state = {settings: {users: {upload_quota: {value: 1}}}} + let settings = {users: {registration_enabled: {value: true}}} store.mutations.settings(state, settings) expect(state.settings).to.deep.equal({ - raven: {front_dsn: {value: 'test'}, front_enabled: {value: true}} + users: {upload_quota: {value: 1}, registration_enabled: {value: true}} }) }) }) @@ -32,13 +32,13 @@ describe('store/instance', () => { status: 200, response: [ { - section: 'raven', - name: 'front_dsn', - value: 'test' + section: 'users', + name: 'upload_quota', + value: 1 }, { - section: 'raven', - name: 'front_enabled', + section: 'users', + name: 'registration_enabled', value: false } ] @@ -50,15 +50,15 @@ describe('store/instance', () => { { type: 'settings', payload: { - raven: { - front_dsn: { - section: 'raven', - name: 'front_dsn', - value: 'test' + users: { + upload_quota: { + section: 'users', + name: 'upload_quota', + value: 1 }, - front_enabled: { - section: 'raven', - name: 'front_enabled', + registration_enabled: { + section: 'users', + name: 'registration_enabled', value: false } }