[full-ci] mountpoint spaces are always listed in the drives list

2403905 · Nov 24, 2023 · 3fcb409 · 3fcb409
1 parent 6771b1a
commit 3fcb409
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/changelog/unreleased/mountpoints-are-always-listed.md b/changelog/unreleased/mountpoints-are-always-listed.md
@@ -0,0 +1,6 @@
+Enhancement: Mountpoint spaces are always listed in the drives list
+
+Mountpoints for pending and declined shares are always listed in the drives list
+
+https://github.com/cs3org/reva/pull/4360
+https://github.com/owncloud/ocis/issues/7702
diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go
@@ -446,7 +446,7 @@ func (s *service) ListStorageSpaces(ctx context.Context, req *provider.ListStora
 			}
 		case "mountpoint":
 			for _, receivedShare := range receivedShares {
-				if receivedShare.State != collaboration.ShareState_SHARE_STATE_ACCEPTED {
+				if receivedShare.State == collaboration.ShareState_SHARE_STATE_INVALID {
 					continue
 				}
 				root := &provider.ResourceId{
@@ -1124,8 +1124,7 @@ func (s *service) fetchShares(ctx context.Context) ([]*collaboration.ReceivedSha
 
 	shareMetaData := make(map[string]*provider.ResourceInfo, len(lsRes.Shares))
 	for _, rs := range lsRes.Shares {
-		// only stat accepted shares
-		if rs.State != collaboration.ShareState_SHARE_STATE_ACCEPTED {
+		if rs.State == collaboration.ShareState_SHARE_STATE_INVALID {
 			continue
 		}
 		if rs.Share.ResourceId.SpaceId == "" {