From e82335b8c5dbd58e4b1eec121f4ecd41650952c7 Mon Sep 17 00:00:00 2001 From: Rakesh Venkatesh Date: Wed, 4 Nov 2020 13:02:12 +0100 Subject: [PATCH 1/2] Provide option to force delete the project Provide a cleanup flag so that the project will be deleted only when there are no resources left in the project. If users click on delete project by mistake then everything is deleted. --- src/config/section/project.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/section/project.js b/src/config/section/project.js index 72cdd713a..1b6276443 100644 --- a/src/config/section/project.js +++ b/src/config/section/project.js @@ -139,7 +139,8 @@ export default { dataView: true, show: (record, store) => { return (['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) || record.isCurrentUserProjectAdmin - } + }, + args: ['cleanup'] } ] } From ad4c25aea49a07dbdd46625612a590b2850bb66e Mon Sep 17 00:00:00 2001 From: Rakesh Venkatesh Date: Thu, 19 Nov 2020 15:40:39 +0100 Subject: [PATCH 2/2] check if param exists --- src/config/section/project.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/config/section/project.js b/src/config/section/project.js index 1b6276443..73ac80fae 100644 --- a/src/config/section/project.js +++ b/src/config/section/project.js @@ -140,7 +140,13 @@ export default { show: (record, store) => { return (['Admin', 'DomainAdmin'].includes(store.userInfo.roletype)) || record.isCurrentUserProjectAdmin }, - args: ['cleanup'] + args: (record, store) => { + const fields = [] + if (store.apis.deleteProject.params.filter(x => x.name === 'cleanup').length > 0) { + fields.push('cleanup') + } + return fields + } } ] }