allow overflow for monaco tooltips, allow nulls for backgrounds/wdigets json schema

Author: sawka

cmd/generateschema/main-generateschema.go

@@ -105,8 +105,26 @@ type WidgetsMetaSchemaHints struct {
 	TermDurable             *bool    `json:"term:durable,omitempty"`
 }
 
-func generateSchema(template any, dir string) error {
+// allowNullValues wraps the top-level additionalProperties of a map schema with
+// anyOf: [originalSchema, {type: "null"}] so that setting a key to null is valid
+// (e.g. "bg@foo": null to remove a default entry).
+func allowNullValues(schema *jsonschema.Schema) {
+	if schema.AdditionalProperties != nil && schema.AdditionalProperties != jsonschema.TrueSchema && schema.AdditionalProperties != jsonschema.FalseSchema {
+		original := schema.AdditionalProperties
+		schema.AdditionalProperties = &jsonschema.Schema{
+			AnyOf: []*jsonschema.Schema{
+				original,
+				{Type: "null"},
+			},
+		}
+	}
+}
+
+func generateSchema(template any, dir string, allowNull bool) error {
 	settingsSchema := jsonschema.Reflect(template)
+	if allowNull {
+		allowNullValues(settingsSchema)
+	}
 
 	jsonSettingsSchema, err := json.MarshalIndent(settingsSchema, "", "  ")
 	if err != nil {
@@ -147,6 +165,7 @@ func generateWidgetsSchema(dir string) error {
 
 	widgetsTemplate := make(map[string]wconfig.WidgetConfigType)
 	widgetsSchema := r.Reflect(&widgetsTemplate)
+	allowNullValues(widgetsSchema)
 
 	jsonWidgetsSchema, err := json.MarshalIndent(widgetsSchema, "", "  ")
 	if err != nil {
@@ -163,19 +182,19 @@ func generateWidgetsSchema(dir string) error {
 }
 
 func main() {
-	err := generateSchema(&wconfig.SettingsType{}, WaveSchemaSettingsFileName)
+	err := generateSchema(&wconfig.SettingsType{}, WaveSchemaSettingsFileName, false)
 	if err != nil {
 		log.Fatalf("settings schema error: %v", err)
 	}
 
 	connectionTemplate := make(map[string]wconfig.ConnKeywords)
-	err = generateSchema(&connectionTemplate, WaveSchemaConnectionsFileName)
+	err = generateSchema(&connectionTemplate, WaveSchemaConnectionsFileName, false)
 	if err != nil {
 		log.Fatalf("connections schema error: %v", err)
 	}
 
 	aiPresetsTemplate := make(map[string]wconfig.AiSettingsType)
-	err = generateSchema(&aiPresetsTemplate, WaveSchemaAiPresetsFileName)
+	err = generateSchema(&aiPresetsTemplate, WaveSchemaAiPresetsFileName, false)
 	if err != nil {
 		log.Fatalf("ai presets schema error: %v", err)
 	}
@@ -186,13 +205,13 @@ func main() {
 	}
 
 	backgroundsTemplate := make(map[string]wconfig.BackgroundConfigType)
-	err = generateSchema(&backgroundsTemplate, WaveSchemaBackgroundsFileName)
+	err = generateSchema(&backgroundsTemplate, WaveSchemaBackgroundsFileName, true)
 	if err != nil {
 		log.Fatalf("backgrounds schema error: %v", err)
 	}
 
 	waveAITemplate := make(map[string]wconfig.AIModeConfigType)
-	err = generateSchema(&waveAITemplate, WaveSchemaWaveAIFileName)
+	err = generateSchema(&waveAITemplate, WaveSchemaWaveAIFileName, false)
 	if err != nil {
 		log.Fatalf("waveai schema error: %v", err)
 	}

frontend/app/view/codeeditor/codeeditor.tsx

@@ -93,7 +93,7 @@ export function CodeEditor({ blockId, text, language, fileName, readonly, onChan
     }, [minimapEnabled, stickyScrollEnabled, wordWrap, fontSize, readonly]);
 
     return (
-        <div className="flex flex-col w-full h-full overflow-hidden items-center justify-center">
+        <div className="flex flex-col w-full h-full items-center justify-center">
             <div className="flex flex-col h-full w-full" ref={divRef}>
                 <MonacoCodeEditor
                     readonly={readonly}

frontend/app/view/waveconfig/waveconfig.tsx

@@ -276,7 +276,7 @@ const WaveConfigView = memo(({ blockId, model }: ViewComponentProps<WaveConfigVi
                                     </button>
                                 </div>
                             )}
-                            <div className="flex-1 overflow-hidden">
+                            <div className="flex-1 min-h-0">
                                 {isLoading ? (
                                     <div className="flex items-center justify-center h-full text-muted-foreground">
                                         Loading...

schema/backgrounds.json

@@ -40,7 +40,14 @@
     }
   },
   "additionalProperties": {
-    "$ref": "#/$defs/BackgroundConfigType"
+    "anyOf": [
+      {
+        "$ref": "#/$defs/BackgroundConfigType"
+      },
+      {
+        "type": "null"
+      }
+    ]
   },
   "type": "object"
 }

schema/widgets.json

@@ -224,7 +224,14 @@
     }
   },
   "additionalProperties": {
-    "$ref": "#/$defs/WidgetConfigType"
+    "anyOf": [
+      {
+        "$ref": "#/$defs/WidgetConfigType"
+      },
+      {
+        "type": "null"
+      }
+    ]
   },
   "type": "object"
 }