Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-06 22:30:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

WebClient: add an id field to files list to simplify UI logic

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2025-07-22 18:59:20 +02:00
parent 8ae6e5e486
commit 0bac81816c
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/httpd/webclient.go
View File

@@ -1009,7 +1009,7 @@ func (s *httpdServer) handleShareGetDirContents(w http.ResponseWriter, r *http.R
} }
defer lister.Close() defer lister.Close()
dataGetter := func(limit, _ int) ([]byte, int, error) { dataGetter := func(limit, offset int) ([]byte, int, error) {
contents, err := lister.Next(limit) contents, err := lister.Next(limit)
if errors.Is(err, io.EOF) { if errors.Is(err, io.EOF) {
err = nil err = nil
@@ -1018,11 +1018,12 @@ func (s *httpdServer) handleShareGetDirContents(w http.ResponseWriter, r *http.R
return nil, 0, err return nil, 0, err
} }
results := make([]map[string]any, 0, len(contents)) results := make([]map[string]any, 0, len(contents))
for _, info := range contents { for idx, info := range contents {
if !info.Mode().IsDir() && !info.Mode().IsRegular() { if !info.Mode().IsDir() && !info.Mode().IsRegular() {
continue continue
} }
res := make(map[string]any) res := make(map[string]any)
res["id"] = offset + idx + 1
if info.IsDir() { if info.IsDir() {
res["type"] = "1" res["type"] = "1"
res["size"] = "" res["size"] = ""
@@ -1217,7 +1218,7 @@ func (s *httpdServer) handleClientGetDirContents(w http.ResponseWriter, r *http.
defer lister.Close() defer lister.Close()
dirTree := r.URL.Query().Get("dirtree") == "1" dirTree := r.URL.Query().Get("dirtree") == "1"
dataGetter := func(limit, _ int) ([]byte, int, error) { dataGetter := func(limit, offset int) ([]byte, int, error) {
contents, err := lister.Next(limit) contents, err := lister.Next(limit)
if errors.Is(err, io.EOF) { if errors.Is(err, io.EOF) {
err = nil err = nil
@@ -1226,8 +1227,9 @@ func (s *httpdServer) handleClientGetDirContents(w http.ResponseWriter, r *http.
return nil, 0, err return nil, 0, err
} }
results := make([]map[string]any, 0, len(contents)) results := make([]map[string]any, 0, len(contents))
for _, info := range contents { for idx, info := range contents {
res := make(map[string]any) res := make(map[string]any)
res["id"] = offset + idx + 1
res["url"] = getFileObjectURL(name, info.Name(), webClientFilesPath) res["url"] = getFileObjectURL(name, info.Name(), webClientFilesPath)
if info.IsDir() { if info.IsDir() {
res["type"] = "1" res["type"] = "1"

12
templates/webclient/files.html
View File

@@ -244,7 +244,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
`; `;
//{{- if not .ShareUploadBaseURL}} //{{- if not .ShareUploadBaseURL}}
const supportedEditExtensions = ["csv", "bat", "dyalog", "apl", "asc", "pgp", "sig", "asn", "asn1", "b", "bf", const supportedEditExtensions = ["csv", "bat", "dyalog", "apl", "asc", "sig", "asn", "asn1", "b", "bf",
"c", "h", "ino", "cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx", "cob", "cpy", "cbl", "cs", "clj", "c", "h", "ino", "cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx", "cob", "cpy", "cbl", "cs", "clj",
"cljc", "cljx", "cljs", "gss", "cmake", "cmake.in", "coffee", "cl", "lisp", "el", "cyp", "cypher", "cljc", "cljx", "cljs", "gss", "cmake", "cmake.in", "coffee", "cl", "lisp", "el", "cyp", "cypher",
"pyx", "pxd", "pxi", "cr", "css", "cql", "d", "dart", "diff", "patch", "dtd", "dylan", "dyl", "intr", "pyx", "pxd", "pxi", "cr", "css", "cql", "d", "dart", "diff", "patch", "dtd", "dylan", "dyl", "intr",
@@ -504,6 +504,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
switch (error.response.status) { switch (error.response.status) {
case 200: case 200:
errorMessage = "general.expired_session"; errorMessage = "general.expired_session";
break;
case 403: case 403:
errorMessage = "fs.create_dir.err_403"; errorMessage = "fs.create_dir.err_403";
break; break;
@@ -677,6 +678,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
}, },
{ {
data: "edit_url", data: "edit_url",
defaultContent: '',
className: 'text-end', className: 'text-end',
render: function (data, type, row) { render: function (data, type, row) {
if (type === 'display') { if (type === 'display') {
@@ -692,15 +694,18 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
case "webp": case "webp":
case "bmp": case "bmp":
case "svg": case "svg":
let desc = escapeHTML(filename).replace(/"/g, '&quot;'); let desc = escapeHTML(filename);
let descHtml = `<span class="fs-5 fw-bold">${desc}</span>`;
let descId = `desc-${row.id}`;
previewDiv = `<div class="ms-2" data-kt-filemanger-table="view_item"> previewDiv = `<div class="ms-2" data-kt-filemanger-table="view_item">
<a href="${row['url']}" data-gallery="gallery" data-glightbox="description: &lt;span class=&quot;fs-5 fw-bold&quot;&gt;${desc}&lt;/span&gt;" class="btn btn-sm btn-icon btn-light btn-active-light-primary glightbox"> <a href="${row['url']}" data-gallery="gallery" data-description=".${descId}" class="btn btn-sm btn-icon btn-light btn-active-light-primary glightbox">
<i class="ki-duotone ki-eye fs-6 m-0"> <i class="ki-duotone ki-eye fs-6 m-0">
<span class="path1"></span> <span class="path1"></span>
<span class="path2"></span> <span class="path2"></span>
<span class="path3"></span> <span class="path3"></span>
</i> </i>
</a> </a>
<div class="glightbox-desc ${descId} d-none">${descHtml}</div>
</div>`; </div>`;
break; break;
case "mp4": case "mp4":
@@ -1965,6 +1970,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
switch (error.response.status) { switch (error.response.status) {
case 200: case 200:
errorMessage = "general.expired_session"; errorMessage = "general.expired_session";
break;
case 403: case 403:
errorMessage = "fs.create_dir.err_403"; errorMessage = "fs.create_dir.err_403";
break; break;