use maxSizeMbStaticDataSources in PlanType (#2290)

* Introduce duplicated field maxSizeMbStaticDataSources in Plan to rename field

* Rename all limits to match PlanType

* use maxSizeMbStaticDataSources in PlanType

* Rework following new names + handle remove old fields

Author: PopDaph

front/lib/auth.ts

@@ -456,9 +456,9 @@ export async function planForWorkspace(
           "isManagedNotionAllowed",
           "isManagedGoogleDriveAllowed",
           "isManagedGithubAllowed",
-          "maxNbStaticDataSources",
-          "maxNbStaticDocuments",
-          "maxSizeStaticDataSources",
+          "maxDataSourcesCount",
+          "maxDataSourcesDocumentsCount",
+          "maxDataSourcesDocumentsSizeMb",
           "maxUsersInWorkspace",
         ],
       },
@@ -504,10 +504,10 @@ export async function planForWorkspace(
         isGithubAllowed: plan.isManagedGithubAllowed,
       },
       dataSources: {
-        count: plan.maxNbStaticDataSources,
+        count: plan.maxDataSourcesCount,
         documents: {
-          count: plan.maxNbStaticDocuments,
-          sizeMb: plan.maxSizeStaticDataSources,
+          count: plan.maxDataSourcesDocumentsCount,
+          sizeMb: plan.maxDataSourcesDocumentsSizeMb,
         },
       },
       users: {

front/lib/models/plan.ts

@@ -32,11 +32,6 @@ export class Plan extends Model<
   declare isManagedNotionAllowed: boolean;
   declare isManagedGoogleDriveAllowed: boolean;
   declare isManagedGithubAllowed: boolean;
-
-  declare maxNbStaticDataSources: number;
-  declare maxNbStaticDocuments: number;
-  declare maxSizeStaticDataSources: number;
-
   declare maxDataSourcesCount: number;
   declare maxDataSourcesDocumentsCount: number;
   declare maxDataSourcesDocumentsSizeMb: number;
@@ -98,18 +93,6 @@ Plan.init(
       type: DataTypes.BOOLEAN,
       defaultValue: false,
     },
-    maxNbStaticDataSources: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-    },
-    maxNbStaticDocuments: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-    },
-    maxSizeStaticDataSources: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-    },
     maxDataSourcesCount: {
       type: DataTypes.INTEGER,
       allowNull: false,

front/lib/plans/enterprise_plans.ts

@@ -32,11 +32,6 @@ export const ENT_PLAN_FAKE_DATA: PlanAttributes = {
   isManagedNotionAllowed: true,
   isManagedGoogleDriveAllowed: true,
   isManagedGithubAllowed: true,
-  // to remove
-  maxNbStaticDataSources: -1,
-  maxNbStaticDocuments: -1,
-  maxSizeStaticDataSources: 2, // 2MB
-  // to keep
   maxDataSourcesCount: -1,
   maxDataSourcesDocumentsCount: -1,
   maxDataSourcesDocumentsSizeMb: 2,

front/lib/plans/free_plans.ts

@@ -35,12 +35,6 @@ export const FREE_TEST_PLAN_DATA: PlanAttributes = {
   isManagedNotionAllowed: false,
   isManagedGoogleDriveAllowed: false,
   isManagedGithubAllowed: false,
-
-  // to remove
-  maxNbStaticDataSources: 10,
-  maxNbStaticDocuments: 50,
-  maxSizeStaticDataSources: 2, // 2MB
-  // to keep
   maxDataSourcesCount: 10,
   maxDataSourcesDocumentsCount: 10,
   maxDataSourcesDocumentsSizeMb: 2,
@@ -62,12 +56,6 @@ const FREE_PLANS_DATA: PlanAttributes[] = [
     isManagedNotionAllowed: true,
     isManagedGoogleDriveAllowed: true,
     isManagedGithubAllowed: true,
-
-    // to remove
-    maxNbStaticDataSources: -1,
-    maxNbStaticDocuments: -1,
-    maxSizeStaticDataSources: 2, // 2MB
-    // to keep
     maxDataSourcesCount: -1,
     maxDataSourcesDocumentsCount: -1,
     maxDataSourcesDocumentsSizeMb: 2,

front/lib/plans/pro_plans.ts

@@ -37,11 +37,6 @@ const PRO_PLANS_DATA: PlanAttributes[] = [
     isManagedNotionAllowed: true,
     isManagedGoogleDriveAllowed: true,
     isManagedGithubAllowed: true,
-    // to remove
-    maxNbStaticDataSources: -1,
-    maxNbStaticDocuments: -1,
-    maxSizeStaticDataSources: 2, // 2MB
-    // to keep
     maxDataSourcesCount: -1,
     maxDataSourcesDocumentsCount: -1,
     maxDataSourcesDocumentsSizeMb: 2,
@@ -57,11 +52,6 @@ const PRO_PLANS_DATA: PlanAttributes[] = [
     isManagedNotionAllowed: true,
     isManagedGoogleDriveAllowed: true,
     isManagedGithubAllowed: true,
-    // to remove
-    maxNbStaticDataSources: -1,
-    maxNbStaticDocuments: -1,
-    maxSizeStaticDataSources: 2, // 2MB
-    // to keep
     maxDataSourcesCount: -1,
     maxDataSourcesDocumentsCount: -1,
     maxDataSourcesDocumentsSizeMb: 2,

front/lib/plans/subscription.ts

@@ -57,10 +57,10 @@ export const internalSubscribeWorkspaceToFreeTestPlan = async ({
         isGithubAllowed: freeTestPlan.isManagedGithubAllowed,
       },
       dataSources: {
-        count: freeTestPlan.maxNbStaticDataSources,
+        count: freeTestPlan.maxDataSourcesCount,
         documents: {
-          count: freeTestPlan.maxNbStaticDocuments,
-          sizeMb: freeTestPlan.maxSizeStaticDataSources,
+          count: freeTestPlan.maxDataSourcesDocumentsCount,
+          sizeMb: freeTestPlan.maxDataSourcesDocumentsSizeMb,
         },
       },
       users: {
@@ -145,10 +145,10 @@ export const internalSubscribeWorkspaceToFreeUpgradedPlan = async ({
           isGithubAllowed: plan.isManagedGithubAllowed,
         },
         dataSources: {
-          count: plan.maxNbStaticDataSources,
+          count: plan.maxDataSourcesCount,
           documents: {
-            count: plan.maxNbStaticDocuments,
-            sizeMb: plan.maxSizeStaticDataSources,
+            count: plan.maxDataSourcesDocumentsCount,
+            sizeMb: plan.maxDataSourcesDocumentsSizeMb,
           },
         },
         users: {
@@ -253,10 +253,10 @@ export const subscribeWorkspaceToPlan = async (
           isGithubAllowed: newPlan.isManagedGithubAllowed,
         },
         dataSources: {
-          count: newPlan.maxNbStaticDataSources,
+          count: newPlan.maxDataSourcesCount,
           documents: {
-            count: newPlan.maxNbStaticDocuments,
-            sizeMb: newPlan.maxSizeStaticDataSources,
+            count: newPlan.maxDataSourcesDocumentsCount,
+            sizeMb: newPlan.maxDataSourcesDocumentsSizeMb,
           },
         },
         users: {