Merge pull request #44 from andriialbatov/fix/mounting-on-slash-dashboard

Fix(UI): correct dashboard URLs when mounted at root

Author: igorbenav

crudadmin/admin_interface/admin_site.py

@@ -248,7 +248,7 @@ async def login_page_inner(
                         {
                             "request": request,
                             "error": "Invalid credentials. Please try again.",
-                            "mount_path": self.mount_path,
+                            "url_prefix": self.get_url_prefix(),
                             "theme": self.theme,
                         },
                     )
@@ -301,7 +301,7 @@ async def login_page_inner(
                         {
                             "request": request,
                             "error": f"Error creating session: {str(e)}",
-                            "mount_path": self.mount_path,
+                            "url_prefix": self.get_url_prefix(),
                             "theme": self.theme,
                         },
                     )
@@ -313,7 +313,7 @@ async def login_page_inner(
                     {
                         "request": request,
                         "error": "An error occurred during login. Please try again.",
-                        "mount_path": self.mount_path,
+                        "url_prefix": self.get_url_prefix(),
                         "theme": self.theme,
                     },
                 )
@@ -397,7 +397,7 @@ async def admin_login_page_inner(
                 "auth/login.html",
                 {
                     "request": request,
-                    "mount_path": self.mount_path,
+                    "url_prefix": self.get_url_prefix(),
                     "theme": self.theme,
                     "error": error,
                 },
@@ -477,7 +477,7 @@ async def get_base_context(
             "table_names": self.models.keys(),
             "auth_model_counts": auth_model_counts,
             "model_counts": model_counts,
-            "mount_path": self.mount_path,
+            "url_prefix": self.get_url_prefix(),
             "track_events": self.event_integration is not None,
             "theme": self.theme,
         }

crudadmin/admin_interface/crud_admin.py

@@ -627,7 +627,7 @@ async def event_log_page_inner(
                     "event_types": [e.value for e in EventType],
                     "statuses": [s.value for s in EventStatus],
                     "users": users["data"],
-                    "mount_path": self.mount_path,
+                    "url_prefix": self.get_url_prefix(),
                 }
             )
 
@@ -767,7 +767,7 @@ async def event_log_content_inner(
                         "events": enriched_events,
                         "page": page,
                         "total_pages": total_pages,
-                        "mount_path": self.mount_path,
+                        "url_prefix": self.get_url_prefix(),
                         "start_date": start_date,
                         "end_date": end_date,
                         "selected_type": event_type,
@@ -785,7 +785,7 @@ async def event_log_content_inner(
                         "events": [],
                         "page": 1,
                         "total_pages": 1,
-                        "mount_path": self.mount_path,
+                        "url_prefix": self.get_url_prefix(),
                     },
                 )
 

crudadmin/admin_interface/model_view.py

