Modify the order of the sidebar, remove tabs from users

app/.streamlit/config.toml

@@ -1,3 +1,10 @@
 [client]
 showSidebarNavigation = false
 toolbarMode = "minimal"
+# toolbarMode = "auto"
+
+[theme]
+# primaryColor = "blue"
+# backgroundColor = "black"
+# secondaryBackgroundColor = "blue"
+# borderColor = "blue"

app/auth.py

@@ -97,7 +97,9 @@ def get_sidebar(role_text: str, username: str):
                 d.dash_id,
                 d.dash_text,
                 d.page_file,
-                d.dash_type
+                d.dash_type,
+                d.order_no as dash_order,
+                g.order_no as group_order
             from
                 groups g
                 left join dashboards d 
@@ -105,6 +107,7 @@ def get_sidebar(role_text: str, username: str):
             where
                 g.active = 1
                 and d.active = 1      
+            order by g.order_no, d.order_no          
         """
     else:
         sql = """
@@ -114,7 +117,9 @@ def get_sidebar(role_text: str, username: str):
                 p.dash_id,
                 d.dash_text,
                 d.page_file,
-                d.dash_type
+                d.dash_type,
+                d.order_no as dash_order,
+                g.order_no as group_order
             FROM
                 users u
                 left join permissions p
@@ -129,13 +134,10 @@ def get_sidebar(role_text: str, username: str):
                 and d.active = 1
                 and p.active = 1
                 and u.username = ?
-            order by 
+            order by g.order_no, d.order_no
-                g.order_no,
-                d.order_no 
         """
     params = (username,) if "?" in sql else None
     df = get_list(sql, params)
-    
     return df
 
 # ---------------------------------------------------------------------------

app/pages/user.py

@@ -350,13 +350,13 @@ def user():
     if "selected_user_id" not in st.session_state:
         st.session_state.selected_user_id = None
 
-    tab_user, tab_role, tab_permission = st.tabs(["Benutzer", "Rollen", "Berechtigungen"])
+    # tab_user, tab_role, tab_permission = st.tabs(["Benutzer", "Rollen", "Berechtigungen"])
 
     #--------------------------------------------------------------------------------------------------
     #   Benutzerverwaltung
     #--------------------------------------------------------------------------------------------------
     
-    with tab_user:
+    # with tab_user:
         
        
 

app/ui/sidebar.py

@@ -52,9 +52,9 @@ def build_sidebar():
             st.info("Keine Einträge zum Suchbegriff gefunden.")
             return
 
-
         # --- Gruppiert durchlaufen ---
-        for group_text, df_group in df_view.groupby("group_text"):
+        # df_view = df_view.sort_values(["group_order", "dash_order"]) # vorher noch sortieren
+        for group_text, df_group in df_view.groupby("group_text", sort=False): # und beim gruppieren nicht nach der Gruppe sortieren!
             # Expander offen, wenn:
             # - aktuelle Seite in dieser Gruppe liegt
             group_open = any(