Update page_files/Categorized_Search.py

page_files/Categorized_Search.py

@@ -7,7 +7,15 @@ import streamlit as st
 from PIL import Image
 
 from data_loader import get_all_sections, load_material_data
-
+import streamlit.components.v1 as components
+
+def switch_tab(index):
+    components.html(f"""
+        <script>
+            var tabs = window.parent.document.querySelectorAll('[data-testid="stTabs"] button[role="tab"]');
+            if (tabs.length > {index}) tabs[{index}].click();
+        </script>
+    """, height=0)
 st.markdown(
     """
     <style>
@@ -375,6 +383,12 @@ def toggle_class(material_class: str):
     else:
         st.session_state.active_classes = [material_class]  
     st.session_state.current_page = 0
+    st.session_state.selected_row = None
+    st.session_state["last_synced_abbr"] = None
+    df_key = f"materials_df_0"
+    if df_key in st.session_state:
+        st.session_state[df_key] = {"selection": {"rows": [], "columns": [], "cells": []}}
+    st.session_state["_switch_to_tab"] = 0
 
 
 def visible_page_numbers(current_page: int, total_pages: int):
@@ -607,7 +621,7 @@ with left_col:
             disabled=st.session_state.selected_row is None,
         ):
             st.info("Open the Inspect tab on the right panel.")
-
+            switch_tab(1)
         if st.session_state.selected_row:
             selected_abbr, selected_name = st.session_state.selected_row
             st.markdown(
@@ -649,7 +663,9 @@ with right_col:
         tab_materials, tab_inspect = st.tabs(
             ["All Materials", "Inspect"]
         )
-
+        if st.session_state.get("_switch_to_tab") is not None:
+            switch_tab(st.session_state["_switch_to_tab"])
+            del st.session_state["_switch_to_tab"]
         with tab_materials:
             filter_label = (
                 ", ".join(st.session_state.active_classes)
@@ -678,11 +694,11 @@ with right_col:
 
             if not page_meta.empty:
                 table_df = page_meta.copy()
-                table_df["Select"] = table_df["material_abbreviation"].eq(selected_abbr)
+
                 table_df["Class"] = table_df["_class"].map(class_map)
                 table_df["Actions"] = ""
                 table_df = table_df[
-                    ["Select", "material_name", "material_abbreviation", "Class", "Actions"]
+                    [ "material_name", "material_abbreviation", "Class", "Actions"]
                 ].rename(
                     columns={
                         "material_name": "Material Name",
@@ -693,67 +709,57 @@ with right_col:
                 table_df = pd.DataFrame(
                     columns=["Select", "Material Name", "Abbreviation", "Class", "Actions"]
                 )
+                
+            df_key = f"materials_df_{st.session_state.current_page}"
 
+            if "pending_row_select" in st.session_state:
+                 st.session_state[df_key] = {"selection": {"rows": [st.session_state.pending_row_select], "columns": [], "cells": []}}
+                 del st.session_state["pending_row_select"]
             
-
-            editor_df = st.data_editor(
+            if st.session_state.pop("_clear_df_selection", False):
+                 st.session_state[df_key] = {"selection": {"rows": [], "columns": [], "cells": []}}
+            event = st.dataframe(
                 table_df,
-                key=f"materials_editor_{st.session_state.current_page}",
-                use_container_width=True,
+                key=df_key,
+                width="stretch",
                 hide_index=True,
                 height=400,
-                row_height=46,
-                column_order=["Select", "Material Name", "Abbreviation", "Class", "Actions"],
+                on_select="rerun",
+                selection_mode=["single-cell", "single-row"],
                 column_config={
-                    "Select": st.column_config.CheckboxColumn("", width="small"),
                     "Material Name": st.column_config.TextColumn("MATERIAL NAME", width="large"),
                     "Abbreviation": st.column_config.TextColumn("ABBREVIATION", width="medium"),
                     "Class": st.column_config.TextColumn("CLASS", width="small"),
                     "Actions": st.column_config.TextColumn("ACTIONS", width="small"),
                 },
-                disabled=["Material Name", "Abbreviation", "Class", "Actions"],
             )
+            
 
-            #checked_rows = editor_df[
-            #    editor_df["Select"]
-            #    & editor_df["Abbreviation"].astype(str).str.strip().ne("")
-            #]
-            #if not checked_rows.empty:
-            #    chosen = checked_rows.iloc[0]
-            #    abbr = chosen["Abbreviation"]
-            #    name = chosen["Material Name"]
-            #    if (
-            #        st.session_state.selected_row is None
-            #        or st.session_state.selected_row[0] != abbr
-            #    ):
-            #        st.session_state.selected_row = (abbr, name)
-            #        st.rerun()
-            checked_rows = editor_df[
-                editor_df["Select"]
-                & editor_df["Abbreviation"].astype(str).str.strip().ne("")
-            ]
-
-            if not checked_rows.empty:
-                current_abbr = st.session_state.selected_row[0] if st.session_state.selected_row else None
-    
-    
-                new_rows = checked_rows[checked_rows["Abbreviation"] != current_abbr]
-    
-                if not new_rows.empty:
-                    chosen = new_rows.iloc[0]
-                else:
-                    chosen = checked_rows.iloc[0]
-                
-                abbr = chosen["Abbreviation"]
-                name = chosen["Material Name"]
-                if st.session_state.selected_row is None or st.session_state.selected_row[0] != abbr:
+            selected_rows = event.selection.rows
+            selected_cells = event.selection.cells
+
+            if selected_rows:
+                row_idx = selected_rows[0]
+                chosen = page_meta.iloc[row_idx]
+                abbr = chosen["material_abbreviation"]
+                name = chosen["material_name"]
+                if not (st.session_state.selected_row and st.session_state.selected_row[0] == abbr):
                     st.session_state.selected_row = (abbr, name)
                     st.rerun()
-            else:
-                if st.session_state.selected_row is not None:
+            if selected_cells:
+                row_idx = selected_cells[0][0]
+                chosen = page_meta.iloc[row_idx]
+                abbr = chosen["material_abbreviation"]
+                name = chosen["material_name"]
+                if st.session_state.selected_row and st.session_state.selected_row[0] == abbr:
                     st.session_state.selected_row = None
+                    st.session_state["pending_row_select"] = None
                     st.rerun()
-            
+                elif st.session_state.selected_row is None or st.session_state.selected_row[0] != abbr:
+                    st.session_state.selected_row = (abbr, name)
+                    st.session_state["pending_row_select"] = row_idx
+                    st.rerun()
+
             info_col, nav_col = st.columns([2.4, 2.0])
             with info_col:
                 st.markdown(
@@ -808,14 +814,19 @@ with right_col:
                             if st.button(
                                 label,
                                 key=f"page_btn_{idx}_{label}_{target_page}",
-                                use_container_width=True,
+                                width="stretch",
                                 disabled=disabled,
                                 type="primary" if active else "secondary",
                             ):
+                                old_page = st.session_state.current_page
+
                                 st.session_state.current_page = target_page
+                                st.session_state.selected_row = None
+                                st.session_state["last_synced_abbr"] = None
+                                st.session_state["_clear_df_selection"] = True
+                                
                                 st.rerun()
 
-
         with tab_inspect:
             if not st.session_state.selected_row:
                 st.warning("Select a material in All Materials first.")
@@ -852,8 +863,25 @@ with right_col:
                         .drop_duplicates()
                         .reset_index(drop=True)
                     )
-                    st.dataframe(properties_df, use_container_width=True, hide_index=True, height=240)
-
+                    #st.dataframe(properties_df, use_container_width=True, hide_index=True, height=240)
+                    rows_html = "".join(
+                        f"<tr><td style='padding:8px 12px;font-size:0.82rem;color:#111827;border-bottom:1px solid #f8fafc;'>{row['property_name']}</td>"
+                        f"<td style='padding:8px 12px;font-size:0.82rem;color:#64748b;border-bottom:1px solid #f8fafc;'>{row['section']}</td></tr>"
+                        for _, row in properties_df.iterrows()
+                    )
+                    st.markdown(f"""
+                        <div style='border:1px solid #edf2f7;border-radius:8px;overflow:hidden;max-height:240px;overflow-y:auto;'>
+                            <table style='width:100%;border-collapse:collapse;'>
+                                <thead>
+                                    <tr style='background:#f8fafc;'>
+                                        <th style='padding:8px 12px;font-size:0.64rem;font-weight:700;letter-spacing:1px;color:#94a3b8;text-align:left;border-bottom:1px solid #edf2f7;'>PROPERTY NAME</th>
+                                        <th style='padding:8px 12px;font-size:0.64rem;font-weight:700;letter-spacing:1px;color:#94a3b8;text-align:left;border-bottom:1px solid #edf2f7;'>SECTION</th>
+                                    </tr>
+                                </thead>
+                                <tbody>{rows_html}</tbody>
+                            </table>
+                        </div>
+                    """, unsafe_allow_html=True)
                     property_options = properties_df["property_name"].dropna().tolist()
                     if property_options:
                         if st.session_state.inspect_property not in property_options: