From 63171368ed62549ae76f93636b9b759d623a231f Mon Sep 17 00:00:00 2001 From: Deluan Date: Wed, 25 Nov 2020 15:29:46 -0500 Subject: [PATCH] Disable Activity Panel by default. You'll need to set `DevActivityPanel` (or `ND_DEVACTIVITYPANEL`) to `true` to re-enable it --- conf/configuration.go | 4 ++-- server/app/serve_index.go | 2 +- ui/src/App.js | 2 +- ui/src/config.js | 2 +- ui/src/layout/AppBar.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/configuration.go b/conf/configuration.go index be584fbc..73001838 100644 --- a/conf/configuration.go +++ b/conf/configuration.go @@ -53,7 +53,7 @@ type configOptions struct { DevPreCacheAlbumArtwork bool DevFastAccessCoverArt bool DevOldCacheLayout bool - DevActivityMenu bool + DevActivityPanel bool } type scannerOptions struct { @@ -143,7 +143,7 @@ func init() { viper.SetDefault("devprecachealbumartwork", false) viper.SetDefault("devoldcachelayout", false) viper.SetDefault("devFastAccessCoverArt", false) - viper.SetDefault("devactivitymenu", true) + viper.SetDefault("devactivitypanel", false) } func InitConfig(cfgFile string) { diff --git a/server/app/serve_index.go b/server/app/serve_index.go index 0e747ff0..3c38d2cc 100644 --- a/server/app/serve_index.go +++ b/server/app/serve_index.go @@ -35,7 +35,7 @@ func serveIndex(ds model.DataStore, fs http.FileSystem) http.HandlerFunc { "enableTranscodingConfig": conf.Server.EnableTranscodingConfig, "gaTrackingId": conf.Server.GATrackingID, "enableDownloads": conf.Server.EnableDownloads, - "devActivityMenu": conf.Server.DevActivityMenu, + "devActivityPanel": conf.Server.DevActivityPanel, "devFastAccessCoverArt": conf.Server.DevFastAccessCoverArt, } j, err := json.Marshal(appConfig) diff --git a/ui/src/App.js b/ui/src/App.js index 8aec2a04..01f9f9f4 100644 --- a/ui/src/App.js +++ b/ui/src/App.js @@ -61,7 +61,7 @@ const App = () => ( const Admin = (props) => { const dispatch = useDispatch() - if (config.devActivityMenu) { + if (config.devActivityPanel) { setDispatch(dispatch) authProvider .checkAuth() diff --git a/ui/src/config.js b/ui/src/config.js index f2f62925..c61cefe4 100644 --- a/ui/src/config.js +++ b/ui/src/config.js @@ -10,7 +10,7 @@ const defaultConfig = { enableDownloads: true, welcomeMessage: '', gaTrackingId: '', - devActivityMenu: true, + devActivityPanel: true, devFastAccessCoverArt: false, } diff --git a/ui/src/layout/AppBar.js b/ui/src/layout/AppBar.js index 6d44182d..353fbd52 100644 --- a/ui/src/layout/AppBar.js +++ b/ui/src/layout/AppBar.js @@ -85,7 +85,7 @@ const CustomUserMenu = ({ onClick, ...rest }) => { return ( <> - {config.devActivityMenu && permissions === 'admin' && } + {config.devActivityPanel && permissions === 'admin' && }