Fixed basic search and advanced search switching

src/callbacks.py

@@ -210,7 +210,9 @@ def register_callbacks(app, search_service: SearchService):
          Output("current-search-params", "data")],
         [Input("search-button", "n_clicks"),
          Input("search-input", "n_submit"),
-         Input("search-button-advanced", "n_clicks")],
+         Input("search-button-advanced", "n_clicks"),
+         Input("search-input-advanced", "n_submit"),
+         Input({"type": "vector-text", "index": dash.dependencies.ALL}, "n_submit")],
         [State("search-input", "value"),
          State("search-input-advanced", "value"),
          State("rmag-slider", "value"),
@@ -226,14 +228,22 @@ def register_callbacks(app, search_service: SearchService):
          State({"type": "vector-operation", "index": dash.dependencies.ALL}, "value")],
         prevent_initial_call=True
     )
-    def perform_search(n_clicks_basic, n_submit, n_clicks_advanced, query_basic, query_advanced,
+    def perform_search(n_clicks_basic, n_submit_basic, n_clicks_advanced, n_submit_advanced, n_submit_vector_texts,
+                      query_basic, query_advanced,
                       rmag_range, advanced_style, main_operation, main_query_type,
                       main_ra, main_dec,
                       additional_query_types, additional_text_values, additional_ra_values,
                       additional_dec_values, additional_operations):
         """Perform text search or advanced search based on mode."""
-        # Check if advanced mode is active
-        is_advanced_mode = advanced_style.get("display") == "block"
+        # Check which input triggered the callback
+        ctx = callback_context
+        if not ctx.triggered:
+            return dash.no_update, dash.no_update, dash.no_update, dash.no_update, dash.no_update, dash.no_update
+
+        trigger_id = ctx.triggered[0]["prop_id"].split(".")[0]
+
+        # Determine if advanced mode based on which button/input triggered the search
+        is_advanced_mode = trigger_id in ["search-button-advanced", "search-input-advanced"] or advanced_style.get("display") == "block"
 
         # If advanced mode is active, perform advanced search
         if is_advanced_mode:
@@ -882,7 +892,8 @@ def register_callbacks(app, search_service: SearchService):
          Output("basic-search-bar", "style", allow_duplicate=True),
          Output("vector-arrow", "className", allow_duplicate=True),
          Output("url-search-trigger", "data", allow_duplicate=True),
-         Output("pending-expand-galaxy", "data")],
+         Output("pending-expand-galaxy", "data"),
+         Output("search-input", "value", allow_duplicate=True)],
         Input("url", "search"),
         prevent_initial_call=True
     )
@@ -907,10 +918,11 @@ def register_callbacks(app, search_service: SearchService):
                 dash.no_update,  # basic-search-bar style
                 dash.no_update,  # vector-arrow
                 dash.no_update,  # url-search-trigger
-                None  # pending-expand-galaxy
+                None,  # pending-expand-galaxy
+                dash.no_update  # search-input
             )
 
-        # Always restore to advanced mode
+        # Parse state
         text_queries = state.get('text_queries', [])
         text_weights = state.get('text_weights', [])
         image_queries = state.get('image_queries', [])
@@ -919,7 +931,33 @@ def register_callbacks(app, search_service: SearchService):
         rmag_max = state.get('rmag_max', 20.0)
         expand_galaxy = state.get('expand_galaxy')
 
-        # Determine main query (first query - text or image)
+        # Determine if this is a basic search (single text query with weight +1) or advanced search
+        is_basic_search = (
+            len(text_queries) == 1 and
+            len(text_weights) == 1 and
+            text_weights[0] == 1.0 and
+            len(image_queries) == 0
+        )
+
+        if is_basic_search:
+            # For basic search, just populate the basic search input and stay in basic mode
+            return (
+                dash.no_update,  # search-input-advanced
+                dash.no_update,  # main-vector-operation
+                dash.no_update,  # main-query-type
+                dash.no_update,  # main-vector-ra
+                dash.no_update,  # main-vector-dec
+                dash.no_update,  # vector-inputs
+                [rmag_min, rmag_max],  # rmag-slider
+                {"display": "none"},  # advanced-search-interface (hide)
+                {"display": "block"},  # basic-search-bar (show)
+                "fas fa-chevron-down me-2",  # vector-arrow (down arrow for basic mode)
+                1,  # url-search-trigger (trigger search)
+                expand_galaxy,  # pending-expand-galaxy
+                text_queries[0] if text_queries else ""  # search-input (populate basic search)
+            )
+
+        # For advanced search, populate all the advanced fields
         main_text = ""
         main_operation = "+"
         main_query_type = "text"
@@ -980,20 +1018,30 @@ def register_callbacks(app, search_service: SearchService):
             {"display": "none"},  # basic-search-bar (hide)
             "fas fa-chevron-up me-2",  # vector-arrow (up arrow for advanced mode)
             1,  # url-search-trigger (trigger search)
-            expand_galaxy  # pending-expand-galaxy
+            expand_galaxy,  # pending-expand-galaxy
+            dash.no_update  # search-input (don't update in advanced mode)
         )
 
     @app.callback(
-        Output("search-button-advanced", "n_clicks", allow_duplicate=True),
+        [Output("search-button", "n_clicks", allow_duplicate=True),
+         Output("search-button-advanced", "n_clicks", allow_duplicate=True)],
         Input("url-search-trigger", "data"),
-        State("search-button-advanced", "n_clicks"),
+        [State("search-button", "n_clicks"),
+         State("search-button-advanced", "n_clicks"),
+         State("basic-search-bar", "style")],
         prevent_initial_call=True
     )
-    def trigger_search_from_url(trigger, current_clicks):
-        """Click search button after URL state is restored."""
+    def trigger_search_from_url(trigger, current_basic_clicks, current_advanced_clicks, basic_style):
+        """Click appropriate search button after URL state is restored."""
         if trigger:
-            return (current_clicks or 0) + 1
-        return dash.no_update
+            # Determine which mode we're in based on which search bar is visible
+            is_basic_mode = basic_style.get("display") == "block"
+
+            if is_basic_mode:
+                return (current_basic_clicks or 0) + 1, dash.no_update
+            else:
+                return dash.no_update, (current_advanced_clicks or 0) + 1
+        return dash.no_update, dash.no_update
 
     @app.callback(
         Output("url", "search", allow_duplicate=True),

src/components.py

@@ -627,10 +627,13 @@ def create_search_container():
                         dbc.Col([
                             # Text input (shown when type is "text")
                             html.Div([
-                                dbc.Input(
+                                dcc.Input(
                                     id="search-input-advanced",
                                     placeholder="Enter text query...",
-                                    type="text"
+                                    type="text",
+                                    value="",
+                                    n_submit=0,
+                                    className="form-control"
                                 )
                             ], id="main-text-input-container", style={"display": "block"}),
                             # Image inputs (shown when type is "image")
@@ -761,11 +764,13 @@ def create_vector_input_row(index: int, query_type: str = "text", ra: float = No
         dbc.Col([
             # Text input (shown when type is "text")
             html.Div([
-                dbc.Input(
+                dcc.Input(
                     id={"type": "vector-text", "index": index},
                     placeholder="Enter text query...",
                     type="text",
-                    value=text_value
+                    value=text_value,
+                    n_submit=0,
+                    className="form-control"
                 )
             ], id={"type": "text-input-container", "index": index}, style=text_display),
             # Image inputs (shown when type is "image")