Flav/unleash vaults (#8011)

* Unleash vaults * 🔙
dust-tt · Oct 11, 2024 · baaf747 · baaf747
1 parent 5ab08c5
commit baaf747
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 38 deletions.
diff --git a/front/admin/init_dust_apps.ts b/front/admin/init_dust_apps.ts
@@ -51,11 +51,6 @@ async function main() {
     planCode: "FREE_UPGRADED_PLAN",
   });
 
-  await FeatureFlag.create({
-    workspaceId: w.id,
-    name: "private_data_vaults_feature",
-  });
-
   const users = await User.findAll();
   await Promise.all(
     users.map(async (user) =>

diff --git a/front/components/vaults/VaultLayout.tsx b/front/components/vaults/VaultLayout.tsx
@@ -58,10 +58,6 @@ export function VaultLayout({
     disabled: plan.limits.vaults.maxVaults === 0 || !isAdmin,
   });
 
-  const isPrivateVaultsEnabled = owner.flags.includes(
-    "private_data_vaults_feature"
-  );
-
   const isLimitReached = isPrivateVaultsLimitReached(vaults, plan);
   const isEnterprise = isEntreprisePlan(plan.code);
 
@@ -74,7 +70,6 @@ export function VaultLayout({
           <VaultSideBarMenu
             owner={owner}
             isAdmin={isAdmin}
-            isPrivateVaultsEnabled={isPrivateVaultsEnabled}
             setShowVaultCreationModal={setShowVaultCreationModal}
           />
         }
@@ -87,7 +82,7 @@ export function VaultLayout({
           parentId={parentId ?? undefined}
         />
         {children}
-        {isAdmin && isPrivateVaultsEnabled && !isLimitReached && (
+        {isAdmin && !isLimitReached && (
           <CreateOrEditVaultModal
             isAdmin={isAdmin}
             owner={owner}
@@ -98,7 +93,7 @@ export function VaultLayout({
             }}
           />
         )}
-        {isAdmin && isPrivateVaultsEnabled && isLimitReached && (
+        {isAdmin && isLimitReached && (
           <Dialog
             alertDialog
             isOpen={isLimitReached && showVaultCreationModal}

diff --git a/front/components/vaults/VaultSideBarMenu.tsx b/front/components/vaults/VaultSideBarMenu.tsx
@@ -37,14 +37,12 @@ import {
 import { getVaultIcon, getVaultName, groupVaults } from "@app/lib/vaults";
 
 interface VaultSideBarMenuProps {
-  isPrivateVaultsEnabled: boolean;
   owner: LightWorkspaceType;
   isAdmin: boolean;
   setShowVaultCreationModal?: (show: boolean) => void;
 }
 
 export default function VaultSideBarMenu({
-  isPrivateVaultsEnabled,
   owner,
   isAdmin,
   setShowVaultCreationModal,
@@ -99,12 +97,9 @@ export default function VaultSideBarMenu({
             if (kind === "public" && !vaults.length) {
               return null;
             }
-            if (kind === "regular") {
-              if (!isPrivateVaultsEnabled) {
-                return null;
-              } else if (!vaults.length && !isAdmin) {
-                return null;
-              }
+
+            if (kind === "regular" && !vaults.length && !isAdmin) {
+              return null;
             }
 
             const sectionLabel = getSectionLabel(kind);

diff --git a/front/lib/resources/vault_resource.ts b/front/lib/resources/vault_resource.ts
@@ -289,10 +289,6 @@ export class VaultResource extends BaseResource<VaultModel> {
   }
 
   canWrite(auth: Authenticator) {
-    const isPrivateVaultsEnabled = auth
-      .getNonNullableWorkspace()
-      .flags.includes("private_data_vaults_feature");
-
     switch (this.kind) {
       case "system":
         return auth.isAdmin() && auth.canWrite([this.acl()]);
@@ -301,7 +297,7 @@ export class VaultResource extends BaseResource<VaultModel> {
         return auth.isBuilder() && auth.canWrite([this.acl()]);
 
       case "regular":
-        return isPrivateVaultsEnabled ? auth.canWrite([this.acl()]) : false;
+        return auth.canWrite([this.acl()]);
 
       case "public":
         return auth.canWrite([this.acl()]);
@@ -315,17 +311,13 @@ export class VaultResource extends BaseResource<VaultModel> {
   // the integrity of the permissions system. It acts as the gatekeeper,
   // determining who has the right to read resources from a vault.
   canRead(auth: Authenticator) {
-    const isPrivateVaultsEnabled = auth
-      .getNonNullableWorkspace()
-      .flags.includes("private_data_vaults_feature");
-
     switch (this.kind) {
       case "global":
       case "system":
         return auth.canRead([this.acl()]);
 
       case "regular":
-        return isPrivateVaultsEnabled ? auth.canRead([this.acl()]) : false;
+        return auth.canRead([this.acl()]);
 
       case "public":
         return true;
@@ -336,10 +328,6 @@ export class VaultResource extends BaseResource<VaultModel> {
   }
 
   canList(auth: Authenticator) {
-    const isPrivateVaultsEnabled = auth
-      .getNonNullableWorkspace()
-      .flags.includes("private_data_vaults_feature");
-
     const isWorkspaceAdmin =
       auth.isAdmin() && auth.getNonNullableWorkspace().id === this.workspaceId;
 
@@ -352,9 +340,7 @@ export class VaultResource extends BaseResource<VaultModel> {
         return true;
 
       case "regular":
-        return isPrivateVaultsEnabled
-          ? isWorkspaceAdmin || auth.canRead([this.acl()])
-          : false;
+        return isWorkspaceAdmin || auth.canRead([this.acl()]);
 
       case "system":
         return isWorkspaceAdmin;

diff --git a/types/src/shared/feature_flags.ts b/types/src/shared/feature_flags.ts
@@ -4,7 +4,6 @@ export const WHITELISTABLE_FEATURES = [
   "labs_transcripts",
   "labs_transcripts_datasource",
   "document_tracker",
-  "private_data_vaults_feature",
   "use_app_for_header_detection",
   "openai_o1_feature",
   "openai_o1_mini_feature",