Sort share entries alphabetically (#1772)

cs3org · Jun 8, 2021 · d85c072 · d85c072
1 parent 52e7228
commit d85c072
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/changelog/unreleased/sort-share.md b/changelog/unreleased/sort-share.md
@@ -0,0 +1,6 @@
+Enhancement: Sort share entries alphabetically
+
+When showing the list of shares to the end-user, the list was not sorted alphabetically.
+This PR sorts the list of users and groups.
+
+https://github.com/cs3org/reva/issues/1763
diff --git a/internal/grpc/services/groupprovider/groupprovider.go b/internal/grpc/services/groupprovider/groupprovider.go
@@ -21,6 +21,7 @@ package groupprovider
 import (
 	"context"
 	"fmt"
+	"sort"
 
 	grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1"
 	"github.com/cs3org/reva/pkg/errtypes"
@@ -138,6 +139,11 @@ func (s *service) FindGroups(ctx context.Context, req *grouppb.FindGroupsRequest
 		}, nil
 	}
 
+	// sort group by groupname
+	sort.Slice(groups, func(i, j int) bool {
+		return groups[i].GroupName <= groups[j].GroupName
+	})
+
 	return &grouppb.FindGroupsResponse{
 		Status: status.NewOK(ctx),
 		Groups: groups,

diff --git a/internal/grpc/services/userprovider/userprovider.go b/internal/grpc/services/userprovider/userprovider.go
@@ -21,6 +21,7 @@ package userprovider
 import (
 	"context"
 	"fmt"
+	"sort"
 
 	userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
 	"github.com/cs3org/reva/pkg/errtypes"
@@ -145,6 +146,11 @@ func (s *service) FindUsers(ctx context.Context, req *userpb.FindUsersRequest) (
 		return res, nil
 	}
 
+	// sort users by username
+	sort.Slice(users, func(i, j int) bool {
+		return users[i].Username <= users[j].Username
+	})
+
 	res := &userpb.FindUsersResponse{
 		Status: status.NewOK(ctx),
 		Users:  users,