Update app.py

app.py

@@ -44,19 +44,20 @@ def load_catalog():
 }
     return pd.DataFrame(products)
 
-# Enhanced function to filter the catalog based on multiple attributes
+# Function to filter the catalog based on multiple attributes with AND logic
 @st.cache_data
-def filter_catalog(catalog, search_query=None, cyber_approved=None, accessibility_approved=None, privacy_approved=None):
+def filter_catalog(catalog, search_query=None, selected_category=None, cyber_approved=None, accessibility_approved=None, privacy_approved=None):
     filtered = catalog
     if search_query:
-        # Filtering by checking if the search_query is in any of the specified attributes
         filtered = filtered[filtered.apply(lambda row: search_query.lower() in str(row).lower(), axis=1)]
-    if cyber_approved is not None:
-        filtered = filtered[filtered["Cyber Approved"] == cyber_approved]
-    if accessibility_approved is not None:
-        filtered = filtered[filtered["Accessibility Approved"] == accessibility_approved]
-    if privacy_approved is not None:
-        filtered = filtered[filtered["Privacy Approved"] == privacy_approved]
+    if selected_category and selected_category != 'All':
+        filtered = filtered[filtered["Category"] == selected_category]
+    if cyber_approved:
+        filtered = filtered[filtered["Cyber Approved"] == True]
+    if accessibility_approved:
+        filtered = filtered[filtered["Accessibility Approved"] == True]
+    if privacy_approved:
+        filtered = filtered[filtered["Privacy Approved"] == True]
     return filtered
 
 catalog = load_catalog()
@@ -72,14 +73,16 @@ st.write("This is the source of truth for app approval statuses within the enter
 
 
 # Sidebar for Advanced Search and Filtering
-with st.sidebar.expander("Advanced Search Options"):
+with st.sidebar:
+    st.header("Advanced Search Options")
     search_query = st.text_input("Search by Any Attribute", key='search_query')
+    selected_category = st.selectbox("Select Category", ['All'] + list(catalog["Category"].unique()), key='search_category')
     cyber_approved = st.checkbox("Cyber Approved", key='cyber_approved')
     accessibility_approved = st.checkbox("Accessibility Approved", key='accessibility_approved')
     privacy_approved = st.checkbox("Privacy Approved", key='privacy_approved')
 
 # Apply the enhanced filter based on user input
-filtered_catalog = filter_catalog(catalog, search_query, cyber_approved, accessibility_approved, privacy_approved)
+filtered_catalog = filter_catalog(catalog, search_query, selected_category, cyber_approved, accessibility_approved, privacy_approved)
 
 # Display the filtered product catalog
 st.header("Product Catalog")