[REFACTOR] tab1: replace apply_auto_disable_logic with refresh_active_methods, remove redundant resource_caps init

tabs/tab1_inputs.py

@@ -7,8 +7,9 @@ from config.config import (resource_groups, resource_order, resource_tooltips,
 from utils.data_utils import (strip_unit_suffix, get_resource_to_group, get_resource_to_unit,
                               get_method_group, standard_resource_names, to_excel_bytes, parse_custom_excel,
                               resource_caps_to_excel_bytes)
-from utils.state_utils import apply_auto_disable_logic, init_custom_resources
+from utils.state_utils import init_custom_resources
 from utils.ui_helpers import show_bar, render_resource_input
+from tabs.tab2_constraints import refresh_active_methods
 
 
 @st.dialog("Add a new resource", width="large")
@@ -739,11 +740,8 @@ def render_tab(cost_sliders):
     Returns:
         None
     """
-    if "resource_caps" not in st.session_state:
-        st.session_state.resource_caps = {}
-    for r in resource_order:
-        if r not in st.session_state.resource_caps:
-            st.session_state.resource_caps[r] = 0.0
+    # resource_caps is already fully populated (every resource_order key set)
+    # by app.py's shared init, which runs before any tab renders.
     init_custom_resources()
 
     st.markdown('<h1 class="crra-heading">Resource inputs</h1>', unsafe_allow_html=True)
@@ -804,19 +802,6 @@ def render_tab(cost_sliders):
     # Standard resource inputs
     st.markdown('<p class="crra-sub-heading">Set available resources for one year</p>', unsafe_allow_html=True)
 
-    # Build a lookup: for each CDR method, which resources are "primary" (mandatory)?
-    # Secondary resources are optional add-ons — a method can still run without them.
-    # A method can only run in the optimisation if at least one primary resource is available.
-    method_to_primary_resources = {}
-    for cdr_method, resource_coeffs in cost_sliders.items():
-        for name in resource_coeffs:
-            r_clean = strip_unit_suffix(name)
-            if (cdr_method, r_clean) not in secondary_resources:
-                method_to_primary_resources.setdefault(cdr_method, []).append(r_clean)
-
-    for r in method_to_primary_resources:
-        pass  # no-op, kept for clarity of intent below
-
     resource_to_group = get_resource_to_group()
 
     for group, rlist in resource_groups.items():
@@ -861,7 +846,15 @@ def render_tab(cost_sliders):
                 ):
                     dialog_add_custom_resource(cost_sliders, preset_resources=rlist)
 
-    apply_auto_disable_logic(method_to_primary_resources, secondary_resources)
+    # Refresh method activation now that this render's resource inputs and
+    # "Related CDR Methods" toggles are final — reuses the same real-quantity
+    # check as app.py's shared init (which runs too early to see toggles the
+    # user just changed on this exact render) and Tab 2's own pre-render sync.
+    cost_sliders_norm = {
+        m: {strip_unit_suffix(name): conf for name, conf in resources.items()}
+        for m, resources in cost_sliders.items()
+    }
+    refresh_active_methods(cost_sliders_norm)
 
     # Rendered after all resource inputs above (which write into
     # resource_caps) so the export always reflects this render's latest