Merge remote-tracking branch 'apache/4.17' into main

Author: shwstppr

tools/apidoc/gen_toc.py

@@ -221,7 +221,7 @@ def choose_category(fn):
     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

ui/src/components/view/ResourceLimitTab.vue

@@ -84,7 +84,6 @@ export default {
   },
   watch: {
     resource: {
-      deep: true,
       handler (newData) {
         if (!newData || !newData.id) {
           return

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) },

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: () => {