From d277250588bcdc54e866488aede83af518c9c455 Mon Sep 17 00:00:00 2001
From: Fred <fred@fspot.org>
Date: Thu, 14 Mar 2024 15:26:22 +0100
Subject: [PATCH] fix: elasticsearch form schema

---
 CHANGELOG.md                                              | 4 ++++
 .../elasticsearch/elasticsearch_connector.py              | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a62eb42b8..63180787e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixed
+
+- Elasticsearch: force `widget="json"` on `body` so the form is properly filled when updating a data source
+
 ## [6.1.0] 2024-03-13
 
 ### Changed
diff --git a/toucan_connectors/elasticsearch/elasticsearch_connector.py b/toucan_connectors/elasticsearch/elasticsearch_connector.py
index 16b5560d5..c2e4a7983 100644
--- a/toucan_connectors/elasticsearch/elasticsearch_connector.py
+++ b/toucan_connectors/elasticsearch/elasticsearch_connector.py
@@ -1,6 +1,6 @@
 from copy import deepcopy
 from enum import Enum
-from typing import List, Union
+from typing import List
 from urllib.parse import urlparse
 
 import pandas as pd
@@ -112,9 +112,9 @@ class SearchMethod(str, Enum):
 
 
 class ElasticsearchDataSource(ToucanDataSource):
-    search_method: SearchMethod
-    index: str = None
-    body: Union[dict, list]
+    search_method: SearchMethod = Field(SearchMethod.search, title="Search method")
+    index: str | None = Field(None, title="Index")
+    body: dict | list = Field({}, description="Body of elasticsearch query", widget="json")
 
 
 class ElasticsearchConnector(ToucanConnector, data_source_model=ElasticsearchDataSource):