fix html templates when we use prefix

Author: vincentsarago

tifeatures/factory.py

@@ -56,38 +56,6 @@
 )
 
 
-def create_html_response(
-    request: Request, data: str, template_name: str
-) -> _TemplateResponse:
-    """Create Template response."""
-    urlpath = request.url.path
-    crumbs = []
-    baseurl = str(request.base_url).rstrip("/")
-    crumbpath = str(baseurl)
-    for crumb in urlpath.split("/"):
-        crumbpath = crumbpath.rstrip("/")
-        part = crumb
-        if part is None or part == "":
-            part = "Home"
-        crumbpath += f"/{crumb}"
-        crumbs.append({"url": crumbpath.rstrip("/"), "part": part.capitalize()})
-
-    return templates.TemplateResponse(
-        f"{template_name}.html",
-        {
-            "request": request,
-            "response": json.loads(data),
-            "template": {
-                "api_root": baseurl,
-                "params": request.query_params,
-                "title": "",
-            },
-            "crumbs": crumbs,
-            "url": str(request.url),
-        },
-    )
-
-
 def create_csv_rows(data: Iterable[Dict]) -> Generator[str, None, None]:
     """Creates an iterator that returns lines of csv from an iterable of dicts."""
 
@@ -144,6 +112,44 @@ def url_for(self, request: Request, name: str, **path_params: Any) -> str:
 
         return url_path.make_absolute_url(base_url=base_url)
 
+    def _create_html_response(
+        self,
+        request: Request,
+        data: str,
+        template_name: str,
+    ) -> _TemplateResponse:
+        """Create Template response."""
+        urlpath = request.url.path
+        crumbs = []
+        baseurl = str(request.base_url).rstrip("/")
+
+        crumbpath = str(baseurl)
+        for crumb in urlpath.split("/"):
+            crumbpath = crumbpath.rstrip("/")
+            part = crumb
+            if part is None or part == "":
+                part = "Home"
+            crumbpath += f"/{crumb}"
+            crumbs.append({"url": crumbpath.rstrip("/"), "part": part.capitalize()})
+
+        if self.router_prefix:
+            baseurl += self.router_prefix
+
+        return templates.TemplateResponse(
+            f"{template_name}.html",
+            {
+                "request": request,
+                "response": json.loads(data),
+                "template": {
+                    "api_root": baseurl,
+                    "params": request.query_params,
+                    "title": "",
+                },
+                "crumbs": crumbs,
+                "url": str(request.url),
+            },
+        )
+
     def register_landing(self) -> None:
         """Register landing endpoint."""
 
@@ -242,7 +248,7 @@ def landing(
             )
 
             if output_type == MediaType.html:
-                return create_html_response(
+                return self._create_html_response(
                     request,
                     data.json(exclude_none=True),
                     template_name="landing",
@@ -291,7 +297,7 @@ def conformance(
             )
 
             if output_type == MediaType.html:
-                return create_html_response(
+                return self._create_html_response(
                     request,
                     data.json(exclude_none=True),
                     template_name="conformance",
@@ -387,7 +393,7 @@ def collections(
             )
 
             if output_type == MediaType.html:
-                return create_html_response(
+                return self._create_html_response(
                     request,
                     data.json(exclude_none=True),
                     template_name="collections",
@@ -469,7 +475,7 @@ def collection(
             )
 
             if output_type == MediaType.html:
-                return create_html_response(
+                return self._create_html_response(
                     request,
                     data.json(exclude_none=True),
                     template_name="collection",
@@ -515,7 +521,7 @@ def queryables(
             )
 
             if output_type == MediaType.html:
-                return create_html_response(
+                return self._create_html_response(
                     request,
                     data.json(exclude_none=True),
                     template_name="queryables",
@@ -772,7 +778,7 @@ async def items(
 
             # HTML Response
             if output_type == MediaType.html:
-                return create_html_response(
+                return self._create_html_response(
                     request,
                     data.json(exclude_none=True),
                     template_name="items",
@@ -847,7 +853,7 @@ async def item(
 
             # HTML Response
             if output_type == MediaType.html:
-                return create_html_response(
+                return self._create_html_response(
                     request,
                     data.json(exclude_none=True),
                     template_name="item",