Update Admin Panel to work via iframes

src/meshapi/admin/urls.py

@@ -1,17 +1,19 @@
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, re_path
 
 from meshapi.admin.password_reset import (
     AdminPasswordResetCompleteView,
     AdminPasswordResetConfirmView,
     AdminPasswordResetDoneView,
     AdminPasswordResetView,
 )
+from meshdb.views import admin_iframe_view
 
 urlpatterns = [
     path("password_reset/", AdminPasswordResetView.as_view(), name="admin_password_reset"),
     path("password_reset/done/", AdminPasswordResetDoneView.as_view(), name="password_reset_done"),
     path("password_reset/<uidb64>/<token>/", AdminPasswordResetConfirmView.as_view(), name="password_reset_confirm"),
     path("password_reset/done/", AdminPasswordResetCompleteView.as_view(), name="password_reset_complete"),
-    path("", admin.site.urls),
+    path("panel/", admin.site.urls),
+    re_path(r"^.*$", admin_iframe_view),  # Match any other /admin/* URL
 ]

src/meshapi/admin/utils.py

@@ -18,7 +18,10 @@ def get_admin_url(model: Model, site_base_url: str) -> str:
         reverse(
             f"admin:{content_type.app_label}_{content_type.model}_change",
             args=(model.pk,),
-        ),
+        ).replace(
+            "panel/", ""
+        ),  # Strip "panel" out of admin URL. "Panel" views are meant to be shown
+        # inside the admin panel iframe, and likely the user does not want that
     )
 
 

src/meshapi/tests/test_admin_change_view.py

