image: Hide status column for users other than Root admin (apache#480)

Pearl1594 · yadvr · commit 84cba65c0ea1 · 2021-01-20T07:06:20.000+05:30
Fixes apache#476 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/ui/src/config/section/image.js b/ui/src/config/section/image.js
@@ -33,7 +33,7 @@ export default {
       resourceType: 'Template',
       filters: ['self', 'shared', 'featured', 'community'],
       columns: () => {
-        var fields = ['name', 'ostypename', 'status', 'hypervisor', 'account', 'domain']
+        var fields = ['name', 'ostypename', 'hypervisor', 'account', 'domain']
         if (['Admin'].includes(store.getters.userInfo.roletype)) {
           fields.push('order')
         }
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
@@ -582,9 +582,11 @@ export default {
         if (!this.items || this.items.length === 0) {
           this.items = []
         }
+
         if (['listTemplates', 'listIsos'].includes(this.apiName) && this.items.length > 1) {
           this.items = [...new Map(this.items.map(x => [x.id, x])).values()]
         }
+
         for (let idx = 0; idx < this.items.length; idx++) {
           this.items[idx].key = idx
           for (const key in customRender) {
diff --git a/ui/src/views/image/IsoZones.vue b/ui/src/views/image/IsoZones.vue
@@ -175,6 +175,11 @@ export default {
         scopedSlots: { customRender: 'action' }
       }
     ]
+    const userInfo = this.$store.getters.userInfo
+    if (!['Admin'].includes(userInfo.roletype) &&
+      (userInfo.account !== this.resource.account || userInfo.domain !== this.resource.domain)) {
+      this.columns = this.columns.filter(col => { return col.dataIndex !== 'status' })
+    }
   },
   mounted () {
     this.fetchData()
diff --git a/ui/src/views/image/TemplateZones.vue b/ui/src/views/image/TemplateZones.vue
@@ -185,6 +185,11 @@ export default {
         scopedSlots: { customRender: 'action' }
       }
     ]
+    const userInfo = this.$store.getters.userInfo
+    if (!['Admin'].includes(userInfo.roletype) &&
+      (userInfo.account !== this.resource.account || userInfo.domain !== this.resource.domain)) {
+      this.columns = this.columns.filter(col => { return col.dataIndex !== 'status' })
+    }
   },
   mounted () {
     this.fetchData()

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export default {`
`33`	`33`	`resourceType: 'Template',`
`34`	`34`	`filters: ['self', 'shared', 'featured', 'community'],`
`35`	`35`	`columns: () => {`
`36`		`- var fields = ['name', 'ostypename', 'status', 'hypervisor', 'account', 'domain']`
	`36`	`+ var fields = ['name', 'ostypename', 'hypervisor', 'account', 'domain']`
`37`	`37`	`if (['Admin'].includes(store.getters.userInfo.roletype)) {`
`38`	`38`	`fields.push('order')`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -582,9 +582,11 @@ export default {`
`582`	`582`	`if (!this.items \|\| this.items.length === 0) {`
`583`	`583`	`this.items = []`
`584`	`584`	`}`
	`585`	`+`
`585`	`586`	`if (['listTemplates', 'listIsos'].includes(this.apiName) && this.items.length > 1) {`
`586`	`587`	`this.items = [...new Map(this.items.map(x => [x.id, x])).values()]`
`587`	`588`	`}`
	`589`	`+`
`588`	`590`	`for (let idx = 0; idx < this.items.length; idx++) {`
`589`	`591`	`this.items[idx].key = idx`
`590`	`592`	`for (const key in customRender) {`
Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,11 @@ export default {`
`175`	`175`	`scopedSlots: { customRender: 'action' }`
`176`	`176`	`}`
`177`	`177`	`]`
	`178`	`+ const userInfo = this.$store.getters.userInfo`
	`179`	`+ if (!['Admin'].includes(userInfo.roletype) &&`
	`180`	`+ (userInfo.account !== this.resource.account \|\| userInfo.domain !== this.resource.domain)) {`
	`181`	`+ this.columns = this.columns.filter(col => { return col.dataIndex !== 'status' })`
	`182`	`+ }`
`178`	`183`	`},`
`179`	`184`	`mounted () {`
`180`	`185`	`this.fetchData()`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,11 @@ export default {`
`185`	`185`	`scopedSlots: { customRender: 'action' }`
`186`	`186`	`}`
`187`	`187`	`]`
	`188`	`+ const userInfo = this.$store.getters.userInfo`
	`189`	`+ if (!['Admin'].includes(userInfo.roletype) &&`
	`190`	`+ (userInfo.account !== this.resource.account \|\| userInfo.domain !== this.resource.domain)) {`
	`191`	`+ this.columns = this.columns.filter(col => { return col.dataIndex !== 'status' })`
	`192`	`+ }`
`188`	`193`	`},`
`189`	`194`	`mounted () {`
`190`	`195`	`this.fetchData()`