Fix conflicts

Author: alejoe91

spikeinterface_gui/curationview.py

@@ -363,17 +363,19 @@ def _panel_make_layout(self):
         )
         save_button.on_click(save_button_callback)
 
-        self.download_button = pn.widgets.FileDownload(
+        download_button = pn.widgets.FileDownload(
             button_type="primary", filename="curation.json", callback=self._panel_generate_json, height=30
         )
-        buttons_row.append(self.download_button)
 
         restore_button = pn.widgets.Button(name="Restore", button_type="primary", height=30)
         restore_button.on_click(self._panel_restore_units)
 
         remove_merge_button = pn.widgets.Button(name="Unmerge", button_type="primary", height=30)
         remove_merge_button.on_click(self._panel_unmerge)
 
+        remove_split_button = pn.widgets.Button(name="Unsplit", button_type="primary", height=30)
+        remove_split_button.on_click(self._panel_unsplit)
+
         # Create layout
         buttons_save = pn.Row(
             save_button,
@@ -388,7 +390,7 @@ def _panel_make_layout(self):
         buttons_curate = pn.Row(
             restore_button,
             remove_merge_button,
-            remove_split,
+            remove_split_button,
             sizing_mode="stretch_width",
         )
 
@@ -404,7 +406,7 @@ def _panel_make_layout(self):
         # Create main layout with proper sizing
         sections = pn.Row(self.table_delete, self.table_merge, self.table_split, sizing_mode="stretch_width")
         self.layout = pn.Column(
-            self.buttons_save, buttons_curate, sections, shortcuts_component, scroll=True, sizing_mode="stretch_both"
+            save_sections, buttons_curate, sections, shortcuts_component, scroll=True, sizing_mode="stretch_both"
         )
 
     def _panel_refresh(self):
@@ -454,7 +456,7 @@ def _panel_ensure_save_warning_message(self):
         import panel as pn
 
         alert_markdown = pn.pane.Markdown(
-            f"""⚠️⚠️⚠️ Your curation is not saved""",
+            f"""⚠️ Your curation is not saved!""",
             hard_line_break=True,
             styles={"color": "red", "font-size": "16px"},
             name="curation_save_warning",

spikeinterface_gui/tests/test_panel_embedded.py

@@ -12,13 +12,11 @@
 analyzer = load_sorting_analyzer(test_folder / "sorting_analyzer")
 
 # State in the parent app
-curation_result = pn.state.cache.setdefault("curation_result", {})
 status_md = pn.pane.Markdown("No curation submitted yet.")
 
 
 def on_curation_saved(curation_data, title):
     """This runs in the parent app's context — pure Python, no JS."""
-    curation_result["data"] = curation_data
     status_md.object = f"{title}\n\nReceived curation data:\n```\n{curation_data}\n```"
     # You can do anything here: save to DB, trigger a pipeline, etc.