GO-5126 Migrate types icons

anyproto · Feb 18, 2025 · 91715f3 · 91715f3
1 parent 175f496
commit 91715f3
Show file tree

Hide file tree

Showing 9 changed files with 824 additions and 644 deletions.
diff --git a/core/block/editor/page.go b/core/block/editor/page.go
@@ -52,6 +52,8 @@ var typeRequiredRelations = append(typeAndRelationRequiredRelations,
 	bundle.RelationKeyRecommendedFileRelations,
 	bundle.RelationKeyRecommendedLayout,
 	bundle.RelationKeySmartblockTypes,
+	bundle.RelationKeyIconOption,
+	bundle.RelationKeyIconName,
 )
 
 var relationRequiredRelations = append(typeAndRelationRequiredRelations,

diff --git a/core/relationutils/objecttype.go b/core/relationutils/objecttype.go
@@ -41,7 +41,6 @@ func (ot *ObjectType) BundledTypeDetails() *domain.Details {
 	det.SetInt64(bundle.RelationKeyLayout, int64(model.ObjectType_objectType))
 	det.SetString(bundle.RelationKeyName, ot.Name)
 	det.SetString(bundle.RelationKeyCreator, addr.AnytypeProfileId)
-	det.SetString(bundle.RelationKeyIconEmoji, ot.IconEmoji)
 	det.SetString(bundle.RelationKeyUniqueKey, uk.Marshal())
 	det.SetStringList(bundle.RelationKeyRecommendedRelations, relationIds)
 	det.SetInt64(bundle.RelationKeyRecommendedLayout, int64(ot.Layout))
@@ -54,5 +53,7 @@ func (ot *ObjectType) BundledTypeDetails() *domain.Details {
 	det.SetString(bundle.RelationKeySpaceId, addr.AnytypeMarketplaceWorkspace)
 	det.SetInt64(bundle.RelationKeyOrigin, int64(model.ObjectOrigin_builtin))
 	det.SetInt64(bundle.RelationKeyRevision, ot.Revision)
+	det.SetInt64(bundle.RelationKeyIconOption, ot.IconColor)
+	det.SetString(bundle.RelationKeyIconName, ot.IconName)
 	return det
 }
diff --git a/docs/proto.md b/docs/proto.md
@@ -30387,6 +30387,8 @@ Used to decode block meta only, without the content itself
 | key | [string](#string) |  | name of objectType (can be localized for bundled types) |
 | revision | [int64](#int64) |  | revision of system objectType. Used to check if we should change type content or not |
 | restrictObjectCreation | [bool](#bool) |  | restricts creating objects of this type for users |
+| iconColor | [int64](#int64) |  | color of object type icon |
+| iconName | [string](#string) |  | name of object type icon |
 
 
 

diff --git a/pkg/lib/bundle/generator/main.go b/pkg/lib/bundle/generator/main.go
@@ -62,6 +62,8 @@ type ObjectType struct {
 	Description            string   `json:"description"`
 	Revision               int      `json:"revision"`
 	RestrictObjectCreation bool     `json:"restrictObjectCreation"`
+	IconColor              int      `json:"iconColor"`
+	IconName               string   `json:"iconName"`
 }
 
 type Layout struct {
@@ -277,9 +279,6 @@ func generateTypes() error {
 			if ot.Hidden {
 				dictS[Id("Hidden")] = Lit(ot.Hidden)
 			}
-			if ot.Emoji != "" {
-				dictS[Id("IconEmoji")] = Lit(ot.Emoji)
-			}
 
 			dictS[Id("Readonly")] = Lit(true)
 
@@ -310,6 +309,12 @@ func generateTypes() error {
 				dictS[Id("RestrictObjectCreation")] = Lit(ot.RestrictObjectCreation)
 			}
 
+			dictS[Id("IconColor")] = Lit(ot.IconColor)
+
+			if ot.IconName != "" {
+				dictS[Id("IconName")] = Lit(ot.IconName)
+			}
+
 			dict[Id(typeConst(ot.ID))] = Block(dictS)
 		}
 		g.Id("types").Op("=").Map(Qual(domainPkg, "TypeKey")).Op("*").Qual(relPbPkg, "ObjectType").Values(Dict(dict))