From 5ac99ee556c0e93a86d4fe878d794fa46ddfdef0 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Tue, 16 Jan 2024 19:51:37 +0100 Subject: [PATCH] WIP new WebAdmin: folder page Signed-off-by: Nicola Murino --- internal/httpd/webadmin.go | 23 ++- internal/util/i18n.go | 3 + static/locales/en/translation.json | 23 ++- static/locales/it/translation.json | 23 ++- templates/webadmin/folder.html | 235 ++++++++++++++++------------- templates/webadmin/folders.html | 19 +++ templates/webadmin/user.html | 22 +-- 7 files changed, 212 insertions(+), 136 deletions(-) diff --git a/internal/httpd/webadmin.go b/internal/httpd/webadmin.go index 57cf771a..fd1cd3bd 100644 --- a/internal/httpd/webadmin.go +++ b/internal/httpd/webadmin.go @@ -428,7 +428,7 @@ func loadAdminTemplates(templatesPath string) { filepath.Join(templatesPath, templateAdminDir, templateFolders), } folderPaths := []string{ - filepath.Join(templatesPath, templateCommonDir, templateCommonCSS), + filepath.Join(templatesPath, templateCommonDir, templateCommonBase), filepath.Join(templatesPath, templateAdminDir, templateBase), filepath.Join(templatesPath, templateAdminDir, templateFsConfig), filepath.Join(templatesPath, templateAdminDir, templateFolder), @@ -1171,13 +1171,13 @@ func (s *httpdServer) renderFolderPage(w http.ResponseWriter, r *http.Request, f var title, currentURL string switch mode { case folderPageModeAdd: - title = "Add a new folder" + title = util.I18nAddFolderTitle currentURL = webFolderPath case folderPageModeUpdate: - title = "Update folder" + title = util.I18nUpdateFolderTitle currentURL = fmt.Sprintf("%v/%v", webFolderPath, url.PathEscape(folder.Name)) case folderPageModeTemplate: - title = "Folder template" + title = util.I18nTemplateFolderTitle currentURL = webTemplateFolder } folder.FsConfig.RedactedSecret = redactedSecret @@ -1201,6 +1201,11 @@ func (s *httpdServer) renderFolderPage(w http.ResponseWriter, r *http.Request, f func getFoldersForTemplate(r *http.Request) []string { var res []string + for k := range r.Form { + if hasPrefixAndSuffix(k, "template_folders[", "][tpl_foldername]") { + r.Form.Add("tpl_foldername", r.Form.Get(k)) + } + } folderNames := r.Form["tpl_foldername"] folders := make(map[string]bool) for _, name := range folderNames { @@ -1958,11 +1963,17 @@ func getQuotaLimits(r *http.Request) (int64, int, error) { func updateRepeaterFormFields(r *http.Request) { for k := range r.Form { if hasPrefixAndSuffix(k, "public_keys[", "][public_key]") { - r.Form.Add("public_keys", r.Form.Get(k)) + key := r.Form.Get(k) + if strings.TrimSpace(key) != "" { + r.Form.Add("public_keys", key) + } continue } if hasPrefixAndSuffix(k, "tls_certs[", "][tls_cert]") { - r.Form.Add("tls_certs", strings.TrimSpace(r.Form.Get(k))) + cert := strings.TrimSpace(r.Form.Get(k)) + if cert != "" { + r.Form.Add("tls_certs", cert) + } continue } if hasPrefixAndSuffix(k, "virtual_folders[", "][vfolder_path]") { diff --git a/internal/util/i18n.go b/internal/util/i18n.go index c427f264..885c4505 100644 --- a/internal/util/i18n.go +++ b/internal/util/i18n.go @@ -186,6 +186,9 @@ const ( I18nAddGroupTitle = "title.add_group" I18nUpdateGroupTitle = "title.update_group" I18nErrorInvalidTLSCert = "user.tls_cert_invalid" + I18nAddFolderTitle = "title.add_folder" + I18nUpdateFolderTitle = "title.update_folder" + I18nTemplateFolderTitle = "title.template_folder" ) // NewI18nError returns a I18nError wrappring the provided error diff --git a/static/locales/en/translation.json b/static/locales/en/translation.json index 6cbc99f1..80cca890 100644 --- a/static/locales/en/translation.json +++ b/static/locales/en/translation.json @@ -49,7 +49,10 @@ "update_user": "Update user", "template_user": "User template", "add_group": "Add group", - "update_group": "Update group" + "update_group": "Update group", + "add_folder": "Add virtual folder", + "update_folder": "Update virtual folder", + "template_folder": "Virtual folder template" }, "setup": { "desc": "To start using SFTPGo you need to create an administrator user", @@ -207,7 +210,8 @@ "global_settings": "Global settings", "mandatory_encryption": "Mandatory encryption", "name_invalid": "The specified username is not valid, the following characters are allowed: a-zA-Z0-9-_.~", - "associations": "Associations" + "associations": "Associations", + "template_placeholders": "The following placeholders are supported" }, "fs": { "view_file": "View file \"{{- path}}\"", @@ -470,7 +474,12 @@ "expires_in_help": "Account expiration as number of days from the creation. 0 means no expiration", "tls_certs": "TLS certificates", "tls_cert_help": "Paste your PEM encoded TLS certificate here", - "tls_cert_invalid": "Invalid TLS certificate" + "tls_cert_invalid": "Invalid TLS certificate", + "template_title": "Create one or more new users from this template", + "template_username_placeholder": "replaced with the specified username", + "template_password_placeholder": "replaced with the specified password", + "template_help1": "Placeholders will be replaced in paths and credentials of the configured storage backend.", + "template_help2": "The generated users can be saved or exported. Exported users can be imported from the \"Maintenance\" section of this SFTPGo instance or another." }, "group": { "view_manage": "View and manage groups", @@ -483,7 +492,13 @@ "quota_size": "Quota size", "quota_size_help": "0 means no limit. You can use MB/GB/TB suffix", "quota_files": "Quota files", - "associations_summary": "Users: {{users}}. Groups: {{groups}}" + "associations_summary": "Users: {{users}}. Groups: {{groups}}", + "template_title": "Create one or more new virtual folders from this template", + "template_name_placeholder": "replaced with the name of the specified virtual folder", + "template_help": "The generated virtual folders can be saved or exported. Exported folders can be imported from the \"Maintenance\" section of this SFTPGo instance or another.", + "name": "Virtual folder name", + "submit_generate": "Generate and save folders", + "submit_export": "Generate and export folder" }, "storage": { "title": "File system", diff --git a/static/locales/it/translation.json b/static/locales/it/translation.json index 5fc70a25..c334f08b 100644 --- a/static/locales/it/translation.json +++ b/static/locales/it/translation.json @@ -49,7 +49,10 @@ "update_user": "Aggiorna utente", "template_user": "Modello utente", "add_group": "Aggiungi gruppo", - "update_group": "Aggiorna gruppo" + "update_group": "Aggiorna gruppo", + "add_folder": "Aggiungi cartella virtuale", + "update_folder": "Aggiorna cartella virtuale", + "template_folder": "Modello cartella virtuale" }, "setup": { "desc": "Per iniziare a utilizzare SFTPGo devi creare un utente amministratore", @@ -207,7 +210,8 @@ "global_settings": "Impostazioni globali", "mandatory_encryption": "Crittografia obbligatoria", "name_invalid": "Il nome specificato non è valido, sono consentiti i seguenti caratteri: a-zA-Z0-9-_.~", - "associations": "Associazioni" + "associations": "Associazioni", + "template_placeholders": "Sono supportati i seguenti segnaposto" }, "fs": { "view_file": "Visualizza file \"{{- path}}\"", @@ -470,7 +474,12 @@ "expires_in_help": "Scadenza dell'account espressa in numero di giorni dalla creazione. 0 significa nessuna scadenza", "tls_certs": "Certificati TLS", "tls_cert_help": "Incolla qui il tuo certificato TLS codificato PEM", - "tls_cert_invalid": "Certificato TLS non valido" + "tls_cert_invalid": "Certificato TLS non valido", + "template_title": "Crea uno o più nuovi utenti da questo modello", + "template_username_placeholder": "sostituito con il nome utente specificato", + "template_password_placeholder": "sostituito con la password specificata", + "template_help1": "I segnaposto verranno sostituiti nei percorsi e nelle credenziali del backend di archiviazione configurato.", + "template_help2": "Gli utenti generati possono essere salvati o esportati. Gli utenti esportati possono essere importati dalla sezione \"Manutenzione\" di questa istanza SFTPGo o di un'altra." }, "group": { "view_manage": "Visualizza e gestisci gruppi", @@ -483,7 +492,13 @@ "quota_size": "Quota (dimensione)", "quota_size_help": "0 significa nessun limite. E' possibile utilizzare il suffisso MB/GB/TB", "quota_files": "Quota (numero file)", - "associations_summary": "Utenti: {{users}}. Gruppi: {{groups}}" + "associations_summary": "Utenti: {{users}}. Gruppi: {{groups}}", + "template_title": "Crea una o più nuove cartelle virtuali da questo modello", + "template_name_placeholder": "sostituito con il nome della cartella virtuale specificata", + "template_help": "Le cartelle virtuali generate possono essere salvate o esportate. Le cartelle esportate possono essere importate dalla sezione \"Manutenzione\" di questa istanza SFTPGo o di un'altra.", + "name": "Nome cartella virtuale", + "submit_generate": "Genera e salva cartelle", + "submit_export": "Genera e esporta cartelle" }, "storage": { "title": "File system", diff --git a/templates/webadmin/folder.html b/templates/webadmin/folder.html index c867a026..5beeeb1c 100644 --- a/templates/webadmin/folder.html +++ b/templates/webadmin/folder.html @@ -1,149 +1,168 @@ {{template "base" .}} -{{define "title"}}{{.Title}}{{end}} - -{{define "extra_css"}} - -{{end}} - -{{define "page_body"}} -
-
-
{{.Title}}
+{{- define "page_body"}} +
+
+

- {{if .Error}} - - {{end}} - {{if eq .Mode 3}} -
-
- Create and save one or more new folders or generate a data provider independent JSON file to import. -
- The following placeholder is supported: -

-
    -
  • %name% will be replaced with the specified folder name
    • -
- The generated folders can be saved or exported. Exported folders can be imported from the "Maintenance" section of this SFTPGo instance or another. + {{- if eq .Mode 3}} +
+ + + + +
+
+

+ Create one or more new folders from this template +

+
+

The following placeholders are supported

+
    +
  • %name%, replaced with the specified folder name
    • +
+

The generated folders can be saved or exported. Exported folders can be imported from the "Maintenance" section of this SFTPGo instance or another.

+
+
- {{end}} + {{- end}} + {{- template "errmsg" .Error}}
- {{if eq .Mode 3}} -
-
- Folders + {{- if eq .Mode 3}} +
+
+

Folders

-
-
-
-
- -
-
- +
+
+
+
-
-
- +
+ + + Add + +
- {{else}} + {{- else}}
- -
- + +
+
- {{end}} -
- -
- - - Optional description - + {{- end}} + +
+ +
+
- {{template "fshtml" .FsWrapper}} + {{- template "fshtml" .FsWrapper}} - -
- {{if eq .Mode 3}} - - {{end}} - +
+ + {{- if eq .Mode 3}} + + {{- end}} +
-{{end}} +{{- end}} -{{define "extra_js"}} - - + - -{{template "fsjs"}} -{{end}} \ No newline at end of file +{{- end}} \ No newline at end of file diff --git a/templates/webadmin/folders.html b/templates/webadmin/folders.html index cf747517..53b7979d 100644 --- a/templates/webadmin/folders.html +++ b/templates/webadmin/folders.html @@ -290,6 +290,14 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). actions+=`
Edit
` + //{{- end}} + //{{- if .LoggedUser.HasPermission "manage_system"}} + numActions++; + actions+=`
+ Template +
` + //{{- end}} + //{{- if .LoggedUser.HasPermission "manage_folders"}} numActions++; actions+=`
Delete @@ -382,6 +390,17 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). }); }); + const templateButtons = document.querySelectorAll('[data-share-table-action="template_row"]'); + templateButtons.forEach(d => { + let el = $(d); + el.off("click"); + el.on("click", function(e){ + e.preventDefault(); + let rowData = dt.row(e.target.closest('tr')).data(); + window.location.replace('{{.FolderTemplateURL}}' + "?from=" + encodeURIComponent(rowData['name'])); + }); + }); + const deleteButtons = document.querySelectorAll('[data-share-table-action="delete_row"]'); deleteButtons.forEach(d => { let el = $(d); diff --git a/templates/webadmin/user.html b/templates/webadmin/user.html index 96703dd0..acf7e1d1 100644 --- a/templates/webadmin/user.html +++ b/templates/webadmin/user.html @@ -30,19 +30,16 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).

- Create one or more new users from this template + Create one or more new users from this template

-

The following placeholders are supported:

+

The following placeholders are supported

    -
  • %username% will be replaced with the specified username
    • -
  • %password% will be replaced with the specified password
    • +
  • %username%, replaced with the specified username
    • +
  • %password%, replaced with the specified password
-

They will be replaced, with the specified username and password, in the paths and credentials of the configured storage backend.

-

The generated users can be saved or exported. Exported users can be imported from the "Maintenance" section of this SFTPGo instance or another.

- {{if .User.Username}} -

Please note that no credentials were copied from user "{{.User.Username}}", you have to set them explicitly.

- {{end}} +

Placeholders will be replaced in paths and credentials of the configured storage backend.

+

The generated users can be saved or exported. Exported users can be imported from the "Maintenance" section of this SFTPGo instance or another.

@@ -739,7 +736,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). {{- if eq .Mode 3}} -