The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Remove IS_USAGE_ANALYTICS_ENABLED feature flag (#19566)
Félix Malfait65b2baca7ac1
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex d14922c0815..6a05e4f1690 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -1741,7 +1741,6 @@ enum FeatureFlagKey {IS_JUNCTION_RELATIONS_ENABLEDIS_DRAFT_EMAIL_ENABLEDIS_CONNECTED_ACCOUNT_MIGRATED- IS_USAGE_ANALYTICS_ENABLEDIS_RICH_TEXT_V1_MIGRATEDIS_RECORD_PAGE_LAYOUT_GLOBAL_EDITION_ENABLEDIS_RECORD_TABLE_WIDGET_ENABLEDdiff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 1d99496c36d..b99a7eb632b 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -1437,7 +1437,7 @@ export interface PublicFeatureFlag {__typename: 'PublicFeatureFlag'}-export type FeatureFlagKey = 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_AI_ENABLED' | 'IS_COMMAND_MENU_ITEM_ENABLED' | 'IS_MARKETPLACE_SETTING_TAB_VISIBLE' | 'IS_RECORD_PAGE_LAYOUT_EDITING_ENABLED' | 'IS_PUBLIC_DOMAIN_ENABLED' | 'IS_EMAILING_DOMAIN_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_DRAFT_EMAIL_ENABLED' | 'IS_CONNECTED_ACCOUNT_MIGRATED' | 'IS_USAGE_ANALYTICS_ENABLED' | 'IS_RICH_TEXT_V1_MIGRATED' | 'IS_RECORD_PAGE_LAYOUT_GLOBAL_EDITION_ENABLED' | 'IS_RECORD_TABLE_WIDGET_ENABLED' | 'IS_DATASOURCE_MIGRATED'+export type FeatureFlagKey = 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_AI_ENABLED' | 'IS_COMMAND_MENU_ITEM_ENABLED' | 'IS_MARKETPLACE_SETTING_TAB_VISIBLE' | 'IS_RECORD_PAGE_LAYOUT_EDITING_ENABLED' | 'IS_PUBLIC_DOMAIN_ENABLED' | 'IS_EMAILING_DOMAIN_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_DRAFT_EMAIL_ENABLED' | 'IS_CONNECTED_ACCOUNT_MIGRATED' | 'IS_RICH_TEXT_V1_MIGRATED' | 'IS_RECORD_PAGE_LAYOUT_GLOBAL_EDITION_ENABLED' | 'IS_RECORD_TABLE_WIDGET_ENABLED' | 'IS_DATASOURCE_MIGRATED'export interface ClientConfigMaintenanceMode {startAt: Scalars['DateTime']@@ -9321,7 +9321,6 @@ export const enumFeatureFlagKey = {IS_JUNCTION_RELATIONS_ENABLED: 'IS_JUNCTION_RELATIONS_ENABLED' as const,IS_DRAFT_EMAIL_ENABLED: 'IS_DRAFT_EMAIL_ENABLED' as const,IS_CONNECTED_ACCOUNT_MIGRATED: 'IS_CONNECTED_ACCOUNT_MIGRATED' as const,- IS_USAGE_ANALYTICS_ENABLED: 'IS_USAGE_ANALYTICS_ENABLED' as const,IS_RICH_TEXT_V1_MIGRATED: 'IS_RICH_TEXT_V1_MIGRATED' as const,IS_RECORD_PAGE_LAYOUT_GLOBAL_EDITION_ENABLED: 'IS_RECORD_PAGE_LAYOUT_GLOBAL_EDITION_ENABLED' as const,IS_RECORD_TABLE_WIDGET_ENABLED: 'IS_RECORD_TABLE_WIDGET_ENABLED' as const,diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 7bc85642e3f..705dbfb46bd 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -1767,8 +1767,7 @@ export enum FeatureFlagKey {IS_RECORD_PAGE_LAYOUT_GLOBAL_EDITION_ENABLED = 'IS_RECORD_PAGE_LAYOUT_GLOBAL_EDITION_ENABLED',IS_RECORD_TABLE_WIDGET_ENABLED = 'IS_RECORD_TABLE_WIDGET_ENABLED',IS_RICH_TEXT_V1_MIGRATED = 'IS_RICH_TEXT_V1_MIGRATED',- IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED',- IS_USAGE_ANALYTICS_ENABLED = 'IS_USAGE_ANALYTICS_ENABLED'+ IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED'}export type Field = {diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsxindex f13f24d4141..be5c5dec0d0 100644--- a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx+++ b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx@@ -6,10 +6,7 @@ import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoimport { SettingPublicDomain } from '@/settings/domains/components/SettingPublicDomain';import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';-import {- FeatureFlagKey,- PermissionFlagType,-} from '~/generated-metadata/graphql';+import { PermissionFlagType } from '~/generated-metadata/graphql';const SettingsGraphQLPlayground = lazy(() =>import(@@ -561,19 +558,11 @@ export const SettingsRoutes = ({ isAdminPageEnabled }: SettingsRoutesProps) => (element={<SettingsLogicFunctionDetail />}/><Route path={SettingsPath.Billing} element={<SettingsBilling />} />+ <Route path={SettingsPath.Usage} element={<SettingsUsage />} /><Route- element={- <SettingsProtectedRouteWrapper- requiredFeatureFlag={FeatureFlagKey.IS_USAGE_ANALYTICS_ENABLED}- />- }- >- <Route path={SettingsPath.Usage} element={<SettingsUsage />} />- <Route- path={SettingsPath.UsageUserDetail}- element={<SettingsUsageUserDetail />}- />- </Route>+ path={SettingsPath.UsageUserDetail}+ element={<SettingsUsageUserDetail />}+ /><Routepath={SettingsPath.Subdomain}element={<SettingsSubdomainPage />}diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsxindex bd34339ff5b..8631fed8135 100644--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx@@ -7,7 +7,6 @@ import { useBillingWording } from '@/settings/billing/hooks/useBillingWording';import { useCurrentBillingFlags } from '@/settings/billing/hooks/useCurrentBillingFlags';import { useCurrentMetered } from '@/settings/billing/hooks/useCurrentMetered';import { useGetWorkflowNodeExecutionUsage } from '@/settings/billing/hooks/useGetWorkflowNodeExecutionUsage';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';@@ -20,10 +19,7 @@ import { Button } from 'twenty-ui/input';import { Section } from 'twenty-ui/layout';import { UndecoratedLink } from 'twenty-ui/navigation';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';-import {- FeatureFlagKey,- SubscriptionStatus,-} from '~/generated-metadata/graphql';+import { SubscriptionStatus } from '~/generated-metadata/graphql';const StyledCreditUsageFooterActions = styled.div`margin-top: ${themeCssVariables.spacing[4]};@@ -44,10 +40,6 @@ export const SettingsBillingCreditsSection = ({const { getCurrentMeteredPricesByInterval } = useCurrentMetered();- const isUsageAnalyticsEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_USAGE_ANALYTICS_ENABLED,- );-const { getIntervalLabel } = useBillingWording();const isTrialing = subscriptionStatus === SubscriptionStatus.Trialing;@@ -143,17 +135,15 @@ export const SettingsBillingCreditsSection = ({)}</SubscriptionInfoContainer>- {isUsageAnalyticsEnabled && (- <StyledCreditUsageFooterActions>- <UndecoratedLink to={getSettingsPath(SettingsPath.Usage)}>- <Button- Icon={IconChartBar}- title={t`View usage`}- variant="secondary"- />- </UndecoratedLink>- </StyledCreditUsageFooterActions>- )}+ <StyledCreditUsageFooterActions>+ <UndecoratedLink to={getSettingsPath(SettingsPath.Usage)}>+ <Button+ Icon={IconChartBar}+ title={t`View usage`}+ variant="secondary"+ />+ </UndecoratedLink>+ </StyledCreditUsageFooterActions></Section><Section><MeteredPriceSelectordiff --git a/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx b/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsxindex 3056e9be15e..918c6eac742 100644--- a/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx+++ b/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx@@ -4,6 +4,8 @@ import { SubscriptionInfoContainer } from '@/settings/billing/components/Subscriimport { UsageBreakdownPieSection } from '@/settings/usage/components/UsageBreakdownPieSection';import { UsageByUserTableSection } from '@/settings/usage/components/UsageByUserTableSection';import { UsageDailyChartSection } from '@/settings/usage/components/UsageDailyChartSection';+import { UsageSectionSkeleton } from '@/settings/usage/components/UsageSectionSkeleton';+import { useUsageAnalyticsData } from '@/settings/usage/hooks/useUsageAnalyticsData';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { t } from '@lingui/core/macro';import { Link } from 'react-router-dom';@@ -17,6 +19,10 @@ import { SETTINGS_AI_TABS } from '~/pages/settings/ai/constants/SettingsAiTabs';export const SettingsUsageAnalyticsSection = () => {const isClickHouseConfigured = useAtomStateValue(isClickHouseConfiguredState);+ const { analytics, isInitialLoading } = useUsageAnalyticsData({+ skip: !isClickHouseConfigured,+ });+if (!isClickHouseConfigured) {return (<Section>@@ -34,6 +40,33 @@ export const SettingsUsageAnalyticsSection = () => {);}+ if (isInitialLoading) {+ return <UsageSectionSkeleton />;+ }++ const hasData =+ analytics &&+ (analytics.timeSeries.length > 0 ||+ analytics.usageByOperationType.length > 0 ||+ analytics.usageByUser.length > 0);++ if (!hasData) {+ return (+ <Section>+ <H2Title+ title={t`Usage Analytics`}+ description={t`Credit usage breakdown for your workspace.`}+ />+ <SubscriptionInfoContainer>+ <SettingsBillingLabelValueItem+ label={t`No usage data yet`}+ value={t`Usage analytics will appear here once you start using credits.`}+ />+ </SubscriptionInfoContainer>+ </Section>+ );+ }+return (<><UsageBreakdownPieSectiondiff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsxindex 2b094940225..09ab424afb6 100644--- a/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx@@ -11,8 +11,6 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { SettingsPath } from 'twenty-shared/types';import { getSettingsPath, isDefined } from 'twenty-shared/utils';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';-import { FeatureFlagKey } from '~/generated-metadata/graphql';import { t } from '@lingui/core/macro';import {IconChartBar,@@ -42,10 +40,6 @@ export const SettingsAI = () => {SETTINGS_AI_TABS.COMPONENT_INSTANCE_ID,);- const isUsageAnalyticsEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_USAGE_ANALYTICS_ENABLED,- );-const handleCreateTool = async () => {setIsCreatingTool(true);try {@@ -100,15 +94,11 @@ export const SettingsAI = () => {title: t`Tools`,Icon: IconTool,},- ...(isUsageAnalyticsEnabled- ? [- {- id: SETTINGS_AI_TABS.TABS_IDS.USAGE,- title: t`Usage`,- Icon: IconChartBar,- },- ]- : []),+ {+ id: SETTINGS_AI_TABS.TABS_IDS.USAGE,+ title: t`Usage`,+ Icon: IconChartBar,+ },{id: SETTINGS_AI_TABS.TABS_IDS.MORE,title: t`More`,diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAIUsageTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAIUsageTab.tsxindex 49256edb8c4..a345e5d8539 100644--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAIUsageTab.tsx+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAIUsageTab.tsx@@ -8,6 +8,8 @@ import { UsageBreakdownPieSection } from '@/settings/usage/components/UsageBreakimport { UsageByUserTableSection } from '@/settings/usage/components/UsageByUserTableSection';import { UsageDailyChartSection } from '@/settings/usage/components/UsageDailyChartSection';import { AI_OPERATION_TYPES } from '@/settings/usage/constants/AiOperationTypes';+import { useUsageAnalyticsData } from '@/settings/usage/hooks/useUsageAnalyticsData';+import { UsageSectionSkeleton } from '@/settings/usage/components/UsageSectionSkeleton';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { t } from '@lingui/core/macro';import { SettingsPath } from 'twenty-shared/types';@@ -25,6 +27,13 @@ export const SettingsAIUsageTab = () => {const hasEnterpriseAccess =isBillingEnabled || currentWorkspace?.hasValidEnterpriseKey === true;+ const shouldSkipQuery = !hasEnterpriseAccess || !isClickHouseConfigured;++ const { analytics, isInitialLoading } = useUsageAnalyticsData({+ operationTypes: AI_OPERATION_TYPES,+ skip: shouldSkipQuery,+ });+if (!hasEnterpriseAccess) {return (<Section>@@ -64,6 +73,34 @@ export const SettingsAIUsageTab = () => {);}+ if (isInitialLoading) {+ return <UsageSectionSkeleton />;+ }++ const hasData =+ analytics &&+ (analytics.timeSeries.length > 0 ||+ analytics.usageByOperationType.length > 0 ||+ analytics.usageByModel.length > 0 ||+ analytics.usageByUser.length > 0);++ if (!hasData) {+ return (+ <Section>+ <H2Title+ title={t`AI Usage`}+ description={t`Track AI consumption across your workspace.`}+ />+ <SubscriptionInfoContainer>+ <SettingsBillingLabelValueItem+ label={t`No usage data yet`}+ value={t`AI usage analytics will appear here once you start using AI features.`}+ />+ </SubscriptionInfoContainer>+ </Section>+ );+ }+return (<><UsageDailyChartSectiondiff --git a/packages/twenty-server/src/engine/core-modules/usage/usage.resolver.ts b/packages/twenty-server/src/engine/core-modules/usage/usage.resolver.tsindex c794bbf904f..a2eed0184bb 100644--- a/packages/twenty-server/src/engine/core-modules/usage/usage.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/usage/usage.resolver.ts@@ -5,7 +5,6 @@ import { Args, Query } from '@nestjs/graphql';import { InjectRepository } from '@nestjs/typeorm';import { PermissionFlagType } from 'twenty-shared/constants';-import { FeatureFlagKey } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { In, type Repository } from 'typeorm';@@ -23,10 +22,6 @@ import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspacimport { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';-import {- FeatureFlagGuard,- RequireFeatureFlag,-} from 'src/engine/guards/feature-flag.guard';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';@MetadataResolver()@@ -43,10 +38,8 @@ export class UsageResolver {@Query(() => UsageAnalyticsDTO)@UseGuards(WorkspaceAuthGuard,- FeatureFlagGuard,SettingsPermissionGuard(PermissionFlagType.WORKSPACE),)- @RequireFeatureFlag(FeatureFlagKey.IS_USAGE_ANALYTICS_ENABLED)async getUsageAnalytics(@AuthWorkspace() workspace: WorkspaceEntity,@Args('input', { nullable: true }) input?: UsageAnalyticsInput,diff --git a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.tsindex 8deff0cbb86..c5ce5d4ae10 100644--- a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts@@ -240,7 +240,6 @@ describe('WorkspaceEntityManager', () => {IS_JUNCTION_RELATIONS_ENABLED: false,IS_DRAFT_EMAIL_ENABLED: false,IS_CONNECTED_ACCOUNT_MIGRATED: false,- IS_USAGE_ANALYTICS_ENABLED: false,IS_RICH_TEXT_V1_MIGRATED: false,IS_RECORD_PAGE_LAYOUT_GLOBAL_EDITION_ENABLED: false,IS_RECORD_TABLE_WIDGET_ENABLED: false,diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.tsindex 8c9d29224bf..b842a2f2386 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts@@ -55,11 +55,6 @@ export const seedFeatureFlags = async ({workspaceId: workspaceId,value: true,},- {- key: FeatureFlagKey.IS_USAGE_ANALYTICS_ENABLED,- workspaceId: workspaceId,- value: true,- },{key: FeatureFlagKey.IS_RECORD_PAGE_LAYOUT_GLOBAL_EDITION_ENABLED,workspaceId: workspaceId,diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.tsindex 3037f663012..19959e0d8fc 100644--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts@@ -10,7 +10,6 @@ export enum FeatureFlagKey {IS_JUNCTION_RELATIONS_ENABLED = 'IS_JUNCTION_RELATIONS_ENABLED',IS_DRAFT_EMAIL_ENABLED = 'IS_DRAFT_EMAIL_ENABLED',IS_CONNECTED_ACCOUNT_MIGRATED = 'IS_CONNECTED_ACCOUNT_MIGRATED',- IS_USAGE_ANALYTICS_ENABLED = 'IS_USAGE_ANALYTICS_ENABLED',IS_RICH_TEXT_V1_MIGRATED = 'IS_RICH_TEXT_V1_MIGRATED',IS_RECORD_PAGE_LAYOUT_GLOBAL_EDITION_ENABLED = 'IS_RECORD_PAGE_LAYOUT_GLOBAL_EDITION_ENABLED',IS_RECORD_TABLE_WIDGET_ENABLED = 'IS_RECORD_TABLE_WIDGET_ENABLED',