Update app/materials_library.py

app/materials_library.py

@@ -1,5 +1,5 @@
 """
-BuildSustain - Material Library Module (Final Fix)
+BuildSustain - Material Library Module
 
 This module handles the material library functionality of the BuildSustain application,
 allowing users to manage building materials and fenestrations (windows, doors, skylights).
@@ -359,62 +359,41 @@ def display_materials_page():
     Display the material library page.
     This is the main function called by main.py when the Material Library page is selected.
     """
-    # Prevent multiple renders by checking if we're already processing
-    if "materials_page_rendering" in st.session_state and st.session_state.materials_page_rendering:
-        return
+    # Initialize session state flags
+    if "material_saved" not in st.session_state:
+        st.session_state.material_saved = False
+    if "fenestration_saved" not in st.session_state:
+        st.session_state.fenestration_saved = False
+
+    st.title("Material Library")
     
-    # Set rendering flag
-    st.session_state.materials_page_rendering = True
+    # Display help information in an expandable section
+    with st.expander("Help & Information"):
+        display_materials_help()
     
-    try:
-        # Initialize session state flags only once
-        if "material_saved" not in st.session_state:
-            st.session_state.material_saved = False
-        if "fenestration_saved" not in st.session_state:
-            st.session_state.fenestration_saved = False
-
-        st.title("Material Library")
-        
-        # Display help information in an expandable section
-        with st.expander("Help & Information"):
-            display_materials_help()
-        
-        # Create tabs for materials and fenestrations
-        tab1, tab2 = st.tabs(["Materials", "Fenestrations"])
-        
-        # Materials tab
-        with tab1:
-            display_materials_tab()
-        
-        # Fenestrations tab
-        with tab2:
-            display_fenestrations_tab()
-        
-        # Navigation buttons
-        col1, col2 = st.columns(2)
-        
-        with col1:
-            if st.button("Back to Climate Data", key="back_to_climate"):
-                st.session_state.current_page = "Climate Data"
-                st.session_state.materials_page_rendering = False
-                st.rerun()
-        
-        with col2:
-            if st.button("Continue to Construction", key="continue_to_construction"):
-                st.session_state.current_page = "Construction"
-                st.session_state.materials_page_rendering = False
-                st.rerun()
-        
-        # Handle material/fenestration saved flags - trigger rerun only once
-        if st.session_state.material_saved or st.session_state.fenestration_saved:
-            st.session_state.material_saved = False
-            st.session_state.fenestration_saved = False
-            st.session_state.materials_page_rendering = False
+    # Create tabs for materials and fenestrations
+    tab1, tab2 = st.tabs(["Materials", "Fenestrations"])
+    
+    # Materials tab
+    with tab1:
+        display_materials_tab()
+    
+    # Fenestrations tab
+    with tab2:
+        display_fenestrations_tab()
+    
+    # Navigation buttons
+    col1, col2 = st.columns(2)
+    
+    with col1:
+        if st.button("Back to Climate Data", key="back_to_climate"):
+            st.session_state.current_page = "Climate Data"
+            st.rerun()
+    
+    with col2:
+        if st.button("Continue to Construction", key="continue_to_construction"):
+            st.session_state.current_page = "Construction"
             st.rerun()
-            
-    finally:
-        # Always clear the rendering flag
-        st.session_state.materials_page_rendering = False
 
 def display_materials_tab():
     """Display the materials tab content."""
@@ -489,7 +468,6 @@ def display_materials_tab():
                         st.session_state.project_data["materials"]["project"][new_name] = material.copy()
                         st.success(f"Material '{new_name}' copied to project.")
                         logger.info(f"Copied library material '{name}' as '{new_name}' to project")
-                        st.session_state.materials_page_rendering = False
                         st.rerun()
             else:
                 st.info("No materials found in the selected category.")
@@ -555,7 +533,6 @@ def display_materials_tab():
                             del st.session_state.project_data["materials"]["project"][name]
                             st.success(f"Material '{name}' deleted from project.")
                             logger.info(f"Deleted material '{name}' from project")
