From 5f29065af93a3444e433615caf144ab80ece9001 Mon Sep 17 00:00:00 2001
From: Chinmay Soni <chinmaysoni227@gmail.com>
Date: Fri, 17 Jul 2026 10:41:57 +0000
Subject: [PATCH 1/4] fix(ui): restore Account column hyperlink routing in list
 views (#13639)

---
 ui/src/components/view/ListView.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index c5346390f178..6cddff9c3195 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -695,12 +695,20 @@
             <router-link
               v-if="$route.path.startsWith('/quotasummary') && $router.resolve(`${$route.path}/${record.accountid}`).matched[0].redirect !== '/exception/404'"
               :to="{ path: `${$route.path}/${record.accountid}` }">{{ text }}</router-link>
+            <router-link
+              v-else-if="$store.getters.userInfo.roletype !== 'User'"
+              :to="{ path: '/account', query: { name: text, domainid: record.domainid, dataView: true } }"
+            >{{ text }}</router-link>
             <span v-else>{{ text }}</span>
           </template>
           <template v-else>
             <router-link
               v-if="$route.path.startsWith('/quotasummary') && $router.resolve(`${$route.path}/${record.accountid}`).matched[0].redirect !== '/exception/404'"
               :to="{ path: `${$route.path}/${record.accountid}` }">{{ (record.projectname || record.account).concat(' (').concat($t('label.project')).concat(')') }}</router-link>
+            <router-link
+              v-else-if="$store.getters.userInfo.roletype !== 'User'"
+              :to="{ path: '/account', query: { name: text, domainid: record.domainid, dataView: true } }"
+            >{{ (record.projectname || record.account).concat(' (').concat($t('label.project')).concat(')') }}</router-link>
             <span v-else>{{ text }}</span>
           </template>
         </template>

From 4de326ae966b768d7e711e1dfe38539d8d38f144 Mon Sep 17 00:00:00 2001
From: Chinmay Soni <chinmaysoni227@gmail.com>
Date: Fri, 17 Jul 2026 15:10:58 +0000
Subject: [PATCH 2/4] fix(ui): use v-else-if for Account column routing per
 maintainer review

---
 ui/src/components/view/ListView.vue | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index 6cddff9c3195..18c8f70fb3a5 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -655,8 +655,7 @@
       <template v-if="column.key === 'usageType'">
         {{ usageTypeMap[record.usagetype] }}
       </template>
-
-      <template v-if="column.key === 'clustername'">
+<template v-if="column.key === 'clustername'">
         <router-link :to="{ path: '/cluster/' + record.clusterid }">{{ text }}</router-link>
       </template>
       <template v-if="column.key === 'objectstore'">
@@ -690,26 +689,23 @@
             </span>
           </template>
         </template>
-        <template v-if="text">
+        <template v-else-if="text">
           <template v-if="!text.startsWith('PrjAcct-')">
             <router-link
-              v-if="$route.path.startsWith('/quotasummary') && $router.resolve(`${$route.path}/${record.accountid}`).matched[0].redirect !== '/exception/404'"
+              v-if="$route.path.startsWith('/quotasummary')"
               :to="{ path: `${$route.path}/${record.accountid}` }">{{ text }}</router-link>
+            <router-link v-else-if="record.accountid" :to="{ path: '/account/' + record.accountid }">{{ text }}</router-link>
             <router-link
               v-else-if="$store.getters.userInfo.roletype !== 'User'"
-              :to="{ path: '/account', query: { name: text, domainid: record.domainid, dataView: true } }"
-            >{{ text }}</router-link>
+              :to="{ path: '/account', query: { name: record.account, domainid: record.domainid, dataView: true } }">
+              {{ text }}
+            </router-link>
             <span v-else>{{ text }}</span>
           </template>
-          <template v-else>
-            <router-link
-              v-if="$route.path.startsWith('/quotasummary') && $router.resolve(`${$route.path}/${record.accountid}`).matched[0].redirect !== '/exception/404'"
-              :to="{ path: `${$route.path}/${record.accountid}` }">{{ (record.projectname || record.account).concat(' (').concat($t('label.project')).concat(')') }}</router-link>
-            <router-link
-              v-else-if="$store.getters.userInfo.roletype !== 'User'"
-              :to="{ path: '/account', query: { name: text, domainid: record.domainid, dataView: true } }"
-            >{{ (record.projectname || record.account).concat(' (').concat($t('label.project')).concat(')') }}</router-link>
-            <span v-else>{{ text }}</span>
+          <template v-else-if="$route.path.startsWith('/quotasummary')">
+            <router-link :to="{ path: `${$route.path}/${record.accountid}` }">
+              {{ (record.projectname || record.account).concat(' (').concat($t('label.project')).concat(')') }}
+            </router-link>
           </template>
         </template>
       </template>

From 9e98d686e8830b799f4b32f67f2feb83ba27e1eb Mon Sep 17 00:00:00 2001
From: Chinmay Soni <chinmaysoni227@gmail.com>
Date: Sat, 18 Jul 2026 05:20:58 +0000
Subject: [PATCH 3/4] refactor(ui): revert whitespace noise and restore v-if
 directive

---
 ui/src/components/view/ListView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index 18c8f70fb3a5..4ba867a1a9f5 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -689,7 +689,7 @@
             </span>
           </template>
         </template>
-        <template v-else-if="text">
+        <template v-if="text">
           <template v-if="!text.startsWith('PrjAcct-')">
             <router-link
               v-if="$route.path.startsWith('/quotasummary')"

From 0c7e66e67ec1127a921a35804769b0729199bad5 Mon Sep 17 00:00:00 2001
From: Fabricio Duarte <fabricio.duarte.jr@gmail.com>
Date: Sun, 19 Jul 2026 21:54:26 -0300
Subject: [PATCH 4/4] Revert indentation changes

---
 ui/src/components/view/ListView.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index 4ba867a1a9f5..f6fd6be3583a 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -655,7 +655,8 @@
       <template v-if="column.key === 'usageType'">
         {{ usageTypeMap[record.usagetype] }}
       </template>
-<template v-if="column.key === 'clustername'">
+
+      <template v-if="column.key === 'clustername'">
         <router-link :to="{ path: '/cluster/' + record.clusterid }">{{ text }}</router-link>
       </template>
       <template v-if="column.key === 'objectstore'">