From 888d73bf83e9844273546320075291337cc43a95 Mon Sep 17 00:00:00 2001 From: xusongfu Date: Thu, 19 May 2022 16:34:33 +0800 Subject: [PATCH] fix: fix delete of secrets and trove 1. Fix the delete button text of trove 2. Fix the params when delete secrets in containers store Change-Id: I7bace5f312aa19caeb4044e02f4a3a3dc04c50ba --- .../database/containers/Instances/Detail/DatabaseDelete.jsx | 4 ++++ src/pages/database/containers/Instances/Detail/UserDelete.jsx | 4 ++++ src/stores/barbican/containers.js | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/pages/database/containers/Instances/Detail/DatabaseDelete.jsx b/src/pages/database/containers/Instances/Detail/DatabaseDelete.jsx index cadecc19..18585350 100644 --- a/src/pages/database/containers/Instances/Detail/DatabaseDelete.jsx +++ b/src/pages/database/containers/Instances/Detail/DatabaseDelete.jsx @@ -32,6 +32,10 @@ export default class DatabaseDelete extends ConfirmAction { return 'danger'; } + get buttonText() { + return t('Delete'); + } + allowedCheckFunction = () => true; policy = 'trove:instance:extension:database:delete'; diff --git a/src/pages/database/containers/Instances/Detail/UserDelete.jsx b/src/pages/database/containers/Instances/Detail/UserDelete.jsx index 14374ff3..01f16963 100644 --- a/src/pages/database/containers/Instances/Detail/UserDelete.jsx +++ b/src/pages/database/containers/Instances/Detail/UserDelete.jsx @@ -32,6 +32,10 @@ export default class UserDelete extends ConfirmAction { return 'danger'; } + get buttonText() { + return t('Delete'); + } + allowedCheckFunction = () => true; policy = 'trove:instance:extension:user:delete'; diff --git a/src/stores/barbican/containers.js b/src/stores/barbican/containers.js index 75177ab1..bf2f638a 100644 --- a/src/stores/barbican/containers.js +++ b/src/stores/barbican/containers.js @@ -173,7 +173,7 @@ export class ContainersStore extends Base { secret_refs.map((it) => { const { secret_ref = '' } = it; const [, secretId] = secret_ref.split('/secrets/'); - return this.secretStore.delete(secretId); + return this.secretStore.delete({ id: secretId }); }) ); return this.submitting(this.client.delete(id));