fix(ui): add safeguard against bad plugin import code to prevent user…

… disruption + this will also prevent issues for users who already have bad plugins with both workspaceId & collectionId filled in their workspace (related to #280)
flawiddsouza · Oct 11, 2024 · 4f6afc5 · 4f6afc5
1 parent dd8fbce
commit 4f6afc5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packages/ui/src/components/modals/PluginManagerModal.vue b/packages/ui/src/components/modals/PluginManagerModal.vue
@@ -145,7 +145,7 @@ export default {
             if(!this.activeWorkspace) {
                 return []
             }
-            return this.$store.state.plugins.workspace.filter(plugin => plugin.workspaceId === this.activeWorkspace._id)
+            return this.$store.state.plugins.workspace.filter(plugin => plugin.workspaceId === this.activeWorkspace._id && plugin.collectionId === null)
         },
         activeWorkspace() {
             return this.$store.state.activeWorkspace

diff --git a/packages/ui/src/db.ts b/packages/ui/src/db.ts
@@ -427,7 +427,7 @@ export async function getWorkspacePlugins(workspaceId: string) {
     const collectionItemPlugins = await db.plugins.where('collectionId').anyOf(collectionIds).toArray()
 
     return [
-        ...workspacePlugins,
+        ...workspacePlugins.filter(plugin => plugin.collectionId === null),
         ...collectionItemPlugins
     ]
 }

diff --git a/packages/ui/src/store.ts b/packages/ui/src/store.ts
@@ -1101,7 +1101,7 @@ export const store = createStore<State>({
                     globalPlugins.push(enabledPlugin)
                 }
 
-                if(context.state.activeWorkspace !== null && enabledPlugin.workspaceId === context.state.activeWorkspace._id) {
+                if(context.state.activeWorkspace !== null && enabledPlugin.workspaceId === context.state.activeWorkspace._id && enabledPlugin.collectionId === null) {
                     workspacePlugins.push(enabledPlugin)
                 }