diff --git a/changelog/19448.txt b/changelog/19448.txt
new file mode 100644
index 000000000..8c75b79f1
--- /dev/null
+++ b/changelog/19448.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ui: fixes SSH engine config deletion
+```
diff --git a/ui/app/components/configure-ssh-secret.js b/ui/app/components/configure-ssh-secret.js
index 41832e10e..961bbe426 100644
--- a/ui/app/components/configure-ssh-secret.js
+++ b/ui/app/components/configure-ssh-secret.js
@@ -6,20 +6,28 @@ import { action } from '@ember/object';
*
* @example
* ```js
- *
+ *
* ```
*
* @param {string} model - ssh secret engine model
* @param {Function} saveConfig - parent action which updates the configuration
- *
+ * @param {boolean} loading - property in parent that updates depending on status of parent's action
+ *
*/
export default class ConfigureSshSecretComponent extends Component {
@action
- saveConfig(data, event) {
+ delete() {
+ this.args.saveConfig({ delete: true });
+ }
+
+ @action
+ saveConfig(event) {
event.preventDefault();
- this.args.saveConfig(data);
+ this.args.saveConfig({ delete: false });
}
}
diff --git a/ui/app/controllers/vault/cluster/settings/configure-secret-backend.js b/ui/app/controllers/vault/cluster/settings/configure-secret-backend.js
index 402eb873b..69829cffd 100644
--- a/ui/app/controllers/vault/cluster/settings/configure-secret-backend.js
+++ b/ui/app/controllers/vault/cluster/settings/configure-secret-backend.js
@@ -31,7 +31,6 @@ export default Controller.extend(CONFIG_ATTRS, {
this.model
.saveCA({ isDelete })
.then(() => {
- this.set('loading', false);
this.send('refreshRoute');
this.set('configured', !isDelete);
if (isDelete) {
@@ -43,6 +42,9 @@ export default Controller.extend(CONFIG_ATTRS, {
.catch((error) => {
const errorMessage = error.errors ? error.errors.join('. ') : error;
this.flashMessages.danger(errorMessage);
+ })
+ .finally(() => {
+ this.set('loading', false);
});
}
},
diff --git a/ui/app/templates/components/configure-ssh-secret.hbs b/ui/app/templates/components/configure-ssh-secret.hbs
index ae0823b08..94136fe9b 100644
--- a/ui/app/templates/components/configure-ssh-secret.hbs
+++ b/ui/app/templates/components/configure-ssh-secret.hbs
@@ -31,14 +31,14 @@
Delete
{{else}}
-