Changes plugin interface from 'roles' to 'enabled' method for more flexibility

app/hooks/useSettingsConfig.ts

@@ -188,17 +188,21 @@ const useSettingsConfig = () => {
 
     // Plugins
     PluginManager.getHooks(Hook.Settings).forEach((plugin) => {
+      const group = plugin.value.group ?? "Integrations";
       const insertIndex = plugin.value.after
         ? items.findIndex((i) => i.name === t(plugin.value.after!)) + 1
-        : items.findIndex(
+        : items.findIndex((i) => i.group === t(group));
-            (i) => i.group === t(plugin.value.group ?? "Integrations")
-          );
       items.splice(insertIndex, 0, {
         name: t(plugin.name),
-        path: integrationSettingsPath(plugin.id),
+        path:
-        group: t(plugin.value.group),
+          group === "Integrations"
+            ? integrationSettingsPath(plugin.id)
+            : settingsPath(plugin.id),
+        group: t(group),
         component: plugin.value.component,
-        enabled: plugin.roles?.includes(user.role) || can.update,
+        enabled: plugin.value.enabled
+          ? plugin.value.enabled(team, user)
+          : can.update,
         icon: plugin.value.icon,
       } as ConfigItem);
     });

app/utils/PluginManager.ts

@@ -1,6 +1,8 @@
 import isArray from "lodash/isArray";
 import sortBy from "lodash/sortBy";
 import { action, observable } from "mobx";
+import Team from "~/models/Team";
+import User from "~/models/User";
 import { useComputed } from "~/hooks/useComputed";
 import Logger from "./Logger";
 import isCloudHosted from "./isCloudHosted";
@@ -26,6 +28,8 @@ type PluginValueMap = {
     icon: React.ElementType;
     /** The settings screen somponent, should be lazy loaded. */
     component: React.LazyExoticComponent<React.ComponentType>;
+    /** Whether the plugin is enabled in the current context. */
+    enabled?: (team: Team, user: User) => boolean;
   };
   [Hook.Icon]: React.ElementType;
 };
@@ -45,8 +49,6 @@ export type Plugin<T extends Hook> = {
   priority?: number;
   /** The deployments this plugin is enabled for (default: all) */
   deployments?: string[];
-  /** The roles this plugin is enabled for. (default: admin) */
-  roles?: string[];
 };
 
 /**

plugins/matomo/client/index.tsx

@@ -1,4 +1,5 @@
 import * as React from "react";
+import { UserRole } from "@shared/types";
 import { Hook, PluginManager } from "~/utils/PluginManager";
 import config from "../plugin.json";
 import Icon from "./Icon";
@@ -11,6 +12,7 @@ PluginManager.add([
       group: "Integrations",
       icon: Icon,
       component: React.lazy(() => import("./Settings")),
+      enabled: (_, user) => user.role === UserRole.Admin,
     },
   },
 ]);

plugins/matomo/plugin.json

@@ -1,7 +1,6 @@
 {
   "id": "matomo",
   "name": "Matomo",
-  "roles": ["admin"],
   "priority": 40,
   "description": "Adds support for reporting analytics to a Matomo server.",
   "deployments": ["community", "enterprise"]

plugins/slack/client/index.tsx

@@ -1,4 +1,5 @@
 import * as React from "react";
+import { UserRole } from "@shared/types";
 import { Hook, PluginManager } from "~/utils/PluginManager";
 import config from "../plugin.json";
 import Icon from "./Icon";
@@ -11,6 +12,8 @@ PluginManager.add([
       group: "Integrations",
       icon: Icon,
       component: React.lazy(() => import("./Settings")),
+      enabled: (_, user) =>
+        [UserRole.Member, UserRole.Admin].includes(user.role),
     },
   },
   {

plugins/slack/plugin.json

@@ -2,6 +2,5 @@
   "id": "slack",
   "name": "Slack",
   "priority": 20,
-  "roles": ["admin", "member"],
   "description": "Adds a Slack authentication provider, support for the /outline slash command, and link unfurling."
 }