From 428c1c606d1b858ed0eb58b7c31f570bc6a9b792 Mon Sep 17 00:00:00 2001 From: Gabriel Alencar Date: Wed, 15 Feb 2023 19:30:48 -0300 Subject: [PATCH] feat: add a new setting that disables the display of the disk usage (#2136) --- cmd/config.go | 2 ++ cmd/config_init.go | 7 +++--- cmd/config_set.go | 2 ++ frontend/src/components/Sidebar.vue | 9 ++++++- frontend/src/i18n/ar.json | 1 + frontend/src/i18n/de.json | 1 + frontend/src/i18n/en.json | 1 + frontend/src/i18n/es.json | 1 + frontend/src/i18n/fr.json | 1 + frontend/src/i18n/is.json | 1 + frontend/src/i18n/it.json | 1 + frontend/src/i18n/ja.json | 1 + frontend/src/i18n/ko.json | 1 + frontend/src/i18n/nl-be.json | 1 + frontend/src/i18n/pl.json | 2 +- frontend/src/i18n/pt-br.json | 1 + frontend/src/i18n/pt.json | 1 + frontend/src/i18n/ro.json | 1 + frontend/src/i18n/ru.json | 1 + frontend/src/i18n/sk.json | 1 + frontend/src/i18n/sv-se.json | 1 + frontend/src/i18n/tr.json | 1 + frontend/src/i18n/ua.json | 1 + frontend/src/i18n/zh-cn.json | 1 + frontend/src/i18n/zh-tw.json | 1 + frontend/src/utils/constants.js | 2 ++ frontend/src/views/settings/Global.vue | 9 +++++++ http/static.go | 33 +++++++++++++------------- settings/branding.go | 11 +++++---- 29 files changed, 71 insertions(+), 26 deletions(-) diff --git a/cmd/config.go b/cmd/config.go index c94b1ba9..4287f3c2 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -45,6 +45,7 @@ func addConfigFlags(flags *pflag.FlagSet) { flags.String("branding.color", "", "set the theme color") flags.String("branding.files", "", "path to directory with images and custom styles") flags.Bool("branding.disableExternal", false, "disable external links such as GitHub links") + flags.Bool("branding.disableUsedPercentage", false, "disable used disk percentage graph") } //nolint:gocyclo @@ -147,6 +148,7 @@ func printSettings(ser *settings.Server, set *settings.Settings, auther auth.Aut fmt.Fprintf(w, "\tName:\t%s\n", set.Branding.Name) fmt.Fprintf(w, "\tFiles override:\t%s\n", set.Branding.Files) fmt.Fprintf(w, "\tDisable external links:\t%t\n", set.Branding.DisableExternal) + fmt.Fprintf(w, "\tDisable used disk percentage graph:\t%t\n", set.Branding.DisableUsedPercentage) fmt.Fprintf(w, "\tColor:\t%s\n", set.Branding.Color) fmt.Fprintln(w, "\nServer:") fmt.Fprintf(w, "\tLog:\t%s\n", ser.Log) diff --git a/cmd/config_init.go b/cmd/config_init.go index 12b11688..7848e706 100644 --- a/cmd/config_init.go +++ b/cmd/config_init.go @@ -35,9 +35,10 @@ override the options.`, AuthMethod: authMethod, Defaults: defaults, Branding: settings.Branding{ - Name: mustGetString(flags, "branding.name"), - DisableExternal: mustGetBool(flags, "branding.disableExternal"), - Files: mustGetString(flags, "branding.files"), + Name: mustGetString(flags, "branding.name"), + DisableExternal: mustGetBool(flags, "branding.disableExternal"), + DisableUsedPercentage: mustGetBool(flags, "branding.DisableUsedPercentage"), + Files: mustGetString(flags, "branding.files"), }, } diff --git a/cmd/config_set.go b/cmd/config_set.go index 058f0d6b..5a02288f 100644 --- a/cmd/config_set.go +++ b/cmd/config_set.go @@ -55,6 +55,8 @@ you want to change. Other options will remain unchanged.`, set.Branding.Color = mustGetString(flags, flag.Name) case "branding.disableExternal": set.Branding.DisableExternal = mustGetBool(flags, flag.Name) + case "branding.disableUsedPercentage": + set.Branding.DisableUsedPercentage = mustGetBool(flags, flag.Name) case "branding.files": set.Branding.Files = mustGetString(flags, flag.Name) } diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue index a3f4c3ae..4394f55a 100644 --- a/frontend/src/components/Sidebar.vue +++ b/frontend/src/components/Sidebar.vue @@ -82,7 +82,9 @@
@@ -116,6 +118,7 @@ import { version, signup, disableExternal, + disableUsedPercentage, noAuth, loginPage, } from "@/utils/constants"; @@ -137,6 +140,7 @@ export default { signup: () => signup, version: () => version, disableExternal: () => disableExternal, + disableUsedPercentage: () => disableUsedPercentage, canLogout: () => !noAuth && loginPage, }, asyncComputed: { @@ -146,6 +150,9 @@ export default { ? this.$route.path : this.$route.path + "/"; let usageStats = { used: 0, total: 0, usedPercentage: 0 }; + if (this.disableUsedPercentage) { + return usageStats; + } try { let usage = await api.usage(path); usageStats = { diff --git a/frontend/src/i18n/ar.json b/frontend/src/i18n/ar.json index 3298bf2a..443b30e3 100644 --- a/frontend/src/i18n/ar.json +++ b/frontend/src/i18n/ar.json @@ -178,6 +178,7 @@ "customStylesheet": "ستايل مخصص", "defaultUserDescription": "This are the default settings for new users.", "disableExternalLinks": "Disable external links (except documentation)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "documentation", "examples": "أمثلة", "executeOnShell": "Execute on shell", diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json index 3b504ee1..ad8aadc4 100644 --- a/frontend/src/i18n/de.json +++ b/frontend/src/i18n/de.json @@ -187,6 +187,7 @@ "customStylesheet": "Individuelles Stylesheet", "defaultUserDescription": "Das sind die Standardeinstellung für Benutzer", "disableExternalLinks": "Externe Links deaktivieren (außer Dokumentation)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "Dokumentation", "examples": "Beispiele", "executeOnShell": "In Shell ausführen", diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json index 8435b545..180c15a9 100644 --- a/frontend/src/i18n/en.json +++ b/frontend/src/i18n/en.json @@ -190,6 +190,7 @@ "customStylesheet": "Custom Stylesheet", "defaultUserDescription": "This are the default settings for new users.", "disableExternalLinks": "Disable external links (except documentation)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "documentation", "examples": "Examples", "executeOnShell": "Execute on shell", diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.json index 4bd803d6..bd247627 100644 --- a/frontend/src/i18n/es.json +++ b/frontend/src/i18n/es.json @@ -190,6 +190,7 @@ "customStylesheet": "Modificar hoja de estilos", "defaultUserDescription": "Estas son las configuraciones por defecto para nuevos usuarios.", "disableExternalLinks": "Deshabilitar enlaces externos (excepto documentación)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "documentación", "examples": "Ejemplos", "executeOnShell": "Ejecutar en la shell", diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.json index 66bea031..0be93f1a 100644 --- a/frontend/src/i18n/fr.json +++ b/frontend/src/i18n/fr.json @@ -187,6 +187,7 @@ "customStylesheet": "Feuille de style personnalisée", "defaultUserDescription": "Paramètres par défaut pour les nouveaux utilisateurs.", "disableExternalLinks": "Désactiver les liens externes (sauf la documentation)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "documentation", "examples": "Exemples", "executeOnShell": "Exécuter dans le shell", diff --git a/frontend/src/i18n/is.json b/frontend/src/i18n/is.json index a723feae..24d51b02 100644 --- a/frontend/src/i18n/is.json +++ b/frontend/src/i18n/is.json @@ -178,6 +178,7 @@ "customStylesheet": "Custom Stylesheet", "defaultUserDescription": "Þetta eru sjálfgefnar stillingar fyrir nýja notendur.", "disableExternalLinks": "Sýna ytri-hlekki (fyrir utan leiðbeiningar)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "leiðbeiningar", "examples": "Dæmi", "executeOnShell": "Keyra í skel", diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json index cd5a29c1..85360980 100644 --- a/frontend/src/i18n/it.json +++ b/frontend/src/i18n/it.json @@ -178,6 +178,7 @@ "customStylesheet": "Foglio di stile personalizzato", "defaultUserDescription": "Queste sono le impostazioni predefinite per i nuovi utenti.", "disableExternalLinks": "Disabilita link esterni (tranne per la documentazione)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "documentazione", "examples": "Esempi", "executeOnShell": "Esegui nella shell", diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.json index 12dec490..d6253050 100644 --- a/frontend/src/i18n/ja.json +++ b/frontend/src/i18n/ja.json @@ -178,6 +178,7 @@ "customStylesheet": "カスタムスタイルシ ート", "defaultUserDescription": "This are the default settings for new users.", "disableExternalLinks": "Disable external links (except documentation)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "documentation", "examples": "例", "executeOnShell": "Execute on shell", diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.json index 22352dba..64a6eab9 100644 --- a/frontend/src/i18n/ko.json +++ b/frontend/src/i18n/ko.json @@ -178,6 +178,7 @@ "customStylesheet": "커스텀 스타일시트", "defaultUserDescription": "아래 사항은 신규 사용자들에 대한 기본 설정입니다.", "disableExternalLinks": "외부 링크 감추기", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "문서", "examples": "예", "executeOnShell": "쉘에서 실행", diff --git a/frontend/src/i18n/nl-be.json b/frontend/src/i18n/nl-be.json index e67bf9b9..dec8d302 100644 --- a/frontend/src/i18n/nl-be.json +++ b/frontend/src/i18n/nl-be.json @@ -178,6 +178,7 @@ "customStylesheet": "Aangepast Stylesheet", "defaultUserDescription": "Dit zijn de standaardinstellingen voor nieuwe gebruikers.", "disableExternalLinks": "Schakel externe links uit (behalve documentatie)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "Documentatie", "examples": "Voorbeelden", "executeOnShell": "Uitvoeren in de shell", diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.json index 21e8090c..a66facb2 100644 --- a/frontend/src/i18n/pl.json +++ b/frontend/src/i18n/pl.json @@ -179,6 +179,7 @@ "customStylesheet": "Własny arkusz stylów", "defaultUserDescription": "Oto domyślne ustawienia dla nowych użytkowników.", "disableExternalLinks": "Wyłącz linki zewnętrzne (z wyjątkiem dokumentacji)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "dokumentacja", "examples": "Przykłady", "executeOnShell": "Wykonaj w powłoce", @@ -258,4 +259,3 @@ "unit": "Jednostka czasu" } } - diff --git a/frontend/src/i18n/pt-br.json b/frontend/src/i18n/pt-br.json index 626b3fc2..51355a9c 100644 --- a/frontend/src/i18n/pt-br.json +++ b/frontend/src/i18n/pt-br.json @@ -190,6 +190,7 @@ "customStylesheet": "Estilos personalizados", "defaultUserDescription": "Estas são as configurações padrão para novos usuários.", "disableExternalLinks": "Desabilitar links externos (exceto documentação)", + "disableUsedDiskPercentage": "Desabilitar gráfico de porcentagem de disco usado", "documentation": "documentação", "examples": "Exemplos", "executeOnShell": "Executar no console", diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.json index 9df22752..93ac94f6 100644 --- a/frontend/src/i18n/pt.json +++ b/frontend/src/i18n/pt.json @@ -178,6 +178,7 @@ "customStylesheet": "Folha de estilos personalizada", "defaultUserDescription": "Estas são as configurações padrão para novos utilizadores.", "disableExternalLinks": "Desativar links externos (exceto documentação)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "documentação", "examples": "Exemplos", "executeOnShell": "Executar na shell", diff --git a/frontend/src/i18n/ro.json b/frontend/src/i18n/ro.json index 329f67af..f2168a46 100644 --- a/frontend/src/i18n/ro.json +++ b/frontend/src/i18n/ro.json @@ -178,6 +178,7 @@ "customStylesheet": "CSS personalizat", "defaultUserDescription": "Acestea sunt setările implicite pentru noii utilizatori.", "disableExternalLinks": "Dezactivează linkurile externe (exceptând documentația)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "documentație", "examples": "Exemple", "executeOnShell": "Execută in linia de comandă", diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.json index 157d8f2d..5cf40b93 100644 --- a/frontend/src/i18n/ru.json +++ b/frontend/src/i18n/ru.json @@ -186,6 +186,7 @@ "customStylesheet": "Свой стиль", "defaultUserDescription": "Это настройки по умолчанию для новых пользователей.", "disableExternalLinks": "Отключить внешние ссылки (кроме документации)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "документация", "examples": "Примеры", "executeOnShell": "Выполнить в командной строке", diff --git a/frontend/src/i18n/sk.json b/frontend/src/i18n/sk.json index 27d3d3ff..414a8b4d 100644 --- a/frontend/src/i18n/sk.json +++ b/frontend/src/i18n/sk.json @@ -186,6 +186,7 @@ "customStylesheet": "Vlastný Stylesheet", "defaultUserDescription": "Toto sú predvolané nastavenia nového používateľa.", "disableExternalLinks": "Vypnúť externé odkazy (okrem dokumentácie)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "dokumentácia", "examples": "Príklady", "executeOnShell": "Vykonať cez shell", diff --git a/frontend/src/i18n/sv-se.json b/frontend/src/i18n/sv-se.json index 271f18c4..df0537ec 100644 --- a/frontend/src/i18n/sv-se.json +++ b/frontend/src/i18n/sv-se.json @@ -178,6 +178,7 @@ "customStylesheet": "Anpassad formatmall", "defaultUserDescription": "Detta är standard inställningar för användare.", "disableExternalLinks": "Inaktivera externa länkar (förutom dokumentation)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "dokumentation", "examples": "Exempel", "executeOnShell": "Exekvera på skal", diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.json index e5ec883d..77ebb3f6 100644 --- a/frontend/src/i18n/tr.json +++ b/frontend/src/i18n/tr.json @@ -184,6 +184,7 @@ "customStylesheet": "Özel CSS", "defaultUserDescription": "Bu, yeni kullanıcılar için varsayılan ayarlardır.", "disableExternalLinks": "Harici bağlantıları devre dışı bırakın (dökümantasyon hariç)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "dökümantasyon", "examples": "Örnekler", "executeOnShell": "Komut satırında çalıştır", diff --git a/frontend/src/i18n/ua.json b/frontend/src/i18n/ua.json index 72f6bef2..cfc42ca2 100644 --- a/frontend/src/i18n/ua.json +++ b/frontend/src/i18n/ua.json @@ -186,6 +186,7 @@ "customStylesheet": "Свій стиль", "defaultUserDescription": "Це налаштування за замовчуванням для нових користувачів.", "disableExternalLinks": "Вимкнути зовнішні посилання (крім документації)", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "документація", "examples": "Приклади", "executeOnShell": "Виконати в командному рядку", diff --git a/frontend/src/i18n/zh-cn.json b/frontend/src/i18n/zh-cn.json index 23c6462e..f5b730f6 100644 --- a/frontend/src/i18n/zh-cn.json +++ b/frontend/src/i18n/zh-cn.json @@ -186,6 +186,7 @@ "customStylesheet": "自定义样式表（CSS）", "defaultUserDescription": "这些是新用户的默认设置。", "disableExternalLinks": "禁止外部链接（帮助文档除外）", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "帮助文档", "examples": "例子", "executeOnShell": "在 Shell 中执行", diff --git a/frontend/src/i18n/zh-tw.json b/frontend/src/i18n/zh-tw.json index a85a4af4..096a9fbc 100644 --- a/frontend/src/i18n/zh-tw.json +++ b/frontend/src/i18n/zh-tw.json @@ -178,6 +178,7 @@ "customStylesheet": "自定義樣式表", "defaultUserDescription": "這些是新使用者的預設設定。", "disableExternalLinks": "禁止外部連結（幫助文件除外）", + "disableUsedDiskPercentage": "Disable used disk percentage graph", "documentation": "幫助文件", "examples": "範例", "executeOnShell": "在Shell中執行", diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index 200c4e8d..94425def 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -1,5 +1,6 @@ const name = window.FileBrowser.Name || "File Browser"; const disableExternal = window.FileBrowser.DisableExternal; +const disableUsedPercentage = window.FileBrowser.DisableUsedPercentage; const baseURL = window.FileBrowser.BaseURL; const staticURL = window.FileBrowser.StaticURL; const recaptcha = window.FileBrowser.ReCaptcha; @@ -19,6 +20,7 @@ const origin = window.location.origin; export { name, disableExternal, + disableUsedPercentage, baseURL, logoURL, recaptcha, diff --git a/frontend/src/views/settings/Global.vue b/frontend/src/views/settings/Global.vue index 10993325..3807dab6 100644 --- a/frontend/src/views/settings/Global.vue +++ b/frontend/src/views/settings/Global.vue @@ -62,6 +62,15 @@ {{ $t("settings.disableExternalLinks") }}

+

+ + {{ $t("settings.disableUsedDiskPercentage") }} +

+