From b69292c376bd97d0d00b004493d8853551b2c107 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <hoangnm@unitech.vn>
Date: Tue, 4 Oct 2022 12:23:39 +0700
Subject: [PATCH 1/2] ui: disable getResource in login page (#6788)

Fixes #6731
---
 ui/src/components/view/InfoCard.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index 02385ff174a..b16beb0821c 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -764,7 +764,10 @@ export default {
     }
   },
   watch: {
-    '$route.fullPath': function () {
+    '$route.fullPath': function (path) {
+      if (path === '/user/login') {
+        return
+      }
       this.getIcons()
     },
     resource: {

From 6a0c9079ed3168f7e9cf62d20f03da172df02fae Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <hoangnm@unitech.vn>
Date: Tue, 4 Oct 2022 12:25:03 +0700
Subject: [PATCH 2/2] ui: fixes ui style on Edge (#6791)

Fixes #6787
---
 ui/src/views/infra/network/IpRangesTabGuest.vue      | 1 -
 ui/src/views/infra/network/IpRangesTabManagement.vue | 1 -
 ui/src/views/infra/network/IpRangesTabPublic.vue     | 1 -
 ui/src/views/infra/network/IpRangesTabStorage.vue    | 1 -
 4 files changed, 4 deletions(-)

diff --git a/ui/src/views/infra/network/IpRangesTabGuest.vue b/ui/src/views/infra/network/IpRangesTabGuest.vue
index 79464de69bd..4de5fd25ed9 100644
--- a/ui/src/views/infra/network/IpRangesTabGuest.vue
+++ b/ui/src/views/infra/network/IpRangesTabGuest.vue
@@ -80,7 +80,6 @@
     <a-pagination
       class="row-element pagination"
       size="small"
-      style="overflow-y: auto"
       :current="page"
       :pageSize="pageSize"
       :total="total"
diff --git a/ui/src/views/infra/network/IpRangesTabManagement.vue b/ui/src/views/infra/network/IpRangesTabManagement.vue
index 9852433c527..e7abfa85549 100644
--- a/ui/src/views/infra/network/IpRangesTabManagement.vue
+++ b/ui/src/views/infra/network/IpRangesTabManagement.vue
@@ -53,7 +53,6 @@
     <a-pagination
       class="row-element pagination"
       size="small"
-      style="overflow-y: auto"
       :current="page"
       :pageSize="pageSize"
       :total="total"
diff --git a/ui/src/views/infra/network/IpRangesTabPublic.vue b/ui/src/views/infra/network/IpRangesTabPublic.vue
index df78eba9935..247a8faf0d4 100644
--- a/ui/src/views/infra/network/IpRangesTabPublic.vue
+++ b/ui/src/views/infra/network/IpRangesTabPublic.vue
@@ -91,7 +91,6 @@
     <a-pagination
       class="row-element pagination"
       size="small"
-      style="overflow-y: auto"
       :current="page"
       :pageSize="pageSize"
       :total="total"
diff --git a/ui/src/views/infra/network/IpRangesTabStorage.vue b/ui/src/views/infra/network/IpRangesTabStorage.vue
index 4d660714e0a..29e146dc4ce 100644
--- a/ui/src/views/infra/network/IpRangesTabStorage.vue
+++ b/ui/src/views/infra/network/IpRangesTabStorage.vue
@@ -50,7 +50,6 @@
     <a-pagination
       class="row-element pagination"
       size="small"
-      style="overflow-y: auto"
       :current="page"
       :pageSize="pageSize"
       :total="total"