fix: also delete global options when removing a plugin (#1816)

ArkEcosystem · Mar 16, 2020 · df07fa0 · df07fa0
1 parent b09368a
commit df07fa0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/renderer/components/PluginManager/PluginManagerModals/PluginRemovalModal.vue b/src/renderer/components/PluginManager/PluginManagerModals/PluginRemovalModal.vue
@@ -54,7 +54,11 @@ export default {
 
   computed: {
     hasStorage () {
-      return this.plugin.permissions.includes('STORAGE') && this.$store.getters['plugin/profileHasPluginOptions'](this.plugin.id)
+      return this.plugin.permissions.includes('STORAGE') &&
+        (
+          this.$store.getters['plugin/profileHasPluginOptions'](this.plugin.id) ||
+          this.$store.getters['plugin/profileHasPluginOptions'](this.plugin.id, 'global')
+        )
     }
   },
 

diff --git a/src/renderer/store/modules/plugin.js b/src/renderer/store/modules/plugin.js
@@ -345,6 +345,10 @@ export default {
     DELETE_PLUGIN_OPTIONS (state, { pluginId, profileId }) {
       if (state.pluginOptions[profileId] && state.pluginOptions[profileId][pluginId]) {
         Vue.delete(state.pluginOptions[profileId], pluginId)
+
+        if (!Object.keys(state.pluginOptions[profileId]).length) {
+          Vue.delete(state.pluginOptions, profileId)
+        }
       }
     },
 
@@ -475,6 +479,10 @@ export default {
         }
       }
 
+      if (removeOptions && getters.profileHasPluginOptions(pluginId, 'global')) {
+        dispatch('deletePluginOptionsForProfile', { pluginId, profileId: 'global' })
+      }
+
       try {
         await this._vm.$plugins.deletePlugin(pluginId)
       } catch (error) {