[mikrotik-sdwan] fix route comments/labels

Author: geoffhouse

src/modules/mikrotik-sdwan/TODO.md

@@ -1,4 +1,3 @@
-- add panel status (default/success etc)
 - need to think about resetting connection table
 - do I want to show the hostname or ip address if the entry row is tall enough
 - maybe a details page with a bugdetailspage showing the entry info

src/modules/mikrotik-sdwan/client/components/RouteList.jsx

@@ -1,4 +1,4 @@
-import { Box, Button } from "@mui/material";
+import { Box, Button, Stack } from "@mui/material";
 
 export default function RouteList({ panelId, routes }) {
     if (routes?.status === "loading" || routes?.status !== "success") {
@@ -57,7 +57,10 @@ export default function RouteList({ panelId, routes }) {
                                         cursor: "default",
                                     }}
                                 >
-                                    {route.comment}
+                                    <Stack>
+                                        <Box>{route.label}</Box>
+                                        <Box sx={{ opacity: 0.5 }}>{route.dynamic ? "DYNAMIC" : "STATIC"}</Box>
+                                    </Stack>
                                 </Button>
                             );
                         })}

src/modules/mikrotik-sdwan/container/services/route-list.js

@@ -14,12 +14,15 @@ module.exports = async () => {
 
         return dbRoutes
             .map((route) => {
-                const gatewayLabel = route?.['immediate-gw'].includes('%') ? route?.['immediate-gw'].split('%', 2).slice(1).join('%') : '';
+                let label = route.comment;
+                if (!label) {
+                    label = route?.['immediate-gw'].includes('%') ? route?.['immediate-gw'].split('%', 2).slice(1).join('%') : '';
+                }
 
                 return {
                     id: route.id,
                     comment: route.comment,
-                    label: gatewayLabel,
+                    label: label,
                     interface: route.interface,
                     distance: route.distance,
                     disabled: route.disabled,