feat: Allow disabling collection creation for members (#3270)

outline · Mar 24, 2022 · 6af9246 · 6af9246
1 parent 53d96d2
commit 6af9246
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 1 deletion.
diff --git a/app/components/Sidebar/components/SidebarAction.tsx b/app/components/Sidebar/components/SidebarAction.tsx
@@ -21,6 +21,10 @@ function SidebarAction({ action, ...rest }: Props) {
   const menuItem = actionToMenuItem(action, context);
   invariant(menuItem.type === "button", "passed action must be a button");
 
+  if (!menuItem.visible) {
+    return null;
+  }
+
   return (
     <SidebarLink
       onClick={menuItem.onClick}

diff --git a/app/models/Team.ts b/app/models/Team.ts
@@ -31,6 +31,10 @@ class Team extends BaseModel {
   @observable
   defaultCollectionId: string | null;
 
+  @Field
+  @observable
+  memberCollectionCreate: boolean;
+
   @Field
   @observable
   guestSignin: boolean;

diff --git a/app/scenes/Settings/Security.tsx b/app/scenes/Settings/Security.tsx
@@ -25,6 +25,7 @@ function Security() {
     documentEmbeds: team.documentEmbeds,
     guestSignin: team.guestSignin,
     defaultUserRole: team.defaultUserRole,
+    memberCollectionCreate: team.memberCollectionCreate,
   });
 
   const showSuccessMessage = React.useMemo(
@@ -102,6 +103,19 @@ function Security() {
           onChange={handleChange}
         />
       </SettingRow>
+      <SettingRow
+        label={t("Collection creation")}
+        name="memberCollectionCreate"
+        description={t(
+          "Allow members to create new collections within the knowledge base"
+        )}
+      >
+        <Switch
+          id="memberCollectionCreate"
+          checked={data.memberCollectionCreate}
+          onChange={handleChange}
+        />
+      </SettingRow>
 
       <SettingRow
         label={t("Default role")}

diff --git a/server/commands/teamUpdater.ts b/server/commands/teamUpdater.ts
@@ -17,6 +17,7 @@ const teamUpdater = async ({ params, user, team, ip }: TeamUpdaterProps) => {
     sharing,
     guestSignin,
     documentEmbeds,
+    memberCollectionCreate,
     collaborativeEditing,
     defaultCollectionId,
     defaultUserRole,
@@ -41,6 +42,9 @@ const teamUpdater = async ({ params, user, team, ip }: TeamUpdaterProps) => {
   if (avatarUrl !== undefined) {
     team.avatarUrl = avatarUrl;
   }
+  if (memberCollectionCreate !== undefined) {
+    team.memberCollectionCreate = memberCollectionCreate;
+  }
   if (defaultCollectionId !== undefined) {
     team.defaultCollectionId = defaultCollectionId;
   }

diff --git a/server/migrations/20220319060408-collection-create-permission.js b/server/migrations/20220319060408-collection-create-permission.js
@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.addColumn("teams", "memberCollectionCreate", {
+      type: Sequelize.BOOLEAN,
+      defaultValue: true,
+      allowNull: false,
+    });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.removeColumn("teams", "memberCollectionCreate");
+  }
+};
diff --git a/server/models/Team.ts b/server/models/Team.ts
@@ -89,6 +89,10 @@ class Team extends ParanoidModel {
   @Column
   documentEmbeds: boolean;
 
+  @Default(true)
+  @Column
+  memberCollectionCreate: boolean;
+
   @Default(false)
   @Column
   collaborativeEditing: boolean;

diff --git a/server/policies/collection.ts b/server/policies/collection.ts
@@ -8,7 +8,10 @@ allow(User, "createCollection", Team, (user, team) => {
   if (!team || user.isViewer || user.teamId !== team.id) {
     return false;
   }
-  return true;
+  if (user.isAdmin || team.memberCollectionCreate) {
+    return true;
+  }
+  return false;
 });
 
 allow(User, "importCollection", Team, (actor, team) => {

diff --git a/server/presenters/team.ts b/server/presenters/team.ts
@@ -6,6 +6,7 @@ export default function present(team: Team) {
     name: team.name,
     avatarUrl: team.logoUrl,
     sharing: team.sharing,
+    memberCollectionCreate: team.memberCollectionCreate,
     collaborativeEditing: team.collaborativeEditing,
     defaultCollectionId: team.defaultCollectionId,
     documentEmbeds: team.documentEmbeds,

diff --git a/server/routes/api/team.ts b/server/routes/api/team.ts
@@ -16,6 +16,7 @@ router.post("team.update", auth(), async (ctx) => {
     sharing,
     guestSignin,
     documentEmbeds,
+    memberCollectionCreate,
     collaborativeEditing,
     defaultCollectionId,
     defaultUserRole,
@@ -37,6 +38,7 @@ router.post("team.update", auth(), async (ctx) => {
       sharing,
       guestSignin,
       documentEmbeds,
+      memberCollectionCreate,
       collaborativeEditing,
       defaultCollectionId,
       defaultUserRole,

diff --git a/shared/i18n/locales/en_US/translation.json b/shared/i18n/locales/en_US/translation.json
@@ -616,6 +616,8 @@
   "When enabled, documents can be shared publicly on the internet by any team member": "When enabled, documents can be shared publicly on the internet by any team member",
   "Rich service embeds": "Rich service embeds",
   "Links to supported services are shown as rich embeds within your documents": "Links to supported services are shown as rich embeds within your documents",
+  "Collection creation": "Collection creation",
+  "Allow members to create new collections within the knowledge base": "Allow members to create new collections within the knowledge base",
   "Default role": "Default role",
   "The default user role for new accounts. Changing this setting does not affect existing user accounts.": "The default user role for new accounts. Changing this setting does not affect existing user accounts.",
   "Sharing is currently disabled.": "Sharing is currently disabled.",