From 06ec0f4237dd926509df95458492a7c73c5974f9 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Tue, 20 Aug 2024 17:16:24 +0530
Subject: [PATCH] ui: show guest networks for guest vlans list

Fixes #7247

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 ui/src/components/view/ListView.vue | 6 ++++++
 ui/src/config/section/network.js    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index ff2e385f03ca..087c547aa692 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -240,6 +240,12 @@
       <template v-if="column.key === 'guestnetworkname'">
         <router-link :to="{ path: '/guestnetwork/' + record.guestnetworkid }">{{ text }}</router-link>
       </template>
+      <template v-if="column.key === 'guest.networks' && record.network">
+        <template v-for="(item, idx) in record.network" :key="idx">
+          <router-link :to="{ path: '/guestnetwork/' + item.id }">{{ item.name }}</router-link>
+          <span v-if="idx < (record.network.length - 1)">, </span>
+        </template>
+      </template>
       <template v-if="column.key === 'associatednetworkname'">
         <router-link :to="{ path: '/guestnetwork/' + record.associatednetworkid }">{{ text }}</router-link>
       </template>
diff --git a/ui/src/config/section/network.js b/ui/src/config/section/network.js
index 8399d9769ef8..fd1b15557aff 100644
--- a/ui/src/config/section/network.js
+++ b/ui/src/config/section/network.js
@@ -1364,7 +1364,7 @@ export default {
       permission: ['listGuestVlans'],
       resourceType: 'GuestVlan',
       filters: ['allocatedonly', 'all'],
-      columns: ['vlan', 'allocationstate', 'physicalnetworkname', 'taken', 'account', 'project', 'domain', 'zonename'],
+      columns: ['vlan', 'allocationstate', 'physicalnetworkname', 'taken', 'account', 'project', 'domain', 'zonename', 'guest.networks'],
       details: ['vlan', 'allocationstate', 'physicalnetworkname', 'taken', 'account', 'project', 'domain', 'isdedicated', 'zonename'],
       searchFilters: ['zoneid'],
       tabs: [{