anyproto/anytype-heart
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-heart.git synced 2025-06-10 18:10:49 +09:00
Code Activity

GO-1084: Remove relation2 alias

Browse source
This commit is contained in:
Sergey 2023-04-25 18:17:59 +02:00 • committed by Mikhail Iudin
parent 0c7d14f846
commit b852b406de
No known key found for this signature in database
GPG key ID: FAAAA8BAABDFF1C0
14 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/block/editor/basic/basic.go
View file

@ -14,9 +14,9 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/simple/base"
"github.com/anytypeio/go-anytype-middleware/core/block/simple/latex"
"github.com/anytypeio/go-anytype-middleware/core/block/simple/link"
"github.com/anytypeio/go-anytype-middleware/core/block/simple/relation"
relationblock "github.com/anytypeio/go-anytype-middleware/core/block/simple/relation"
"github.com/anytypeio/go-anytype-middleware/core/block/simple/text"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/session"
"github.com/anytypeio/go-anytype-middleware/pb"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle"
@ -45,7 +45,7 @@ type CommonOperations interface {
SetLatexText(ctx *session.Context, req pb.RpcBlockLatexSetTextRequest) error
SetRelationKey(ctx *session.Context, req pb.RpcBlockRelationSetKeyRequest) error
AddRelationAndSet(ctx *session.Context, service relation2.Service, req pb.RpcBlockRelationAddRequest) error
AddRelationAndSet(ctx *session.Context, service relation.Service, req pb.RpcBlockRelationAddRequest) error
FeaturedRelationAdd(ctx *session.Context, relations ...string) error
FeaturedRelationRemove(ctx *session.Context, relations ...string) error
@ -96,7 +96,7 @@ var ErrNotSupported = fmt.Errorf("operation not supported for this type of smart
func NewBasic(
sb smartblock.SmartBlock,
objectStore objectstore.ObjectStore,
relationService relation2.Service,
relationService relation.Service,
layoutConverter converter.LayoutConverter,
) AllOperations {
return &basic{
@ -111,7 +111,7 @@ type basic struct {
smartblock.SmartBlock
objectStore objectstore.ObjectStore
relationService relation2.Service
relationService relation.Service
layoutConverter converter.LayoutConverter
}
@ -342,7 +342,7 @@ func (bs *basic) SetRelationKey(ctx *session.Context, req pb.RpcBlockRelationSet
if !bs.HasRelation(s, req.Key) {
return fmt.Errorf("relation with given key not found")
}
if rel, ok := b.(relation.Block); ok {
if rel, ok := b.(relationblock.Block); ok {
rel.SetKey(req.Key)
} else {
return fmt.Errorf("unexpected block type: %T (want relation)", b)
@ -365,7 +365,7 @@ func (bs *basic) SetLatexText(ctx *session.Context, req pb.RpcBlockLatexSetTextR
return bs.Apply(s, smartblock.NoEvent)
}
func (bs *basic) AddRelationAndSet(ctx *session.Context, relationService relation2.Service, req pb.RpcBlockRelationAddRequest) (err error) {
func (bs *basic) AddRelationAndSet(ctx *session.Context, relationService relation.Service, req pb.RpcBlockRelationAddRequest) (err error) {
s := bs.NewStateCtx(ctx)
b := s.Get(req.BlockId)
if b == nil {
@ -377,7 +377,7 @@ func (bs *basic) AddRelationAndSet(ctx *session.Context, relationService relatio
return
}
if rb, ok := b.(relation.Block); ok {
if rb, ok := b.(relationblock.Block); ok {
rb.SetKey(rel.Key)
} else {
return fmt.Errorf("unexpected block type: %T (want relation)", b)

2
core/block/editor/basic/details.go
View file

@ -105,7 +105,7 @@ func (bs *basic) setDetailSpecialCases(st *state.State, detail *pb.RpcObjectSetD
}
func (bs *basic) addRelationLink(relationKey string, st *state.State) error {
// TODO: add relation2.WithWorkspaceId(workspaceId) filter
// TODO: add relation.WithWorkspaceId(workspaceId) filter
rel, err := bs.relationService.FetchKey(relationKey)
if err != nil || rel == nil {
return fmt.Errorf("failed to get relation: %w", err)

6
core/block/editor/dataview/dataview.go
View file

@ -13,7 +13,7 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/editor/template"
"github.com/anytypeio/go-anytype-middleware/core/block/simple"
"github.com/anytypeio/go-anytype-middleware/core/block/simple/dataview"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation/relationutils"
"github.com/anytypeio/go-anytype-middleware/core/session"
"github.com/anytypeio/go-anytype-middleware/pb"
@ -62,7 +62,7 @@ func NewDataview(
sb smartblock.SmartBlock,
anytype core.Service,
objectStore objectstore.ObjectStore,
relationService relation2.Service,
relationService relation.Service,
sbtProvider typeprovider.SmartBlockTypeProvider,
) Dataview {
dv := &sdataview{
@ -80,7 +80,7 @@ type sdataview struct {
smartblock.SmartBlock
anytype core.Service
objectStore objectstore.ObjectStore
relationService relation2.Service
relationService relation.Service
sbtProvider typeprovider.SmartBlockTypeProvider
}

6
core/block/editor/factory.go
View file

@ -16,7 +16,7 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/source"
"github.com/anytypeio/go-anytype-middleware/core/event"
"github.com/anytypeio/go-anytype-middleware/core/files"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/pb"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/core"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore"
@ -35,7 +35,7 @@ type ObjectFactory struct {
fileBlockService file.BlockService
layoutConverter converter.LayoutConverter
objectStore objectstore.ObjectStore
relationService relation2.Service
relationService relation.Service
sbtProvider typeprovider.SmartBlockTypeProvider
sendEvent func(e *pb.Event)
sourceService source.Service
@ -65,7 +65,7 @@ func (f *ObjectFactory) Init(a *app.App) (err error) {
f.detailsModifier = app.MustComponent[DetailsModifier](a)
f.fileBlockService = app.MustComponent[file.BlockService](a)
f.objectStore = app.MustComponent[objectstore.ObjectStore](a)
f.relationService = app.MustComponent[relation2.Service](a)
f.relationService = app.MustComponent[relation.Service](a)
f.sourceService = app.MustComponent[source.Service](a)
f.sendEvent = app.MustComponent[event.Sender](a).Send
f.templateCloner = app.MustComponent[templateCloner](a)

6
core/block/editor/objecttype.go
View file

@ -14,7 +14,7 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/editor/template"
"github.com/anytypeio/go-anytype-middleware/core/block/restriction"
"github.com/anytypeio/go-anytype-middleware/core/files"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation/relationutils"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/core"
@ -27,7 +27,7 @@ import (
)
type ObjectType struct {
relationService relation2.Service
relationService relation.Service
*SubObject
}
@ -36,7 +36,7 @@ func NewObjectType(
objectStore objectstore.ObjectStore,
fileBlockService file.BlockService,
anytype core.Service,
relationService relation2.Service,
relationService relation.Service,
tempDirProvider core.TempDirProvider,
sbtProvider typeprovider.SmartBlockTypeProvider,
layoutConverter converter.LayoutConverter,

4
core/block/editor/page.go
View file

@ -15,7 +15,7 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/editor/template"
"github.com/anytypeio/go-anytype-middleware/core/block/migration"
"github.com/anytypeio/go-anytype-middleware/core/files"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/core"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore"
@ -45,7 +45,7 @@ func NewPage(
fileBlockService file.BlockService,
bookmarkBlockService bookmark.BlockService,
bookmarkService bookmark.BookmarkService,
relationService relation2.Service,
relationService relation.Service,
tempDirProvider core.TempDirProvider,
sbtProvider typeprovider.SmartBlockTypeProvider,
layoutConverter converter.LayoutConverter,

4
core/block/editor/relation.go
View file

@ -8,7 +8,7 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/editor/template"
"github.com/anytypeio/go-anytype-middleware/core/block/restriction"
"github.com/anytypeio/go-anytype-middleware/core/files"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation/relationutils"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/core"
@ -28,7 +28,7 @@ func NewRelation(
objectStore objectstore.ObjectStore,
fileBlockService file.BlockService,
anytype core.Service,
relationService relation2.Service,
relationService relation.Service,
tempDirProvider core.TempDirProvider,
sbtProvider typeprovider.SmartBlockTypeProvider,
layoutConverter converter.LayoutConverter,

4
core/block/editor/relation_option.go
View file

@ -6,7 +6,7 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock"
"github.com/anytypeio/go-anytype-middleware/core/block/editor/template"
"github.com/anytypeio/go-anytype-middleware/core/files"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/core"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore"
@ -24,7 +24,7 @@ func NewRelationOption(
objectStore objectstore.ObjectStore,
fileBlockService file.BlockService,
anytype core.Service,
relationService relation2.Service,
relationService relation.Service,
tempDirProvider core.TempDirProvider,
sbtProvider typeprovider.SmartBlockTypeProvider,
layoutConverter converter.LayoutConverter,

8
core/block/editor/smartblock/smartblock.go
View file

@ -23,7 +23,7 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/source"
"github.com/anytypeio/go-anytype-middleware/core/block/undo"
"github.com/anytypeio/go-anytype-middleware/core/files"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation/relationutils"
"github.com/anytypeio/go-anytype-middleware/core/session"
"github.com/anytypeio/go-anytype-middleware/metrics"
@ -86,7 +86,7 @@ func New(
fileService files.Service,
restrictionService restriction.Service,
objectStore objectstore.ObjectStore,
relationService relation2.Service,
relationService relation.Service,
indexer Indexer,
) SmartBlock {
s := &smartBlock{
@ -212,7 +212,7 @@ type smartBlock struct {
fileService files.Service
restrictionService restriction.Service
objectStore objectstore.ObjectStore
relationService relation2.Service
relationService relation.Service
indexer Indexer
}
@ -832,7 +832,7 @@ func (sb *smartBlock) Anytype() core.Service {
return sb.coreService
}
func (sb *smartBlock) RelationService() relation2.Service {
func (sb *smartBlock) RelationService() relation.Service {
return sb.relationService
}

4
core/block/editor/sub_object_factory.go
View file

@ -9,7 +9,7 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/restriction"
"github.com/anytypeio/go-anytype-middleware/core/block/source"
"github.com/anytypeio/go-anytype-middleware/core/files"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/core"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore"
"github.com/anytypeio/go-anytype-middleware/space/typeprovider"
@ -22,7 +22,7 @@ type subObjectFactory struct {
indexer smartblock.Indexer
layoutConverter converter.LayoutConverter
objectStore objectstore.ObjectStore
relationService relation2.Service
relationService relation.Service
restrictionService restriction.Service
sbtProvider typeprovider.SmartBlockTypeProvider
sourceService source.Service

4
core/block/editor/subobject.go
View file

@ -11,7 +11,7 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock"
"github.com/anytypeio/go-anytype-middleware/core/block/editor/stext"
"github.com/anytypeio/go-anytype-middleware/core/files"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/core"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore"
"github.com/anytypeio/go-anytype-middleware/space/typeprovider"
@ -32,7 +32,7 @@ func NewSubObject(
objectStore objectstore.ObjectStore,
fileBlockService file.BlockService,
anytype core.Service,
relationService relation2.Service,
relationService relation.Service,
tempDirProvider core.TempDirProvider,
sbtProvider typeprovider.SmartBlockTypeProvider,
layoutConverter converter.LayoutConverter,

4
core/block/editor/subobjectcollection.go
View file

@ -16,7 +16,7 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/editor/stext"
"github.com/anytypeio/go-anytype-middleware/core/block/simple"
"github.com/anytypeio/go-anytype-middleware/core/block/source"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/core"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr"
@ -67,7 +67,7 @@ func NewSubObjectCollection(
defaultCollectionName string,
objectStore objectstore.ObjectStore,
anytype core.Service,
relationService relation2.Service,
relationService relation.Service,
sourceService source.Service,
sbtProvider typeprovider.SmartBlockTypeProvider,
layoutConverter converter.LayoutConverter,

4
core/block/editor/template.go
View file

@ -11,7 +11,7 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/editor/template"
"github.com/anytypeio/go-anytype-middleware/core/block/migration"
"github.com/anytypeio/go-anytype-middleware/core/files"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/core"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore"
@ -31,7 +31,7 @@ func NewTemplate(
fileBlockService file.BlockService,
bookmarkBlockService bookmark.BlockService,
bookmarkService bookmark.BookmarkService,
relationService relation2.Service,
relationService relation.Service,
tempDirProvider core.TempDirProvider,
sbtProvider typeprovider.SmartBlockTypeProvider,
layoutConverter converter.LayoutConverter,

10
util/builtinobjects/builtinobjects.go
View file

@ -25,10 +25,10 @@ import (
"github.com/anytypeio/go-anytype-middleware/core/block/simple/bookmark"
"github.com/anytypeio/go-anytype-middleware/core/block/simple/dataview"
"github.com/anytypeio/go-anytype-middleware/core/block/simple/link"
"github.com/anytypeio/go-anytype-middleware/core/block/simple/relation"
relationblock "github.com/anytypeio/go-anytype-middleware/core/block/simple/relation"
"github.com/anytypeio/go-anytype-middleware/core/block/simple/text"
"github.com/anytypeio/go-anytype-middleware/core/block/source"
relation2 "github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation"
"github.com/anytypeio/go-anytype-middleware/core/relation/relationutils"
"github.com/anytypeio/go-anytype-middleware/pb"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle"
@ -75,7 +75,7 @@ type builtinObjects struct {
cancel func()
source source.Service
service *block.Service
relService relation2.Service
relService relation.Service
sbtProvider typeprovider.SmartBlockTypeProvider
coreService core.Service
@ -93,7 +93,7 @@ func (b *builtinObjects) Init(a *app.App) (err error) {
b.source = a.MustComponent(source.CName).(source.Service)
b.service = a.MustComponent(block.CName).(*block.Service)
b.createBuiltinObjects = a.MustComponent(config.CName).(*config.Config).CreateBuiltinObjects
b.relService = a.MustComponent(relation2.CName).(relation2.Service)
b.relService = a.MustComponent(relation.CName).(relation.Service)
b.coreService = a.MustComponent(core.CName).(core.Service)
b.cancel = func() {}
return
@ -466,7 +466,7 @@ func (b *builtinObjects) validate(st *state.State) (err error) {
}
st.Iterate(func(b simple.Block) (isContinue bool) {
if rb, ok := b.(relation.Block); ok {
if rb, ok := b.(relationblock.Block); ok {
relKeys = append(relKeys, rb.Model().GetRelation().Key)
}
return true