GO-4785: Fix subscription deps

core/block/editor/basic/details.go

@@ -206,7 +206,7 @@ func (bs *basic) validateDetailFormat(spaceID string, key domain.RelationKey, v
 
 		return nil
 	case model.RelationFormat_file, model.RelationFormat_object:
-		vals, ok := v.TryStringList()
+		vals, ok := v.TryWrapToStringList()
 		if !ok {
 			return fmt.Errorf("incorrect type: %v instead of string list", v)
 		}

core/block/editor/file/file.go

@@ -2,6 +2,7 @@ package file
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -306,11 +307,14 @@ func (sf *sfile) dropFilesCreateStructure(groupId, targetId string, pos model.Bl
 }
 
 func (sf *sfile) dropFilesSetInfo(info dropFileInfo) (err error) {
-	if info.err == context.Canceled {
+	if errors.Is(info.err, context.Canceled) {
 		s := sf.NewState().SetGroupId(info.groupId)
 		s.Unlink(info.blockId)
 		return sf.Apply(s)
 	}
+	if info.err != nil {
+		return fmt.Errorf("drop file: %w", info.err)
+	}
 	if isCollection(sf) {
 		s := sf.NewState()
 		if !s.HasInStore([]string{info.file.TargetObjectId}) {

core/block/editor/state/state.go

@@ -1129,8 +1129,7 @@
 }
 
 func (s *State) modifyIdsInDetail(details *domain.Details, key domain.RelationKey, modifier func(id string) string) {
-	// TODO TryStringList in pbtypes return []string{singleValue} for string values
-	if ids := details.GetStringList(key); len(ids) > 0 {
+	if ids := details.WrapToStringList(key); len(ids) > 0 {
 		var anyChanges bool
 		for i, oldId := range ids {
 			if oldId == "" {

core/domain/genericmap.go

@@ -194,6 +194,10 @@ func (d *GenericMap[K]) GetStringList(key K) []string {
 	return d.Get(key).StringList()
 }
 
+func (d *GenericMap[K]) WrapToStringList(key K) []string {
+	return d.Get(key).WrapToStringList()
+}
+
 func (d *GenericMap[K]) TryFloat64List(key K) ([]float64, bool) {
 	return d.Get(key).TryFloat64List()
 }

core/domain/value.go

@@ -283,6 +283,26 @@ func (v Value) StringList() []string {
 	return res
 }
 
+func (v Value) TryWrapToStringList() ([]string, bool) {
+	res, ok := v.TryStringList()
+	if ok {
+		return res, true
+	}
+	s, ok := v.TryString()
+	if ok {
+		return []string{s}, true
+	}
+	return nil, false
+}
+
+func (v Value) WrapToStringList() []string {
+	res, ok := v.TryWrapToStringList()
+	if ok {
+		return res
+	}
+	return nil
+}
+
 func (v Value) IsInt64List() bool {
 	return v.IsFloat64List()
 }

core/subscription/dep.go

@@ -43,7 +43,7 @@ func (ds *dependencyService) depIdsByEntries(entries []*entry, depKeys []domain.
 	depIds = forceIds
 	for _, e := range entries {
 		for _, k := range depKeys {
-			for _, depId := range e.data.GetStringList(k) {
+			for _, depId := range e.data.WrapToStringList(k) {
 				if depId != "" && slice.FindPos(depIds, depId) == -1 && depId != e.id {
 					depIds = append(depIds, depId)
 				}

util/pbtypes/pbtypes.go

@@ -517,33 +517,6 @@ func BundledRelationIdToKey(id string) (string, error) {
 	return "", fmt.Errorf("incorrect id format")
 }
 
-func Map(s *types.Struct, keys ...string) *types.Struct {
-	if len(keys) == 0 {
-		return s
-	}
-	if s == nil {
-		return nil
-	}
-	ns := new(types.Struct)
-	if s.Fields == nil {
-		return ns
-	}
-	ns.Fields = make(map[string]*types.Value)
-	for _, key := range keys {
-		if value, ok := s.Fields[key]; ok {
-			ns.Fields[key] = value
-		}
-	}
-	return ns
-}
-
-func MapN(structs []*types.Struct, keys ...string) []*types.Struct {
-	for i, s := range structs {
-		structs[i] = Map(s, keys...)
-	}
-	return structs
-}
-
 func StructIterate(st *types.Struct, f func(path []string, v *types.Value)) {
 	var iterate func(s *types.Struct, f func(path []string, v *types.Value), path []string)
 	iterate = func(s *types.Struct, f func(path []string, v *types.Value), path []string) {

util/pbtypes/pbtypes_test.go

@@ -6,8 +6,6 @@ import (
 
 	"github.com/gogo/protobuf/types"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/maps"
 )
 
 func TestGet(t *testing.T) {
@@ -179,34 +177,3 @@ func TestIsEmptyValueOrAbsent(t *testing.T) {
 		})
 	}
 }
-
-func TestMapN(t *testing.T) {
-	// given
-	structs := []*types.Struct{
-		{Fields: map[string]*types.Value{
-			"name": String("obj1"),
-			"id":   String("obj1"),
-			"key":  String("obj1"),
-		}},
-		{Fields: map[string]*types.Value{
-			"name":  String("obj2"),
-			"id":    String("obj2"),
-			"links": StringList([]string{"obj1", "obj3"}),
-		}},
-		{Fields: map[string]*types.Value{
-			"name":   String("obj3"),
-			"id":     String("obj3"),
-			"number": Int64(42),
-		}},
-	}
-	keys := []string{"name", "id"}
-
-	// when
-	mapped := MapN(structs, keys...)
-
-	// then
-	require.Len(t, mapped, 3)
-	assert.Len(t, maps.Keys(mapped[0].Fields), 2)
-	assert.Len(t, maps.Keys(mapped[1].Fields), 2)
-	assert.Len(t, maps.Keys(mapped[2].Fields), 2)
-}