From 95e087b342c8a947b47f2e5cec17bcfacf37b0b6 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 20 Dec 2018 00:21:57 +0100
Subject: [PATCH] Removed raven on front-end

---
 .../instance/dynamic_preferences_registry.py  |  9 -----
 front/package.json                            |  1 -
 front/src/App.vue                             |  6 ---
 front/src/components/Raven.vue                | 40 -------------------
 front/src/store/instance.js                   |  8 ----
 front/src/views/admin/Settings.vue            |  5 ---
 front/tests/unit/specs/store/instance.spec.js | 32 +++++++--------
 7 files changed, 16 insertions(+), 85 deletions(-)
 delete mode 100644 front/src/components/Raven.vue

diff --git a/api/funkwhale_api/instance/dynamic_preferences_registry.py b/api/funkwhale_api/instance/dynamic_preferences_registry.py
index 0edb94482..844fbb08b 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 72cd6c71c..adeb1fb19 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 ed2f4e36f..55cfab6e9 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 f45d0ed22..000000000
--- 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 a1a1530a9..72a960cd0 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 890eba9fd..779bb7459 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 b60b1fd47..7b70982fc 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
                 }
               }