[FIX] Hide Other resources in tab1, fix unit label (yr instead of year)

tabs/tab1_inputs.py

@@ -2,7 +2,8 @@ import pandas as pd
 import streamlit as st
 
 from config.config import (resource_groups, resource_order, resource_tooltips,
-                           resource_unit_map, method_groups, CO2_UNIT, secondary_resources)
+                           resource_unit_map, method_groups, CO2_UNIT, secondary_resources,
+                           hidden_resource_names)
 from utils.data_utils import render_resource_input, strip_unit_suffix, get_resource_to_group, get_resource_to_unit, get_method_group
 from utils.ui_helpers import show_bar
 from io import BytesIO
@@ -114,12 +115,12 @@ def dialog_add_custom_resource(cost_sliders, edit_index: int | None = None, pres
     group = resource_to_group.get(batch_group)
     unit = resource_unit_map.get(group, "?")
 
-    st.markdown(f'<p class="caption">Unit for this group: <strong>{unit}/year</strong></p>', unsafe_allow_html=True)
+    st.markdown(f'<p class="caption">Unit for this group: <strong>{unit}/yr</strong></p>', unsafe_allow_html=True)
 
     st.markdown('<p class="dialog-title">2 — Available quantity</p>', unsafe_allow_html=True)
 
     batch_amount = st.number_input(
-        label=f"Available amount ({unit}/year)",
+        label=f"Available amount ({unit}/yr)",
         min_value=0.0,
         format="%.2f",
         value=float(existing["amount"]) if existing.get("amount") and existing.get("amount") != 0.0 else None,
@@ -283,7 +284,7 @@ def dialog_add_custom_resource(cost_sliders, edit_index: int | None = None, pres
         errors = []
         if not batch_name.strip():
             errors.append("Resource name is required.")
-        elif batch_name.strip() in standard_names:
+        elif batch_name.strip().lower() in {n.lower() for n in standard_names}:
             errors.append(f"**{batch_name}** matches a standard resource name. Choose a different name.")
         elif batch_name.strip() in existing_names:
             errors.append(f"**{batch_name}** already exists. Choose a different name.")
@@ -682,11 +683,19 @@ def render_tab(cost_sliders):
 
     for group, rlist in resource_groups.items():
         unit = resource_unit_map.get(group, "")
-        with st.expander(f"**{group}** ({unit}/year)", expanded=True):
+        with st.expander(f"**{group}** ({unit}/yr)", expanded=True):
+
+            display_rlist = [r for r in rlist if r not in hidden_resource_names]
+
+            if not display_rlist:
+                st.caption(
+                    "No standard resource to display for this group. "
+                    "Add a specific resource below to include it in the optimization."
+                )
 
             cols = st.columns(4)
 
-            for i, r in enumerate(rlist):
+            for i, r in enumerate(display_rlist):
 
                 tooltip = resource_tooltips.get(r, None)
                 name_clean = r.split(" (")[0]
@@ -804,34 +813,29 @@ def render_tab(cost_sliders):
         if method_active_resource_count.get(m, 0) > 0:
             if m in st.session_state.constraints:
                 st.session_state.constraints[m]["active"] = True
-            toggle_key = f"toggle_{m}"
-            if toggle_key in st.session_state:
-                st.session_state[toggle_key] = True
+                st.session_state.constraints[m]["cap_type"] = "percent"
+                st.session_state.constraints[m]["cap_value"] = 100
+            st.session_state[f"toggle_{m}"] = True
+            st.session_state[f"slider_{m}"] = 100
             st.session_state.auto_disabled_methods.discard(m)
+            st.session_state.setdefault("just_activated_methods", set()).add(m)
 
     # Step 3 – disable methods that now have zero active primary resources.
     # We record which methods the tool disabled (auto_disabled_methods) so that
     # step 2 can safely re-enable them later without touching user-chosen settings.
     newly_disabled = []
     for m in methods_with_no_active_resource:
+        # Always track in auto_disabled_methods so Step 2 can re-enable later,
+        # even if the method was already inactive (e.g. initialised as False in app.py).
+        st.session_state.auto_disabled_methods.add(m)
         if st.session_state.constraints.get(m, {}).get("active", True):
             st.session_state.constraints.setdefault(m, {"active": True, "cap_type": "percent", "cap_value": 100})
             st.session_state.constraints[m]["active"] = False
-            st.session_state.auto_disabled_methods.add(m)
             newly_disabled.append(m)
             toggle_key = f"toggle_{m}"
             if toggle_key in st.session_state:
                 st.session_state[toggle_key] = False
 
-    if newly_disabled:
-        st.info(
-            "The following methods have no active resource left and were "
-            "automatically deactivated (see Method constraints tab): "
-            + ", ".join(newly_disabled),
-            icon=":material/info:"
-        )
-
-
     panel_custom_resources_controls(cost_sliders)
 
     st.markdown('<p class="crra-sub-heading">Summary of available resources</p>', unsafe_allow_html=True)