From 5fe0aed1a68ab639c97146b5468850f3ad1a1c06 Mon Sep 17 00:00:00 2001
From: Lukas Juhrich <lukas.juhrich@agdsn.de>
Date: Sat, 27 Jan 2024 15:55:58 +0100
Subject: [PATCH] Turn switches in user `host` table into links

Refs #335
---
 tests/frontend/test_host.py     |  2 +-
 web/blueprints/host/__init__.py | 17 +++++++++++------
 web/blueprints/host/tables.py   |  6 ++++--
 web/resources/js/table.js       | 10 ++++++++++
 web/table/table.py              |  7 +++++++
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/tests/frontend/test_host.py b/tests/frontend/test_host.py
index 84192bfe3..40029717e 100644
--- a/tests/frontend/test_host.py
+++ b/tests/frontend/test_host.py
@@ -185,5 +185,5 @@ def test_user_host_without_room(client, host_without_room):
     )
     assert len(resp.json["items"]) == 1
     [it] = resp.json["items"]
-    assert it["switch"] is None
+    assert it["switch"] == []
     assert it["port"] is None
diff --git a/web/blueprints/host/__init__.py b/web/blueprints/host/__init__.py
index 2f633afd4..b20f8bc55 100644
--- a/web/blueprints/host/__init__.py
+++ b/web/blueprints/host/__init__.py
@@ -20,7 +20,7 @@
 from web.blueprints.helpers.user import get_user_or_404
 from web.blueprints.host.forms import InterfaceForm, HostForm
 from web.blueprints.host.tables import InterfaceTable, HostTable, HostRow, InterfaceRow
-from web.table.table import TableResponse, BtnColResponse
+from web.table.table import TableResponse, BtnColResponse, LinkColResponse
 
 bp = Blueprint('host', __name__)
 access = BlueprintAccess(bp, required_properties=['user_show'])
@@ -330,17 +330,22 @@ def default_response() -> ResponseReturnValue:
 def _host_row(host: Host, user_id: int) -> HostRow:
     if host.room:
         patch_ports = host.room.connected_patch_ports
-        switches = ", ".join(
-            p.switch_port.switch.host.name or "<unnamed switch>" for p in patch_ports
-        )
+        switches = [p.switch_port.switch.host for p in patch_ports]
+        switch_links = [
+            LinkColResponse(
+                href=url_for("infrastructure.switch_show", switch_id=s.id),
+                title=s.name or f"<unnamed switch #{s.id}>",
+            )
+            for s in switches
+        ]
         ports = ", ".join(p.switch_port.name for p in patch_ports)
     else:
-        switches = None
+        switch_links = []
         ports = None
     return HostRow(
         id=host.id,
         name=host.name,
-        switch=switches,
+        switch=switch_links,
         port=ports,
         actions=[
             BtnColResponse(
diff --git a/web/blueprints/host/tables.py b/web/blueprints/host/tables.py
index 44d9713c4..5bad8a126 100644
--- a/web/blueprints/host/tables.py
+++ b/web/blueprints/host/tables.py
@@ -11,6 +11,8 @@
     button_toolbar,
     MultiBtnColumn,
     BtnColResponse,
+    MultiLinkColumn,
+    LinkColResponse,
 )
 
 
@@ -18,7 +20,7 @@ class HostTable(BootstrapTable):
     """A table for displaying hosts
     """
     name = Column("Name")
-    switch = Column("Switch")
+    switch = MultiLinkColumn("Switch")
     port = Column("SwitchPort")
     actions = MultiBtnColumn("Aktionen", hide_if=no_hosts_change, width=3)
     interfaces_table_link = Column("", hide_if=lambda: True)
@@ -49,7 +51,7 @@ def toolbar(self) -> HasDunderStr | None:
 
 class HostRow(BaseModel):
     name: str | None = None
-    switch: str | None = None
+    switch: list[LinkColResponse] | None = None
     port: str | None = None
     actions: list[BtnColResponse]
     interfaces_table_link: str
diff --git a/web/resources/js/table.js b/web/resources/js/table.js
index 1fb4ff94d..e40182dbd 100644
--- a/web/resources/js/table.js
+++ b/web/resources/js/table.js
@@ -174,6 +174,16 @@ export function multiBtnFormatter(value, row, index) {
     return btnFormatter(value, row, index);
 }
 
+export function multiLinkFormatter(value, row, index) {
+    if (!value) {
+        return;
+    }
+    if (Array.isArray(value)) {
+        return value.map(v => linkFormatter(v, row, index)).join('&nbsp;');
+    }
+    return linkFormatter(value, row, index);
+}
+
 export function listFormatter(value, row, index) {
     if (!value) {
         return;
diff --git a/web/table/table.py b/web/table/table.py
index 6b2491fcf..67a131be2 100644
--- a/web/table/table.py
+++ b/web/table/table.py
@@ -191,6 +191,13 @@ def value(
             ...
 
 
+@custom_formatter_column("table.multiLinkFormatter")
+class MultiLinkColumn(Column):
+    def __init__(self, *a: t.Any, **kw: t.Any) -> None:
+        kw.setdefault("sortable", False)
+        super().__init__(*a, **kw)
+
+
 
 @custom_formatter_column('table.dateFormatter')
 class DateColumn(Column):