Clubbed the conditions

harikrishna-patnala · harikrishna-patnala · commit 2c62676beefa · 2023-10-11T09:39:21.000+05:30
diff --git a/ui/src/views/dashboard/UsageDashboard.vue b/ui/src/views/dashboard/UsageDashboard.vue
@@ -142,10 +142,8 @@ export default {
       (newValue, oldValue) => {
         if (newValue && newValue.id && (!oldValue || newValue.id !== oldValue.id)) {
           this.fetchData()
-        } else if (store.getters.userInfo.roletype !== 'Admin') {
-          if (!store.getters.logoutFlag) {
-            this.fetchData()
-          }
+        } else if (store.getters.userInfo.roletype !== 'Admin' && !store.getters.logoutFlag) {
+          this.fetchData()
         }
       }
     )

Original file line number	Diff line number	Diff line change
`@@ -142,10 +142,8 @@ 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') {`
`146`		`- if (!store.getters.logoutFlag) {`
`147`		`- this.fetchData()`
`148`		`- }`
	`145`	`+ } else if (store.getters.userInfo.roletype !== 'Admin' && !store.getters.logoutFlag) {`
	`146`	`+ this.fetchData()`
`149`	`147`	`}`
`150`	`148`	`}`
`151`	`149`	`)`