The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat(usage-limit): let only an operator replace an instance default (#26476)
Etienne8a19e9eb3968
diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.tsindex 693efbb3166..1c219957158 100644--- a/packages/twenty-front/src/generated-admin/graphql.ts+++ b/packages/twenty-front/src/generated-admin/graphql.ts@@ -13,6 +13,7 @@ export type Scalars = {Boolean: { input: boolean; output: boolean; }Int: { input: number; output: number; }Float: { input: number; output: number; }+ BigInt: { input: any; output: any; }DateTime: { input: string; output: string; }JSON: { input: any; output: any; }UUID: { input: string; output: string; }@@ -164,6 +165,37 @@ export type AdminPanelTopWorkspace = {totalUsers: Scalars['Int']['output'];};+export type AdminPanelUsageLimit = {+ __typename?: 'AdminPanelUsageLimit';+ burstValue?: Maybe<Scalars['BigInt']['output']>;+ createdAt: Scalars['DateTime']['output'];+ id: Scalars['UUID']['output'];+ limitKind: Scalars['String']['output'];+ limitValue: Scalars['BigInt']['output'];+ meter: Scalars['String']['output'];+ operationType: UsageOperationType;+ periodCount: Scalars['Int']['output'];+ periodUnit: Scalars['String']['output'];+ resourceType: UsageResourceType;+ spenderId?: Maybe<Scalars['String']['output']>;+ spenderType: Scalars['String']['output'];+ updatedAt: Scalars['DateTime']['output'];+};++export type AdminPanelUsageLimitDefault = {+ __typename?: 'AdminPanelUsageLimitDefault';+ isOverridable: Scalars['Boolean']['output'];+ limitKind: Scalars['String']['output'];+ limitValue: Scalars['BigInt']['output'];+ meter: Scalars['String']['output'];+ operationType: UsageOperationType;+ overriddenByUsageLimitId?: Maybe<Scalars['UUID']['output']>;+ periodCount: Scalars['Int']['output'];+ periodUnit: Scalars['String']['output'];+ resourceType: UsageResourceType;+ spenderType: Scalars['String']['output'];+};+export type AdminPanelWorkerQueueHealth = {__typename?: 'AdminPanelWorkerQueueHealth';id: Scalars['String']['output'];@@ -232,6 +264,12 @@ export type AdminPanelWorkspaceUsage = {usedCredits: Scalars['Float']['output'];};+export type AdminPanelWorkspaceUsageLimits = {+ __typename?: 'AdminPanelWorkspaceUsageLimits';+ defaults: Array<AdminPanelUsageLimitDefault>;+ limits: Array<AdminPanelUsageLimit>;+};+export type AdminUpdateApplicationRegistrationInput = {id: Scalars['String']['input'];update: AdminUpdateApplicationRegistrationPayload;@@ -404,6 +442,19 @@ export type ConfigVariablesGroupData = {variables: Array<ConfigVariable>;};+export type CreateUsageLimitInput = {+ burstValue?: InputMaybe<Scalars['BigInt']['input']>;+ limitKind: Scalars['String']['input'];+ limitValue: Scalars['BigInt']['input'];+ meter: Scalars['String']['input'];+ operationType: UsageOperationType;+ periodCount: Scalars['Int']['input'];+ periodUnit: Scalars['String']['input'];+ resourceType: UsageResourceType;+ spenderId?: InputMaybe<Scalars['String']['input']>;+ spenderType: Scalars['String']['input'];+};+export type CustomAiProviderAccessDto = {__typename?: 'CustomAiProviderAccessDTO';hasAccess: Scalars['Boolean']['output'];@@ -550,8 +601,10 @@ export type Mutation = {addModelToProvider: Scalars['Boolean']['output'];clearMaintenanceMode: Scalars['Boolean']['output'];createDatabaseConfigVariable: Scalars['Boolean']['output'];+ createWorkspaceUsageLimit: AdminPanelUsageLimit;deleteDatabaseConfigVariable: Scalars['Boolean']['output'];deleteJobs: DeleteJobsResponse;+ deleteWorkspaceUsageLimit: Scalars['Boolean']['output'];grantWorkspaceCredits: AdminPanelWorkspaceCreditGrant;refreshUpgradeStatus: InstanceAndAllWorkspacesUpgradeStatus;removeAiProvider: Scalars['Boolean']['output'];@@ -569,6 +622,7 @@ export type Mutation = {updateDatabaseConfigVariable: Scalars['Boolean']['output'];updateServerAdminAccess: ServerAdmin;updateWorkspaceFeatureFlag: Scalars['Boolean']['output'];+ updateWorkspaceUsageLimit: AdminPanelUsageLimit;};@@ -590,6 +644,12 @@ export type MutationCreateDatabaseConfigVariableArgs = {};+export type MutationCreateWorkspaceUsageLimitArgs = {+ payload: CreateUsageLimitInput;+ workspaceId: Scalars['UUID']['input'];+};++export type MutationDeleteDatabaseConfigVariableArgs = {key: Scalars['String']['input'];};@@ -601,6 +661,12 @@ export type MutationDeleteJobsArgs = {};+export type MutationDeleteWorkspaceUsageLimitArgs = {+ usageLimitId: Scalars['UUID']['input'];+ workspaceId: Scalars['UUID']['input'];+};++export type MutationGrantWorkspaceCreditsArgs = {amount: Scalars['Float']['input'];clientOperationId: Scalars['UUID']['input'];@@ -694,6 +760,12 @@ export type MutationUpdateWorkspaceFeatureFlagArgs = {workspaceId: Scalars['UUID']['input'];};++export type MutationUpdateWorkspaceUsageLimitArgs = {+ payload: UpdateUsageLimitInput;+ workspaceId: Scalars['UUID']['input'];+};+export type PaginatedAdminChatThreads = {__typename?: 'PaginatedAdminChatThreads';hasMore: Scalars['Boolean']['output'];@@ -742,6 +814,7 @@ export type Query = {versionInfo: VersionInfo;workspaceBillingAdminPanel?: Maybe<AdminPanelWorkspaceBilling>;workspaceLookupAdminPanel: UserLookup;+ workspaceUsageLimits: AdminPanelWorkspaceUsageLimits;};@@ -867,6 +940,11 @@ export type QueryWorkspaceLookupAdminPanelArgs = {workspaceId: Scalars['UUID']['input'];};++export type QueryWorkspaceUsageLimitsArgs = {+ workspaceId: Scalars['UUID']['input'];+};+export type QueueJob = {__typename?: 'QueueJob';attemptsMade: Scalars['Float']['output'];@@ -1001,6 +1079,11 @@ export type UpdateApplicationRegistrationVariablePayload = {value?: InputMaybe<Scalars['String']['input']>;};+export type UpdateUsageLimitInput = {+ id: Scalars['UUID']['input'];+ payload: CreateUsageLimitInput;+};+export enum UpgradeHealth {BEHIND = 'BEHIND',FAILED = 'FAILED',@@ -1014,6 +1097,35 @@ export type UsageBreakdownItem = {label?: Maybe<Scalars['String']['output']>;};+export enum UsageOperationType {+ AI_CHAT_TOKEN = 'AI_CHAT_TOKEN',+ AI_WORKFLOW_TOKEN = 'AI_WORKFLOW_TOKEN',+ ALL = 'ALL',+ API_REQUEST = 'API_REQUEST',+ CALL_RECORDING = 'CALL_RECORDING',+ CODE_EXECUTION = 'CODE_EXECUTION',+ EMAIL_SEND = 'EMAIL_SEND',+ MESSAGE_CAMPAIGN_SEND = 'MESSAGE_CAMPAIGN_SEND',+ RECORD_WRITE = 'RECORD_WRITE',+ STORAGE_FILE = 'STORAGE_FILE',+ SUBSCRIPTION = 'SUBSCRIPTION',+ WEBHOOK_CALL = 'WEBHOOK_CALL',+ WEB_SEARCH = 'WEB_SEARCH',+ WORKFLOW_EXECUTION = 'WORKFLOW_EXECUTION'+}++export enum UsageResourceType {+ AI = 'AI',+ API = 'API',+ APP = 'APP',+ EMAIL = 'EMAIL',+ LOGIC_FUNCTION = 'LOGIC_FUNCTION',+ RECORD = 'RECORD',+ STORAGE = 'STORAGE',+ WEBHOOK = 'WEBHOOK',+ WORKFLOW = 'WORKFLOW'+}+export type UserInfo = {__typename?: 'UserInfo';avatarUrl?: Maybe<Scalars['String']['output']>;@@ -1285,6 +1397,22 @@ export type GetDatabaseConfigVariableQuery = { __typename?: 'Query', getDatabaseexport type UserInfoFragmentFragment = { __typename?: 'UserInfo', id: string, email: string, firstName?: string | null, lastName?: string | null, createdAt: string };+export type CreateWorkspaceUsageLimitMutationVariables = Exact<{+ workspaceId: Scalars['UUID']['input'];+ payload: CreateUsageLimitInput;+}>;+++export type CreateWorkspaceUsageLimitMutation = { __typename?: 'Mutation', createWorkspaceUsageLimit: { __typename?: 'AdminPanelUsageLimit', id: string } };++export type DeleteWorkspaceUsageLimitMutationVariables = Exact<{+ workspaceId: Scalars['UUID']['input'];+ usageLimitId: Scalars['UUID']['input'];+}>;+++export type DeleteWorkspaceUsageLimitMutation = { __typename?: 'Mutation', deleteWorkspaceUsageLimit: boolean };+export type GrantWorkspaceCreditsMutationVariables = Exact<{workspaceId: Scalars['UUID']['input'];amount: Scalars['Float']['input'];@@ -1324,6 +1452,14 @@ export type UpdateWorkspaceFeatureFlagMutationVariables = Exact<{export type UpdateWorkspaceFeatureFlagMutation = { __typename?: 'Mutation', updateWorkspaceFeatureFlag: boolean };+export type UpdateWorkspaceUsageLimitMutationVariables = Exact<{+ workspaceId: Scalars['UUID']['input'];+ payload: UpdateUsageLimitInput;+}>;+++export type UpdateWorkspaceUsageLimitMutation = { __typename?: 'Mutation', updateWorkspaceUsageLimit: { __typename?: 'AdminPanelUsageLimit', id: string } };+export type AdminPanelRecentUsersQueryVariables = Exact<{searchTerm?: InputMaybe<Scalars['String']['input']>;}>;@@ -1411,6 +1547,13 @@ export type WorkspaceLookupAdminPanelQueryVariables = Exact<{export type WorkspaceLookupAdminPanelQuery = { __typename?: 'Query', workspaceLookupAdminPanel: { __typename?: 'UserLookup', user?: { __typename?: 'UserInfo', id: string, email: string, firstName?: string | null, lastName?: string | null, createdAt: string } | null, workspaces: Array<{ __typename?: 'WorkspaceInfo', id: string, name: string, allowImpersonation: boolean, logo?: string | null, totalUsers: number, activationStatus: WorkspaceActivationStatus, createdAt: string, workspaceUrls: { __typename?: 'WorkspaceUrls', customUrl?: string | null, subdomainUrl: string }, users: Array<{ __typename?: 'UserInfo', id: string, email: string, firstName?: string | null, lastName?: string | null, avatarUrl?: string | null }>, featureFlags: Array<{ __typename?: 'FeatureFlag', key: FeatureFlagKey, value: boolean }> }> } };+export type WorkspaceUsageLimitsQueryVariables = Exact<{+ workspaceId: Scalars['UUID']['input'];+}>;+++export type WorkspaceUsageLimitsQuery = { __typename?: 'Query', workspaceUsageLimits: { __typename?: 'AdminPanelWorkspaceUsageLimits', defaults: Array<{ __typename?: 'AdminPanelUsageLimitDefault', resourceType: UsageResourceType, operationType: UsageOperationType, spenderType: string, limitKind: string, periodCount: number, periodUnit: string, meter: string, limitValue: any, isOverridable: boolean, overriddenByUsageLimitId?: string | null }>, limits: Array<{ __typename?: 'AdminPanelUsageLimit', id: string, periodCount: number, periodUnit: string, limitValue: any, burstValue?: any | null }> } };+export type DeleteJobsMutationVariables = Exact<{queueName: Scalars['String']['input'];jobIds: Array<Scalars['String']['input']> | Scalars['String']['input'];@@ -1528,10 +1671,13 @@ export const DeleteDatabaseConfigVariableDocument = {"kind":"Document","definitiexport const UpdateDatabaseConfigVariableDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateDatabaseConfigVariable"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"key"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"value"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"JSON"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateDatabaseConfigVariable"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"key"},"value":{"kind":"Variable","name":{"kind":"Name","value":"key"}}},{"kind":"Argument","name":{"kind":"Name","value":"value"},"value":{"kind":"Variable","name":{"kind":"Name","value":"value"}}}]}]}}]} as unknown as DocumentNode<UpdateDatabaseConfigVariableMutation, UpdateDatabaseConfigVariableMutationVariables>;export const GetConfigVariablesGroupedDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetConfigVariablesGrouped"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getConfigVariablesGrouped"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"groups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"isHiddenOnLoad"}},{"kind":"Field","name":{"kind":"Name","value":"variables"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"isSensitive"}},{"kind":"Field","name":{"kind":"Name","value":"isEnvOnly"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"options"}},{"kind":"Field","name":{"kind":"Name","value":"source"}}]}}]}}]}}]}}]} as unknown as DocumentNode<GetConfigVariablesGroupedQuery, GetConfigVariablesGroupedQueryVariables>;export const GetDatabaseConfigVariableDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetDatabaseConfigVariable"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"key"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getDatabaseConfigVariable"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"key"},"value":{"kind":"Variable","name":{"kind":"Name","value":"key"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"isSensitive"}},{"kind":"Field","name":{"kind":"Name","value":"isEnvOnly"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"options"}},{"kind":"Field","name":{"kind":"Name","value":"source"}}]}}]}}]} as unknown as DocumentNode<GetDatabaseConfigVariableQuery, GetDatabaseConfigVariableQueryVariables>;+export const CreateWorkspaceUsageLimitDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateWorkspaceUsageLimit"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"payload"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateUsageLimitInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createWorkspaceUsageLimit"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"payload"},"value":{"kind":"Variable","name":{"kind":"Name","value":"payload"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<CreateWorkspaceUsageLimitMutation, CreateWorkspaceUsageLimitMutationVariables>;+export const DeleteWorkspaceUsageLimitDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteWorkspaceUsageLimit"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"usageLimitId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteWorkspaceUsageLimit"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"usageLimitId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"usageLimitId"}}}]}]}}]} as unknown as DocumentNode<DeleteWorkspaceUsageLimitMutation, DeleteWorkspaceUsageLimitMutationVariables>;export const GrantWorkspaceCreditsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"GrantWorkspaceCredits"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"amount"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"type"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"BillingCreditGrantType"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"reason"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"expiresInDays"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"clientOperationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"grantWorkspaceCredits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"amount"},"value":{"kind":"Variable","name":{"kind":"Name","value":"amount"}}},{"kind":"Argument","name":{"kind":"Name","value":"type"},"value":{"kind":"Variable","name":{"kind":"Name","value":"type"}}},{"kind":"Argument","name":{"kind":"Name","value":"reason"},"value":{"kind":"Variable","name":{"kind":"Name","value":"reason"}}},{"kind":"Argument","name":{"kind":"Name","value":"expiresInDays"},"value":{"kind":"Variable","name":{"kind":"Name","value":"expiresInDays"}}},{"kind":"Argument","name":{"kind":"Name","value":"clientOperationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"clientOperationId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"amount"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"effectiveAt"}},{"kind":"Field","name":{"kind":"Name","value":"expiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"revokedAt"}},{"kind":"Field","name":{"kind":"Name","value":"sourceGrantId"}},{"kind":"Field","name":{"kind":"Name","value":"reason"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]} as unknown as DocumentNode<GrantWorkspaceCreditsMutation, GrantWorkspaceCreditsMutationVariables>;export const RevokeWorkspaceCreditGrantDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RevokeWorkspaceCreditGrant"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"creditGrantId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"revokeWorkspaceCreditGrant"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"creditGrantId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"creditGrantId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"amount"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"effectiveAt"}},{"kind":"Field","name":{"kind":"Name","value":"expiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"revokedAt"}},{"kind":"Field","name":{"kind":"Name","value":"sourceGrantId"}},{"kind":"Field","name":{"kind":"Name","value":"reason"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]} as unknown as DocumentNode<RevokeWorkspaceCreditGrantMutation, RevokeWorkspaceCreditGrantMutationVariables>;export const UpdateServerAdminAccessDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateServerAdminAccess"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"userId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"canAccessFullAdminPanel"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"canImpersonate"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"otp"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateServerAdminAccess"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"userId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"userId"}}},{"kind":"Argument","name":{"kind":"Name","value":"canAccessFullAdminPanel"},"value":{"kind":"Variable","name":{"kind":"Name","value":"canAccessFullAdminPanel"}}},{"kind":"Argument","name":{"kind":"Name","value":"canImpersonate"},"value":{"kind":"Variable","name":{"kind":"Name","value":"canImpersonate"}}},{"kind":"Argument","name":{"kind":"Name","value":"otp"},"value":{"kind":"Variable","name":{"kind":"Name","value":"otp"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"firstName"}},{"kind":"Field","name":{"kind":"Name","value":"lastName"}},{"kind":"Field","name":{"kind":"Name","value":"canAccessFullAdminPanel"}},{"kind":"Field","name":{"kind":"Name","value":"canImpersonate"}}]}}]}}]} as unknown as DocumentNode<UpdateServerAdminAccessMutation, UpdateServerAdminAccessMutationVariables>;export const UpdateWorkspaceFeatureFlagDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateWorkspaceFeatureFlag"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"featureFlag"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"value"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateWorkspaceFeatureFlag"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"featureFlag"},"value":{"kind":"Variable","name":{"kind":"Name","value":"featureFlag"}}},{"kind":"Argument","name":{"kind":"Name","value":"value"},"value":{"kind":"Variable","name":{"kind":"Name","value":"value"}}}]}]}}]} as unknown as DocumentNode<UpdateWorkspaceFeatureFlagMutation, UpdateWorkspaceFeatureFlagMutationVariables>;+export const UpdateWorkspaceUsageLimitDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateWorkspaceUsageLimit"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"payload"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateUsageLimitInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateWorkspaceUsageLimit"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"payload"},"value":{"kind":"Variable","name":{"kind":"Name","value":"payload"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<UpdateWorkspaceUsageLimitMutation, UpdateWorkspaceUsageLimitMutationVariables>;export const AdminPanelRecentUsersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"AdminPanelRecentUsers"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"searchTerm"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"adminPanelRecentUsers"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"searchTerm"},"value":{"kind":"Variable","name":{"kind":"Name","value":"searchTerm"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"firstName"}},{"kind":"Field","name":{"kind":"Name","value":"lastName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceName"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceLogo"}}]}}]}}]} as unknown as DocumentNode<AdminPanelRecentUsersQuery, AdminPanelRecentUsersQueryVariables>;export const AdminPanelTopWorkspacesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"AdminPanelTopWorkspaces"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"searchTerm"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"adminPanelTopWorkspaces"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"searchTerm"},"value":{"kind":"Variable","name":{"kind":"Name","value":"searchTerm"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"logoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"totalUsers"}},{"kind":"Field","name":{"kind":"Name","value":"subdomain"}}]}}]}}]} as unknown as DocumentNode<AdminPanelTopWorkspacesQuery, AdminPanelTopWorkspacesQueryVariables>;export const FindOneAdminApplicationRegistrationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindOneAdminApplicationRegistration"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findOneAdminApplicationRegistration"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ApplicationRegistrationFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ApplicationRegistrationFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ApplicationRegistration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"logoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"galleryImagesUrls"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthClientId"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthRedirectUris"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthScopes"}},{"kind":"Field","name":{"kind":"Name","value":"sourceType"}},{"kind":"Field","name":{"kind":"Name","value":"sourcePackage"}},{"kind":"Field","name":{"kind":"Name","value":"latestAvailableVersion"}},{"kind":"Field","name":{"kind":"Name","value":"isListed"}},{"kind":"Field","name":{"kind":"Name","value":"isVetted"}},{"kind":"Field","name":{"kind":"Name","value":"isPreInstalled"}},{"kind":"Field","name":{"kind":"Name","value":"isConfigured"}},{"kind":"Field","name":{"kind":"Name","value":"ownerWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<FindOneAdminApplicationRegistrationQuery, FindOneAdminApplicationRegistrationQueryVariables>;@@ -1544,6 +1690,7 @@ export const GetVersionInfoDocument = {"kind":"Document","definitions":[{"kind":export const WorkspaceBillingAdminPanelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"WorkspaceBillingAdminPanel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspaceBillingAdminPanel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stripeCustomerId"}},{"kind":"Field","name":{"kind":"Name","value":"creditBalance"}},{"kind":"Field","name":{"kind":"Name","value":"creditGrants"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"amount"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"effectiveAt"}},{"kind":"Field","name":{"kind":"Name","value":"expiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"revokedAt"}},{"kind":"Field","name":{"kind":"Name","value":"sourceGrantId"}},{"kind":"Field","name":{"kind":"Name","value":"reason"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}},{"kind":"Field","name":{"kind":"Name","value":"usage"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"periodStart"}},{"kind":"Field","name":{"kind":"Name","value":"periodEnd"}},{"kind":"Field","name":{"kind":"Name","value":"usedCredits"}},{"kind":"Field","name":{"kind":"Name","value":"grantedCredits"}},{"kind":"Field","name":{"kind":"Name","value":"rolloverCredits"}},{"kind":"Field","name":{"kind":"Name","value":"totalGrantedCredits"}},{"kind":"Field","name":{"kind":"Name","value":"remainingCredits"}}]}},{"kind":"Field","name":{"kind":"Name","value":"subscription"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stripeSubscriptionId"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"interval"}},{"kind":"Field","name":{"kind":"Name","value":"currency"}},{"kind":"Field","name":{"kind":"Name","value":"planKey"}},{"kind":"Field","name":{"kind":"Name","value":"currentPeriodStart"}},{"kind":"Field","name":{"kind":"Name","value":"currentPeriodEnd"}},{"kind":"Field","name":{"kind":"Name","value":"trialStart"}},{"kind":"Field","name":{"kind":"Name","value":"trialEnd"}},{"kind":"Field","name":{"kind":"Name","value":"cancelAt"}},{"kind":"Field","name":{"kind":"Name","value":"canceledAt"}},{"kind":"Field","name":{"kind":"Name","value":"cancelAtPeriodEnd"}},{"kind":"Field","name":{"kind":"Name","value":"items"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"productName"}},{"kind":"Field","name":{"kind":"Name","value":"productKey"}},{"kind":"Field","name":{"kind":"Name","value":"stripePriceId"}},{"kind":"Field","name":{"kind":"Name","value":"quantity"}},{"kind":"Field","name":{"kind":"Name","value":"unitAmount"}},{"kind":"Field","name":{"kind":"Name","value":"includedCredits"}}]}}]}}]}}]}}]} as unknown as DocumentNode<WorkspaceBillingAdminPanelQuery, WorkspaceBillingAdminPanelQueryVariables>;export const UserLookupAdminPanelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UserLookupAdminPanel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"userIdentifier"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"userLookupAdminPanel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"userIdentifier"},"value":{"kind":"Variable","name":{"kind":"Name","value":"userIdentifier"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"UserInfoFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"workspaces"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"totalUsers"}},{"kind":"Field","name":{"kind":"Name","value":"activationStatus"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"allowImpersonation"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceUrls"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customUrl"}},{"kind":"Field","name":{"kind":"Name","value":"subdomainUrl"}}]}},{"kind":"Field","name":{"kind":"Name","value":"users"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"firstName"}},{"kind":"Field","name":{"kind":"Name","value":"lastName"}}]}},{"kind":"Field","name":{"kind":"Name","value":"featureFlags"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"value"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"UserInfoFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"UserInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"firstName"}},{"kind":"Field","name":{"kind":"Name","value":"lastName"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]} as unknown as DocumentNode<UserLookupAdminPanelQuery, UserLookupAdminPanelQueryVariables>;export const WorkspaceLookupAdminPanelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"WorkspaceLookupAdminPanel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspaceLookupAdminPanel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"UserInfoFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"workspaces"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"allowImpersonation"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"totalUsers"}},{"kind":"Field","name":{"kind":"Name","value":"activationStatus"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceUrls"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"customUrl"}},{"kind":"Field","name":{"kind":"Name","value":"subdomainUrl"}}]}},{"kind":"Field","name":{"kind":"Name","value":"users"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"firstName"}},{"kind":"Field","name":{"kind":"Name","value":"lastName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}}]}},{"kind":"Field","name":{"kind":"Name","value":"featureFlags"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"value"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"UserInfoFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"UserInfo"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"firstName"}},{"kind":"Field","name":{"kind":"Name","value":"lastName"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]} as unknown as DocumentNode<WorkspaceLookupAdminPanelQuery, WorkspaceLookupAdminPanelQueryVariables>;+export const WorkspaceUsageLimitsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"WorkspaceUsageLimits"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workspaceUsageLimits"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"defaults"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"resourceType"}},{"kind":"Field","name":{"kind":"Name","value":"operationType"}},{"kind":"Field","name":{"kind":"Name","value":"spenderType"}},{"kind":"Field","name":{"kind":"Name","value":"limitKind"}},{"kind":"Field","name":{"kind":"Name","value":"periodCount"}},{"kind":"Field","name":{"kind":"Name","value":"periodUnit"}},{"kind":"Field","name":{"kind":"Name","value":"meter"}},{"kind":"Field","name":{"kind":"Name","value":"limitValue"}},{"kind":"Field","name":{"kind":"Name","value":"isOverridable"}},{"kind":"Field","name":{"kind":"Name","value":"overriddenByUsageLimitId"}}]}},{"kind":"Field","name":{"kind":"Name","value":"limits"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"periodCount"}},{"kind":"Field","name":{"kind":"Name","value":"periodUnit"}},{"kind":"Field","name":{"kind":"Name","value":"limitValue"}},{"kind":"Field","name":{"kind":"Name","value":"burstValue"}}]}}]}}]}}]} as unknown as DocumentNode<WorkspaceUsageLimitsQuery, WorkspaceUsageLimitsQueryVariables>;export const DeleteJobsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteJobs"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"queueName"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"jobIds"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteJobs"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"queueName"},"value":{"kind":"Variable","name":{"kind":"Name","value":"queueName"}}},{"kind":"Argument","name":{"kind":"Name","value":"jobIds"},"value":{"kind":"Variable","name":{"kind":"Name","value":"jobIds"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deletedCount"}},{"kind":"Field","name":{"kind":"Name","value":"results"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"jobId"}},{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"error"}}]}}]}}]}}]} as unknown as DocumentNode<DeleteJobsMutation, DeleteJobsMutationVariables>;export const RefreshUpgradeStatusDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RefreshUpgradeStatus"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"refreshUpgradeStatus"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"instanceUpgradeStatus"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"inferredVersion"}},{"kind":"Field","name":{"kind":"Name","value":"health"}},{"kind":"Field","name":{"kind":"Name","value":"latestCommand"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"executedByVersion"}},{"kind":"Field","name":{"kind":"Name","value":"errorMessage"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"workspacesBehind"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"workspacesFailed"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"computedAt"}}]}}]}}]} as unknown as DocumentNode<RefreshUpgradeStatusMutation, RefreshUpgradeStatusMutationVariables>;export const RetryJobsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RetryJobs"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"queueName"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"jobIds"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"retryJobs"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"queueName"},"value":{"kind":"Variable","name":{"kind":"Name","value":"queueName"}}},{"kind":"Argument","name":{"kind":"Name","value":"jobIds"},"value":{"kind":"Variable","name":{"kind":"Name","value":"jobIds"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"retriedCount"}},{"kind":"Field","name":{"kind":"Name","value":"results"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"jobId"}},{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"error"}}]}}]}}]}}]} as unknown as DocumentNode<RetryJobsMutation, RetryJobsMutationVariables>;diff --git a/packages/twenty-front/src/modules/ai/components/RoutingDebugDisplay.tsx b/packages/twenty-front/src/modules/ai/components/RoutingDebugDisplay.tsxindex b999dbda36e..8ff22e657e6 100644--- a/packages/twenty-front/src/modules/ai/components/RoutingDebugDisplay.tsx+++ b/packages/twenty-front/src/modules/ai/components/RoutingDebugDisplay.tsx@@ -9,6 +9,7 @@ import { useTheme, themeCssVariables } from 'twenty-ui/theme';import { useUsageValueFormatter } from '@/settings/usage/hooks/useUsageValueFormatter';import { useLingui } from '@lingui/react/macro';import { type DataMessagePart } from 'twenty-shared/ai';+import { formatBytes } from 'twenty-shared/utils';import { type JsonValue } from 'type-fest';import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';@@ -121,14 +122,6 @@ const TimingRow = ({ label, value }: TimingRowProps) => {);};-const formatBytes = (bytes: number) => {- if (bytes === 0) return '0 B';- const k = 1024;- const sizes = ['B', 'KB', 'MB'];- const i = Math.floor(Math.log(bytes) / Math.log(k));- return `${Math.round((bytes / Math.pow(k, i)) * 100) / 100} ${sizes[i]}`;-};-const formatNumber = (num: number) => num.toLocaleString();const formatTokenBreakdown = (diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceBillingContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceBillingContent.tsxindex 123fd63e75c..e6870df27c5 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceBillingContent.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceBillingContent.tsx@@ -23,6 +23,7 @@ import { type ThemeColor, themeCssVariables } from 'twenty-ui/theme';import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';import { SettingsAdminWorkspaceCreditGrantModal } from '@/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal';import { SettingsAdminWorkspaceCreditGrantsTable } from '@/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantsTable';+import { SettingsAdminWorkspaceUsageLimitsSection } from '@/settings/admin-panel/components/SettingsAdminWorkspaceUsageLimitsSection';import { formatSubscriptionItemValue } from '@/settings/admin-panel/utils/formatSubscriptionItemValue';import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';import { GET_WORKSPACE_BILLING_ADMIN_PANEL } from '@/settings/admin-panel/graphql/queries/getWorkspaceBillingAdminPanel';@@ -160,6 +161,7 @@ export const SettingsAdminWorkspaceBillingContent = ({description={t`No billing data is available for this workspace.`}/></Section.Root>+ <SettingsAdminWorkspaceUsageLimitsSection workspaceId={workspaceId} /></StyledContainer>);}@@ -403,6 +405,8 @@ export const SettingsAdminWorkspaceBillingContent = ({)}</Section.Root>+ <SettingsAdminWorkspaceUsageLimitsSection workspaceId={workspaceId} />+<SettingsAdminWorkspaceCreditGrantsTableworkspaceId={workspaceId}creditGrants={creditGrants}diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceUsageLimitModal.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceUsageLimitModal.tsxnew file mode 100644index 00000000000..6e27f57369e--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceUsageLimitModal.tsx@@ -0,0 +1,278 @@+import { useMutation } from '@apollo/client/react';+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { useState } from 'react';+import { isDefined, isNonEmptyString } from 'twenty-shared/utils';+import { Section, useToast } from 'twenty-ui/components';+import { Button } from 'twenty-ui/primitives/input';+import { Dialog } from 'twenty-ui/primitives/surfaces';+import { themeCssVariables } from 'twenty-ui/theme';++import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';+import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';+import { CREATE_WORKSPACE_USAGE_LIMIT } from '@/settings/admin-panel/graphql/mutations/createWorkspaceUsageLimit';+import { DELETE_WORKSPACE_USAGE_LIMIT } from '@/settings/admin-panel/graphql/mutations/deleteWorkspaceUsageLimit';+import { UPDATE_WORKSPACE_USAGE_LIMIT } from '@/settings/admin-panel/graphql/mutations/updateWorkspaceUsageLimit';+import { WORKSPACE_USAGE_LIMITS } from '@/settings/admin-panel/graphql/queries/workspaceUsageLimits';+import { type AdminUsageLimitRow } from '@/settings/admin-panel/types/AdminUsageLimitRow';+import { formatUsageLimitValue } from '@/settings/admin-panel/utils/formatUsageLimitValue';+import { getAdminUsageLimitScopeLabel } from '@/settings/admin-panel/utils/getAdminUsageLimitScopeLabel';+import { USAGE_LIMIT_METER_LABELS } from '@/settings/billing/constants/UsageLimitMeterLabels';+import { getUsageLimitLabel } from '@/settings/billing/utils/getUsageLimitLabel';+import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';+import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';+import { type DeleteWorkspaceUsageLimitMutation } from '~/generated-admin/graphql';++type SettingsAdminWorkspaceUsageLimitModalProps = {+ dialogId: string;+ workspaceId: string;+ row: AdminUsageLimitRow;+};++const StyledSectionContainer = styled.div`+ margin-bottom: ${themeCssVariables.spacing[6]};+`;++const StyledFields = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[4]};+`;++const StyledActions = styled.div`+ display: flex;+ gap: ${themeCssVariables.spacing[2]};+ margin-top: ${themeCssVariables.spacing[6]};+`;++const StyledActionSlot = styled.div`+ flex: 1;+`;++const parsePositiveInteger = (value: string): number | null => {+ const parsed = Number(value);++ return Number.isInteger(parsed) && parsed >= 1 ? parsed : null;+};++export const SettingsAdminWorkspaceUsageLimitModal = ({+ dialogId,+ workspaceId,+ row,+}: SettingsAdminWorkspaceUsageLimitModalProps) => {+ const { t } = useLingui();+ const { closeDialog } = useDialog();+ const { enqueueToast } = useToast();+ const apolloAdminClient = useApolloAdminClient();++ const [limitValue, setLimitValue] = useState(String(row.limitValue));+ const [burstValue, setBurstValue] = useState(+ isDefined(row.burstValue) ? String(row.burstValue) : '',+ );++ const mutationOptions = {+ client: apolloAdminClient,+ refetchQueries: [+ { query: WORKSPACE_USAGE_LIMITS, variables: { workspaceId } },+ ],+ };++ const [createWorkspaceUsageLimit, { loading: isCreating }] = useMutation(+ CREATE_WORKSPACE_USAGE_LIMIT,+ mutationOptions,+ );+ const [updateWorkspaceUsageLimit, { loading: isUpdating }] = useMutation(+ UPDATE_WORKSPACE_USAGE_LIMIT,+ mutationOptions,+ );+ const [deleteWorkspaceUsageLimit, { loading: isResetting }] =+ useMutation<DeleteWorkspaceUsageLimitMutation>(+ DELETE_WORKSPACE_USAGE_LIMIT,+ mutationOptions,+ );++ const parsedLimitValue = parsePositiveInteger(limitValue);+ const hasBurstValue = isNonEmptyString(burstValue.trim());+ const parsedBurstValue = hasBurstValue+ ? parsePositiveInteger(burstValue)+ : null;+ const isBurstAllowed = row.limitKind === 'speed';+ const isBusy = isCreating || isUpdating || isResetting;+ const isValid =+ isDefined(parsedLimitValue) &&+ (!isBurstAllowed || !hasBurstValue || isDefined(parsedBurstValue));++ const handleClose = () => {+ closeDialog(dialogId);+ };++ const handleSubmit = async () => {+ if (!isDefined(parsedLimitValue)) {+ return;+ }++ const payload = {+ resourceType: row.resourceType,+ operationType: row.operationType,+ spenderType: row.spenderType,+ spenderId: null,+ limitKind: row.limitKind,+ periodCount: row.periodCount,+ periodUnit: row.periodUnit,+ meter: row.meter,+ limitValue: parsedLimitValue,+ burstValue: isBurstAllowed ? parsedBurstValue : null,+ };++ try {+ if (isDefined(row.usageLimitId)) {+ await updateWorkspaceUsageLimit({+ variables: {+ workspaceId,+ payload: { id: row.usageLimitId, payload },+ },+ });+ } else {+ await createWorkspaceUsageLimit({+ variables: { workspaceId, payload },+ });+ }++ enqueueToast({+ variant: 'success',+ children: t`Limit saved for this workspace.`,+ });+ handleClose();+ } catch (error) {+ enqueueToast(getToastOptionsFromError({ error }));+ }+ };++ const handleReset = async () => {+ if (!isDefined(row.usageLimitId)) {+ return;+ }++ try {+ const { data } = await deleteWorkspaceUsageLimit({+ variables: { workspaceId, usageLimitId: row.usageLimitId },+ });++ if (data?.deleteWorkspaceUsageLimit !== true) {+ enqueueToast({+ variant: 'error',+ children: t`This override no longer exists. Reload to see the current limit.`,+ });+ handleClose();++ return;+ }++ enqueueToast({+ variant: 'success',+ children: t`Limit reset to the default.`,+ });+ handleClose();+ } catch (error) {+ enqueueToast(getToastOptionsFromError({ error }));+ }+ };++ const meterLabel = getUsageLimitLabel(USAGE_LIMIT_METER_LABELS, row.meter);+ const scopeLabel = getAdminUsageLimitScopeLabel(row);+ const defaultText = formatUsageLimitValue({+ value: row.defaultValue,+ meter: row.meter,+ });+ const limitValueAdornment =+ isDefined(parsedLimitValue) && row.meter !== 'quantity'+ ? formatUsageLimitValue({ value: parsedLimitValue, meter: row.meter })+ : undefined;++ return (+ <DialogInstance+ dialogId={dialogId}+ dismissible+ onClose={handleClose}+ renderInDocumentBody+ >+ {({ container, backdrop, viewportProps, onKeyDown }) => (+ <Dialog.Popup+ {...{ container, backdrop, viewportProps, onKeyDown }}+ size="md"+ data-globally-prevent-click-outside+ style={{+ padding: 'var(--t-spacing-6)',+ borderRadius: 'var(--t-spacing-1)',+ width: '360px',+ }}+ >+ <Dialog.Title>{t`Set limit for this workspace`}</Dialog.Title>+ <StyledSectionContainer>+ <Section.Root align="center" color="primary">+ {t`${scopeLabel} — the instance default is ${defaultText}. Saving applies to this workspace only.`}+ </Section.Root>+ </StyledSectionContainer>++ <StyledFields>+ <SettingsTextInput+ instanceId={`${dialogId}-limit-value`}+ label={isDefined(meterLabel) ? t(meterLabel) : t`Limit`}+ type="number"+ min={1}+ value={limitValue}+ onChange={setLimitValue}+ rightAdornment={limitValueAdornment}+ autoFocusOnMount+ fullWidth+ />++ {isBurstAllowed && (+ <SettingsTextInput+ instanceId={`${dialogId}-burst-value`}+ label={t`Burst`}+ placeholder={t`Same as the limit`}+ type="number"+ min={1}+ value={burstValue}+ onChange={setBurstValue}+ fullWidth+ />+ )}+ </StyledFields>++ <StyledActions>+ {row.isOverridden && (+ <StyledActionSlot>+ <Button+ onClick={handleReset}+ fullWidth+ disabled={isBusy}+ variant="outline"+ color="danger"+ >{t`Reset`}</Button>+ </StyledActionSlot>+ )}+ <StyledActionSlot>+ <Button+ onClick={handleClose}+ fullWidth+ variant="outline"+ >{t`Cancel`}</Button>+ </StyledActionSlot>+ <StyledActionSlot>+ <Button+ onClick={handleSubmit}+ fullWidth+ disabled={!isValid || isBusy}+ variant="solid"+ color="accent"+ >{t`Save`}</Button>+ </StyledActionSlot>+ </StyledActions>+ </Dialog.Popup>+ )}+ </DialogInstance>+ );+};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceUsageLimitsSection.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceUsageLimitsSection.tsxnew file mode 100644index 00000000000..64a8712673f--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceUsageLimitsSection.tsx@@ -0,0 +1,164 @@+import { useQuery } from '@apollo/client/react';+import { type MessageDescriptor } from '@lingui/core';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react/macro';+import { useState } from 'react';+import { isDefined } from 'twenty-shared/utils';+import { LightIconButton, Section } from 'twenty-ui/components';+import { IconPencil } from 'twenty-ui/icon';+import { Tag } from 'twenty-ui/primitives/data-display';+import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';+import { type ThemeColor } from 'twenty-ui/theme';++import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';+import { SettingsAdminWorkspaceUsageLimitModal } from '@/settings/admin-panel/components/SettingsAdminWorkspaceUsageLimitModal';+import { WORKSPACE_USAGE_LIMITS } from '@/settings/admin-panel/graphql/queries/workspaceUsageLimits';+import { type AdminUsageLimitRow } from '@/settings/admin-panel/types/AdminUsageLimitRow';+import { buildAdminUsageLimitRows } from '@/settings/admin-panel/utils/buildAdminUsageLimitRows';+import { formatUsageLimitValue } from '@/settings/admin-panel/utils/formatUsageLimitValue';+import { getAdminUsageLimitOperationLabel } from '@/settings/admin-panel/utils/getAdminUsageLimitOperationLabel';+import { getAdminUsageLimitPeriodLabel } from '@/settings/admin-panel/utils/getAdminUsageLimitPeriodLabel';+import { getAdminUsageLimitResourceLabel } from '@/settings/admin-panel/utils/getAdminUsageLimitResourceLabel';+import { getAdminUsageLimitSpenderLabel } from '@/settings/admin-panel/utils/getAdminUsageLimitSpenderLabel';+import { SettingsEmptyPlaceholder } from '@/settings/components/SettingsEmptyPlaceholder';+import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';+import { SettingsTableListSection } from '@/settings/components/SettingsTableListSection';+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';+import { type WorkspaceUsageLimitsQuery } from '~/generated-admin/graphql';++type SettingsAdminWorkspaceUsageLimitsSectionProps = {+ workspaceId: string;+};++const EDIT_LIMIT_DIALOG_ID = 'settings-admin-usage-limit-edit';++const USAGE_LIMITS_GRID_AUTO_COLUMNS = '1fr 120px 120px 110px 100px 36px';++const getStatus = (+ row: AdminUsageLimitRow,+): { label: MessageDescriptor; color: ThemeColor } =>+ row.isOverridden+ ? { label: msg`Override`, color: 'blue' }+ : { label: msg`Default`, color: 'green' };++export const SettingsAdminWorkspaceUsageLimitsSection = ({+ workspaceId,+}: SettingsAdminWorkspaceUsageLimitsSectionProps) => {+ const { t } = useLingui();+ const apolloAdminClient = useApolloAdminClient();+ const { openDialog } = useDialog();++ const [editedRowOpening, setEditedRowOpening] = useState<{+ rowId: string;+ sequence: number;+ } | null>(null);++ const { data, loading, error } = useQuery<WorkspaceUsageLimitsQuery>(+ WORKSPACE_USAGE_LIMITS,+ {+ client: apolloAdminClient,+ variables: { workspaceId },+ fetchPolicy: 'network-only',+ },+ );++ if (loading) {+ return <SettingsSectionSkeletonLoader rowCount={4} />;+ }++ const rows = isDefined(data)+ ? buildAdminUsageLimitRows(data.workspaceUsageLimits)+ : [];++ const editedRow = isDefined(editedRowOpening)+ ? rows.find((row) => row.id === editedRowOpening.rowId)+ : undefined;++ const handleEditClick = (row: AdminUsageLimitRow) => {+ setEditedRowOpening((opening) => ({+ rowId: row.id,+ sequence: (opening?.sequence ?? 0) + 1,+ }));+ openDialog(EDIT_LIMIT_DIALOG_ID);+ };++ return (+ <Section.Root>+ <SettingsTableListSection<AdminUsageLimitRow>+ title={t`Limits`}+ description={t`What caps this workspace. Instance defaults come from config variables and only an operator can replace one.`}+ items={rows}+ columns={[+ {+ label: t`Scope`,+ overflow: 'hidden',+ Cell: ({ item }) => (+ <OverflowingTextWithTooltip+ text={`${getAdminUsageLimitResourceLabel(item)} · ${getAdminUsageLimitOperationLabel(item)}`}+ />+ ),+ },+ {+ label: t`Applies to`,+ overflow: 'hidden',+ Cell: ({ item }) => (+ <OverflowingTextWithTooltip+ text={getAdminUsageLimitSpenderLabel(item)}+ />+ ),+ },+ {+ label: t`Limit`,+ Cell: ({ item }) => (+ <>+ {formatUsageLimitValue({+ value: item.limitValue,+ meter: item.meter,+ })}+ </>+ ),+ },+ {+ label: t`Per`,+ Cell: ({ item }) => <>{getAdminUsageLimitPeriodLabel(item)}</>,+ },+ {+ label: t`Source`,+ Cell: ({ item }) => {+ const status = getStatus(item);++ return <Tag color={status.color}>{t(status.label)}</Tag>;+ },+ },+ {+ label: '',+ align: 'right',+ Cell: ({ item }) => (+ <LightIconButton+ emphasis="subtle"+ aria-label={t`Edit`}+ onClick={() => handleEditClick(item)}+ >+ <IconPencil />+ </LightIconButton>+ ),+ },+ ]}+ gridAutoColumns={USAGE_LIMITS_GRID_AUTO_COLUMNS}+ />++ {isDefined(error) && (+ <SettingsEmptyPlaceholder>{t`Failed to load usage limits.`}</SettingsEmptyPlaceholder>+ )}++ {isDefined(editedRow) && isDefined(editedRowOpening) && (+ <SettingsAdminWorkspaceUsageLimitModal+ key={`${editedRowOpening.rowId}:${editedRowOpening.sequence}`}+ dialogId={EDIT_LIMIT_DIALOG_ID}+ workspaceId={workspaceId}+ row={editedRow}+ />+ )}+ </Section.Root>+ );+};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/graphql/mutations/createWorkspaceUsageLimit.ts b/packages/twenty-front/src/modules/settings/admin-panel/graphql/mutations/createWorkspaceUsageLimit.tsnew file mode 100644index 00000000000..880ac2a968b--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/graphql/mutations/createWorkspaceUsageLimit.ts@@ -0,0 +1,12 @@+import { gql } from '@apollo/client';++export const CREATE_WORKSPACE_USAGE_LIMIT = gql`+ mutation CreateWorkspaceUsageLimit(+ $workspaceId: UUID!+ $payload: CreateUsageLimitInput!+ ) {+ createWorkspaceUsageLimit(workspaceId: $workspaceId, payload: $payload) {+ id+ }+ }+`;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/graphql/mutations/deleteWorkspaceUsageLimit.ts b/packages/twenty-front/src/modules/settings/admin-panel/graphql/mutations/deleteWorkspaceUsageLimit.tsnew file mode 100644index 00000000000..aac3c18860b--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/graphql/mutations/deleteWorkspaceUsageLimit.ts@@ -0,0 +1,13 @@+import { gql } from '@apollo/client';++export const DELETE_WORKSPACE_USAGE_LIMIT = gql`+ mutation DeleteWorkspaceUsageLimit(+ $workspaceId: UUID!+ $usageLimitId: UUID!+ ) {+ deleteWorkspaceUsageLimit(+ workspaceId: $workspaceId+ usageLimitId: $usageLimitId+ )+ }+`;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/graphql/mutations/updateWorkspaceUsageLimit.ts b/packages/twenty-front/src/modules/settings/admin-panel/graphql/mutations/updateWorkspaceUsageLimit.tsnew file mode 100644index 00000000000..454a44a03f2--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/graphql/mutations/updateWorkspaceUsageLimit.ts@@ -0,0 +1,12 @@+import { gql } from '@apollo/client';++export const UPDATE_WORKSPACE_USAGE_LIMIT = gql`+ mutation UpdateWorkspaceUsageLimit(+ $workspaceId: UUID!+ $payload: UpdateUsageLimitInput!+ ) {+ updateWorkspaceUsageLimit(workspaceId: $workspaceId, payload: $payload) {+ id+ }+ }+`;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/graphql/queries/workspaceUsageLimits.ts b/packages/twenty-front/src/modules/settings/admin-panel/graphql/queries/workspaceUsageLimits.tsnew file mode 100644index 00000000000..0b53d631469--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/graphql/queries/workspaceUsageLimits.ts@@ -0,0 +1,27 @@+import { gql } from '@apollo/client';++export const WORKSPACE_USAGE_LIMITS = gql`+ query WorkspaceUsageLimits($workspaceId: UUID!) {+ workspaceUsageLimits(workspaceId: $workspaceId) {+ defaults {+ resourceType+ operationType+ spenderType+ limitKind+ periodCount+ periodUnit+ meter+ limitValue+ isOverridable+ overriddenByUsageLimitId+ }+ limits {+ id+ periodCount+ periodUnit+ limitValue+ burstValue+ }+ }+ }+`;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/types/AdminUsageLimitRow.ts b/packages/twenty-front/src/modules/settings/admin-panel/types/AdminUsageLimitRow.tsnew file mode 100644index 00000000000..9844df9cfbf--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/types/AdminUsageLimitRow.ts@@ -0,0 +1,20 @@+import {+ type UsageOperationType,+ type UsageResourceType,+} from '~/generated-admin/graphql';++export type AdminUsageLimitRow = {+ id: string;+ resourceType: UsageResourceType;+ operationType: UsageOperationType;+ spenderType: string;+ limitKind: string;+ periodCount: number;+ periodUnit: string;+ meter: string;+ defaultValue: number;+ limitValue: number;+ burstValue: number | null;+ usageLimitId: string | null;+ isOverridden: boolean;+};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/utils/__tests__/buildAdminUsageLimitRows.test.ts b/packages/twenty-front/src/modules/settings/admin-panel/utils/__tests__/buildAdminUsageLimitRows.test.tsnew file mode 100644index 00000000000..cd548a23465--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/utils/__tests__/buildAdminUsageLimitRows.test.ts@@ -0,0 +1,172 @@+import { buildAdminUsageLimitRows } from '@/settings/admin-panel/utils/buildAdminUsageLimitRows';+import {+ UsageOperationType,+ UsageResourceType,+ type WorkspaceUsageLimitsQuery,+} from '~/generated-admin/graphql';++type WorkspaceUsageLimits = WorkspaceUsageLimitsQuery['workspaceUsageLimits'];++const buildDefault = (+ overrides: Partial<WorkspaceUsageLimits['defaults'][number]> = {},+): WorkspaceUsageLimits['defaults'][number] => ({+ __typename: 'AdminPanelUsageLimitDefault',+ resourceType: UsageResourceType.STORAGE,+ operationType: UsageOperationType.STORAGE_FILE,+ spenderType: 'workspace',+ limitKind: 'stock',+ periodCount: 1,+ periodUnit: 'lifetime',+ meter: 'bytes',+ limitValue: 100,+ isOverridable: true,+ overriddenByUsageLimitId: null,+ ...overrides,+});++const buildLimit = (+ overrides: Partial<WorkspaceUsageLimits['limits'][number]> = {},+): WorkspaceUsageLimits['limits'][number] => ({+ __typename: 'AdminPanelUsageLimit',+ id: 'limit-1',+ periodCount: 1,+ periodUnit: 'lifetime',+ limitValue: 50,+ burstValue: null,+ ...overrides,+});++const buildWorkspaceUsageLimits = ({+ defaults = [],+ limits = [],+}: {+ defaults?: WorkspaceUsageLimits['defaults'];+ limits?: WorkspaceUsageLimits['limits'];+}): WorkspaceUsageLimits => ({+ __typename: 'AdminPanelWorkspaceUsageLimits',+ defaults,+ limits,+});++describe('buildAdminUsageLimitRows', () => {+ it('shows one row per overridable default', () => {+ const rows = buildAdminUsageLimitRows(+ buildWorkspaceUsageLimits({+ defaults: [buildDefault({ overriddenByUsageLimitId: 'limit-1' })],+ limits: [buildLimit()],+ }),+ );++ expect(rows).toHaveLength(1);+ });++ it('reports a default as overridden and shows the override value', () => {+ const [row] = buildAdminUsageLimitRows(+ buildWorkspaceUsageLimits({+ defaults: [buildDefault({ overriddenByUsageLimitId: 'limit-1' })],+ limits: [buildLimit({ limitValue: 50 })],+ }),+ );++ expect(row.isOverridden).toBe(true);+ expect(row.usageLimitId).toBe('limit-1');+ expect(row.limitValue).toBe(50);+ expect(row.defaultValue).toBe(100);+ });++ it('shows the instance value on a default nothing replaced', () => {+ const [row] = buildAdminUsageLimitRows(+ buildWorkspaceUsageLimits({ defaults: [buildDefault()] }),+ );++ expect(row.isOverridden).toBe(false);+ expect(row.usageLimitId).toBeNull();+ expect(row.limitValue).toBe(100);+ });++ it('leaves a default writable when the server named no row for it', () => {+ const [row] = buildAdminUsageLimitRows(+ buildWorkspaceUsageLimits({+ defaults: [buildDefault()],+ limits: [buildLimit({ id: 'a-limit-of-its-own' })],+ }),+ );++ expect(row.isOverridden).toBe(false);+ expect(row.usageLimitId).toBeNull();+ expect(row.limitValue).toBe(100);+ });++ it('names the period of the row in force, not the one the default implies', () => {+ const [row] = buildAdminUsageLimitRows(+ buildWorkspaceUsageLimits({+ defaults: [+ buildDefault({+ limitKind: 'speed',+ meter: 'quantity',+ periodUnit: 'second',+ periodCount: 30,+ overriddenByUsageLimitId: 'limit-1',+ }),+ ],+ limits: [buildLimit({ periodCount: 60, periodUnit: 'second' })],+ }),+ );++ expect(row.periodCount).toBe(60);+ expect(row.periodUnit).toBe('second');+ });++ it('leaves out defaults no row may replace', () => {+ expect(+ buildAdminUsageLimitRows(+ buildWorkspaceUsageLimits({+ defaults: [buildDefault({ isOverridable: false })],+ }),+ ),+ ).toEqual([]);+ });++ it('carries the burst value of a speed override', () => {+ const [row] = buildAdminUsageLimitRows(+ buildWorkspaceUsageLimits({+ defaults: [+ buildDefault({+ resourceType: UsageResourceType.API,+ operationType: UsageOperationType.API_REQUEST,+ spenderType: 'apiKey',+ limitKind: 'speed',+ meter: 'quantity',+ periodUnit: 'second',+ periodCount: 60,+ overriddenByUsageLimitId: 'limit-1',+ }),+ ],+ limits: [buildLimit({ burstValue: 20 })],+ }),+ );++ expect(row.burstValue).toBe(20);+ });++ it('groups rows of one resource and kind together', () => {+ const rows = buildAdminUsageLimitRows(+ buildWorkspaceUsageLimits({+ defaults: [+ buildDefault({+ resourceType: UsageResourceType.WEBHOOK,+ operationType: UsageOperationType.WEBHOOK_CALL,+ limitKind: 'speed',+ meter: 'quantity',+ }),+ buildDefault(),+ ],+ }),+ );++ expect(rows.map((row) => row.resourceType)).toEqual([+ UsageResourceType.STORAGE,+ UsageResourceType.WEBHOOK,+ ]);+ });+});diff --git a/packages/twenty-front/src/modules/settings/admin-panel/utils/buildAdminUsageLimitRows.ts b/packages/twenty-front/src/modules/settings/admin-panel/utils/buildAdminUsageLimitRows.tsnew file mode 100644index 00000000000..25f44ef1529--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/utils/buildAdminUsageLimitRows.ts@@ -0,0 +1,52 @@+import { isDefined } from 'twenty-shared/utils';++import { type AdminUsageLimitRow } from '@/settings/admin-panel/types/AdminUsageLimitRow';+import { type WorkspaceUsageLimitsQuery } from '~/generated-admin/graphql';++type WorkspaceUsageLimits = WorkspaceUsageLimitsQuery['workspaceUsageLimits'];++const buildSortKey = (row: AdminUsageLimitRow): string =>+ `${row.resourceType}:${row.limitKind}:${row.operationType}:${row.spenderType}:${row.periodCount}`;++export const buildAdminUsageLimitRows = (+ workspaceUsageLimits: WorkspaceUsageLimits,+): AdminUsageLimitRow[] => {+ const usageLimitById = new Map(+ workspaceUsageLimits.limits.map((usageLimit) => [+ usageLimit.id,+ usageLimit,+ ]),+ );++ return workspaceUsageLimits.defaults+ .map((usageLimitDefault, index) => ({ usageLimitDefault, index }))+ .filter(({ usageLimitDefault }) => usageLimitDefault.isOverridable)+ .map(({ usageLimitDefault, index }) => {+ const override = isDefined(usageLimitDefault.overriddenByUsageLimitId)+ ? usageLimitById.get(usageLimitDefault.overriddenByUsageLimitId)+ : undefined;+ const defaultValue = Number(usageLimitDefault.limitValue);++ return {+ id: `usage-limit-default-${index}`,+ resourceType: usageLimitDefault.resourceType,+ operationType: usageLimitDefault.operationType,+ spenderType: usageLimitDefault.spenderType,+ limitKind: usageLimitDefault.limitKind,+ periodCount: override?.periodCount ?? usageLimitDefault.periodCount,+ periodUnit: override?.periodUnit ?? usageLimitDefault.periodUnit,+ meter: usageLimitDefault.meter,+ defaultValue,+ limitValue: isDefined(override)+ ? Number(override.limitValue)+ : defaultValue,+ burstValue:+ isDefined(override) && isDefined(override.burstValue)+ ? Number(override.burstValue)+ : null,+ usageLimitId: override?.id ?? null,+ isOverridden: isDefined(override),+ };+ })+ .sort((rowA, rowB) => buildSortKey(rowA).localeCompare(buildSortKey(rowB)));+};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/utils/formatUsageLimitValue.ts b/packages/twenty-front/src/modules/settings/admin-panel/utils/formatUsageLimitValue.tsnew file mode 100644index 00000000000..3e59adb7975--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/utils/formatUsageLimitValue.ts@@ -0,0 +1,25 @@+import { t } from '@lingui/core/macro';+import { INTERNAL_CREDITS_PER_DISPLAY_CREDIT } from 'twenty-shared/constants';+import { formatBytes } from 'twenty-shared/utils';++export const formatUsageLimitValue = ({+ value,+ meter,+}: {+ value: number;+ meter: string;+}): string => {+ if (meter === 'bytes') {+ return formatBytes(value);+ }++ if (meter === 'creditsUsedMicro') {+ const credits = (+ value / INTERNAL_CREDITS_PER_DISPLAY_CREDIT+ ).toLocaleString();++ return t`${credits} credits`;+ }++ return value.toLocaleString();+};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitOperationLabel.ts b/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitOperationLabel.tsnew file mode 100644index 00000000000..8f104d2c9f0--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitOperationLabel.ts@@ -0,0 +1,13 @@+import { t } from '@lingui/core/macro';+import { isDefined } from 'twenty-shared/utils';++import { type AdminUsageLimitRow } from '@/settings/admin-panel/types/AdminUsageLimitRow';+import { getUsageOperationTypeLabel } from '@/settings/usage/utils/getUsageOperationTypeLabel';++export const getAdminUsageLimitOperationLabel = (+ row: AdminUsageLimitRow,+): string => {+ const operationLabel = getUsageOperationTypeLabel(row.operationType);++ return isDefined(operationLabel) ? t(operationLabel) : row.operationType;+};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitPeriodLabel.ts b/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitPeriodLabel.tsnew file mode 100644index 00000000000..99c2e9103d0--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitPeriodLabel.ts@@ -0,0 +1,24 @@+import { t } from '@lingui/core/macro';+import { isDefined } from 'twenty-shared/utils';++import { type AdminUsageLimitRow } from '@/settings/admin-panel/types/AdminUsageLimitRow';+import { USAGE_LIMIT_PERIOD_UNIT_LABELS } from '@/settings/billing/constants/UsageLimitPeriodUnitLabels';+import { getUsageLimitLabel } from '@/settings/billing/utils/getUsageLimitLabel';++export const getAdminUsageLimitPeriodLabel = (+ row: AdminUsageLimitRow,+): string => {+ const periodUnitLabel = getUsageLimitLabel(+ USAGE_LIMIT_PERIOD_UNIT_LABELS,+ row.periodUnit,+ );+ const unitText = isDefined(periodUnitLabel)+ ? t(periodUnitLabel)+ : row.periodUnit;++ if (row.periodUnit === 'lifetime') {+ return unitText;+ }++ return row.periodCount === 1 ? unitText : `${row.periodCount} ${unitText}`;+};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitResourceLabel.ts b/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitResourceLabel.tsnew file mode 100644index 00000000000..b3b4a862a9a--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitResourceLabel.ts@@ -0,0 +1,12 @@+import { t } from '@lingui/core/macro';++import { type AdminUsageLimitRow } from '@/settings/admin-panel/types/AdminUsageLimitRow';+import { USAGE_LIMIT_RESOURCE_TYPE_LABELS } from '@/settings/billing/constants/UsageLimitResourceTypeLabels';+import { isKeyOfRecord } from '@/settings/billing/utils/isKeyOfRecord';++export const getAdminUsageLimitResourceLabel = (+ row: AdminUsageLimitRow,+): string =>+ isKeyOfRecord(USAGE_LIMIT_RESOURCE_TYPE_LABELS, row.resourceType)+ ? t(USAGE_LIMIT_RESOURCE_TYPE_LABELS[row.resourceType])+ : row.resourceType;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitScopeLabel.ts b/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitScopeLabel.tsnew file mode 100644index 00000000000..0fc3f7c82d6--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitScopeLabel.ts@@ -0,0 +1,7 @@+import { type AdminUsageLimitRow } from '@/settings/admin-panel/types/AdminUsageLimitRow';+import { getAdminUsageLimitOperationLabel } from '@/settings/admin-panel/utils/getAdminUsageLimitOperationLabel';+import { getAdminUsageLimitResourceLabel } from '@/settings/admin-panel/utils/getAdminUsageLimitResourceLabel';+import { getAdminUsageLimitSpenderLabel } from '@/settings/admin-panel/utils/getAdminUsageLimitSpenderLabel';++export const getAdminUsageLimitScopeLabel = (row: AdminUsageLimitRow): string =>+ `${getAdminUsageLimitResourceLabel(row)} · ${getAdminUsageLimitOperationLabel(row)} · ${getAdminUsageLimitSpenderLabel(row)}`;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitSpenderLabel.ts b/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitSpenderLabel.tsnew file mode 100644index 00000000000..3ed3ed01d32--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/utils/getAdminUsageLimitSpenderLabel.ts@@ -0,0 +1,12 @@+import { t } from '@lingui/core/macro';++import { type AdminUsageLimitRow } from '@/settings/admin-panel/types/AdminUsageLimitRow';+import { USAGE_LIMIT_SPENDER_TYPE_LABELS } from '@/settings/billing/constants/UsageLimitSpenderTypeLabels';+import { isKeyOfRecord } from '@/settings/billing/utils/isKeyOfRecord';++export const getAdminUsageLimitSpenderLabel = (+ row: AdminUsageLimitRow,+): string =>+ isKeyOfRecord(USAGE_LIMIT_SPENDER_TYPE_LABELS, row.spenderType)+ ? t(USAGE_LIMIT_SPENDER_TYPE_LABELS[row.spenderType])+ : row.spenderType;diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitForm.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitForm.tsxindex 55db26ffd26..e6368672b5c 100644--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitForm.tsx+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitForm.tsx@@ -22,6 +22,7 @@ import { useUsageLimitFormatter } from '@/settings/billing/hooks/useUsageLimitFoimport { type UsageQuotaScopeConsumption } from '@/settings/billing/types/UsageQuotaScopeConsumption';import { computeUsageLimitProgress } from '@/settings/billing/utils/computeUsageLimitProgress';import { getUsageLimitFormOptions } from '@/settings/billing/utils/getUsageLimitFormOptions';+import { getUsageLimitLabel } from '@/settings/billing/utils/getUsageLimitLabel';import { getUsageLimitRingColor } from '@/settings/billing/utils/getUsageLimitRingColor';import { Select } from '@/ui/input/components/Select';import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';@@ -139,8 +140,11 @@ export const SettingsBillingLimitForm = ({operationType: values.operationType ?? UsageOperationType.ALL,}): '';- const periodSpanLabel = isDefined(values.periodUnit)- ? t(USAGE_LIMIT_PERIOD_SPAN_LABELS[values.periodUnit])+ const periodSpanLabelDescriptor = isDefined(values.periodUnit)+ ? getUsageLimitLabel(USAGE_LIMIT_PERIOD_SPAN_LABELS, values.periodUnit)+ : undefined;+ const periodSpanLabel = isDefined(periodSpanLabelDescriptor)+ ? t(periodSpanLabelDescriptor): '';const hasResource = isDefined(values.resourceType);diff --git a/packages/twenty-front/src/modules/settings/billing/constants/AnchoredUsageLimitPeriodUnits.ts b/packages/twenty-front/src/modules/settings/billing/constants/AnchoredUsageLimitPeriodUnits.tsnew file mode 100644index 00000000000..97ee8f870c9--- /dev/null+++ b/packages/twenty-front/src/modules/settings/billing/constants/AnchoredUsageLimitPeriodUnits.ts@@ -0,0 +1,8 @@+import { type UsageLimitPeriodUnit } from '@/settings/billing/types/UsageLimitPeriodUnit';++export const ANCHORED_USAGE_LIMIT_PERIOD_UNITS = [+ 'day',+ 'week',+ 'month',+ 'allowancePeriod',+] as const satisfies readonly UsageLimitPeriodUnit[];diff --git a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitMeterIcons.ts b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitMeterIcons.tsindex 8b6c602b272..f46a0e1e911 100644--- a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitMeterIcons.ts+++ b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitMeterIcons.ts@@ -2,7 +2,9 @@ import { IconCoins, type IconComponent, IconNumber123 } from 'twenty-ui/icon';import { type UsageLimitMeter } from '@/settings/billing/types/UsageLimitMeter';-export const USAGE_LIMIT_METER_ICONS: Record<UsageLimitMeter, IconComponent> = {+export const USAGE_LIMIT_METER_ICONS: Partial<+ Record<UsageLimitMeter, IconComponent>+> = {creditsUsedMicro: IconCoins,quantity: IconNumber123,};diff --git a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitMeterLabels.ts b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitMeterLabels.tsindex 34a4fd1e178..dce4768485e 100644--- a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitMeterLabels.ts+++ b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitMeterLabels.ts@@ -9,4 +9,5 @@ export const USAGE_LIMIT_METER_LABELS: Record<> = {creditsUsedMicro: msg`Credits`,quantity: msg`Operations`,+ bytes: msg`Bytes`,};diff --git a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodIcons.ts b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodIcons.tsindex db893b2432a..b1533c4912f 100644--- a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodIcons.ts+++ b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodIcons.ts@@ -8,9 +8,8 @@ import {import { type UsageLimitPeriodUnit } from '@/settings/billing/types/UsageLimitPeriodUnit';-export const USAGE_LIMIT_PERIOD_ICONS: Record<- UsageLimitPeriodUnit,- IconComponent+export const USAGE_LIMIT_PERIOD_ICONS: Partial<+ Record<UsageLimitPeriodUnit, IconComponent>> = {day: IconSun,week: IconCalendarWeek,diff --git a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodNameLabels.ts b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodNameLabels.tsindex eb6251bfffc..cfc80ff0c90 100644--- a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodNameLabels.ts+++ b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodNameLabels.ts@@ -3,9 +3,8 @@ import { msg } from '@lingui/core/macro';import { type UsageLimitPeriodUnit } from '@/settings/billing/types/UsageLimitPeriodUnit';-export const USAGE_LIMIT_PERIOD_NAME_LABELS: Record<- UsageLimitPeriodUnit,- MessageDescriptor+export const USAGE_LIMIT_PERIOD_NAME_LABELS: Partial<+ Record<UsageLimitPeriodUnit, MessageDescriptor>> = {day: msg`Daily`,week: msg`Weekly`,diff --git a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodSpanLabels.ts b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodSpanLabels.tsindex 1e48c062813..cf041a131a2 100644--- a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodSpanLabels.ts+++ b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodSpanLabels.ts@@ -3,9 +3,8 @@ import { msg } from '@lingui/core/macro';import { type UsageLimitPeriodUnit } from '@/settings/billing/types/UsageLimitPeriodUnit';-export const USAGE_LIMIT_PERIOD_SPAN_LABELS: Record<- UsageLimitPeriodUnit,- MessageDescriptor+export const USAGE_LIMIT_PERIOD_SPAN_LABELS: Partial<+ Record<UsageLimitPeriodUnit, MessageDescriptor>> = {day: msg`Today`,week: msg`This week`,diff --git a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodUnitLabels.ts b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodUnitLabels.tsindex fcefadb3016..9e8d9fa4ad6 100644--- a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodUnitLabels.ts+++ b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodUnitLabels.ts@@ -7,8 +7,10 @@ export const USAGE_LIMIT_PERIOD_UNIT_LABELS: Record<UsageLimitPeriodUnit,MessageDescriptor> = {+ second: msg`Seconds`,day: msg`Day`,week: msg`Week`,month: msg`Month`,allowancePeriod: msg`Billing period`,+ lifetime: msg`Lifetime`,};diff --git a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodUnits.ts b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodUnits.tsindex 29d455e0017..d7eb5122f9b 100644--- a/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodUnits.ts+++ b/packages/twenty-front/src/modules/settings/billing/constants/UsageLimitPeriodUnits.ts@@ -1,6 +1,8 @@export const USAGE_LIMIT_PERIOD_UNITS = [+ 'second','day','week','month','allowancePeriod',+ 'lifetime',] as const;diff --git a/packages/twenty-front/src/modules/settings/billing/types/UsageLimitMeter.ts b/packages/twenty-front/src/modules/settings/billing/types/UsageLimitMeter.tsindex 551fce45872..6b1e16dbdb0 100644--- a/packages/twenty-front/src/modules/settings/billing/types/UsageLimitMeter.ts+++ b/packages/twenty-front/src/modules/settings/billing/types/UsageLimitMeter.ts@@ -1 +1 @@-export type UsageLimitMeter = 'creditsUsedMicro' | 'quantity';+export type UsageLimitMeter = 'creditsUsedMicro' | 'quantity' | 'bytes';diff --git a/packages/twenty-front/src/modules/settings/billing/utils/getUsageLimitFormOptions.ts b/packages/twenty-front/src/modules/settings/billing/utils/getUsageLimitFormOptions.tsindex 415994b2b74..be30e2400ae 100644--- a/packages/twenty-front/src/modules/settings/billing/utils/getUsageLimitFormOptions.ts+++ b/packages/twenty-front/src/modules/settings/billing/utils/getUsageLimitFormOptions.ts@@ -1,7 +1,7 @@import { isDefined } from 'twenty-shared/utils';import { USAGE_LIMIT_METER_LABELS } from '@/settings/billing/constants/UsageLimitMeterLabels';-import { USAGE_LIMIT_PERIOD_UNITS } from '@/settings/billing/constants/UsageLimitPeriodUnits';+import { ANCHORED_USAGE_LIMIT_PERIOD_UNITS } from '@/settings/billing/constants/AnchoredUsageLimitPeriodUnits';import { USAGE_LIMIT_SPENDER_TYPE_LABELS } from '@/settings/billing/constants/UsageLimitSpenderTypeLabels';import { type UsageLimitFormValues } from '@/settings/billing/types/UsageLimitFormValues';import { type UsageLimitMeter } from '@/settings/billing/types/UsageLimitMeter';@@ -63,7 +63,7 @@ export const getUsageLimitFormOptions = ({meter === 'creditsUsedMicro',);- const periodUnits = USAGE_LIMIT_PERIOD_UNITS.filter(+ const periodUnits = ANCHORED_USAGE_LIMIT_PERIOD_UNITS.filter((periodUnit) =>periodUnit !== 'allowancePeriod' || definitions.hasAllowancePeriod,);diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowRunStepLogsEmailDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowRunStepLogsEmailDetail.tsxindex 7207c2698b8..05c7579a840 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowRunStepLogsEmailDetail.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowRunStepLogsEmailDetail.tsx@@ -1,7 +1,7 @@import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';-import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { formatBytes, isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { type WorkflowRunStepLog } from 'twenty-shared/workflow';import {IconAlertTriangle,@@ -12,7 +12,6 @@ import {} from 'twenty-ui/icon';import { themeCssVariables } from 'twenty-ui/theme';-import { formatBytes } from '@/workflow/workflow-steps/workflow-actions/utils/formatBytes';import { formatDuration } from '@/workflow/workflow-steps/workflow-actions/utils/formatDuration';import {StyledBadgeGroup,diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowRunStepLogsHttpRequestDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowRunStepLogsHttpRequestDetail.tsxindex 83fbbf8b93b..c35381479bf 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowRunStepLogsHttpRequestDetail.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowRunStepLogsHttpRequestDetail.tsx@@ -1,7 +1,7 @@import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { Fragment } from 'react';-import { isDefined } from 'twenty-shared/utils';+import { formatBytes, isDefined } from 'twenty-shared/utils';import { type WorkflowRunStepLog } from 'twenty-shared/workflow';import {IconAlertTriangle,@@ -13,7 +13,6 @@ import {import { themeCssVariables } from 'twenty-ui/theme';import { MONOSPACE_FONT_FAMILY } from '@/ui/theme/constants/MonospaceFontFamily';-import { formatBytes } from '@/workflow/workflow-steps/workflow-actions/utils/formatBytes';import { formatDuration } from '@/workflow/workflow-steps/workflow-actions/utils/formatDuration';import {StyledBadgeGroup,diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/formatBytes.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/formatBytes.tsdeleted file mode 100644index a3b8bf5d70f..00000000000--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/formatBytes.ts+++ /dev/null@@ -1,11 +0,0 @@-export const formatBytes = (bytes: number): string => {- if (bytes < 1024) {- return `${bytes} B`;- }-- if (bytes < 1024 * 1024) {- return `${(bytes / 1024).toFixed(1)} KB`;- }-- return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;-};diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790245573467-add-usage-limit-instance-override.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790245573467-add-usage-limit-instance-override.tsnew file mode 100644index 00000000000..3caf31756a9--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790245573467-add-usage-limit-instance-override.ts@@ -0,0 +1,21 @@+import { QueryRunner } from 'typeorm';++import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';+import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';++@RegisteredInstanceCommand('2.43.0', 1790245573467)+export class AddUsageLimitInstanceOverrideFastInstanceCommand+ implements FastInstanceCommand+{+ public async up(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ 'ALTER TABLE "core"."usageLimit" ADD "isInstanceOverride" boolean NOT NULL DEFAULT false',+ );+ }++ public async down(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ 'ALTER TABLE "core"."usageLimit" DROP COLUMN "isInstanceOverride"',+ );+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.tsindex 316ca4d01b7..fae06ffcf13 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts@@ -207,6 +207,7 @@ import { AddSettingsMenuItemFastInstanceCommand } from 'src/database/commands/upimport { BackfillSettingsMenuItemSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-42/2-42-instance-command-slow-1790165870000-backfill-settings-menu-item';import { AddChatMessageSenderFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790171503074-add-chat-message-sender';import { AddWorkspaceAllowedIframeOriginsFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790232481570-add-workspace-allowed-iframe-origins';+import { AddUsageLimitInstanceOverrideFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-instance-command-fast-1790245573467-add-usage-limit-instance-override';export const INSTANCE_COMMANDS = [AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,@@ -416,4 +417,5 @@ export const INSTANCE_COMMANDS = [BackfillSettingsMenuItemSlowInstanceCommand,AddChatMessageSenderFastInstanceCommand,AddWorkspaceAllowedIframeOriginsFastInstanceCommand,+ AddUsageLimitInstanceOverrideFastInstanceCommand,];diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-usage-limit.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-usage-limit.resolver.tsnew file mode 100644index 00000000000..b61dda6f8b6--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-usage-limit.resolver.ts@@ -0,0 +1,95 @@+import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';+import { Args, Mutation, Query } from '@nestjs/graphql';++import { PermissionFlagType } from 'twenty-shared/constants';++import { AdminResolver } from 'src/engine/api/graphql/graphql-config/decorators/admin-resolver.decorator';+import {+ AdminPanelCreateUsageLimitInput,+ AdminPanelDeleteUsageLimitInput,+ AdminPanelUpdateUsageLimitInput,+ AdminPanelWorkspaceUsageLimitsInput,+} from 'src/engine/core-modules/admin-panel/dtos/admin-panel-usage-limit.input';+import {+ AdminPanelUsageLimitDTO,+ AdminPanelWorkspaceUsageLimitsDTO,+} from 'src/engine/core-modules/admin-panel/dtos/admin-panel-workspace-usage-limits.dto';+import { AdminPanelUsageLimitService } from 'src/engine/core-modules/admin-panel/services/admin-panel-usage-limit.service';+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';+import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';+import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';+import { UsageLimitGraphqlApiExceptionFilter } from 'src/engine/core-modules/usage-limit/filters/usage-limit-graphql-api-exception.filter';+import { UsageLimitService } from 'src/engine/core-modules/usage-limit/services/usage-limit.service';+import { fromUsageLimitEntityToDto } from 'src/engine/core-modules/usage-limit/utils/from-usage-limit-entity-to-dto.util';+import { AdminPanelGuard } from 'src/engine/guards/admin-panel-guard';+import { RequireUserSessionGuard } from 'src/engine/guards/require-user-session.guard';+import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';+import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';+import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';++@UsePipes(ResolverValidationPipe)+@AdminResolver()+@UseFilters(+ AuthGraphqlApiExceptionFilter,+ UsageLimitGraphqlApiExceptionFilter,+ PreventNestToAutoLogGraphqlErrorsFilter,+)+@UseGuards(+ WorkspaceAuthGuard,+ UserAuthGuard,+ RequireUserSessionGuard,+ SettingsPermissionGuard(PermissionFlagType.SECURITY),+ AdminPanelGuard,+)+export class AdminPanelUsageLimitResolver {+ constructor(+ private readonly adminPanelUsageLimitService: AdminPanelUsageLimitService,+ private readonly usageLimitService: UsageLimitService,+ ) {}++ @Query(() => AdminPanelWorkspaceUsageLimitsDTO)+ async workspaceUsageLimits(+ @Args() { workspaceId }: AdminPanelWorkspaceUsageLimitsInput,+ ): Promise<AdminPanelWorkspaceUsageLimitsDTO> {+ return this.adminPanelUsageLimitService.findWorkspaceUsageLimits(+ workspaceId,+ );+ }++ @Mutation(() => AdminPanelUsageLimitDTO)+ async createWorkspaceUsageLimit(+ @Args() { workspaceId, payload }: AdminPanelCreateUsageLimitInput,+ ): Promise<AdminPanelUsageLimitDTO> {+ const usageLimit = await this.usageLimitService.create({+ workspaceId,+ input: payload,+ isOperator: true,+ });++ return fromUsageLimitEntityToDto(usageLimit);+ }++ @Mutation(() => AdminPanelUsageLimitDTO)+ async updateWorkspaceUsageLimit(+ @Args() { workspaceId, payload }: AdminPanelUpdateUsageLimitInput,+ ): Promise<AdminPanelUsageLimitDTO> {+ const usageLimit = await this.usageLimitService.update({+ workspaceId,+ input: payload,+ isOperator: true,+ });++ return fromUsageLimitEntityToDto(usageLimit);+ }++ @Mutation(() => Boolean)+ async deleteWorkspaceUsageLimit(+ @Args() { workspaceId, usageLimitId }: AdminPanelDeleteUsageLimitInput,+ ): Promise<boolean> {+ return this.usageLimitService.delete({+ workspaceId,+ usageLimitId,+ isOperator: true,+ });+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.tsindex 2af6dc1e662..32a4115ff61 100644--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.module.ts@@ -6,6 +6,7 @@ import { TypeOrmModule } from '@nestjs/typeorm';import { CoreEntityCacheModule } from 'src/engine/core-entity-cache/core-entity-cache.module';import { AdminPanelAiProviderResolver } from 'src/engine/core-modules/admin-panel/admin-panel-ai-provider.resolver';import { AdminPanelApplicationRegistrationResolver } from 'src/engine/core-modules/admin-panel/admin-panel-application-registration.resolver';+import { AdminPanelUsageLimitResolver } from 'src/engine/core-modules/admin-panel/admin-panel-usage-limit.resolver';import { AdminPanelHealthService } from 'src/engine/core-modules/admin-panel/admin-panel-health.service';import { AdminPanelQueueService } from 'src/engine/core-modules/admin-panel/admin-panel-queue.service';import { AdminPanelResolver } from 'src/engine/core-modules/admin-panel/admin-panel.resolver';@@ -16,6 +17,7 @@ import { RedisHealthIndicator } from 'src/engine/core-modules/admin-panel/indicaimport { WorkerHealthIndicator } from 'src/engine/core-modules/admin-panel/indicators/worker.health';import { MaintenanceModeService } from 'src/engine/core-modules/admin-panel/maintenance-mode.service';import { AdminPanelAiProviderService } from 'src/engine/core-modules/admin-panel/services/admin-panel-ai-provider.service';+import { AdminPanelUsageLimitService } from 'src/engine/core-modules/admin-panel/services/admin-panel-usage-limit.service';import { AdminPanelBillingService } from 'src/engine/core-modules/admin-panel/services/admin-panel-billing.service';import { AdminPanelChatService } from 'src/engine/core-modules/admin-panel/services/admin-panel-chat.service';import { AdminPanelGlobalChatThreadsService } from 'src/engine/core-modules/admin-panel/services/admin-panel-global-chat-threads.service';@@ -45,6 +47,7 @@ import { SecureHttpClientModule } from 'src/engine/core-modules/secure-http-clieimport { TelemetryModule } from 'src/engine/core-modules/telemetry/telemetry.module';import { TwoFactorAuthenticationModule } from 'src/engine/core-modules/two-factor-authentication/two-factor-authentication.module';import { UpgradeModule } from 'src/engine/core-modules/upgrade/upgrade.module';+import { UsageLimitModule } from 'src/engine/core-modules/usage-limit/usage-limit.module';import { UsageModule } from 'src/engine/core-modules/usage/usage.module';import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';import { UserVarsModule } from 'src/engine/core-modules/user/user-vars/user-vars.module';@@ -82,6 +85,7 @@ import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspacSecureHttpClientModule,ApplicationRegistrationModule,UsageModule,+ UsageLimitModule,KeyValuePairModule,UserVarsModule,UpgradeModule,@@ -96,6 +100,8 @@ import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspacAdminPanelResolver,AdminPanelAiProviderResolver,AdminPanelApplicationRegistrationResolver,+ AdminPanelUsageLimitResolver,+ AdminPanelUsageLimitService,AdminPanelAiProviderService,AdminPanelUserLookupService,AdminPanelServerAdminService,diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/dtos/admin-panel-usage-limit.input.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/dtos/admin-panel-usage-limit.input.tsnew file mode 100644index 00000000000..9de8350d565--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/dtos/admin-panel-usage-limit.input.ts@@ -0,0 +1,55 @@+import { ArgsType, Field } from '@nestjs/graphql';++import { Type } from 'class-transformer';+import { IsNotEmpty, IsUUID, ValidateNested } from 'class-validator';++import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';+import { CreateUsageLimitInput } from 'src/engine/core-modules/usage-limit/dtos/create-usage-limit.input';+import { UpdateUsageLimitInput } from 'src/engine/core-modules/usage-limit/dtos/update-usage-limit.input';++@ArgsType()+export class AdminPanelWorkspaceUsageLimitsInput {+ @Field(() => UUIDScalarType)+ @IsNotEmpty()+ @IsUUID()+ workspaceId: string;+}++@ArgsType()+export class AdminPanelCreateUsageLimitInput {+ @Field(() => UUIDScalarType)+ @IsNotEmpty()+ @IsUUID()+ workspaceId: string;++ @Field(() => CreateUsageLimitInput)+ @Type(() => CreateUsageLimitInput)+ @ValidateNested()+ payload: CreateUsageLimitInput;+}++@ArgsType()+export class AdminPanelUpdateUsageLimitInput {+ @Field(() => UUIDScalarType)+ @IsNotEmpty()+ @IsUUID()+ workspaceId: string;++ @Field(() => UpdateUsageLimitInput)+ @Type(() => UpdateUsageLimitInput)+ @ValidateNested()+ payload: UpdateUsageLimitInput;+}++@ArgsType()+export class AdminPanelDeleteUsageLimitInput {+ @Field(() => UUIDScalarType)+ @IsNotEmpty()+ @IsUUID()+ workspaceId: string;++ @Field(() => UUIDScalarType)+ @IsNotEmpty()+ @IsUUID()+ usageLimitId: string;+}diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/dtos/admin-panel-workspace-usage-limits.dto.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/dtos/admin-panel-workspace-usage-limits.dto.tsnew file mode 100644index 00000000000..33ff09aa784--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/dtos/admin-panel-workspace-usage-limits.dto.ts@@ -0,0 +1,57 @@+import { Field, Int, ObjectType } from '@nestjs/graphql';++import { GraphQLBigInt } from 'graphql-scalars';++import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';+import { UsageLimitDTO } from 'src/engine/core-modules/usage-limit/dtos/usage-limit.dto';+import { type LimitKind } from 'src/engine/core-modules/usage-limit/types/limit-kind.type';+import { type PeriodUnit } from 'src/engine/core-modules/usage-limit/types/period-unit.type';+import { type SpenderType } from 'src/engine/core-modules/usage-limit/types/spender-type.type';+import { type UsageMeter } from 'src/engine/core-modules/usage-limit/types/usage-meter.type';+import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';+import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';++@ObjectType('AdminPanelUsageLimitDefault')+export class AdminPanelUsageLimitDefaultDTO {+ @Field(() => UsageResourceType)+ resourceType: UsageResourceType;++ @Field(() => UsageOperationType)+ operationType: UsageOperationType;++ @Field(() => String)+ spenderType: SpenderType;++ @Field(() => String)+ limitKind: LimitKind;++ @Field(() => Int)+ periodCount: number;++ @Field(() => String)+ periodUnit: PeriodUnit;++ @Field(() => String)+ meter: UsageMeter;++ @Field(() => GraphQLBigInt)+ limitValue: number;++ @Field(() => Boolean)+ isOverridable: boolean;++ @Field(() => UUIDScalarType, { nullable: true })+ overriddenByUsageLimitId: string | null;+}++@ObjectType('AdminPanelUsageLimit')+export class AdminPanelUsageLimitDTO extends UsageLimitDTO {}++@ObjectType('AdminPanelWorkspaceUsageLimits')+export class AdminPanelWorkspaceUsageLimitsDTO {+ @Field(() => [AdminPanelUsageLimitDefaultDTO])+ defaults: AdminPanelUsageLimitDefaultDTO[];++ @Field(() => [AdminPanelUsageLimitDTO])+ limits: AdminPanelUsageLimitDTO[];+}diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-usage-limit.service.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-usage-limit.service.tsnew file mode 100644index 00000000000..d5da38d752f--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/services/admin-panel-usage-limit.service.ts@@ -0,0 +1,64 @@+import { Injectable } from '@nestjs/common';++import {+ type AdminPanelUsageLimitDefaultDTO,+ type AdminPanelWorkspaceUsageLimitsDTO,+} from 'src/engine/core-modules/admin-panel/dtos/admin-panel-workspace-usage-limits.dto';+import { type NumericConfigVariableKey } from 'src/engine/core-modules/twenty-config/types/numeric-config-variable-key.type';+import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';+import { UsageLimitService } from 'src/engine/core-modules/usage-limit/services/usage-limit.service';+import { type UsageLimitEntity } from 'src/engine/core-modules/usage-limit/usage-limit.entity';+import { buildUsageLimitDefaultScopes } from 'src/engine/core-modules/usage-limit/utils/build-usage-limit-default-scopes.util';+import { buildUsageLimitScope } from 'src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util';+import { doesUsageLimitRowSuppressDefault } from 'src/engine/core-modules/usage-limit/utils/does-usage-limit-row-suppress-default.util';+import { fromUsageLimitEntityToDto } from 'src/engine/core-modules/usage-limit/utils/from-usage-limit-entity-to-dto.util';++@Injectable()+export class AdminPanelUsageLimitService {+ constructor(+ private readonly usageLimitService: UsageLimitService,+ private readonly twentyConfigService: TwentyConfigService,+ ) {}++ async findWorkspaceUsageLimits(+ workspaceId: string,+ ): Promise<AdminPanelWorkspaceUsageLimitsDTO> {+ const usageLimits = await this.usageLimitService.findAll(workspaceId);++ return {+ defaults: this.buildDefaults(usageLimits),+ limits: usageLimits.map(fromUsageLimitEntityToDto),+ };+ }++ private buildDefaults(+ usageLimits: UsageLimitEntity[],+ ): AdminPanelUsageLimitDefaultDTO[] {+ const getConfigValue = (key: NumericConfigVariableKey) =>+ this.twentyConfigService.get(key);++ return buildUsageLimitDefaultScopes({ getConfigValue }).map(+ (usageLimitDefault) => {+ const overridingUsageLimit = usageLimits.find((usageLimit) =>+ doesUsageLimitRowSuppressDefault({+ scope: buildUsageLimitScope(usageLimit),+ usageLimitDefault,+ }),+ );++ return {+ resourceType: usageLimitDefault.resourceType,+ operationType: usageLimitDefault.operationType,+ spenderType: usageLimitDefault.spenderType,+ limitKind: usageLimitDefault.limitKind,+ periodCount: usageLimitDefault.periodCount,+ periodUnit: usageLimitDefault.periodUnit,+ meter: usageLimitDefault.meter,+ limitValue: usageLimitDefault.limitValue,+ isOverridable: usageLimitDefault.isOverridable,+ overriddenByUsageLimitId: overridingUsageLimit?.id ?? null,+ };+ },+ );+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/constants/usage-limit-definitions.constant.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/constants/usage-limit-definitions.constant.tsindex bc947288754..bef60da3cf3 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/constants/usage-limit-definitions.constant.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/constants/usage-limit-definitions.constant.ts@@ -1,4 +1,4 @@-import { type UsageLimitDefinitions } from 'src/engine/core-modules/usage-limit/types/usage-limit-definition.type';+import { type UsageLimitDefinitionsByResourceType } from 'src/engine/core-modules/usage-limit/types/usage-limit-definition.type';import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';@@ -9,24 +9,42 @@ export const USAGE_LIMIT_DEFINITIONS = {allowedSpenderTypes: ['apiKey', 'application'],defaults: [{+ resourceType: UsageResourceType.API,+ operationType: UsageOperationType.API_REQUEST,+ limitKind: 'speed',spenderType: 'apiKey',- counterScope: 'perWorkspace',- limitValueConfigVariable: 'API_RATE_LIMITING_SHORT_LIMIT',+ spenderId: '',+ meter: 'quantity',+ periodUnit: 'second',windowMsConfigVariable: 'API_RATE_LIMITING_SHORT_TTL_IN_MS',- isOverridable: true,+ limitValueConfigVariable: 'API_RATE_LIMITING_SHORT_LIMIT',+ counterScope: 'perWorkspace',+ isOverridable: false,},{+ resourceType: UsageResourceType.API,+ operationType: UsageOperationType.API_REQUEST,+ limitKind: 'speed',spenderType: 'apiKey',- counterScope: 'perWorkspace',- limitValueConfigVariable: 'API_RATE_LIMITING_LONG_LIMIT',+ spenderId: '',+ meter: 'quantity',+ periodUnit: 'second',windowMsConfigVariable: 'API_RATE_LIMITING_LONG_TTL_IN_MS',+ limitValueConfigVariable: 'API_RATE_LIMITING_LONG_LIMIT',+ counterScope: 'perWorkspace',isOverridable: true,},{+ resourceType: UsageResourceType.API,+ operationType: UsageOperationType.API_REQUEST,+ limitKind: 'speed',spenderType: 'application',- counterScope: 'crossWorkspace',- limitValueConfigVariable: 'APPLICATION_API_RATE_LIMITING_LIMIT',+ spenderId: '',+ meter: 'quantity',+ periodUnit: 'second',windowMsConfigVariable: 'APPLICATION_API_RATE_LIMITING_TTL_IN_MS',+ limitValueConfigVariable: 'APPLICATION_API_RATE_LIMITING_LIMIT',+ counterScope: 'crossWorkspace',isOverridable: false,},],@@ -63,8 +81,14 @@ export const USAGE_LIMIT_DEFINITIONS = {allowedMeters: ['bytes', 'quantity'],defaults: [{+ resourceType: UsageResourceType.STORAGE,+ operationType: UsageOperationType.STORAGE_FILE,+ limitKind: 'stock',spenderType: 'workspace',+ spenderId: '',meter: 'bytes',+ periodUnit: 'lifetime',+ periodCount: 1,limitValueConfigVariable: 'WORKSPACE_STORAGE_LIMIT_BYTES',isOverridable: true,},@@ -92,18 +116,57 @@ export const USAGE_LIMIT_DEFINITIONS = {// reports which limit was hit.defaults: [{+ resourceType: UsageResourceType.EMAIL,+ operationType: UsageOperationType.EMAIL_SEND,+ limitKind: 'speed',spenderType: 'workspace',- counterScope: 'perWorkspace',- limitValueConfigVariable: 'EMAIL_SEND_WORKSPACE_RATE_LIMITING_LIMIT',+ spenderId: '',+ meter: 'quantity',+ periodUnit: 'second',windowMsConfigVariable:'EMAIL_SEND_WORKSPACE_RATE_LIMITING_TTL_IN_MS',+ limitValueConfigVariable: 'EMAIL_SEND_WORKSPACE_RATE_LIMITING_LIMIT',+ counterScope: 'perWorkspace',isOverridable: true,},{+ resourceType: UsageResourceType.EMAIL,+ operationType: UsageOperationType.EMAIL_SEND,+ limitKind: 'speed',spenderType: 'workspace',- counterScope: 'crossWorkspace',+ spenderId: '',+ meter: 'quantity',+ periodUnit: 'second',+ windowMsConfigVariable: 'EMAIL_SEND_RATE_LIMITING_TTL_IN_MS',limitValueConfigVariable: 'EMAIL_SEND_RATE_LIMITING_LIMIT',+ counterScope: 'crossWorkspace',+ isOverridable: false,+ },+ {+ resourceType: UsageResourceType.EMAIL,+ operationType: UsageOperationType.MESSAGE_CAMPAIGN_SEND,+ limitKind: 'speed',+ spenderType: 'workspace',+ spenderId: '',+ meter: 'quantity',+ periodUnit: 'second',+ windowMsConfigVariable:+ 'EMAIL_SEND_WORKSPACE_RATE_LIMITING_TTL_IN_MS',+ limitValueConfigVariable: 'EMAIL_SEND_WORKSPACE_RATE_LIMITING_LIMIT',+ counterScope: 'perWorkspace',+ isOverridable: true,+ },+ {+ resourceType: UsageResourceType.EMAIL,+ operationType: UsageOperationType.MESSAGE_CAMPAIGN_SEND,+ limitKind: 'speed',+ spenderType: 'workspace',+ spenderId: '',+ meter: 'quantity',+ periodUnit: 'second',windowMsConfigVariable: 'EMAIL_SEND_RATE_LIMITING_TTL_IN_MS',+ limitValueConfigVariable: 'EMAIL_SEND_RATE_LIMITING_LIMIT',+ counterScope: 'crossWorkspace',isOverridable: false,},],@@ -120,10 +183,16 @@ export const USAGE_LIMIT_DEFINITIONS = {allowedSpenderTypes: ['workspace'],defaults: [{+ resourceType: UsageResourceType.WEBHOOK,+ operationType: UsageOperationType.WEBHOOK_CALL,+ limitKind: 'speed',spenderType: 'workspace',- counterScope: 'perWorkspace',- limitValueConfigVariable: 'WEBHOOK_CALL_RATE_LIMITING_LIMIT',+ spenderId: '',+ meter: 'quantity',+ periodUnit: 'second',windowMsConfigVariable: 'WEBHOOK_CALL_RATE_LIMITING_TTL_IN_MS',+ limitValueConfigVariable: 'WEBHOOK_CALL_RATE_LIMITING_LIMIT',+ counterScope: 'perWorkspace',isOverridable: true,},],@@ -136,12 +205,18 @@ export const USAGE_LIMIT_DEFINITIONS = {allowedMeters: ['quantity'],defaults: [{+ resourceType: UsageResourceType.RECORD,+ operationType: UsageOperationType.RECORD_WRITE,+ limitKind: 'stock',spenderType: 'workspace',+ spenderId: '',meter: 'quantity',+ periodUnit: 'lifetime',+ periodCount: 1,limitValueConfigVariable: 'WORKSPACE_RECORD_LIMIT',isOverridable: true,},],},},-} satisfies Record<UsageResourceType, UsageLimitDefinitions>;+} satisfies UsageLimitDefinitionsByResourceType;diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/exceptions/usage-limit.exception.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/exceptions/usage-limit.exception.tsindex b444c14325c..3f4d349515a 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/exceptions/usage-limit.exception.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/exceptions/usage-limit.exception.ts@@ -12,6 +12,8 @@ export enum UsageLimitExceptionCode {STOCK_EXHAUSTED = 'STOCK_EXHAUSTED',LIMIT_INVALID = 'LIMIT_INVALID',LIMIT_NOT_ENTITLED = 'LIMIT_NOT_ENTITLED',+ LIMIT_FORBIDDEN = 'LIMIT_FORBIDDEN',+ LIMIT_CONFLICT = 'LIMIT_CONFLICT',}const getUsageLimitExceptionUserFriendlyMessage = (@@ -28,6 +30,10 @@ const getUsageLimitExceptionUserFriendlyMessage = (return msg`This limit cannot be saved.`;case UsageLimitExceptionCode.LIMIT_NOT_ENTITLED:return msg`Limits scoped below the workspace require the Organization plan.`;+ case UsageLimitExceptionCode.LIMIT_FORBIDDEN:+ return msg`Only an operator can replace an instance default.`;+ case UsageLimitExceptionCode.LIMIT_CONFLICT:+ return msg`This limit changed while you were editing it. Reload and try again.`;default:assertUnreachable(code);}diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/filters/__tests__/usage-limit-graphql-api-exception.filter.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/filters/__tests__/usage-limit-graphql-api-exception.filter.spec.tsindex a424e7f7fdb..647db8c8c4e 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/filters/__tests__/usage-limit-graphql-api-exception.filter.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/filters/__tests__/usage-limit-graphql-api-exception.filter.spec.ts@@ -46,6 +46,35 @@ describe('UsageLimitGraphqlApiExceptionFilter', () => {expect(graphqlError.extensions.code).toBe(ErrorCode.FORBIDDEN);});+ it('surfaces an operator-only default as a forbidden error carrying its own message', () => {+ const graphqlError = catchAsGraphQLError(+ new UsageLimitException(+ 'The STORAGE stock default is set for this instance and only an operator can replace it',+ UsageLimitExceptionCode.LIMIT_FORBIDDEN,+ ),+ );++ expect(graphqlError.extensions.code).toBe(ErrorCode.FORBIDDEN);+ expect(graphqlError.extensions.subCode).toBe(+ UsageLimitExceptionCode.LIMIT_FORBIDDEN,+ );+ expect(graphqlError.extensions.userFriendlyMessage).toBeDefined();+ });++ it('surfaces a row that changed under the request as a conflict, not a refusal', () => {+ const graphqlError = catchAsGraphQLError(+ new UsageLimitException(+ 'Usage limit 20202020-0000-4000-8000-000000000000 changed while this request was being authorized',+ UsageLimitExceptionCode.LIMIT_CONFLICT,+ ),+ );++ expect(graphqlError.extensions.code).toBe(ErrorCode.CONFLICT);+ expect(graphqlError.extensions.subCode).toBe(+ UsageLimitExceptionCode.LIMIT_CONFLICT,+ );+ });+it('surfaces an exhausted quota through the shared enforcement mapping', () => {const graphqlError = catchAsGraphQLError(new UsageLimitException(diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/filters/usage-limit-graphql-api-exception.filter.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/filters/usage-limit-graphql-api-exception.filter.tsindex 40a8fa3091c..11d592e6626 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/filters/usage-limit-graphql-api-exception.filter.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/filters/usage-limit-graphql-api-exception.filter.ts@@ -3,6 +3,7 @@ import { Catch, type ExceptionFilter } from '@nestjs/common';import { assertUnreachable } from 'twenty-shared/utils';import {+ ConflictError,ForbiddenError,UserInputError,} from 'src/engine/core-modules/graphql/utils/graphql-errors.util';@@ -19,7 +20,10 @@ export class UsageLimitGraphqlApiExceptionFilter implements ExceptionFilter {case UsageLimitExceptionCode.LIMIT_INVALID:throw new UserInputError(exception);case UsageLimitExceptionCode.LIMIT_NOT_ENTITLED:+ case UsageLimitExceptionCode.LIMIT_FORBIDDEN:throw new ForbiddenError(exception);+ case UsageLimitExceptionCode.LIMIT_CONFLICT:+ throw new ConflictError(exception);case UsageLimitExceptionCode.RATE_LIMITED:case UsageLimitExceptionCode.QUOTA_EXHAUSTED:case UsageLimitExceptionCode.STOCK_EXHAUSTED:diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/services/__tests__/usage-limit-quota.service.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/services/__tests__/usage-limit-quota.service.spec.tsindex 96f6ff2637e..f890ec0ff15 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/services/__tests__/usage-limit-quota.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/services/__tests__/usage-limit-quota.service.spec.ts@@ -78,6 +78,7 @@ const buildLimit = (overrides: Partial<FlatUsageLimit>): FlatUsageLimit => ({meter: 'creditsUsedMicro',limitValue: 1_000,burstValue: null,+ isInstanceOverride: false,...overrides,});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/services/__tests__/usage-limit-speed.service.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/services/__tests__/usage-limit-speed.service.spec.tsindex 727b71a8982..74f2faaac07 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/services/__tests__/usage-limit-speed.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/services/__tests__/usage-limit-speed.service.spec.ts@@ -45,6 +45,7 @@ const buildApiKeySpeedLimit = (): FlatUsageLimit => ({meter: 'quantity',limitValue: 100,burstValue: null,+ isInstanceOverride: false,});describe('UsageLimitSpeedService', () => {diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit-speed.service.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit-speed.service.tsindex 0d469844a6e..dc2bea39a87 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit-speed.service.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit-speed.service.ts@@ -246,8 +246,12 @@ export class UsageLimitSpeedService {});return buildSpeedBuckets({- speedLimitDefaults: definition.defaults.map(- (speedLimitDefaultDefinition) => ({+ speedLimitDefaults: definition.defaults+ .filter(+ (speedLimitDefaultDefinition) =>+ speedLimitDefaultDefinition.operationType === operationType,+ )+ .map((speedLimitDefaultDefinition) => ({spenderType: speedLimitDefaultDefinition.spenderType,counterScope: speedLimitDefaultDefinition.counterScope,isOverridable: speedLimitDefaultDefinition.isOverridable,@@ -257,8 +261,7 @@ export class UsageLimitSpeedService {windowMs: this.twentyConfigService.get(speedLimitDefaultDefinition.windowMsConfigVariable,),- }),- ),+ })),limits: enforceableLimits,authContext,resourceType,diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit-stock.service.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit-stock.service.tsindex 929c615b9d0..ae9c1f65d41 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit-stock.service.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit-stock.service.ts@@ -173,7 +173,7 @@ export class UsageLimitStockService {if (isStockResourceType(resourceType)) {keys.push(- ...this.buildStockLimitDefaults(resourceType)+ ...this.buildStockLimitDefaults({ resourceType, operationType }).filter((stockLimitDefault) =>stockLimitDefault.spenderType === spenderType,@@ -298,26 +298,38 @@ export class UsageLimitStockService {operationType,spenders,limits: enforceableLimits,- stockLimitDefaults: this.buildStockLimitDefaults(resourceType),+ stockLimitDefaults: this.buildStockLimitDefaults({+ resourceType,+ operationType,+ }),});}- private buildStockLimitDefaults(- resourceType: StockResourceType,- ): StockLimitDefault[] {+ private buildStockLimitDefaults({+ resourceType,+ operationType,+ }: {+ resourceType: StockResourceType;+ operationType: UsageOperationType;+ }): StockLimitDefault[] {const definition = findUsageLimitDefinition({resourceType,limitKind: 'stock',});- return (definition?.defaults ?? []).map((stockLimitDefaultDefinition) => ({- spenderType: stockLimitDefaultDefinition.spenderType,- meter: stockLimitDefaultDefinition.meter,- isOverridable: stockLimitDefaultDefinition.isOverridable,- limitValue: this.twentyConfigService.get(- stockLimitDefaultDefinition.limitValueConfigVariable,- ),- }));+ return (definition?.defaults ?? [])+ .filter(+ (stockLimitDefaultDefinition) =>+ stockLimitDefaultDefinition.operationType === operationType,+ )+ .map((stockLimitDefaultDefinition) => ({+ spenderType: stockLimitDefaultDefinition.spenderType,+ meter: stockLimitDefaultDefinition.meter,+ isOverridable: stockLimitDefaultDefinition.isOverridable,+ limitValue: this.twentyConfigService.get(+ stockLimitDefaultDefinition.limitValueConfigVariable,+ ),+ }));}private async readRemainings({diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit.service.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit.service.tsindex 188edda6529..3efeb7c998f 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit.service.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/services/usage-limit.service.ts@@ -17,7 +17,12 @@ import { UsageLimitStockService } from 'src/engine/core-modules/usage-limit/servimport { UsagePeriodService } from 'src/engine/core-modules/usage-limit/services/usage-period.service';import { type SpenderType } from 'src/engine/core-modules/usage-limit/types/spender-type.type';import { UsageLimitEntity } from 'src/engine/core-modules/usage-limit/usage-limit.entity';-import { buildUsageLimitScope } from 'src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util';+import { assertUsageLimitDefaultOverrideIsAllowed } from 'src/engine/core-modules/usage-limit/utils/assert-usage-limit-default-override-is-allowed.util';+import { assertUsageLimitInstanceOverrideIsAllowed } from 'src/engine/core-modules/usage-limit/utils/assert-usage-limit-instance-override-is-allowed.util';+import {+ buildUsageLimitScope,+ type UsageLimitScope,+} from 'src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util';import { isIntraWorkspaceScoped } from 'src/engine/core-modules/usage-limit/utils/is-intra-workspace-scoped.util';import { isStockLimit } from 'src/engine/core-modules/usage-limit/utils/is-stock-limit.util';import { validateUsageLimitAgainstDefinition } from 'src/engine/core-modules/usage-limit/utils/validate-usage-limit-against-definition.util';@@ -58,14 +63,18 @@ export class UsageLimitService {async create({workspaceId,input,+ isOperator,}: {workspaceId: string;input: CreateUsageLimitInput;+ isOperator: boolean;}): Promise<UsageLimitEntity> {- await this.validateInput({ workspaceId, input });+ await this.validateInput({ workspaceId, input, isOperator });const scope = buildUsageLimitScope(input);+ assertUsageLimitDefaultOverrideIsAllowed({ scope, isOperator });+await this.assertScopeIsFree({ workspaceId, scope });await this.usageLimitRepository.insert(workspaceId, {@@ -73,6 +82,7 @@ export class UsageLimitService {...scope,limitValue: input.limitValue,burstValue: input.burstValue ?? null,+ isInstanceOverride: isOperator,});await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [@@ -92,12 +102,12 @@ export class UsageLimitService {async update({workspaceId,input,+ isOperator,}: {workspaceId: string;input: UpdateUsageLimitInput;+ isOperator: boolean;}): Promise<UsageLimitEntity> {- await this.validateInput({ workspaceId, input: input.payload });-const usageLimit = await this.usageLimitRepository.findOne(workspaceId, {where: { id: input.id },});@@ -109,24 +119,49 @@ export class UsageLimitService {);}+ const authorizedScope = buildUsageLimitScope(usageLimit);++ assertUsageLimitInstanceOverrideIsAllowed({ usageLimit, isOperator });++ assertUsageLimitDefaultOverrideIsAllowed({+ scope: authorizedScope,+ isOperator,+ });++ await this.validateInput({ workspaceId, input: input.payload, isOperator });+const scope = buildUsageLimitScope(input.payload);+ assertUsageLimitDefaultOverrideIsAllowed({ scope, isOperator });+await this.assertScopeIsFree({workspaceId,scope,allowedUsageLimitId: usageLimit.id,});- await this.usageLimitRepository.update(+ const { affected } = await this.usageLimitRepository.update(workspaceId,- { id: usageLimit.id },+ {+ id: usageLimit.id,+ ...authorizedScope,+ isInstanceOverride: usageLimit.isInstanceOverride,+ },{...scope,limitValue: input.payload.limitValue,burstValue: input.payload.burstValue ?? null,+ isInstanceOverride: isOperator,},);+ if (!isDefined(affected) || affected === 0) {+ throw new UsageLimitException(+ `Usage limit ${input.id} changed while this request was being authorized`,+ UsageLimitExceptionCode.LIMIT_CONFLICT,+ );+ }+await this.workspaceCacheService.invalidateAndRecompute(workspaceId, ['usageLimits',]);@@ -149,7 +184,7 @@ export class UsageLimitService {allowedUsageLimitId,}: {workspaceId: string;- scope: ReturnType<typeof buildUsageLimitScope>;+ scope: UsageLimitScope;allowedUsageLimitId?: string;}): Promise<void> {const usageLimitHoldingScope = await this.usageLimitRepository.findOne(@@ -171,14 +206,17 @@ export class UsageLimitService {private async validateInput({workspaceId,input,+ isOperator,}: {workspaceId: string;input: CreateUsageLimitInput;+ isOperator: boolean;}): Promise<void> {validateUsageLimitAgainstDefinition(input);validateUsageLimitAgainstKindRule(input);if (+ !isOperator &&isIntraWorkspaceScoped(input.spenderType) &&!(await this.usageLimitEntitlementService.isIntraWorkspaceLimitEntitled(workspaceId,@@ -212,9 +250,11 @@ export class UsageLimitService {async delete({workspaceId,usageLimitId,+ isOperator,}: {workspaceId: string;usageLimitId: string;+ isOperator: boolean;}): Promise<boolean> {const usageLimit = await this.usageLimitRepository.findOne(workspaceId, {where: { id: usageLimitId },@@ -224,12 +264,24 @@ export class UsageLimitService {return false;}+ assertUsageLimitInstanceOverrideIsAllowed({ usageLimit, isOperator });++ assertUsageLimitDefaultOverrideIsAllowed({+ scope: buildUsageLimitScope(usageLimit),+ isOperator,+ });+const { affected } = await this.usageLimitRepository.delete(workspaceId, {id: usageLimitId,+ ...buildUsageLimitScope(usageLimit),+ isInstanceOverride: usageLimit.isInstanceOverride,});if (!isDefined(affected) || affected === 0) {- return false;+ throw new UsageLimitException(+ `Usage limit ${usageLimitId} changed while this request was being authorized`,+ UsageLimitExceptionCode.LIMIT_CONFLICT,+ );}await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/types/flat-usage-limit.type.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/types/flat-usage-limit.type.tsindex 7694b9e1a2a..25879472dab 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/types/flat-usage-limit.type.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/types/flat-usage-limit.type.ts@@ -17,4 +17,5 @@ export type FlatUsageLimit = {meter: UsageMeter;limitValue: number;burstValue: number | null;+ isInstanceOverride: boolean;};diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/types/speed-limit-default-definition.type.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/types/speed-limit-default-definition.type.tsindex 6dc45372ab2..72837855e2a 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/types/speed-limit-default-definition.type.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/types/speed-limit-default-definition.type.ts@@ -1,11 +1,22 @@import { type NumericConfigVariableKey } from 'src/engine/core-modules/twenty-config/types/numeric-config-variable-key.type';import { type CounterScope } from 'src/engine/core-modules/usage-limit/types/counter-scope.type';+import { type SpeedMeter } from 'src/engine/core-modules/usage-limit/types/speed-meter.type';import { type SpenderType } from 'src/engine/core-modules/usage-limit/types/spender-type.type';+import { type UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';+import { type UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';-export type SpeedLimitDefaultDefinition = {+export type SpeedLimitDefaultDefinition<+ TResourceType extends UsageResourceType = UsageResourceType,+> = {+ resourceType: TResourceType;+ operationType: UsageOperationType;+ limitKind: 'speed';spenderType: SpenderType;+ spenderId: '';+ meter: SpeedMeter;+ periodUnit: 'second';+ windowMsConfigVariable: NumericConfigVariableKey;+ limitValueConfigVariable: NumericConfigVariableKey;counterScope: CounterScope;isOverridable: boolean;- limitValueConfigVariable: NumericConfigVariableKey;- windowMsConfigVariable: NumericConfigVariableKey;};diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/types/speed-meter.type.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/types/speed-meter.type.tsnew file mode 100644index 00000000000..89a9b3b5e2e--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/types/speed-meter.type.ts@@ -0,0 +1,3 @@+import { type SPEED_METERS } from 'src/engine/core-modules/usage-limit/constants/usage-meters.constant';++export type SpeedMeter = (typeof SPEED_METERS)[number];diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/types/stock-limit-default-definition.type.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/types/stock-limit-default-definition.type.tsindex 961d034061c..415e7d60ceb 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/types/stock-limit-default-definition.type.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/types/stock-limit-default-definition.type.ts@@ -1,10 +1,20 @@import { type NumericConfigVariableKey } from 'src/engine/core-modules/twenty-config/types/numeric-config-variable-key.type';import { type SpenderType } from 'src/engine/core-modules/usage-limit/types/spender-type.type';import { type StockMeter } from 'src/engine/core-modules/usage-limit/types/stock-meter.type';+import { type UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';+import { type UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';-export type StockLimitDefaultDefinition = {+export type StockLimitDefaultDefinition<+ TResourceType extends UsageResourceType = UsageResourceType,+> = {+ resourceType: TResourceType;+ operationType: UsageOperationType;+ limitKind: 'stock';spenderType: SpenderType;+ spenderId: '';meter: StockMeter;- isOverridable: boolean;+ periodUnit: 'lifetime';+ periodCount: 1;limitValueConfigVariable: NumericConfigVariableKey;+ isOverridable: boolean;};diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/types/usage-limit-default-definition.type.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/types/usage-limit-default-definition.type.tsnew file mode 100644index 00000000000..a4c2fb92927--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/types/usage-limit-default-definition.type.ts@@ -0,0 +1,6 @@+import { type SpeedLimitDefaultDefinition } from 'src/engine/core-modules/usage-limit/types/speed-limit-default-definition.type';+import { type StockLimitDefaultDefinition } from 'src/engine/core-modules/usage-limit/types/stock-limit-default-definition.type';++export type UsageLimitDefaultDefinition =+ | SpeedLimitDefaultDefinition+ | StockLimitDefaultDefinition;diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/types/usage-limit-definition.type.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/types/usage-limit-definition.type.tsindex 8836e7066a6..3888e5b7594 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/types/usage-limit-definition.type.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/types/usage-limit-definition.type.ts@@ -4,11 +4,12 @@ import { type SpenderType } from 'src/engine/core-modules/usage-limit/types/spenimport { type StockLimitDefaultDefinition } from 'src/engine/core-modules/usage-limit/types/stock-limit-default-definition.type';import { type StockMeter } from 'src/engine/core-modules/usage-limit/types/stock-meter.type';import { type UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';+import { type UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';-type SpeedLimitDefinition = {+type SpeedLimitDefinition<TResourceType extends UsageResourceType> = {allowedOperationTypes: UsageOperationType[];allowedSpenderTypes: SpenderType[];- defaults: SpeedLimitDefaultDefinition[];+ defaults: SpeedLimitDefaultDefinition<TResourceType>[];};type QuotaLimitDefinition = {@@ -17,15 +18,21 @@ type QuotaLimitDefinition = {allowedMeters: QuotaMeter[];};-type StockLimitDefinition = {+type StockLimitDefinition<TResourceType extends UsageResourceType> = {allowedOperationTypes: UsageOperationType[];allowedSpenderTypes: SpenderType[];allowedMeters: StockMeter[];- defaults: StockLimitDefaultDefinition[];+ defaults: StockLimitDefaultDefinition<TResourceType>[];};-export type UsageLimitDefinitions = {- speed?: SpeedLimitDefinition;+export type UsageLimitDefinitions<+ TResourceType extends UsageResourceType = UsageResourceType,+> = {+ speed?: SpeedLimitDefinition<TResourceType>;quota?: QuotaLimitDefinition;- stock?: StockLimitDefinition;+ stock?: StockLimitDefinition<TResourceType>;+};++export type UsageLimitDefinitionsByResourceType = {+ [TResourceType in UsageResourceType]: UsageLimitDefinitions<TResourceType>;};diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.entity.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.entity.tsindex 774ebed1fe1..834e766c26a 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.entity.ts@@ -66,6 +66,9 @@ export class UsageLimitEntity extends WorkspaceRelatedEntity {})burstValue: number | null;+ @Column({ type: 'boolean', default: false })+ isInstanceOverride: boolean;+@CreateDateColumn({ type: 'timestamptz' })createdAt: Date;diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.module.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.module.tsindex 808dbcc9d84..36cdcfb87dc 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.module.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.module.ts@@ -64,6 +64,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache],exports: [UsageLimitEntitlementService,+ UsageLimitService,UsageLimitQuotaService,UsageLimitSpeedService,UsageLimitStockService,diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.resolver.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.resolver.tsindex 7161133d46e..90c8c56e237 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/usage-limit.resolver.ts@@ -87,6 +87,7 @@ export class UsageLimitResolver {const usageLimit = await this.usageLimitService.create({workspaceId: workspace.id,input,+ isOperator: false,});return fromUsageLimitEntityToDto(usageLimit);@@ -100,6 +101,7 @@ export class UsageLimitResolver {const usageLimit = await this.usageLimitService.update({workspaceId: workspace.id,input,+ isOperator: false,});return fromUsageLimitEntityToDto(usageLimit);@@ -113,6 +115,7 @@ export class UsageLimitResolver {return this.usageLimitService.delete({workspaceId: workspace.id,usageLimitId,+ isOperator: false,});}}diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/assert-usage-limit-default-override-is-allowed.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/assert-usage-limit-default-override-is-allowed.util.spec.tsnew file mode 100644index 00000000000..605931ed7b9--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/assert-usage-limit-default-override-is-allowed.util.spec.ts@@ -0,0 +1,83 @@+import { UsageLimitExceptionCode } from 'src/engine/core-modules/usage-limit/exceptions/usage-limit.exception';+import { assertUsageLimitDefaultOverrideIsAllowed } from 'src/engine/core-modules/usage-limit/utils/assert-usage-limit-default-override-is-allowed.util';+import {+ buildUsageLimitScope,+ type UsageLimitScope,+} from 'src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util';+import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';+import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';++const buildScope = (+ overrides: Partial<UsageLimitScope> = {},+): UsageLimitScope =>+ buildUsageLimitScope({+ resourceType: UsageResourceType.STORAGE,+ operationType: UsageOperationType.STORAGE_FILE,+ spenderType: 'workspace',+ spenderId: '',+ limitKind: 'stock',+ periodCount: 1,+ periodUnit: 'lifetime',+ meter: 'bytes',+ ...overrides,+ });++describe('assertUsageLimitDefaultOverrideIsAllowed', () => {+ it('refuses a workspace write that would replace a default', () => {+ expect(() =>+ assertUsageLimitDefaultOverrideIsAllowed({+ scope: buildScope(),+ isOperator: false,+ }),+ ).toThrow(+ expect.objectContaining({+ code: UsageLimitExceptionCode.LIMIT_FORBIDDEN,+ }),+ );+ });++ it('lets an operator replace the same default', () => {+ expect(() =>+ assertUsageLimitDefaultOverrideIsAllowed({+ scope: buildScope(),+ isOperator: true,+ }),+ ).not.toThrow();+ });++ it('lets a workspace write where only a non-overridable default stands, since it can only tighten', () => {+ expect(() =>+ assertUsageLimitDefaultOverrideIsAllowed({+ scope: buildScope({+ resourceType: UsageResourceType.API,+ operationType: UsageOperationType.API_REQUEST,+ spenderType: 'application',+ limitKind: 'speed',+ periodUnit: 'second',+ meter: 'quantity',+ }),+ isOperator: false,+ }),+ ).not.toThrow();+ });++ it('lets a workspace write scoped to one spender', () => {+ expect(() =>+ assertUsageLimitDefaultOverrideIsAllowed({+ scope: buildScope({+ spenderId: 'ef0cfbbd-8b6e-4f9d-9a7c-1a2b3c4d5e6f',+ }),+ isOperator: false,+ }),+ ).not.toThrow();+ });++ it('lets a workspace write on a scope no default covers', () => {+ expect(() =>+ assertUsageLimitDefaultOverrideIsAllowed({+ scope: buildScope({ meter: 'quantity' }),+ isOperator: false,+ }),+ ).not.toThrow();+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/assert-usage-limit-instance-override-is-allowed.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/assert-usage-limit-instance-override-is-allowed.util.spec.tsnew file mode 100644index 00000000000..8f1a745d71a--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/assert-usage-limit-instance-override-is-allowed.util.spec.ts@@ -0,0 +1,35 @@+import { UsageLimitExceptionCode } from 'src/engine/core-modules/usage-limit/exceptions/usage-limit.exception';+import { assertUsageLimitInstanceOverrideIsAllowed } from 'src/engine/core-modules/usage-limit/utils/assert-usage-limit-instance-override-is-allowed.util';++describe('assertUsageLimitInstanceOverrideIsAllowed', () => {+ it('refuses a workspace write on a row an operator set', () => {+ expect(() =>+ assertUsageLimitInstanceOverrideIsAllowed({+ usageLimit: { isInstanceOverride: true },+ isOperator: false,+ }),+ ).toThrow(+ expect.objectContaining({+ code: UsageLimitExceptionCode.LIMIT_FORBIDDEN,+ }),+ );+ });++ it('lets an operator change the row it set', () => {+ expect(() =>+ assertUsageLimitInstanceOverrideIsAllowed({+ usageLimit: { isInstanceOverride: true },+ isOperator: true,+ }),+ ).not.toThrow();+ });++ it('leaves a row the workspace set for itself alone', () => {+ expect(() =>+ assertUsageLimitInstanceOverrideIsAllowed({+ usageLimit: { isInstanceOverride: false },+ isOperator: false,+ }),+ ).not.toThrow();+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-intra-workspace-limit-counter-keys.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-intra-workspace-limit-counter-keys.util.spec.tsindex d1d07d8484b..f1e2f6935d6 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-intra-workspace-limit-counter-keys.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-intra-workspace-limit-counter-keys.util.spec.ts@@ -25,6 +25,7 @@ const buildLimit = (overrides: Partial<FlatUsageLimit>): FlatUsageLimit => ({meter: 'creditsUsedMicro',limitValue: 1_000,burstValue: null,+ isInstanceOverride: false,...overrides,});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-quota-counters.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-quota-counters.util.spec.tsindex 5bb264ca9fc..c293df28367 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-quota-counters.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-quota-counters.util.spec.ts@@ -25,6 +25,7 @@ const buildLimit = (overrides: Partial<FlatQuotaLimit>): FlatQuotaLimit => ({meter: 'creditsUsedMicro',limitValue: 1_000_000,burstValue: null,+ isInstanceOverride: false,...overrides,});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-speed-buckets.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-speed-buckets.util.spec.tsindex 2335c153aae..1484019260d 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-speed-buckets.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-speed-buckets.util.spec.ts@@ -15,7 +15,7 @@ const SPEED_LIMIT_DEFAULTS: SpeedLimitDefault[] = [counterScope: 'perWorkspace',maxTokens: 100,windowMs: 1000,- isOverridable: true,+ isOverridable: false,},{spenderType: 'apiKey',@@ -45,6 +45,7 @@ const buildLimit = (overrides: Partial<FlatUsageLimit>): FlatUsageLimit => ({meter: 'quantity',limitValue: 100,burstValue: null,+ isInstanceOverride: false,...overrides,});@@ -222,6 +223,7 @@ describe('buildSpeedBuckets with limits configured', () => {expect(buckets.map((bucket) => bucket.key)).toEqual(['{workspace-1}:speed:API:API_REQUEST:apiKey:key-1:60','{workspace-1}:speed:API:API_REQUEST:apiKey:-:60',+ '{workspace-1}:speed:API:API_REQUEST:apiKey:-:1',]);});@@ -238,7 +240,7 @@ describe('buildSpeedBuckets with limits configured', () => {]);});- it('replaces every default once a limit covers the spender type', () => {+ it('replaces the overridable default but stays under the burst ceiling', () => {const buckets = buildBuckets({authContext: apiKeyContext,limits: [buildLimit({ spenderId: '', periodCount: 60, limitValue: 10 })],@@ -246,7 +248,10 @@ describe('buildSpeedBuckets with limits configured', () => {expect(buckets.map((bucket) => [bucket.windowMs, bucket.refillPerWindow]),- ).toEqual([[60_000, 10]]);+ ).toEqual([+ [60_000, 10],+ [1000, 100],+ ]);});it('tells the platform default apart from a configured limit', () => {@@ -291,6 +296,7 @@ describe('buildSpeedBuckets with limits configured', () => {expect(buckets.map((bucket) => bucket.key)).toEqual(['{workspace-1}:speed:API:ALL:apiKey:-:60','{workspace-1}:speed:API:API_REQUEST:apiKey:-:60',+ '{workspace-1}:speed:API:API_REQUEST:apiKey:-:1',]);});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-stock-counters.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-stock-counters.util.spec.tsindex f88d8aff9f2..b1fe6eba1ae 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-stock-counters.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/build-stock-counters.util.spec.ts@@ -20,6 +20,7 @@ const buildLimit = (meter: 'bytes',limitValue: 500,burstValue: null,+ isInstanceOverride: false,...overrides,});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/does-usage-limit-row-suppress-default.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/does-usage-limit-row-suppress-default.util.spec.tsnew file mode 100644index 00000000000..a345e5e1472--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/does-usage-limit-row-suppress-default.util.spec.ts@@ -0,0 +1,108 @@+import { type StockLimitDefaultDefinition } from 'src/engine/core-modules/usage-limit/types/stock-limit-default-definition.type';+import {+ buildUsageLimitScope,+ type UsageLimitScope,+} from 'src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util';+import { doesUsageLimitRowSuppressDefault } from 'src/engine/core-modules/usage-limit/utils/does-usage-limit-row-suppress-default.util';+import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';+import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';++const buildDefault = (+ overrides: Partial<StockLimitDefaultDefinition> = {},+): StockLimitDefaultDefinition => ({+ resourceType: UsageResourceType.STORAGE,+ operationType: UsageOperationType.STORAGE_FILE,+ limitKind: 'stock',+ spenderType: 'workspace',+ spenderId: '',+ meter: 'bytes',+ periodUnit: 'lifetime',+ periodCount: 1,+ limitValueConfigVariable: 'WORKSPACE_STORAGE_LIMIT_BYTES',+ isOverridable: true,+ ...overrides,+});++const buildScope = (+ overrides: Partial<UsageLimitScope> = {},+): UsageLimitScope =>+ buildUsageLimitScope({+ resourceType: UsageResourceType.STORAGE,+ operationType: UsageOperationType.STORAGE_FILE,+ spenderType: 'workspace',+ spenderId: '',+ limitKind: 'stock',+ periodCount: 1,+ periodUnit: 'lifetime',+ meter: 'bytes',+ ...overrides,+ });++describe('doesUsageLimitRowSuppressDefault', () => {+ it('suppresses the default a workspace-wide row stands in for', () => {+ expect(+ doesUsageLimitRowSuppressDefault({+ scope: buildScope(),+ usageLimitDefault: buildDefault(),+ }),+ ).toBe(true);+ });++ it('never suppresses a default that is not overridable', () => {+ expect(+ doesUsageLimitRowSuppressDefault({+ scope: buildScope(),+ usageLimitDefault: buildDefault({ isOverridable: false }),+ }),+ ).toBe(false);+ });++ it('never suppresses from a row scoped to one spender', () => {+ expect(+ doesUsageLimitRowSuppressDefault({+ scope: buildScope({+ spenderId: 'ef0cfbbd-8b6e-4f9d-9a7c-1a2b3c4d5e6f',+ }),+ usageLimitDefault: buildDefault(),+ }),+ ).toBe(false);+ });++ it.each([+ ['meter', { meter: 'quantity' } as Partial<UsageLimitScope>],+ [+ 'spender type',+ { spenderType: 'application' } as Partial<UsageLimitScope>,+ ],+ [+ 'resource type',+ { resourceType: UsageResourceType.RECORD } as Partial<UsageLimitScope>,+ ],+ ['limit kind', { limitKind: 'quota' } as Partial<UsageLimitScope>],+ ])('does not suppress across a different %s', (_label, overrides) => {+ expect(+ doesUsageLimitRowSuppressDefault({+ scope: buildScope(overrides),+ usageLimitDefault: buildDefault(),+ }),+ ).toBe(false);+ });++ it('does not suppress from an ALL row, which the kind rules keep out of speed and stock', () => {+ expect(+ doesUsageLimitRowSuppressDefault({+ scope: buildScope({ operationType: UsageOperationType.ALL }),+ usageLimitDefault: buildDefault(),+ }),+ ).toBe(false);+ });++ it('ignores the period, which no builder matches on', () => {+ expect(+ doesUsageLimitRowSuppressDefault({+ scope: buildScope({ periodCount: 60, periodUnit: 'second' }),+ usageLimitDefault: buildDefault(),+ }),+ ).toBe(true);+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/find-enforceable-limits.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/find-enforceable-limits.util.spec.tsindex 867a0d64c27..d49c684d54f 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/find-enforceable-limits.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/find-enforceable-limits.util.spec.ts@@ -4,7 +4,11 @@ import { findEnforceableLimits } from 'src/engine/core-modules/usage-limit/utilsimport { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';-const buildLimit = (spenderType: SpenderType, id: string): FlatUsageLimit => ({+const buildLimit = (+ spenderType: SpenderType,+ id: string,+ isInstanceOverride = false,+): FlatUsageLimit => ({id,resourceType: UsageResourceType.API,operationType: UsageOperationType.API_REQUEST,@@ -16,6 +20,7 @@ const buildLimit = (spenderType: SpenderType, id: string): FlatUsageLimit => ({meter: 'quantity',limitValue: 100,burstValue: null,+ isInstanceOverride,});describe('findEnforceableLimits', () => {@@ -40,4 +45,15 @@ describe('findEnforceableLimits', () => {}),).toEqual([workspaceLimit]);});++ it('keeps an operator override on an unentitled workspace, since the plan sells what a tenant may cap, not what the instance may', () => {+ const operatorApiKeyLimit = buildLimit('apiKey', 'operator-ak', true);++ expect(+ findEnforceableLimits({+ limits: [userWorkspaceLimit, apiKeyLimit, operatorApiKeyLimit],+ isIntraWorkspaceLimitEntitled: false,+ }),+ ).toEqual([operatorApiKeyLimit]);+ });});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/find-limits-for-spender.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/find-limits-for-spender.util.spec.tsindex a3550b71a52..ecb2f720cbd 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/find-limits-for-spender.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/find-limits-for-spender.util.spec.ts@@ -15,6 +15,7 @@ const buildLimit = (overrides: Partial<FlatUsageLimit>): FlatUsageLimit => ({meter: 'creditsUsedMicro',limitValue: 100,burstValue: null,+ isInstanceOverride: false,...overrides,});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/find-suppressed-usage-limit-defaults.util.spec.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/find-suppressed-usage-limit-defaults.util.spec.tsnew file mode 100644index 00000000000..38c12efe8af--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/__tests__/find-suppressed-usage-limit-defaults.util.spec.ts@@ -0,0 +1,135 @@+import { findUsageLimitDefaults } from 'src/engine/core-modules/usage-limit/utils/find-usage-limit-defaults.util';+import {+ buildUsageLimitScope,+ type UsageLimitScope,+} from 'src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util';+import { findSuppressedUsageLimitDefaults } from 'src/engine/core-modules/usage-limit/utils/find-suppressed-usage-limit-defaults.util';+import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';+import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';++const buildSpeedScope = (+ overrides: Partial<UsageLimitScope> = {},+): UsageLimitScope =>+ buildUsageLimitScope({+ resourceType: UsageResourceType.EMAIL,+ operationType: UsageOperationType.EMAIL_SEND,+ spenderType: 'workspace',+ spenderId: '',+ limitKind: 'speed',+ periodCount: 10,+ periodUnit: 'second',+ meter: 'quantity',+ ...overrides,+ });++const buildStockScope = (+ overrides: Partial<UsageLimitScope> = {},+): UsageLimitScope =>+ buildUsageLimitScope({+ resourceType: UsageResourceType.STORAGE,+ operationType: UsageOperationType.STORAGE_FILE,+ spenderType: 'workspace',+ spenderId: '',+ limitKind: 'stock',+ periodCount: 1,+ periodUnit: 'lifetime',+ meter: 'bytes',+ ...overrides,+ });++describe('findSuppressedUsageLimitDefaults', () => {+ it('returns only the overridable default when a resource declares one of each', () => {+ const suppressed = findSuppressedUsageLimitDefaults(buildSpeedScope());++ expect(suppressed).toHaveLength(1);+ expect(suppressed[0]).toMatchObject({+ isOverridable: true,+ counterScope: 'perWorkspace',+ limitValueConfigVariable: 'EMAIL_SEND_WORKSPACE_RATE_LIMITING_LIMIT',+ });+ });++ it('leaves the other operation of the same resource alone', () => {+ const suppressed = findSuppressedUsageLimitDefaults(+ buildSpeedScope({+ operationType: UsageOperationType.MESSAGE_CAMPAIGN_SEND,+ }),+ );++ expect(suppressed).toHaveLength(1);+ expect(suppressed[0].operationType).toBe(+ UsageOperationType.MESSAGE_CAMPAIGN_SEND,+ );+ });++ it('replaces the api key default whatever period the row names', () => {+ const suppressed = findSuppressedUsageLimitDefaults(+ buildSpeedScope({+ resourceType: UsageResourceType.API,+ operationType: UsageOperationType.API_REQUEST,+ spenderType: 'apiKey',+ periodCount: 1,+ }),+ );++ expect(suppressed.map((entry) => entry.limitValueConfigVariable)).toEqual([+ 'API_RATE_LIMITING_LONG_LIMIT',+ ]);+ });++ it('returns nothing where only a non-overridable default stands', () => {+ expect(+ findSuppressedUsageLimitDefaults(+ buildSpeedScope({+ resourceType: UsageResourceType.API,+ operationType: UsageOperationType.API_REQUEST,+ spenderType: 'application',+ }),+ ),+ ).toEqual([]);+ });++ it('returns nothing for a meter no default is declared on', () => {+ expect(+ findSuppressedUsageLimitDefaults(buildStockScope({ meter: 'quantity' })),+ ).toEqual([]);+ });++ it('returns nothing for a row scoped to one spender', () => {+ expect(+ findSuppressedUsageLimitDefaults(+ buildStockScope({ spenderId: 'ef0cfbbd-8b6e-4f9d-9a7c-1a2b3c4d5e6f' }),+ ),+ ).toEqual([]);+ });++ it('declares at most one overridable default per suppressible scope', () => {+ const suppressionKeysWithTwoDefaults = Object.values(UsageResourceType)+ .flatMap((resourceType) => findUsageLimitDefaults({ resourceType }))+ .filter((usageLimitDefault) => usageLimitDefault.isOverridable)+ .map(+ (usageLimitDefault) =>+ `${usageLimitDefault.resourceType}:${usageLimitDefault.operationType}:${usageLimitDefault.spenderType}:${usageLimitDefault.limitKind}:${usageLimitDefault.meter}`,+ )+ .filter(+ (suppressionKey, _index, suppressionKeys) =>+ suppressionKeys.filter((key) => key === suppressionKey).length > 1,+ );++ expect(suppressionKeysWithTwoDefaults).toEqual([]);+ });++ it('returns nothing for a resource that declares no default', () => {+ expect(+ findSuppressedUsageLimitDefaults(+ buildStockScope({+ resourceType: UsageResourceType.AI,+ operationType: UsageOperationType.AI_CHAT_TOKEN,+ limitKind: 'quota',+ periodUnit: 'month',+ meter: 'creditsUsedMicro',+ }),+ ),+ ).toEqual([]);+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/assert-usage-limit-default-override-is-allowed.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/assert-usage-limit-default-override-is-allowed.util.tsnew file mode 100644index 00000000000..78d3bbfc238--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/assert-usage-limit-default-override-is-allowed.util.ts@@ -0,0 +1,29 @@+import { isNonEmptyArray } from 'twenty-shared/utils';++import {+ UsageLimitException,+ UsageLimitExceptionCode,+} from 'src/engine/core-modules/usage-limit/exceptions/usage-limit.exception';+import { type UsageLimitScope } from 'src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util';+import { findSuppressedUsageLimitDefaults } from 'src/engine/core-modules/usage-limit/utils/find-suppressed-usage-limit-defaults.util';++export const assertUsageLimitDefaultOverrideIsAllowed = ({+ scope,+ isOperator,+}: {+ scope: UsageLimitScope;+ isOperator: boolean;+}): void => {+ if (isOperator) {+ return;+ }++ if (!isNonEmptyArray(findSuppressedUsageLimitDefaults(scope))) {+ return;+ }++ throw new UsageLimitException(+ `The ${scope.resourceType} ${scope.limitKind} default is set for this instance and only an operator can replace it`,+ UsageLimitExceptionCode.LIMIT_FORBIDDEN,+ );+};diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/assert-usage-limit-instance-override-is-allowed.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/assert-usage-limit-instance-override-is-allowed.util.tsnew file mode 100644index 00000000000..fc91a344488--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/assert-usage-limit-instance-override-is-allowed.util.ts@@ -0,0 +1,22 @@+import {+ UsageLimitException,+ UsageLimitExceptionCode,+} from 'src/engine/core-modules/usage-limit/exceptions/usage-limit.exception';+import { type UsageLimitEntity } from 'src/engine/core-modules/usage-limit/usage-limit.entity';++export const assertUsageLimitInstanceOverrideIsAllowed = ({+ usageLimit,+ isOperator,+}: {+ usageLimit: Pick<UsageLimitEntity, 'isInstanceOverride'>;+ isOperator: boolean;+}): void => {+ if (isOperator || !usageLimit.isInstanceOverride) {+ return;+ }++ throw new UsageLimitException(+ 'This limit was set by an operator and only an operator can change it',+ UsageLimitExceptionCode.LIMIT_FORBIDDEN,+ );+};diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-usage-limit-default-scopes.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-usage-limit-default-scopes.util.tsnew file mode 100644index 00000000000..3e5e38890ae--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-usage-limit-default-scopes.util.ts@@ -0,0 +1,41 @@+import { type NumericConfigVariableKey } from 'src/engine/core-modules/twenty-config/types/numeric-config-variable-key.type';+import { type UsageLimitDefaultDefinition } from 'src/engine/core-modules/usage-limit/types/usage-limit-default-definition.type';+import { type UsageLimitScope } from 'src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util';+import { findUsageLimitDefaults } from 'src/engine/core-modules/usage-limit/utils/find-usage-limit-defaults.util';+import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';++export type UsageLimitDefaultScope = UsageLimitScope & {+ isOverridable: boolean;+ limitValue: number;+};++const buildPeriodCount = ({+ usageLimitDefault,+ getConfigValue,+}: {+ usageLimitDefault: UsageLimitDefaultDefinition;+ getConfigValue: (key: NumericConfigVariableKey) => number;+}): number =>+ usageLimitDefault.limitKind === 'speed'+ ? Math.ceil(getConfigValue(usageLimitDefault.windowMsConfigVariable) / 1000)+ : usageLimitDefault.periodCount;++export const buildUsageLimitDefaultScopes = ({+ getConfigValue,+}: {+ getConfigValue: (key: NumericConfigVariableKey) => number;+}): UsageLimitDefaultScope[] =>+ Object.values(UsageResourceType).flatMap((resourceType) =>+ findUsageLimitDefaults({ resourceType }).map((usageLimitDefault) => ({+ resourceType: usageLimitDefault.resourceType,+ operationType: usageLimitDefault.operationType,+ spenderType: usageLimitDefault.spenderType,+ spenderId: usageLimitDefault.spenderId,+ limitKind: usageLimitDefault.limitKind,+ meter: usageLimitDefault.meter,+ periodUnit: usageLimitDefault.periodUnit,+ periodCount: buildPeriodCount({ usageLimitDefault, getConfigValue }),+ limitValue: getConfigValue(usageLimitDefault.limitValueConfigVariable),+ isOverridable: usageLimitDefault.isOverridable,+ })),+ );diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util.tsindex 6640684551f..cc9a279af3e 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util.ts@@ -1,7 +1,6 @@-import { type CreateUsageLimitInput } from 'src/engine/core-modules/usage-limit/dtos/create-usage-limit.input';import { type UsageLimitEntity } from 'src/engine/core-modules/usage-limit/usage-limit.entity';-type UsageLimitScope = Pick<+export type UsageLimitScope = Pick<UsageLimitEntity,| 'resourceType'| 'operationType'@@ -13,15 +12,19 @@ type UsageLimitScope = Pick<| 'meter'>;+type UsageLimitScopeSource = Omit<UsageLimitScope, 'spenderId'> & {+ spenderId?: string | null;+};+export const buildUsageLimitScope = (- input: CreateUsageLimitInput,+ source: UsageLimitScopeSource,): UsageLimitScope => ({- resourceType: input.resourceType,- operationType: input.operationType,- spenderType: input.spenderType,- spenderId: input.spenderId ?? '',- limitKind: input.limitKind,- periodCount: input.periodCount,- periodUnit: input.periodUnit,- meter: input.meter,+ resourceType: source.resourceType,+ operationType: source.operationType,+ spenderType: source.spenderType,+ spenderId: source.spenderId ?? '',+ limitKind: source.limitKind,+ periodCount: source.periodCount,+ periodUnit: source.periodUnit,+ meter: source.meter,});diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/does-usage-limit-row-suppress-default.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/does-usage-limit-row-suppress-default.util.tsnew file mode 100644index 00000000000..105c9d1f693--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/does-usage-limit-row-suppress-default.util.ts@@ -0,0 +1,18 @@+import { type UsageLimitScope } from 'src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util';++type SuppressibleScope = Omit<UsageLimitScope, 'periodCount' | 'periodUnit'>;++export const doesUsageLimitRowSuppressDefault = ({+ scope,+ usageLimitDefault,+}: {+ scope: UsageLimitScope;+ usageLimitDefault: SuppressibleScope & { isOverridable: boolean };+}): boolean =>+ usageLimitDefault.isOverridable &&+ scope.resourceType === usageLimitDefault.resourceType &&+ scope.operationType === usageLimitDefault.operationType &&+ scope.spenderType === usageLimitDefault.spenderType &&+ scope.spenderId === usageLimitDefault.spenderId &&+ scope.limitKind === usageLimitDefault.limitKind &&+ scope.meter === usageLimitDefault.meter;diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/find-enforceable-limits.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/find-enforceable-limits.util.tsindex eaa3c2a9ded..6c321442a8c 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/find-enforceable-limits.util.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/find-enforceable-limits.util.ts@@ -10,4 +10,8 @@ export const findEnforceableLimits = <TLimit extends FlatUsageLimit>({}): TLimit[] =>isIntraWorkspaceLimitEntitled? limits- : limits.filter((limit) => !isIntraWorkspaceScoped(limit.spenderType));+ : limits.filter(+ (limit) =>+ !isIntraWorkspaceScoped(limit.spenderType) ||+ limit.isInstanceOverride,+ );diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/find-suppressed-usage-limit-defaults.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/find-suppressed-usage-limit-defaults.util.tsnew file mode 100644index 00000000000..dd44091f004--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/find-suppressed-usage-limit-defaults.util.ts@@ -0,0 +1,12 @@+import { type UsageLimitDefaultDefinition } from 'src/engine/core-modules/usage-limit/types/usage-limit-default-definition.type';+import { type UsageLimitScope } from 'src/engine/core-modules/usage-limit/utils/build-usage-limit-scope.util';+import { doesUsageLimitRowSuppressDefault } from 'src/engine/core-modules/usage-limit/utils/does-usage-limit-row-suppress-default.util';+import { findUsageLimitDefaults } from 'src/engine/core-modules/usage-limit/utils/find-usage-limit-defaults.util';++export const findSuppressedUsageLimitDefaults = (+ scope: UsageLimitScope,+): UsageLimitDefaultDefinition[] =>+ findUsageLimitDefaults({ resourceType: scope.resourceType }).filter(+ (usageLimitDefault) =>+ doesUsageLimitRowSuppressDefault({ scope, usageLimitDefault }),+ );diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/find-usage-limit-defaults.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/find-usage-limit-defaults.util.tsnew file mode 100644index 00000000000..68ae9bf8d7e--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/find-usage-limit-defaults.util.ts@@ -0,0 +1,15 @@+import { USAGE_LIMIT_DEFINITIONS } from 'src/engine/core-modules/usage-limit/constants/usage-limit-definitions.constant';+import { type UsageLimitDefaultDefinition } from 'src/engine/core-modules/usage-limit/types/usage-limit-default-definition.type';+import { type UsageLimitDefinitions } from 'src/engine/core-modules/usage-limit/types/usage-limit-definition.type';+import { type UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';++export const findUsageLimitDefaults = ({+ resourceType,+}: {+ resourceType: UsageResourceType;+}): UsageLimitDefaultDefinition[] => {+ const { speed, stock }: UsageLimitDefinitions =+ USAGE_LIMIT_DEFINITIONS[resourceType];++ return [...(speed?.defaults ?? []), ...(stock?.defaults ?? [])];+};diff --git a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/from-usage-limit-entity-to-flat.util.ts b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/from-usage-limit-entity-to-flat.util.tsindex 39753b589b6..e7b78b813c1 100644--- a/packages/twenty-server/src/engine/core-modules/usage-limit/utils/from-usage-limit-entity-to-flat.util.ts+++ b/packages/twenty-server/src/engine/core-modules/usage-limit/utils/from-usage-limit-entity-to-flat.util.ts@@ -15,4 +15,5 @@ export const fromUsageLimitEntityToFlat = (meter: usageLimit.meter,limitValue: usageLimit.limitValue,burstValue: usageLimit.burstValue,+ isInstanceOverride: usageLimit.isInstanceOverride,});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/find-ai-chat-credit-limits.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/find-ai-chat-credit-limits.util.spec.tsindex 482a8874adf..9631c8f8c6f 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/find-ai-chat-credit-limits.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/find-ai-chat-credit-limits.util.spec.ts@@ -18,6 +18,7 @@ const buildLimit = (meter: 'creditsUsedMicro',limitValue: 1000,burstValue: null,+ isInstanceOverride: false,...overrides,});diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/select-ai-chat-usage.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/select-ai-chat-usage.util.spec.tsindex 748ea07f480..198752cf934 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/select-ai-chat-usage.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/__tests__/select-ai-chat-usage.util.spec.ts@@ -21,6 +21,7 @@ const buildLimit = (meter: 'creditsUsedMicro',limitValue: 1000,burstValue: null,+ isInstanceOverride: false,...overrides,});diff --git a/packages/twenty-server/test/integration/graphql/suites/admin-panel/workspace-usage-limits.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/admin-panel/workspace-usage-limits.integration-spec.tsnew file mode 100644index 00000000000..1fd6f20e66f--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/admin-panel/workspace-usage-limits.integration-spec.ts@@ -0,0 +1,259 @@+import { makeAdminPanelAPIRequestWithGuestRole } from 'test/integration/graphql/suites/admin-panel/utils/make-admin-panel-api-request-with-guest-role.util';+import { makeAdminPanelAPIRequest } from 'test/integration/twenty-config/utils/make-admin-panel-api-request.util';+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';+import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';+import { jestExpectToBeDefined } from 'test/utils/jest-expect-to-be-defined.util.test';++import { gql } from 'graphql-tag';+import { type Repository } from 'typeorm';++import { type CoreEntityCacheService } from 'src/engine/core-entity-cache/services/core-entity-cache.service';+import { UsageLimitEntity } from 'src/engine/core-modules/usage-limit/usage-limit.entity';+import { UserEntity } from 'src/engine/core-modules/user/user.entity';+import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';+import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';+import { USER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-users.util';++const WORKSPACE_USAGE_LIMITS = gql`+ query WorkspaceUsageLimits($workspaceId: UUID!) {+ workspaceUsageLimits(workspaceId: $workspaceId) {+ defaults {+ resourceType+ operationType+ spenderType+ limitKind+ meter+ limitValue+ isOverridable+ overriddenByUsageLimitId+ }+ limits {+ id+ limitValue+ }+ }+ }+`;++const CREATE_WORKSPACE_USAGE_LIMIT = gql`+ mutation CreateWorkspaceUsageLimit(+ $workspaceId: UUID!+ $payload: CreateUsageLimitInput!+ ) {+ createWorkspaceUsageLimit(workspaceId: $workspaceId, payload: $payload) {+ id+ limitValue+ }+ }+`;++const UPDATE_WORKSPACE_USAGE_LIMIT = gql`+ mutation UpdateWorkspaceUsageLimit(+ $workspaceId: UUID!+ $payload: UpdateUsageLimitInput!+ ) {+ updateWorkspaceUsageLimit(workspaceId: $workspaceId, payload: $payload) {+ id+ }+ }+`;++const DELETE_WORKSPACE_USAGE_LIMIT = gql`+ mutation DeleteWorkspaceUsageLimit(+ $workspaceId: UUID!+ $usageLimitId: UUID!+ ) {+ deleteWorkspaceUsageLimit(+ workspaceId: $workspaceId+ usageLimitId: $usageLimitId+ )+ }+`;++const STORAGE_STOCK_PAYLOAD = {+ resourceType: UsageResourceType.STORAGE,+ operationType: UsageOperationType.STORAGE_FILE,+ spenderType: 'workspace',+ spenderId: null,+ limitKind: 'stock',+ periodCount: 1,+ periodUnit: 'lifetime',+ meter: 'bytes',+ limitValue: 5_000_000,+ burstValue: null,+};++describe('Workspace usage limits from the admin panel', () => {+ let usageLimitRepository: Repository<UsageLimitEntity>;++ const findWorkspaceUsageLimits = async () => {+ const response = await makeAdminPanelAPIRequest({+ query: WORKSPACE_USAGE_LIMITS,+ variables: { workspaceId: SEED_APPLE_WORKSPACE_ID },+ });++ return response.body.data?.workspaceUsageLimits;+ };++ beforeAll(() => {+ usageLimitRepository =+ getCoreRepository<UsageLimitEntity>(UsageLimitEntity);+ });++ afterEach(async () => {+ await usageLimitRepository.delete({ workspaceId: SEED_APPLE_WORKSPACE_ID });+ });++ it('lists the instance defaults that apply to the workspace', async () => {+ const workspaceUsageLimits = await findWorkspaceUsageLimits();++ jestExpectToBeDefined(workspaceUsageLimits);++ expect(workspaceUsageLimits.defaults).toContainEqual(+ expect.objectContaining({+ resourceType: UsageResourceType.STORAGE,+ limitKind: 'stock',+ meter: 'bytes',+ isOverridable: true,+ overriddenByUsageLimitId: null,+ }),+ );+ expect(workspaceUsageLimits.limits).toEqual([]);+ });++ it('lets an operator replace a default the workspace cannot touch', async () => {+ const response = await makeAdminPanelAPIRequest({+ query: CREATE_WORKSPACE_USAGE_LIMIT,+ variables: {+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ payload: STORAGE_STOCK_PAYLOAD,+ },+ });++ const usageLimitId = response.body.data?.createWorkspaceUsageLimit?.id;++ jestExpectToBeDefined(usageLimitId);++ expect(+ (await usageLimitRepository.findOneByOrFail({ id: usageLimitId }))+ .isInstanceOverride,+ ).toBe(true);++ const workspaceUsageLimits = await findWorkspaceUsageLimits();++ expect(workspaceUsageLimits.limits).toHaveLength(1);+ expect(+ workspaceUsageLimits.defaults.find(+ (usageLimitDefault: {+ resourceType: UsageResourceType;+ operationType: UsageOperationType;+ spenderType: string;+ meter: string;+ }) =>+ usageLimitDefault.resourceType === UsageResourceType.STORAGE &&+ usageLimitDefault.operationType === UsageOperationType.STORAGE_FILE &&+ usageLimitDefault.spenderType === 'workspace' &&+ usageLimitDefault.meter === 'bytes',+ ),+ ).toEqual(+ expect.objectContaining({ overriddenByUsageLimitId: usageLimitId }),+ );+ });++ it('lets an operator remove the override it created', async () => {+ const createResponse = await makeAdminPanelAPIRequest({+ query: CREATE_WORKSPACE_USAGE_LIMIT,+ variables: {+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ payload: STORAGE_STOCK_PAYLOAD,+ },+ });++ const usageLimitId =+ createResponse.body.data?.createWorkspaceUsageLimit?.id;++ jestExpectToBeDefined(usageLimitId);++ const deleteResponse = await makeAdminPanelAPIRequest({+ query: DELETE_WORKSPACE_USAGE_LIMIT,+ variables: { workspaceId: SEED_APPLE_WORKSPACE_ID, usageLimitId },+ });++ expect(deleteResponse.body.data?.deleteWorkspaceUsageLimit).toBe(true);+ expect(+ await usageLimitRepository.countBy({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ }),+ ).toBe(0);+ });++ describe('a workspace admin who is not an operator', () => {+ const setJaneIsOperator = async (canAccessFullAdminPanel: boolean) => {+ await getCoreRepository<UserEntity>(UserEntity).update(+ { id: USER_DATA_SEED_IDS.JANE },+ { canAccessFullAdminPanel },+ );+ await getAppProviderByClassName<CoreEntityCacheService>(+ 'CoreEntityCacheService',+ ).invalidate('user', USER_DATA_SEED_IDS.JANE);+ };++ beforeEach(() => setJaneIsOperator(false));+ afterEach(() => setJaneIsOperator(true));++ it.each([+ [+ 'the query',+ WORKSPACE_USAGE_LIMITS,+ { workspaceId: SEED_APPLE_WORKSPACE_ID },+ ],+ [+ 'create',+ CREATE_WORKSPACE_USAGE_LIMIT,+ {+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ payload: STORAGE_STOCK_PAYLOAD,+ },+ ],+ [+ 'update',+ UPDATE_WORKSPACE_USAGE_LIMIT,+ {+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ payload: {+ id: '3a2f1e5c-6b7d-4e8f-9a0b-1c2d3e4f5a6b',+ payload: STORAGE_STOCK_PAYLOAD,+ },+ },+ ],+ [+ 'delete',+ DELETE_WORKSPACE_USAGE_LIMIT,+ {+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ usageLimitId: '3a2f1e5c-6b7d-4e8f-9a0b-1c2d3e4f5a6b',+ },+ ],+ ])('is refused on %s', async (_label, query, variables) => {+ const response = await makeAdminPanelAPIRequest({ query, variables });++ expect(response.body.errors).toBeDefined();+ expect(+ await usageLimitRepository.countBy({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ }),+ ).toBe(0);+ });+ });++ it('refuses a user without the security permission', async () => {+ const response = await makeAdminPanelAPIRequestWithGuestRole({+ query: WORKSPACE_USAGE_LIMITS,+ variables: { workspaceId: SEED_APPLE_WORKSPACE_ID },+ });++ expect(response.body.errors).toBeDefined();+ expect(response.body.data?.workspaceUsageLimits).toBeFalsy();+ });+});diff --git a/packages/twenty-server/test/integration/usage-limit/usage-limit-mutations.integration-spec.ts b/packages/twenty-server/test/integration/usage-limit/usage-limit-mutations.integration-spec.tsindex 832b6a07844..38098f42d5d 100644--- a/packages/twenty-server/test/integration/usage-limit/usage-limit-mutations.integration-spec.ts+++ b/packages/twenty-server/test/integration/usage-limit/usage-limit-mutations.integration-spec.ts@@ -6,6 +6,7 @@ import { gql } from 'graphql-tag';import { createClient } from 'redis';import { type Repository } from 'typeorm';+import { type CreateUsageLimitInput } from 'src/engine/core-modules/usage-limit/dtos/create-usage-limit.input';import { UsageLimitEntity } from 'src/engine/core-modules/usage-limit/usage-limit.entity';import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';import { UsageResourceType } from 'src/engine/core-modules/usage/enums/usage-resource-type.enum';@@ -49,8 +50,8 @@ const USAGE_QUOTAS_WITH_CONSUMPTION = gql``;const buildPayload = (- overrides: Record<string, unknown> = {},-): Record<string, unknown> => ({+ overrides: Partial<CreateUsageLimitInput> = {},+): CreateUsageLimitInput => ({resourceType: UsageResourceType.AI,operationType: UsageOperationType.AI_CHAT_TOKEN,spenderType: 'workspace',@@ -68,7 +69,9 @@ describe('Usage limit mutations', () => {let usageLimitRepository: Repository<UsageLimitEntity>;let redis: Awaited<ReturnType<typeof createClient>>;- const createUsageLimitRequest = (overrides: Record<string, unknown> = {}) =>+ const createUsageLimitRequest = (+ overrides: Partial<CreateUsageLimitInput> = {},+ ) =>makeMetadataAPIRequest({query: CREATE_USAGE_LIMIT,variables: { input: buildPayload(overrides) },@@ -76,7 +79,7 @@ describe('Usage limit mutations', () => {const updateUsageLimit = (id: string,- overrides: Record<string, unknown> = {},+ overrides: Partial<CreateUsageLimitInput> = {},) =>makeMetadataAPIRequest({query: UPDATE_USAGE_LIMIT,@@ -91,7 +94,9 @@ describe('Usage limit mutations', () => {return response.body.data?.usageQuotasWithConsumption ?? [];};- const createUsageLimit = async (overrides: Record<string, unknown> = {}) => {+ const createUsageLimit = async (+ overrides: Partial<CreateUsageLimitInput> = {},+ ) => {const response = await createUsageLimitRequest(overrides);const usageLimitId = response.body.data?.createUsageLimit?.id;@@ -242,4 +247,170 @@ describe('Usage limit mutations', () => {expect(response.body.data?.deleteUsageLimit).toBe(false);});});++ describe('rows an operator set', () => {+ const OPERATOR_ROW_MESSAGE = 'only an operator can change it';++ const seedOperatorRow = async () => {+ await usageLimitRepository.insert({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ ...buildPayload({+ resourceType: UsageResourceType.STORAGE,+ operationType: UsageOperationType.STORAGE_FILE,+ spenderType: 'workspace',+ limitKind: 'stock',+ periodCount: 1,+ periodUnit: 'lifetime',+ meter: 'quantity',+ limitValue: 5_000,+ }),+ spenderId: '',+ burstValue: null,+ isInstanceOverride: true,+ });++ const usageLimit = await usageLimitRepository.findOneByOrFail({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ meter: 'quantity',+ });++ return usageLimit;+ };++ it('refuses a workspace update of one', async () => {+ const usageLimit = await seedOperatorRow();++ const response = await updateUsageLimit(usageLimit.id, {+ resourceType: UsageResourceType.STORAGE,+ operationType: UsageOperationType.STORAGE_FILE,+ spenderType: 'workspace',+ limitKind: 'stock',+ periodCount: 1,+ periodUnit: 'lifetime',+ meter: 'quantity',+ limitValue: 9_000_000,+ });++ expect(response.body.errors?.[0]?.message).toEqual(+ expect.stringContaining(OPERATOR_ROW_MESSAGE),+ );+ expect(+ (await usageLimitRepository.findOneByOrFail({ id: usageLimit.id }))+ .limitValue,+ ).toBe(5_000);+ });++ it('refuses a workspace delete of one', async () => {+ const usageLimit = await seedOperatorRow();++ const response = await makeMetadataAPIRequest({+ query: DELETE_USAGE_LIMIT,+ variables: { usageLimitId: usageLimit.id },+ });++ expect(response.body.errors?.[0]?.message).toEqual(+ expect.stringContaining(OPERATOR_ROW_MESSAGE),+ );+ expect(await usageLimitRepository.countBy({ id: usageLimit.id })).toBe(1);+ });+ });++ describe('instance defaults', () => {+ const OPERATOR_ONLY_MESSAGE = 'only an operator can replace it';++ const storageStockPayload = (+ overrides: Partial<CreateUsageLimitInput> = {},+ ) =>+ buildPayload({+ resourceType: UsageResourceType.STORAGE,+ operationType: UsageOperationType.STORAGE_FILE,+ spenderType: 'workspace',+ spenderId: null,+ limitKind: 'stock',+ periodCount: 1,+ periodUnit: 'lifetime',+ meter: 'bytes',+ limitValue: 1_000_000,+ ...overrides,+ });++ const seedOperatorOverride = async () => {+ await usageLimitRepository.insert({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ ...storageStockPayload(),+ spenderId: '',+ burstValue: null,+ });++ const usageLimit = await usageLimitRepository.findOneBy({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ resourceType: UsageResourceType.STORAGE,+ });++ jestExpectToBeDefined(usageLimit);++ return usageLimit;+ };++ it('refuses a workspace write that would replace a default', async () => {+ const response = await makeMetadataAPIRequest({+ query: CREATE_USAGE_LIMIT,+ variables: { input: storageStockPayload() },+ });++ expect(response.body.errors?.[0]?.message).toEqual(+ expect.stringContaining(OPERATOR_ONLY_MESSAGE),+ );+ expect(+ await usageLimitRepository.countBy({+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ }),+ ).toBe(0);+ });++ it('allows a workspace write on a meter no default covers', async () => {+ const response = await makeMetadataAPIRequest({+ query: CREATE_USAGE_LIMIT,+ variables: { input: storageStockPayload({ meter: 'quantity' }) },+ });++ expect(response.body.errors).toBeUndefined();+ });++ it('refuses moving an operator override off the default it replaces', async () => {+ const usageLimit = await seedOperatorOverride();++ const response = await makeMetadataAPIRequest({+ query: UPDATE_USAGE_LIMIT,+ variables: {+ input: {+ id: usageLimit.id,+ payload: storageStockPayload({ meter: 'quantity' }),+ },+ },+ });++ expect(response.body.errors?.[0]?.message).toEqual(+ expect.stringContaining(OPERATOR_ONLY_MESSAGE),+ );+ expect(+ (await usageLimitRepository.findOneByOrFail({ id: usageLimit.id }))+ .meter,+ ).toBe('bytes');+ });++ it('refuses deleting an operator override', async () => {+ const usageLimit = await seedOperatorOverride();++ const response = await makeMetadataAPIRequest({+ query: DELETE_USAGE_LIMIT,+ variables: { usageLimitId: usageLimit.id },+ });++ expect(response.body.errors?.[0]?.message).toEqual(+ expect.stringContaining(OPERATOR_ONLY_MESSAGE),+ );+ expect(await usageLimitRepository.countBy({ id: usageLimit.id })).toBe(1);+ });+ });});diff --git a/packages/twenty-shared/src/utils/__tests__/formatBytes.test.ts b/packages/twenty-shared/src/utils/__tests__/formatBytes.test.tsnew file mode 100644index 00000000000..33248a93de3--- /dev/null+++ b/packages/twenty-shared/src/utils/__tests__/formatBytes.test.ts@@ -0,0 +1,25 @@+import { formatBytes } from '../format/formatBytes';++describe('formatBytes', () => {+ it.each([+ [0, '0 B'],+ [1, '1 B'],+ [1023, '1023 B'],+ [1024, '1 KB'],+ [1536, '1.5 KB'],+ [1024 ** 2, '1 MB'],+ [1024 ** 3, '1 GB'],+ [107_374_182_400, '100 GB'],+ [1024 ** 4, '1 TB'],+ ])('formats %i as %s', (bytes, expected) => {+ expect(formatBytes(bytes)).toBe(expected);+ });++ it('stays on terabytes past the largest unit', () => {+ expect(formatBytes(1024 ** 5)).toBe('1024 TB');+ });++ it('keeps a negative size on bytes rather than producing NaN', () => {+ expect(formatBytes(-1)).toBe('-1 B');+ });+});diff --git a/packages/twenty-shared/src/utils/format/formatBytes.ts b/packages/twenty-shared/src/utils/format/formatBytes.tsnew file mode 100644index 00000000000..58c2d1d7964--- /dev/null+++ b/packages/twenty-shared/src/utils/format/formatBytes.ts@@ -0,0 +1,11 @@+const BYTE_UNITS = ['B', 'KB', 'MB', 'GB', 'TB'] as const;++export const formatBytes = (bytes: number): string => {+ const unitIndex = Math.min(+ BYTE_UNITS.length - 1,+ bytes > 0 ? Math.floor(Math.log(bytes) / Math.log(1024)) : 0,+ );+ const scaled = bytes / 1024 ** unitIndex;++ return `${Number(scaled.toFixed(unitIndex === 0 ? 0 : 1))} ${BYTE_UNITS[unitIndex]}`;+};diff --git a/packages/twenty-shared/src/utils/index.ts b/packages/twenty-shared/src/utils/index.tsindex 08465b601df..01d025858e0 100644--- a/packages/twenty-shared/src/utils/index.ts+++ b/packages/twenty-shared/src/utils/index.ts@@ -188,6 +188,7 @@ export {relationFilterValueSchemaObject,jsonRelationFilterValueSchema,} from './filter/utils/validation-schemas/jsonRelationFilterValueSchema';+export { formatBytes } from './format/formatBytes';export { formatToShortNumber } from './format/formatToShortNumber';export { fromArrayToUniqueKeyRecord } from './from-array-to-unique-key-record.util';export { fromArrayToValuesByKeyRecord } from './fromArrayToValuesByKeyRecord.util';