Implementing file search, pagination, bulk ops & URL S3 instance routing

Author: Enzo DJABALI

internal/app/s3manager/bucket_view.go

@@ -7,39 +7,85 @@ import (
 	"net/http"
 	"path"
 	"regexp"
+	"sort"
+	"strconv"
 	"strings"
 	"time"
 
 	"github.com/minio/minio-go/v7"
 )
 
+// objectWithIcon represents an S3 object with additional display properties
+type objectWithIcon struct {
+	Key          string
+	Size         int64
+	LastModified time.Time
+	Owner        string
+	Icon         string
+	IsFolder     bool
+	DisplayName  string
+}
+
 // HandleBucketView shows the details page of a bucket.
 func HandleBucketView(s3 S3, templates fs.FS, allowDelete bool, listRecursive bool, rootURL string) http.HandlerFunc {
-	type objectWithIcon struct {
-		Key          string
-		Size         int64
-		LastModified time.Time
-		Owner        string
-		Icon         string
-		IsFolder     bool
-		DisplayName  string
-	}
-
 	type pageData struct {
-		RootURL     string
-		BucketName  string
-		Objects     []objectWithIcon
-		AllowDelete bool
-		Paths       []string
-		CurrentPath string
+		RootURL      string
+		BucketName   string
+		Objects      []objectWithIcon
+		AllowDelete  bool
+		Paths        []string
+		CurrentPath  string
+		CurrentS3    *S3Instance
+		S3Instances  []*S3Instance
+		HasError     bool
+		ErrorMessage string
+		SortBy       string
+		SortOrder    string
+		Page         int
+		PerPage      int
+		TotalItems   int
+		TotalPages   int
+		HasPrevPage  bool
+		HasNextPage  bool
+		Search       string
 	}
 
 	return func(w http.ResponseWriter, r *http.Request) {
 		regex := regexp.MustCompile(`\/buckets\/([^\/]*)\/?(.*)`)
-		matches := regex.FindStringSubmatch(r.RequestURI)
+		matches := regex.FindStringSubmatch(r.URL.Path)
 		bucketName := matches[1]
 		path := matches[2]
 
+		// Get sorting parameters from query string
+		sortBy := r.URL.Query().Get("sortBy")
+		sortOrder := r.URL.Query().Get("sortOrder")
+
+		// Default sorting
+		if sortBy == "" {
+			sortBy = "key"
+		}
+		if sortOrder == "" {
+			sortOrder = "asc"
+		}
+
+		// Get pagination parameters
+		page := 1
+		if pageStr := r.URL.Query().Get("page"); pageStr != "" {
+			if p, err := strconv.Atoi(pageStr); err == nil && p > 0 {
+				page = p
+			}
+		}
+
+		perPage := 25
+		if perPageStr := r.URL.Query().Get("perPage"); perPageStr != "" {
+			if pp, err := strconv.Atoi(perPageStr); err == nil && pp > 0 {
+				perPage = pp
+			}
+		}
+
+		// Get search parameter
+		search := strings.TrimSpace(r.URL.Query().Get("search"))
+
 		var objs []objectWithIcon
 		opts := minio.ListObjectsOptions{
 			Recursive: listRecursive,
@@ -63,16 +109,91 @@ func HandleBucketView(s3 S3, templates fs.FS, allowDelete bool, listRecursive bo
 			}
 			objs = append(objs, obj)
 		}
+
+		// Filter objects based on search query
+		if search != "" {
+			searchLower := strings.ToLower(search)
+			filteredObjs := make([]objectWithIcon, 0)
+			for _, obj := range objs {
+				// Search in DisplayName and Key (case-insensitive)
+				if strings.Contains(strings.ToLower(obj.DisplayName), searchLower) ||
+					strings.Contains(strings.ToLower(obj.Key), searchLower) {
+					filteredObjs = append(filteredObjs, obj)
+				}
+			}
+			objs = filteredObjs
+		}
+
+		// Sort objects based on sortBy and sortOrder
+		sortObjects(objs, sortBy, sortOrder)
+
+		// Calculate pagination
+		totalItems := len(objs)
+		totalPages := (totalItems + perPage - 1) / perPage
+		if totalPages == 0 {
+			totalPages = 1
+		}
+		if page > totalPages {
+			page = totalPages
+		}
+
+		// Paginate objects
+		start := (page - 1) * perPage
+		end := start + perPage
+		if start < 0 {
+			start = 0
+		}
+		if end > totalItems {
+			end = totalItems
+		}
+		if start < totalItems {
+			objs = objs[start:end]
+		} else {
+			objs = []objectWithIcon{}
+		}
+
 		data := pageData{
-			RootURL:     rootURL,
-			BucketName:  bucketName,
-			Objects:     objs,
-			AllowDelete: allowDelete,
-			Paths:       removeEmptyStrings(strings.Split(path, "/")),
-			CurrentPath: path,
+			RootURL:      rootURL,
+			BucketName:   bucketName,
+			Objects:      objs,
+			AllowDelete:  allowDelete,
+			Paths:        removeEmptyStrings(strings.Split(path, "/")),
+			CurrentPath:  path,
+			CurrentS3:    nil,
+			S3Instances:  nil,
+			HasError:     false,
+			ErrorMessage: "",
+			SortBy:       sortBy,
+			SortOrder:    sortOrder,
+			Page:         page,
+			PerPage:      perPage,
+			TotalItems:   totalItems,
+			TotalPages:   totalPages,
+			HasPrevPage:  page > 1,
+			HasNextPage:  page < totalPages,
+			Search:       search,
+		}
+
+		funcMap := template.FuncMap{
+			"add": func(a, b int) int { return a + b },
+			"sub": func(a, b int) int { return a - b },
+			"mul": func(a, b int) int { return a * b },
+			"min": func(a, b int) int {
+				if a < b {
+					return a
+				}
+				return b
+			},
+			"iterate": func(start, end int) []int {
+				result := make([]int, 0, end-start)
+				for i := start; i < end; i++ {
+					result = append(result, i)
+				}
+				return result
+			},
 		}
 
-		t, err := template.ParseFS(templates, "layout.html.tmpl", "bucket.html.tmpl")
+		t, err := template.New("").Funcs(funcMap).ParseFS(templates, "layout.html.tmpl", "bucket.html.tmpl")
 		if err != nil {
 			handleHTTPError(w, fmt.Errorf("error parsing template files: %w", err))
 			return
@@ -114,3 +235,27 @@ func removeEmptyStrings(input []string) []string {
 	}
 	return result
 }
+
+// sortObjects sorts the objects based on the specified field and order
+func sortObjects(objs []objectWithIcon, sortBy, sortOrder string) {
+	sort.Slice(objs, func(i, j int) bool {
+		var less bool
+		switch sortBy {
+		case "size":
+			less = objs[i].Size < objs[j].Size
+		case "owner":
+			less = strings.ToLower(objs[i].Owner) < strings.ToLower(objs[j].Owner)
+		case "lastModified":
+			less = objs[i].LastModified.Before(objs[j].LastModified)
+		case "key":
+			fallthrough
+		default:
+			less = strings.ToLower(objs[i].DisplayName) < strings.ToLower(objs[j].DisplayName)
+		}
+
+		if sortOrder == "desc" {
+			return !less
+		}
+		return less
+	})
+}

internal/app/s3manager/buckets_view.go

@@ -5,30 +5,37 @@ import (
 	"html/template"
 	"io/fs"
 	"net/http"
-
-	"github.com/minio/minio-go/v7"
 )
 
 // HandleBucketsView renders all buckets on an HTML page.
 func HandleBucketsView(s3 S3, templates fs.FS, allowDelete bool, rootURL string) http.HandlerFunc {
 	type pageData struct {
-		RootURL     string
-		Buckets     []minio.BucketInfo
-		AllowDelete bool
+		RootURL      string
+		Buckets      []interface{}
+		AllowDelete  bool
+		CurrentS3    *S3Instance
+		S3Instances  []*S3Instance
+		HasError     bool
+		ErrorMessage string
 	}
 
 	return func(w http.ResponseWriter, r *http.Request) {
 		buckets, err := s3.ListBuckets(r.Context())
 
+		data := pageData{
+			RootURL:     rootURL,
+			AllowDelete: allowDelete,
+			HasError:    false,
+		}
+
 		if err != nil {
 			handleHTTPError(w, fmt.Errorf("error listing buckets: %w", err))
 			return
 		}
 
-		data := pageData{
-			RootURL:     rootURL,
-			Buckets:     buckets,
-			AllowDelete: allowDelete,
+		data.Buckets = make([]interface{}, len(buckets))
+		for i, bucket := range buckets {
+			data.Buckets[i] = bucket
 		}
 
 		t, err := template.ParseFS(templates, "layout.html.tmpl", "buckets.html.tmpl")