From f0993ce098fe906692c90540eca37cf918123586 Mon Sep 17 00:00:00 2001
From: David Jumani <dj.davidjumani1994@gmail.com>
Date: Fri, 25 Mar 2022 20:08:20 +0530
Subject: [PATCH] ui: Remove misleading links for users (#6159)

---
 ui/src/components/view/ListView.vue | 92 ++++++++++-------------------
 1 file changed, 31 insertions(+), 61 deletions(-)

diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index c97a16f0277..fa1f7da7ddc 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -116,35 +116,29 @@
       </span>
     </template>
     <template #templatetype="{ text, record }">
-      <a href="javascript:;">
-        <router-link :to="{ path: $route.path + '/' + record.templatetype }">{{ text }}</router-link>
-      </a>
+      <router-link :to="{ path: $route.path + '/' + record.templatetype }">{{ text }}</router-link>
     </template>
     <template #type="{ text }">
       <span v-if="['USER.LOGIN', 'USER.LOGOUT', 'ROUTER.HEALTH.CHECKS', 'FIREWALL.CLOSE', 'ALERT.SERVICE.DOMAINROUTER'].includes(text)">{{ $t(text.toLowerCase()) }}</span>
       <span v-else>{{ text }}</span>
     </template>
     <template #displayname="{text, record}">
-      <a href="javascript:;">
-        <QuickView
-          style="margin-left: 5px"
-          :actions="actions"
-          :resource="record"
-          :enabled="quickViewEnabled() && actions.length > 0 && columns && columns[0].dataIndex === 'displayname' "
-          @exec-action="$parent.execAction"/>
-        <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
-      </a>
+      <QuickView
+        style="margin-left: 5px"
+        :actions="actions"
+        :resource="record"
+        :enabled="quickViewEnabled() && actions.length > 0 && columns && columns[0].dataIndex === 'displayname' "
+        @exec-action="$parent.execAction"/>
+      <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
     </template>
     <template #username="{text, record}">
-      <a href="javascript:;">
-        <span v-if="$showIcon() && !['vm'].includes($route.path.split('/')[1])" style="margin-right: 5px">
-          <resource-icon v-if="$showIcon() && record.icon && record.icon.base64image" :image="record.icon.base64image" size="1x"/>
-          <user-outlined v-else style="font-size: 16px;" />
-        </span>
-        <router-link :to="{ path: $route.path + '/' + record.id }" v-if="['/accountuser', '/vpnuser'].includes($route.path)">{{ text }}</router-link>
-        <router-link :to="{ path: '/accountuser', query: { username: record.username, domainid: record.domainid } }" v-else-if="$store.getters.userInfo.roletype !== 'User'">{{ text }}</router-link>
-        <span v-else>{{ text }}</span>
-      </a>
+      <span v-if="$showIcon() && !['vm'].includes($route.path.split('/')[1])" style="margin-right: 5px">
+        <resource-icon v-if="$showIcon() && record.icon && record.icon.base64image" :image="record.icon.base64image" size="1x"/>
+        <user-outlined v-else style="font-size: 16px;" />
+      </span>
+      <router-link :to="{ path: $route.path + '/' + record.id }" v-if="['/accountuser', '/vpnuser'].includes($route.path)">{{ text }}</router-link>
+      <router-link :to="{ path: '/accountuser', query: { username: record.username, domainid: record.domainid } }" v-else-if="$store.getters.userInfo.roletype !== 'User'">{{ text }}</router-link>
+      <span v-else>{{ text }}</span>
     </template>
     <template #entityid="{ record }" href="javascript:;">
       <router-link :to="{ path: generateCommentsPath(record), query: { tab: 'comments' } }">{{ record.entityname }}</router-link>
@@ -168,22 +162,16 @@
       <span>{{ ipV6Address(text, record) }}</span>
     </template>
     <template #publicip="{ text, record }">
-      <a href="javascript:;">
-        <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
-      </a>
+      <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
     </template>
     <template #traffictype="{ text }" href="javascript:;">
       {{ text }}
     </template>
     <template #vmname="{ text, record }">
-      <a href="javascript:;">
-        <router-link :to="{ path: '/vm/' + record.virtualmachineid }">{{ text }}</router-link>
-      </a>
+      <router-link :to="{ path: '/vm/' + record.virtualmachineid }">{{ text }}</router-link>
     </template>
     <template #virtualmachinename="{ text, record }">
-      <a href="javascript:;">
-        <router-link :to="{ path: '/vm/' + record.virtualmachineid }">{{ text }}</router-link>
-      </a>
+      <router-link :to="{ path: '/vm/' + record.virtualmachineid }">{{ text }}</router-link>
     </template>
     <template #hypervisor="{ text, record }">
       <span v-if="$route.name === 'hypervisorcapability'">
@@ -208,32 +196,22 @@
       <status :text="text ? text : ''" displayText />
     </template>
     <template #guestnetworkname="{ text, record }">
-      <a href="javascript:;">
-        <router-link :to="{ path: '/guestnetwork/' + record.guestnetworkid }">{{ text }}</router-link>
-      </a>
+      <router-link :to="{ path: '/guestnetwork/' + record.guestnetworkid }">{{ text }}</router-link>
     </template>
     <template #associatednetworkname="{ text, record }">
-      <a href="javascript:;">
-        <router-link :to="{ path: '/guestnetwork/' + record.associatednetworkid }">{{ text }}</router-link>
-      </a>
+      <router-link :to="{ path: '/guestnetwork/' + record.associatednetworkid }">{{ text }}</router-link>
     </template>
     <template #vpcname="{ text, record }">
-      <a href="javascript:;">
-        <router-link :to="{ path: '/vpc/' + record.vpcid }">{{ text }}</router-link>
-      </a>
+      <router-link :to="{ path: '/vpc/' + record.vpcid }">{{ text }}</router-link>
     </template>
     <template #hostname="{ text, record }">
-      <a href="javascript:;">
-        <router-link v-if="record.hostid" :to="{ path: '/host/' + record.hostid }">{{ text }}</router-link>
-        <router-link v-else-if="record.hostname" :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
-        <span v-else>{{ text }}</span>
-      </a>
+      <router-link v-if="record.hostid" :to="{ path: '/host/' + record.hostid }">{{ text }}</router-link>
+      <router-link v-else-if="record.hostname" :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
+      <span v-else>{{ text }}</span>
     </template>
     <template #storage="{ text, record }">
-      <a href="javascript:;">
-        <router-link v-if="record.storageid" :to="{ path: '/storagepool/' + record.storageid }">{{ text }}</router-link>
-        <span v-else>{{ text }}</span>
-      </a>
+      <router-link v-if="record.storageid" :to="{ path: '/storagepool/' + record.storageid }">{{ text }}</router-link>
+      <span v-else>{{ text }}</span>
     </template>
 
     <template
@@ -255,20 +233,14 @@
     </template>
 
     <template #level="{ text, record }">
-      <a href="javascript:;">
-        <router-link :to="{ path: '/event/' + record.id }">{{ text }}</router-link>
-      </a>
+      <router-link :to="{ path: '/event/' + record.id }">{{ text }}</router-link>
     </template>
 
     <template #clustername="{ text, record }">
-      <a href="javascript:;">
-        <router-link :to="{ path: '/cluster/' + record.clusterid }">{{ text }}</router-link>
-      </a>
+      <router-link :to="{ path: '/cluster/' + record.clusterid }">{{ text }}</router-link>
     </template>
     <template #podname="{ text, record }">
-      <a href="javascript:;">
-        <router-link :to="{ path: '/pod/' + record.podid }">{{ text }}</router-link>
-      </a>
+      <router-link :to="{ path: '/pod/' + record.podid }">{{ text }}</router-link>
     </template>
     <template #account="{ text, record }">
       <template v-if="record.owner">
@@ -300,10 +272,8 @@
       <span v-else>{{ text }}</span>
     </template>
     <template #zone="{ text, record }">
-      <a href="javascript:;">
-        <router-link v-if="record.zoneid && !record.zoneid.includes(',') && $router.resolve('/zone/' + record.zoneid).matched[0].redirect !== '/exception/404'" :to="{ path: '/zone/' + record.zoneid }">{{ text }}</router-link>
-        <span v-else>{{ text }}</span>
-      </a>
+      <router-link v-if="record.zoneid && !record.zoneid.includes(',') && $router.resolve('/zone/' + record.zoneid).matched[0].redirect !== '/exception/404'" :to="{ path: '/zone/' + record.zoneid }">{{ text }}</router-link>
+      <span v-else>{{ text }}</span>
     </template>
     <template #zonename="{ text, record }">
       <router-link v-if="$router.resolve('/zone/' + record.zoneid).matched[0].redirect !== '/exception/404'" :to="{ path: '/zone/' + record.zoneid }">{{ text }}</router-link>