notion icon format

api/controllers/console/datasets/data_source.py

@@ -28,10 +28,15 @@ PREVIEW_WORDS_LIMIT = 3000
 
 
 class DataSourceApi(Resource):
+    integrate_icon_fields = {
+        'type': fields.String,
+        'url': fields.String,
+        'emoji': fields.String
+    }
     integrate_page_fields = {
         'page_name': fields.String,
         'page_id': fields.String,
-        'page_icon': fields.String,
+        'page_icon': fields.Nested(integrate_icon_fields),
         'parent_id': fields.String,
         'type': fields.String
     }
@@ -130,10 +135,15 @@ class DataSourceApi(Resource):
 
 
 class DataSourceNotionListApi(Resource):
+    integrate_icon_fields = {
+        'type': fields.String,
+        'url': fields.String,
+        'emoji': fields.String
+    }
     integrate_page_fields = {
         'page_name': fields.String,
         'page_id': fields.String,
-        'page_icon': fields.String,
+        'page_icon': fields.Nested(integrate_icon_fields),
         'is_bound': fields.Boolean,
         'parent_id': fields.String,
         'type': fields.String

api/libs/oauth_data_source.py

@@ -129,7 +129,16 @@ class NotionOAuth(OAuthDataSource):
             page_icon = page_result['icon']
             if page_icon:
                 icon_type = page_icon['type']
-                icon = page_icon[icon_type]
+                if icon_type == 'external':
+                    icon = {
+                        'type': 'url',
+                        'url': page_icon[icon_type]['url']
+                    }
+                else:
+                    icon = {
+                        'type': 'emoji',
+                        'emoji': page_icon[icon_type]
+                    }
             else:
                 icon = None
             parent = page_result['parent']
@@ -156,7 +165,16 @@ class NotionOAuth(OAuthDataSource):
                 page_icon = database_result['icon']
                 if page_icon:
                     icon_type = page_icon['type']
-                    icon = page_icon[icon_type]
+                    if icon_type == 'external':
+                        icon = {
+                            'type': 'url',
+                            'url': page_icon[icon_type]['url']
+                        }
+                    else:
+                        icon = {
+                            'type': icon_type,
+                            icon_type: page_icon[icon_type]
+                        }
                 else:
                     icon = None
                 parent = database_result['parent']