Update app.py

app.py

@@ -44,27 +44,21 @@ def load_catalog():
 }
     return pd.DataFrame(products)
 
-# Cached function for filtering the catalog
+# Enhanced function to filter the catalog based on multiple attributes
 @st.cache_data
-def filter_catalog(catalog, category=None, cyber_approved=None, accessibility_approved=None, privacy_approved=None, search_query=None):
+def filter_catalog(catalog, search_query=None, cyber_approved=None, accessibility_approved=None, privacy_approved=None):
     filtered = catalog
-    if category:
-        filtered = filtered[filtered["Category"].isin(category)]
+    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 search_query:
-        filtered = filtered[filtered["Product Name"].str.contains(search_query, case=False)]
     return filtered
 
-# Load the catalog
-catalog = load_catalog()
-
-
-# Assuming load_catalog is defined and loads data correctly
 catalog = load_catalog()
 
 
@@ -75,22 +69,16 @@ catalog = load_catalog()
 st.title("Enterprise Software Product Catalog")
 st.write("This is the source of truth for app approval statuses within the enterprise.")
 
-# Sidebar for filters
-category = st.sidebar.multiselect("Filter by Category", options=catalog["Category"].unique())
-cyber_approved = st.sidebar.checkbox("Cyber Approved", value=True, key="cyber")
-accessibility_approved = st.sidebar.checkbox("Accessibility Approved", value=True, key="accessibility")
-privacy_approved = st.sidebar.checkbox("Privacy Approved", value=True, key="privacy")
-search_query = st.sidebar.text_input("Search Products", key="search")
+# Sidebar for Advanced Search and Filtering
+with st.sidebar.expander("Advanced Search Options"):
+    search_query = st.text_input("Search by Any Attribute", key='search_query')
+    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 filters based on user input
-filtered_catalog = filter_catalog(
-    catalog,
-    category=category,
-    cyber_approved=cyber_approved,
-    accessibility_approved=accessibility_approved,
-    privacy_approved=privacy_approved,
-    search_query=search_query
-)
+# Apply the enhanced filter based on user input
+filtered_catalog = filter_catalog(catalog, search_query, cyber_approved, accessibility_approved, privacy_approved)
 
 # Display the filtered product catalog
-st.dataframe(filtered_catalog)
+st.header("Product Catalog")
+st.dataframe(filtered_catalog)