GO-4588 layout resolver

.mockery.yaml

@@ -37,6 +37,11 @@ packages:
           dir: "{{.InterfaceDir}}"
           outpkg: "{{.PackageName}}"
           inpackage: true
+      Space:
+        config:
+          dir: "{{.InterfaceDir}}"
+          outpkg: "{{.PackageName}}"
+          inpackage: true
   github.com/anyproto/anytype-heart/core/block/editor/lastused:
     interfaces:
       ObjectUsageUpdater:

core/block/delete.go

@@ -97,7 +97,7 @@ func (s *Service) deleteRelationOptions(spaceId string, relationKey string) erro
 	relationOptions, _, err := s.objectStore.SpaceIndex(spaceId).QueryObjectIds(database.Query{
 		Filters: []database.FilterRequest{
 			{
-				RelationKey: bundle.RelationKeyLayout,
+				RelationKey: bundle.RelationKeyResolvedLayout,
 				Condition:   model.BlockContentDataviewFilter_Equal,
 				Value:       domain.Int64(model.ObjectType_relationOption),
 			},

core/block/detailservice/relations_test.go

@@ -23,7 +23,7 @@ func relationObject(key domain.RelationKey, format model.RelationFormat) objects
 	return objectstore.TestObject{
 		bundle.RelationKeyId:             domain.String(key.URL()),
 		bundle.RelationKeySpaceId:        domain.String(spaceId),
-		bundle.RelationKeyLayout:         domain.Float64(float64(model.ObjectType_relation)),
+		bundle.RelationKeyResolvedLayout: domain.Float64(float64(model.ObjectType_relation)),
 		bundle.RelationKeyRelationKey:    domain.String(key.String()),
 		bundle.RelationKeyRelationFormat: domain.Int64(int64(format)),
 	}

core/block/editor/accountobject/accountobject.go

@@ -206,7 +206,8 @@ func (a *accountObject) initState(st *state.State) error {
 	template.InitTemplate(st,
 		template.WithTitle,
 		template.WithForcedObjectTypes([]domain.TypeKey{bundle.TypeKeyProfile}),
-		template.WithForcedDetail(bundle.RelationKeyLayout, domain.Int64(model.ObjectType_profile)),
+		template.WithResolvedLayout(model.ObjectType_profile),
+		template.WithLayout(model.ObjectType_profile),
 		template.WithDetail(bundle.RelationKeyLayoutAlign, domain.Int64(model.Block_AlignCenter)),
 	)
 	blockId := "identity"

core/block/editor/basic/details.go

@@ -289,7 +289,7 @@ func (bs *basic) setDetailSpecialCases(st *state.State, detail domain.Detail) er
 	if detail.Key == bundle.RelationKeyType {
 		return fmt.Errorf("can't change object type directly: %w", domain.ErrValidationFailed)
 	}
-	if detail.Key == bundle.RelationKeyLayout {
+	if detail.Key == bundle.RelationKeyResolvedLayout {
 		// special case when client sets the layout detail directly instead of using SetLayoutInState command
 		return bs.SetLayoutInState(st, model.ObjectTypeLayout(detail.Value.Int64()), false)
 	}
@@ -410,7 +410,7 @@ func (bs *basic) SetLayoutInState(s *state.State, toLayout model.ObjectTypeLayou
 	}
 
 	fromLayout, _ := s.Layout()
-	s.SetDetail(bundle.RelationKeyLayout, domain.Int64(toLayout))
+	s.SetDetail(bundle.RelationKeyResolvedLayout, domain.Int64(toLayout))
 	if err = bs.layoutConverter.Convert(s, fromLayout, toLayout); err != nil {
 		return fmt.Errorf("convert layout: %w", err)
 	}

core/block/editor/basic/details_test.go

@@ -151,10 +151,10 @@ func TestBasic_SetObjectTypesInState(t *testing.T) {
 
 		f.lastUsed.EXPECT().UpdateLastUsedDate(mock.Anything, bundle.TypeKeyTask, mock.Anything).Return().Once()
 		f.store.AddObjects(t, []objectstore.TestObject{{
-			bundle.RelationKeySpaceId:   domain.String(spaceId),
-			bundle.RelationKeyId:        domain.String("ot-task"),
-			bundle.RelationKeyUniqueKey: domain.String("ot-task"),
-			bundle.RelationKeyLayout:    domain.Int64(int64(model.ObjectType_todo)),
+			bundle.RelationKeySpaceId:        domain.String(spaceId),
+			bundle.RelationKeyId:             domain.String("ot-task"),
+			bundle.RelationKeyUniqueKey:      domain.String("ot-task"),
+			bundle.RelationKeyResolvedLayout: domain.Int64(int64(model.ObjectType_todo)),
 		}})
 
 		s := f.sb.NewState()

core/block/editor/basic/extract_objects.go

@@ -178,7 +178,7 @@ func removeBlocks(state *state.State, descendants []simple.Block) {
 
 func createTargetObjectDetails(nameText string, layout model.ObjectTypeLayout) *domain.Details {
 	details := domain.NewDetails()
-	details.SetInt64(bundle.RelationKeyLayout, int64(layout))
+	details.SetInt64(bundle.RelationKeyResolvedLayout, int64(layout))
 	// Without this check title will be duplicated in template.WithNameToFirstBlock
 	if layout != model.ObjectType_note {
 		details.SetString(bundle.RelationKeyName, nameText)
@@ -252,5 +252,6 @@ func copySubtreeOfBlocks(s *state.State, oldRootId string, oldBlocks []simple.Bl
 }
 
 func hasNoteLayout(s *state.State) bool {
-	return model.ObjectTypeLayout(s.Details().GetInt64(bundle.RelationKeyLayout)) == model.ObjectType_note
+	//nolint:gosec
+	return model.ObjectTypeLayout(s.LocalDetails().GetInt64(bundle.RelationKeyResolvedLayout)) == model.ObjectType_note
 }

core/block/editor/dashboard.go

@@ -57,7 +57,9 @@ func (p *Dashboard) CreationStateMigration(ctx *smartblock.InitContext) migratio
 		Version: 2,
 		Proc: func(st *state.State) {
 			template.InitTemplate(st,
-				template.WithObjectTypesAndLayout([]domain.TypeKey{bundle.TypeKeyDashboard}, model.ObjectType_dashboard),
+				template.WithObjectTypes([]domain.TypeKey{bundle.TypeKeyDashboard}),
+				template.WithLayout(model.ObjectType_dashboard),
+				template.WithResolvedLayout(model.ObjectType_dashboard),
 				template.WithEmpty,
 				template.WithDetailName("Home"),
 				template.WithDetailIconEmoji("🏠"),

core/block/editor/file/file.go

@@ -127,7 +127,8 @@ func (sf *sfile) SetFileTargetObjectId(ctx session.Context, blockId, targetObjec
 		return err
 	}
 	var blockContentFileType model.BlockContentFileType
-	switch model.ObjectTypeLayout(sb.Details().GetInt64(bundle.RelationKeyLayout)) {
+	//nolint:gosec
+	switch model.ObjectTypeLayout(sb.LocalDetails().GetInt64(bundle.RelationKeyResolvedLayout)) {
 	case model.ObjectType_image:
 		blockContentFileType = model.BlockContentFile_Image
 	case model.ObjectType_audio:

core/block/editor/file/file_test.go

@@ -110,7 +110,7 @@ func TestFile(t *testing.T) {
 			fx := newFixture(t)
 			fileSb := smarttest.New("root")
 			fileSb.SetDetails(nil, []domain.Detail{{
-				Key:   bundle.RelationKeyLayout,
+				Key:   bundle.RelationKeyResolvedLayout,
 				Value: domain.Int64(int64(testCase.typeLayout)),
 			}}, false)
 
@@ -160,7 +160,7 @@ func TestDropFiles(t *testing.T) {
 
 		fx := newFixture(t)
 		st := fx.sb.Doc.NewState()
-		st.SetDetail(bundle.RelationKeyLayout, domain.Int64(int64(model.ObjectType_collection)))
+		st.SetDetail(bundle.RelationKeyResolvedLayout, domain.Int64(int64(model.ObjectType_collection)))
 		fx.sb.Doc = st
 		fx.pickerFx.EXPECT().GetObject(context.Background(), "root").Return(fx, nil).Maybe()
 		fx.mockSender.EXPECT().Broadcast(mock.Anything).Return().Maybe()
@@ -185,7 +185,7 @@ func TestDropFiles(t *testing.T) {
 
 		fx := newFixture(t)
 		st := fx.sb.Doc.NewState()
-		st.SetDetail(bundle.RelationKeyLayout, domain.Int64(int64(model.ObjectType_collection)))
+		st.SetDetail(bundle.RelationKeyResolvedLayout, domain.Int64(int64(model.ObjectType_collection)))
 		fx.sb.Doc = st
 		fx.pickerFx.EXPECT().GetObject(context.Background(), "root").Return(fx, nil).Maybe()
 		fx.mockSender.EXPECT().Broadcast(mock.Anything).Return().Maybe()
@@ -210,7 +210,7 @@ func TestDropFiles(t *testing.T) {
 
 		fx := newFixture(t)
 		st := fx.sb.Doc.NewState()
-		st.SetDetail(bundle.RelationKeyLayout, domain.Int64(int64(model.ObjectType_collection)))
+		st.SetDetail(bundle.RelationKeyResolvedLayout, domain.Int64(int64(model.ObjectType_collection)))
 		fx.sb.Doc = st
 		fx.pickerFx.EXPECT().GetObject(context.Background(), "root").Return(fx, nil)
 		fx.mockSender.EXPECT().Broadcast(mock.Anything).Return()
@@ -245,7 +245,7 @@ func TestDropFiles(t *testing.T) {
 
 		fx := newFixture(t)
 		st := fx.sb.Doc.NewState()
-		st.SetDetail(bundle.RelationKeyLayout, domain.Int64(int64(model.ObjectType_collection)))
+		st.SetDetail(bundle.RelationKeyResolvedLayout, domain.Int64(int64(model.ObjectType_collection)))
 		fx.sb.Doc = st
 		fx.pickerFx.EXPECT().GetObject(context.Background(), "root").Return(fx, nil)
 		fx.mockSender.EXPECT().Broadcast(mock.Anything).Return()

core/block/editor/page.go

@@ -124,7 +124,7 @@ func (p *Page) deleteRelationOptions(spaceID string, relationKey string) error {
 				Value:       domain.String(relationKey),
 			},
 			{
-				RelationKey: bundle.RelationKeyLayout,
+				RelationKey: bundle.RelationKeyResolvedLayout,
 				Condition:   model.BlockContentDataviewFilter_Equal,
 				Value:       domain.Int64(model.ObjectType_relationOption),
 			},
@@ -172,8 +172,8 @@ func (p *Page) CreationStateMigration(ctx *smartblock.InitContext) migration.Mig
 
 			templates := []template.StateTransformer{
 				template.WithEmpty,
-				template.WithObjectTypesAndLayout(ctx.State.ObjectTypeKeys(), layout),
-				template.WithLayout(layout),
+				template.WithObjectTypes(ctx.State.ObjectTypeKeys()),
+				template.WithResolvedLayout(layout),
 				template.WithDefaultFeaturedRelations,
 				template.WithFeaturedRelations,
 				template.WithLinkFieldsMigration,
@@ -204,27 +204,33 @@ func (p *Page) CreationStateMigration(ctx *smartblock.InitContext) migration.Mig
 				templates = append(templates,
 					template.WithTitle,
 					template.WithAddedFeaturedRelation(bundle.RelationKeyType),
+					template.WithLayout(layout),
 				)
 			case model.ObjectType_objectType:
 				templates = append(templates,
 					template.WithTitle,
 					template.WithAddedFeaturedRelation(bundle.RelationKeyType),
+					template.WithLayout(layout),
 				)
 			case model.ObjectType_chat:
 				templates = append(templates,
 					template.WithTitle,
 					template.WithBlockChat,
+					template.WithLayout(layout),
 				)
 			case model.ObjectType_chatDerived:
 				templates = append(templates,
 					template.WithTitle,
 					template.WithBlockChat,
+					template.WithLayout(layout),
 				)
 				// TODO case for relationOption?
 			case model.ObjectType_tag:
 				templates = append(templates,
 					template.WithTitle,
-					template.WithNoDescription)
+					template.WithNoDescription,
+					template.WithLayout(layout),
+				)
 			default:
 				templates = append(templates,
 					template.WithTitle,

core/block/editor/participant.go

@@ -49,7 +49,6 @@ func (p *participant) Init(ctx *smartblock.InitContext) (err error) {
 	ctx.State.SetDetailAndBundledRelation(bundle.RelationKeyIsReadonly, domain.Bool(true))
 	ctx.State.SetDetailAndBundledRelation(bundle.RelationKeyIsArchived, domain.Bool(false))
 	ctx.State.SetDetailAndBundledRelation(bundle.RelationKeyIsHidden, domain.Bool(false))
-	ctx.State.SetDetailAndBundledRelation(bundle.RelationKeyLayout, domain.Int64(model.ObjectType_participant))
 	ctx.State.SetDetailAndBundledRelation(bundle.RelationKeyLayoutAlign, domain.Int64(model.Block_AlignCenter))
 
 	records, err := p.objectStore.QueryByIds([]string{p.Id()})
@@ -64,6 +63,8 @@ func (p *participant) Init(ctx *smartblock.InitContext) (err error) {
 		template.WithTitle,
 		template.WithDescription,
 		template.WithFeaturedRelations,
+		template.WithLayout(model.ObjectType_participant),
+		template.WithResolvedLayout(model.ObjectType_participant),
 		template.WithAddedFeaturedRelation(bundle.RelationKeyType),
 		template.WithAddedFeaturedRelation(bundle.RelationKeyBacklinks),
 	)

core/block/editor/participant_test.go

@@ -177,7 +177,7 @@ func newStoreFixture(t *testing.T) *spaceindex.StoreFixture {
 	for _, rel := range []domain.RelationKey{
 		bundle.RelationKeyFeaturedRelations, bundle.RelationKeyIdentity, bundle.RelationKeyName,
 		bundle.RelationKeyIdentityProfileLink, bundle.RelationKeyIsReadonly, bundle.RelationKeyIsArchived,
-		bundle.RelationKeyDescription, bundle.RelationKeyIsHidden, bundle.RelationKeyLayout,
+		bundle.RelationKeyDescription, bundle.RelationKeyIsHidden, bundle.RelationKeyResolvedLayout,
 		bundle.RelationKeyLayoutAlign, bundle.RelationKeyIconImage, bundle.RelationKeyGlobalName,
 		bundle.RelationKeyId, bundle.RelationKeyParticipantPermissions, bundle.RelationKeyLastModifiedBy,
 		bundle.RelationKeySpaceId, bundle.RelationKeyParticipantStatus, bundle.RelationKeyIsHiddenDiscovery,

core/block/editor/profile.go

@@ -80,7 +80,9 @@ func (p *Profile) CreationStateMigration(ctx *smartblock.InitContext) migration.
 		Version: 4,
 		Proc: func(st *state.State) {
 			template.InitTemplate(st,
-				template.WithObjectTypesAndLayout([]domain.TypeKey{bundle.TypeKeyProfile}, model.ObjectType_profile),
+				template.WithObjectTypes([]domain.TypeKey{bundle.TypeKeyProfile}),
+				template.WithLayout(model.ObjectType_profile),
+				template.WithResolvedLayout(model.ObjectType_profile),
 				template.WithDetail(bundle.RelationKeyLayoutAlign, domain.Int64(model.Block_AlignCenter)),
 				migrationSetHidden,
 			)