diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue index 90404dc97..a2933d759 100644 --- a/src/components/home/navigation.vue +++ b/src/components/home/navigation.vue @@ -131,9 +131,7 @@ export default { NamespaceSettingsDropdown, }, computed: mapState({ - namespaces(state) { - return state.namespaces.namespaces.filter(n => !n.isArchived) - }, + namespaces: state => state.namespaces.namespaces.filter(n => !n.isArchived), currentList: CURRENT_LIST, background: 'background', menuActive: MENU_ACTIVE, diff --git a/src/store/modules/namespaces.js b/src/store/modules/namespaces.js index 87ba1301e..98f3cf87c 100644 --- a/src/store/modules/namespaces.js +++ b/src/store/modules/namespaces.js @@ -135,5 +135,15 @@ export default { return Promise.resolve() } }, + deleteNamespace(ctx, namespace) { + const namespaceService = new NamespaceService() + + return namespaceService.delete(namespace) + .then(r => { + ctx.commit('removeNamespaceById', namespace.id) + return Promise.resolve(r) + }) + .catch(Promise.reject) + }, }, } \ No newline at end of file diff --git a/src/views/namespaces/settings/delete.vue b/src/views/namespaces/settings/delete.vue index f8f247ee2..dd58a7496 100644 --- a/src/views/namespaces/settings/delete.vue +++ b/src/views/namespaces/settings/delete.vue @@ -29,9 +29,8 @@ export default { deleteNamespace() { const namespace = this.$store.getters['namespaces/getNamespaceById'](this.$route.params.id) - this.namespaceService.delete(namespace) + this.$store.dispatch('namespaces/deleteNamespace', namespace) .then(() => { - this.$store.commit('namespaces/removeNamespaceFromNamespaceById', namespace) this.success({message: 'The namespace was successfully deleted.'}, this) this.$router.push({name: 'home'}) })