-                            st.session_state.materials_page_rendering = False
                             st.rerun()
             else:
                 st.info("No project materials in the selected category.")
@@ -662,7 +639,6 @@ def display_fenestrations_tab():
                         st.session_state.project_data["fenestrations"]["project"][new_name] = fenestration.copy()
                         st.success(f"Fenestration '{new_name}' copied to project.")
                         logger.info(f"Copied library fenestration '{name}' as '{new_name}' to project")
-                        st.session_state.materials_page_rendering = False
                         st.rerun()
             else:
                 st.info("No fenestrations found in the selected type.")
@@ -722,7 +698,6 @@ def display_fenestrations_tab():
                             del st.session_state.project_data["fenestrations"]["project"][name]
                             st.success(f"Fenestration '{name}' deleted from project.")
                             logger.info(f"Deleted fenestration '{name}' from project")
-                            st.session_state.materials_page_rendering = False
                             st.rerun()
             else:
                 st.info("No project fenestrations in the selected type.")
@@ -816,372 +791,356 @@ def initialize_fenestrations():
 
 def display_material_editor():
     """Display the material editor form."""
-    # Prevent form from being rendered multiple times
-    if "material_form_rendered" in st.session_state and st.session_state.material_form_rendered:
-        return
-    
-    st.session_state.material_form_rendered = True
-    
-    try:
-        with st.form("material_editor_form"):
-            editor_state = st.session_state.material_editor
-            is_library = editor_state.get("is_library", False)
-            
-            # Material name
-            name = st.text_input(
-                "Material Name",
-                value=editor_state["name"],
-                help="Enter a unique name for the material.",
+    with st.form("material_editor_form"):
+        editor_state = st.session_state.material_editor
+        is_library = editor_state.get("is_library", False)
+        
+        # Material name
+        name = st.text_input(
+            "Material Name",
+            value=editor_state["name"],
+            help="Enter a unique name for the material.",
+            disabled=is_library
+        )
+        
+        # Create two columns for layout
+        col1, col2 = st.columns(2)
+        
+        with col1:
+            # Category
+            category = st.selectbox(
+                "Category",
+                MATERIAL_CATEGORIES,
+                index=MATERIAL_CATEGORIES.index(editor_state["category"]) if editor_state["category"] in MATERIAL_CATEGORIES else 0,
+                help="Select the material category.",
                 disabled=is_library
             )
             
-            # Create two columns for layout
-            col1, col2 = st.columns(2)
-            
-            with col1:
-                # Category
-                category = st.selectbox(
-                    "Category",
-                    MATERIAL_CATEGORIES,
-                    index=MATERIAL_CATEGORIES.index(editor_state["category"]) if editor_state["category"] in MATERIAL_CATEGORIES else 0,
-                    help="Select the material category.",
-                    disabled=is_library
-                )
-                
-                # Thermal conductivity
-                thermal_conductivity = st.number_input(
-                    "Thermal Conductivity (W/m·K)",
-                    min_value=0.001,
-                    max_value=1000.0,
-                    value=float(editor_state["thermal_conductivity"]),
-                    format="%.3f",
-                    help="Thermal conductivity in W/m·K. Lower values indicate better insulation.",
-                    disabled=is_library
-                )
-                
-                # Density
-                density = st.number_input(
-                    "Density (kg/m³)",
-                    min_value=1.0,
-                    max_value=20000.0,
-                    value=float(editor_state["density"]),
-                    format="%.1f",
-                    help="Material density in kg/m³.",
-                    disabled=is_library
-                )
-            
-            with col2:
-                # Specific heat
-                specific_heat = st.number_input(
-                    "Specific Heat (J/kg·K)",
-                    min_value=100.0,
-                    max_value=10000.0,
-                    value=float(editor_state["specific_heat"]),
-                    format="%.1f",
-                    help="Specific heat capacity in J/kg·K. Higher values indicate better thermal mass.",
-                    disabled=is_library
-                )
-                
-                # Default thickness
-                default_thickness = st.number_input(
-                    "Thickness (m)",
-                    min_value=0.001,
-                    max_value=0.5,
-                    value=float(editor_state["default_thickness"]),
-                    format="%.3f",
-                    help="Thickness for this material in meters.",
-                    disabled=is_library
-                )
-                
-                # Absorptivity
-                absorptivity = st.number_input(
-                    "Absorptivity",
-                    min_value=0.0,
-                    max_value=1.0,
-                    value=float(editor_state["absorptivity"]),
-                    format="%.2f",
-                    help="Solar radiation absorbed (0-1).",
-                    disabled=is_library
-                )
-            
-            # Other properties
-            col1, col2 = st.columns(2)
-            
-            with col1:
-                # Emissivity
-                emissivity = st.number_input(
-                    "Emissivity",
-                    min_value=0.0,
-                    max_value=1.0,
-                    value=float(editor_state["emissivity"]),
-                    format="%.2f",
-                    help="Ratio of radiation emitted (0-1).",
-                    disabled=is_library
-                )
-            
-            with col2:
-                # Colour
-                colour = st.selectbox(
-                    "Colour Category",
-                    COLOUR_CATEGORIES,
-                    index=COLOUR_CATEGORIES.index(editor_state["colour"]) if editor_state["colour"] in COLOUR_CATEGORIES else 0,
-                    help="Colour category affecting absorptivity.",
-                    disabled=is_library
-                )
-            
-            # Additional properties
-            st.subheader("Additional Properties")
-            col1, col2 = st.columns(2)
-            
-            with col1:
-                # Embodied carbon
-                embodied_carbon = st.number_input(
-                    "Embodied Carbon (kg CO₂e/m³)",
-                    min_value=0.0,
-                    max_value=10000.0,
-                    value=float(editor_state["embodied_carbon"]),
-                    format="%.1f",
-                    help="Embodied carbon in kg CO₂e per cubic meter.",
-                    disabled=is_library
-                )
-            
-            with col2:
-                # Cost
-                cost = st.number_input(
-                    "Cost (USD/m³)",
-                    min_value=0.0,
-                    max_value=10000.0,
-                    value=float(editor_state["cost"]),
-                    format="%.1f",
-                    help="Material cost in USD per cubic meter.",
-                    disabled=is_library
-                )
+            # Thermal conductivity
+            thermal_conductivity = st.number_input(
+                "Thermal Conductivity (W/m·K)",
+                min_value=0.001,
+                max_value=1000.0,
+                value=float(editor_state["thermal_conductivity"]),
+                format="%.3f",
+                help="Thermal conductivity in W/m·K. Lower values indicate better insulation.",
+                disabled=is_library
+            )
             
-            # Form submission buttons
-            col1, col2 = st.columns(2)
+            # Density
+            density = st.number_input(
+                "Density (kg/m³)",
+                min_value=1.0,
+                max_value=20000.0,
+                value=float(editor_state["density"]),
+                format="%.1f",
+                help="Material density in kg/m³.",
+                disabled=is_library
+            )
+        
+        with col2:
+            # Specific heat
+            specific_heat = st.number_input(
+                "Specific Heat (J/kg·K)",
+                min_value=100.0,
+                max_value=10000.0,
+                value=float(editor_state["specific_heat"]),
+                format="%.1f",
+                help="Specific heat capacity in J/kg·K. Higher values indicate better thermal mass.",
+                disabled=is_library
+            )
             
-            with col1:
-                submit_button = st.form_submit_button("Save Material", disabled=is_library)
+            # Default thickness
+            default_thickness = st.number_input(
+                "Thickness (m)",
+                min_value=0.001,
+                max_value=0.5,
+                value=float(editor_state["default_thickness"]),
+                format="%.3f",
+                help="Thickness for this material in meters.",
+                disabled=is_library
+            )
             
-            with col2:
-                clear_button = st.form_submit_button("Clear Form")
+            # Absorptivity
+            absorptivity = st.number_input(
+                "Absorptivity",
+                min_value=0.0,
+                max_value=1.0,
+                value=float(editor_state["absorptivity"]),
+                format="%.2f",
+                help="Solar radiation absorbed (0-1).",
+                disabled=is_library
+            )
+        
+        # Other properties
+        col1, col2 = st.columns(2)
+        
+        with col1:
+            # Emissivity
+            emissivity = st.number_input(
+                "Emissivity",
+                min_value=0.0,
+                max_value=1.0,
+                value=float(editor_state["emissivity"]),
+                format="%.2f",
+                help="Ratio of radiation emitted (0-1).",
+                disabled=is_library
+            )
+        
+        with col2:
+            # Colour
+            colour = st.selectbox(
+                "Colour Category",
+                COLOUR_CATEGORIES,
+                index=COLOUR_CATEGORIES.index(editor_state["colour"]) if editor_state["colour"] in COLOUR_CATEGORIES else 0,
+                help="Colour category affecting absorptivity.",
+                disabled=is_library
+            )
+        
+        # Additional properties
+        st.subheader("Additional Properties")
+        col1, col2 = st.columns(2)
+        
+        with col1:
+            # Embodied carbon
+            embodied_carbon = st.number_input(
+                "Embodied Carbon (kg CO₂e/m³)",
+                min_value=0.0,
+                max_value=10000.0,
+                value=float(editor_state["embodied_carbon"]),
+                format="%.1f",
+                help="Embodied carbon in kg CO₂e per cubic meter.",
+                disabled=is_library
+            )
+        
+        with col2:
+            # Cost
+            cost = st.number_input(
+                "Cost (USD/m³)",
+                min_value=0.0,
+                max_value=10000.0,
+                value=float(editor_state["cost"]),
+                format="%.1f",
+                help="Material cost in USD per cubic meter.",
+                disabled=is_library
+            )
+        
+        # Form submission buttons
+        col1, col2 = st.columns(2)
+        
+        with col1:
+            submit_button = st.form_submit_button("Save Material", disabled=is_library)
+        
+        with col2:
+            clear_button = st.form_submit_button("Clear Form")
+        
+        # Handle form submission
+        if submit_button and not is_library:
+            # Validate inputs
+            validation_errors = validate_material(
+                name, category, thermal_conductivity, density, specific_heat,
+                default_thickness, embodied_carbon, cost,
+                editor_state["edit_mode"], editor_state["original_name"],
+                absorptivity, emissivity, colour
+            )
             
-            # Handle form submission
-            if submit_button and not is_library:
-                # Validate inputs
-                validation_errors = validate_material(
-                    name, category, thermal_conductivity, density, specific_heat,
-                    default_thickness, embodied_carbon, cost,
-                    editor_state["edit_mode"], editor_state["original_name"],
-                    absorptivity, emissivity, colour
-                )
+            if validation_errors:
+                for error in validation_errors:
+                    st.error(error)
+            else:
+                # Create material data
+                material_data = {
+                    "category": category,
+                    "thermal_conductivity": thermal_conductivity,
+                    "density": density,
+                    "specific_heat": specific_heat,
+                    "default_thickness": default_thickness,
+                    "embodied_carbon": embodied_carbon,
+                    "cost": cost,
+                    "absorptivity": absorptivity,
+                    "emissivity": emissivity,
+                    "colour": colour
+                }
                 
-                if validation_errors:
-                    for error in validation_errors:
-                        st.error(error)
+                # Handle edit mode
+                if editor_state["edit_mode"]:
+                    original_name = editor_state["original_name"]
+                    if original_name != name:
+                        del st.session_state.project_data["materials"]["project"][original_name]
+                    st.session_state.project_data["materials"]["project"][name] = material_data
+                    st.success(f"Material '{name}' updated successfully.")
+                    logger.info(f"Updated material '{name}' in project")
                 else:
-                    # Create material data
-                    material_data = {
-                        "category": category,
-                        "thermal_conductivity": thermal_conductivity,
-                        "density": density,
-                        "specific_heat": specific_heat,
-                        "default_thickness": default_thickness,
-                        "embodied_carbon": embodied_carbon,
-                        "cost": cost,
-                        "absorptivity": absorptivity,
-                        "emissivity": emissivity,
-                        "colour": colour
-                    }
-                    
-                    # Handle edit mode
-                    if editor_state["edit_mode"]:
-                        original_name = editor_state["original_name"]
-                        if original_name != name:
-                            del st.session_state.project_data["materials"]["project"][original_name]
-                        st.session_state.project_data["materials"]["project"][name] = material_data
-                        st.success(f"Material '{name}' updated successfully.")
-                        logger.info(f"Updated material '{name}' in project")
-                    else:
-                        st.session_state.project_data["materials"]["project"][name] = material_data
-                        st.success(f"Material '{name}' added to your project.")
-                        logger.info(f"Added new material '{name}' to project")
-                    
-                    # Reset editor and flag for rerun
-                    reset_material_editor()
-                    st.session_state.material_saved = True
-            
-            # Handle clear button
-            if clear_button:
-                reset_material_editor()
-                st.session_state.material_saved = True
+                    st.session_state.project_data["materials"]["project"][name] = material_data
+                    st.success(f"Material '{name}' added to your project.")
+                    logger.info(f"Added new material '{name}' to project")
                 
-    finally:
-        st.session_state.material_form_rendered = False
+                # Reset editor and trigger rerun
+                reset_material_editor()
+                logger.info("Triggering rerun after saving material editor")
+                st.rerun()
+        
+        # Handle clear button
+        if clear_button:
+            reset_material_editor()
+            logger.info("Triggering rerun after clearing material editor")
+            st.rerun()
 
 def display_fenestration_editor():
     """Display the fenestration editor form."""
-    # Prevent form from being rendered multiple times
-    if "fenestration_form_rendered" in st.session_state and st.session_state.fenestration_form_rendered:
-        return
-    
-    st.session_state.fenestration_form_rendered = True
-    
-    try:
-        with st.form("fenestration_editor_form"):
-            editor_state = st.session_state.fenestration_editor
-            is_library = editor_state.get("is_library", False)
-            
-            # Fenestration name
-            name = st.text_input(
-                "Fenestration Name",
-                value=editor_state["name"],
-                help="Enter a unique name for the fenestration.",
+    with st.form("fenestration_editor_form"):
+        editor_state = st.session_state.fenestration_editor
+        is_library = editor_state.get("is_library", False)
+        
+        # Fenestration name
+        name = st.text_input(
+            "Fenestration Name",
+            value=editor_state["name"],
+            help="Enter a unique name for the fenestration.",
+            disabled=is_library
+        )
+        
+        # Create two columns for layout
+        col1, col2 = st.columns(2)
+        
+        with col1:
+            # Type
+            fenestration_type = st.selectbox(
+                "Type",
+                FENESTRATION_TYPES,
+                index=FENESTRATION_TYPES.index(editor_state["type"]) if editor_state["type"] in FENESTRATION_TYPES else 0,
+                help="Select the fenestration type.",
                 disabled=is_library
             )
             
-            # Create two columns for layout
-            col1, col2 = st.columns(2)
-            
-            with col1:
-                # Type
-                fenestration_type = st.selectbox(
-                    "Type",
-                    FENESTRATION_TYPES,
-                    index=FENESTRATION_TYPES.index(editor_state["type"]) if editor_state["type"] in FENESTRATION_TYPES else 0,
-                    help="Select the fenestration type.",
-                    disabled=is_library
-                )
-                
-                # U-value
-                u_value = st.number_input(
-                    "U-Value (W/m²·K)",
-                    min_value=0.1,
-                    max_value=10.0,
-                    value=float(editor_state["u_value"]),
-                    format="%.2f",
-                    help="U-value in W/m²·K. Lower values indicate better insulation.",
-                    disabled=is_library
-                )
-                
-                # SHGC
-                shgc = st.number_input(
-                    "Solar Heat Gain Coefficient (SHGC)",
-                    min_value=0.0,
-                    max_value=1.0,
-                    value=float(editor_state["shgc"]),
-                    format="%.2f",
-                    help="Solar Heat Gain Coefficient (0-1). Lower values indicate less solar heat transmission.",
-                    disabled=is_library
-                )
-            
-            with col2:
-                # Visible transmittance
-                visible_transmittance = st.number_input(
-                    "Visible Transmittance",
-                    min_value=0.0,
-                    max_value=1.0,
-                    value=float(editor_state["visible_transmittance"]),
-                    format="%.2f",
-                    help="Visible Transmittance (0-1). Higher values indicate more visible light transmission.",
-                    disabled=is_library
-                )
-                
-                # Thickness
-                thickness = st.number_input(
-                    "Thickness (m)",
-                    min_value=0.001,
-                    max_value=0.1,
-                    value=float(editor_state["thickness"]),
-                    format="%.3f",
-                    help="Thickness in meters.",
-                    disabled=is_library
-                )
-            
-            # Additional properties
-            st.subheader("Additional Properties")
-            col1, col2 = st.columns(2)
-            
-            with col1:
-                # Embodied carbon
-                embodied_carbon = st.number_input(
-                    "Embodied Carbon (kg CO₂e/m²)",
-                    min_value=0.0,
-                    max_value=5000.0,
-                    value=float(editor_state["embodied_carbon"]),
-                    format="%.1f",
-                    help="Embodied carbon in kg CO₂e per square meter.",
-                    disabled=is_library
-                )
-            
-            with col2:
-                # Cost
-                cost = st.number_input(
-                    "Cost (USD/m²)",
-                    min_value=0.0,
-                    max_value=5000.0,
-                    value=float(editor_state["cost"]),
-                    format="%.1f",
-                    help="Fenestration cost in USD per square meter.",
-                    disabled=is_library
-                )
-            
-            # Form submission buttons
-            col1, col2 = st.columns(2)
+            # U-value
+            u_value = st.number_input(
+                "U-Value (W/m²·K)",
+                min_value=0.1,
+                max_value=10.0,
+                value=float(editor_state["u_value"]),
+                format="%.2f",
+                help="U-value in W/m²·K. Lower values indicate better insulation.",
+                disabled=is_library
+            )
             
-            with col1:
-                submit_button = st.form_submit_button("Save Fenestration", disabled=is_library)
+            # SHGC
+            shgc = st.number_input(
+                "Solar Heat Gain Coefficient (SHGC)",
+                min_value=0.0,
+                max_value=1.0,
+                value=float(editor_state["shgc"]),
+                format="%.2f",
+                help="Solar Heat Gain Coefficient (0-1). Lower values indicate less solar heat transmission.",
+                disabled=is_library
+            )
+        
+        with col2:
+            # Visible transmittance
+            visible_transmittance = st.number_input(
+                "Visible Transmittance",
+                min_value=0.0,
+                max_value=1.0,
+                value=float(editor_state["visible_transmittance"]),
+                format="%.2f",
+                help="Visible Transmittance (0-1). Higher values indicate more visible light transmission.",
+                disabled=is_library
+            )
             
-            with col2:
-                clear_button = st.form_submit_button("Clear Form")
+            # Thickness
+            thickness = st.number_input(
+                "Thickness (m)",
+                min_value=0.001,
+                max_value=0.1,
+                value=float(editor_state["thickness"]),
+                format="%.3f",
+                help="Thickness in meters.",
+                disabled=is_library
+            )
+        
+        # Additional properties
+        st.subheader("Additional Properties")
+        col1, col2 = st.columns(2)
+        
+        with col1:
+            # Embodied carbon
+            embodied_carbon = st.number_input(
+                "Embodied Carbon (kg CO₂e/m²)",
+                min_value=0.0,
+                max_value=5000.0,
+                value=float(editor_state["embodied_carbon"]),
+                format="%.1f",
+                help="Embodied carbon in kg CO₂e per square meter.",
+                disabled=is_library
+            )
+        
+        with col2:
+            # Cost
+            cost = st.number_input(
+                "Cost (USD/m²)",
+                min_value=0.0,
+                max_value=5000.0,
+                value=float(editor_state["cost"]),
+                format="%.1f",
+                help="Fenestration cost in USD per square meter.",
+                disabled=is_library
+            )
+        
+        # Form submission buttons
+        col1, col2 = st.columns(2)
+        
+        with col1:
+            submit_button = st.form_submit_button("Save Fenestration", disabled=is_library)
+        
+        with col2:
+            clear_button = st.form_submit_button("Clear Form")
+        
+        # Handle form submission
+        if submit_button and not is_library:
+            # Validate inputs
+            validation_errors = validate_fenestration(
+                name, fenestration_type, u_value, shgc, visible_transmittance, thickness,
+                embodied_carbon, cost, editor_state["edit_mode"], editor_state["original_name"]
+            )
             
-            # Handle form submission
-            if submit_button and not is_library:
-                # Validate inputs
-                validation_errors = validate_fenestration(
-                    name, fenestration_type, u_value, shgc, visible_transmittance, thickness,
-                    embodied_carbon, cost, editor_state["edit_mode"], editor_state["original_name"]
-                )
+            if validation_errors:
+                for error in validation_errors:
+                    st.error(error)
+            else:
+                # Create fenestration data
+                fenestration_data = {
+                    "type": fenestration_type,
+                    "u_value": u_value,
+                    "shgc": shgc,
+                    "visible_transmittance": visible_transmittance,
+                    "thickness": thickness,
+                    "embodied_carbon": embodied_carbon,
+                    "cost": cost
+                }
                 
-                if validation_errors:
-                    for error in validation_errors:
-                        st.error(error)
+                # Handle edit mode
+                if editor_state["edit_mode"]:
+                    original_name = editor_state["original_name"]
+                    if original_name != name:
+                        del st.session_state.project_data["fenestrations"]["project"][original_name]
+                    st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
+                    st.success(f"Fenestration '{name}' updated successfully.")
+                    logger.info(f"Updated fenestration '{name}' in project")
                 else:
-                    # Create fenestration data
-                    fenestration_data = {
-                        "type": fenestration_type,
-                        "u_value": u_value,
-                        "shgc": shgc,
-                        "visible_transmittance": visible_transmittance,
-                        "thickness": thickness,
-                        "embodied_carbon": embodied_carbon,
-                        "cost": cost
-                    }
-                    
-                    # Handle edit mode
-                    if editor_state["edit_mode"]:
-                        original_name = editor_state["original_name"]
-                        if original_name != name:
-                            del st.session_state.project_data["fenestrations"]["project"][original_name]
-                        st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
-                        st.success(f"Fenestration '{name}' updated successfully.")
-                        logger.info(f"Updated fenestration '{name}' in project")
-                    else:
-                        st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
-                        st.success(f"Fenestration '{name}' added to your project.")
-                        logger.info(f"Added new fenestration '{name}' to project")
-                    
-                    # Reset editor and flag for rerun
-                    reset_fenestration_editor()
-                    st.session_state.fenestration_saved = True
-            
-            # Handle clear button
-            if clear_button:
-                reset_fenestration_editor()
-                st.session_state.fenestration_saved = True
+                    st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
+                    st.success(f"Fenestration '{name}' added to your project.")
+                    logger.info(f"Added new fenestration '{name}' to project")
                 
-    finally:
-        st.session_state.fenestration_form_rendered = False
+                # Reset editor and trigger rerun
+                reset_fenestration_editor()
+                logger.info("Triggering rerun after saving fenestration editor")
+                st.rerun()
+        
+        # Handle clear button
+        if clear_button:
+            reset_fenestration_editor()
+            logger.info("Triggering rerun after clearing fenestration editor")
+            st.rerun()
 
 def validate_material(
     name: str, category: str, thermal_conductivity: float, density: float,