Fix the poll for the API ReadyForShutdown even after logout (#8004)

harikrishna-patnala · web-flow · commit 285387105ff0 · 2023-09-28T12:13:22.000+05:30
diff --git a/plugins/shutdown/src/main/java/org/apache/cloudstack/api/command/ReadyForShutdownCmd.java b/plugins/shutdown/src/main/java/org/apache/cloudstack/api/command/ReadyForShutdownCmd.java
@@ -30,7 +30,7 @@
 import com.cloud.user.Account;
 
 @APICommand(name = ReadyForShutdownCmd.APINAME,
-            description = "Returs the status of CloudStack, whether a shutdown has been triggered and if ready to shutdown",
+            description = "Returns the status of CloudStack, whether a shutdown has been triggered and if ready to shutdown",
             since = "4.19.0",
             responseObject = ReadyForShutdownResponse.class,
             requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
diff --git a/ui/src/components/page/GlobalLayout.vue b/ui/src/components/page/GlobalLayout.vue
@@ -199,7 +199,8 @@ export default {
   created () {
     this.menus = this.mainMenu.find((item) => item.path === '/').children
     this.collapsed = !this.sidebarOpened
-    setInterval(this.checkShutdown, 5000)
+    const readyForShutdownPollingJob = setInterval(this.checkShutdown, 5000)
+    this.$store.commit('SET_READY_FOR_SHUTDOWN_POLLING_JOB', readyForShutdownPollingJob)
   },
   mounted () {
     const layoutMode = this.$config.theme['@layout-mode'] || 'light'
diff --git a/ui/src/store/getters.js b/ui/src/store/getters.js
@@ -50,7 +50,8 @@ const getters = {
   twoFaIssuer: state => state.user.twoFaIssuer,
   loginFlag: state => state.user.loginFlag,
   allProjects: (state) => state.app.allProjects,
-  customHypervisorName: state => state.user.customHypervisorName
+  customHypervisorName: state => state.user.customHypervisorName,
+  readyForShutdownPollingJob: state => state.user.readyForShutdownPollingJob
 }
 
 export default getters
diff --git a/ui/src/store/modules/app.js b/ui/src/store/modules/app.js
@@ -130,6 +130,9 @@ const app = {
     },
     SET_SHUTDOWN_TRIGGERED: (state, shutdownTriggered) => {
       state.shutdownTriggered = shutdownTriggered
+    },
+    SET_READY_FOR_SHUTDOWN_POLLING_JOB: (state, readyForShutdownPollingJob) => {
+      state.readyForShutdownPollingJob = readyForShutdownPollingJob
     }
   },
   actions: {
@@ -192,6 +195,9 @@ const app = {
     },
     SetShutdownTriggered ({ commit }, bool) {
       commit('SET_SHUTDOWN_TRIGGERED', bool)
+    },
+    SetReadyForShutdownPollingJob ({ commit }, job) {
+      commit('SET_READY_FOR_SHUTDOWN_POLLING_JOB', job)
     }
   }
 }
diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js
@@ -65,7 +65,8 @@ const user = {
     twoFaEnabled: false,
     twoFaProvider: '',
     twoFaIssuer: '',
-    customHypervisorName: 'Custom'
+    customHypervisorName: 'Custom',
+    readyForShutdownPollingJob: ''
   },
 
   mutations: {
@@ -155,6 +156,9 @@ const user = {
     },
     SET_CUSTOM_HYPERVISOR_NAME (state, name) {
       state.customHypervisorName = name
+    },
+    SET_READY_FOR_SHUTDOWN_POLLING_JOB: (state, job) => {
+      state.readyForShutdownPollingJob = job
     }
   },
 
diff --git a/ui/src/views/auth/Login.vue b/ui/src/views/auth/Login.vue
@@ -189,6 +189,9 @@ export default {
     }
     this.initForm()
     if (store.getters.logoutFlag) {
+      if (store.getters.readyForShutdownPollingJob !== '' || store.getters.readyForShutdownPollingJob !== undefined) {
+        clearInterval(store.getters.readyForShutdownPollingJob)
+      }
       sourceToken.init()
       this.fetchData()
     } else {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@ const getters = {`
`50`	`50`	`twoFaIssuer: state => state.user.twoFaIssuer,`
`51`	`51`	`loginFlag: state => state.user.loginFlag,`
`52`	`52`	`allProjects: (state) => state.app.allProjects,`
`53`		`- customHypervisorName: state => state.user.customHypervisorName`
	`53`	`+ customHypervisorName: state => state.user.customHypervisorName,`
	`54`	`+ readyForShutdownPollingJob: state => state.user.readyForShutdownPollingJob`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`export default getters`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,9 @@ const app = {`
`130`	`130`	`},`
`131`	`131`	`SET_SHUTDOWN_TRIGGERED: (state, shutdownTriggered) => {`
`132`	`132`	`state.shutdownTriggered = shutdownTriggered`
	`133`	`+ },`
	`134`	`+ SET_READY_FOR_SHUTDOWN_POLLING_JOB: (state, readyForShutdownPollingJob) => {`
	`135`	`+ state.readyForShutdownPollingJob = readyForShutdownPollingJob`
`133`	`136`	`}`
`134`	`137`	`},`
`135`	`138`	`actions: {`
`@@ -192,6 +195,9 @@ const app = {`
`192`	`195`	`},`
`193`	`196`	`SetShutdownTriggered ({ commit }, bool) {`
`194`	`197`	`commit('SET_SHUTDOWN_TRIGGERED', bool)`
	`198`	`+ },`
	`199`	`+ SetReadyForShutdownPollingJob ({ commit }, job) {`
	`200`	`+ commit('SET_READY_FOR_SHUTDOWN_POLLING_JOB', job)`
`195`	`201`	`}`
`196`	`202`	`}`
`197`	`203`	`}`