ui: Fix non admin logouts (apache#8065)

harikrishna-patnala · yadvr · commit 84fee7b89639 · 2023-10-11T21:03:09.000+05:30
If a user (non-admin) logs out from a session, then login page is not loading completely. Few starter APIs like listIds are failing and showing unauthorised access notification in Login Page. Also if SAML is enabled, it is not getting enabled since the corresponding API are failed. User needs to refresh the browser to get it back. (cherry picked from commit 8b28128) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/ui/src/views/dashboard/UsageDashboard.vue b/ui/src/views/dashboard/UsageDashboard.vue
@@ -142,7 +142,7 @@ export default {
       (newValue, oldValue) => {
         if (newValue && newValue.id && (!oldValue || newValue.id !== oldValue.id)) {
           this.fetchData()
-        } else if (store.getters.userInfo.roletype !== 'Admin') {
+        } else if (store.getters.userInfo.roletype !== 'Admin' && !store.getters.logoutFlag) {
           this.fetchData()
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ export default {`
`142`	`142`	`(newValue, oldValue) => {`
`143`	`143`	`if (newValue && newValue.id && (!oldValue \|\| newValue.id !== oldValue.id)) {`
`144`	`144`	`this.fetchData()`
`145`		`- } else if (store.getters.userInfo.roletype !== 'Admin') {`
	`145`	`+ } else if (store.getters.userInfo.roletype !== 'Admin' && !store.getters.logoutFlag) {`
`146`	`146`	`this.fetchData()`
`147`	`147`	`}`
`148`	`148`	`}`