Skip to content

The open alternative to Salesforce, designed for AI.

Add List View lab icon and make lab feature flag icons mandatory (#23930)

Félix Malfait80fb91c033df
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 4853cdf37e7..94c6225a786 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -1968,6 +1968,7 @@ type ApiConfig {
type PublicFeatureFlagMetadata {
label: String!
description: String!
+ icon: String!
imagePath: String
}
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index cd418a4803d..cae780b6ff0 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -1600,6 +1600,7 @@ export interface ApiConfig {
export interface PublicFeatureFlagMetadata {
label: Scalars['String']
description: Scalars['String']
+ icon: Scalars['String']
imagePath?: Scalars['String']
__typename: 'PublicFeatureFlagMetadata'
}
@@ -4867,6 +4868,7 @@ export interface ApiConfigGenqlSelection{
export interface PublicFeatureFlagMetadataGenqlSelection{
label?: boolean | number
description?: boolean | number
+ icon?: boolean | number
imagePath?: boolean | number
__typename?: boolean | number
__scalar?: boolean | number
diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.ts
index adcbfa268fb..45d10617eba 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts
@@ -3769,6 +3769,9 @@ export default {
"description": [
1
],
+ "icon": [
+ 1
+ ],
"imagePath": [
1
],
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index 073c4842201..a4fd9b8b1a9 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -4502,6 +4502,7 @@ export type PublicFeatureFlag = {
export type PublicFeatureFlagMetadata = {
__typename?: 'PublicFeatureFlagMetadata';
description: Scalars['String']['output'];
+ icon: Scalars['String']['output'];
imagePath?: Maybe<Scalars['String']['output']>;
label: Scalars['String']['output'];
};
diff --git a/packages/twenty-front/src/modules/settings/lab/components/SettingsLabContent.tsx b/packages/twenty-front/src/modules/settings/lab/components/SettingsLabContent.tsx
index 709ed44531e..517fc5367ed 100644
--- a/packages/twenty-front/src/modules/settings/lab/components/SettingsLabContent.tsx
+++ b/packages/twenty-front/src/modules/settings/lab/components/SettingsLabContent.tsx
@@ -5,15 +5,10 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { styled } from '@linaria/react';
import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
-import {
- IconCalendarWeek,
- IconRelationManyToMany,
- IconSparkles,
- type IconComponent,
-} from 'twenty-ui/icon';
+import { useIcons } from 'twenty-ui/icon';
import { Card } from 'twenty-ui/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { FeatureFlagKey } from '~/generated-metadata/graphql';
+import { type FeatureFlagKey } from '~/generated-metadata/graphql';
const StyledCardGrid = styled.div`
display: grid;
@@ -29,14 +24,9 @@ const StyledImage = styled.img`
width: 100%;
`;
-const labFeatureFlagIcons: Partial<Record<FeatureFlagKey, IconComponent>> = {
- [FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED]: IconCalendarWeek,
- [FeatureFlagKey.IS_JUNCTION_RELATIONS_ENABLED]: IconRelationManyToMany,
- [FeatureFlagKey.IS_SETTINGS_DISCOVERY_HERO_ENABLED]: IconSparkles,
-};
-
export const SettingsLabContent = () => {
const currentWorkspace = useAtomStateValue(currentWorkspaceState);
+ const { getIcon } = useIcons();
const { labPublicFeatureFlags, handleLabPublicFeatureFlagUpdate } =
useLabPublicFeatureFlags();
const [hasImageLoadingError, setHasImageLoadingError] = useState<
@@ -75,7 +65,7 @@ export const SettingsLabContent = () => {
/>
)}
<SettingsOptionCardContentToggle
- Icon={labFeatureFlagIcons[flag.key]}
+ Icon={getIcon(flag.metadata.icon)}
title={flag.metadata.label}
description={flag.metadata.description}
checked={flag.value}
@@ -93,7 +83,7 @@ export const SettingsLabContent = () => {
{labPublicFeatureFlagsWithoutImage.map((flag, index) => (
<SettingsOptionCardContentToggle
key={flag.key}
- Icon={labFeatureFlagIcons[flag.key]}
+ Icon={getIcon(flag.metadata.icon)}
title={flag.metadata.label}
description={flag.metadata.description}
checked={flag.value}
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
index 1518a83b5a9..d39310d372f 100644
--- a/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
@@ -226,6 +226,9 @@ export class PublicFeatureFlagMetadata {
@Field(() => String)
description: string;
+ @Field(() => String)
+ icon: string;
+
@Field(() => String, { nullable: true })
imagePath?: string;
}
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts
index f081eac35b5..73e14f61a5c 100644
--- a/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts
@@ -3,6 +3,7 @@ import { FeatureFlagKey } from 'twenty-shared/types';
type FeatureFlagMetadata = {
label: string;
description: string;
+ icon: string;
imagePath?: string;
};
@@ -18,6 +19,7 @@ export const PUBLIC_FEATURE_FLAGS: PublicFeatureFlag[] = [
label: 'Calendar Day and Week Views',
description:
'Display calendar records in daily or weekly layouts with optional end dates',
+ icon: 'IconCalendarWeek',
},
},
{
@@ -26,6 +28,7 @@ export const PUBLIC_FEATURE_FLAGS: PublicFeatureFlag[] = [
label: 'Junction Relations',
description:
'Enable many-to-many relations through junction tables configuration',
+ icon: 'IconRelationManyToMany',
},
},
{
@@ -34,6 +37,7 @@ export const PUBLIC_FEATURE_FLAGS: PublicFeatureFlag[] = [
label: 'List View',
description:
'Display records in a list layout with collapsible groups and inline fields',
+ icon: 'IconList',
},
},
{
@@ -42,6 +46,7 @@ export const PUBLIC_FEATURE_FLAGS: PublicFeatureFlag[] = [
label: 'Settings Discovery Hero',
description:
'Show the per-page hero illustration + video walkthrough modal on settings pages',
+ icon: 'IconSparkles',
},
},
...(process.env.CLOUDFLARE_API_KEY
diff --git a/packages/twenty-ui/src/icon/providers/internal/AllIcons.ts b/packages/twenty-ui/src/icon/providers/internal/AllIcons.ts
index ae7791c37a4..a4d486b9b8e 100644
--- a/packages/twenty-ui/src/icon/providers/internal/AllIcons.ts
+++ b/packages/twenty-ui/src/icon/providers/internal/AllIcons.ts
@@ -965,6 +965,7 @@ import {
IconCalendarStats,
IconCalendarTime,
IconCalendarUp,
+ IconCalendarWeek,
IconCalendarX,
IconCamera,
IconCameraBolt,
@@ -5149,6 +5150,7 @@ export const ALL_ICONS = {
IconCalendarStats,
IconCalendarTime,
IconCalendarUp,
+ IconCalendarWeek,
IconCalendarX,
IconCamera,
IconCameraBolt,