@@ -692,7 +692,7 @@ async def form_create_endpoint_inner(
                 "error": error_message,
                 "field_errors": field_errors,
                 "field_values": field_values,
-                "mount_path": self.admin_site.mount_path if self.admin_site else "",
+                "url_prefix": self.get_url_prefix(),
             }
 
             return self.templates.TemplateResponse(
@@ -851,7 +851,7 @@ async def bulk_delete_endpoint_inner(
                     "current_page": adjusted_page,
                     "rows_per_page": rows_per_page,
                     "primary_key_info": primary_key_info,
-                    "mount_path": self.admin_site.mount_path if self.admin_site else "",
+                    "url_prefix": self.get_url_prefix(),
                 }
 
                 return self.templates.TemplateResponse(
@@ -1002,7 +1002,7 @@ async def get_model_admin_page_inner(
                 "rows_per_page": rows_per_page,
                 "selected_column": search_column,
                 "primary_key_info": primary_key_info,
-                "mount_path": self.admin_site.mount_path if self.admin_site else "",
+                "url_prefix": self.get_url_prefix(),
                 "sort_column": sort_column,
                 "sort_order": sort_order,
                 "allowed_actions": self.allowed_actions,
@@ -1046,14 +1046,13 @@ def get_model_create_page(
         async def model_create_page(request: Request) -> Response:
             """Show a blank form for creating a new record."""
             form_fields = _get_form_fields_from_schema(self.create_schema)
-            mount_path = self.admin_site.mount_path if self.admin_site else ""
             return self.templates.TemplateResponse(
                 template,
                 {
                     "request": request,
                     "model_name": self.model_key,
                     "form_fields": form_fields,
-                    "mount_path": mount_path,
+                    "url_prefix": self.get_url_prefix(),
                 },
             )
 
@@ -1098,14 +1097,13 @@ async def get_model_update_page_inner(
                 if field_name in item:
                     field["value"] = item[field_name]
 
-            mount_path = self.admin_site.mount_path if self.admin_site else ""
             return self.templates.TemplateResponse(
                 template,
                 {
                     "request": request,
                     "model_name": self.model_key,
                     "form_fields": form_fields,
-                    "mount_path": mount_path,
+                    "url_prefix": self.get_url_prefix(),
                     "id": id,
                 },
             )
@@ -1267,7 +1265,7 @@ async def form_update_endpoint_inner(
                 "error": error_message,
                 "field_errors": field_errors,
                 "field_values": field_values,
-                "mount_path": self.admin_site.mount_path if self.admin_site else "",
+                "url_prefix": self.get_url_prefix(),
                 "id": id,
                 "include_sidebar_and_header": False,
             }

crudadmin/templates/admin/dashboard/dashboard.html

@@ -5,7 +5,7 @@
 {% set include_sidebar_and_header = True %}
 
 {% block content %}
-    <div id="dynamic-content" hx-get="/{{ mount_path }}/dashboard-content" hx-trigger="load" hx-swap="outerHTML">
+    <div id="dynamic-content" hx-get="{{ url_prefix }}/dashboard-content" hx-trigger="load" hx-swap="outerHTML">
         <div class="loading-state">
             <div class="card">
                 <div class="loading-message">Loading dashboard content...</div>
@@ -22,14 +22,14 @@
         align-items: center;
         min-height: 200px;
     }
-    
+
     .loading-message {
         color: var(--text-secondary-light);
         font-size: 1.1rem;
     }
-    
+
     .dark-theme .loading-message {
         color: var(--text-secondary-dark);
     }
 </style>
-{% endblock %}
+{% endblock %}

crudadmin/templates/admin/dashboard/dashboard_content.html

@@ -97,7 +97,7 @@
         {% if "AdminUser" in auth_table_names %}
             <div class="module">
                 <div class="module-info">
-                    <a href="/{{ mount_path }}/AdminUser" class="module-title">Admin Users</a>
+                    <a href="{{ url_prefix }}/AdminUser" class="module-title">Admin Users</a>
                     <div class="module-stats">
                         <span>Active Users:</span>
                         <span class="stats-badge">{{ auth_model_counts["AdminUser"]|default(0) }}</span>
@@ -109,7 +109,7 @@
         {% if "AdminSession" in auth_table_names %}
             <div class="module">
                 <div class="module-info">
-                    <a href="/{{ mount_path }}/AdminSession" class="module-title">Sessions</a>
+                    <a href="{{ url_prefix }}/AdminSession" class="module-title">Sessions</a>
                     <div class="module-stats">
                         <span>Active Sessions:</span>
                         <span class="stats-badge" title="Total / Active">
@@ -127,7 +127,7 @@
         {% for table_name in table_names %}
             <div class="module">
                 <div class="module-info">
-                    <a href="/{{ mount_path }}/{{ table_name }}" class="module-title">{{ table_name }}</a>
+                    <a href="{{ url_prefix }}/{{ table_name }}" class="module-title">{{ table_name }}</a>
                     <div class="module-stats">
                         <span>Total Records:</span>
                         <span class="stats-badge">{{ model_counts[table_name]|default(0) }}</span>
@@ -138,4 +138,4 @@
     </div>
     {% endif %}
 </div>
-{% endblock %}
+{% endblock %}

crudadmin/templates/admin/management/events.html

@@ -288,16 +288,16 @@
         .filter-grid {
             grid-template-columns: 1fr;
         }
-        
+
         .detail-item {
             grid-template-columns: 1fr;
             gap: 0.25rem;
         }
-        
+
         .filter-actions {
             flex-direction: column;
         }
-        
+
         .filter-button {
             width: 100%;
         }
@@ -309,7 +309,7 @@
         <div class="dashboard-header">
             <h1 class="page-title">Event Logs</h1>
         </div>
-        
+
         <div class="filter-section">
             <div class="filter-grid">
                 <div class="filter-group">
@@ -323,7 +323,7 @@ <h1 class="page-title">Event Logs</h1>
                         {% endfor %}
                     </select>
                 </div>
-                
+
                 <div class="filter-group">
                     <label class="filter-label" for="event-type">Event Type</label>
                     <select id="event-type" name="event_type" class="filter-control">
@@ -350,19 +350,19 @@ <h1 class="page-title">Event Logs</h1>
 
                 <div class="filter-group">
                     <label class="filter-label" for="start-date">Start Date</label>
-                    <input type="date" 
+                    <input type="date"
                            id="start-date"
-                           name="start_date" 
-                           class="filter-control" 
+                           name="start_date"
+                           class="filter-control"
                            value="{{ start_date }}">
                 </div>
 
                 <div class="filter-group">
                     <label class="filter-label" for="end-date">End Date</label>
-                    <input type="date" 
+                    <input type="date"
                            id="end-date"
-                           name="end_date" 
-                           class="filter-control" 
+                           name="end_date"
+                           class="filter-control"
                            value="{{ end_date }}">
                 </div>
             </div>
@@ -377,8 +377,8 @@ <h1 class="page-title">Event Logs</h1>
             </div>
         </div>
 
-        <div id="events-content" 
-             hx-get="/{{ mount_path }}/management/events/content"
+        <div id="events-content"
+             hx-get="{{ url_prefix }}/management/events/content"
              hx-trigger="load">
             <div class="event-grid">
                 <div class="event-card">
@@ -405,14 +405,14 @@ <h1 class="page-title">Event Logs</h1>
 function applyFilters() {
     const filters = getFilterValues();
     const queryParams = new URLSearchParams();
-    
+
     Object.entries(filters).forEach(([key, value]) => {
         if (value) {
             queryParams.append(key, value);
         }
     });
 
-    const url = `/{{ mount_path }}/management/events/content?${queryParams.toString()}`;
+    const url = `{{ url_prefix }}/management/events/content?${queryParams.toString()}`;
     htmx.ajax('GET', url, {
         target: '#events-content',
         swap: 'innerHTML'
@@ -434,4 +434,4 @@ <h1 class="page-title">Event Logs</h1>
     details.classList.toggle('visible');
 }
 </script>
-{% endblock %}
+{% endblock %}

crudadmin/templates/admin/management/events_content.html

@@ -8,7 +8,7 @@
                <span class="event-timestamp">{{ event.timestamp.strftime('%Y-%m-%d %H:%M:%S') }}</span>
            </div>
        </div>
-       
+
        <div class="event-summary" onclick="toggleDetails(this)">
            <div class="summary-grid">
                <div class="summary-item">
@@ -94,21 +94,21 @@ <h4>Request Details</h4>
 
 <div class="pagination">
     <button class="pagination-button"
-            hx-get="/{{ mount_path }}/management/events/content"
+            hx-get="{{ url_prefix }}/management/events/content"
             hx-target="#events-content"
             hx-include="[name='event-type'],[name='status'],[name='start-date'],[name='end-date']"
             hx-vals='js:{"page": "{{ page - 1 }}"}'
             {% if page <= 1 %}disabled{% endif %}>
         Previous
     </button>
-    
+
     <div class="pagination-info">
         Page {{ page }} of {{ total_pages }}
     </div>
-    
+
     <button class="pagination-button"
-            hx-get="/{{ mount_path }}/management/events/content"
-            hx-target="#events-content" 
+            hx-get="{{ url_prefix }}/management/events/content"
+            hx-target="#events-content"
             hx-include="[name='event-type'],[name='status'],[name='start-date'],[name='end-date']"
             hx-vals='js:{"page": "{{ page + 1 }}"}'
             {% if page >= total_pages %}disabled{% endif %}>
@@ -120,7 +120,7 @@ <h4>Request Details</h4>
     .event-card {
         margin-bottom: 1rem;
     }
-    
+
     .header-info {
         display: flex;
         align-items: center;
@@ -188,4 +188,4 @@ <h4>Request Details</h4>
        <span>No events found matching the criteria.</span>
    </div>
 </div>
-{% endif %}
+{% endif %}

crudadmin/templates/admin/management/health.html

@@ -209,24 +209,24 @@
         <div class="dashboard-header">
             <h1 class="page-title">System Health</h1>
             <button class="refresh-button"
-                    hx-get="/{{ mount_path }}/management/health/content"
+                    hx-get="{{ url_prefix }}/management/health/content"
                     hx-target="#health-content"
                     hx-indicator=".refresh-icon">
                 <svg class="refresh-icon"
-                     fill="none" 
-                     stroke="currentColor" 
+                     fill="none"
+                     stroke="currentColor"
                      viewBox="0 0 24 24">
-                    <path stroke-linecap="round" 
-                          stroke-linejoin="round" 
-                          stroke-width="2" 
+                    <path stroke-linecap="round"
+                          stroke-linejoin="round"
+                          stroke-width="2"
                           d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
                 </svg>
                 Refresh
             </button>
         </div>
-        
-        <div id="health-content" 
-             hx-get="/{{ mount_path }}/management/health/content"
+
+        <div id="health-content"
+             hx-get="{{ url_prefix }}/management/health/content"
              hx-trigger="load delay:100ms">
             <div class="health-grid">
                 <div class="health-card loading-placeholder">
@@ -238,4 +238,4 @@ <h1 class="page-title">System Health</h1>
         </div>
     </div>
 </div>
-{% endblock %}
+{% endblock %}