From 3868e91f77dbf7613323199aa2baae59aa5e154a Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Mon, 31 Aug 2020 13:26:44 +0530
Subject: [PATCH] compute: Fixing expunge only when allowuserexpungerecovervm
 is true (#636)

Fixes #635

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 ui/src/config/section/compute.js                      | 7 +++++--
 ui/src/config/section/storage.js                      | 3 ++-
 ui/src/views/compute/{DestoryVM.vue => DestroyVM.vue} | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename ui/src/views/compute/{DestoryVM.vue => DestroyVM.vue} (97%)

diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js
index 03d68b1a5e8..e411538139a 100644
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@ -387,11 +387,14 @@ export default {
           docHelp: 'adminguide/virtual_machines.html#deleting-vms',
           dataView: true,
           groupAction: true,
-          args: ['expunge'],
+          args: (record, store, group) => {
+            return (['Admin'].includes(store.userInfo.roletype) || store.features.allowuserexpungerecovervm)
+              ? ['expunge'] : []
+          },
           popup: true,
           groupMap: (selection, values) => { return selection.map(x => { return { id: x, expunge: values.expunge } }) },
           show: (record) => { return ['Running', 'Stopped', 'Error'].includes(record.state) },
-          component: () => import('@/views/compute/DestoryVM.vue')
+          component: () => import('@/views/compute/DestroyVM.vue')
         }
       ]
     },
diff --git a/ui/src/config/section/storage.js b/ui/src/config/section/storage.js
index 73337f1f47e..794906194d3 100644
--- a/ui/src/config/section/storage.js
+++ b/ui/src/config/section/storage.js
@@ -237,7 +237,8 @@ export default {
           message: 'message.action.destroy.volume',
           dataView: true,
           args: (record, store) => {
-            return (!['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) && !store.features.allowuserexpungerecovervolumestore) ? [] : ['expunge']
+            return (['Admin'].includes(store.userInfo.roletype) || store.features.allowuserexpungerecovervolume)
+              ? ['expunge'] : []
           },
           show: (record, store) => {
             return !['Destroy', 'Destroyed', 'Expunging', 'Expunged', 'Migrating', 'Uploading', 'UploadError', 'Creating', 'Allocated', 'Uploaded'].includes(record.state) &&
diff --git a/ui/src/views/compute/DestoryVM.vue b/ui/src/views/compute/DestroyVM.vue
similarity index 97%
rename from ui/src/views/compute/DestoryVM.vue
rename to ui/src/views/compute/DestroyVM.vue
index 56d2b23ce4f..754bf818241 100644
--- a/ui/src/views/compute/DestoryVM.vue
+++ b/ui/src/views/compute/DestroyVM.vue
@@ -23,7 +23,7 @@
         :form="form"
         @submit="handleSubmit"
         layout="vertical">
-        <a-form-item>
+        <a-form-item v-if="$store.getters.userInfo.roletype === 'Admin' || $store.getters.features.allowuserexpungerecovervm">
           <span slot="label">
             {{ $t('label.expunge') }}
             <a-tooltip placement="bottom" :title="apiParams.expunge.description">