chore(server, web): support infoboxBlock extension type (#936)

reearth · Mar 22, 2024 · 459c94f · 459c94f
1 parent 06f7019
commit 459c94f
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 14 deletions.
diff --git a/server/gql/plugin.graphql b/server/gql/plugin.graphql
@@ -27,6 +27,7 @@ enum PluginExtensionType {
   Story
   StoryPage
   StoryBlock
+  InfoboxBlock
 }
 
 type PluginExtension {

diff --git a/server/internal/adapter/gql/generated.go b/server/internal/adapter/gql/generated.go
diff --git a/server/internal/adapter/gql/gqlmodel/convert_plugin.go b/server/internal/adapter/gql/gqlmodel/convert_plugin.go
@@ -53,6 +53,8 @@ func ToPluginExtensionType(t plugin.ExtensionType) PluginExtensionType {
 		return PluginExtensionTypeVisualizer
 	case plugin.ExtensionTypeInfobox:
 		return PluginExtensionTypeInfobox
+	case plugin.ExtensionTypeInfoboxBlock:
+		return PluginExtensionTypeInfoboxBlock
 	case plugin.ExtensionTypeCluster:
 		return PluginExtensionTypeCluster
 	case plugin.ExtensionTypeStory:

diff --git a/server/internal/adapter/gql/gqlmodel/models_gen.go b/server/internal/adapter/gql/gqlmodel/models_gen.go
diff --git a/server/internal/usecase/interactor/nlslayer.go b/server/internal/usecase/interactor/nlslayer.go
@@ -387,7 +387,7 @@ func (i *NLSLayer) AddNLSInfoboxBlock(ctx context.Context, inp interfaces.AddNLS
 	if err != nil {
 		return nil, nil, err
 	}
-	if extension.Type() != plugin.ExtensionTypeBlock {
+	if extension.Type() != plugin.ExtensionTypeInfoboxBlock {
 		return nil, nil, interfaces.ErrExtensionTypeMustBeBlock
 	}
 	property, err := property.New().NewID().Schema(extension.Schema()).Scene(l.Scene()).Build()

diff --git a/server/pkg/builtin/main.go b/server/pkg/builtin/main.go
@@ -26,6 +26,7 @@ var (
 	PropertySchemaIDVisualizerBetaCesium = property.MustSchemaID("reearth/cesium-beta")
 	PropertySchemaIDInfobox              = property.MustSchemaID("reearth/infobox")
 	PropertySchemaIDBetaInfobox          = property.MustSchemaID("reearth/infobox-beta")
+	PropertySchemaIDInfoboxBlock         = property.MustSchemaID("reearth/infoboxBlock")
 	PropertySchemaIDStory                = property.MustSchemaID("reearth/story")
 	PropertySchemaIDStoryPage            = property.MustSchemaID("reearth/storyPage")
 	PropertySchemaIDStoryBlock           = property.MustSchemaID("reearth/storyBlock")

diff --git a/server/pkg/builtin/manifest.yml b/server/pkg/builtin/manifest.yml
@@ -2631,7 +2631,7 @@ extensions:
                 value: true
   - id: textInfoboxBetaBlock
     name: Text
-    type: block
+    type: infoboxBlock
     description: Infobox Text Block
     schema:
       groups:
@@ -2653,7 +2653,7 @@ extensions:
               ui: multiline
   - id: imageInfoboxBetaBlock
     name: Image
-    type: block
+    type: infoboxBlock
     description: Infobox Image Block
     schema:
       groups:
@@ -2673,7 +2673,7 @@ extensions:
               type: string
               title: Image
   - id: propertyInfoboxBetaBlock
-    type: block
+    type: infoboxBlock
     name: Property List Block
     description: Infobox Property List Block
     schema:

diff --git a/server/pkg/plugin/extension.go b/server/pkg/plugin/extension.go
@@ -16,6 +16,7 @@ var (
 	ExtensionTypeBlock           ExtensionType = "block"
 	ExtensionTypeVisualizer      ExtensionType = "visualizer"
 	ExtensionTypeInfobox         ExtensionType = "infobox"
+	ExtensionTypeInfoboxBlock    ExtensionType = "infoboxBlock"
 	ExtensionTypeCluster         ExtensionType = "cluster"
 
 	ExtensionTypeStory      ExtensionType = "story"

diff --git a/server/pkg/plugin/manifest/convert.go b/server/pkg/plugin/manifest/convert.go
@@ -132,6 +132,8 @@ func (i Extension) extension(pluginID plugin.ID, sys bool, te *TranslatedExtensi
 		typ = plugin.ExtensionTypeVisualizer
 	case "infobox":
 		typ = plugin.ExtensionTypeInfobox
+	case "infoboxBlock":
+		typ = plugin.ExtensionTypeInfoboxBlock
 	case "cluster":
 		typ = plugin.ExtensionTypeCluster
 	case "story":

diff --git a/web/src/classic/gql/graphql-client-api.tsx b/web/src/classic/gql/graphql-client-api.tsx
@@ -1714,6 +1714,7 @@ export enum PluginExtensionType {
   Block = 'BLOCK',
   Cluster = 'Cluster',
   Infobox = 'INFOBOX',
+  InfoboxBlock = 'InfoboxBlock',
   Primitive = 'PRIMITIVE',
   Story = 'Story',
   StoryBlock = 'StoryBlock',

diff --git a/web/src/classic/gql/graphql.schema.json b/web/src/classic/gql/graphql.schema.json
@@ -13397,6 +13397,12 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "InfoboxBlock",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "PRIMITIVE",
             "description": null,

diff --git a/web/src/services/gql/__gen__/graphql.ts b/web/src/services/gql/__gen__/graphql.ts
@@ -1713,6 +1713,7 @@ export enum PluginExtensionType {
   Block = 'BLOCK',
   Cluster = 'Cluster',
   Infobox = 'INFOBOX',
+  InfoboxBlock = 'InfoboxBlock',
   Primitive = 'PRIMITIVE',
   Story = 'Story',
   StoryBlock = 'StoryBlock',