From db2bda313fa77880be744f5c3991ccc7c25b46e9 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Tue, 2 Aug 2022 16:16:57 +0530
Subject: [PATCH 1/4] ui: fix icon for vr migrate storage (#6600)

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
---
 ui/src/config/section/infra/routers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/config/section/infra/routers.js b/ui/src/config/section/infra/routers.js
index 50186367aa9..e7e156a930f 100644
--- a/ui/src/config/section/infra/routers.js
+++ b/ui/src/config/section/infra/routers.js
@@ -190,7 +190,7 @@ export default {
     },
     {
       api: 'migrateSystemVm',
-      icon: 'drag',
+      icon: 'drag-outlined',
       label: 'label.action.migrate.systemvm.to.ps',
       dataView: true,
       show: (record, store) => { return ['Stopped'].includes(record.state) && ['VMware'].includes(record.hypervisor) },

From 06ff472906efb3ff814c6e6f7a72f1e871bfafdf Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <hoangnm@unitech.vn>
Date: Wed, 3 Aug 2022 17:01:16 +0700
Subject: [PATCH 2/4] UI: Fixes notification error can't close when exit config
 limit tab (#6607)

* fixed an error that generated incorrect messages when accessing the config limit tab

* removed deep:true
---
 ui/src/components/view/ResourceLimitTab.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/src/components/view/ResourceLimitTab.vue b/ui/src/components/view/ResourceLimitTab.vue
index b20f00e39a8..0c09a14fcd5 100644
--- a/ui/src/components/view/ResourceLimitTab.vue
+++ b/ui/src/components/view/ResourceLimitTab.vue
@@ -84,7 +84,6 @@ export default {
   },
   watch: {
     resource: {
-      deep: true,
       handler (newData) {
         if (!newData || !newData.id) {
           return

From 3220efe815de15e8f3b3b5a19cc4ead005cf4d09 Mon Sep 17 00:00:00 2001
From: "Rodrigo D. Lopez" <19981369+RodrigoDLopez@users.noreply.github.com>
Date: Wed, 3 Aug 2022 07:48:14 -0300
Subject: [PATCH 3/4] apidocs: Shows quotaSummary in API documentation (#6605)

Co-authored-by: Lopez <rodrigo@scclouds.com.br>
---
 tools/apidoc/gen_toc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
index 18996028182..45f1e065656 100644
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@ -221,7 +221,7 @@ for f in sys.argv:
     dirname, fn = os.path.split(f)
     if not fn.endswith('.xml'):
         continue
-    if fn.endswith('Summary.xml'):
+    if fn.endswith('Summary.xml') and fn != 'quotaSummary.xml':
         continue
     if fn.endswith('SummarySorted.xml'):
         continue

From 7d50b65674c47fb10919a5ae3e9b514688798c21 Mon Sep 17 00:00:00 2001
From: Nicolas Vazquez <nicovazquez90@gmail.com>
Date: Wed, 3 Aug 2022 08:14:31 -0300
Subject: [PATCH 4/4] UI: Fix delete ISO navigation after job is finished
 (#6598)

* UI: Fix delete ISO navigation after job is finished

* Apply suggestion

* Fix redirection
---
 ui/src/views/image/IsoZones.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/ui/src/views/image/IsoZones.vue b/ui/src/views/image/IsoZones.vue
index 7ca07ebb4be..8c9df643542 100644
--- a/ui/src/views/image/IsoZones.vue
+++ b/ui/src/views/image/IsoZones.vue
@@ -206,6 +206,7 @@ export default {
       selectedColumns: [],
       filterColumns: ['Status', 'Ready'],
       showConfirmationAction: false,
+      redirectOnFinish: true,
       message: {
         title: this.$t('label.action.bulk.delete.isos'),
         confirmMessage: this.$t('label.confirm.delete.isos')
@@ -340,6 +341,14 @@ export default {
       this.selectedRowKeys = []
       this.fetchData()
       if (this.dataSource.length === 0) {
+        this.moveToPreviousView()
+        this.redirectOnFinish = false
+      }
+    },
+    async moveToPreviousView () {
+      const lastPath = this.$router.currentRoute.value.fullPath
+      const navigationResult = await this.$router.go(-1)
+      if (navigationResult !== undefined || this.$router.currentRoute.value.fullPath === lastPath) {
         this.$router.go(-1)
       }
     },
@@ -372,14 +381,15 @@ export default {
         const jobId = json.deleteisoresponse.jobid
         eventBus.emit('update-job-details', { jobId, resourceId: null })
         const singleZone = (this.dataSource.length === 1)
+        this.redirectOnFinish = true
         this.$pollJob({
           jobId,
           title: this.$t('label.action.delete.iso'),
           description: this.resource.name,
           successMethod: result => {
             if (singleZone) {
-              if (this.selectedItems.length === 0) {
-                this.$router.go(-1)
+              if (this.selectedItems.length === 0 && this.redirectOnFinish) {
+                this.moveToPreviousView()
               }
             } else {
               if (this.selectedItems.length === 0) {
@@ -388,6 +398,9 @@ export default {
             }
             if (this.selectedItems.length > 0) {
               eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource: record.zoneid, state: 'success' })
+              if (this.selectedItems.length === this.zones.length && this.redirectOnFinish) {
+                this.moveToPreviousView()
+              }
             }
           },
           errorMethod: () => {