From fac66b289b974fbd3cb29076b1561c2b77c1c2dd Mon Sep 17 00:00:00 2001
From: Matthias Mair <code@mjmair.com>
Date: Mon, 27 Nov 2023 01:51:53 +0100
Subject: [PATCH] [PUI] URL fixes (#5989)

* added helper to render an instance for an url

* removed unneeded declaration

* restructed PUI urls to improve behaviour:
- removes dead routes
- adds percausion to make sure asset-matching path is always the same
- makes sure subpaths of the PUI path also match to PUI (fixing a current bug with fully reload PUI)

* clean up diff
---
 InvenTree/InvenTree/urls.py |  5 +----
 InvenTree/web/urls.py       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py
index 1208e52cb1..3a9a00d214 100644
--- a/InvenTree/InvenTree/urls.py
+++ b/InvenTree/InvenTree/urls.py
@@ -217,9 +217,6 @@ classic_frontendpatterns = [
     re_path(r'^accounts/', include('allauth.urls')),        # included urlpatterns
 ]
 
-
-new_frontendpatterns = platform_urls
-
 urlpatterns = []
 
 if settings.INVENTREE_ADMIN_ENABLED:
@@ -236,7 +233,7 @@ frontendpatterns = []
 if settings.ENABLE_CLASSIC_FRONTEND:
     frontendpatterns += classic_frontendpatterns
 if settings.ENABLE_PLATFORM_FRONTEND:
-    frontendpatterns += new_frontendpatterns
+    frontendpatterns += platform_urls
 
 urlpatterns += frontendpatterns
 
diff --git a/InvenTree/web/urls.py b/InvenTree/web/urls.py
index 35726815ac..ea3f893729 100644
--- a/InvenTree/web/urls.py
+++ b/InvenTree/web/urls.py
@@ -17,15 +17,15 @@ class RedirectAssetView(TemplateView):
 
 
 spa_view = ensure_csrf_cookie(TemplateView.as_view(template_name="web/index.html"))
+assets_path = path("assets/<path:path>", RedirectAssetView.as_view())
 
 
 urlpatterns = [
-    path(f'{settings.FRONTEND_URL_BASE}/', include([
-        path("assets/<path:path>", RedirectAssetView.as_view()),
-        re_path(r"^(?P<path>.*)/$", spa_view),
-        path("set-password?uid=<uid>&token=<token>", spa_view, name="password_reset_confirm"),
-        path("", spa_view),]
-    )),
-    path(settings.FRONTEND_URL_BASE, spa_view, name='platform'),
-    path("assets/<path:path>", RedirectAssetView.as_view()),
+    path(f"{settings.FRONTEND_URL_BASE}/", include([
+        assets_path,
+        path("set-password?uid=<uid>&token=<token>", spa_view, name="password_reset_confirm",),
+        re_path(".*", spa_view),
+    ])),
+    assets_path,
+    path(settings.FRONTEND_URL_BASE, spa_view, name="platform"),
 ]