@@ -192,25 +192,25 @@ def _submit_form(
         return response
 
     def test_change_building(self):
-        change_url = f"/admin/meshapi/building/{self.building_1.id}/change/"
+        change_url = f"/admin/panel/meshapi/building/{self.building_1.id}/change/"
         response = self._call(change_url, 200)
         self._submit_form(change_url, bs4.BeautifulSoup(response.content.decode()).find(id="building_form"), 302)
 
     def test_change_member(self):
-        change_url = f"/admin/meshapi/member/{self.member.id}/change/"
+        change_url = f"/admin/panel/meshapi/member/{self.member.id}/change/"
         response = self._call(change_url, 200)
         self._submit_form(change_url, bs4.BeautifulSoup(response.content.decode()).find(id="member_form"), 302)
 
     def test_change_member_no_email(self):
-        change_url = f"/admin/meshapi/member/{self.member2.id}/change/"
+        change_url = f"/admin/panel/meshapi/member/{self.member2.id}/change/"
         response = self._call(change_url, 200)
         self._submit_form(change_url, bs4.BeautifulSoup(response.content.decode()).find(id="member_form"), 302)
 
         self.member2.refresh_from_db()
         self.assertIsNone(self.member2.primary_email_address)
 
     def test_add_new_member(self):
-        change_url = "/admin/meshapi/member/add/"
+        change_url = "/admin/panel/meshapi/member/add/"
         response = self._call(change_url, 200)
         form_soup = bs4.BeautifulSoup(response.content.decode()).find(id="member_form")
         fill_in_admin_form(
@@ -241,7 +241,7 @@ def test_add_new_member(self):
         self.assertEqual(member.notes, "Test notes")
 
     def test_add_new_member_name_only(self):
-        change_url = "/admin/meshapi/member/add/"
+        change_url = "/admin/panel/meshapi/member/add/"
         response = self._call(change_url, 200)
         form_soup = bs4.BeautifulSoup(response.content.decode()).find(id="member_form")
         fill_in_admin_form(
@@ -265,57 +265,57 @@ def test_add_new_member_name_only(self):
         self.assertEqual(member.notes, "")
 
     def test_change_install(self):
-        change_url = f"/admin/meshapi/install/{self.install.id}/change/"
+        change_url = f"/admin/panel/meshapi/install/{self.install.id}/change/"
         response = self._call(change_url, 200)
         self._submit_form(change_url, bs4.BeautifulSoup(response.content.decode()).find(id="install_form"), 302)
 
     def test_change_link(self):
-        change_url = f"/admin/meshapi/link/{self.link.id}/change/"
+        change_url = f"/admin/panel/meshapi/link/{self.link.id}/change/"
         response = self._call(change_url, 200)
         self._submit_form(change_url, bs4.BeautifulSoup(response.content.decode()).find(id="link_form"), 302)
 
     def test_change_los(self):
-        change_url = f"/admin/meshapi/los/{self.los.id}/change/"
+        change_url = f"/admin/panel/meshapi/los/{self.los.id}/change/"
         response = self._call(change_url, 200)
         self._submit_form(change_url, bs4.BeautifulSoup(response.content.decode()).find(id="los_form"), 302)
 
     def test_change_device(self):
-        change_url = f"/admin/meshapi/device/{self.device1.id}/change/"
+        change_url = f"/admin/panel/meshapi/device/{self.device1.id}/change/"
         response = self._call(change_url, 200)
         self._submit_form(change_url, bs4.BeautifulSoup(response.content.decode()).find(id="device_form"), 302)
 
     def test_change_sector_accessed_via_device_redirect(self):
-        change_url = f"/admin/meshapi/device/{self.sector.id}/change/"
+        change_url = f"/admin/panel/meshapi/device/{self.sector.id}/change/"
         response = self._call(change_url, 302)
         self.assertEqual(response.url, f"http://testserver/admin/meshapi/sector/{self.sector.id}/change/")
 
     def test_change_ap_accessed_via_device_redirect(self):
-        change_url = f"/admin/meshapi/device/{self.access_point.id}/change/"
+        change_url = f"/admin/panel/meshapi/device/{self.access_point.id}/change/"
         response = self._call(change_url, 302)
         self.assertEqual(response.url, f"http://testserver/admin/meshapi/accesspoint/{self.access_point.id}/change/")
 
     def test_change_device_bad_id(self):
-        change_url = "/admin/meshapi/device/00000000-0000-0000-0000-000000000000/change/"
+        change_url = "/admin/panel/meshapi/device/00000000-0000-0000-0000-000000000000/change/"
         response = self._call(change_url, 302)
-        self.assertEqual(response.url, "/admin/")
+        self.assertEqual(response.url, "/admin/panel/")
 
     def test_change_sector(self):
-        change_url = f"/admin/meshapi/sector/{self.sector.id}/change/"
+        change_url = f"/admin/panel/meshapi/sector/{self.sector.id}/change/"
         response = self._call(change_url, 200)
         self._submit_form(change_url, bs4.BeautifulSoup(response.content.decode()).find(id="sector_form"), 302)
 
     def test_change_accesspoint(self):
-        change_url = f"/admin/meshapi/accesspoint/{self.access_point.id}/change/"
+        change_url = f"/admin/panel/meshapi/accesspoint/{self.access_point.id}/change/"
         response = self._call(change_url, 200)
         self._submit_form(change_url, bs4.BeautifulSoup(response.content.decode()).find(id="accesspoint_form"), 302)
 
     def test_change_node(self):
-        change_url = f"/admin/meshapi/node/{self.node1.id}/change/"
+        change_url = f"/admin/panel/meshapi/node/{self.node1.id}/change/"
         response = self._call(change_url, 200)
         self._submit_form(change_url, bs4.BeautifulSoup(response.content.decode()).find(id="node_form"), 302)
 
     def test_change_node_remove_building(self):
-        change_url = f"/admin/meshapi/node/{self.node1.id}/change/"
+        change_url = f"/admin/panel/meshapi/node/{self.node1.id}/change/"
         response = self._call(change_url, 200)
         soup = bs4.BeautifulSoup(response.content.decode()).find(id="node_form")
         fill_in_admin_form(
@@ -329,7 +329,7 @@ def test_change_node_remove_building(self):
         self._submit_form(change_url, soup, 200, expect_failure=True)
 
     def test_add_new_node(self):
-        change_url = "/admin/meshapi/node/add/"
+        change_url = "/admin/panel/meshapi/node/add/"
         response = self._call(change_url, 200)
         form_soup = bs4.BeautifulSoup(response.content.decode()).find(id="node_form")
         fill_in_admin_form(
@@ -372,7 +372,7 @@ def test_add_new_node(self):
         self.assertEqual(node.notes, "Test notes")
 
     def test_add_new_node_no_building(self):
-        change_url = "/admin/meshapi/node/add/"
+        change_url = "/admin/panel/meshapi/node/add/"
         response = self._call(change_url, 200)
         form_soup = bs4.BeautifulSoup(response.content.decode()).find(id="node_form")
         fill_in_admin_form(
@@ -395,7 +395,7 @@ def test_add_new_node_no_building(self):
         self._submit_form(change_url, form_soup, 200, expect_failure=True)
 
     def test_add_new_node_no_nn(self):
-        change_url = "/admin/meshapi/node/add/"
+        change_url = "/admin/panel/meshapi/node/add/"
         response = self._call(change_url, 200)
         form_soup = bs4.BeautifulSoup(response.content.decode()).find(id="node_form")
         fill_in_admin_form(
@@ -437,7 +437,7 @@ def test_add_new_node_no_nn(self):
         self.assertEqual(node.notes, "Test notes")
 
     def test_add_new_planned_node_no_nn(self):
-        change_url = "/admin/meshapi/node/add/"
+        change_url = "/admin/panel/meshapi/node/add/"
         response = self._call(change_url, 200)
         form_soup = bs4.BeautifulSoup(response.content.decode()).find(id="node_form")
         fill_in_admin_form(
@@ -480,7 +480,7 @@ def test_add_new_planned_node_no_nn(self):
 
     def test_add_building(self):
         enable_flag("EDIT_PANORAMAS")
-        change_url = "/admin/meshapi/building/add/"
+        change_url = "/admin/panel/meshapi/building/add/"
         response = self._call(change_url, 200)
         form_soup = bs4.BeautifulSoup(response.content.decode()).find(id="building_form")
 
@@ -521,7 +521,7 @@ def test_add_building(self):
 
     def test_add_building_no_pano(self):
         disable_flag("EDIT_PANORAMAS")
-        change_url = "/admin/meshapi/building/add/"
+        change_url = "/admin/panel/meshapi/building/add/"
         response = self._call(change_url, 200)
         form_soup = bs4.BeautifulSoup(response.content.decode()).find(id="building_form")
 
@@ -561,7 +561,7 @@ def test_add_building_no_pano(self):
 
     def test_change_building_but_not_address(self):
         enable_flag("EDIT_PANORAMAS")
-        change_url = f"/admin/meshapi/building/{self.building_1.id}/change/"
+        change_url = f"/admin/panel/meshapi/building/{self.building_1.id}/change/"
         response = self._call(change_url, 200)
         form_soup = bs4.BeautifulSoup(response.content.decode()).find(id="building_form")
         fill_in_admin_form(
@@ -601,7 +601,7 @@ def test_change_building_but_not_address(self):
 
     def test_change_building_address(self):
         enable_flag("EDIT_PANORAMAS")
-        change_url = f"/admin/meshapi/building/{self.building_1.id}/change/"
+        change_url = f"/admin/panel/meshapi/building/{self.building_1.id}/change/"
         response = self._call(change_url, 200)
         form_soup = bs4.BeautifulSoup(response.content.decode()).find(id="building_form")
         fill_in_admin_form(
@@ -656,16 +656,16 @@ def _call(self, route, code):
         return response
 
     def test_add_views_http_200(self):
-        self._call("/admin/auth/group/add/", 200)
-        self._call("/admin/auth/user/add/", 200)
-        self._call("/admin/authtoken/tokenproxy/add/", 200)
-        self._call("/admin/meshapi_hooks/celeryserializerhook/add/", 200)
-        self._call("/admin/meshapi/building/add/", 200)
-        self._call("/admin/meshapi/member/add/", 200)
-        self._call("/admin/meshapi/install/add/", 200)
-        self._call("/admin/meshapi/link/add/", 200)
-        self._call("/admin/meshapi/los/add/", 200)
-        self._call("/admin/meshapi/sector/add/", 200)
-        self._call("/admin/meshapi/device/add/", 200)
-        self._call("/admin/meshapi/accesspoint/add/", 200)
-        self._call("/admin/meshapi/node/add/", 200)
+        self._call("/admin/panel/auth/group/add/", 200)
+        self._call("/admin/panel/auth/user/add/", 200)
+        self._call("/admin/panel/authtoken/tokenproxy/add/", 200)
+        self._call("/admin/panel/meshapi_hooks/celeryserializerhook/add/", 200)
+        self._call("/admin/panel/meshapi/building/add/", 200)
+        self._call("/admin/panel/meshapi/member/add/", 200)
+        self._call("/admin/panel/meshapi/install/add/", 200)
+        self._call("/admin/panel/meshapi/link/add/", 200)
+        self._call("/admin/panel/meshapi/los/add/", 200)
+        self._call("/admin/panel/meshapi/sector/add/", 200)
+        self._call("/admin/panel/meshapi/device/add/", 200)
+        self._call("/admin/panel/meshapi/accesspoint/add/", 200)
+        self._call("/admin/panel/meshapi/node/add/", 200)

src/meshapi/tests/test_admin_list_view.py

@@ -96,53 +96,53 @@ def _call(self, route, code):
         return response
 
     def test_list_group(self):
-        response = self._call("/admin/auth/group/", 200)
+        response = self._call("/admin/panel/auth/group/", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_list_user(self):
-        response = self._call("/admin/auth/user/", 200)
+        response = self._call("/admin/panel/auth/user/", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_list_authtoken(self):
-        response = self._call("/admin/authtoken/tokenproxy/", 200)
+        response = self._call("/admin/panel/authtoken/tokenproxy/", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_list_hook(self):
-        response = self._call("/admin/meshapi_hooks/celeryserializerhook/", 200)
+        response = self._call("/admin/panel/meshapi_hooks/celeryserializerhook/", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_list_building(self):
-        response = self._call("/admin/meshapi/building/", 200)
+        response = self._call("/admin/panel/meshapi/building/", 200)
         self.assertEqual(2, get_admin_results_count(response.content.decode()))
 
     def test_list_member(self):
-        response = self._call("/admin/meshapi/member/", 200)
+        response = self._call("/admin/panel/meshapi/member/", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_list_install(self):
-        response = self._call("/admin/meshapi/install/", 200)
+        response = self._call("/admin/panel/meshapi/install/", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_list_link(self):
-        response = self._call("/admin/meshapi/link/", 200)
+        response = self._call("/admin/panel/meshapi/link/", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_list_los(self):
-        response = self._call("/admin/meshapi/los/", 200)
+        response = self._call("/admin/panel/meshapi/los/", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_list_sector(self):
-        response = self._call("/admin/meshapi/sector/", 200)
+        response = self._call("/admin/panel/meshapi/sector/", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_list_accesspoint(self):
-        response = self._call("/admin/meshapi/accesspoint/", 200)
+        response = self._call("/admin/panel/meshapi/accesspoint/", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_list_device(self):
-        response = self._call("/admin/meshapi/device/", 200)
+        response = self._call("/admin/panel/meshapi/device/", 200)
         self.assertEqual(2, get_admin_results_count(response.content.decode()))
 
     def test_list_node(self):
-        response = self._call("/admin/meshapi/node/", 200)
+        response = self._call("/admin/panel/meshapi/node/", 200)
         self.assertEqual(2, get_admin_results_count(response.content.decode()))

src/meshapi/tests/test_admin_search_view.py

@@ -103,43 +103,43 @@ def _call(self, route, code):
         return response
 
     def test_search_building(self):
-        response = self._call("/admin/meshapi/building/?q=8888", 200)
+        response = self._call("/admin/panel/meshapi/building/?q=8888", 200)
         self.assertEqual(2, get_admin_results_count(response.content.decode()))
 
     def test_search_member(self):
-        response = self._call("/admin/meshapi/member/?q=1", 200)
+        response = self._call("/admin/panel/meshapi/member/?q=1", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_search_install(self):
-        response = self._call(f"/admin/meshapi/install/?q={self.install.install_number}", 200)
+        response = self._call(f"/admin/panel/meshapi/install/?q={self.install.install_number}", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_search_link(self):
-        response = self._call("/admin/meshapi/link/?q=101", 200)
+        response = self._call("/admin/panel/meshapi/link/?q=101", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_search_los(self):
-        response = self._call("/admin/meshapi/los/?q=101", 200)
+        response = self._call("/admin/panel/meshapi/los/?q=101", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_search_sector(self):
-        response = self._call("/admin/meshapi/sector/?q=1", 200)
+        response = self._call("/admin/panel/meshapi/sector/?q=1", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_search_access_point(self):
-        response = self._call("/admin/meshapi/accesspoint/?q=1", 200)
+        response = self._call("/admin/panel/meshapi/accesspoint/?q=1", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_search_device(self):
-        response = self._call("/admin/meshapi/device/?q=1", 200)
+        response = self._call("/admin/panel/meshapi/device/?q=1", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_search_node(self):
-        response = self._call("/admin/meshapi/node/?q=101", 200)
+        response = self._call("/admin/panel/meshapi/node/?q=101", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_search_install_by_nn(self):
-        response = self._call("/admin/meshapi/install/?q=101", 200)
+        response = self._call("/admin/panel/meshapi/install/?q=101", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_search_install_by_nn_exact(self):
@@ -152,17 +152,17 @@ def test_search_install_by_nn_exact(self):
         install2.notes = "NN101"
         install2.save()
 
-        response = self._call("/admin/meshapi/install/?q=NN101", 200)
+        response = self._call("/admin/panel/meshapi/install/?q=NN101", 200)
         self.assertEqual(2, get_admin_results_count(response.content.decode()))
 
     def test_search_install_just_nn(self):
-        response = self._call("/admin/meshapi/install/?q=nN", 200)
+        response = self._call("/admin/panel/meshapi/install/?q=nN", 200)
         self.assertEqual(0, get_admin_results_count(response.content.decode()))
 
     def test_search_install_empty(self):
-        response = self._call("/admin/meshapi/install/?q=", 200)
+        response = self._call("/admin/panel/meshapi/install/?q=", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))
 
     def test_search_install_referral(self):
-        response = self._call("/admin/meshapi/install/?q=reddit", 200)
+        response = self._call("/admin/panel/meshapi/install/?q=reddit", 200)
         self.assertEqual(1, get_admin_results_count(response.content.decode()))