Skip to content

The open alternative to Salesforce, designed for AI.

Migrate Twenty UI headings (#26085)

Raphaël Bosi933d0cdf912f
diff --git a/packages/twenty-agent-skills/references/concepts/how-apps-work.md b/packages/twenty-agent-skills/references/concepts/how-apps-work.md
index 0f6ec75ec4f..037cc18fb99 100644
--- a/packages/twenty-agent-skills/references/concepts/how-apps-work.md
+++ b/packages/twenty-agent-skills/references/concepts/how-apps-work.md
@@ -21,7 +21,7 @@ A Twenty app depends on two SDK packages:
`twenty-sdk/front-component` provides runtime APIs available inside front components: `navigate`, `enqueueSnackbar`, `openSidePanelPage`, `useSelectedRecordIds`, `getApplicationVariable`, and others.
-Twenty UI components (`Button`, `Chip`, `Tag`, `Status`, `H2Title`, `ThemeProvider`, icons, `themeCssVariables`) live in the `twenty-ui` package. Install `twenty-ui` from npm at the same version as `twenty-sdk` and `twenty-client-sdk` and import from its subpaths (`twenty-ui/primitives/input`, `twenty-ui/primitives/data-display`, `twenty-ui/icon`, `twenty-ui/primitives/typography`, `twenty-ui/theme-constants`, and others).
+Twenty UI components (`Button`, `Chip`, `Tag`, `Status`, `Heading`, `Section`, `ThemeProvider`, icons, `themeCssVariables`) live in the `twenty-ui` package. Install `twenty-ui` from npm at the same version as `twenty-sdk` and `twenty-client-sdk` and import from its subpaths (`twenty-ui/primitives/input`, `twenty-ui/primitives/data-display`, `twenty-ui/icon`, `twenty-ui/primitives/typography`, `twenty-ui/components`, `twenty-ui/theme-constants`, and others).
`twenty-client-sdk/core` provides `CoreApiClient` for querying and mutating workspace records (companies, people, custom objects). `twenty-client-sdk/metadata` provides access to workspace metadata (object definitions, field definitions).
diff --git a/packages/twenty-agent-skills/references/design/front-component-ui.md b/packages/twenty-agent-skills/references/design/front-component-ui.md
index a2bcdbc8d98..217f9c41fa1 100644
--- a/packages/twenty-agent-skills/references/design/front-component-ui.md
+++ b/packages/twenty-agent-skills/references/design/front-component-ui.md
@@ -25,7 +25,8 @@ Use Figma measurements as evidence for the current Twenty rhythm, not as impleme
Prefer Twenty UI primitives for CRM-native front component UI:
-- Use `H2Title` or `H3Title` for compact section headings.
+- Use `Dialog.Title` from `twenty-ui/primitives/surfaces` inside `Modal` for its visible title and accessible name.
+- Use `Heading` from `twenty-ui/primitives/typography` for compact headings, or `Section.Header` from `twenty-ui/components` for a heading with a description or action.
- Use `Callout` with a matching icon for loading, empty, error, and blocked states.
- Use `Button` for primary and secondary actions.
- Use `Tag`, `Status`, `Chip`, `Label`, and `Avatar` for metadata, state, people, and small summaries.
diff --git a/packages/twenty-agent-skills/references/develop-app/front-components.md b/packages/twenty-agent-skills/references/develop-app/front-components.md
index 9d684862d11..b20b72ae48c 100644
--- a/packages/twenty-agent-skills/references/develop-app/front-components.md
+++ b/packages/twenty-agent-skills/references/develop-app/front-components.md
@@ -37,7 +37,7 @@ Keep imports narrow:
The front component renderer provides a Twenty `ThemeProvider` around the remote root. For isolated examples or local story-style verification, wrapping the component in `ThemeProvider` from `twenty-ui/theme-constants` is also acceptable.
-The canonical Twenty UI front component example is `packages/twenty-front-component-renderer/src/__stories__/showcase/twenty-ui-example.front-component.tsx`. It imports `Button` from `twenty-ui/primitives/input`; `Chip`, `Status`, and `Tag` from `twenty-ui/primitives/data-display`; `H2Title` from `twenty-ui/primitives/typography`; and `ThemeProvider` from `twenty-ui/theme-constants`.
+The canonical Twenty UI front component example is `packages/twenty-front-component-renderer/src/__stories__/showcase/twenty-ui-example.front-component.tsx`. It imports `Button` from `twenty-ui/primitives/input`; `Chip`, `Status`, and `Tag` from `twenty-ui/primitives/data-display`; `Section` from `twenty-ui/components`; and `ThemeProvider` from `twenty-ui/theme-constants`.
Read theme tokens with the `useTheme()` hook from `twenty-ui/theme-constants` inside the component body. The same tokens are also exported as the `themeCssVariables` constant, but the SDK mocks `twenty-ui` during manifest extraction, so a module-level constant that dereferences `themeCssVariables` can fail before the component renders — prefer `useTheme()`.
diff --git a/packages/twenty-companion/src/renderer/components/Home.tsx b/packages/twenty-companion/src/renderer/components/Home.tsx
index b785be1aeea..91977604e97 100644
--- a/packages/twenty-companion/src/renderer/components/Home.tsx
+++ b/packages/twenty-companion/src/renderer/components/Home.tsx
@@ -1,8 +1,8 @@
+import { Section } from '@ui/components/Section/Section';
import { useNow } from '../hooks/useNow';
import { MeetingRow } from './MeetingRow';
import { i18n } from '@lingui/core';
import { SettingsCardContent } from './SettingsCardContent';
-import { H2Title } from '@ui/primitives/typography/H2Title/H2Title';
import { THEME_COMMON } from '@ui/theme/constants/ThemeCommon';
import { Card } from '@ui/primitives/surfaces/Card/Card';
import { CalendarDayLabel } from './CalendarDayLabel';
@@ -34,7 +34,7 @@ const UpcomingMeetings = ({ state, isPending, command }: ActionProps) => {
}
return (
<section aria-label={calendarTitle}>
- <H2Title title={calendarTitle} />
+ <Section.Header title={calendarTitle} />
{meetings.length ? (
<>
<Card
@@ -141,7 +141,7 @@ export const Home = ({ state, command, isPending }: ActionProps) => {
className="section recordings-section"
aria-label={i18n._('Recordings')}
>
- <H2Title
+ <Section.Header
title={i18n._('Recordings')}
adornment={
<Button
diff --git a/packages/twenty-companion/src/renderer/components/RecordingControls.tsx b/packages/twenty-companion/src/renderer/components/RecordingControls.tsx
index 5f4b4ed5f94..8732badb926 100644
--- a/packages/twenty-companion/src/renderer/components/RecordingControls.tsx
+++ b/packages/twenty-companion/src/renderer/components/RecordingControls.tsx
@@ -1,8 +1,5 @@
+import { Section } from '@ui/components/Section/Section';
import { Avatar } from '@ui/primitives/data-display/Avatar/Avatar';
-import {
- H1Title,
- H1TitleFontColor,
-} from '@ui/primitives/typography/H1Title/H1Title';
import { Card } from '@ui/primitives/surfaces/Card/Card';
import { i18n } from '@lingui/core';
import { Button } from '@ui/primitives/input/Button/Button';
@@ -44,16 +41,17 @@ export const RecordingControls = ({
size="xl"
shape="rounded-square"
/>
- <div className="grow">
- <H1Title
- className="live-title"
- title={active.title}
- fontColor={H1TitleFontColor.Primary}
- />
- <span className="small muted" role="status">
- {label} · <RecordingTimer recording={active} />
- </span>
- </div>
+ <Section.Header
+ className="grow live-section-header"
+ title={active.title}
+ level={2}
+ size="lg"
+ description={
+ <div className="small muted" role="status">
+ {label} · <RecordingTimer recording={active} />
+ </div>
+ }
+ />
</div>
<div className="live-actions">
<Button
diff --git a/packages/twenty-companion/src/renderer/components/Settings.tsx b/packages/twenty-companion/src/renderer/components/Settings.tsx
index 533e7ecfeec..ba1d50a9f2c 100644
--- a/packages/twenty-companion/src/renderer/components/Settings.tsx
+++ b/packages/twenty-companion/src/renderer/components/Settings.tsx
@@ -1,5 +1,5 @@
+import { Section } from '@ui/components/Section/Section';
import { i18n } from '@lingui/core';
-import { H2Title } from '@ui/primitives/typography/H2Title/H2Title';
import { SettingsCardContent } from './SettingsCardContent';
import { THEME_COMMON } from '@ui/theme/constants/ThemeCommon';
import { Card } from '@ui/primitives/surfaces/Card/Card';
@@ -62,7 +62,7 @@ const SettingsToggle = ({
export const Settings = ({ state, isPending, command }: ActionProps) => (
<section className="settings-page">
- <H2Title title={i18n._('General')} />
+ <Section.Header title={i18n._('General')} />
<Card
className="settings-group"
backgroundColor="var(--t-background-secondary)"
@@ -127,7 +127,7 @@ export const Settings = ({ state, isPending, command }: ActionProps) => (
)}
/>
</Card>
- <H2Title title={i18n._('Meetings')} className="section" />
+ <Section.Header title={i18n._('Meetings')} className="section" />
<Card
className="settings-group"
backgroundColor="var(--t-background-secondary)"
@@ -238,7 +238,7 @@ export const Settings = ({ state, isPending, command }: ActionProps) => (
</SettingsCardContent>
</button>
</Card>
- <H2Title title={i18n._('Workspace')} className="section" />
+ <Section.Header title={i18n._('Workspace')} className="section" />
<Card
className="settings-group"
backgroundColor="var(--t-background-secondary)"
diff --git a/packages/twenty-companion/src/renderer/style.css b/packages/twenty-companion/src/renderer/style.css
index 1dd7b8daaec..9e2d5d6aa19 100644
--- a/packages/twenty-companion/src/renderer/style.css
+++ b/packages/twenty-companion/src/renderer/style.css
@@ -460,11 +460,8 @@ p {
gap: var(--t-spacing-3);
align-items: center;
}
-.live-heading .small {
- margin-top: var(--t-spacing-1);
-}
-.live-heading .live-title {
- margin-bottom: var(--t-spacing-1);
+.live-heading .live-section-header {
+ margin-bottom: 0;
}
.live-actions {
display: flex;
diff --git a/packages/twenty-docs/docs.json b/packages/twenty-docs/docs.json
index a30909a8f39..a569450ca40 100644
--- a/packages/twenty-docs/docs.json
+++ b/packages/twenty-docs/docs.json
@@ -551,6 +551,7 @@
"group": "Surfaces",
"pages": [
"ui/primitives/surfaces/alert-dialog",
+ "ui/primitives/surfaces/dialog",
"ui/primitives/surfaces/menu",
"ui/primitives/surfaces/popover"
]
@@ -564,6 +565,7 @@
{
"group": "Typography",
"pages": [
+ "ui/primitives/typography/heading",
"ui/primitives/typography/text"
]
}
@@ -575,7 +577,8 @@
"ui/components/overview",
"ui/components/input/main-button",
"ui/components/input/light-button",
- "ui/components/input/icon-button"
+ "ui/components/input/icon-button",
+ "ui/components/section"
]
}
]
diff --git a/packages/twenty-docs/navigation/base-structure.json b/packages/twenty-docs/navigation/base-structure.json
index f5a1d4d020a..996f1be7b77 100644
--- a/packages/twenty-docs/navigation/base-structure.json
+++ b/packages/twenty-docs/navigation/base-structure.json
@@ -564,6 +564,7 @@
"label": "Surfaces",
"pages": [
"ui/primitives/surfaces/alert-dialog",
+ "ui/primitives/surfaces/dialog",
"ui/primitives/surfaces/menu",
"ui/primitives/surfaces/popover"
]
@@ -576,7 +577,10 @@
{
"key": "uiTypography",
"label": "Typography",
- "pages": ["ui/primitives/typography/text"]
+ "pages": [
+ "ui/primitives/typography/heading",
+ "ui/primitives/typography/text"
+ ]
}
]
},
@@ -587,7 +591,8 @@
"ui/components/overview",
"ui/components/input/main-button",
"ui/components/input/light-button",
- "ui/components/input/icon-button"
+ "ui/components/input/icon-button",
+ "ui/components/section"
]
}
]
diff --git a/packages/twenty-docs/snippets/ui/generated/components/section.mdx b/packages/twenty-docs/snippets/ui/generated/components/section.mdx
new file mode 100644
index 00000000000..0259ce38816
--- /dev/null
+++ b/packages/twenty-docs/snippets/ui/generated/components/section.mdx
@@ -0,0 +1,70 @@
+{/*
+ * _____ _
+ *|_ _|_ _____ _ __ | |_ _ _
+ * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
+ * | | \ V V / __/ | | | |_| |_| | DO NOT EDIT - changes will be overwritten
+ * |_| \_/\_/ \___|_| |_|\__|\__, | Generated by: npx nx generate:ui twenty-docs
+ * |___/
+ *
+ * This file is generated from the documentation data in packages/twenty-ui/generated.
+ * To update it, edit the component prop types or design tokens in twenty-ui and run:
+ * npx nx generate:ui twenty-docs
+ */}
+
+### Section.Root
+
+<ParamField body="Root.align" type="&quot;center&quot; | &quot;left&quot;" default="left">
+ Text alignment within the section. Defaults to `left`.
+</ParamField>
+
+<ParamField body="Root.color" type="&quot;primary&quot; | &quot;secondary&quot; | &quot;tertiary&quot;" default="primary">
+ Text color within the section. Defaults to `primary`.
+</ParamField>
+
+<ParamField body="Root.fullWidth" type="boolean" default="true">
+ Whether the section fills the available width. Defaults to `true`.
+</ParamField>
+
+<ParamField body="Root.render" type="ReactElement&lt;unknown, string | JSXElementConstructor&lt;any&gt;&gt; | ComponentRenderFn&lt;HTMLProps, {}&gt;">
+ Allows you to replace the component's HTML element
+ with a different tag, or compose it with another component.
+
+ Accepts a `ReactElement` or a function that returns the element to render.
+</ParamField>
+
+### Section.Header
+
+<ParamField body="Header.adornment" type="ReactNode">
+ Content alongside the heading, such as an action button or status.
+</ParamField>
+
+<ParamField body="Header.color" type="&quot;primary&quot; | &quot;secondary&quot; | &quot;tertiary&quot;" default="primary">
+ Theme font color. Defaults to `primary`.
+</ParamField>
+
+<ParamField body="Header.description" type="ReactNode">
+ Supporting text associated with the heading. Strings support links and overflow tooltips; React nodes render as supplied.
+</ParamField>
+
+<ParamField body="Header.descriptionLineClamp" type="number" default="5">
+ Maximum visible lines for a string description. Defaults to `5`. Overflowing descriptions can be read in a tooltip on hover or focus.
+</ParamField>
+
+<ParamField body="Header.level" type="5 | 1 | 2 | 3 | 4 | 6" default="2">
+ Semantic heading level, from `h1` through `h6`. Does not change the visual size. Defaults to `2`.
+</ParamField>
+
+<ParamField body="Header.render" type="ReactElement&lt;unknown, string | JSXElementConstructor&lt;any&gt;&gt; | ComponentRenderFn&lt;HTMLProps, {}&gt;">
+ Allows you to replace the component's HTML element
+ with a different tag, or compose it with another component.
+
+ Accepts a `ReactElement` or a function that returns the element to render.
+</ParamField>
+
+<ParamField body="Header.size" type="&quot;sm&quot; | &quot;md&quot; | &quot;lg&quot; | &quot;xs&quot;" default="md">
+ Visual font size, independent of the heading level. Defaults to `md`.
+</ParamField>
+
+<ParamField body="Header.title" type="ReactNode" required>
+ Content of the section heading.
+</ParamField>
diff --git a/packages/twenty-docs/snippets/ui/generated/surfaces/dialog.mdx b/packages/twenty-docs/snippets/ui/generated/surfaces/dialog.mdx
new file mode 100644
index 00000000000..e1e3c465c1d
--- /dev/null
+++ b/packages/twenty-docs/snippets/ui/generated/surfaces/dialog.mdx
@@ -0,0 +1,43 @@
+{/*
+ * _____ _
+ *|_ _|_ _____ _ __ | |_ _ _
+ * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
+ * | | \ V V / __/ | | | |_| |_| | DO NOT EDIT - changes will be overwritten
+ * |_| \_/\_/ \___|_| |_|\__|\__, | Generated by: npx nx generate:ui twenty-docs
+ * |___/
+ *
+ * This file is generated from the documentation data in packages/twenty-ui/generated.
+ * To update it, edit the component prop types or design tokens in twenty-ui and run:
+ * npx nx generate:ui twenty-docs
+ */}
+
+### Dialog.Title
+
+<ParamField body="Title.className" type="string | ((state: DialogTitleState) =&gt; string | undefined)">
+ CSS class applied to the element, or a function that
+ returns a class based on the component's state.
+</ParamField>
+
+<ParamField body="Title.color" type="&quot;primary&quot; | &quot;secondary&quot; | &quot;tertiary&quot;" default="primary">
+ Theme font color. Defaults to `primary`.
+</ParamField>
+
+<ParamField body="Title.level" type="5 | 1 | 2 | 3 | 4 | 6" default="2">
+ Semantic heading level, from `h1` through `h6`. Does not change the visual size. Defaults to `2`.
+</ParamField>
+
+<ParamField body="Title.render" type="ReactElement&lt;unknown, string | JSXElementConstructor&lt;any&gt;&gt; | ComponentRenderFn&lt;HTMLProps, DialogTitleState&gt;">
+ Allows you to replace the component's HTML element
+ with a different tag, or compose it with another component.
+
+ Accepts a `ReactElement` or a function that returns the element to render.
+</ParamField>
+
+<ParamField body="Title.size" type="&quot;sm&quot; | &quot;md&quot; | &quot;lg&quot; | &quot;xs&quot;" default="lg">
+ Visual font size, independent of the heading level. Defaults to `lg`.
+</ParamField>
+
+<ParamField body="Title.style" type="CSSProperties | ((state: DialogTitleState) =&gt; CSSProperties | undefined)">
+ Style applied to the element, or a function that
+ returns a style object based on the component's state.
+</ParamField>
diff --git a/packages/twenty-docs/snippets/ui/generated/typography/heading.mdx b/packages/twenty-docs/snippets/ui/generated/typography/heading.mdx
new file mode 100644
index 00000000000..59423eca3e7
--- /dev/null
+++ b/packages/twenty-docs/snippets/ui/generated/typography/heading.mdx
@@ -0,0 +1,31 @@
+{/*
+ * _____ _
+ *|_ _|_ _____ _ __ | |_ _ _
+ * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
+ * | | \ V V / __/ | | | |_| |_| | DO NOT EDIT - changes will be overwritten
+ * |_| \_/\_/ \___|_| |_|\__|\__, | Generated by: npx nx generate:ui twenty-docs
+ * |___/
+ *
+ * This file is generated from the documentation data in packages/twenty-ui/generated.
+ * To update it, edit the component prop types or design tokens in twenty-ui and run:
+ * npx nx generate:ui twenty-docs
+ */}
+
+<ParamField body="color" type="&quot;primary&quot; | &quot;secondary&quot; | &quot;tertiary&quot;" default="primary">
+ Theme font color. Defaults to `primary`.
+</ParamField>
+
+<ParamField body="level" type="5 | 1 | 2 | 3 | 4 | 6" default="2">
+ Semantic heading level, from `h1` through `h6`. Does not change the visual size. Defaults to `2`.
+</ParamField>
+
+<ParamField body="render" type="ReactElement&lt;unknown, string | JSXElementConstructor&lt;any&gt;&gt; | ComponentRenderFn&lt;HTMLProps, {}&gt;">
+ Allows you to replace the component's HTML element
+ with a different tag, or compose it with another component.
+
+ Accepts a `ReactElement` or a function that returns the element to render.
+</ParamField>
+
+<ParamField body="size" type="&quot;sm&quot; | &quot;md&quot; | &quot;lg&quot; | &quot;xs&quot;" default="md">
+ Visual font size, independent of the heading level. Defaults to `md`.
+</ParamField>
diff --git a/packages/twenty-docs/ui/components/overview.mdx b/packages/twenty-docs/ui/components/overview.mdx
index a489dc5ba15..44efa269373 100644
--- a/packages/twenty-docs/ui/components/overview.mdx
+++ b/packages/twenty-docs/ui/components/overview.mdx
@@ -10,8 +10,9 @@ Import shared components from `twenty-ui/components`. See [Getting started](/ui/
## Browse components
-| Component | Purpose |
-| ---------------------------------------------------------------------- | --------------------------------------------------------------------- |
-| [MainButton](/ui/components/input/main-button) | Prominent actions with a solid surface, elevation, and semibold text. |
-| [LightButton](/ui/components/input/light-button) | Lightweight actions with standard or subtle emphasis. |
-| [IconButton](/ui/components/input/icon-button) | Square icon actions built on Button. |
+| Component | Purpose |
+| ------------------------------------------------ | --------------------------------------------------------------------- |
+| [MainButton](/ui/components/input/main-button) | Prominent actions with a solid surface, elevation, and semibold text. |
+| [LightButton](/ui/components/input/light-button) | Lightweight actions with standard or subtle emphasis. |
+| [IconButton](/ui/components/input/icon-button) | Square icon actions built on Button. |
+| [Section](/ui/components/section) | Related content with a heading, description, and optional action. |
diff --git a/packages/twenty-docs/ui/components/section.mdx b/packages/twenty-docs/ui/components/section.mdx
new file mode 100644
index 00000000000..c4dfb933ff5
--- /dev/null
+++ b/packages/twenty-docs/ui/components/section.mdx
@@ -0,0 +1,52 @@
+---
+title: Section
+description: Group content with a heading, supporting description, and optional action.
+---
+
+import { StoryEmbed } from '/snippets/ui/StoryEmbed.mdx';
+import SectionReference from '/snippets/ui/generated/components/section.mdx';
+
+`Section.Root` groups related content. `Section.Header` combines [Heading](/ui/primitives/typography/heading) with a description and an optional `adornment`. Descriptions are ordinary text associated with the heading, so they do not add levels to the document outline.
+
+<StoryEmbed
+ storyId="ui-components-section--documentation"
+ title="Section example"
+ height={200}
+/>
+
+## Add a description and action
+
+```tsx
+import { Section } from 'twenty-ui/components';
+import { Button } from 'twenty-ui/primitives/input';
+import { Text } from 'twenty-ui/primitives/typography';
+
+export const WorkspaceSection = () => (
+ <Section.Root>
+ <Section.Header
+ title="Workspace settings"
+ description="Manage your workspace name and preferences."
+ adornment={<Button>Edit workspace</Button>}
+ />
+ <Text>Workspace preferences appear here.</Text>
+ </Section.Root>
+);
+```
+
+`Section.Root` defaults to a full-width `div` with left alignment and the primary text color. Use `align`, `color`, and `fullWidth` to adjust the content wrapper.
+
+`Section.Header` can also be used by itself. Its `level`, `size`, and `color` configure the heading and default to `2`, `md`, and `primary`. The header has one spacing-4 margin after it. Use native `style` or `className` to adjust that spacing.
+
+## Description overflow
+
+String descriptions preserve line breaks, turn URLs into links, and show up to five lines. Set `descriptionLineClamp` to a positive integer to choose another limit. Hovering or focusing an overflowing description reveals its full text; Escape dismisses the tooltip.
+
+Pass a React node for richer supporting content. Rich descriptions render as supplied, without automatic truncation or tooltips.
+
+## Composition
+
+Both parts forward native attributes, refs, class names, styles, and `render` to their outer element. For example, `Section.Root render={<section aria-label="Workspace settings" />}` provides a named section, and `Section.Header render={<header />}` uses a header container.
+
+## Props
+
+<SectionReference />
diff --git a/packages/twenty-docs/ui/primitives/overview.mdx b/packages/twenty-docs/ui/primitives/overview.mdx
index 9ea03ba2d87..d8d55a05601 100644
--- a/packages/twenty-docs/ui/primitives/overview.mdx
+++ b/packages/twenty-docs/ui/primitives/overview.mdx
@@ -91,6 +91,6 @@ Each page includes usage examples, interaction guidance, and a generated API ref
| Data display | [Avatar](/ui/primitives/data-display/avatar), [Chip](/ui/primitives/data-display/chip), [Tag](/ui/primitives/data-display/tag), [Status](/ui/primitives/data-display/status) |
| Forms | [Button](/ui/primitives/input/button), [ButtonGroup](/ui/primitives/input/button-group), [Field](/ui/primitives/input/field), [Input](/ui/primitives/input/input), [InputGroup](/ui/primitives/input/input-group), [Textarea](/ui/primitives/input/textarea), [Checkbox](/ui/primitives/input/checkbox), [Radio](/ui/primitives/input/radio), [RadioGroup](/ui/primitives/input/radio-group), [Select](/ui/primitives/input/select), [Slider](/ui/primitives/input/slider), [Switch](/ui/primitives/input/switch) |
| Navigation | [ListItem](/ui/primitives/navigation/list-item), [Tabs](/ui/primitives/navigation/tabs) |
-| Surfaces | [AlertDialog](/ui/primitives/surfaces/alert-dialog), [Menu](/ui/primitives/surfaces/menu), [Popover](/ui/primitives/surfaces/popover), [Tooltip](/ui/primitives/surfaces/tooltip) |
+| Surfaces | [AlertDialog](/ui/primitives/surfaces/alert-dialog), [Dialog](/ui/primitives/surfaces/dialog), [Menu](/ui/primitives/surfaces/menu), [Popover](/ui/primitives/surfaces/popover), [Tooltip](/ui/primitives/surfaces/tooltip) |
| Feedback | [Toast](/ui/primitives/feedback/toast) |
-| Typography | [Text](/ui/primitives/typography/text) |
+| Typography | [Heading](/ui/primitives/typography/heading), [Text](/ui/primitives/typography/text) |
diff --git a/packages/twenty-docs/ui/primitives/surfaces/dialog.mdx b/packages/twenty-docs/ui/primitives/surfaces/dialog.mdx
new file mode 100644
index 00000000000..2f463aaa6cf
--- /dev/null
+++ b/packages/twenty-docs/ui/primitives/surfaces/dialog.mdx
@@ -0,0 +1,39 @@
+---
+title: Dialog
+description: Give a modal a visible heading and accessible name with Dialog.Title.
+---
+
+import { StoryEmbed } from '/snippets/ui/StoryEmbed.mdx';
+import DialogReference from '/snippets/ui/generated/surfaces/dialog.mdx';
+
+Use `Dialog.Title` inside Twenty UI's existing `Modal`. It provides the shared modal heading style and automatically connects the heading to the modal's accessible name. The public `Dialog` namespace currently exports `Title`.
+
+<StoryEmbed
+ storyId="ui-surfaces-dialog--documentation"
+ title="Dialog title example"
+ height={300}
+/>
+
+## Add a modal title
+
+```tsx
+import { Dialog, Modal } from 'twenty-ui/primitives/surfaces';
+import { Text } from 'twenty-ui/primitives/typography';
+
+type CreditModalProps = { isOpen: boolean };
+
+export const CreditModal = ({ isOpen }: CreditModalProps) => (
+ <Modal isOpen={isOpen} padding="large" autoHeight>
+ <Dialog.Title>Grant credits</Dialog.Title>
+ <Text>Add credits to this workspace.</Text>
+ </Modal>
+);
+```
+
+The title defaults to an `h2` with large type, primary text color, centered alignment, and spacing-4 below it. Use `level` to change the document outline independently of `size`. Native `className` and `style` can adjust alignment and spacing.
+
+Native attributes, refs, and `render` are forwarded to the heading. Keep a heading element when using `render`, and keep the title inside `Modal` so its accessible naming relationship is available.
+
+## Props
+
+<DialogReference />
diff --git a/packages/twenty-docs/ui/primitives/typography/heading.mdx b/packages/twenty-docs/ui/primitives/typography/heading.mdx
new file mode 100644
index 00000000000..5e94468d691
--- /dev/null
+++ b/packages/twenty-docs/ui/primitives/typography/heading.mdx
@@ -0,0 +1,43 @@
+---
+title: Heading
+description: Render semantic headings with independent visual sizes.
+---
+
+import { StoryEmbed } from '/snippets/ui/StoryEmbed.mdx';
+import HeadingReference from '/snippets/ui/generated/typography/heading.mdx';
+
+`Heading` renders an `h2` by default. Use `children` for its content, `level` for document structure, and `size` for appearance.
+
+<StoryEmbed
+ storyId="ui-typography-heading--documentation"
+ title="Heading example"
+ height={180}
+/>
+
+## Choose a heading level and size
+
+Choose levels in document order. A smaller visual size does not change the level announced by assistive technology.
+
+```tsx
+import { Heading } from 'twenty-ui/primitives/typography';
+
+export const WorkspaceTitle = () => (
+ <Heading level={1} size="lg">
+ Workspace settings
+ </Heading>
+);
+```
+
+Sizes `xs`, `sm`, `md`, and `lg` use the matching font tokens. Headings have no outer margin; their surrounding layout owns spacing.
+
+## Color and composition
+
+Use `color="secondary"` for less prominent headings. `tertiary` is also available, but its contrast depends on the font size, theme, and background. Check readability when using it.
+
+Native attributes, styles, class names, and refs pass to the heading. Use `render` to compose with a custom element or component; that element is responsible for preserving heading semantics.
+
+For a heading with supporting text or actions, use [Section](/ui/components/section).
+
+## Props
+
+<HeadingReference />
diff --git a/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx b/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx
index 65a32da305e..e30babb1ca7 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx
@@ -21,6 +21,7 @@ import {
chipControlsTest,
} from '@/__stories__/twenty-ui-gallery/utils/displayControlTests';
import { createGalleryStory } from '@/__stories__/twenty-ui-gallery/utils/createGalleryStory';
+import { typographyTest } from '@/__stories__/twenty-ui-gallery/utils/typographyTest';
import {
codeEditorTest,
dataDisplayTest,
@@ -171,12 +172,12 @@ export const CodeEditorPreact: Story = createGalleryStory({
export const TypographyReact: Story = createGalleryStory({
frontComponentBundleName: 'twenty-ui-typography-gallery',
runtime: 'react',
- play: galleryRenderTest,
+ play: typographyTest,
});
export const TypographyPreact: Story = createGalleryStory({
frontComponentBundleName: 'twenty-ui-typography-gallery',
runtime: 'preact',
- play: galleryRenderTest,
+ play: typographyTest,
});
export const ThemeTokensReact: Story = createGalleryStory({
diff --git a/packages/twenty-front-component-renderer/src/__stories__/showcase/twenty-ui-example.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/showcase/twenty-ui-example.front-component.tsx
index 5b0d3ac0dd0..207adbf00db 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/showcase/twenty-ui-example.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/showcase/twenty-ui-example.front-component.tsx
@@ -1,9 +1,9 @@
import { defineFrontComponent } from 'twenty-sdk/define';
import { useState } from 'react';
+import { Section } from 'twenty-ui/components';
import { Chip, Status, Tag } from 'twenty-ui/primitives/data-display';
import { Button } from 'twenty-ui/primitives/input';
import { ThemeProvider } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
const CARD_STYLE = {
padding: 24,
@@ -30,7 +30,7 @@ const TwentyUiComponent = () => {
return (
<ThemeProvider colorScheme="light">
<div data-testid="twenty-ui-component" style={CARD_STYLE}>
- <H2Title
+ <Section.Header
title="Twenty UI"
description="The CRM's own component library with theme-aware styling."
/>
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-layout-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-layout-gallery.front-component.tsx
index fd46f8177b1..4e1a0a6b2d3 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-layout-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-layout-gallery.front-component.tsx
@@ -11,9 +11,6 @@ import {
AutogrowWrapper,
HorizontalSeparator,
ResizeHandle,
- Section,
- SectionAlignment,
- SectionFontColor,
} from 'twenty-ui/primitives/layout';
import { ThemeProvider } from 'twenty-ui/theme-constants';
@@ -74,17 +71,6 @@ const LAYOUT_ENTRIES: GalleryEntry[] = [
name: 'ResizeHandle',
node: <ResizeHandle />,
},
- {
- name: 'Section',
- node: (
- <Section
- alignment={SectionAlignment.Left}
- fontColor={SectionFontColor.Primary}
- >
- Section
- </Section>
- ),
- },
];
const LayoutGallery = () => (
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-modal-open-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-modal-open-gallery.front-component.tsx
index f7606526441..0e9805605ca 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-modal-open-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-modal-open-gallery.front-component.tsx
@@ -1,5 +1,5 @@
import { defineFrontComponent } from 'twenty-sdk/define';
-import { Modal } from 'twenty-ui/primitives/surfaces';
+import { Dialog, Modal } from 'twenty-ui/primitives/surfaces';
import { ThemeProvider } from 'twenty-ui/theme-constants';
import {
@@ -15,7 +15,8 @@ const MODAL_OPEN_ENTRIES: GalleryEntry[] = [
{
name: 'Modal',
node: (
- <Modal isOpen={true} ariaLabel="Open gallery modal">
+ <Modal isOpen={true}>
+ <Dialog.Title>Open gallery modal</Dialog.Title>
Modal body
</Modal>
),
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-typography-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-typography-gallery.front-component.tsx
index d7c1eb676a7..512e70f2f0c 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-typography-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-typography-gallery.front-component.tsx
@@ -1,3 +1,6 @@
+import { useState } from 'react';
+import { Section } from 'twenty-ui/components';
+import { Button } from 'twenty-ui/primitives/input';
import { defineFrontComponent } from 'twenty-sdk/define';
import {
VisibilityHidden,
@@ -5,10 +8,8 @@ import {
} from 'twenty-ui/primitives/accessibility';
import { ThemeProvider } from 'twenty-ui/theme-constants';
import {
- H1Title,
- H1TitleFontColor,
- H2Title,
- H3Title,
+ Heading,
+ Text,
Label,
LinkifiedText,
SeparatorLineText,
@@ -22,18 +23,45 @@ import {
type GalleryEntry,
} from '../shared/front-components/component-gallery';
+const SectionExample = () => {
+ const [activations, setActivations] = useState(0);
+
+ return (
+ <Section.Root>
+ <Section.Header
+ title="Workspace preferences"
+ description="Manage the settings for your workspace."
+ adornment={
+ <Button onClick={() => setActivations((count) => count + 1)}>
+ Edit workspace
+ </Button>
+ }
+ />
+ <Text aria-label="Workspace edits">{activations}</Text>
+ </Section.Root>
+ );
+};
+
const TYPOGRAPHY_ENTRIES: GalleryEntry[] = [
{
- name: 'H1Title',
- node: <H1Title title="Heading 1" fontColor={H1TitleFontColor.Primary} />,
+ name: 'Heading',
+ node: (
+ <Heading level={1} size="lg">
+ Heading 1
+ </Heading>
+ ),
},
{
- name: 'H2Title',
- node: <H2Title title="Heading 2" />,
+ name: 'Section',
+ node: <SectionExample />,
},
{
- name: 'H3Title',
- node: <H3Title title="Heading 3" />,
+ name: 'HeadingLevel',
+ node: (
+ <Heading level={3} size="sm">
+ Heading 3
+ </Heading>
+ ),
},
{
name: 'Label',
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/typographyTest.ts b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/typographyTest.ts
new file mode 100644
index 00000000000..22d3b89b8c5
--- /dev/null
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/typographyTest.ts
@@ -0,0 +1,29 @@
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+
+import { type TwentyUiGalleryPlayFunction } from '@/__stories__/twenty-ui-gallery/types/TwentyUiGalleryPlayFunction';
+import { galleryRenderTest } from '@/__stories__/twenty-ui-gallery/utils/galleryRenderTests';
+
+export const typographyTest: TwentyUiGalleryPlayFunction = async (context) => {
+ await galleryRenderTest(context);
+ const canvas = within(context.canvasElement);
+
+ await expect(
+ canvas.getByRole('heading', { level: 1, name: 'Heading 1' }),
+ ).toHaveAttribute('data-size', 'lg');
+ await expect(
+ canvas.getByRole('heading', { level: 3, name: 'Heading 3' }),
+ ).toHaveAttribute('data-size', 'sm');
+ await expect(
+ canvas.getByRole('heading', { level: 2, name: 'Workspace preferences' }),
+ ).toHaveAccessibleDescription('Manage the settings for your workspace.');
+
+ const button = canvas.getByRole('button', { name: 'Edit workspace' });
+ await userEvent.click(button);
+ await waitFor(() =>
+ expect(canvas.getByLabelText('Workspace edits')).toHaveTextContent('1'),
+ );
+ await userEvent.keyboard('{Enter}');
+ await waitFor(() =>
+ expect(canvas.getByLabelText('Workspace edits')).toHaveTextContent('2'),
+ );
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx
index 640603cdb2b..cdf43d31874 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx
@@ -8,6 +8,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { format, getYear } from 'date-fns';
+import { Section } from 'twenty-ui/components';
import {
AnimatedPlaceholder,
AnimatedPlaceholderEmptyContainer,
@@ -15,9 +16,8 @@ import {
AnimatedPlaceholderEmptyTextContainer,
AnimatedPlaceholderEmptyTitle,
} from 'twenty-ui/primitives/feedback';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { H3Title } from 'twenty-ui/primitives/typography';
+import { Heading } from 'twenty-ui/primitives/typography';
import { type TimelineCalendarEvent } from '~/generated/graphql';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
@@ -36,6 +36,7 @@ const StyledTitleContainer = styled.div`
color: ${themeCssVariables.font.color.secondary};
font-size: ${themeCssVariables.font.size.md};
font-weight: ${themeCssVariables.font.weight.regular};
+ line-height: inherit;
}
`;
@@ -102,19 +103,15 @@ export const CalendarEventsCardContent = ({
});
return (
- <Section key={monthTime}>
+ <Section.Root key={monthTime}>
<StyledTitleContainer>
- <H3Title
- title={
- <>
- {monthLabel}
- {isLastMonthOfYear && <StyledYear> {year}</StyledYear>}
- </>
- }
- />
+ <Heading level={3} size="lg">
+ {monthLabel}
+ {isLastMonthOfYear && <StyledYear> {year}</StyledYear>}
+ </Heading>
</StyledTitleContainer>
<CalendarMonthCard dayTimes={monthDayTimes} />
- </Section>
+ </Section.Root>
);
})}
<CustomResolverFetchMoreLoader
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailsCardContent.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailsCardContent.tsx
index c413ba0bedd..7e457bc90ae 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailsCardContent.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailsCardContent.tsx
@@ -5,7 +5,7 @@ import { EmailThreadPreview } from '@/activities/emails/components/EmailThreadPr
import { EmptyInboxPlaceholder } from '@/activities/emails/components/EmptyInboxPlaceholder';
import { StyledWidgetContentContainer } from '@/ui/layout/components/WidgetContentContainer';
import { styled } from '@linaria/react';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type TimelineThread } from '~/generated/graphql';
@@ -14,7 +14,7 @@ const StyledContainer = styled(StyledWidgetContentContainer)`
overflow: hidden;
`;
-const StyledSection = styled(Section)`
+const StyledSection = styled(Section.Root)`
display: flex;
flex: 1;
min-height: 0;
diff --git a/packages/twenty-front/src/modules/ai/components/SettingsAgentModelCapabilities.tsx b/packages/twenty-front/src/modules/ai/components/SettingsAgentModelCapabilities.tsx
index f7d64b98a43..281cbbde715 100644
--- a/packages/twenty-front/src/modules/ai/components/SettingsAgentModelCapabilities.tsx
+++ b/packages/twenty-front/src/modules/ai/components/SettingsAgentModelCapabilities.tsx
@@ -1,11 +1,11 @@
import { useResolvedAiModel } from '@/ai/hooks/useResolvedAiModel';
+import { Section } from 'twenty-ui/components';
import { InputLabel, Checkbox } from 'twenty-ui/primitives/input';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { IconBrandX, IconWorld } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledCheckboxContainer = styled.div<{ disabled: boolean }>`
@@ -113,7 +113,7 @@ export const SettingsAgentModelCapabilities = ({
];
return (
- <Section>
+ <Section.Root>
<InputLabel>{t`Enable model-specific features`}</InputLabel>
<div>
{capabilities.map((capability) => (
@@ -140,6 +140,6 @@ export const SettingsAgentModelCapabilities = ({
</StyledCheckboxContainer>
))}
</div>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/components/RecordDetailSectionContainer.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/components/RecordDetailSectionContainer.tsx
index 2132d2fc95e..d3995bfdb7d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/components/RecordDetailSectionContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/components/RecordDetailSectionContainer.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { useState } from 'react';
import { Link } from 'react-router-dom';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledRecordDetailSectionWrapper = styled.div`
@@ -70,7 +70,7 @@ export const RecordDetailSectionContainer = ({
const [isHovered, setIsHovered] = useState(false);
return (
<StyledRecordDetailSectionWrapper>
- <Section>
+ <Section.Root>
<StyledHeader
areRecordsAvailable={areRecordsAvailable}
onMouseEnter={() => setIsHovered(true)}
@@ -90,7 +90,7 @@ export const RecordDetailSectionContainer = ({
: rightAdornment}
</StyledHeader>
{children}
- </Section>
+ </Section.Root>
</StyledRecordDetailSectionWrapper>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeSettingsTab.tsx b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeSettingsTab.tsx
index 93cfd02bc16..3ae3addeb80 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeSettingsTab.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeSettingsTab.tsx
@@ -5,7 +5,7 @@ import { getPositionWordLabel } from '@/object-record/record-merge/utils/getPosi
import { Select } from '@/ui/input/components/Select';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledSectionContainer = styled.div`
@@ -38,7 +38,7 @@ export const MergeSettingsTab = () => {
return (
<StyledSectionContainer>
- <Section>
+ <Section.Root>
<Select
dropdownId="merge-settings-priority-select"
options={priorityOptions}
@@ -46,7 +46,7 @@ export const MergeSettingsTab = () => {
onChange={handleSelectionChange}
label={t`Fields conflicts`}
/>
- </Section>
+ </Section.Root>
</StyledSectionContainer>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsx b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsx
index d803aac4ccb..743503b0284 100644
--- a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsx
@@ -8,7 +8,7 @@ import { shouldDisplayFormMultiEditField } from '@/object-record/record-update-m
import { styled } from '@linaria/react';
import { FieldMetadataType } from 'twenty-shared/types';
import { computeRelationGqlFieldJoinColumnName } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledSectionContainer = styled.div`
@@ -54,7 +54,7 @@ export const UpdateMultipleRecordsForm = ({
return (
<StyledSectionContainer>
- <Section>
+ <Section.Root>
{fieldsWithDefinitions.map(({ fieldMetadataItem, fieldDefinition }) => {
const fieldName = fieldDefinition.metadata.fieldName;
const isRelation = isFieldRelation(fieldDefinition);
@@ -88,7 +88,7 @@ export const UpdateMultipleRecordsForm = ({
/>
);
})}
- </Section>
+ </Section.Root>
</StyledSectionContainer>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetGroupContainer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetGroupContainer.tsx
index 28183a9ed02..56471cc33c5 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetGroupContainer.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetGroupContainer.tsx
@@ -1,10 +1,8 @@
import { styled } from '@linaria/react';
import { useContext, useState } from 'react';
+import { Section } from 'twenty-ui/components';
import { IconChevronDown } from 'twenty-ui/icon';
-import {
- AnimatedExpandableContainer,
- Section,
-} from 'twenty-ui/primitives/layout';
+import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledHeader = styled.header`
@@ -47,7 +45,7 @@ export const FieldsWidgetGroupContainer = ({
setIsExpanded((previousIsExpanded) => !previousIsExpanded);
return (
- <Section>
+ <Section.Root>
<StyledHeader onClick={handleToggleGroup}>
<StyledTitleLabel>{title}</StyledTitleLabel>
<StyledChevronWrapper isExpanded={isExpanded}>
@@ -64,6 +62,6 @@ export const FieldsWidgetGroupContainer = ({
>
{children}
</AnimatedExpandableContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graph-widget-aggregate-chart/components/GraphWidgetAggregateChart.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graph-widget-aggregate-chart/components/GraphWidgetAggregateChart.tsx
index 809982f1575..c81efdb04fc 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graph-widget-aggregate-chart/components/GraphWidgetAggregateChart.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graph-widget-aggregate-chart/components/GraphWidgetAggregateChart.tsx
@@ -3,7 +3,7 @@ import { styled } from '@linaria/react';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { IconTrendingDown, IconTrendingUp } from 'twenty-ui/icon';
-import { H1Title, H1TitleFontColor } from 'twenty-ui/primitives/typography';
+import { Heading } from 'twenty-ui/primitives/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type GraphWidgetAggregateChartProps = {
value: string | number;
@@ -33,7 +33,7 @@ const StyledTrendIconContainer = styled.div`
justify-content: center;
`;
-const StyledH1TitleWrapper = styled.div`
+const StyledHeadingWrapper = styled.div`
> h2 {
font-size: ${themeCssVariables.font.size.xxl};
margin: 0;
@@ -56,9 +56,11 @@ export const GraphWidgetAggregateChart = ({
return (
<StyledContainer>
- <StyledH1TitleWrapper>
- <H1Title title={displayValue} fontColor={H1TitleFontColor.Primary} />
- </StyledH1TitleWrapper>
+ <StyledHeadingWrapper>
+ <Heading level={2} size="lg">
+ {displayValue}
+ </Heading>
+ </StyledHeadingWrapper>
{isDefined(trendPercentage) && (
<StyledTrendIconContainer>
<StyledTrendPercentageValue>
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx
index bd5fb19c095..548e7ebd59d 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx
@@ -10,8 +10,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useLingui } from '@lingui/react/macro';
import { BlocklistScope, CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
export const SettingsAccountsBlocklistSection = () => {
const { t } = useLingui();
@@ -61,8 +60,8 @@ export const SettingsAccountsBlocklistSection = () => {
};
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Blocklist`}
description={
isInternalMessagesImportEnabled
@@ -78,6 +77,6 @@ export const SettingsAccountsBlocklistSection = () => {
blocklist={blocklist}
handleBlockedEmailRemove={handleBlockedEmailRemove}
/>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelDetails.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelDetails.tsx
index 02f47a58824..f3c7928d5fb 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelDetails.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelDetails.tsx
@@ -5,9 +5,8 @@ import { SettingsAccountsEventVisibilitySettingsCard } from '@/settings/accounts
import { SettingsOptionCardContentSwitch } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSwitch';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { IconUserPlus } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type CalendarChannelVisibility } from '~/generated/graphql';
@@ -46,8 +45,8 @@ export const SettingsAccountsCalendarChannelDetails = ({
return (
<StyledDetailsContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Event visibility`}
description={t`Define what will be visible to other users in your workspace`}
/>
@@ -55,9 +54,9 @@ export const SettingsAccountsCalendarChannelDetails = ({
value={calendarChannel.visibility}
onChange={handleVisibilityChange}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Contact auto-creation`}
description={t`Automatically create contacts for people you've participated in an event with.`}
/>
@@ -74,7 +73,7 @@ export const SettingsAccountsCalendarChannelDetails = ({
}}
/>
</Card>
- </Section>
+ </Section.Root>
</StyledDetailsContainer>
);
};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
index 3d76e6f7664..403bce13518 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
@@ -7,10 +7,10 @@ import { styled } from '@linaria/react';
import { SettingsPath } from 'twenty-shared/types';
import { useLingui } from '@lingui/react/macro';
+import { Section } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -41,7 +41,7 @@ export const SettingsAccountsConnectedAccountsListCard = ({
}
return (
- <Section>
+ <Section.Root>
<Table>
<SettingsConnectedAccountsTableHeader />
<StyledTableRows>
@@ -54,15 +54,15 @@ export const SettingsAccountsConnectedAccountsListCard = ({
</StyledTableRows>
</Table>
<StyledAddAccountSectionContainer>
- <Section>
+ <Section.Root>
<Button
startIcon={<IconPlus />}
size="sm"
onClick={() => navigateSettings(SettingsPath.NewAccount)}
variant="outline"
>{t`Add account`}</Button>
- </Section>
+ </Section.Root>
</StyledAddAccountSectionContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx
index fb44c154e81..1b7acca4a1a 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectionForm.tsx
@@ -9,8 +9,7 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { SettingsAccountsPasswordController } from '@/settings/accounts/components/SettingsAccountsPasswordController';
import { type ConnectionFormData } from '@/settings/accounts/hooks/useImapSmtpCaldavConnectionForm';
import { type AccountType } from 'twenty-shared/constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledFormContainer = styled.div`
@@ -94,8 +93,8 @@ export const SettingsAccountsConnectionForm = ({
const handlePortChange = (value: string) => Number(value);
return (
- <Section>
- <H2Title title={t`Mail Account`} description={getDescription()} />
+ <Section.Root>
+ <Section.Header title={t`Mail Account`} description={getDescription()} />
<StyledFormContainer>
<Controller
name="name"
@@ -375,6 +374,6 @@ export const SettingsAccountsConnectionForm = ({
/>
</StyledConnectionSection>
</StyledFormContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelDetails.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelDetails.tsx
index 4d0d64a3b2d..8b8ce0bc9c1 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelDetails.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageChannelDetails.tsx
@@ -7,9 +7,8 @@ import {
MessageChannelType,
type MessageFolderImportPolicy,
} from 'twenty-shared/types';
+import { Section } from 'twenty-ui/components';
import { IconBriefcase, IconUsers } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -92,8 +91,8 @@ export const SettingsAccountsMessageChannelDetails = ({
return (
<StyledDetailsContainer>
{supportsFolderImportPolicy && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Import`}
description={t`Emails from the blocklist will be ignored. Manage blocklist on the "Accounts" setting page.`}
/>
@@ -101,11 +100,11 @@ export const SettingsAccountsMessageChannelDetails = ({
onChange={handleMessageFolderImportPolicyChange}
value={messageChannel.messageFolderImportPolicy}
/>
- </Section>
+ </Section.Root>
)}
{!isGroupMailbox && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Visibility`}
description={t`Define what will be visible to other users in your workspace`}
/>
@@ -113,10 +112,10 @@ export const SettingsAccountsMessageChannelDetails = ({
value={messageChannel.visibility}
onChange={handleVisibilityChange}
/>
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Contact auto-creation`}
description={t`Automatically create People records when receiving or sending emails`}
/>
@@ -124,9 +123,9 @@ export const SettingsAccountsMessageChannelDetails = ({
value={messageChannel.contactAutoCreationPolicy}
onChange={handleContactAutoCreationChange}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Options`}
description={t`Configure what emails should get synced`}
/>
@@ -155,7 +154,7 @@ export const SettingsAccountsMessageChannelDetails = ({
}}
/>
</Card>
- </Section>
+ </Section.Root>
</StyledDetailsContainer>
);
};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewEmailGroupChannel.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewEmailGroupChannel.tsx
index 0024e68750c..a30c2f389d8 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewEmailGroupChannel.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewEmailGroupChannel.tsx
@@ -4,8 +4,6 @@ import { z } from 'zod';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { useCreateEmailGroupChannel } from '@/settings/accounts/hooks/useCreateEmailGroupChannel';
import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
@@ -13,6 +11,7 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContain
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { Section } from 'twenty-ui/components';
export const SettingsAccountsNewEmailGroupChannel = () => {
const { t } = useLingui();
@@ -66,8 +65,8 @@ export const SettingsAccountsNewEmailGroupChannel = () => {
}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Email Address`}
description={t`The address your workspace will send and receive email from (e.g. [email protected]). Outbound sending requires the domain to be verified in Outbound Domains.`}
/>
@@ -84,9 +83,9 @@ export const SettingsAccountsNewEmailGroupChannel = () => {
}}
disabled={loading}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Display Name`}
description={t`The name recipients see next to your address in their inbox, instead of the address alone.`}
/>
@@ -104,7 +103,7 @@ export const SettingsAccountsNewEmailGroupChannel = () => {
}}
disabled={loading}
/>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
index 78852b82934..e25abff08a7 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
@@ -5,9 +5,8 @@ import { SettingsCard } from '@/settings/components/SettingsCard';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconCalendarEvent, IconMailCog } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import {
MOBILE_VIEWPORT,
@@ -34,8 +33,8 @@ export const SettingsAccountsSettingsSection = () => {
const { theme } = useContext(ThemeContext);
const { t } = useLingui();
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Settings`}
description={t`Configure your emails and calendar settings.`}
/>
@@ -69,6 +68,6 @@ export const SettingsAccountsSettingsSection = () => {
</UndecoratedLink>
</StyledCardLinkSlot>
</StyledCardsContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx
index d51a3328427..fdf07d433c5 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx
@@ -1,16 +1,15 @@
import { SettingsAccountsListEmptyStateCard } from '@/settings/accounts/components/SettingsAccountsListEmptyStateCard';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
export const SettingsNewAccountSection = () => {
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`New account`}
description={t`Connect a new account to your workspace`}
/>
<SettingsAccountsListEmptyStateCard />
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFoldersCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFoldersCard.tsx
index 6847b4d794d..072671965de 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFoldersCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsAccountsMessageFoldersCard.tsx
@@ -15,8 +15,8 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
+import { Section } from 'twenty-ui/components';
import { Checkbox } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { Label } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -120,11 +120,11 @@ export const SettingsAccountsMessageFoldersCard = () => {
if (loading) {
return (
- <Section>
+ <Section.Root>
<Table>
<SettingsMessageFoldersSkeletonLoader />
</Table>
- </Section>
+ </Section.Root>
);
}
@@ -133,7 +133,7 @@ export const SettingsAccountsMessageFoldersCard = () => {
}
return (
- <Section>
+ <Section.Root>
<Table>
<StyledSearchInputContainer>
<SettingsTextInput
@@ -173,6 +173,6 @@ export const SettingsAccountsMessageFoldersCard = () => {
</StyledTreeList>
</StyledFoldersContainer>
</Table>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsMessageFoldersEmptyStateCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsMessageFoldersEmptyStateCard.tsx
index 894ece419fe..228dfa85aec 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsMessageFoldersEmptyStateCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/message-folders/SettingsMessageFoldersEmptyStateCard.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { Section } from 'twenty-ui/components';
import { IconFolder } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
@@ -19,11 +19,11 @@ export const SettingsMessageFoldersEmptyStateCard = () => {
const { theme } = useContext(ThemeContext);
return (
- <Section>
+ <Section.Root>
<StyledEmptyState>
<IconFolder size={theme.icon.size.md} />
<div>{t`No folders found for this account`}</div>
</StyledEmptyState>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
index dcc044928b5..76ed20f6eec 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
@@ -1,4 +1,5 @@
import { NavigationButton } from '@/ui/input/components/NavigationButton';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import { useMemo, useState } from 'react';
@@ -8,8 +9,6 @@ import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { AI_MODEL_TIERS, type AiModelTier } from 'twenty-shared/ai';
import { IconMessage } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -157,8 +156,8 @@ export const SettingsAdminAI = () => {
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Providers`}
description={t`Built-in providers activated by API key. Click to manage models.`}
/>
@@ -167,10 +166,10 @@ export const SettingsAdminAI = () => {
providers={catalogProviders}
showAddButton={false}
/>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Custom Providers`}
description={t`Add custom endpoints, private gateways, or additional regions.`}
adornment={
@@ -192,11 +191,11 @@ export const SettingsAdminAI = () => {
buttonTitle={t`Activate`}
/>
)}
- </Section>
+ </Section.Root>
{enabledModels.length > 0 && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Default Models`}
description={t`The model behind each mode for every workspace. Workspaces can pin their own.`}
/>
@@ -229,11 +228,11 @@ export const SettingsAdminAI = () => {
))}
</StyledSettingsSelectGroup>
</Card>
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Chats`}
description={t`Browse AI chat threads across all workspaces, including onboarding chats`}
/>
@@ -243,10 +242,10 @@ export const SettingsAdminAI = () => {
size="sm"
variant="outline"
>{t`View all chats`}</NavigationButton>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`AI Usage by Workspace`}
description={t`AI consumption across all workspaces.`}
adornment={
@@ -307,7 +306,7 @@ export const SettingsAdminAI = () => {
buttonTitle={t`Activate`}
/>
)}
- </Section>
+ </Section.Root>
</>
);
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
index c8cf4ed02dd..cffea1e2c58 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
@@ -21,6 +21,7 @@ import {
getSettingsPath,
isDefined,
} from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import {
IconChevronRight,
IconDotsVertical,
@@ -30,9 +31,7 @@ import {
import { Tag } from 'twenty-ui/primitives/data-display';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button, SearchInput } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { MenuItemSwitch } from 'twenty-ui/primitives/navigation';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebounce } from 'use-debounce';
import {
@@ -187,8 +186,8 @@ export const SettingsAdminApps = () => {
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`General`}
description={t`Manage the marketplace application catalog`}
/>
@@ -200,9 +199,9 @@ export const SettingsAdminApps = () => {
disabled={isSyncing}
variant="outline"
>{t`Synchronize catalog`}</Button>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`All App Registrations`}
description={t`All application registrations across the platform, including orphaned marketplace apps (${totalCount} matching)`}
/>
@@ -328,7 +327,7 @@ export const SettingsAdminApps = () => {
>{t`Show more`}</Button>
</StyledShowMoreContainer>
)}
- </Section>
+ </Section.Root>
</>
);
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx
index 7ae485ddd52..f72da84f394 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminGeneral.tsx
@@ -20,11 +20,10 @@ import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { currentUserState } from '@/auth/states/currentUserState';
+import { Section } from 'twenty-ui/components';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { IconChevronRight } from 'twenty-ui/icon';
import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import {
AdminPanelRecentUsersDocument,
@@ -84,20 +83,20 @@ export const SettingsAdminGeneral = () => {
<>
{canAccessFullAdminPanel && (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`About`}
description={t`Version of the application`}
/>
<SettingsAdminVersionContainer />
- </Section>
+ </Section.Root>
<SettingsAdminServerAdmins />
</>
)}
{(canImpersonate || canAccessFullAdminPanel) && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Recent Users`}
description={
canManageFeatureFlags
@@ -194,12 +193,12 @@ export const SettingsAdminGeneral = () => {
</TableBody>
</Table>
)}
- </Section>
+ </Section.Root>
)}
{canImpersonate && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Top Workspaces`}
description={t`Top 10 workspaces by number of users`}
/>
@@ -267,7 +266,7 @@ export const SettingsAdminGeneral = () => {
</TableBody>
</Table>
)}
- </Section>
+ </Section.Root>
)}
</>
);
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdmins.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdmins.tsx
index 6e591ea35f4..0ad81ae7e02 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdmins.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdmins.tsx
@@ -11,10 +11,9 @@ import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconChevronRight } from 'twenty-ui/icon';
import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { GetServerAdminsDocument } from '~/generated-admin/graphql';
@@ -36,8 +35,8 @@ export const SettingsAdminServerAdmins = () => {
const serverAdmins = data?.getServerAdmins ?? [];
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Administrators`}
description={t`Users with server-level access. Open a user to grant or revoke access; use the search below to find anyone.`}
/>
@@ -92,6 +91,6 @@ export const SettingsAdminServerAdmins = () => {
</TableBody>
</Table>
)}
- </Section>
+ </Section.Root>
);
};
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.tsx
index d291a5f0e59..a21bf99ea4b 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
@@ -2,6 +2,7 @@ import { useQuery } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { Tag } from 'twenty-ui/primitives/data-display';
import {
IconBox,
@@ -17,8 +18,6 @@ import {
IconTag,
IconUsers,
} from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { type ThemeColor } from 'twenty-ui/theme';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -156,12 +155,12 @@ export const SettingsAdminWorkspaceBillingContent = ({
if (!billing) {
return (
<StyledContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Billing`}
description={t`No billing data is available for this workspace.`}
/>
- </Section>
+ </Section.Root>
</StyledContainer>
);
}
@@ -357,8 +356,8 @@ export const SettingsAdminWorkspaceBillingContent = ({
return (
<StyledContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Customer`}
description={t`Stripe customer linked to this workspace`}
/>
@@ -367,10 +366,10 @@ export const SettingsAdminWorkspaceBillingContent = ({
items={customerItems}
gridAutoColumns="3fr 8fr"
/>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Usage`}
description={
isDefined(usage)
@@ -385,10 +384,10 @@ export const SettingsAdminWorkspaceBillingContent = ({
gridAutoColumns="3fr 8fr"
/>
)}
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Subscription`}
description={
subscription
@@ -403,7 +402,7 @@ export const SettingsAdminWorkspaceBillingContent = ({
gridAutoColumns="3fr 8fr"
/>
)}
- </Section>
+ </Section.Root>
<SettingsAdminWorkspaceCreditGrantsTable
workspaceId={workspaceId}
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx
index df09d5d28bc..d9690a1bc46 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx
@@ -17,6 +17,7 @@ import {
isDefined,
} from 'twenty-shared/utils';
import { type GetUpgradeStatusQuery } from '~/generated-admin/graphql';
+import { Section } from 'twenty-ui/components';
import {
AvatarOrIcon,
LinkChip,
@@ -31,8 +32,6 @@ import {
IconUser,
} from 'twenty-ui/icon';
import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
@@ -145,8 +144,8 @@ export const SettingsAdminWorkspaceContent = ({
return (
<StyledContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Workspace Info`}
description={t`About this workspace`}
/>
@@ -154,10 +153,10 @@ export const SettingsAdminWorkspaceContent = ({
items={workspaceInfoItems}
gridAutoColumns="1fr 4fr"
/>
- </Section>
+ </Section.Root>
{workspaceUpgradeStatus && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Upgrade Status`}
description={t`Workspace upgrade health`}
/>
@@ -230,7 +229,7 @@ export const SettingsAdminWorkspaceContent = ({
]}
gridAutoColumns="2fr 3fr"
/>
- </Section>
+ </Section.Root>
)}
</StyledContainer>
);
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal.tsx
index 44d7df3fa67..c55d4ee6b7c 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal.tsx
@@ -12,13 +12,9 @@ import { useMutation } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
+import { Section } from 'twenty-ui/components';
+import { Dialog } from 'twenty-ui/primitives/surfaces';
import { Button } from 'twenty-ui/primitives/input';
-import {
- Section,
- SectionAlignment,
- SectionFontColor,
-} from 'twenty-ui/primitives/layout';
-import { H1Title, H1TitleFontColor } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { v4 } from 'uuid';
import { BillingCreditGrantType } from '~/generated-admin/graphql';
@@ -31,10 +27,6 @@ type SettingsAdminWorkspaceCreditGrantModalProps = {
workspaceId: string;
};
-const StyledCenteredTitle = styled.div`
- text-align: center;
-`;
-
const StyledSectionContainer = styled.div`
margin-bottom: ${themeCssVariables.spacing[6]};
`;
@@ -158,19 +150,11 @@ export const SettingsAdminWorkspaceCreditGrantModal = ({
smallBorderRadius
autoHeight
>
- <StyledCenteredTitle>
- <H1Title
- title={t`Grant credits`}
- fontColor={H1TitleFontColor.Primary}
- />
- </StyledCenteredTitle>
+ <Dialog.Title>{t`Grant credits`}</Dialog.Title>
<StyledSectionContainer>
- <Section
- alignment={SectionAlignment.Center}
- fontColor={SectionFontColor.Primary}
- >
+ <Section.Root align="center" color="primary">
{t`Credits are added on top of the plan allowance and are spent only once it runs out. They carry over in full from one billing period to the next, and stay available until they are used up or, where an expiry is set, until the end of the billing period that expiry falls in.`}
- </Section>
+ </Section.Root>
</StyledSectionContainer>
<StyledFields>
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/SettingsAdminConfigVariables.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/SettingsAdminConfigVariables.tsx
index c19da64d464..a4c00899327 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/SettingsAdminConfigVariables.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/SettingsAdminConfigVariables.tsx
@@ -10,8 +10,6 @@ import { showHiddenGroupVariablesState } from '@/settings/admin-panel/config-var
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useMemo, useState } from 'react';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { useQuery } from '@apollo/client/react';
import {
ConfigSource,
@@ -20,6 +18,7 @@ import {
import { normalizeSearchText } from '~/utils/normalizeSearchText';
import { ConfigVariableSearchInput } from './ConfigVariableSearchInput';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
+import { Section } from 'twenty-ui/components';
const StyledControlsContainer = styled.div`
display: flex;
@@ -165,8 +164,8 @@ export const SettingsAdminConfigVariables = () => {
return (
<>
- <Section>
- <H2Title title={t`Config Variables`} />
+ <Section.Root>
+ <Section.Header title={t`Config Variables`} />
<ConfigVariableFilterContainer activeChips={activeChips}>
<StyledControlsContainer>
@@ -182,20 +181,23 @@ export const SettingsAdminConfigVariables = () => {
/>
</StyledControlsContainer>
</ConfigVariableFilterContainer>
- </Section>
+ </Section.Root>
{groupedVariables.size === 0 && (
<StyledTableContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`No variables found`}
description={t`No config variables match your current filters. Try adjusting your filters or search criteria.`}
/>
- </Section>
+ </Section.Root>
</StyledTableContainer>
)}
{[...groupedVariables.entries()].map(([groupName, groupData]) => (
<StyledTableContainer key={groupName}>
- <H2Title title={groupName} description={groupData.description} />
+ <Section.Header
+ title={groupName}
+ description={groupData.description}
+ />
<SettingsAdminConfigVariablesTable variables={groupData.variables} />
</StyledTableContainer>
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthAccountSyncCountersTable.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthAccountSyncCountersTable.tsx
index e27085f722f..1b08d5fc80c 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthAccountSyncCountersTable.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthAccountSyncCountersTable.tsx
@@ -1,8 +1,7 @@
import { SettingsTableCard } from '@/settings/components/SettingsTableCard';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledSettingsTableCardContainer = styled.div`
@@ -47,8 +46,8 @@ export const SettingsAdminHealthAccountSyncCountersTable = ({
];
return (
- <Section>
- <H2Title title={title} description={description} />
+ <Section.Root>
+ <Section.Header title={title} description={description} />
<StyledSettingsTableCardContainer>
<SettingsTableCard
items={items}
@@ -58,6 +57,6 @@ export const SettingsAdminHealthAccountSyncCountersTable = ({
valueAlign="right"
/>
</StyledSettingsTableCardContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatus.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatus.tsx
index 9b365530008..c60707d0503 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatus.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminHealthStatus.tsx
@@ -7,12 +7,11 @@ import { SettingsAdminSigningKeysTable } from '@/settings/admin-panel/signing-ke
import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';
import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import {
GetInstanceAndAllWorkspacesUpgradeStatusDocument,
GetSystemHealthStatusDocument,
} from '~/generated-admin/graphql';
+import { Section } from 'twenty-ui/components';
export const SettingsAdminHealthStatus = () => {
const apolloAdminClient = useApolloAdminClient();
@@ -42,8 +41,8 @@ export const SettingsAdminHealthStatus = () => {
return (
<>
<SettingsAdminMaintenanceModeFetchEffect />
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Health Status`}
description={t`How your system is doing`}
/>
@@ -51,23 +50,23 @@ export const SettingsAdminHealthStatus = () => {
services={services}
loading={loadingHealthStatus}
/>
- </Section>
+ </Section.Root>
{upgradeStatus && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Upgrade Status`}
description={t`Upgrade health across instance and workspaces`}
/>
<SettingsAdminUpgradeStatusListCard upgradeStatus={upgradeStatus} />
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Signing Keys`}
description={t`Asymmetric public keys used to sign and verify access tokens. Revoking a key immediately invalidates every JWT signed with it.`}
/>
<SettingsAdminSigningKeysTable />
- </Section>
+ </Section.Root>
<SettingsAdminMaintenanceMode />
</>
);
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJsonDataIndicatorHealthStatus.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJsonDataIndicatorHealthStatus.tsx
index 4f3f0d48571..f685b33ccf3 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJsonDataIndicatorHealthStatus.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJsonDataIndicatorHealthStatus.tsx
@@ -2,8 +2,8 @@ import { SettingsAdminIndicatorHealthContext } from '@/settings/admin-panel/heal
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
+import { Section } from 'twenty-ui/components';
import { JsonTree } from 'twenty-ui/primitives/json-visualizer';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { AdminPanelHealthServiceStatus } from '~/generated-admin/graphql';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
@@ -42,7 +42,7 @@ export const SettingsAdminJsonDataIndicatorHealthStatus = () => {
const serviceLabel = indicatorHealth.label;
return (
- <Section>
+ <Section.Root>
{isDown && (
<StyledErrorMessage>
{indicatorHealth.errorMessage ||
@@ -63,6 +63,6 @@ export const SettingsAdminJsonDataIndicatorHealthStatus = () => {
/>
</StyledDetailsContainer>
)}
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerQueueMetricsSection.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerQueueMetricsSection.tsx
index 03c9124a7ea..9a533aa45ba 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerQueueMetricsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerQueueMetricsSection.tsx
@@ -8,9 +8,8 @@ import { t } from '@lingui/core/macro';
import { lazy, Suspense, useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconList } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
type AdminPanelWorkerQueueHealth,
@@ -52,9 +51,12 @@ export const SettingsAdminWorkerQueueMetricsSection = ({
return (
<StyledContainer>
- <Section>
+ <Section.Root>
<StyledControlsContainer>
- <H2Title title={queue.queueName} description={t`Queue performance`} />
+ <Section.Header
+ title={queue.queueName}
+ description={t`Queue performance`}
+ />
<StyledRightControls>
<NavigationButton
startIcon={<IconList />}
@@ -77,7 +79,7 @@ export const SettingsAdminWorkerQueueMetricsSection = ({
/>
</StyledRightControls>
</StyledControlsContainer>
- </Section>
+ </Section.Root>
<Suspense fallback={<WidgetSkeletonLoader />}>
<SettingsAdminWorkerMetricsGraph
queueName={queue.queueName}
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/maintenance-mode/components/SettingsAdminMaintenanceMode.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/maintenance-mode/components/SettingsAdminMaintenanceMode.tsx
index 6c1f72ee7db..5b805d472e6 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/maintenance-mode/components/SettingsAdminMaintenanceMode.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/maintenance-mode/components/SettingsAdminMaintenanceMode.tsx
@@ -16,12 +16,11 @@ import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconLink, IconTool } from 'twenty-ui/icon';
import { Status } from 'twenty-ui/primitives/data-display';
import { InputHint } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card, CardContent } from 'twenty-ui/primitives/surfaces';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useToast } from 'twenty-ui/primitives/feedback';
@@ -192,8 +191,8 @@ export const SettingsAdminMaintenanceMode = () => {
: undefined;
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Maintenance`}
description={t`Schedule a maintenance window and notify all users`}
/>
@@ -249,6 +248,6 @@ export const SettingsAdminMaintenanceMode = () => {
</CardContent>
)}
</Card>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/AddCreditCardModal.tsx b/packages/twenty-front/src/modules/settings/billing/components/AddCreditCardModal.tsx
index f24b34acfd6..9b0d6f6899f 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/AddCreditCardModal.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/AddCreditCardModal.tsx
@@ -3,13 +3,9 @@ import { ModalStatefulWrapper } from '@/ui/layout/modal/components/ModalStateful
import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
+import { Section } from 'twenty-ui/components';
+import { Dialog } from 'twenty-ui/primitives/surfaces';
import { Button } from 'twenty-ui/primitives/input';
-import {
- Section,
- SectionAlignment,
- SectionFontColor,
-} from 'twenty-ui/primitives/layout';
-import { H1Title, H1TitleFontColor } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type AddCreditCardModalProps = {
@@ -18,10 +14,6 @@ type AddCreditCardModalProps = {
onPaymentMethodAdded: () => Promise<void>;
};
-const StyledCenteredTitle = styled.div`
- text-align: center;
-`;
-
const StyledSectionContainer = styled.div`
margin-bottom: ${themeCssVariables.spacing[6]};
`;
@@ -56,19 +48,11 @@ export const AddCreditCardModal = ({
smallBorderRadius
autoHeight
>
- <StyledCenteredTitle>
- <H1Title
- title={t`Add your credit card`}
- fontColor={H1TitleFontColor.Primary}
- />
- </StyledCenteredTitle>
+ <Dialog.Title>{t`Add your credit card`}</Dialog.Title>
<StyledSectionContainer>
- <Section
- alignment={SectionAlignment.Center}
- fontColor={SectionFontColor.Primary}
- >
+ <Section.Root align="center" color="primary">
{t`Add your credit card below. Once added, your subscription will start automatically.`}
- </Section>
+ </Section.Root>
</StyledSectionContainer>
<AddPaymentMethodForm
finalRedirectPath={finalRedirectPath}
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingContent.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingContent.tsx
index cf55f1f8d45..82d3b1508e0 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingContent.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingContent.tsx
@@ -12,10 +12,9 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContain
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconCircleX, IconCreditCard } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { SubscriptionStatus } from '~/generated-metadata/graphql';
const SETTINGS_BILLING_UPDATE_PAYMENT_MODAL_ID =
@@ -89,8 +88,8 @@ export const SettingsBillingContent = () => {
isUpdatePaymentDisabled={isPaymentMethodFlowDisabled}
/>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Manage billing information`}
description={t`Edit payment method, see your invoices and more`}
/>
@@ -100,10 +99,10 @@ export const SettingsBillingContent = () => {
disabled={isBillingPortalSessionDisabled}
variant="outline"
>{t`View billing details`}</Button>
- </Section>
+ </Section.Root>
{canCancelCurrentSubscription && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Cancel your subscription`}
description={t`Your workspace will be disabled`}
/>
@@ -114,7 +113,7 @@ export const SettingsBillingContent = () => {
variant="outline"
color="danger"
>{t`Cancel Plan`}</Button>
- </Section>
+ </Section.Root>
)}
{shouldAddPaymentMethodInProduct && (
<UpdatePaymentMethodModal
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
index 82c885d7cc0..557ef4396d9 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
@@ -23,6 +23,7 @@ import { t } from '@lingui/core/macro';
import { DOCUMENTATION_PATHS } from 'twenty-shared/constants';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import {
IconChartBar,
IconCoins,
@@ -31,8 +32,6 @@ import {
} from 'twenty-ui/icon';
import { ProgressBar } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';
import {
PermissionFlagType,
@@ -217,8 +216,8 @@ export const SettingsBillingCreditsSection = ({
});
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Credits`}
description={t`Credits are used by workflows, AI chats, agents, and approved apps`}
/>
@@ -324,6 +323,6 @@ export const SettingsBillingCreditsSection = ({
variant="outline"
>{t`How credits work`}</Button>
</StyledCreditUsageFooterActions>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitEditForm.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitEditForm.tsx
index 9f94c1a34a6..2e6d407ace9 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitEditForm.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitEditForm.tsx
@@ -3,11 +3,10 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import { IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { SettingsBillingLimitForm } from '@/settings/billing/components/SettingsBillingLimitForm';
import { useDeleteUsageLimit } from '@/settings/billing/hooks/useDeleteUsageLimit';
@@ -128,8 +127,8 @@ export const SettingsBillingLimitEditForm = ({
scopeConsumption={scopeConsumption}
onChange={setValues}
/>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Danger zone`}
description={t`Spending stays capped by your plan allowance and the other limits.`}
/>
@@ -149,7 +148,7 @@ export const SettingsBillingLimitEditForm = ({
loading={isDeleting}
onConfirmClick={handleDelete}
/>
- </Section>
+ </Section.Root>
</>
)}
</SettingsPageContainer>
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitForm.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitForm.tsx
index cf37b31313b..2797585e42d 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitForm.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitForm.tsx
@@ -2,10 +2,9 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { INTERNAL_CREDITS_PER_DISPLAY_CREDIT } from 'twenty-shared/constants';
import { isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { SettingsBillingLimitUsageSelect } from '@/settings/billing/components/SettingsBillingLimitUsageSelect';
import { SettingsBillingLimitAmount } from '@/settings/billing/components/internal/SettingsBillingLimitAmount';
@@ -152,8 +151,8 @@ export const SettingsBillingLimitForm = ({
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Scope`}
description={t`The usage this limit applies to.`}
/>
@@ -175,9 +174,9 @@ export const SettingsBillingLimitForm = ({
onChange={(spender) => onChange({ ...values, ...spender })}
/>
</StyledRow>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Limit`}
description={t`How much can be spent, and how often it resets.`}
/>
@@ -267,7 +266,7 @@ export const SettingsBillingLimitForm = ({
/>
</StyledMeterRow>
</StyledRow>
- </Section>
+ </Section.Root>
</>
);
};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitsContent.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitsContent.tsx
index 547091c5b68..9d3a8931e0b 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitsContent.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitsContent.tsx
@@ -2,13 +2,12 @@ import { useLingui } from '@lingui/react/macro';
import { Navigate } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { SettingsBillingLimitsTable } from '@/settings/billing/components/SettingsBillingLimitsTable';
import { useUsageQuotasWithConsumption } from '@/settings/billing/hooks/useUsageQuotasWithConsumption';
import { hasKnownUsageLimitSpender } from '@/settings/billing/utils/hasKnownUsageLimitSpender';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { Section } from 'twenty-ui/components';
export const SettingsBillingLimitsContent = () => {
const { t } = useLingui();
@@ -24,12 +23,12 @@ export const SettingsBillingLimitsContent = () => {
if (isDefined(error)) {
return (
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Limits`}
description={t`Limits could not be loaded.`}
/>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
);
}
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
index 6ec6088b76c..1b5bc93270b 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
@@ -30,9 +30,8 @@ import { useMutation } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconClockPlay, IconCoins, IconTag } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import {
BillingPlanKey,
CancelSwitchResourceCreditPriceDocument,
@@ -388,8 +387,11 @@ export const SettingsBillingSubscriptionInfo = ({
};
return (
- <Section>
- <H2Title title={t`Subscription`} description={subscriptionDescription} />
+ <Section.Root>
+ <Section.Header
+ title={t`Subscription`}
+ description={subscriptionDescription}
+ />
<SettingsBillingSubscriptionInfoCard
canDisplaySwitchToMonthlyAction={canDisplaySwitchToMonthlyAction}
canDisplaySwitchToYearlyAction={canDisplaySwitchToYearlyAction}
@@ -485,6 +487,6 @@ export const SettingsBillingSubscriptionInfo = ({
},
})}
/>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/UpdatePaymentMethodModal.tsx b/packages/twenty-front/src/modules/settings/billing/components/UpdatePaymentMethodModal.tsx
index a82671f537a..62d32d78fc8 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/UpdatePaymentMethodModal.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/UpdatePaymentMethodModal.tsx
@@ -7,24 +7,16 @@ import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
+import { Section } from 'twenty-ui/components';
+import { Dialog } from 'twenty-ui/primitives/surfaces';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import {
- Section,
- SectionAlignment,
- SectionFontColor,
-} from 'twenty-ui/primitives/layout';
-import { H1Title, H1TitleFontColor } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type UpdatePaymentMethodModalProps = {
modalInstanceId: string;
};
-const StyledCenteredTitle = styled.div`
- text-align: center;
-`;
-
const StyledSectionContainer = styled.div`
margin-bottom: ${themeCssVariables.spacing[6]};
`;
@@ -74,19 +66,11 @@ export const UpdatePaymentMethodModal = ({
smallBorderRadius
autoHeight
>
- <StyledCenteredTitle>
- <H1Title
- title={t`Update your payment method`}
- fontColor={H1TitleFontColor.Primary}
- />
- </StyledCenteredTitle>
+ <Dialog.Title>{t`Update your payment method`}</Dialog.Title>
<StyledSectionContainer>
- <Section
- alignment={SectionAlignment.Center}
- fontColor={SectionFontColor.Primary}
- >
+ <Section.Root align="center" color="primary">
{t`Add a card below to update your billing details and retry your payment.`}
- </Section>
+ </Section.Root>
</StyledSectionContainer>
<AddPaymentMethodForm
onPaymentMethodAdded={handlePaymentMethodAdded}
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPackagePickerModal.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPackagePickerModal.tsx
index 5a3c3d3206f..1d39060b833 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPackagePickerModal.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPackagePickerModal.tsx
@@ -6,6 +6,7 @@ import { t } from '@lingui/core/macro';
import { AnimatePresence, motion } from 'framer-motion';
import { type ElementType, type ReactNode } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import {
IconCoins,
IconHistory,
@@ -14,13 +15,10 @@ import {
} from 'twenty-ui/icon';
import { Button, Slider } from 'twenty-ui/primitives/input';
import {
- Section,
- SectionAlignment,
- SectionFontColor,
-} from 'twenty-ui/primitives/layout';
-import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
+ Dialog,
+ OverflowingTextWithTooltip,
+} from 'twenty-ui/primitives/surfaces';
import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';
-import { H1Title, H1TitleFontColor } from 'twenty-ui/primitives/typography';
const PACKAGE_SUMMARY_ROW_HEIGHT = 24;
const PACKAGE_SUMMARY_ROW_GAP = 4;
@@ -267,18 +265,12 @@ export const ResourceCreditPackagePickerModal = ({
autoHeight
>
<StyledCenteredTitle>
- <H1Title
- title={t`Choose ${intervalAdjective} credits`}
- fontColor={H1TitleFontColor.Primary}
- />
+ <Dialog.Title>{t`Choose ${intervalAdjective} credits`}</Dialog.Title>
</StyledCenteredTitle>
<StyledSectionContainer>
- <Section
- alignment={SectionAlignment.Center}
- fontColor={SectionFontColor.Primary}
- >
+ <Section.Root align="center" color="primary">
{t`Select the credit package to add to your ${intervalAdjective} bill.`}
- </Section>
+ </Section.Root>
</StyledSectionContainer>
<StyledPackageCard>
<StyledPackageHeader>
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx b/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx
index 756796e5d40..fccb34de7c3 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx
@@ -8,10 +8,9 @@ import { Table } from '@/ui/layout/table/components/Table';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { Section } from 'twenty-ui/components';
import { IconChevronRight, IconPlus } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledTableRows = styled.div`
@@ -86,8 +85,8 @@ export const SettingsTableListSection = <
: gridAutoColumns;
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={title}
description={description}
adornment={headerAdornment}
@@ -149,6 +148,6 @@ export const SettingsTableListSection = <
</Button>
</StyledFooter>
)}
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx
index 5dff5c64958..d2fc19fd2de 100644
--- a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx
+++ b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx
@@ -4,13 +4,16 @@ import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type Dispatch, type SetStateAction, useState } from 'react';
+import { Section } from 'twenty-ui/components';
import { IconCheck, IconPencil, IconX } from 'twenty-ui/icon';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button, ButtonGroup } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H3Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
+const StyledSectionHeader = styled(Section.Header)`
+ margin-block-end: 0;
+`;
+
const RESET_VARIABLE_MODAL_ID =
'reset-application-registration-config-variable-modal';
@@ -113,11 +116,17 @@ export const ConfigVariableEdit = ({
return (
<SettingsPageContainer>
- <Section>
- <H3Title title={title} description={description} />
- </Section>
-
- <Section>
+ <Section.Root>
+ <StyledSectionHeader
+ title={title}
+ description={description}
+ level={3}
+ size="lg"
+ descriptionLineClamp={2}
+ />
+ </Section.Root>
+
+ <Section.Root>
<StyledRow>
{input}
{!isEditing ? (
@@ -159,7 +168,7 @@ export const ConfigVariableEdit = ({
/>
</StyledRow>
{helpContent}
- </Section>
+ </Section.Root>
</SettingsPageContainer>
);
};
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
index 63054266168..f37a2d1b20f 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
@@ -12,13 +12,12 @@ import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFiel
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { Section } from 'twenty-ui/primitives/layout';
import { useContext, useState } from 'react';
import { Controller, useFormContext } from 'react-hook-form';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconSearch } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { FieldMetadataType } from '~/generated-metadata/graphql';
@@ -113,7 +112,7 @@ export const SettingsObjectNewFieldSelector = ({
return (
<>
{' '}
- <Section>
+ <Section.Root>
<StyledSearchInputContainer>
<SettingsTextInput
instanceId="new-field-type-search"
@@ -123,15 +122,15 @@ export const SettingsObjectNewFieldSelector = ({
onChange={setSearchQuery}
/>
</StyledSearchInputContainer>
- </Section>
+ </Section.Root>
<Controller
name="type"
control={control}
render={() => (
<StyledTypeSelectContainer>
{SETTINGS_FIELD_TYPE_CATEGORIES.map((category) => (
- <Section key={category}>
- <H2Title
+ <Section.Root key={category}>
+ <Section.Header
title={category}
description={
SETTINGS_FIELD_TYPE_CATEGORY_DESCRIPTIONS[category]
@@ -180,7 +179,7 @@ export const SettingsObjectNewFieldSelector = ({
</StyledCardContainer>
))}
</StyledContainer>
- </Section>
+ </Section.Root>
))}
</StyledTypeSelectContainer>
)}
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx
index 5cad78a6e03..71d9e14f10e 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx
@@ -10,9 +10,8 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useLingui } from '@lingui/react/macro';
import { FieldMetadataType, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsObjectFieldTable } from '~/pages/settings/data-model/SettingsObjectFieldTable';
@@ -53,8 +52,8 @@ export const ObjectFields = ({ objectMetadataItem }: ObjectFieldsProps) => {
return (
<StyledContentContainer>
{hasRelations && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Relations`}
description={t`Relation between this object and other objects`}
/>
@@ -75,10 +74,10 @@ export const ObjectFields = ({ objectMetadataItem }: ObjectFieldsProps) => {
>{t`Add relation`}</NavigationButton>
)}
</StyledButtonContainer>
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Fields`}
description={t`Customise the fields available in the ${objectLabelSingular} views and their display order in the ${objectLabelSingular} detail view and menus.`}
/>
@@ -99,7 +98,7 @@ export const ObjectFields = ({ objectMetadataItem }: ObjectFieldsProps) => {
>{t`Add Field`}</NavigationButton>
)}
</StyledButtonContainer>
- </Section>
+ </Section.Root>
</StyledContentContainer>
);
};
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectLayout.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectLayout.tsx
index 59be3c2b4b9..4a4ae6e81a6 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectLayout.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectLayout.tsx
@@ -2,11 +2,10 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconAddressBook, IconPencil, IconReload } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { useEnterLayoutCustomizationMode } from '@/layout-customization/hooks/useEnterLayoutCustomizationMode';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
@@ -98,8 +97,8 @@ export const ObjectLayout = ({ objectMetadataItem }: ObjectLayoutProps) => {
return (
<StyledContentContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Record page`}
description={t`Customize the workspace record page`}
/>
@@ -127,16 +126,16 @@ export const ObjectLayout = ({ objectMetadataItem }: ObjectLayoutProps) => {
/>
}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Navigation`}
description={t`Where records of this object open`}
/>
<ObjectOpenRecordInPicker objectMetadataItem={objectMetadataItem} />
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Reset`}
description={t`Reset all overrides on this layout to return it to the app default`}
/>
@@ -147,7 +146,7 @@ export const ObjectLayout = ({ objectMetadataItem }: ObjectLayoutProps) => {
disabled={!hasLayoutsPermission || !isDefined(pageLayout)}
variant="outline"
>{t`Reset to default`}</Button>
- </Section>
+ </Section.Root>
<ConfirmationModal
modalInstanceId={RESET_PAGE_LAYOUT_MODAL_ID}
title={t`Reset to default`}
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
index c8582436377..97acdd9c083 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
@@ -16,10 +16,9 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
+import { Section } from 'twenty-ui/components';
import { IconArchive, IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -103,30 +102,30 @@ export const ObjectSettings = ({
return (
<StyledContentContainer>
<StyledFormSectionContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`About`}
description={t`Name in both singular (e.g., 'Invoice') and plural (e.g., 'Invoices') forms.`}
/>
<SettingsUpdateDataModelObjectAboutForm
objectMetadataItem={objectMetadataItem}
/>
- </Section>
+ </Section.Root>
</StyledFormSectionContainer>
<StyledFormSectionContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Options`}
description={t`Choose the fields that will identify your records`}
/>
<SettingsDataModelObjectSettingsFormCard
objectMetadataItem={objectMetadataItem}
/>
- </Section>
+ </Section.Root>
</StyledFormSectionContainer>
<StyledFormSectionContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Translations`}
description={t`What each language displays for this object's labels`}
/>
@@ -137,12 +136,12 @@ export const ObjectSettings = ({
label: objectMetadataItem.labelPlural,
}}
/>
- </Section>
+ </Section.Root>
</StyledFormSectionContainer>
<AdvancedSettingsWrapper>
<StyledFormSectionContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Search`}
description={t`Configure how this object appears in search results`}
/>
@@ -150,13 +149,13 @@ export const ObjectSettings = ({
objectMetadataItem={objectMetadataItem}
isReadOnly={isReadOnly}
/>
- </Section>
+ </Section.Root>
</StyledFormSectionContainer>
</AdvancedSettingsWrapper>
<AdvancedSettingsWrapper>
<StyledFormSectionContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Indexes`}
description={t`Speed up reads on the fields you filter or sort by most. Each index also slows down writes and uses disk space, so add them with intent.`}
/>
@@ -164,13 +163,13 @@ export const ObjectSettings = ({
objectMetadataItem={objectMetadataItem}
isReadOnly={isReadOnly}
/>
- </Section>
+ </Section.Root>
</StyledFormSectionContainer>
</AdvancedSettingsWrapper>
{!isReadOnly && (
<StyledFormSectionContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Danger zone`}
description={t`Deactivate object`}
/>
@@ -190,7 +189,7 @@ export const ObjectSettings = ({
>{t`Delete`}</Button>
)}
</StyledDangerButtonsContainer>
- </Section>
+ </Section.Root>
</StyledFormSectionContainer>
)}
<ConfirmationModal
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx
index 780854f987f..b50f5a3999c 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx
@@ -19,10 +19,9 @@ import {
isDefined,
isValidUrl,
} from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconTrash } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { SETTINGS_API_WEBHOOKS_TABS } from '~/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs';
import { SettingsDatabaseEventsForm } from '@/settings/components/SettingsDatabaseEventsForm';
@@ -119,8 +118,8 @@ export const SettingsDevelopersWebhookForm = ({
}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Endpoint URL`}
description={t`We will send a POST request to this endpoint for each new event in application/json format`}
/>
@@ -144,9 +143,9 @@ export const SettingsDevelopersWebhookForm = ({
);
}}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Description`}
description={t`We will send a POST request to this endpoint for each new event in application/json format.`}
/>
@@ -164,9 +163,9 @@ export const SettingsDevelopersWebhookForm = ({
/>
)}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Filters`}
description={t`Select the events you wish to send to this endpoint`}
/>
@@ -181,9 +180,9 @@ export const SettingsDevelopersWebhookForm = ({
/>
)}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Secret`}
description={t`Optional secret used to compute the HMAC signature for webhook payloads`}
/>
@@ -200,10 +199,10 @@ export const SettingsDevelopersWebhookForm = ({
/>
)}
/>
- </Section>
+ </Section.Root>
{!isCreationMode && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Danger zone`}
description={t`Delete this webhook`}
/>
@@ -213,7 +212,7 @@ export const SettingsDevelopersWebhookForm = ({
variant="outline"
color="danger"
>{t`Delete`}</Button>
- </Section>
+ </Section.Root>
)}
</SettingsPageContainer>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
index 08f86af44b6..e4ead8a07dd 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
@@ -17,11 +17,10 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconReload, IconTrash } from 'twenty-ui/icon';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button, ButtonGroup } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
CreatePublicDomainDocument,
@@ -165,8 +164,8 @@ export const SettingPublicDomain = () => {
}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Custom Domain`}
description={t`Set the name of your custom domain and configure your DNS records.`}
/>
@@ -218,7 +217,7 @@ export const SettingPublicDomain = () => {
)}
</StyledRecordsWrapper>
)}
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingsCustomDomain.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingsCustomDomain.tsx
index 9a543d8715c..dd71576e453 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingsCustomDomain.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingsCustomDomain.tsx
@@ -13,10 +13,9 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { styled } from '@linaria/react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconReload, IconTrash } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { useCheckCustomDomainValidRecords } from '@/settings/domains/hooks/useCheckCustomDomainValidRecords';
@@ -74,8 +73,8 @@ export const SettingsCustomDomain = () => {
}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Custom Domain`}
description={t`Set the name of your custom domain and configure your DNS records.`}
/>
@@ -107,7 +106,7 @@ export const SettingsCustomDomain = () => {
</StyledButtonsContainer>
)}
</StyledDomainFormWrapper>
- </Section>
+ </Section.Root>
{currentWorkspace?.customDomain && customDomainRecords && (
<SettingsDomainRecords records={customDomainRecords.records} />
)}
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingsDomainRecords.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingsDomainRecords.tsx
index 41e8e1db500..83accfce6d6 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingsDomainRecords.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingsDomainRecords.tsx
@@ -2,8 +2,7 @@ import { isDefined } from 'twenty-shared/utils';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { SettingsDnsRecordsTable } from '@/settings/components/SettingsDnsRecordsTable';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { type ThemeColor } from 'twenty-ui/theme';
import {
type DomainRecord,
@@ -57,12 +56,12 @@ export const SettingsDomainRecords = ({
});
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Domain Setup`}
description={t`Configure these DNS records with your domain provider`}
/>
<SettingsDnsRecordsTable records={transformedRecords} />
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingsSubdomain.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingsSubdomain.tsx
index 64b6ad8afe9..447d85dc793 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingsSubdomain.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingsSubdomain.tsx
@@ -14,9 +14,8 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { styled } from '@linaria/react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { Section } from 'twenty-ui/components';
const StyledDomainFormWrapper = styled.div`
align-items: center;
@@ -64,8 +63,8 @@ export const SettingsSubdomain = () => {
}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Subdomain`}
description={t`Set the name of your subdomain`}
/>
@@ -84,7 +83,7 @@ export const SettingsSubdomain = () => {
fullWidth
/>
</StyledDomainFormWrapper>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
<ConfirmationModal
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/SettingsLogicFunctionNewForm.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/SettingsLogicFunctionNewForm.tsx
index dbc15906d75..93c9b275681 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/SettingsLogicFunctionNewForm.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/SettingsLogicFunctionNewForm.tsx
@@ -4,9 +4,8 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { TextArea } from '@/ui/input/components/TextArea';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { Section } from 'twenty-ui/components';
import { IconClockHour8 } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -31,8 +30,8 @@ export const SettingsLogicFunctionNewForm = ({
const nameTextInputId = `${formValues.name}-name`;
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`About`}
description={t`Name and describe your function`}
/>
@@ -68,6 +67,6 @@ export const SettingsLogicFunctionNewForm = ({
/>
</Card>
</StyledInputsContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionCodeEditorTab.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionCodeEditorTab.tsx
index b2099336068..8eb1f53304c 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionCodeEditorTab.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionCodeEditorTab.tsx
@@ -8,10 +8,9 @@ import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTab
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { Section } from 'twenty-ui/components';
import { IconPlayerPlay } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button, CoreEditorHeader } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
const StyledTabListContainer = styled.div`
> * {
@@ -59,8 +58,8 @@ export const SettingsLogicFunctionCodeEditorTab = ({
);
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Code your function`}
description={t`Write your function (in typescript) below`}
/>
@@ -73,6 +72,6 @@ export const SettingsLogicFunctionCodeEditorTab = ({
applicationVariableKeys={applicationVariableKeys}
/>
)}
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab.tsx
index e8e38e46dc0..17a54018d4f 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab.tsx
@@ -11,6 +11,7 @@ import {
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import {
IconClock,
IconDatabase,
@@ -19,13 +20,11 @@ import {
IconWebhook,
type IconComponent,
} from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import {
Button,
CodeEditor,
CoreEditorHeader,
} from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type TriggerButton = {
@@ -129,8 +128,8 @@ export const SettingsLogicFunctionTestTab = ({
};
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Test your function`}
description={t`Insert a JSON input, then press "Run Function".`}
/>
@@ -191,6 +190,6 @@ export const SettingsLogicFunctionTestTab = ({
</StyledCodeEditorContainer>
)}
</StyledInputsContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionTriggerSection.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionTriggerSection.tsx
index 0ca40f15a9c..fe5b6fba129 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionTriggerSection.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionTriggerSection.tsx
@@ -1,8 +1,7 @@
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
-import { H2Title } from 'twenty-ui/primitives/typography';
+import { Section } from 'twenty-ui/components';
import { Switch } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledHeader = styled.div`
@@ -38,9 +37,9 @@ export const SettingsLogicFunctionTriggerSection = ({
}
return (
- <Section>
+ <Section.Root>
<StyledHeader>
- <H2Title title={title} description={description} />
+ <Section.Header title={title} description={description} />
{!readonly && (
<Switch
aria-label={title}
@@ -51,6 +50,6 @@ export const SettingsLogicFunctionTriggerSection = ({
)}
</StyledHeader>
{enabled && children}
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetup.tsx b/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetup.tsx
index 794f1c3051c..86f853f9ce6 100644
--- a/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetup.tsx
+++ b/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetup.tsx
@@ -11,10 +11,9 @@ import {
buildMcpServerUrl,
isHttpsUrl,
} from '@/settings/mcp-and-apis/utils/mcpSetup';
+import { Section } from 'twenty-ui/components';
import { CodeEditor, CoreEditorHeader } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
const StyledMcpEditorHeaderTitle = styled.div`
@@ -58,8 +57,8 @@ export const SettingsMcpSetup = () => {
<StyledMcpSetupContainer>
{categories.map((category) => (
<Fragment key={category.title}>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={category.title}
description={category.description}
/>
@@ -68,11 +67,11 @@ export const SettingsMcpSetup = () => {
<SettingsMcpSetupCard key={card.title} card={card} />
))}
</StyledCardsGrid>
- </Section>
+ </Section.Root>
{category.showManualConfigurationAfter && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Manual configuration`}
description={t`Access your workspace data from your favorite MCP client like Claude, Codex or Cursor.`}
/>
@@ -108,7 +107,7 @@ export const SettingsMcpSetup = () => {
wordWrap: 'on',
}}
/>
- </Section>
+ </Section.Root>
)}
</Fragment>
))}
diff --git a/packages/twenty-front/src/modules/settings/members/components/MemberInfosTab.tsx b/packages/twenty-front/src/modules/settings/members/components/MemberInfosTab.tsx
index 5108c68129a..5c4a9265c66 100644
--- a/packages/twenty-front/src/modules/settings/members/components/MemberInfosTab.tsx
+++ b/packages/twenty-front/src/modules/settings/members/components/MemberInfosTab.tsx
@@ -6,9 +6,8 @@ import { MemberNameFields } from '@/settings/members/components/MemberNameFields
import { WorkspaceMemberPictureUploader } from '@/settings/workspace-member/components/WorkspaceMemberPictureUploader';
import { type WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/primitives/typography';
+import { Section } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type MemberInfosTabProps = {
@@ -43,17 +42,17 @@ export const MemberInfosTab = ({
return (
<>
- <Section>
- <H2Title title={t`Picture`} />
+ <Section.Root>
+ <Section.Header title={t`Picture`} />
<WorkspaceMemberPictureUploader
workspaceMemberId={member.id}
avatarUrl={avatarUrl}
onAvatarUpdated={setAvatarUrl}
/>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Name`}
description={t`As it will be displayed in the workspace`}
/>
@@ -73,18 +72,18 @@ export const MemberInfosTab = ({
}}
/>
</StyledNameRow>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Email`}
description={t`The email associated to this account`}
/>
<MemberEmailField email={member.userEmail} />
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Admin`}
description={t`Perform administrative actions or permanently delete this user`}
/>
@@ -103,7 +102,7 @@ export const MemberInfosTab = ({
color="danger"
>{t`Delete account`}</Button>
</StyledActionRow>
- </Section>
+ </Section.Root>
</>
);
};
diff --git a/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx b/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx
index c350e0b8758..981ed5d5f23 100644
--- a/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx
+++ b/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx
@@ -10,11 +10,10 @@ import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconArrowUpRight, IconUser, useIcons } from 'twenty-ui/icon';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { UpdateWorkspaceMemberRoleDocument } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -124,8 +123,8 @@ export const MemberPermissionsTab = ({
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Role`}
description={t`Customize what this user can view and perform`}
/>
@@ -147,7 +146,7 @@ export const MemberPermissionsTab = ({
>{t`Open in Roles`}</Button>
</StyledRoleContainer>
<SettingsRolePermissions roleId={primaryRole.id} isEditable={false} />
- </Section>
+ </Section.Root>
{pendingRole && (
<ConfirmationModal
diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
index b89a8b6fd8f..6a281d1a536 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
@@ -10,9 +10,9 @@ import { useMutation } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
DeleteUserAccountDocument,
@@ -70,7 +70,7 @@ export const DeleteAccount = () => {
return (
<>
- <H2Title
+ <Section.Header
title={t`Danger zone`}
description={
userHasMultipleWorkspaces
diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
index 9a80378ad8f..6bca1624327 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
@@ -6,8 +6,8 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useRedirectToDefaultDomain } from '@/domain-manager/hooks/useRedirectToDefaultDomain';
import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
import { useModal } from '@/ui/layout/modal/hooks/useModal';
+import { Section } from 'twenty-ui/components';
import { IconTrash } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
import { useMutation } from '@apollo/client/react';
import { AppPath } from 'twenty-shared/types';
@@ -33,7 +33,7 @@ export const DeleteWorkspace = () => {
return (
<>
- <H2Title
+ <Section.Header
title={t`Danger zone`}
description={t`Delete your whole workspace`}
/>
diff --git a/packages/twenty-front/src/modules/settings/profile/components/SetOrChangePassword.tsx b/packages/twenty-front/src/modules/settings/profile/components/SetOrChangePassword.tsx
index eea25a11e4d..715ada232d0 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/SetOrChangePassword.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/SetOrChangePassword.tsx
@@ -1,7 +1,7 @@
import { useHandleResetPassword } from '@/auth/sign-in-up/hooks/useHandleResetPassword';
import { currentUserState } from '@/auth/states/currentUserState';
import { useLingui } from '@lingui/react/macro';
-import { H2Title } from 'twenty-ui/primitives/typography';
+import { Section } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -19,7 +19,7 @@ export const SetOrChangePassword = () => {
return (
<>
- <H2Title title={heading} description={description} />
+ <Section.Header title={heading} description={description} />
<Button onClick={handleResetPassword()} variant="outline">
{heading}
</Button>
diff --git a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
index 81005f97ebb..5583d156bb1 100644
--- a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
@@ -8,12 +8,11 @@ import { SettingsListCard } from '@/settings/components/SettingsListCard';
import { SettingsDeviceSessionRowRightComponent } from '@/settings/profile/devices/components/SettingsDeviceSessionRowRightComponent';
import { parseUserAgentDescription } from '@/settings/profile/devices/utils/parseUserAgentDescription';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import { IconDeviceDesktop, IconLogout } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
import {
CurrentUserSessionsDocument,
type CurrentUserSessionsQuery,
@@ -100,8 +99,8 @@ export const SettingsProfileDevicesSection = () => {
<>
<ToastOnQueryErrorEffect error={error} />
{(loading || isNonEmptyArray(sessions)) && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Devices`}
description={t`Devices with an active session on your account`}
/>
@@ -126,7 +125,7 @@ export const SettingsProfileDevicesSection = () => {
</StyledButtonContainer>
)}
</StyledContainer>
- </Section>
+ </Section.Root>
)}
</>
);
diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesDefaultRole.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesDefaultRole.tsx
index c116588dad8..3b8b4b93807 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesDefaultRole.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesDefaultRole.tsx
@@ -8,9 +8,8 @@ import { Select } from '@/ui/input/components/Select';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconUserPin, useIcons } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
import { useMutation } from '@apollo/client/react';
import {
@@ -71,8 +70,8 @@ export const SettingsRoleDefaultRole = ({
}
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Default Role`}
description={t`Assigned to users who join via invite link, approved domain, or SSO, and used as fallback when an assigned role is deleted`}
/>
@@ -94,6 +93,6 @@ export const SettingsRoleDefaultRole = ({
/>
</SettingsOptionCardContentSelect>
</Card>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
index d4fa8b1e646..20b472eec63 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
@@ -12,6 +12,7 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
+import { Section } from 'twenty-ui/components';
import {
IconFilter,
IconKey,
@@ -19,9 +20,7 @@ import {
IconPlus,
IconSearch,
} from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { MenuItemSwitch } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -79,8 +78,8 @@ export const SettingsRolesList = () => {
});
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`All roles`}
description={t`Assign roles to specify access permissions`}
/>
@@ -145,15 +144,15 @@ export const SettingsRolesList = () => {
</StyledTableRows>
</Table>
<StyledCreateRoleSectionContainer>
- <Section>
+ <Section.Root>
<Button
startIcon={<IconPlus />}
size="sm"
onClick={() => navigateSettings(SettingsPath.RoleCreate)}
variant="outline"
>{t`Create Role`}</Button>
- </Section>
+ </Section.Root>
</StyledCreateRoleSectionContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
index c812bbb6662..991d9fd03ec 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
@@ -4,10 +4,10 @@ import { SettingsRoleAssignmentWorkspaceMemberPickerDropdown } from '@/settings/
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { styled } from '@linaria/react';
+import { Section } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type Agent, type ApiKeyForRole } from '~/generated-metadata/graphql';
import {
@@ -57,7 +57,7 @@ export const RoleAssignmentSection = ({
);
return (
- <Section>
+ <Section.Root>
<SettingsRoleAssignmentTable
roleId={roleId}
roleTargetType={roleTargetType}
@@ -110,6 +110,6 @@ export const RoleAssignmentSection = ({
}
/>
</StyledAssignToMemberContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTable.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTable.tsx
index 3c2dce08252..da47fb52bca 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTable.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTable.tsx
@@ -12,8 +12,8 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useMemo, useState } from 'react';
+import { Section } from 'twenty-ui/components';
import { IconSearch } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { type Agent, type ApiKeyForRole } from '~/generated-metadata/graphql';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
@@ -140,7 +140,7 @@ export const SettingsRoleAssignmentTable = <T extends RoleTargetType>({
return (
<>
- <H2Title
+ <Section.Header
title={t`Assigned ${roleTargetDisplayName}`}
description={t`This role is assigned to these ${roleTargetDisplayName}.`}
/>
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelObjectPicker.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelObjectPicker.tsx
index 6d7a25c448c..eb4f43642c4 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelObjectPicker.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelObjectPicker.tsx
@@ -10,9 +10,8 @@ import { t } from '@lingui/core/macro';
import { useContext, useState } from 'react';
import { useSearchParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
+import { Section } from 'twenty-ui/components';
import { IconSearch } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -104,7 +103,7 @@ export const SettingsRolePermissionsObjectLevelObjectPicker = ({
return (
<StyledTypeSelectContainer>
- <Section>
+ <Section.Root>
<StyledSearchContainer>
<StyledSearchInputContainer>
<SettingsTextInput
@@ -118,11 +117,11 @@ export const SettingsRolePermissionsObjectLevelObjectPicker = ({
/>
</StyledSearchInputContainer>
</StyledSearchContainer>
- </Section>
+ </Section.Root>
{standardObjects.length > 0 && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Standard`}
description={t`All the standard objects`}
/>
@@ -147,11 +146,14 @@ export const SettingsRolePermissionsObjectLevelObjectPicker = ({
</StyledCardContainer>
))}
</StyledContainer>
- </Section>
+ </Section.Root>
)}
{customObjects.length > 0 && (
- <Section>
- <H2Title title={t`Custom`} description={t`All your custom objects`} />
+ <Section.Root>
+ <Section.Header
+ title={t`Custom`}
+ description={t`All your custom objects`}
+ />
<StyledContainer>
{customObjects.map((objectMetadataItem) => (
<StyledCardContainer
@@ -173,7 +175,7 @@ export const SettingsRolePermissionsObjectLevelObjectPicker = ({
</StyledCardContainer>
))}
</StyledContainer>
- </Section>
+ </Section.Root>
)}
</StyledTypeSelectContainer>
);
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSection.tsx
index 3eff9df3626..c937b9ada14 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSection.tsx
@@ -12,9 +12,9 @@ import { t } from '@lingui/core/macro';
import { useMemo } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -109,7 +109,7 @@ export const SettingsRolePermissionsObjectLevelSection = ({
objectMetadataItemsWithPermissionOverride?.length > 0;
return (
- <Section>
+ <Section.Root>
<Table>
<SettingsRolePermissionsObjectLevelTableHeader
showPermissionsLabel={hasObjectPermissions}
@@ -136,7 +136,7 @@ export const SettingsRolePermissionsObjectLevelSection = ({
</Table>
{isEditable && (
<StyledCreateObjectOverrideSectionContainer>
- <Section>
+ <Section.Root>
<Button
startIcon={<IconPlus />}
size="sm"
@@ -146,9 +146,9 @@ export const SettingsRolePermissionsObjectLevelSection = ({
onClick={handleAddRule}
variant="outline"
>{t`Add rule`}</Button>
- </Section>
+ </Section.Root>
</StyledCreateObjectOverrideSectionContainer>
)}
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsx
index a435a6f9662..165dd615627 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsx
@@ -20,9 +20,8 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { isNonEmptyArray } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconSearch } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { sortByProperty } from '~/utils/array/sortByProperty';
@@ -91,8 +90,8 @@ export const SettingsRolePermissionsObjectLevelObjectFieldPermissionTable = ({
cannotAllowFieldReadRestrict && cannotAllowFieldUpdateRestrict;
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Fields Permissions`}
description={t`Ability to interact with this object's fields.`}
/>
@@ -151,6 +150,6 @@ export const SettingsRolePermissionsObjectLevelObjectFieldPermissionTable = ({
/>
))}
</Table>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectFormObjectLevel.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectFormObjectLevel.tsx
index cfbc7c7df50..8c0dced3bca 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectFormObjectLevel.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectFormObjectLevel.tsx
@@ -6,8 +6,7 @@ import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDr
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledTable = styled.div`
@@ -65,8 +64,8 @@ export const SettingsRolePermissionsObjectLevelObjectFormObjectLevel = ({
];
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Object-Level`}
description={t`Actions users can perform on this object`}
/>
@@ -87,6 +86,6 @@ export const SettingsRolePermissionsObjectLevelObjectFormObjectLevel = ({
))}
</StyledTableRows>
</StyledTable>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx
index c4c12b8f540..55901953d0d 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx
@@ -2,9 +2,8 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { Section } from 'twenty-ui/components';
import { IconArrowUp, IconLock } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
import { billingState } from '@/client-config/states/billingState';
@@ -44,8 +43,8 @@ export const SettingsRolePermissionsObjectLevelRecordLevelSection = ({
if (!hasOrganizationPlan) {
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Record-level`}
description={t`Ability to filter the records a user can interact with`}
adornment={<OrganizationAdornment />}
@@ -74,13 +73,13 @@ export const SettingsRolePermissionsObjectLevelRecordLevelSection = ({
/>
</Card>
</StyledCardContainer>
- </Section>
+ </Section.Root>
);
}
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Record-level`}
description={t`Ability to filter the records a user can interact with.`}
/>
@@ -90,6 +89,6 @@ export const SettingsRolePermissionsObjectLevelRecordLevelSection = ({
objectMetadataItem={objectMetadataItem}
/>
</StyledContent>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/components/SettingsRolePermissionsObjectsSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/components/SettingsRolePermissionsObjectsSection.tsx
index 1a00602aae2..14c8c6aa77f 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/components/SettingsRolePermissionsObjectsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/components/SettingsRolePermissionsObjectsSection.tsx
@@ -6,8 +6,7 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAto
import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledTable = styled.div`
@@ -157,8 +156,8 @@ export const SettingsRolePermissionsObjectsSection = ({
];
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Objects`}
description={t`Objects and fields permissions settings`}
/>
@@ -178,6 +177,6 @@ export const SettingsRolePermissionsObjectsSection = ({
))}
</StyledTableRows>
</StyledTable>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsSettingsSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsSettingsSection.tsx
index 171bca440e6..4f2b6d6154c 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsSettingsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsSettingsSection.tsx
@@ -7,12 +7,9 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAto
import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { Section } from 'twenty-ui/components';
import { IconSettings } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import {
- AnimatedExpandableContainer,
- Section,
-} from 'twenty-ui/primitives/layout';
+import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -60,8 +57,11 @@ export const SettingsRolePermissionsSettingsSection = ({
settingsDraftRole.canBeAssignedToUsers;
return (
- <Section>
- <H2Title title={t`Settings`} description={t`Settings permissions`} />
+ <Section.Root>
+ <Section.Header
+ title={t`Settings`}
+ description={t`Settings permissions`}
+ />
{shouldShowAllAccessToggle && (
<StyledCardContainer>
<Card rounded>
@@ -111,6 +111,6 @@ export const SettingsRolePermissionsSettingsSection = ({
</StyledTableRows>
</StyledTable>
</AnimatedExpandableContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsToolSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsToolSection.tsx
index 3abb38c647b..5ba3fd2fb59 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsToolSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/permission-flags/components/SettingsRolePermissionsToolSection.tsx
@@ -8,12 +8,9 @@ import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAt
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { Section } from 'twenty-ui/components';
import { IconTool } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import {
- AnimatedExpandableContainer,
- Section,
-} from 'twenty-ui/primitives/layout';
+import { AnimatedExpandableContainer } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -61,8 +58,8 @@ export const SettingsRolePermissionsToolSection = ({
settingsDraftRole.canBeAssignedToUsers;
return (
- <Section>
- <H2Title title={t`Actions`} description={t`Actions permissions`} />
+ <Section.Root>
+ <Section.Header title={t`Actions`} description={t`Actions permissions`} />
{shouldShowAllAccessToggle && (
<StyledCardContainer>
<Card rounded>
@@ -112,6 +109,6 @@ export const SettingsRolePermissionsToolSection = ({
</StyledTableRows>
</StyledTable>
</AnimatedExpandableContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleApplicability.tsx b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleApplicability.tsx
index a89afa3220e..5f911d5a8f1 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleApplicability.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleApplicability.tsx
@@ -1,10 +1,9 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { Section } from 'twenty-ui/components';
import { IconKey, IconLego, IconUsers } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Checkbox } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
@@ -69,8 +68,8 @@ export const SettingsRoleApplicability = ({
},
];
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Applicability`}
description={t`Control which types of entities this role can be assigned to`}
/>
@@ -100,6 +99,6 @@ export const SettingsRoleApplicability = ({
</StyledCheckboxContainer>
))}
</div>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx
index 32648326716..3838591fc35 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx
@@ -11,9 +11,8 @@ import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAt
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { TextArea } from '@/ui/input/components/TextArea';
import { useModal } from '@/ui/layout/modal/hooks/useModal';
-import { H2Title } from 'twenty-ui/primitives/typography';
+import { Section } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledInputsContainer = styled.div`
@@ -55,7 +54,7 @@ export const SettingsRoleSettings = ({
return (
<>
- <Section>
+ <Section.Root>
<StyledInputsContainer>
<StyledInputContainer>
<IconPicker
@@ -98,7 +97,7 @@ export const SettingsRoleSettings = ({
}}
disabled={!isEditable}
/>
- </Section>
+ </Section.Root>
<SettingsRoleApplicability
values={{
@@ -117,8 +116,8 @@ export const SettingsRoleSettings = ({
{!isCreateMode && (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Danger zone`}
description={t`Delete this role and assign a new role to its members`}
/>
@@ -131,7 +130,7 @@ export const SettingsRoleSettings = ({
variant="outline"
color="danger"
>{t`Delete role`}</Button>
- </Section>
+ </Section.Root>
<SettingsRoleSettingsDeleteRoleConfirmationModal roleId={roleId} />
</>
)}
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx
index ccded8af01a..0ca5fe02b3f 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx
@@ -19,10 +19,9 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useMutation } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
+import { Section } from 'twenty-ui/components';
import { IconClockHour8, IconHistory, IconTrash } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebouncedCallback } from 'use-debounce';
import { UpdateWorkspaceDocument } from '~/generated-metadata/graphql';
@@ -149,57 +148,57 @@ export const SettingsSecuritySettings = () => {
<SettingsRolesQueryEffect />
<StyledMainContent>
<StyledSectionContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`SSO`}
description={t`Configure an SSO connection`}
adornment={<OrganizationAdornment />}
/>
<SettingsSsoIdentitiesProvidersListCard />
- </Section>
+ </Section.Root>
</StyledSectionContainer>
- <Section>
+ <Section.Root>
<StyledContainer>
- <H2Title
+ <Section.Header
title={t`Authentication`}
description={t`Customize your workspace security`}
/>
<SettingsSecurityAuthProvidersOptionsList />
</StyledContainer>
- </Section>
- <Section>
+ </Section.Root>
+ <Section.Root>
<StyledContainer>
- <H2Title
+ <Section.Header
title={t`Editable Profile Fields`}
description={t`Choose which profile fields users with the Edit Profile permission can modify`}
/>
<SettingsSecurityEditableProfileFields />
</StyledContainer>
- </Section>
+ </Section.Root>
<SettingsRoleDefaultRole roles={roles} />
{shouldShowBypassSection && (
- <Section>
+ <Section.Root>
<StyledContainer>
- <H2Title
+ <Section.Header
title={t`SSO Bypass`}
description={t`Configure fallback login methods for users with SSO bypass permissions`}
/>
<SettingsSecurityAuthBypassOptionsList />
</StyledContainer>
- </Section>
+ </Section.Root>
)}
{isMultiWorkspaceEnabled && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Support`}
description={t`Manage support access settings`}
/>
<ImpersonationSwitch />
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Audit Logs`}
description={t`Configure how long audit logs are retained`}
adornment={<OrganizationAdornment />}
@@ -232,9 +231,12 @@ export const SettingsSecuritySettings = () => {
buttonTitle={t`Activate`}
/>
)}
- </Section>
- <Section>
- <H2Title title={t`Other`} description={t`Other security settings`} />
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
+ title={t`Other`}
+ description={t`Other security settings`}
+ />
<Card rounded>
<SettingsOptionCardContentCounter
Icon={IconTrash}
@@ -246,7 +248,7 @@ export const SettingsSecuritySettings = () => {
showButtons={false}
/>
</Card>
- </Section>
+ </Section.Root>
</StyledMainContent>
</>
);
diff --git a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersForm.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersForm.tsx
index 7f6154fd7ce..d26be04c7a6 100644
--- a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersForm.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoIdentitiesProvidersForm.tsx
@@ -10,9 +10,8 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type ReactElement, useMemo } from 'react';
import { Controller, useFormContext } from 'react-hook-form';
+import { Section } from 'twenty-ui/components';
import { type IconComponent, IconKey } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { IdentityProviderType } from '~/generated-metadata/graphql';
@@ -82,8 +81,11 @@ export const SettingsSsoIdentitiesProvidersForm = () => {
return (
<SettingsPageContainer>
- <Section>
- <H2Title title={t`Name`} description={t`The name of your connection`} />
+ <Section.Root>
+ <Section.Header
+ title={t`Name`}
+ description={t`The name of your connection`}
+ />
<StyledInputsContainer>
<Controller
name="name"
@@ -101,9 +103,9 @@ export const SettingsSsoIdentitiesProvidersForm = () => {
)}
/>
</StyledInputsContainer>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Type`}
description={t`Choose between OIDC and SAML protocols`}
/>
@@ -122,7 +124,7 @@ export const SettingsSsoIdentitiesProvidersForm = () => {
)}
/>
</StyledInputsContainer>
- </Section>
+ </Section.Root>
{formByType}
</SettingsPageContainer>
);
diff --git a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoOidcForm.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoOidcForm.tsx
index f0090b07790..4ccac92e3c5 100644
--- a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoOidcForm.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoOidcForm.tsx
@@ -4,10 +4,9 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { Controller, useFormContext } from 'react-hook-form';
+import { Section } from 'twenty-ui/components';
import { IconCopy } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
@@ -45,8 +44,8 @@ export const SettingsSsoOidcForm = () => {
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Client Settings`}
description={t`Provide your OIDC provider details`}
/>
@@ -98,9 +97,9 @@ export const SettingsSsoOidcForm = () => {
</StyledButtonCopy>
</StyledContainer>
</StyledInputsContainer>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Identity Provider`}
description={t`Enter the credentials to set the connection`}
/>
@@ -152,7 +151,7 @@ export const SettingsSsoOidcForm = () => {
)}
/>
</StyledInputsContainer>
- </Section>
+ </Section.Root>
</>
);
};
diff --git a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx
index 434764109c9..35e9e8e1f3a 100644
--- a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx
@@ -5,10 +5,10 @@ import { useLingui } from '@lingui/react/macro';
import { type ChangeEvent, useContext, useRef } from 'react';
import { useFormContext } from 'react-hook-form';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconCheck, IconCopy, IconDownload, IconUpload } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { HorizontalSeparator, Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
+import { HorizontalSeparator } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
@@ -118,8 +118,8 @@ export const SettingsSsoSamlForm = () => {
};
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Identity Provider Metadata XML`}
description={t`Upload the XML file with your connection infos`}
/>
@@ -143,9 +143,9 @@ export const SettingsSsoSamlForm = () => {
/>
)}
</StyledUploadFileContainer>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Service Provider Details`}
description={t`Enter the infos to set the connection`}
/>
@@ -199,7 +199,7 @@ export const SettingsSsoSamlForm = () => {
</StyledButtonCopy>
</StyledContainer>
</StyledInputsContainer>
- </Section>
+ </Section.Root>
</>
);
};
diff --git a/packages/twenty-front/src/modules/settings/translations/components/SidePanelSettingsMetadataTranslationsPage.tsx b/packages/twenty-front/src/modules/settings/translations/components/SidePanelSettingsMetadataTranslationsPage.tsx
index d1f7c31cfd0..75cbd8de1b7 100644
--- a/packages/twenty-front/src/modules/settings/translations/components/SidePanelSettingsMetadataTranslationsPage.tsx
+++ b/packages/twenty-front/src/modules/settings/translations/components/SidePanelSettingsMetadataTranslationsPage.tsx
@@ -15,10 +15,10 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconRestore } from 'twenty-ui/icon';
import { LightIconButton } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { MetadataTranslationProvenance } from '~/generated-metadata/graphql';
const TRANSLATIONS_ROW_GRID_TEMPLATE_COLUMNS = '112px 1fr 24px';
@@ -107,7 +107,7 @@ export const SidePanelSettingsMetadataTranslationsPage = () => {
return (
<StyledPropertySection key={property}>
- <H2Title
+ <Section.Header
title={labelByProperty[property] ?? property}
description={t`Source: ${canonicalValue}`}
/>
diff --git a/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx b/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
index 0a1efcb659a..16e3a53d4de 100644
--- a/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
+++ b/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
@@ -11,9 +11,9 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { DeleteTwoFactorAuthenticationMethodDocument } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -83,7 +83,7 @@ export const DeleteTwoFactorAuthentication = () => {
return (
<>
- <H2Title
+ <Section.Header
title={t`Delete Two-Factor Authentication Method`}
description={t`Deleting this method will remove it permanently from your account.`}
/>
diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribePreview.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribePreview.tsx
index db94d9fa701..7056e19821e 100644
--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribePreview.tsx
+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribePreview.tsx
@@ -2,10 +2,10 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useUnsubscribeTopics } from '@/activities/emails/hooks/useUnsubscribeTopics';
+import { Section } from 'twenty-ui/components';
import { Button, Checkbox } from 'twenty-ui/primitives/input';
-import { HorizontalSeparator, Section } from 'twenty-ui/primitives/layout';
+import { HorizontalSeparator } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { UnsubscribeTopicVisibility } from '~/generated-metadata/graphql';
@@ -63,8 +63,8 @@ export const SettingsUnsubscribePreview = () => {
const hasPublicTopics = publicTopics.length > 0;
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Unsubscribe page`}
description={
hasPublicTopics
@@ -76,7 +76,7 @@ export const SettingsUnsubscribePreview = () => {
{!loading && (
<StyledCard rounded>
<StyledHeader>
- <H2Title
+ <Section.Header
title={t`Do you want to unsubscribe?`}
description={
hasPublicTopics
@@ -120,6 +120,6 @@ export const SettingsUnsubscribePreview = () => {
</StyledCard>
)}
</StyledViewport>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx b/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx
index 75da7e2ec5d..e8d9c49fd7e 100644
--- a/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx
@@ -11,9 +11,8 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconSparkles } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { SETTINGS_AI_TABS } from '~/pages/settings/ai/constants/SettingsAiTabs';
export const SettingsUsageAnalyticsSection = () => {
@@ -25,8 +24,8 @@ export const SettingsUsageAnalyticsSection = () => {
if (!isClickHouseConfigured) {
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Usage Analytics`}
description={t`Credit usage breakdown for your workspace.`}
/>
@@ -36,7 +35,7 @@ export const SettingsUsageAnalyticsSection = () => {
value={t`Usage analytics requires ClickHouse. Contact your administrator.`}
/>
</SubscriptionInfoContainer>
- </Section>
+ </Section.Root>
);
}
@@ -52,8 +51,8 @@ export const SettingsUsageAnalyticsSection = () => {
if (!hasData) {
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Usage Analytics`}
description={t`Credit usage breakdown for your workspace.`}
/>
@@ -63,7 +62,7 @@ export const SettingsUsageAnalyticsSection = () => {
value={t`Usage analytics will appear here once you start using credits.`}
/>
</SubscriptionInfoContainer>
- </Section>
+ </Section.Root>
);
}
@@ -95,13 +94,13 @@ export const SettingsUsageAnalyticsSection = () => {
}
showAvatar
/>
- <Section>
+ <Section.Root>
<NavigationButton
to={`${getSettingsPath(SettingsPath.AI)}#${SETTINGS_AI_TABS.TABS_IDS.USAGE}`}
startIcon={<IconSparkles />}
variant="outline"
>{t`View AI usage breakdown`}</NavigationButton>
- </Section>
+ </Section.Root>
</>
);
};
diff --git a/packages/twenty-front/src/modules/settings/usage/components/UsageBreakdownPieSection.tsx b/packages/twenty-front/src/modules/settings/usage/components/UsageBreakdownPieSection.tsx
index 9f490c92640..992e56527f5 100644
--- a/packages/twenty-front/src/modules/settings/usage/components/UsageBreakdownPieSection.tsx
+++ b/packages/twenty-front/src/modules/settings/usage/components/UsageBreakdownPieSection.tsx
@@ -10,8 +10,7 @@ import { Select } from '@/ui/input/components/Select';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { type UsageOperationType } from '~/generated-metadata/graphql';
@@ -96,8 +95,8 @@ export const UsageBreakdownPieSection = ({
const resolvedDescription = description ?? formatUsageValue(total);
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={title}
description={resolvedDescription}
adornment={
@@ -114,6 +113,6 @@ export const UsageBreakdownPieSection = ({
<SubscriptionInfoContainer>
<UsagePieChart data={pieData} />
</SubscriptionInfoContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/usage/components/UsageByUserTableSection.tsx b/packages/twenty-front/src/modules/settings/usage/components/UsageByUserTableSection.tsx
index 8164064060b..5d90f1f51e7 100644
--- a/packages/twenty-front/src/modules/settings/usage/components/UsageByUserTableSection.tsx
+++ b/packages/twenty-front/src/modules/settings/usage/components/UsageByUserTableSection.tsx
@@ -9,11 +9,10 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext, useState } from 'react';
+import { Section } from 'twenty-ui/components';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { IconChevronRight } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { SearchInput } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { type UsageOperationType } from '~/generated-metadata/graphql';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
@@ -77,8 +76,8 @@ export const UsageByUserTableSection = ({
});
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={title}
description={description}
adornment={
@@ -139,6 +138,6 @@ export const UsageByUserTableSection = ({
</TableRow>
))}
</Table>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/usage/components/UsageDailyChartSection.tsx b/packages/twenty-front/src/modules/settings/usage/components/UsageDailyChartSection.tsx
index e59eef61aff..48e2df57073 100644
--- a/packages/twenty-front/src/modules/settings/usage/components/UsageDailyChartSection.tsx
+++ b/packages/twenty-front/src/modules/settings/usage/components/UsageDailyChartSection.tsx
@@ -7,10 +7,9 @@ import { useUsageAnalyticsData } from '@/settings/usage/hooks/useUsageAnalyticsD
import { useUsageValueFormatter } from '@/settings/usage/hooks/useUsageValueFormatter';
import { Select } from '@/ui/input/components/Select';
import { styled } from '@linaria/react';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { type UsageOperationType } from '~/generated-metadata/graphql';
import { formatDate } from '~/utils/date-utils';
+import { Section } from 'twenty-ui/components';
const StyledLineChartContainer = styled.div`
height: 200px;
@@ -73,8 +72,8 @@ export const UsageDailyChartSection = ({
];
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={title}
description={description}
adornment={
@@ -105,6 +104,6 @@ export const UsageDailyChartSection = ({
</WidgetComponentInstanceContext.Provider>
</StyledLineChartContainer>
</SubscriptionInfoContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/usage/components/UsageSectionSkeleton.tsx b/packages/twenty-front/src/modules/settings/usage/components/UsageSectionSkeleton.tsx
index 8563e741053..1cab1960cfa 100644
--- a/packages/twenty-front/src/modules/settings/usage/components/UsageSectionSkeleton.tsx
+++ b/packages/twenty-front/src/modules/settings/usage/components/UsageSectionSkeleton.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { ThemeContext } from 'twenty-ui/theme-constants';
export const UsageSectionSkeleton = () => {
@@ -13,7 +13,7 @@ export const UsageSectionSkeleton = () => {
highlightColor={theme.background.transparent.lighter}
borderRadius={4}
>
- <Section>
+ <Section.Root>
<Skeleton width={160} height={16} />
<Skeleton
width="100%"
@@ -21,7 +21,7 @@ export const UsageSectionSkeleton = () => {
borderRadius={8}
style={{ marginTop: 16 }}
/>
- </Section>
+ </Section.Root>
</SkeletonTheme>
);
};
diff --git a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceBlocklistSection.tsx b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceBlocklistSection.tsx
index acf4f3fb7a2..2480aa410a5 100644
--- a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceBlocklistSection.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceBlocklistSection.tsx
@@ -6,8 +6,7 @@ import { SettingsAccountsBlocklistInput } from '@/settings/accounts/components/S
import { SettingsAccountsBlocklistTable } from '@/settings/accounts/components/SettingsAccountsBlocklistTable';
import { useLingui } from '@lingui/react/macro';
import { BlocklistScope, CoreObjectNameSingular } from 'twenty-shared/types';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
+import { Section } from 'twenty-ui/components';
export const SettingsWorkspaceBlocklistSection = () => {
const { t } = useLingui();
@@ -42,8 +41,8 @@ export const SettingsWorkspaceBlocklistSection = () => {
};
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Blocklist`}
description={t`Exclude the following people and domains from the email and calendar sync of every workspace member`}
/>
@@ -55,6 +54,6 @@ export const SettingsWorkspaceBlocklistSection = () => {
blocklist={workspaceBlocklist}
handleBlockedEmailRemove={handleBlockedEmailRemove}
/>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailSyncSection.tsx b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailSyncSection.tsx
index d27cf825b3b..16a7374dae9 100644
--- a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailSyncSection.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailSyncSection.tsx
@@ -5,11 +5,10 @@ import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useMutation } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import { IconMail } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { UpdateWorkspaceDocument } from '~/generated-metadata/graphql';
export const SettingsWorkspaceEmailSyncSection = () => {
@@ -47,8 +46,8 @@ export const SettingsWorkspaceEmailSyncSection = () => {
};
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Sync`}
description={t`Control what the workspace imports from connected mailboxes and calendars`}
/>
@@ -62,6 +61,6 @@ export const SettingsWorkspaceEmailSyncSection = () => {
advancedMode
/>
</Card>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
index 20042b88a60..c478a330c7d 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
@@ -10,18 +10,10 @@ import { ModalStatefulWrapper } from '@/ui/layout/modal/components/ModalStateful
import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
-import { H1Title, H1TitleFontColor } from 'twenty-ui/primitives/typography';
-import {
- Section,
- SectionAlignment,
- SectionFontColor,
-} from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
+import { Dialog } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-const StyledCenteredTitle = styled.div`
- text-align: center;
-`;
-
const StyledSectionContainer = styled.div`
margin-bottom: ${themeCssVariables.spacing[6]};
`;
@@ -93,19 +85,14 @@ export const ConfirmationModal = ({
narrowWidth
autoHeight
>
- <StyledCenteredTitle>
- <H1Title title={title} fontColor={H1TitleFontColor.Primary} />
- </StyledCenteredTitle>
+ <Dialog.Title>{title}</Dialog.Title>
<StyledSectionContainer>
- <Section
- alignment={SectionAlignment.Center}
- fontColor={SectionFontColor.Primary}
- >
+ <Section.Root align="center" color="primary">
{subtitle}
- </Section>
+ </Section.Root>
</StyledSectionContainer>
{confirmationValue && (
- <Section>
+ <Section.Root>
<SettingsTextInput
instanceId="confirmation-modal-input"
dataTestId="confirmation-modal-input"
@@ -116,7 +103,7 @@ export const ConfirmationModal = ({
disableHotkeys
key={'input-' + confirmationValue}
/>
- </Section>
+ </Section.Root>
)}
{!hideCancelButton && (
<StyledCenteredButton
diff --git a/packages/twenty-front/src/pages/auth/Authorize.tsx b/packages/twenty-front/src/pages/auth/Authorize.tsx
index 5816ef48f3d..60f17268aad 100644
--- a/packages/twenty-front/src/pages/auth/Authorize.tsx
+++ b/packages/twenty-front/src/pages/auth/Authorize.tsx
@@ -16,7 +16,7 @@ import {
IconDatabase,
IconUserCircle,
} from 'twenty-ui/icon';
-import { H1Title, H1TitleFontColor } from 'twenty-ui/primitives/typography';
+import { Heading } from 'twenty-ui/primitives/typography';
import { ModalContent } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import {
@@ -57,7 +57,7 @@ const StyledHeader = styled.div`
width: 100%;
`;
-const StyledOAuthTitle = styled(H1Title)`
+const StyledOAuthTitle = styled(Heading)`
margin: 0;
max-width: min(100%, var(--oauth-modal-content-max-width));
padding-bottom: ${themeCssVariables.spacing[1]};
@@ -247,10 +247,9 @@ export const Authorize = () => {
<ModalContent isVerticallyCentered isHorizontallyCentered>
<StyledCardWrapper>
<ModalContent contentPadding={10}>
- <StyledOAuthTitle
- title={<Trans>Something went wrong</Trans>}
- fontColor={H1TitleFontColor.Primary}
- />
+ <StyledOAuthTitle level={2} size="lg">
+ <Trans>Something went wrong</Trans>
+ </StyledOAuthTitle>
<StyledErrorText>
{t`Unable to load application details. Please try again later.`}
</StyledErrorText>
@@ -275,10 +274,9 @@ export const Authorize = () => {
<AppConnectionHeader appLogoUrl={appLogoUrl} appName={appName} />
</StyledHeader>
<ModalContent contentPadding={10}>
- <StyledOAuthTitle
- title={<Trans>Connect {appName} to your account</Trans>}
- fontColor={H1TitleFontColor.Primary}
- />
+ <StyledOAuthTitle level={2} size="lg">
+ <Trans>Connect {appName} to your account</Trans>
+ </StyledOAuthTitle>
{requestedScopes.length > 0 && (
<StyledPermissionSection>
<StyledPermissionIntro>
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
index 6dccb4c9995..25e89e28f88 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
@@ -8,8 +8,7 @@ import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLay
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
export const SettingsAccounts = () => {
const { t } = useLingui();
@@ -32,15 +31,15 @@ export const SettingsAccounts = () => {
<SettingsSectionSkeletonLoader />
) : (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Connected accounts`}
description={t`Manage your internet accounts.`}
/>
<SettingsAccountsConnectedAccountsListCard
accounts={allAccounts}
/>
- </Section>
+ </Section.Root>
<SettingsAccountsBlocklistSection />
<SettingsAccountsSettingsSection />
</>
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
index 204294d7378..76d4d75974a 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
@@ -10,7 +10,7 @@ import { useLingui } from '@lingui/react/macro';
import { useMemo } from 'react';
import { CalendarChannelSyncStage, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
export const SettingsAccountsCalendars = () => {
const { t } = useLingui();
@@ -41,11 +41,11 @@ export const SettingsAccountsCalendars = () => {
}
return (
- <Section>
+ <Section.Root>
<SettingsAccountsCalendarChannelsContainer
calendarChannels={calendarChannels}
/>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
index 018bcd3e2a0..ae501ccaf0a 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
@@ -14,7 +14,7 @@ import {
SettingsPath,
} from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
export const SettingsAccountsEmails = () => {
const { t } = useLingui();
@@ -50,11 +50,11 @@ export const SettingsAccountsEmails = () => {
}
return (
- <Section>
+ <Section.Root>
<SettingsAccountsMessageChannelsContainer
messageChannels={messageChannels}
/>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
index c53462952d3..011b8358569 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
@@ -23,6 +23,7 @@ import { useMemo, useState } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import {
type IconComponent,
IconFlag,
@@ -35,9 +36,7 @@ import {
IconWorld,
} from 'twenty-ui/icon';
import { Button, SearchInput } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { RoundedLink } from 'twenty-ui/primitives/navigation';
-import { H2Title } from 'twenty-ui/primitives/typography';
import {
type AdminAiModelConfig,
SetAdminAiModelEnabledDocument,
@@ -320,8 +319,8 @@ export const SettingsAdminAiProviderDetail = () => {
]}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={provider?.label ?? providerName ?? ''}
description={provider?.npm ?? ''}
/>
@@ -333,10 +332,10 @@ export const SettingsAdminAiProviderDetail = () => {
gridAutoColumns="120px 1fr"
/>
)}
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Models`}
description={
isCustomProvider
@@ -403,11 +402,11 @@ export const SettingsAdminAiProviderDetail = () => {
variant="outline"
>{t`Add Model`}</NavigationButton>
)}
- </Section>
+ </Section.Root>
{isCustomProvider && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Danger zone`}
description={t`Remove this provider and disconnect all its models`}
/>
@@ -417,7 +416,7 @@ export const SettingsAdminAiProviderDetail = () => {
variant="outline"
color="danger"
>{t`Remove provider`}</Button>
- </Section>
+ </Section.Root>
)}
</SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationClaims.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationClaims.tsx
index 5fb63397297..c024f97dcb5 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationClaims.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationClaims.tsx
@@ -1,3 +1,4 @@
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
import { Table } from '@/ui/layout/table/components/Table';
@@ -8,8 +9,6 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
import { useQuery } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { Tag } from 'twenty-ui/primitives/data-display';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { FindAdminApplicationRegistrationClaimsDocument } from '~/generated-admin/graphql';
const CLAIMS_TABLE_GRID = '1fr 140px';
@@ -34,8 +33,8 @@ export const SettingsAdminApplicationRegistrationClaims = ({
}
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Ownership`}
description={t`The workspace that claimed this app registration`}
/>
@@ -63,6 +62,6 @@ export const SettingsAdminApplicationRegistrationClaims = ({
))}
</TableBody>
</Table>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
index f607265e332..3a2e66aae34 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
@@ -9,20 +9,11 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconShare, IconTrash, IconUserPlus } from 'twenty-ui/icon';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import {
- Section,
- SectionAlignment,
- SectionFontColor,
-} from 'twenty-ui/primitives/layout';
-import { Tooltip } from 'twenty-ui/primitives/surfaces';
-import {
- H1Title,
- H1TitleFontColor,
- H2Title,
-} from 'twenty-ui/primitives/typography';
+import { Dialog, Tooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
type ApplicationRegistration,
@@ -37,7 +28,6 @@ import {
StyledAppModal,
StyledAppModalButton,
StyledAppModalSection,
- StyledAppModalTitle,
} from '~/pages/settings/applications/components/SettingsAppModalLayout';
const DELETE_REGISTRATION_MODAL_ID = 'delete-application-registration-modal';
@@ -202,8 +192,8 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Danger zone`}
description={t`Delete or transfer this app registration`}
/>
@@ -245,7 +235,7 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({
>{t`Transfer ownership`}</Button>
)}
</StyledDangerButtonGroup>
- </Section>
+ </Section.Root>
<ConfirmationModal
confirmationPlaceholder={confirmationValue}
@@ -286,19 +276,11 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({
padding="large"
dataGloballyPreventClickOutside
>
- <StyledAppModalTitle>
- <H1Title
- title={t`Transfer ownership`}
- fontColor={H1TitleFontColor.Primary}
- />
- </StyledAppModalTitle>
- <StyledAppModalSection
- alignment={SectionAlignment.Center}
- fontColor={SectionFontColor.Primary}
- >
+ <Dialog.Title>{t`Transfer ownership`}</Dialog.Title>
+ <StyledAppModalSection align="center" color="primary">
{t`Enter the workspace subdomain to transfer this app to. You will lose access to manage it.`}
</StyledAppModalSection>
- <Section>
+ <Section.Root>
<SettingsTextInput
instanceId="transfer-ownership-subdomain"
value={transferSubdomain}
@@ -309,7 +291,7 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({
label={t`Target workspace subdomain`}
autoFocusOnMount
/>
- </Section>
+ </Section.Root>
<StyledAppModalButton
onClick={() => {
closeModal(TRANSFER_OWNERSHIP_MODAL_ID);
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationGeneralSwitches.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationGeneralSwitches.tsx
index 76c4bcdc5e2..9b25e83587e 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationGeneralSwitches.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationGeneralSwitches.tsx
@@ -1,8 +1,7 @@
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { Card } from 'twenty-ui/primitives/surfaces';
import { SettingsOptionCardContentSwitch } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSwitch';
import { IconArrowBarToDown, IconPinned, IconShield } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { type ApplicationRegistration } from '~/generated-metadata/graphql';
import { UpdateAdminApplicationRegistrationDocument } from '~/generated-admin/graphql';
import { styled } from '@linaria/react';
@@ -31,8 +30,8 @@ export const SettingsAdminApplicationRegistrationGeneralSwitches = ({
);
return (
- <Section>
- <H2Title title={t`Installation`} />
+ <Section.Root>
+ <Section.Header title={t`Installation`} />
<StyledSwitchContainer>
<Card rounded fullWidth>
<SettingsOptionCardContentSwitch
@@ -89,6 +88,6 @@ export const SettingsAdminApplicationRegistrationGeneralSwitches = ({
/>
</Card>
</StyledSwitchContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminChats.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminChats.tsx
index 208c4e3d74b..548f11a4ce1 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminChats.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminChats.tsx
@@ -4,11 +4,10 @@ import { type ReactNode } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconDotsVertical } from 'twenty-ui/icon';
import { Button, SearchInput } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { AI_ADMIN_PATH } from '@/settings/admin-panel/ai/constants/AiAdminPath';
import { SettingsAdminChatsContent } from '@/settings/admin-panel/chats/components/SettingsAdminChatsContent';
@@ -55,8 +54,8 @@ export const SettingsAdminChats = () => {
]}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Chats`}
description={t`Browse AI chat threads across all workspaces (${totalCount} matching)`}
/>
@@ -88,7 +87,7 @@ export const SettingsAdminChats = () => {
>{t`Show more`}</Button>
</StyledShowMoreContainer>
)}
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminIndicatorHealthStatus.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminIndicatorHealthStatus.tsx
index 23a18c1deff..3d1d6279ed4 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminIndicatorHealthStatus.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminIndicatorHealthStatus.tsx
@@ -10,8 +10,8 @@ import { useLingui } from '@lingui/react/macro';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title, H3Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
+import { Heading } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useQuery } from '@apollo/client/react';
import {
@@ -25,6 +25,10 @@ const StyledTitleContainer = styled.div`
display: flex;
gap: ${themeCssVariables.spacing[4]};
margin-top: ${themeCssVariables.spacing[2]};
+
+ h3 {
+ line-height: inherit;
+ }
`;
export const SettingsAdminIndicatorHealthStatus = () => {
@@ -76,27 +80,29 @@ export const SettingsAdminIndicatorHealthStatus = () => {
},
}}
>
- <Section>
+ <Section.Root>
<StyledTitleContainer>
- <H3Title title={data?.getIndicatorHealthStatus?.label} />
+ <Heading level={3} size="lg">
+ {data?.getIndicatorHealthStatus?.label}
+ </Heading>
{data?.getIndicatorHealthStatus?.status && (
<SettingsAdminHealthStatusRightContainer
status={data?.getIndicatorHealthStatus.status}
/>
)}
</StyledTitleContainer>
- </Section>
- <Section>
+ </Section.Root>
+ <Section.Root>
{data?.getIndicatorHealthStatus?.id !== HealthIndicatorId.worker &&
data?.getIndicatorHealthStatus?.id !==
HealthIndicatorId.connectedAccount && (
- <H2Title
+ <Section.Header
title={t`Status`}
description={data?.getIndicatorHealthStatus?.description}
/>
)}
<SettingsAdminIndicatorHealthStatusContent />
- </Section>
+ </Section.Root>
</SettingsAdminIndicatorHealthContext.Provider>
</SettingsPageContainer>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx
index 2301821fef6..ebd2ed31aed 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx
@@ -7,11 +7,10 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconId } from 'twenty-ui/icon';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
GetInstanceAndAllWorkspacesUpgradeStatusDocument,
@@ -82,8 +81,8 @@ export const SettingsAdminInferredVersion = () => {
]}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Inferred version`}
description={t`Detected application version running on this instance`}
/>
@@ -104,7 +103,7 @@ export const SettingsAdminInferredVersion = () => {
variant="outline"
>{t`Refresh status`}</Button>
</StyledRefreshButtonContainer>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
index 4db440182c1..805265c9208 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
@@ -12,6 +12,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { formatUpgradeCommandName, getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import {
IconAlertTriangle,
IconCalendar,
@@ -21,8 +22,6 @@ import {
import { Status } from 'twenty-ui/primitives/data-display';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
GetInstanceAndAllWorkspacesUpgradeStatusDocument,
@@ -112,8 +111,8 @@ export const SettingsAdminInstanceStatus = () => {
]}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Instance status`}
description={t`Health of the latest instance command`}
/>
@@ -174,7 +173,7 @@ export const SettingsAdminInstanceStatus = () => {
variant="outline"
>{t`Refresh status`}</Button>
</StyledRefreshButtonContainer>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
index f6ea9c73ce0..06656e01352 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx
@@ -19,11 +19,10 @@ import { Controller, useForm } from 'react-hook-form';
import { useNavigate, useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
import { Info, useToast } from 'twenty-ui/primitives/feedback';
import { Checkbox, Switch } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';
@@ -352,8 +351,8 @@ export const SettingsAdminNewAiModel = () => {
/>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Model ID`}
description={
showModelSelect
@@ -404,10 +403,10 @@ export const SettingsAdminNewAiModel = () => {
)}
/>
)}
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Label`}
description={t`Display name for the model`}
/>
@@ -427,10 +426,10 @@ export const SettingsAdminNewAiModel = () => {
/>
)}
/>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Pricing`}
description={t`Cost per million tokens (USD)`}
/>
@@ -462,10 +461,10 @@ export const SettingsAdminNewAiModel = () => {
)}
/>
</StyledComboInputContainer>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Cache pricing`}
description={t`Cost per million tokens for cached input (USD)`}
/>
@@ -497,10 +496,10 @@ export const SettingsAdminNewAiModel = () => {
)}
/>
</StyledComboInputContainer>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Limits`}
description={t`Token limits for context and output`}
/>
@@ -540,10 +539,10 @@ export const SettingsAdminNewAiModel = () => {
)}
/>
</StyledComboInputContainer>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Supported input types`}
description={t`Types of content this model can process besides text`}
/>
@@ -589,10 +588,10 @@ export const SettingsAdminNewAiModel = () => {
</StyledModalitiesContainer>
)}
/>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Supports reasoning`}
description={t`Whether this model supports chain-of-thought reasoning`}
/>
@@ -607,7 +606,7 @@ export const SettingsAdminNewAiModel = () => {
/>
)}
/>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
</form>
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
index e6ea2e9ff03..01846c7140e 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
@@ -23,10 +23,9 @@ import { slugify } from 'transliteration';
import { type AiSdkPackage, isDataResidency } from 'twenty-shared/ai';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
import { Info, useToast } from 'twenty-ui/primitives/feedback';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';
type ModelsDevProvider = { id: string; modelCount: number; npm: AiSdkPackage };
@@ -281,8 +280,8 @@ export const SettingsAdminNewAiProvider = () => {
/>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Provider`}
description={t`Select a known provider or create a custom one`}
adornment={
@@ -304,7 +303,7 @@ export const SettingsAdminNewAiProvider = () => {
Icon: IconPlus,
}}
/>
- </Section>
+ </Section.Root>
{isModelsDevWithoutNativeSdk && (
<Info
@@ -315,8 +314,8 @@ export const SettingsAdminNewAiProvider = () => {
{hasSelected && (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Label`}
description={t`A display name for this provider`}
/>
@@ -340,11 +339,11 @@ export const SettingsAdminNewAiProvider = () => {
/>
)}
/>
- </Section>
+ </Section.Root>
{needsApiKey && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`API Key`}
description={t`Your provider API key for authentication`}
/>
@@ -365,12 +364,12 @@ export const SettingsAdminNewAiProvider = () => {
/>
)}
/>
- </Section>
+ </Section.Root>
)}
{isOpenAiCompatible && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Base URL`}
description={t`The API endpoint for your OpenAI-compatible provider`}
/>
@@ -390,11 +389,11 @@ export const SettingsAdminNewAiProvider = () => {
/>
)}
/>
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Data Residency`}
description={t`Region where inference data is processed (optional)`}
/>
@@ -414,12 +413,12 @@ export const SettingsAdminNewAiProvider = () => {
/>
)}
/>
- </Section>
+ </Section.Root>
{isBedrock && (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Region`}
description={t`The AWS region for Bedrock`}
/>
@@ -439,10 +438,10 @@ export const SettingsAdminNewAiProvider = () => {
/>
)}
/>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Access Key ID`}
description={t`Optional — uses IAM role if empty`}
/>
@@ -462,10 +461,10 @@ export const SettingsAdminNewAiProvider = () => {
/>
)}
/>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Secret Access Key`}
description={t`Optional — uses IAM role if empty`}
/>
@@ -485,7 +484,7 @@ export const SettingsAdminNewAiProvider = () => {
/>
)}
/>
- </Section>
+ </Section.Root>
</>
)}
</>
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminQueueDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminQueueDetail.tsx
index 3f38b9ef3e7..1db00e8965a 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminQueueDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminQueueDetail.tsx
@@ -6,8 +6,7 @@ import { useState } from 'react';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
export const SettingsAdminQueueDetail = () => {
const { queueName } = useParams<{ queueName: string }>();
@@ -75,13 +74,13 @@ export const SettingsAdminQueueDetail = () => {
]}
>
<SettingsPageContainer>
- <Section>
- <H2Title title={t`Jobs`} description={queueDescription} />
+ <Section.Root>
+ <Section.Header title={t`Jobs`} description={queueDescription} />
<SettingsAdminQueueJobsTable
queueName={queueName}
onRetentionConfigLoaded={setRetentionConfig}
/>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx
index 57c15ee8dc7..a33f6624acb 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx
@@ -26,6 +26,7 @@ import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTab
import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { Section } from 'twenty-ui/components';
import {
IconCalendar,
IconEyeShare,
@@ -35,9 +36,7 @@ import {
IconUser,
} from 'twenty-ui/icon';
import { Avatar } from 'twenty-ui/primitives/data-display';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
import {
@@ -176,16 +175,19 @@ export const SettingsAdminUserDetail = () => {
<SettingsPageContainer>
{userLookupResult && (
<>
- <Section>
- <H2Title title={t`User Info`} description={t`About this user`} />
+ <Section.Root>
+ <Section.Header
+ title={t`User Info`}
+ description={t`About this user`}
+ />
<SettingsTableCard
items={userInfoItems}
rounded
gridAutoColumns="1fr 4fr"
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Workspaces`}
description={t`All workspaces this user is a member of`}
/>
@@ -214,7 +216,7 @@ export const SettingsAdminUserDetail = () => {
</Button>
</StyledButtonContainer>
)}
- </Section>
+ </Section.Root>
</>
)}
</SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceChatThread.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceChatThread.tsx
index c68648a5c7e..3d749cd1f0a 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceChatThread.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceChatThread.tsx
@@ -12,9 +12,8 @@ import { GET_ADMIN_CHAT_THREAD_MESSAGES } from '@/settings/admin-panel/graphql/q
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { type GetAdminChatThreadMessagesQuery } from '~/generated-admin/graphql';
+import { Section } from 'twenty-ui/components';
export const SettingsAdminWorkspaceChatThread = () => {
const { workspaceId, threadId } = useParams<{
@@ -62,10 +61,13 @@ export const SettingsAdminWorkspaceChatThread = () => {
]}
>
<SettingsPageContainer>
- <Section>
- <H2Title title={threadTitle} description={t`Chat conversation`} />
+ <Section.Root>
+ <Section.Header
+ title={threadTitle}
+ description={t`Chat conversation`}
+ />
<SettingsAdminChatThreadMessageList messages={messages} />
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
index edfc6404756..bf7960452c8 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
@@ -37,6 +37,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import {
IconCreditCard,
IconEyeShare,
@@ -47,12 +48,11 @@ import {
} from 'twenty-ui/icon';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { Button, Switch } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import {
Card,
OverflowingTextWithTooltip,
} from 'twenty-ui/primitives/surfaces';
-import { H2Title, Text } from 'twenty-ui/primitives/typography';
+import { Text } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
GetUpgradeStatusDocument,
@@ -348,8 +348,11 @@ export const SettingsAdminWorkspaceDetail = () => {
)}
{effectiveTabId === WORKSPACE_DETAIL_TAB_IDS.MEMBERS && workspace && (
- <Section>
- <H2Title title={t`Members`} description={t`Workspace members`} />
+ <Section.Root>
+ <Section.Header
+ title={t`Members`}
+ description={t`Workspace members`}
+ />
<Table>
<TableBody>
<TableRow gridTemplateColumns="1fr 2fr 100px">
@@ -415,7 +418,7 @@ export const SettingsAdminWorkspaceDetail = () => {
})}
</TableBody>
</Table>
- </Section>
+ </Section.Root>
)}
{effectiveTabId === WORKSPACE_DETAIL_TAB_IDS.FEATURE_FLAGS &&
@@ -430,8 +433,8 @@ export const SettingsAdminWorkspaceDetail = () => {
)}
{effectiveTabId === WORKSPACE_DETAIL_TAB_IDS.CHATS && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Chat Sessions`}
description={t`AI chat threads for this workspace`}
/>
@@ -478,7 +481,7 @@ export const SettingsAdminWorkspaceDetail = () => {
))}
</Table>
)}
- </Section>
+ </Section.Root>
)}
</SettingsPageContainer>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx
index 8a3bed17a43..7f1406611e2 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx
@@ -8,10 +8,9 @@ import { styled } from '@linaria/react';
import { plural, t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
GetInstanceAndAllWorkspacesUpgradeStatusDocument,
@@ -88,8 +87,8 @@ export const SettingsAdminWorkspacesStatus = () => {
]}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Workspaces status`}
description={t`Upgrade health across all workspaces`}
/>
@@ -105,9 +104,9 @@ export const SettingsAdminWorkspacesStatus = () => {
variant="outline"
>{t`Refresh status`}</Button>
</StyledRefreshButtonContainer>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Detail per workspace`}
description={t`Workspace lists by upgrade status`}
/>
@@ -130,7 +129,7 @@ export const SettingsAdminWorkspacesStatus = () => {
workspaces={upgradeStatus?.workspacesFailed ?? []}
/>
</StyledAccordionCardsContainer>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
index 541bc4acf9b..f44a83b56ae 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
@@ -9,6 +9,7 @@ import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { t } from '@lingui/core/macro';
+import { Section } from 'twenty-ui/components';
import {
IconBook,
IconChartBar,
@@ -19,7 +20,6 @@ import {
IconTool,
} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { SettingsAgentSkillsTab } from '~/pages/settings/ai/components/SettingsAgentSkillsTab';
import { SettingsAgentToolsTab } from '~/pages/settings/ai/components/SettingsAgentToolsTab';
import { SettingsAiSystemPromptsSection } from '~/pages/settings/ai/components/SettingsAiSystemPromptsSection';
@@ -115,7 +115,7 @@ export const SettingsAI = () => {
>
<SettingsPageContainer>
{!isModelsTab && (
- <Section>
+ <Section.Root>
<SettingsDiscoveryHeroCard
lightSrc={AI_HERO_LIGHT}
darkSrc={AI_HERO_DARK}
@@ -131,7 +131,7 @@ export const SettingsAI = () => {
]}
playButtonAriaLabel={t`Watch AI demo`}
/>
- </Section>
+ </Section.Root>
)}
{isOverviewTab && (
<>
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx
index 9cede5b8376..3e5763000bf 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAgentForm.tsx
@@ -3,8 +3,8 @@ import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { useParams } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { useIcons } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -56,9 +56,9 @@ export const SettingsAgentForm = ({ mode }: { mode: 'create' | 'edit' }) => {
links={getSettingsAiBreadcrumbLinks(t`Agent`)}
>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
<SettingsAgentDetailSkeletonLoader />
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx
index d190f9cccd9..c591df80249 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAgentTurnDetail.tsx
@@ -14,9 +14,8 @@ import { Suspense } from 'react';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { Status } from 'twenty-ui/primitives/data-display';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
type AgentMessage,
@@ -141,8 +140,8 @@ export const SettingsAgentTurnDetail = () => {
]}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Messages`}
description={new Date(turn.createdAt).toLocaleString('en-US', {
dateStyle: 'medium',
@@ -188,10 +187,10 @@ export const SettingsAgentTurnDetail = () => {
) : (
<div>{t`No messages found for this turn`}</div>
)}
- </Section>
+ </Section.Root>
- <Section>
- <H2Title title={t`Evaluations`} />
+ <Section.Root>
+ <Section.Header title={t`Evaluations`} />
{turn.evaluations.length > 0 ? (
<StyledTableContainer>
<Table>
@@ -243,7 +242,7 @@ export const SettingsAgentTurnDetail = () => {
) : (
<div>{t`No evaluations yet for this turn`}</div>
)}
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAiPrompts.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAiPrompts.tsx
index 44c92284ab7..ad94fabdd17 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAiPrompts.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAiPrompts.tsx
@@ -14,12 +14,15 @@ import {
getValidTimeZoneOrUndefined,
isDefined,
} from 'twenty-shared/utils';
-import { H2Title, H3Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { GetAiSystemPromptPreviewDocument } from '~/generated-metadata/graphql';
import { formatNumber } from '~/utils/format/formatNumber';
+const StyledSectionHeader = styled(Section.Header)`
+ margin-block-end: 0;
+`;
+
const StyledFormContainer = styled.div`
display: flex;
flex-direction: column;
@@ -101,16 +104,19 @@ export const SettingsAiPrompts = () => {
]}
>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
<StyledTitleContainer>
- <H3Title
+ <StyledSectionHeader
title={t`System Prompt`}
description={[t`Read-only`, totalTokenCount]
.filter(Boolean)
.join(' ')}
+ level={3}
+ size="lg"
+ descriptionLineClamp={2}
/>
</StyledTitleContainer>
- </Section>
+ </Section.Root>
{promptSections.map((section) => {
const sectionTokenCount = t`~ ${formatNumber(
section.estimatedTokenCount,
@@ -121,8 +127,8 @@ export const SettingsAiPrompts = () => {
)} tokens`;
return (
- <Section key={section.title}>
- <H2Title
+ <Section.Root key={section.title}>
+ <Section.Header
title={section.title}
description={[t`Read-only`, sectionTokenCount]
.filter(Boolean)
@@ -151,12 +157,12 @@ export const SettingsAiPrompts = () => {
minHeight={120}
/>
</StyledFormContainer>
- </Section>
+ </Section.Root>
);
})}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`User Context`}
description={t`Information about the current user (auto-generated and included in each request)`}
/>
@@ -171,7 +177,7 @@ export const SettingsAiPrompts = () => {
minHeight={80}
/>
</StyledFormContainer>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAiUsageUserDetail.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAiUsageUserDetail.tsx
index 23e040d46ca..725c08132ae 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAiUsageUserDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAiUsageUserDetail.tsx
@@ -12,7 +12,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
export const SettingsAiUsageUserDetail = () => {
const { t: tLingui } = useLingui();
@@ -65,14 +65,14 @@ export const SettingsAiUsageUserDetail = () => {
<SettingsPageLayout title={displayName} links={breadcrumbLinks}>
<SettingsPageContainer>
{!hasAnyData && (
- <Section>
+ <Section.Root>
<SubscriptionInfoContainer>
<SettingsBillingLabelValueItem
label={t`No usage data`}
value={t`No AI consumption recorded for this user.`}
/>
</SubscriptionInfoContainer>
- </Section>
+ </Section.Root>
)}
<UsageDailyChartSection
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx
index 1d8b4fcbbe0..15e0721156c 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx
@@ -4,8 +4,8 @@ import { useContext } from 'react';
import Skeleton from 'react-loading-skeleton';
import { useParams } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { useIcons } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -54,9 +54,9 @@ export const SettingsSkillForm = ({ mode }: { mode: 'create' | 'edit' }) => {
links={getSettingsAiBreadcrumbLinks(t`Skill`)}
>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
<Skeleton height={400} borderRadius={4} />
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx
index 8bac0c919c3..0044c92e919 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx
@@ -15,10 +15,9 @@ import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
import { useNavigate, useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined, isValidUuid } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { useDebouncedCallback } from 'use-debounce';
import {
@@ -208,17 +207,17 @@ export const SettingsToolDetail = () => {
highlightColor={theme.background.transparent.lighter}
borderRadius={4}
>
- <Section>
+ <Section.Root>
<Skeleton height={20} width={200} />
<Skeleton height={20} width={400} />
<Skeleton height={80} />
- </Section>
+ </Section.Root>
</SkeletonTheme>
) : (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Parameters`}
description={t`Input parameters accepted by this tool`}
/>
@@ -227,10 +226,10 @@ export const SettingsToolDetail = () => {
requiredFields={inputSchema?.required}
functionLink={functionLink}
/>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Description`}
description={t`Define what this tool does`}
/>
@@ -243,11 +242,11 @@ export const SettingsToolDetail = () => {
onChange={handleDescriptionChange}
disabled={isReadOnly}
/>
- </Section>
+ </Section.Root>
{isCustomTool && !isManaged && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Danger zone`}
description={t`Delete this tool`}
/>
@@ -258,7 +257,7 @@ export const SettingsToolDetail = () => {
variant="outline"
color="danger"
>{t`Delete`}</Button>
- </Section>
+ </Section.Root>
)}
</>
)}
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
index c19497e47b6..bef35e69a6a 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
@@ -15,6 +15,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { useNavigate } from 'react-router-dom';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import {
IconDotsVertical,
@@ -24,7 +25,6 @@ import {
IconTrash,
} from 'twenty-ui/icon';
import { Button, LightIconButton } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { MenuItem } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { v4 as uuidv4 } from 'uuid';
@@ -130,7 +130,7 @@ export const SettingsAgentEvalsTab = ({
return (
<>
- <Section>
+ <Section.Root>
<StyledInputContainer>
<TextInput
placeholder={t`Add test input for evaluation (e.g., "Find all customers in NY")`}
@@ -195,7 +195,7 @@ export const SettingsAgentEvalsTab = ({
) : (
<StyledEmptyMessage>{t`No evaluation inputs yet. Add your first test input above.`}</StyledEmptyMessage>
)}
- </Section>
+ </Section.Root>
<ConfirmationModal
modalInstanceId={DELETE_EVAL_INPUT_MODAL_ID}
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentFormContent.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentFormContent.tsx
index 1e8fd443244..b21e3b8311a 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentFormContent.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentFormContent.tsx
@@ -3,6 +3,7 @@ import { t } from '@lingui/core/macro';
import { useContext, useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import {
IconListCheck,
IconLock,
@@ -10,7 +11,6 @@ import {
IconTerminal,
useIcons,
} from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
@@ -194,7 +194,7 @@ export const SettingsAgentFormContent = ({
}
>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
<StyledContentContainer>
{isRoleTab && (
<SettingsAgentRoleTab
@@ -225,7 +225,7 @@ export const SettingsAgentFormContent = ({
)}
{isLogsTab && <SettingsAgentLogsTab agentId={agentId} />}
</StyledContentContainer>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
</>
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx
index 4e11964bf00..1d8b0b2d50e 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx
@@ -10,10 +10,9 @@ import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDr
import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useMutation, useQuery } from '@apollo/client/react';
import {
@@ -147,10 +146,10 @@ export const SettingsAgentRoleTab = ({
Boolean(isRoleExclusiveToThisAgent);
return (
- <Section>
+ <Section.Root>
{!formValues.role ? (
<>
- <H2Title
+ <Section.Header
title={t`Role`}
description={t`Create a role to define permissions for this agent.`}
/>
@@ -179,6 +178,6 @@ export const SettingsAgentRoleTab = ({
)}
</>
)}
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx
index 31774f7147a..96ef923f05b 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx
@@ -9,10 +9,9 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { TextArea } from '@/ui/input/components/TextArea';
import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconTrash } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type Agent } from '~/generated-metadata/graphql';
import { SettingsAgentDeleteConfirmationModal } from '~/pages/settings/ai/components/SettingsAgentDeleteConfirmationModal';
@@ -157,15 +156,18 @@ export const SettingsAgentSettingsTab = ({
/>
</StyledFormContainer>
{!disabled && agent && formValues.isCustom && (
- <Section>
- <H2Title title={t`Danger zone`} description={t`Delete this agent`} />
+ <Section.Root>
+ <Section.Header
+ title={t`Danger zone`}
+ description={t`Delete this agent`}
+ />
<Button
startIcon={<IconTrash />}
onClick={() => openModal(DELETE_AGENT_MODAL_ID)}
variant="outline"
color="danger"
>{t`Delete Agent`}</Button>
- </Section>
+ </Section.Root>
)}
{!disabled && agent && (
<SettingsAgentDeleteConfirmationModal
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx
index 8781b8cdd23..4cba6aa103d 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSkillsTab.tsx
@@ -1,3 +1,4 @@
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import { getApplicationDisplayName } from '@/applications/utils/getApplicationDisplayName';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
@@ -11,14 +12,12 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
import { IconArchive, IconSettings } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { SearchInput } from 'twenty-ui/primitives/input';
import { MenuItemSwitch } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useMutation, useQuery } from '@apollo/client/react';
import { isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/primitives/layout';
import {
ActivateSkillDocument,
DeleteSkillDocument,
@@ -120,8 +119,8 @@ export const SettingsAgentSkillsTab = () => {
};
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Skills`}
description={t`Use filter to see existing skills or create your own`}
/>
@@ -169,6 +168,6 @@ export const SettingsAgentSkillsTab = () => {
onActivate={handleActivate}
onDelete={handleDelete}
/>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx
index b9faa3d8a69..84738ba8f02 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentToolsTab.tsx
@@ -6,10 +6,9 @@ import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconLock, IconPuzzle, IconTool } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { SearchInput } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { MenuItemSwitch } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsAgentToolsTable } from '~/pages/settings/ai/components/SettingsAgentToolsTable';
@@ -76,8 +75,8 @@ export const SettingsAgentToolsTab = () => {
.sort((a, b) => (a.label ?? a.name).localeCompare(b.label ?? b.name));
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Tools`}
description={t`Use filter to see existing tools or create your own`}
/>
@@ -132,6 +131,6 @@ export const SettingsAgentToolsTab = () => {
}
currentWorkspace={currentWorkspace}
/>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelTiersPreview.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelTiersPreview.tsx
index eaf6d6aa5f9..dbc1a07705a 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelTiersPreview.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelTiersPreview.tsx
@@ -1,8 +1,7 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -74,8 +73,8 @@ export const SettingsAiModelTiersPreview = () => {
const tiers = useAiModelTiers();
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Preview`}
description={t`The modes people and agents choose between`}
/>
@@ -137,6 +136,6 @@ export const SettingsAiModelTiersPreview = () => {
);
})}
</StyledTable>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelsTab.tsx
index 24e96025abb..52dcabb3b83 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelsTab.tsx
@@ -1,8 +1,7 @@
import { t } from '@lingui/core/macro';
import { AI_MODEL_TIERS, type AiModelTier } from 'twenty-shared/ai';
+import { Section } from 'twenty-ui/components';
import { IconMessage, IconRobot, IconWand } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -49,8 +48,8 @@ export const SettingsAiModelsTab = () => {
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Models`}
description={t`Choose the default modes for people and agents`}
/>
@@ -122,7 +121,7 @@ export const SettingsAiModelsTab = () => {
</StyledSettingsSelectGroup>
)}
</Card>
- </Section>
+ </Section.Root>
<SettingsAiModelTiersPreview />
</>
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiOverviewTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiOverviewTab.tsx
index d3df2b0a6e8..19de8d23040 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiOverviewTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiOverviewTab.tsx
@@ -12,11 +12,10 @@ import { t } from '@lingui/core/macro';
import { Fragment, useContext, useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconBook, IconMessage, IconSparkles, IconTool } from 'twenty-ui/icon';
import { useToast } from 'twenty-ui/primitives/feedback';
-import { Section } from 'twenty-ui/primitives/layout';
import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebouncedCallback } from 'use-debounce';
import {
@@ -80,8 +79,8 @@ export const SettingsAiOverviewTab = () => {
return (
<Fragment>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`At a glance`}
description={t`What's installed and being used in your workspace`}
/>
@@ -110,10 +109,10 @@ export const SettingsAiOverviewTab = () => {
],
]}
/>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`MCP Server`}
description={t`Connect AI assistants like Claude or Cursor to your workspace via the Model Context Protocol`}
/>
@@ -123,10 +122,10 @@ export const SettingsAiOverviewTab = () => {
title={t`Set up MCP`}
/>
</UndecoratedLink>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Workspace Instructions`}
description={t`Custom instructions appended to every system prompt`}
/>
@@ -149,7 +148,7 @@ export const SettingsAiOverviewTab = () => {
minHeight={150}
/>
</StyledInstructionsContainer>
- </Section>
+ </Section.Root>
</Fragment>
);
};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiSystemPromptsSection.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiSystemPromptsSection.tsx
index 9c50919a15f..e97b84f9b31 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiSystemPromptsSection.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiSystemPromptsSection.tsx
@@ -3,10 +3,9 @@ import { t } from '@lingui/core/macro';
import { useContext } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconPrompt } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { ThemeContext } from 'twenty-ui/theme-constants';
import { SettingsCard } from '@/settings/components/SettingsCard';
import { GetAiSystemPromptPreviewDocument } from '~/generated-metadata/graphql';
@@ -26,14 +25,17 @@ export const SettingsAiSystemPromptsSection = () => {
: t`Read the system prompts to understand how the AI works`;
return (
- <Section>
- <H2Title title={t`System Prompt`} description={systemPromptDescription} />
+ <Section.Root>
+ <Section.Header
+ title={t`System Prompt`}
+ description={systemPromptDescription}
+ />
<UndecoratedLink to={getSettingsPath(SettingsPath.AiPrompts)}>
<SettingsCard
Icon={<IconPrompt size={theme.icon.size.md} />}
title={t`Read system prompts`}
/>
</UndecoratedLink>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiUsageTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiUsageTab.tsx
index dff09b2d113..282c0350900 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiUsageTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiUsageTab.tsx
@@ -14,9 +14,8 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';
+import { Section } from 'twenty-ui/components';
export const SettingsAiUsageTab = () => {
const currentWorkspace = useAtomStateValue(currentWorkspaceState);
@@ -37,8 +36,8 @@ export const SettingsAiUsageTab = () => {
if (!hasEnterpriseAccess) {
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`AI Usage`}
description={t`Track AI consumption across your workspace.`}
adornment={<OrganizationAdornment />}
@@ -48,14 +47,14 @@ export const SettingsAiUsageTab = () => {
description={t`AI usage analytics is available with an Organization key.`}
buttonTitle={t`Activate`}
/>
- </Section>
+ </Section.Root>
);
}
if (!isClickHouseConfigured) {
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`AI Usage`}
description={t`Track AI consumption across your workspace.`}
/>
@@ -65,7 +64,7 @@ export const SettingsAiUsageTab = () => {
value={t`AI usage analytics requires ClickHouse. Contact your administrator.`}
/>
</SubscriptionInfoContainer>
- </Section>
+ </Section.Root>
);
}
@@ -82,8 +81,8 @@ export const SettingsAiUsageTab = () => {
if (!hasData) {
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`AI Usage`}
description={t`Track AI consumption across your workspace.`}
/>
@@ -93,7 +92,7 @@ export const SettingsAiUsageTab = () => {
value={t`AI usage analytics will appear here once you start using AI features.`}
/>
</SubscriptionInfoContainer>
- </Section>
+ </Section.Root>
);
}
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillDangerZone.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillDangerZone.tsx
index dbec6759d1e..0d8f811a23c 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillDangerZone.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillDangerZone.tsx
@@ -3,12 +3,11 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import { IconArchive, IconArchiveOff, IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
@@ -73,8 +72,8 @@ export const SettingsSkillDangerZone = ({
);
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Danger zone`}
description={t`Deactivate or delete this skill`}
/>
@@ -104,6 +103,6 @@ export const SettingsSkillDangerZone = ({
confirmButtonText={t`Delete`}
loading={isSubmitting}
/>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillFormContent.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillFormContent.tsx
index a1982bc47c8..ccc07f08514 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillFormContent.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillFormContent.tsx
@@ -3,11 +3,10 @@ import { t } from '@lingui/core/macro';
import { useContext, useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconInfoCircle, IconRefresh, useIcons } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { Tooltip, Card } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { FormAdvancedTextFieldInput } from '@/advanced-text-editor/components/FormAdvancedTextFieldInput';
import { AI_INSTRUCTIONS_EDITOR_PROFILE } from '@/ai/constants/AiInstructionsEditorProfile';
@@ -163,8 +162,8 @@ export const SettingsSkillFormContent = ({
links={getSettingsAiBreadcrumbLinks(breadcrumbText)}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`About`}
description={t`Define the name and instructions for this skill`}
/>
@@ -267,7 +266,7 @@ export const SettingsSkillFormContent = ({
</StyledAdvancedSettingsOuterContainer>
</AdvancedSettingsWrapper>
</StyledFormContainer>
- </Section>
+ </Section.Root>
{isDefined(skill) && <SettingsSkillDangerZone skill={skill} />}
</SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx b/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx
index c6ead3212f9..32e011e3de6 100644
--- a/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx
+++ b/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx
@@ -18,6 +18,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import {
IconApi,
IconPlus,
@@ -25,9 +26,7 @@ import {
IconSparkles,
IconWebhook,
} from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { SETTINGS_API_WEBHOOKS_TABS } from '~/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs';
type TabKey =
@@ -106,7 +105,7 @@ export const SettingsApiWebhooks = () => {
]}
>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
<SettingsDiscoveryHeroCard
lightSrc={isMcpTab ? McpCoverLight : PlaygroundCoverLight}
darkSrc={isMcpTab ? McpCoverDark : PlaygroundCoverDark}
@@ -122,20 +121,20 @@ export const SettingsApiWebhooks = () => {
]}
playButtonAriaLabel={t`Watch API demo`}
/>
- </Section>
+ </Section.Root>
{activeTab === SETTINGS_API_WEBHOOKS_TABS.TABS_IDS.API && (
<StyledTabContent>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Documentation`}
description={t`Try our REST or GraphQL API playgrounds`}
/>
<PlaygroundSetupForm />
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`API Keys`}
description={t`Active API keys created by you or your team.`}
/>
@@ -150,7 +149,7 @@ export const SettingsApiWebhooks = () => {
>{t`Create API key`}</NavigationButton>
</StyledButtonContainer>
</StyledTableContainer>
- </Section>
+ </Section.Root>
</StyledTabContent>
)}
@@ -162,8 +161,8 @@ export const SettingsApiWebhooks = () => {
{activeTab === SETTINGS_API_WEBHOOKS_TABS.TABS_IDS.WEBHOOKS && (
<StyledTabContent>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Webhooks`}
description={t`Establish Webhook endpoints for notifications on asynchronous events.`}
/>
@@ -178,7 +177,7 @@ export const SettingsApiWebhooks = () => {
>{t`Create webhook`}</NavigationButton>
</StyledButtonContainer>
</StyledTableContainer>
- </Section>
+ </Section.Root>
</StyledTabContent>
)}
</SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
index 34630353e75..0c4b3d7c2db 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
@@ -6,11 +6,10 @@ import { type ReactNode } from 'react';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { Status, Tag } from 'twenty-ui/primitives/data-display';
import { IconRefresh, IconTrash, IconUsers } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { GET_MY_CONNECTED_ACCOUNTS } from '@/settings/accounts/graphql/queries/getMyConnectedAccounts';
@@ -315,16 +314,16 @@ export const SettingsApplicationConnectionDetail = () => {
{isLoading ? (
<SettingsSectionSkeletonLoader />
) : connection === undefined || provider === undefined ? (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Connection not found`}
description={t`This connection does not exist or is not available for this application.`}
/>
- </Section>
+ </Section.Root>
) : (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={connectionLabel}
description={t`Manage this application's OAuth connection.`}
/>
@@ -351,9 +350,9 @@ export const SettingsApplicationConnectionDetail = () => {
color="danger"
>{t`Disconnect`}</Button>
</StyledActions>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Details`}
description={t`OAuth credential metadata for this application connection`}
/>
@@ -378,7 +377,7 @@ export const SettingsApplicationConnectionDetail = () => {
))}
</TableSection>
</Table>
- </Section>
+ </Section.Root>
<ConfirmationModal
modalInstanceId={deleteModalId}
title={t`Disconnect connection?`}
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplications.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplications.tsx
index 6ccfcbd2d0d..2b9553f2dfb 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplications.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplications.tsx
@@ -7,13 +7,13 @@ import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFla
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import {
IconApps,
IconCode,
IconShoppingBag,
IconSparkle2,
} from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { PermissionFlagType } from '~/generated-metadata/graphql';
import coverDark from '~/pages/settings/applications/assets/cover-dark.png';
import coverLight from '~/pages/settings/applications/assets/cover-light.png';
@@ -82,7 +82,7 @@ export const SettingsApplications = () => {
hasDeveloperAccess={hasDeveloperAccess}
/>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
<SettingsDiscoveryHeroCard
lightSrc={coverLight}
darkSrc={coverDark}
@@ -98,7 +98,7 @@ export const SettingsApplications = () => {
]}
playButtonAriaLabel={t`Watch apps demo`}
/>
- </Section>
+ </Section.Root>
{renderActiveTabContent()}
</SettingsPageContainer>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsAppModalLayout.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsAppModalLayout.tsx
index 282a916a53b..74e1db6f13d 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsAppModalLayout.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsAppModalLayout.tsx
@@ -2,8 +2,8 @@ import { styled } from '@linaria/react';
import React from 'react';
import { ModalStatefulWrapper } from '@/ui/layout/modal/components/ModalStatefulWrapper';
+import { Section } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import {
type ModalOverlay,
type ModalPadding,
@@ -107,9 +107,9 @@ const StyledAppModalSectionContainer = styled.div`
export const StyledAppModalSection = ({
children,
...props
-}: React.ComponentProps<typeof Section>) => (
+}: React.ComponentProps<typeof Section.Root>) => (
<StyledAppModalSectionContainer>
{/* oxlint-disable-next-line react/jsx-props-no-spreading */}
- <Section {...props}>{children}</Section>
+ <Section.Root {...props}>{children}</Section.Root>
</StyledAppModalSectionContainer>
);
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx
index 3d15c80cc07..cbb46220594 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo.tsx
@@ -1,3 +1,4 @@
+import { Section } from 'twenty-ui/components';
import {
IconBox,
IconDownload,
@@ -5,7 +6,6 @@ import {
IconVersions,
IconWorld,
} from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Trans, useLingui } from '@lingui/react/macro';
import { useRefetchOnApplicationOperation } from '@/applications/hooks/useRefetchOnApplicationOperation';
import {
@@ -25,7 +25,6 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useQuery } from '@apollo/client/react';
import { AvatarOrIcon, Chip, Tag } from 'twenty-ui/primitives/data-display';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/primitives/layout';
import { SettingsPath } from 'twenty-shared/types';
import { SettingsApplicationRegistrationShareLinkButtons } from '~/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
@@ -191,8 +190,8 @@ export const SettingsApplicationRegistrationGeneralInfo = ({
};
return (
- <Section>
- <H2Title title={t`General`} description={t`About your app`} />
+ <Section.Root>
+ <Section.Header title={t`General`} description={t`About your app`} />
<StyledGeneralContainer>
<SettingsTableCard
rounded
@@ -208,6 +207,6 @@ export const SettingsApplicationRegistrationGeneralInfo = ({
}
/>
</StyledGeneralContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats.tsx
index 8230decd561..e91b397e56c 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats.tsx
@@ -1,9 +1,8 @@
import { useLingui } from '@lingui/react/macro';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { type ApplicationRegistration } from '~/generated-metadata/graphql';
import { SettingsApplicationRegistrationInstalledWorkspaces } from '~/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces';
import { SettingsApplicationRegistrationInstallStats } from '~/pages/settings/applications/components/SettingsApplicationRegistrationInstallStats';
+import { Section } from 'twenty-ui/components';
export const SettingsApplicationRegistrationGeneralStats = ({
registration,
@@ -13,8 +12,8 @@ export const SettingsApplicationRegistrationGeneralStats = ({
const { t } = useLingui();
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Install Stats`}
description={t`Usage across all non-deleted workspaces on this server`}
/>
@@ -24,6 +23,6 @@ export const SettingsApplicationRegistrationGeneralStats = ({
<SettingsApplicationRegistrationInstalledWorkspaces
registration={registration}
/>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx
index 98903f24f76..b43e8ba6217 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx
@@ -4,10 +4,10 @@ import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { useDebounce } from 'use-debounce';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { IconChevronDown, IconDotsVertical } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -29,7 +29,7 @@ const INITIAL_VISIBLE_WORKSPACES = 3;
const SHOW_MORE_PAGE_SIZE = 20;
const INSTALLED_WORKSPACES_GRID_TEMPLATE_COLUMNS = '1fr 120px';
-const StyledSection = styled(Section)`
+const StyledSection = styled(Section.Root)`
margin-top: ${themeCssVariables.spacing[5]};
`;
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
index 4e0be290db9..9ae1a1c9c3c 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
@@ -1,5 +1,5 @@
+import { Section } from 'twenty-ui/components';
import { IconChevronRight } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
@@ -14,7 +14,6 @@ import {
import { useContext, useState } from 'react';
import { type ApplicationWithoutRelation } from '~/pages/settings/applications/types/applicationWithoutRelation';
import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';
-import { Section } from 'twenty-ui/primitives/layout';
import { SearchInput } from 'twenty-ui/primitives/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { ApplicationRegistrationSourceType } from '~/generated-metadata/graphql';
@@ -61,8 +60,8 @@ export const SettingsApplicationsTable = ({
});
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Installed apps`}
description={t`All the applications currently installed on this workspace`}
/>
@@ -119,6 +118,6 @@ export const SettingsApplicationsTable = ({
})}
</StyledTableRowsContainer>
</Table>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsClaimApplicationSection.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsClaimApplicationSection.tsx
index c200eeda888..7ceb77d2c7a 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsClaimApplicationSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsClaimApplicationSection.tsx
@@ -17,11 +17,10 @@ import {
} from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconBrandGithub, IconRefresh, IconSearch } from 'twenty-ui/icon';
import { Callout, useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
FindClaimableApplicationRegistrationDocument,
@@ -220,8 +219,8 @@ export const SettingsClaimApplicationSection = () => {
);
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Claim an application`}
description={t`Take ownership of an app you published to npm. Enter its exact package name (or universal identifier) to find it.`}
/>
@@ -308,6 +307,6 @@ export const SettingsClaimApplicationSection = () => {
</StyledRow>
</StyledResultCard>
)}
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationCommandMenuItemSettingsTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationCommandMenuItemSettingsTab.tsx
index 988e80b6341..d242e54dac4 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationCommandMenuItemSettingsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationCommandMenuItemSettingsTab.tsx
@@ -6,8 +6,7 @@ import { TableSection } from '@/ui/layout/table/components/TableSection';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type ReactNode } from 'react';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type SettingsApplicationCommandMenuItemSettingsTabProps = {
@@ -118,8 +117,8 @@ export const SettingsApplicationCommandMenuItemSettingsTab = ({
];
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Details`}
description={t`Configuration of this command menu item`}
/>
@@ -141,6 +140,6 @@ export const SettingsApplicationCommandMenuItemSettingsTab = ({
))}
</TableSection>
</Table>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx
index a6c197e1c85..a3445095429 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx
@@ -9,12 +9,11 @@ import { Table } from '@/ui/layout/table/components/Table';
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { Section } from 'twenty-ui/components';
import { Avatar, Status } from 'twenty-ui/primitives/data-display';
import { Info } from 'twenty-ui/primitives/feedback';
import { IconChevronRight, IconPlus } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useFindApplicationConnectionProviders } from '~/pages/settings/applications/hooks/useFindApplicationConnectionProviders';
import { useApplicationConnectedAccounts } from '~/pages/settings/applications/hooks/useApplicationConnectedAccounts';
@@ -64,8 +63,8 @@ export const SettingsApplicationConnectionsSection = ({
);
return (
- <Section key={provider.id}>
- <H2Title
+ <Section.Root key={provider.id}>
+ <Section.Header
title={provider.displayName}
description={t`Manage connections used by this app to call ${provider.displayName}.`}
adornment={
@@ -174,7 +173,7 @@ export const SettingsApplicationConnectionsSection = ({
>{t`Add connection`}</Button>
</StyledFooter>
)}
- </Section>
+ </Section.Root>
);
})}
</>
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationCustomSettingsSection.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationCustomSettingsSection.tsx
index 16a14fe73b8..f446fccb102 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationCustomSettingsSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationCustomSettingsSection.tsx
@@ -1,8 +1,8 @@
import { styled } from '@linaria/react';
import { Suspense, lazy } from 'react';
-import { Section } from 'twenty-ui/primitives/layout';
import { FrontComponentSkeletonLoader } from '@/front-components/components/FrontComponentSkeletonLoader';
+import { Section } from 'twenty-ui/components';
const FrontComponentRenderer = lazy(() =>
import('@/front-components/components/FrontComponentRenderer').then(
@@ -24,7 +24,7 @@ export const SettingsApplicationCustomSettingsSection = ({
frontComponentId,
}: SettingsApplicationCustomSettingsSectionProps) => {
return (
- <Section>
+ <Section.Root>
<StyledRendererContainer>
<Suspense fallback={<FrontComponentSkeletonLoader />}>
<FrontComponentRenderer
@@ -33,6 +33,6 @@ export const SettingsApplicationCustomSettingsSection = ({
/>
</Suspense>
</StyledRendererContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx
index 330060787a4..bdfe9c74f0c 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx
@@ -7,9 +7,8 @@ import { useState } from 'react';
import { type Manifest } from 'twenty-shared/application';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
+import { Section } from 'twenty-ui/components';
import { SearchInput } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { type ApplicationDisplayData } from '@/applications/types/applicationDisplayData.type';
import { type Application } from '~/generated-metadata/graphql';
import {
@@ -223,17 +222,17 @@ export const SettingsApplicationDetailContentTab = ({
return (
<>
- <Section>
+ <Section.Root>
<SearchInput
placeholder={t`Search...`}
value={searchTerm}
onChange={setSearchTerm}
/>
- </Section>
+ </Section.Root>
{hasData && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Data`}
description={t`Schema this app contributes to your workspace`}
/>
@@ -251,12 +250,12 @@ export const SettingsApplicationDetailContentTab = ({
fallbackApplicationData={fallbackApplicationData}
/>
</Table>
- </Section>
+ </Section.Root>
)}
{hasLayout && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Layout`}
description={t`How records, pages, and navigation are displayed`}
/>
@@ -292,12 +291,12 @@ export const SettingsApplicationDetailContentTab = ({
fallbackApplicationData={fallbackApplicationData}
/>
</Table>
- </Section>
+ </Section.Root>
)}
{hasLogic && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Logic`}
description={t`Automation, AI, and access this app provides`}
/>
@@ -339,7 +338,7 @@ export const SettingsApplicationDetailContentTab = ({
fallbackApplicationData={fallbackApplicationData}
/>
</Table>
- </Section>
+ </Section.Root>
)}
</>
);
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailEnvironmentVariablesTable.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailEnvironmentVariablesTable.tsx
index 50094b4d25e..fe0abbacb39 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailEnvironmentVariablesTable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailEnvironmentVariablesTable.tsx
@@ -2,8 +2,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
import { type ApplicationVariableOption } from 'twenty-shared/application';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useDebouncedCallback } from 'use-debounce';
import { type ApplicationVariable } from '~/generated-metadata/graphql';
@@ -36,8 +35,11 @@ export const SettingsApplicationDetailEnvironmentVariablesTable = ({
? t`Set your application configuration variables`
: t`No variables to set for this application`;
return (
- <Section>
- <H2Title title={t`Configuration`} description={sectionDescription} />
+ <Section.Root>
+ <Section.Header
+ title={t`Configuration`}
+ description={sectionDescription}
+ />
<StyledContainer>
{editedEnvVariables.map((editedEnvVariable) => {
return (
@@ -75,6 +77,6 @@ export const SettingsApplicationDetailEnvironmentVariablesTable = ({
);
})}
</StyledContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFrontComponentPreviewTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFrontComponentPreviewTab.tsx
index a24d2aabab7..78c7a3c2ac5 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFrontComponentPreviewTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFrontComponentPreviewTab.tsx
@@ -1,7 +1,7 @@
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { Suspense, lazy } from 'react';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { FrontComponentSkeletonLoader } from '@/front-components/components/FrontComponentSkeletonLoader';
@@ -57,7 +57,7 @@ export const SettingsApplicationFrontComponentPreviewTab = ({
isHeadless,
}: SettingsApplicationFrontComponentPreviewTabProps) => {
return (
- <Section>
+ <Section.Root>
<StyledPreviewFrame>
{isHeadless ? (
<StyledHeadlessNotice>
@@ -75,6 +75,6 @@ export const SettingsApplicationFrontComponentPreviewTab = ({
</StyledRendererContainer>
)}
</StyledPreviewFrame>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFrontComponentSettingsTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFrontComponentSettingsTab.tsx
index ea5197f0168..c91e063daef 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFrontComponentSettingsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFrontComponentSettingsTab.tsx
@@ -6,8 +6,7 @@ import { TableSection } from '@/ui/layout/table/components/TableSection';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type ReactNode } from 'react';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type SettingsApplicationFrontComponentSettingsTabProps = {
@@ -102,16 +101,16 @@ export const SettingsApplicationFrontComponentSettingsTab = ({
return (
<>
{trimmedDescription !== undefined && trimmedDescription.length > 0 && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`About`}
description={t`Description provided by the application`}
/>
<StyledDescription>{trimmedDescription}</StyledDescription>
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Details`}
description={t`Build and runtime metadata for this component`}
/>
@@ -133,7 +132,7 @@ export const SettingsApplicationFrontComponentSettingsTab = ({
))}
</TableSection>
</Table>
- </Section>
+ </Section.Root>
</>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFunctionDomainSection.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFunctionDomainSection.tsx
index b8b08446c5d..1c507d19180 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFunctionDomainSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFunctionDomainSection.tsx
@@ -4,10 +4,9 @@ import { useLingui } from '@lingui/react/macro';
import { SettingsPublicDomainsListCard } from '@/settings/domains/components/SettingsPublicDomainsListCard';
import { useGetLogicFunctionHttpUrl } from '@/settings/logic-functions/hooks/useGetLogicFunctionHttpUrl';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
+import { Section } from 'twenty-ui/components';
import { IconCopy } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
const StyledContent = styled.div`
@@ -26,8 +25,8 @@ export const SettingsApplicationFunctionDomainSection = ({
const { functionsBaseUrl } = useGetLogicFunctionHttpUrl();
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`App URL`}
description={t`This app's routes are served from this URL. Add a custom domain to use your own.`}
/>
@@ -45,6 +44,6 @@ export const SettingsApplicationFunctionDomainSection = ({
/>
<SettingsPublicDomainsListCard applicationId={applicationId} />
</StyledContent>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationGeneralSection.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationGeneralSection.tsx
index 7b0a99cad14..a113c3c78d7 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationGeneralSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationGeneralSection.tsx
@@ -2,11 +2,10 @@ import { SettingsOptionCardContentSwitch } from '@/settings/components/SettingsO
import { useMutation } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import { IconRefresh } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { UpdateApplicationDocument } from '~/generated-metadata/graphql';
export const SettingsApplicationGeneralSection = ({
@@ -37,8 +36,8 @@ export const SettingsApplicationGeneralSection = ({
};
return (
- <Section>
- <H2Title title={t`General`} />
+ <Section.Root>
+ <Section.Header title={t`General`} />
<Card rounded fullWidth>
<SettingsOptionCardContentSwitch
Icon={IconRefresh}
@@ -48,6 +47,6 @@ export const SettingsApplicationGeneralSection = ({
onChange={handleAutoUpgradeChange}
/>
</Card>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab.tsx
index 8f1f33df6ca..6d601808e9a 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab.tsx
@@ -9,8 +9,7 @@ import {
UpdateAdminApplicationRegistrationVariableDocument,
} from '~/generated-admin/graphql';
import { styled } from '@linaria/react';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
@@ -140,8 +139,8 @@ export const SettingsApplicationRegistrationConfigTab = ({
return (
variables.length > 0 && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Server Variables`}
description={t`Server variables are applied to all workspace installations.`}
/>
@@ -163,7 +162,7 @@ export const SettingsApplicationRegistrationConfigTab = ({
);
})}
</StyledContainer>
- </Section>
+ </Section.Root>
)
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
index 9b7f0415663..064c799fbab 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
@@ -1,9 +1,8 @@
import { useLingui } from '@lingui/react/macro';
+import { Section } from 'twenty-ui/components';
import { CommandBlock, Tag } from 'twenty-ui/primitives/data-display';
import { IconCopy } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { ApplicationRegistrationSourceType } from '~/generated-metadata/graphql';
@@ -37,16 +36,16 @@ export const SettingsApplicationRegistrationDistributionTab = ({
return (
<>
{isNpmSource && fromAdmin !== true && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Ownership`}
description={t`This application's registration is claimed by your workspace`}
/>
<Tag color="green">{t`Claimed by this workspace`}</Tag>
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Public`}
description={t`Publish your app to the marketplace so others can install it`}
/>
@@ -74,10 +73,10 @@ export const SettingsApplicationRegistrationDistributionTab = ({
}
/>
)}
- </Section>
+ </Section.Root>
{isTarballSource && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Private`}
description={t`Share your app to other workspaces without pushing it on the marketplace`}
/>
@@ -85,7 +84,7 @@ export const SettingsApplicationRegistrationDistributionTab = ({
shareLink={shareLink}
withCopyButton
/>
- </Section>
+ </Section.Root>
)}
</>
);
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx
index 451b8ac483c..c9040b6dc8b 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx
@@ -8,11 +8,10 @@ import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useState } from 'react';
+import { Section } from 'twenty-ui/components';
import { IconKey, IconRefresh, IconShield } from 'twenty-ui/icon';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
RotateApplicationRegistrationClientSecretDocument,
@@ -130,8 +129,8 @@ export const SettingsApplicationRegistrationOAuthTab = ({
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`OAuth`}
description={t`Credentials and scopes for OAuth authorization flows`}
/>
@@ -147,20 +146,20 @@ export const SettingsApplicationRegistrationOAuthTab = ({
variant="outline"
>{t`Rotate client secret`}</Button>
</StyledRotateContainer>
- </Section>
+ </Section.Root>
{displayedSecret && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Client Secret`}
description={t`Copy this secret as it will not be visible again`}
/>
<ApiKeyInput apiKey={displayedSecret} />
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Redirect URIs`}
description={t`Allowed redirect URIs for OAuth flows`}
/>
@@ -172,7 +171,7 @@ export const SettingsApplicationRegistrationOAuthTab = ({
redirectUris={formRedirectUris}
updateRedirectUris={handleSave}
/>
- </Section>
+ </Section.Root>
<ConfirmationModal
confirmationPlaceholder={confirmationValue}
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationTimelineActivityTypeSettingsTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationTimelineActivityTypeSettingsTab.tsx
index 06de5d05247..74fb17e0569 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationTimelineActivityTypeSettingsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationTimelineActivityTypeSettingsTab.tsx
@@ -7,12 +7,11 @@ import { TableSection } from '@/ui/layout/table/components/TableSection';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { type ReactNode } from 'react';
+import { Section } from 'twenty-ui/components';
import { Button } from 'twenty-ui/primitives/input';
import { IconRestore, IconTimelineEvent } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { type SettingsApplicationTimelineActivityType } from '~/pages/settings/applications/types/settingsApplicationTimelineActivityType';
type SettingsApplicationTimelineActivityTypeSettingsTabProps = {
@@ -88,8 +87,8 @@ export const SettingsApplicationTimelineActivityTypeSettingsTab = ({
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Details`}
description={t`Configuration of this timeline activity type`}
/>
@@ -111,9 +110,9 @@ export const SettingsApplicationTimelineActivityTypeSettingsTab = ({
))}
</TableSection>
</Table>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Activity visibility`}
description={t`Choose whether this activity type appears in record timelines`}
/>
@@ -127,10 +126,10 @@ export const SettingsApplicationTimelineActivityTypeSettingsTab = ({
onChange={onIsActiveChange}
/>
</Card>
- </Section>
+ </Section.Root>
{canReset && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Reset`}
description={t`Restore the activity type settings defined by the application`}
/>
@@ -141,7 +140,7 @@ export const SettingsApplicationTimelineActivityTypeSettingsTab = ({
onClick={onReset}
variant="outline"
>{t`Reset to default`}</Button>
- </Section>
+ </Section.Root>
)}
</>
);
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
index 6a447ed93af..dca86d4079f 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsAvailableTab.tsx
@@ -5,10 +5,10 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { type ReactNode, useState } from 'react';
+import { Section } from 'twenty-ui/components';
import { InlineBanner } from 'twenty-ui/primitives/feedback';
import { IconSparkles } from 'twenty-ui/icon';
import { SearchInput } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { MenuItemSwitch } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useMarketplaceApps } from '~/modules/marketplace/hooks/useMarketplaceApps';
@@ -77,9 +77,9 @@ export const SettingsApplicationsAvailableTab = () => {
if (isLoading) {
return (
- <Section>
+ <Section.Root>
<SettingsEmptyPlaceholder padding="4">{t`Loading applications...`}</SettingsEmptyPlaceholder>
- </Section>
+ </Section.Root>
);
}
@@ -91,7 +91,7 @@ export const SettingsApplicationsAvailableTab = () => {
const hasNoApplications = textFilteredApplications.length === 0;
return (
- <Section>
+ <Section.Root>
<StyledSearchInputContainer>
<SearchInput
placeholder={t`Search an application`}
@@ -164,6 +164,6 @@ export const SettingsApplicationsAvailableTab = () => {
)}
</StyledContentContainer>
)}
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx
index ea8c3a7739a..dd07f92cbd0 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx
@@ -9,14 +9,13 @@ import { useQuery } from '@apollo/client/react';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useContext, useState } from 'react';
+import { Section } from 'twenty-ui/components';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { CommandBlock } from 'twenty-ui/primitives/data-display';
import { IconArrowUpRight, IconChevronRight, IconCopy } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button, SearchInput } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import {
type ApplicationRegistrationListItemFragment,
FeatureFlagKey,
@@ -100,8 +99,8 @@ export const SettingsApplicationsDeveloperTab = () => {
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Create an application`}
description={t`You can either create a private app or share it to others`}
/>
@@ -122,15 +121,15 @@ export const SettingsApplicationsDeveloperTab = () => {
variant="outline"
>{t`Read documentation`}</Button>
</StyledButtonContainer>
- </Section>
+ </Section.Root>
{canClaimApplications && isAppClaimingEnabled && (
<SettingsClaimApplicationSection />
)}
{registrations.length > 0 && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`My apps`}
description={t`Apps you're the developer of`}
/>
@@ -170,7 +169,7 @@ export const SettingsApplicationsDeveloperTab = () => {
})}
</StyledTableRowsContainer>
</Table>
- </Section>
+ </Section.Root>
)}
</>
);
diff --git a/packages/twenty-front/src/pages/settings/billing/SettingsUsageUserDetail.tsx b/packages/twenty-front/src/pages/settings/billing/SettingsUsageUserDetail.tsx
index 81da810e214..0d8929612ad 100644
--- a/packages/twenty-front/src/pages/settings/billing/SettingsUsageUserDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/billing/SettingsUsageUserDetail.tsx
@@ -15,8 +15,8 @@ import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { Avatar } from 'twenty-ui/primitives/data-display';
-import { Section } from 'twenty-ui/primitives/layout';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
const StyledUserHeader = styled.div`
@@ -130,14 +130,14 @@ export const SettingsUsageUserDetail = () => {
</StyledUserHeader>
{!hasAnyData && (
- <Section>
+ <Section.Root>
<SubscriptionInfoContainer>
<SettingsBillingLabelValueItem
label={t`No usage data`}
value={t`No credit consumption recorded for this user.`}
/>
</SubscriptionInfoContainer>
- </Section>
+ </Section.Root>
)}
<UsageDailyChartSection
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx
index 3e49f7bebf8..5719b7692f9 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx
@@ -20,11 +20,10 @@ import { useState } from 'react';
import { useParams } from 'react-router-dom';
import { MessageChannelType, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconCopy, IconTrash } from 'twenty-ui/icon';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { GetEmailingDomainsDocument } from '~/generated-metadata/graphql';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
@@ -164,8 +163,8 @@ export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {
}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Shared email`}
description={t`The shared email you want to use.`}
/>
@@ -175,9 +174,9 @@ export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {
disabled
fullWidth
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Forwarding address`}
description={t`Set up forwarding from the source address to this destination.`}
/>
@@ -200,10 +199,10 @@ export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {
}
>{t`Copy`}</Button>
</StyledInputRow>
- </Section>
+ </Section.Root>
{isNonEmptyString(channel.displayName) && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Sender name`}
description={t`The name recipients see next to your address. It is set when the channel is created.`}
/>
@@ -213,11 +212,11 @@ export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {
disabled
fullWidth
/>
- </Section>
+ </Section.Root>
)}
{isDefined(emailingDomain) && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Sending domain`}
description={t`Add these records at your DNS provider. Twenty checks them automatically.`}
/>
@@ -239,7 +238,7 @@ export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {
emailingDomain={emailingDomain}
/>
</StyledSendingDomainColumn>
- </Section>
+ </Section.Root>
)}
<SettingsAccountsMessageChannelDetails messageChannel={channel} />
</SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunications.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunications.tsx
index 0ab75395890..4fd59225669 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunications.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunications.tsx
@@ -11,14 +11,13 @@ import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';
import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import {
IconBrandWhatsapp,
IconMail,
IconMailX,
IconPhone,
} from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import coverDark from '~/pages/settings/communications/assets/cover-dark.png';
import coverLight from '~/pages/settings/communications/assets/cover-light.png';
import { SettingsCard } from '@/settings/components/SettingsCard';
@@ -81,18 +80,18 @@ export const SettingsWorkspaceCommunications = () => {
]}
>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
<SettingsDiscoveryHeroCard
lightSrc={coverLight}
darkSrc={coverDark}
instanceIdPrefix="settings-communications-hero"
tabs={[]}
/>
- </Section>
+ </Section.Root>
<SettingsWorkspaceEmailGroupSection />
{isMessageCampaignFeatureEnabled && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Unsubscribe`}
description={t`Manage unsubscribers, opt-out topics, and the page recipients see`}
/>
@@ -108,7 +107,7 @@ export const SettingsWorkspaceCommunications = () => {
onClick={() => navigateSettings(SettingsPath.Unsubscribe)}
/>
</StyledCardsColumn>
- </Section>
+ </Section.Root>
)}
<SettingsWorkspaceEmailSyncSection />
<SettingsWorkspaceBlocklistSection />
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx
index 487bd244c5e..ac8f7e2dc0d 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceNewUnsubscribeTopic.tsx
@@ -10,10 +10,9 @@ import { useLingui } from '@lingui/react/macro';
import { useCallback, useState } from 'react';
import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconEye } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { UnsubscribeTopicVisibility } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { NotFound } from '~/pages/not-found/NotFound';
@@ -120,8 +119,8 @@ export const SettingsWorkspaceNewUnsubscribeTopic = () => {
}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Name`}
description={t`The name recipients see for this topic.`}
/>
@@ -134,9 +133,9 @@ export const SettingsWorkspaceNewUnsubscribeTopic = () => {
disabled={loading}
fullWidth
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Description`}
description={t`Optional context shown to recipients on the preferences page.`}
/>
@@ -148,9 +147,9 @@ export const SettingsWorkspaceNewUnsubscribeTopic = () => {
disabled={loading}
fullWidth
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Visibility`}
description={t`Control whether recipients can find and manage this topic.`}
/>
@@ -163,7 +162,7 @@ export const SettingsWorkspaceNewUnsubscribeTopic = () => {
onChange={setIsPublic}
/>
</Card>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx
index 9fdccf018e8..7a5c4cfe5f2 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx
@@ -15,11 +15,10 @@ import { useEffect, useState } from 'react';
import { useParams } from 'react-router-dom';
import { FeatureFlagKey, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconEye, IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { UnsubscribeTopicVisibility } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { NotFound } from '~/pages/not-found/NotFound';
@@ -158,8 +157,8 @@ export const SettingsWorkspaceUnsubscribeTopicDetail = () => {
}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Name`}
description={t`The name recipients see for this topic.`}
/>
@@ -171,9 +170,9 @@ export const SettingsWorkspaceUnsubscribeTopicDetail = () => {
onBlur={handleNameBlur}
fullWidth
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Description`}
description={t`Optional context shown to recipients on the preferences page.`}
/>
@@ -185,9 +184,9 @@ export const SettingsWorkspaceUnsubscribeTopicDetail = () => {
onBlur={handleDescriptionBlur}
fullWidth
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Visibility`}
description={t`Control whether recipients can find and manage this topic.`}
/>
@@ -200,7 +199,7 @@ export const SettingsWorkspaceUnsubscribeTopicDetail = () => {
onChange={handleVisibilityChange}
/>
</Card>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
<ConfirmationModal
modalInstanceId={DELETE_UNSUBSCRIBE_TOPIC_MODAL_ID}
diff --git a/packages/twenty-front/src/pages/settings/community/SettingsCommunity.tsx b/packages/twenty-front/src/pages/settings/community/SettingsCommunity.tsx
index c913a3b8eb5..d9dc6e55f0c 100644
--- a/packages/twenty-front/src/pages/settings/community/SettingsCommunity.tsx
+++ b/packages/twenty-front/src/pages/settings/community/SettingsCommunity.tsx
@@ -6,6 +6,7 @@ import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLay
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
+import { Section } from 'twenty-ui/components';
import {
IconBrandX,
IconBriefcase,
@@ -13,8 +14,6 @@ import {
type IconComponent,
useIcons,
} from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import {
@@ -87,17 +86,17 @@ export const SettingsCommunity = () => {
]}
>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
<SettingsDiscoveryHeroCard
lightSrc={coverLight}
darkSrc={coverDark}
instanceIdPrefix={SETTINGS_COMMUNITY_HERO_INSTANCE_ID_PREFIX}
tabs={[]}
/>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Join the community`}
description={t`Stay up to date with product news and community updates.`}
/>
@@ -122,10 +121,10 @@ export const SettingsCommunity = () => {
</StyledCardLink>
))}
</StyledCardsGrid>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Partners`}
description={t`Hire a partner to help you implement and customize Twenty.`}
/>
@@ -144,10 +143,10 @@ export const SettingsCommunity = () => {
title={t`Browse partners`}
/>
</StyledCardLink>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Features`}
description={t`Try our upcoming features. Note they are still in beta. Please bear with us and report any issues you find.`}
/>
@@ -169,7 +168,7 @@ export const SettingsCommunity = () => {
/>
</StyledCardLink>
</StyledFeaturesContent>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
index 097207bb5e2..5288e97cab3 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
@@ -18,9 +18,8 @@ import { useState } from 'react';
import { FormProvider, useForm } from 'react-hook-form';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { Section } from 'twenty-ui/components';
export const SettingsNewObject = () => {
const { t } = useLingui();
@@ -101,8 +100,8 @@ export const SettingsNewObject = () => {
}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`About`}
description={t`Define the name and description of your object`}
/>
@@ -112,7 +111,7 @@ export const SettingsNewObject = () => {
!isLoading ? conflictingObjectMetadataItem : undefined
}
/>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
</FormProvider>
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
index 95f61c82a10..47c3f121e8f 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
@@ -35,10 +35,9 @@ import { FormProvider, useForm } from 'react-hook-form';
import { useLocation, useNavigate, useParams } from 'react-router-dom';
import { AppPath, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconArchive, IconArchiveOff, IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { useNavigateApp } from '~/hooks/useNavigateApp';
@@ -361,8 +360,8 @@ export const SettingsObjectFieldEdit = () => {
}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Icon and Name`}
description={t`The name and icon of this field`}
/>
@@ -372,16 +371,16 @@ export const SettingsObjectFieldEdit = () => {
isCreationMode={false}
readonly={readonly}
/>
- </Section>
+ </Section.Root>
{!isReverseJunctionRelation && (
- <Section>
+ <Section.Root>
{fieldMetadataItem.isUnique ? (
- <H2Title
+ <Section.Header
title={t`Values`}
description={t`The values of this field must be unique`}
/>
) : (
- <H2Title
+ <Section.Header
title={t`Values`}
description={t`The values of this field`}
/>
@@ -392,10 +391,10 @@ export const SettingsObjectFieldEdit = () => {
objectNameSingular={objectMetadataItem.nameSingular}
disabled={readonly}
/>
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Description`}
description={t`The description of this field`}
/>
@@ -403,10 +402,10 @@ export const SettingsObjectFieldEdit = () => {
fieldMetadataItem={fieldMetadataItem}
disabled={readonly}
/>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Translations`}
description={t`What each language displays for this field's labels`}
/>
@@ -418,11 +417,11 @@ export const SettingsObjectFieldEdit = () => {
label: fieldMetadataItem.label,
}}
/>
- </Section>
+ </Section.Root>
{!isLabelIdentifier && !readonly && fieldCanBeDeactivated && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Danger zone`}
description={t`Deactivate this field`}
/>
@@ -455,7 +454,7 @@ export const SettingsObjectFieldEdit = () => {
>{t`Delete`}</Button>
)}
</StyledDangerButtons>
- </Section>
+ </Section.Root>
)}
</SettingsPageContainer>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
index 5ce36162396..359e569997f 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
@@ -11,10 +11,9 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconEye, IconPlus, IconSparkle2 } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { SettingsObjectTable } from '~/pages/settings/data-model/SettingsObjectTable';
const SETTINGS_DATA_MODEL_HERO_INSTANCE_ID_PREFIX = 'settings-data-model-hero';
@@ -66,7 +65,7 @@ export const SettingsObjects = () => {
]}
>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
<SettingsDiscoveryHeroCard
lightSrc={LightCoverImage}
darkSrc={DarkCoverImage}
@@ -74,16 +73,16 @@ export const SettingsObjects = () => {
tabs={heroTabs}
playButtonAriaLabel={t`Watch data model demo`}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Objects`}
description={t`Manage objects, fields and relationships`}
/>
<SettingsObjectTable objectMetadataItems={objectMetadataItems} />
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Visualize data model`}
description={t`See your data structure as an interactive diagram`}
/>
@@ -93,7 +92,7 @@ export const SettingsObjects = () => {
startIcon={<IconEye />}
variant="outline"
>{t`Visualize`}</NavigationButton>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
index dac7af0737b..9c534010aaf 100644
--- a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
@@ -23,10 +23,9 @@ import {
SettingsPath,
} from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type z } from 'zod';
import { FieldMetadataType } from '~/generated-metadata/graphql';
@@ -239,8 +238,8 @@ export const SettingsObjectNewFieldConfigure = () => {
}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Icon and Name`}
description={t`The name and icon of this field`}
/>
@@ -248,9 +247,9 @@ export const SettingsObjectNewFieldConfigure = () => {
maxLength={FIELD_NAME_MAXIMUM_LENGTH}
isCreationMode={true}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Customization`}
description={t`Customize field settings`}
/>
@@ -259,7 +258,7 @@ export const SettingsObjectNewFieldConfigure = () => {
existingFieldMetadataId=""
objectNameSingular={activeObjectMetadataItem.nameSingular}
/>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
</FormProvider>
diff --git a/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx b/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx
index fc37765e45c..5b7e872ea12 100644
--- a/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx
@@ -19,10 +19,9 @@ import { useParams } from 'react-router-dom';
import { MAX_CUSTOM_INDEXES_PER_OBJECT } from 'twenty-shared/constants';
import { AppPath, RelationType, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconAlertTriangle } from 'twenty-ui/icon';
import { Callout, useToast } from 'twenty-ui/primitives/feedback';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { IndexType } from '~/generated-metadata/graphql';
import { useNavigateApp } from '~/hooks/useNavigateApp';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -157,28 +156,28 @@ export const SettingsObjectNewIndex = () => {
}
>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
<Callout
variant="warning"
Icon={IconAlertTriangle}
title={t`Use indexes sparingly`}
description={t`Each index speeds up reads on the fields it covers, but slows down every insert and update, and uses disk space. Only add an index when you know which queries it serves.`}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Fields`}
description={t`Pick one or more fields. The order you select them in becomes the column order in the index — important for composite queries. For composite fields like Address, pick the specific sub-column to index.`}
/>
<SettingsObjectIndexFieldsForm indexableFields={indexableFields} />
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Options`}
description={t`Pick the index type. BTREE covers most queries; GIN is for full-text and JSONB.`}
/>
<SettingsObjectIndexOptionsForm />
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
</FormProvider>
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
index 206622e7b73..fbabb44adf1 100644
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
@@ -20,10 +20,9 @@ import { useCallback, useEffect, useState } from 'react';
import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconRepeat, IconTrash } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
AssignRoleToApiKeyDocument,
@@ -272,10 +271,10 @@ export const SettingsDevelopersApiKeyDetail = () => {
]}
>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
{apiKeyToken ? (
<>
- <H2Title
+ <Section.Header
title={t`API Key`}
description={t`Copy this key as it will not be visible again`}
/>
@@ -283,7 +282,7 @@ export const SettingsDevelopersApiKeyDetail = () => {
</>
) : (
<>
- <H2Title
+ <Section.Header
title={t`API Key`}
description={t`Regenerate an API key`}
/>
@@ -298,18 +297,21 @@ export const SettingsDevelopersApiKeyDetail = () => {
</StyledInputContainer>
</>
)}
- </Section>
- <Section>
- <H2Title title={t`Name`} description={t`Name of your API key`} />
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
+ title={t`Name`}
+ description={t`Name of your API key`}
+ />
<ApiKeyNameInput
apiKeyName={apiKeyName}
apiKeyId={apiKey?.id}
disabled={isLoading}
onNameUpdate={setApiKeyName}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Role`}
description={t`What this API can do: Select a user role to define its permissions.`}
/>
@@ -318,9 +320,9 @@ export const SettingsDevelopersApiKeyDetail = () => {
onChange={handleRoleChange}
roles={roles}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Expiration`}
description={t`When the key will be disabled`}
/>
@@ -331,9 +333,9 @@ export const SettingsDevelopersApiKeyDetail = () => {
disabled
fullWidth
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Danger zone`}
description={t`Delete this integration`}
/>
@@ -343,7 +345,7 @@ export const SettingsDevelopersApiKeyDetail = () => {
variant="outline"
color="danger"
>{t`Delete`}</Button>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
)}
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
index 2dd6ec27b6a..2b5629e5350 100644
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
@@ -16,8 +16,6 @@ import { useStore } from 'jotai';
import { Key } from 'ts-key-enum';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import {
CreateApiKeyDocument,
GenerateApiKeyTokenDocument,
@@ -26,6 +24,7 @@ import {
} from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { SETTINGS_API_WEBHOOKS_TABS } from '~/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs';
+import { Section } from 'twenty-ui/components';
export const SettingsDevelopersApiKeysNew = () => {
const { t } = useLingui();
@@ -166,8 +165,11 @@ export const SettingsDevelopersApiKeysNew = () => {
}
>
<SettingsPageContainer>
- <Section>
- <H2Title title={t`Name`} description={t`Name of your API key`} />
+ <Section.Root>
+ <Section.Header
+ title={t`Name`}
+ description={t`Name of your API key`}
+ />
<SettingsTextInput
instanceId="api-key-new-name"
placeholder={t`E.g. backoffice integration`}
@@ -188,9 +190,9 @@ export const SettingsDevelopersApiKeysNew = () => {
}}
fullWidth
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Role`}
description={t`What this API can do: Select a user role to define its permissions.`}
/>
@@ -204,9 +206,9 @@ export const SettingsDevelopersApiKeysNew = () => {
}}
roles={roles}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Expiration Date`}
description={t`When the API key will expire.`}
/>
@@ -221,7 +223,7 @@ export const SettingsDevelopersApiKeysNew = () => {
}));
}}
/>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx b/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
index afc89e8b057..722a8d7b2ab 100644
--- a/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
+++ b/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
@@ -32,6 +32,7 @@ import {
} from 'twenty-shared/constants';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import {
IconCalendarRepeat,
@@ -42,9 +43,7 @@ import {
IconUser,
} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { isGraphqlErrorOfType } from '~/utils/is-graphql-error-of-type.util';
const RELEASE_ENTERPRISE_BINDING_CONFIRMATION_MODAL_ID =
@@ -526,8 +525,8 @@ export const SettingsEnterprise = ({
);
const activateKeySection = (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Activate Organization Key`}
description={t`Paste your Organization key below to activate. Keep a copy of this key somewhere safe: the same key is reused to set up a development instance or to move your license to a replacement server.`}
/>
@@ -554,12 +553,12 @@ export const SettingsEnterprise = ({
</Button>
</StyledActivateButtonWrapper>
</StyledInputContainer>
- </Section>
+ </Section.Root>
);
const transferSection = (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Key in use on another server`}
description={t`This Organization key is already bound to a different server instance. Releasing it here will transfer the license to this server and stop counting seats on the previous one.`}
/>
@@ -576,21 +575,21 @@ export const SettingsEnterprise = ({
? t`Transferring...`
: t`Release & transfer to this server`}
</Button>
- </Section>
+ </Section.Root>
);
const enterpriseKeyInfoSection = (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Your Organization key`}
description={t`This server has an Organization key configured. Make sure you keep a copy of it somewhere safe: you need the same key to activate a development instance or to move your license to a replacement server. If you no longer have access to your key, contact support.`}
/>
- </Section>
+ </Section.Root>
);
const instanceTypeSection = (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Development instance`}
description={
instanceType === ENTERPRISE_INSTANCE_TYPE.DEVELOPMENT
@@ -623,7 +622,7 @@ export const SettingsEnterprise = ({
: t`Register as development instance`}
</Button>
)}
- </Section>
+ </Section.Root>
);
const renderContent = () => {
@@ -634,8 +633,8 @@ export const SettingsEnterprise = ({
if (hasOrphanedValidityToken) {
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Organization License`}
description={t`Your premium features are active but your Organization key is missing or invalid. This may be expected, but if not, please set a valid signed Organization key to manage your subscription, or contact support.`}
/>
@@ -644,7 +643,7 @@ export const SettingsEnterprise = ({
onClick={openCheckoutModal}
variant="outline"
>{t`Get Organization Key`}</Button>
- </Section>
+ </Section.Root>
{activateKeySection}
</>
);
@@ -653,8 +652,8 @@ export const SettingsEnterprise = ({
if (!hasSignedEnterpriseKey) {
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Get Organization`}
description={t`Unlock premium features like SSO, row-level security, and audit logs.`}
/>
@@ -663,7 +662,7 @@ export const SettingsEnterprise = ({
onClick={openCheckoutModal}
variant="outline"
>{t`Get Organization Key`}</Button>
- </Section>
+ </Section.Root>
{activateKeySection}
</>
);
@@ -672,8 +671,8 @@ export const SettingsEnterprise = ({
if (isSubscriptionActiveOrTrialing && !hasValidityToken) {
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Organization License`}
description={t`Your subscription is active but your validity token is invalid or has expired. Try reloading it or contact support.`}
/>
@@ -717,10 +716,10 @@ export const SettingsEnterprise = ({
/>
)}
</SubscriptionInfoContainer>
- </Section>
+ </Section.Root>
{isBoundToAnotherServer && transferSection}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Manage billing information`}
description={t`Edit payment method, see your invoices and more`}
/>
@@ -729,7 +728,7 @@ export const SettingsEnterprise = ({
onClick={openBillingPortal}
variant="outline"
>{t`View billing details`}</Button>
- </Section>
+ </Section.Root>
</>
);
}
@@ -737,8 +736,8 @@ export const SettingsEnterprise = ({
if (isSubscriptionActiveOrTrialing) {
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Organization License`}
description={
isCancelScheduled
@@ -785,9 +784,9 @@ export const SettingsEnterprise = ({
{cancellationMessage}
</StyledCancellationNotice>
)}
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Manage billing information`}
description={t`Edit payment method, see your invoices and more`}
/>
@@ -796,10 +795,10 @@ export const SettingsEnterprise = ({
onClick={openBillingPortal}
variant="outline"
>{t`View billing details`}</Button>
- </Section>
+ </Section.Root>
{!isCancelScheduled && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Cancel your subscription`}
description={t`Your premium features will be disabled`}
/>
@@ -809,7 +808,7 @@ export const SettingsEnterprise = ({
variant="outline"
color="danger"
>{t`Cancel Plan`}</Button>
- </Section>
+ </Section.Root>
)}
</>
);
@@ -818,8 +817,8 @@ export const SettingsEnterprise = ({
if (isCanceled) {
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Organization License`}
description={t`Your Organization subscription has been canceled.`}
/>
@@ -846,9 +845,9 @@ export const SettingsEnterprise = ({
}
/>
</SubscriptionInfoContainer>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Get Organization`}
description={t`Start a new Organization subscription to re-enable premium features.`}
/>
@@ -857,7 +856,7 @@ export const SettingsEnterprise = ({
onClick={openCheckoutModal}
variant="outline"
>{t`Get Organization Key`}</Button>
- </Section>
+ </Section.Root>
{activateKeySection}
</>
);
@@ -866,8 +865,8 @@ export const SettingsEnterprise = ({
if (isPastDue) {
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Organization License`}
description={
hasValidityToken
@@ -912,9 +911,9 @@ export const SettingsEnterprise = ({
{t`Update your payment method before ${licenseExpiresAtDate} to avoid losing access.`}
</StyledCancellationNotice>
)}
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Update payment method`}
description={
hasValidityToken
@@ -928,7 +927,7 @@ export const SettingsEnterprise = ({
variant="outline"
color="accent"
>{t`Go to billing portal`}</Button>
- </Section>
+ </Section.Root>
</>
);
}
@@ -936,8 +935,8 @@ export const SettingsEnterprise = ({
if (isIncomplete) {
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Organization License`}
description={t`Your subscription setup was not completed.`}
/>
@@ -953,9 +952,9 @@ export const SettingsEnterprise = ({
}
/>
</SubscriptionInfoContainer>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Get Organization`}
description={t`Start a new Organization subscription.`}
/>
@@ -963,7 +962,7 @@ export const SettingsEnterprise = ({
startIcon={<IconKey />}
onClick={openCheckoutModal}
>{t`Get Organization Key`}</Button>
- </Section>
+ </Section.Root>
{activateKeySection}
</>
);
@@ -971,8 +970,8 @@ export const SettingsEnterprise = ({
return (
<>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Organization License`}
description={(() => {
const statusLabel = stripeStatus ?? 'unknown';
@@ -985,7 +984,7 @@ export const SettingsEnterprise = ({
onClick={openBillingPortal}
variant="outline"
>{t`Go to billing portal`}</Button>
- </Section>
+ </Section.Root>
{activateKeySection}
</>
);
diff --git a/packages/twenty-front/src/pages/settings/general/SettingsGeneral.tsx b/packages/twenty-front/src/pages/settings/general/SettingsGeneral.tsx
index d8b49370cf6..1b1e6f824bb 100644
--- a/packages/twenty-front/src/pages/settings/general/SettingsGeneral.tsx
+++ b/packages/twenty-front/src/pages/settings/general/SettingsGeneral.tsx
@@ -13,9 +13,8 @@ import { SettingsSecuritySettings } from '@/settings/security/components/Setting
import { NameField } from '@/settings/workspace/components/NameField';
import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { Section } from 'twenty-ui/components';
import { IconHistory, IconKey, IconSettings2 } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { PermissionFlagType } from '~/generated-metadata/graphql';
const SETTINGS_GENERAL_TABS_INSTANCE_ID = 'settings-general-tabs';
@@ -61,26 +60,29 @@ export const SettingsGeneral = () => {
return (
<>
- <Section>
- <H2Title title={t`Picture`} />
+ <Section.Root>
+ <Section.Header title={t`Picture`} />
<WorkspaceLogoUploader />
- </Section>
- <Section>
- <H2Title title={t`Name`} description={t`Name of your workspace`} />
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
+ title={t`Name`}
+ description={t`Name of your workspace`}
+ />
<NameField />
- </Section>
+ </Section.Root>
{isMultiWorkspaceEnabled && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Workspace domain`}
description={t`Edit your subdomain name or set a custom domain.`}
/>
<SettingsWorkspaceDomainCard />
- </Section>
+ </Section.Root>
)}
- <Section>
+ <Section.Root>
<DeleteWorkspace />
- </Section>
+ </Section.Root>
</>
);
};
diff --git a/packages/twenty-front/src/pages/settings/layout/SettingsLayout.tsx b/packages/twenty-front/src/pages/settings/layout/SettingsLayout.tsx
index f39504cc53a..8a2ff5aafc7 100644
--- a/packages/twenty-front/src/pages/settings/layout/SettingsLayout.tsx
+++ b/packages/twenty-front/src/pages/settings/layout/SettingsLayout.tsx
@@ -8,10 +8,9 @@ import { useLingui } from '@lingui/react/macro';
import { useNavigate } from 'react-router-dom';
import { AppPath, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconLayoutDashboard, IconPencil, IconSparkle2 } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import coverDark from '~/pages/settings/layout/assets/cover-dark.png';
import coverLight from '~/pages/settings/layout/assets/cover-light.png';
@@ -50,7 +49,7 @@ export const SettingsLayout = () => {
]}
>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
<SettingsDiscoveryHeroCard
lightSrc={coverLight}
darkSrc={coverDark}
@@ -74,14 +73,14 @@ export const SettingsLayout = () => {
/>
}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Overview`}
description={t`All the layout items declared on your workspace`}
/>
<SettingsLayoutItemsStats />
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutDetailScaffold.tsx b/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutDetailScaffold.tsx
index 0c5fd5c0191..dc4ca0c2db9 100644
--- a/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutDetailScaffold.tsx
+++ b/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutDetailScaffold.tsx
@@ -11,8 +11,7 @@ import { t } from '@lingui/core/macro';
import { type ReactNode } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
export type DetailRow = { key: string; label: string; value: ReactNode };
@@ -75,16 +74,16 @@ export const SettingsLayoutDetailScaffold = ({
) : (
<>
{isDefined(trimmedDescription) && trimmedDescription.length > 0 && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`About`}
description={t`Description provided by the application`}
/>
<StyledDescription>{trimmedDescription}</StyledDescription>
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Details`}
description={t`Read-only ${entityTypeLabel} definition shipped by this app`}
/>
@@ -106,7 +105,7 @@ export const SettingsLayoutDetailScaffold = ({
))}
</TableBody>
</Table>
- </Section>
+ </Section.Root>
{children}
</>
)}
diff --git a/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutItemTable.tsx b/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutItemTable.tsx
index f4814c3ae4f..b1973091412 100644
--- a/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutItemTable.tsx
+++ b/packages/twenty-front/src/pages/settings/layout/components/SettingsLayoutItemTable.tsx
@@ -4,8 +4,7 @@ import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { type ReactNode } from 'react';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
+import { Section } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type Column = {
@@ -38,8 +37,8 @@ export const SettingsLayoutItemTable = ({
const gridTemplate = columns.map((c) => c.width ?? '1fr').join(' ');
return (
- <Section>
- <H2Title title={title} description={description} />
+ <Section.Root>
+ <Section.Header title={title} description={description} />
<Table>
<TableRow gridTemplateColumns={gridTemplate}>
{columns.map((col) => (
@@ -66,6 +65,6 @@ export const SettingsLayoutItemTable = ({
))}
</TableBody>
</Table>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpa.tsx b/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpa.tsx
index 395c420e389..1e83dd85fcf 100644
--- a/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpa.tsx
+++ b/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpa.tsx
@@ -4,9 +4,8 @@ import { useQuery } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { DpaDocumentPreview } from '@/settings/legal/components/DpaDocumentPreview';
@@ -66,34 +65,34 @@ export const SettingsLegalDpa = () => {
{isLoading ? (
<SettingsSkeletonLoader />
) : hasAgreements ? (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Executed copies`}
description={t`Accepted and signed DPAs for this workspace, with their template version and date.`}
/>
<SettingsDpaAgreementsTable agreements={agreements} />
- </Section>
+ </Section.Root>
) : preview ? (
<>
{preview.notice && (
- <Section>
+ <Section.Root>
<DpaNotice text={preview.notice} />
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Data Processing Agreement`}
description={t`No copy has been generated yet. This is the agreement that applies to your deployment — generate a signed copy from the top-right.`}
/>
<DpaDocumentPreview document={preview} />
- </Section>
+ </Section.Root>
</>
) : (
- <Section>
+ <Section.Root>
<DpaNotice
text={t`The Data Processing Agreement could not be loaded. Please try again.`}
/>
- </Section>
+ </Section.Root>
)}
</SettingsPageContainer>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpaNew.tsx b/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpaNew.tsx
index b16de242a70..e8b02e9cbfe 100644
--- a/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpaNew.tsx
+++ b/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpaNew.tsx
@@ -3,8 +3,6 @@ import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { downloadFile } from '@/activities/files/utils/downloadFile';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
@@ -22,6 +20,7 @@ import {
type GenerateSignedDpaResult,
} from '@/settings/legal/types/Dpa';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -134,13 +133,13 @@ export const SettingsLegalDpaNew = () => {
>
<SettingsPageContainer>
{preview?.notice && (
- <Section>
+ <Section.Root>
<DpaNotice text={preview.notice} />
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Your details`}
description={t`The PDF is pre-signed by Twenty and executed with your legal entity and authorized signatory.`}
/>
@@ -168,16 +167,16 @@ export const SettingsLegalDpaNew = () => {
onChange={setSignatoryTitle}
fullWidth
/>
- </Section>
+ </Section.Root>
{preview && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Preview`}
description={t`The full agreement with fields resolved for your deployment.`}
/>
<DpaDocumentPreview document={preview} />
- </Section>
+ </Section.Root>
)}
</SettingsPageContainer>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMembers.tsx b/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMembers.tsx
index 7c9145d151d..a3ef5f327d2 100644
--- a/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMembers.tsx
+++ b/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMembers.tsx
@@ -1,6 +1,7 @@
import { Trans, useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import {
IconLock,
IconSparkle2,
@@ -14,7 +15,6 @@ import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLay
import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';
import { useSettingsActiveTabId } from '@/settings/components/layout/useSettingsActiveTabId';
import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
-import { Section } from 'twenty-ui/primitives/layout';
import { PermissionFlagType } from '~/generated-metadata/graphql';
import coverDark from '~/pages/settings/members/assets/cover-dark.png';
import coverLight from '~/pages/settings/members/assets/cover-light.png';
@@ -78,7 +78,7 @@ export const SettingsWorkspaceMembers = () => {
]}
>
<SettingsPageContainer>
- <Section>
+ <Section.Root>
<SettingsDiscoveryHeroCard
lightSrc={coverLight}
darkSrc={coverDark}
@@ -94,7 +94,7 @@ export const SettingsWorkspaceMembers = () => {
]}
playButtonAriaLabel={t`Watch members demo`}
/>
- </Section>
+ </Section.Root>
{renderActiveTabContent()}
</SettingsPageContainer>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
index b5649e84c41..32bb5e1da43 100644
--- a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
+++ b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
@@ -20,12 +20,10 @@ import { isNonEmptyArray } from '@sniptt/guards';
import { formatDistanceToNow } from 'date-fns';
import { useContext, useMemo } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { IconButton, Section } from 'twenty-ui/components';
import { IconMail, IconReload, IconTrash } from 'twenty-ui/icon';
import { Status } from 'twenty-ui/primitives/data-display';
-import { IconButton } from 'twenty-ui/components';
-import { Section } from 'twenty-ui/primitives/layout';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { GetWorkspaceInvitationsDocument } from '~/generated-metadata/graphql';
import { dateLocaleState } from '~/localization/states/dateLocaleState';
@@ -126,18 +124,18 @@ export const SettingsWorkspaceMembersInviteTab = () => {
<SettingsRolesQueryEffect />
{currentWorkspace?.inviteHash &&
currentWorkspace?.isPublicInviteLinkEnabled && (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Invite by link`}
description={t`Share this link to invite users to join your workspace`}
/>
<WorkspaceInviteLink
inviteLink={`${window.location.origin}/invite/${currentWorkspace?.inviteHash}`}
/>
- </Section>
+ </Section.Root>
)}
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Invite by email`}
description={t`Send an invite email to your team`}
/>
@@ -238,14 +236,14 @@ export const SettingsWorkspaceMembersInviteTab = () => {
</Table>
</StyledTableContainer>
)}
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Approved Domains`}
description={t`Anyone with an email address at these domains is allowed to sign up for this workspace.`}
/>
<SettingsApprovedAccessDomainsListCard />
- </Section>
+ </Section.Root>
</>
);
};
diff --git a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
index 1a353c83bba..71cdd0481ef 100644
--- a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
+++ b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
@@ -21,6 +21,7 @@ import {
SettingsPath,
} from 'twenty-shared/types';
import { generateILikeFiltersForCompositeFields } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { Avatar } from 'twenty-ui/primitives/data-display';
import {
IconArrowUpRight,
@@ -29,9 +30,7 @@ import {
IconListDetails,
} from 'twenty-ui/icon';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { Button, SearchInput } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { MenuItem } from 'twenty-ui/primitives/navigation';
import { TableCell } from '@/ui/layout/table/components/TableCell';
@@ -165,8 +164,8 @@ export const SettingsWorkspaceMembersTeamTab = () => {
}, [workspaceMembers, searchFilter]);
return (
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Manage Members`}
description={t`Manage the members of your workspace here`}
/>
@@ -307,6 +306,6 @@ export const SettingsWorkspaceMembersTeamTab = () => {
)}
</Table>
</StyledTableContainer>
- </Section>
+ </Section.Root>
);
};
diff --git a/packages/twenty-front/src/pages/settings/profile/SettingsProfile.tsx b/packages/twenty-front/src/pages/settings/profile/SettingsProfile.tsx
index ec34ff8a0be..d0207ccac8e 100644
--- a/packages/twenty-front/src/pages/settings/profile/SettingsProfile.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/SettingsProfile.tsx
@@ -14,10 +14,9 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { Status } from 'twenty-ui/primitives/data-display';
import { IconShield } from 'twenty-ui/icon';
-import { H2Title } from 'twenty-ui/primitives/typography';
-import { Section } from 'twenty-ui/primitives/layout';
import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
export const SettingsProfile = () => {
@@ -49,28 +48,28 @@ export const SettingsProfile = () => {
]}
>
<SettingsPageContainer>
- <Section>
- <H2Title title={t`Picture`} />
+ <Section.Root>
+ <Section.Header title={t`Picture`} />
<WorkspaceMemberPictureUploader
workspaceMemberId={currentWorkspaceMember.id}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Name`}
description={t`Your name as it will be displayed`}
/>
<NameFields key={currentWorkspaceMember.id} />
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Email`}
description={t`The email associated to your account`}
/>
<EmailField />
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Two Factor Authentication`}
description={t`Enhances security by requiring a code along with your password`}
/>
@@ -92,16 +91,16 @@ export const SettingsProfile = () => {
}
/>
</UndecoratedLink>
- </Section>
+ </Section.Root>
{canChangePassword && (
- <Section>
+ <Section.Root>
<SetOrChangePassword />
- </Section>
+ </Section.Root>
)}
<SettingsProfileDevicesSection />
- <Section>
+ <Section.Root>
<DeleteAccount />
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/profile/SettingsTwoFactorAuthenticationMethod.tsx b/packages/twenty-front/src/pages/settings/profile/SettingsTwoFactorAuthenticationMethod.tsx
index b1fdbe2ecad..35c9c5aaa67 100644
--- a/packages/twenty-front/src/pages/settings/profile/SettingsTwoFactorAuthenticationMethod.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/SettingsTwoFactorAuthenticationMethod.tsx
@@ -15,9 +15,8 @@ import { extractSecretFromOtpUri } from '@/settings/two-factor-authentication/ut
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
+import { Section } from 'twenty-ui/components';
import { Loader } from 'twenty-ui/primitives/feedback';
-import { Section } from 'twenty-ui/primitives/layout';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { resolveCjsModuleDefaultExport } from '~/utils/resolveCjsModuleDefaultExport';
@@ -144,13 +143,13 @@ export const SettingsTwoFactorAuthenticationMethod = () => {
>
<SettingsPageContainer>
{has2FAMethod ? (
- <Section>
+ <Section.Root>
<DeleteTwoFactorAuthentication />
- </Section>
+ </Section.Root>
) : (
- <Section>
+ <Section.Root>
<TwoFactorAuthenticationSetupForSettingsEffect />
- <H2Title
+ <Section.Header
title={t`Authenticator app`}
description={t`Authenticator apps and browser extensions like 1Password, Authy, Microsoft Authenticator, etc. generate one-time passwords that are used as a second factor to verify your identity when prompted during sign-in.`}
/>
@@ -176,14 +175,14 @@ export const SettingsTwoFactorAuthenticationMethod = () => {
<StyledDivider />
- <H2Title
+ <Section.Header
title={t`Verify the code from the app`}
description={t`Copy paste the code below`}
/>
<StyledOTPContainer>
<TwoFactorAuthenticationVerificationForSettings />
</StyledOTPContainer>
- </Section>
+ </Section.Root>
)}
</SettingsPageContainer>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
index fabcf59a6a6..b7d68ba6aa3 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
@@ -9,9 +9,8 @@ import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';
import { Trans, useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
-import { H2Title } from 'twenty-ui/primitives/typography';
+import { Section } from 'twenty-ui/components';
import { ColorSchemePicker } from 'twenty-ui/primitives/input';
-import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { LocalePicker } from '~/pages/settings/profile/appearance/components/LocalePicker';
@@ -37,8 +36,8 @@ export const SettingsExperience = () => {
]}
>
<SettingsPageContainer>
- <Section>
- <H2Title title={t`Appearance`} />
+ <Section.Root>
+ <Section.Header title={t`Appearance`} />
<ColorSchemePicker
value={colorScheme}
onChange={setColorScheme}
@@ -46,10 +45,10 @@ export const SettingsExperience = () => {
darkLabel={t`Dark`}
systemLabel={t`System settings`}
/>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Interface`}
description={t`Select your language and adjust the size of the interface`}
/>
@@ -57,23 +56,23 @@ export const SettingsExperience = () => {
<LocalePicker />
<UiScalePicker />
</StyledInterfaceControls>
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Navigation`}
description={t`Choose where records open by default. Some objects may use a workspace setting`}
/>
<OpenRecordInPreferencePicker />
- </Section>
+ </Section.Root>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Formats`}
description={t`Configure date, time, number, timezone, and calendar start day`}
/>
<FormatPreferencesSettings />
- </Section>
+ </Section.Root>
{/* Unified into FormatPreferencesSettings */}
</SettingsPageContainer>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/security/SettingsSecurityApprovedAccessDomain.tsx b/packages/twenty-front/src/pages/settings/security/SettingsSecurityApprovedAccessDomain.tsx
index 97ee4867ee5..f92448874b4 100644
--- a/packages/twenty-front/src/pages/settings/security/SettingsSecurityApprovedAccessDomain.tsx
+++ b/packages/twenty-front/src/pages/settings/security/SettingsSecurityApprovedAccessDomain.tsx
@@ -9,9 +9,8 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { Controller, useForm } from 'react-hook-form';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
+import { Section } from 'twenty-ui/components';
import { useToast } from 'twenty-ui/primitives/feedback';
-import { Section } from 'twenty-ui/primitives/layout';
-import { H2Title } from 'twenty-ui/primitives/typography';
import { z } from 'zod';
import { CreateApprovedAccessDomainDocument } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -101,8 +100,8 @@ export const SettingsSecurityApprovedAccessDomain = () => {
]}
>
<SettingsPageContainer>
- <Section>
- <H2Title
+ <Section.Root>
+ <Section.Header
title={t`Domain`}
description={t`The name of your Domain`}
/>
@@ -125,9 +124,9 @@ export const SettingsSecurityApprovedAccessDomain = () => {
/>
)}
/>
- </Section>
- <Section>
- <H2Title
+ </Section.Root>
+ <Section.Root>
+ <Section.Header
title={t`Email verification`}
description={t`We will send you a link to verify domain ownership`}
/>
@@ -149,7 +148,7 @@ export const SettingsSecurityApprovedAccessDomain = () => {
/>
)}
/>
- </Section>
+ </Section.Root>
</SettingsPageContainer>
</SettingsPageLayout>
</form>
diff --git a/packages/twenty-shared/src/constants/DocumentationPaths.ts b/packages/twenty-shared/src/constants/DocumentationPaths.ts
index 13ca95def52..3063f72c879 100644
--- a/packages/twenty-shared/src/constants/DocumentationPaths.ts
+++ b/packages/twenty-shared/src/constants/DocumentationPaths.ts
@@ -132,6 +132,7 @@ export const DOCUMENTATION_PATHS = {
UI_COMPONENTS_INPUT_LIGHT_BUTTON: '/ui/components/input/light-button',
UI_COMPONENTS_INPUT_MAIN_BUTTON: '/ui/components/input/main-button',
UI_COMPONENTS_OVERVIEW: '/ui/components/overview',
+ UI_COMPONENTS_SECTION: '/ui/components/section',
UI_DARK_MODE: '/ui/dark-mode',
UI_GETTING_STARTED: '/ui/getting-started',
UI_PRIMITIVES_DATA_DISPLAY_AVATAR: '/ui/primitives/data-display/avatar',
@@ -155,8 +156,10 @@ export const DOCUMENTATION_PATHS = {
UI_PRIMITIVES_NAVIGATION_TABS: '/ui/primitives/navigation/tabs',
UI_PRIMITIVES_OVERVIEW: '/ui/primitives/overview',
UI_PRIMITIVES_SURFACES_ALERT_DIALOG: '/ui/primitives/surfaces/alert-dialog',
+ UI_PRIMITIVES_SURFACES_DIALOG: '/ui/primitives/surfaces/dialog',
UI_PRIMITIVES_SURFACES_MENU: '/ui/primitives/surfaces/menu',
UI_PRIMITIVES_SURFACES_POPOVER: '/ui/primitives/surfaces/popover',
+ UI_PRIMITIVES_TYPOGRAPHY_HEADING: '/ui/primitives/typography/heading',
UI_PRIMITIVES_TYPOGRAPHY_TEXT: '/ui/primitives/typography/text',
UI_SSR: '/ui/ssr',
UI_THEMING: '/ui/theming',
diff --git a/packages/twenty-ui/docs/components.ts b/packages/twenty-ui/docs/components.ts
index fc7ecd98886..92ad78b14be 100644
--- a/packages/twenty-ui/docs/components.ts
+++ b/packages/twenty-ui/docs/components.ts
@@ -3,7 +3,11 @@ import { BUTTON_GROUP_PROP_DESCRIPTIONS } from './buttonGroupPropDescriptions';
import { BUTTON_PROP_DESCRIPTIONS } from './buttonPropDescriptions';
import { ICON_BUTTON_PROP_DESCRIPTIONS } from './iconButtonPropDescriptions';
import { CHIP_PROP_DESCRIPTIONS } from './chipPropDescriptions';
+import { DIALOG_TITLE_PROP_DESCRIPTIONS } from './dialogTitlePropDescriptions';
+import { HEADING_PROP_DESCRIPTIONS } from './headingPropDescriptions';
import { LIGHT_BUTTON_PROP_DESCRIPTIONS } from './lightButtonPropDescriptions';
+import { SECTION_HEADER_PROP_DESCRIPTIONS } from './sectionHeaderPropDescriptions';
+import { SECTION_ROOT_PROP_DESCRIPTIONS } from './sectionRootPropDescriptions';
import { STATUS_PROP_DESCRIPTIONS } from './statusPropDescriptions';
import { TAG_PROP_DESCRIPTIONS } from './tagPropDescriptions';
import { TOOLTIP_PART_PROP_DESCRIPTIONS } from './tooltipPartPropDescriptions';
@@ -185,4 +189,28 @@ export const DOCUMENTED_COMPONENTS = [
slug: 'data-display/status',
propDescriptions: STATUS_PROP_DESCRIPTIONS,
},
+ {
+ name: 'Heading',
+ source: 'primitives/typography/Heading/Heading.tsx',
+ entryPoint: 'twenty-ui/primitives/typography',
+ slug: 'typography/heading',
+ propDescriptions: HEADING_PROP_DESCRIPTIONS,
+ },
+ {
+ name: 'Section',
+ source: 'components/Section/Section.tsx',
+ entryPoint: 'twenty-ui/components',
+ slug: 'components/section',
+ partPropDescriptions: {
+ Root: SECTION_ROOT_PROP_DESCRIPTIONS,
+ Header: SECTION_HEADER_PROP_DESCRIPTIONS,
+ },
+ },
+ {
+ name: 'Dialog',
+ source: 'primitives/surfaces/Dialog/Dialog.tsx',
+ entryPoint: 'twenty-ui/primitives/surfaces',
+ slug: 'surfaces/dialog',
+ partPropDescriptions: { Title: DIALOG_TITLE_PROP_DESCRIPTIONS },
+ },
] as const;
diff --git a/packages/twenty-ui/docs/dialogTitlePropDescriptions.ts b/packages/twenty-ui/docs/dialogTitlePropDescriptions.ts
new file mode 100644
index 00000000000..d8aaeec8ca1
--- /dev/null
+++ b/packages/twenty-ui/docs/dialogTitlePropDescriptions.ts
@@ -0,0 +1,7 @@
+import { type DialogTitleProps } from '../src/primitives/surfaces/Dialog/types/DialogTitleProps';
+import { HEADING_PROP_DESCRIPTIONS } from './headingPropDescriptions';
+
+export const DIALOG_TITLE_PROP_DESCRIPTIONS = {
+ ...HEADING_PROP_DESCRIPTIONS,
+ size: 'Visual font size, independent of the heading level. Defaults to `lg`.',
+} satisfies Partial<Record<keyof DialogTitleProps, string>>;
diff --git a/packages/twenty-ui/docs/headingPropDescriptions.ts b/packages/twenty-ui/docs/headingPropDescriptions.ts
new file mode 100644
index 00000000000..ea6528ac9a1
--- /dev/null
+++ b/packages/twenty-ui/docs/headingPropDescriptions.ts
@@ -0,0 +1,8 @@
+import { type HeadingProps } from '../src/primitives/typography/Heading/types/HeadingProps';
+
+export const HEADING_PROP_DESCRIPTIONS = {
+ level:
+ 'Semantic heading level, from `h1` through `h6`. Does not change the visual size. Defaults to `2`.',
+ size: 'Visual font size, independent of the heading level. Defaults to `md`.',
+ color: 'Theme font color. Defaults to `primary`.',
+} satisfies Partial<Record<keyof HeadingProps, string>>;
diff --git a/packages/twenty-ui/docs/sectionHeaderPropDescriptions.ts b/packages/twenty-ui/docs/sectionHeaderPropDescriptions.ts
new file mode 100644
index 00000000000..86c12ef31e2
--- /dev/null
+++ b/packages/twenty-ui/docs/sectionHeaderPropDescriptions.ts
@@ -0,0 +1,13 @@
+import { type SectionHeaderProps } from '../src/components/Section/types/SectionHeaderProps';
+import { HEADING_PROP_DESCRIPTIONS } from './headingPropDescriptions';
+
+export const SECTION_HEADER_PROP_DESCRIPTIONS = {
+ ...HEADING_PROP_DESCRIPTIONS,
+ title: 'Content of the section heading.',
+ description:
+ 'Supporting text associated with the heading. Strings support links and overflow tooltips; React nodes render as supplied.',
+ adornment:
+ 'Content alongside the heading, such as an action button or status.',
+ descriptionLineClamp:
+ 'Maximum visible lines for a string description. Defaults to `5`. Overflowing descriptions can be read in a tooltip on hover or focus.',
+} satisfies Partial<Record<keyof SectionHeaderProps, string>>;
diff --git a/packages/twenty-ui/docs/sectionRootPropDescriptions.ts b/packages/twenty-ui/docs/sectionRootPropDescriptions.ts
new file mode 100644
index 00000000000..2cb00f659a1
--- /dev/null
+++ b/packages/twenty-ui/docs/sectionRootPropDescriptions.ts
@@ -0,0 +1,8 @@
+import { type SectionRootProps } from '../src/components/Section/types/SectionRootProps';
+
+export const SECTION_ROOT_PROP_DESCRIPTIONS = {
+ align: 'Text alignment within the section. Defaults to `left`.',
+ color: 'Text color within the section. Defaults to `primary`.',
+ fullWidth:
+ 'Whether the section fills the available width. Defaults to `true`.',
+} satisfies Partial<Record<keyof SectionRootProps, string>>;
diff --git a/packages/twenty-ui/generated/components.docs.json b/packages/twenty-ui/generated/components.docs.json
index f9d4c1a4826..63e93e2f08e 100644
--- a/packages/twenty-ui/generated/components.docs.json
+++ b/packages/twenty-ui/generated/components.docs.json
@@ -5241,5 +5241,197 @@
"description": "Font weight of the label."
}
]
+ },
+ {
+ "name": "Heading",
+ "entryPoint": "twenty-ui/primitives/typography",
+ "slug": "typography/heading",
+ "props": [
+ {
+ "name": "color",
+ "type": "\"primary\" | \"secondary\" | \"tertiary\"",
+ "required": false,
+ "defaultValue": "primary",
+ "description": "Theme font color. Defaults to `primary`."
+ },
+ {
+ "name": "level",
+ "type": "5 | 1 | 2 | 3 | 4 | 6",
+ "required": false,
+ "defaultValue": "2",
+ "description": "Semantic heading level, from `h1` through `h6`. Does not change the visual size. Defaults to `2`."
+ },
+ {
+ "name": "render",
+ "type": "ReactElement<unknown, string | JSXElementConstructor<any>> | ComponentRenderFn<HTMLProps, {}>",
+ "required": false,
+ "defaultValue": null,
+ "description": "Allows you to replace the component's HTML element\nwith a different tag, or compose it with another component.\n\nAccepts a `ReactElement` or a function that returns the element to render."
+ },
+ {
+ "name": "size",
+ "type": "\"sm\" | \"md\" | \"lg\" | \"xs\"",
+ "required": false,
+ "defaultValue": "md",
+ "description": "Visual font size, independent of the heading level. Defaults to `md`."
+ }
+ ]
+ },
+ {
+ "name": "Section",
+ "entryPoint": "twenty-ui/components",
+ "slug": "components/section",
+ "props": [],
+ "parts": [
+ {
+ "name": "Root",
+ "props": [
+ {
+ "name": "align",
+ "type": "\"center\" | \"left\"",
+ "required": false,
+ "defaultValue": "left",
+ "description": "Text alignment within the section. Defaults to `left`."
+ },
+ {
+ "name": "color",
+ "type": "\"primary\" | \"secondary\" | \"tertiary\"",
+ "required": false,
+ "defaultValue": "primary",
+ "description": "Text color within the section. Defaults to `primary`."
+ },
+ {
+ "name": "fullWidth",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": "true",
+ "description": "Whether the section fills the available width. Defaults to `true`."
+ },
+ {
+ "name": "render",
+ "type": "ReactElement<unknown, string | JSXElementConstructor<any>> | ComponentRenderFn<HTMLProps, {}>",
+ "required": false,
+ "defaultValue": null,
+ "description": "Allows you to replace the component's HTML element\nwith a different tag, or compose it with another component.\n\nAccepts a `ReactElement` or a function that returns the element to render."
+ }
+ ]
+ },
+ {
+ "name": "Header",
+ "props": [
+ {
+ "name": "adornment",
+ "type": "ReactNode",
+ "required": false,
+ "defaultValue": null,
+ "description": "Content alongside the heading, such as an action button or status."
+ },
+ {
+ "name": "color",
+ "type": "\"primary\" | \"secondary\" | \"tertiary\"",
+ "required": false,
+ "defaultValue": "primary",
+ "description": "Theme font color. Defaults to `primary`."
+ },
+ {
+ "name": "description",
+ "type": "ReactNode",
+ "required": false,
+ "defaultValue": null,
+ "description": "Supporting text associated with the heading. Strings support links and overflow tooltips; React nodes render as supplied."
+ },
+ {
+ "name": "descriptionLineClamp",
+ "type": "number",
+ "required": false,
+ "defaultValue": "5",
+ "description": "Maximum visible lines for a string description. Defaults to `5`. Overflowing descriptions can be read in a tooltip on hover or focus."
+ },
+ {
+ "name": "level",
+ "type": "5 | 1 | 2 | 3 | 4 | 6",
+ "required": false,
+ "defaultValue": "2",
+ "description": "Semantic heading level, from `h1` through `h6`. Does not change the visual size. Defaults to `2`."
+ },
+ {
+ "name": "render",
+ "type": "ReactElement<unknown, string | JSXElementConstructor<any>> | ComponentRenderFn<HTMLProps, {}>",
+ "required": false,
+ "defaultValue": null,
+ "description": "Allows you to replace the component's HTML element\nwith a different tag, or compose it with another component.\n\nAccepts a `ReactElement` or a function that returns the element to render."
+ },
+ {
+ "name": "size",
+ "type": "\"sm\" | \"md\" | \"lg\" | \"xs\"",
+ "required": false,
+ "defaultValue": "md",
+ "description": "Visual font size, independent of the heading level. Defaults to `md`."
+ },
+ {
+ "name": "title",
+ "type": "ReactNode",
+ "required": true,
+ "defaultValue": null,
+ "description": "Content of the section heading."
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "name": "Dialog",
+ "entryPoint": "twenty-ui/primitives/surfaces",
+ "slug": "surfaces/dialog",
+ "props": [],
+ "parts": [
+ {
+ "name": "Title",
+ "props": [
+ {
+ "name": "className",
+ "type": "string | ((state: DialogTitleState) => string | undefined)",
+ "required": false,
+ "defaultValue": null,
+ "description": "CSS class applied to the element, or a function that\nreturns a class based on the component's state."
+ },
+ {
+ "name": "color",
+ "type": "\"primary\" | \"secondary\" | \"tertiary\"",
+ "required": false,
+ "defaultValue": "primary",
+ "description": "Theme font color. Defaults to `primary`."
+ },
+ {
+ "name": "level",
+ "type": "5 | 1 | 2 | 3 | 4 | 6",
+ "required": false,
+ "defaultValue": "2",
+ "description": "Semantic heading level, from `h1` through `h6`. Does not change the visual size. Defaults to `2`."
+ },
+ {
+ "name": "render",
+ "type": "ReactElement<unknown, string | JSXElementConstructor<any>> | ComponentRenderFn<HTMLProps, DialogTitleState>",
+ "required": false,
+ "defaultValue": null,
+ "description": "Allows you to replace the component's HTML element\nwith a different tag, or compose it with another component.\n\nAccepts a `ReactElement` or a function that returns the element to render."
+ },
+ {
+ "name": "size",
+ "type": "\"sm\" | \"md\" | \"lg\" | \"xs\"",
+ "required": false,
+ "defaultValue": "lg",
+ "description": "Visual font size, independent of the heading level. Defaults to `lg`."
+ },
+ {
+ "name": "style",
+ "type": "CSSProperties | ((state: DialogTitleState) => CSSProperties | undefined)",
+ "required": false,
+ "defaultValue": null,
+ "description": "Style applied to the element, or a function that\nreturns a style object based on the component's state."
+ }
+ ]
+ }
+ ]
}
]
diff --git a/packages/twenty-ui/src/components/Section/Section.tsx b/packages/twenty-ui/src/components/Section/Section.tsx
new file mode 100644
index 00000000000..548d532d6b0
--- /dev/null
+++ b/packages/twenty-ui/src/components/Section/Section.tsx
@@ -0,0 +1,7 @@
+import { SectionHeader } from './internal/SectionHeader';
+import { SectionRoot } from './internal/SectionRoot';
+
+export const Section = {
+ Root: SectionRoot,
+ Header: SectionHeader,
+};
diff --git a/packages/twenty-ui/src/components/Section/SectionHeader.module.scss b/packages/twenty-ui/src/components/Section/SectionHeader.module.scss
new file mode 100644
index 00000000000..130af563116
--- /dev/null
+++ b/packages/twenty-ui/src/components/Section/SectionHeader.module.scss
@@ -0,0 +1,33 @@
+.header {
+ display: flex;
+ flex-direction: column;
+ margin-block-end: var(--t-spacing-4);
+ min-inline-size: 0;
+}
+
+.titleRow {
+ align-items: center;
+ display: flex;
+ gap: var(--t-spacing-2);
+ justify-content: space-between;
+ min-inline-size: 0;
+}
+
+.title {
+ line-height: inherit;
+ min-inline-size: 0;
+}
+
+.adornment {
+ align-items: center;
+ display: flex;
+ flex-shrink: 0;
+}
+
+.description {
+ color: var(--t-font-color-secondary);
+ font-size: var(--t-font-size-md);
+ font-weight: var(--t-font-weight-regular);
+ line-height: var(--t-text-line-height-lg);
+ margin-block-start: var(--t-spacing-2);
+}
diff --git a/packages/twenty-ui/src/components/Section/SectionHeader.module.scss.d.ts b/packages/twenty-ui/src/components/Section/SectionHeader.module.scss.d.ts
new file mode 100644
index 00000000000..a5567a6cbb5
--- /dev/null
+++ b/packages/twenty-ui/src/components/Section/SectionHeader.module.scss.d.ts
@@ -0,0 +1,8 @@
+declare const styles: {
+ readonly header: string;
+ readonly titleRow: string;
+ readonly title: string;
+ readonly adornment: string;
+ readonly description: string;
+};
+export default styles;
diff --git a/packages/twenty-ui/src/components/Section/SectionRoot.module.scss b/packages/twenty-ui/src/components/Section/SectionRoot.module.scss
new file mode 100644
index 00000000000..8b3b32f3b3b
--- /dev/null
+++ b/packages/twenty-ui/src/components/Section/SectionRoot.module.scss
@@ -0,0 +1,27 @@
+.root {
+ inline-size: auto;
+
+ &:where([data-align='left']) {
+ text-align: left;
+ }
+
+ &:where([data-align='center']) {
+ text-align: center;
+ }
+
+ &:where([data-color='primary']) {
+ color: var(--t-font-color-primary);
+ }
+
+ &:where([data-color='secondary']) {
+ color: var(--t-font-color-secondary);
+ }
+
+ &:where([data-color='tertiary']) {
+ color: var(--t-font-color-tertiary);
+ }
+}
+
+.fullWidth {
+ inline-size: 100%;
+}
diff --git a/packages/twenty-ui/src/components/Section/SectionRoot.module.scss.d.ts b/packages/twenty-ui/src/components/Section/SectionRoot.module.scss.d.ts
new file mode 100644
index 00000000000..dc9b71d0da2
--- /dev/null
+++ b/packages/twenty-ui/src/components/Section/SectionRoot.module.scss.d.ts
@@ -0,0 +1,5 @@
+declare const classNames: {
+ readonly root: 'root';
+ readonly fullWidth: 'fullWidth';
+};
+export default classNames;
diff --git a/packages/twenty-ui/src/components/Section/__stories__/Section.stories.tsx b/packages/twenty-ui/src/components/Section/__stories__/Section.stories.tsx
new file mode 100644
index 00000000000..67c3e994323
--- /dev/null
+++ b/packages/twenty-ui/src/components/Section/__stories__/Section.stories.tsx
@@ -0,0 +1,138 @@
+import { Section } from '@ui/components/Section/Section';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, userEvent, within } from 'storybook/test';
+
+import { Button } from '@ui/primitives/input/Button/Button';
+import { Text } from '@ui/primitives/typography/Text/Text';
+import { ComponentDecorator } from '@ui/testing';
+
+const meta: Meta<typeof Section.Header> = {
+ title: 'UI/Components/Section',
+ component: Section.Header,
+ args: { title: 'Workspace settings' },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof Section.Header>;
+
+export const Default: Story = {
+ decorators: [ComponentDecorator],
+};
+
+export const WithDescription: Story = {
+ ...Default,
+ args: { description: 'Manage your workspace name and preferences.' },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ await expect(canvas.getAllByRole('heading')).toHaveLength(1);
+ await expect(canvas.getByRole('heading')).toHaveAccessibleDescription(
+ 'Manage your workspace name and preferences.',
+ );
+ },
+};
+
+export const Documentation: Story = {
+ ...WithDescription,
+ render: (args) => (
+ <Section.Root>
+ <Section.Header {...args} />
+ <Text>Workspace preferences appear here.</Text>
+ </Section.Root>
+ ),
+};
+
+export const Centered: Story = {
+ ...Default,
+ render: () => (
+ <Section.Root align="center">Centered section content</Section.Root>
+ ),
+ play: async ({ canvasElement }) => {
+ await expect(
+ within(canvasElement).getByText('Centered section content'),
+ ).toHaveStyle({ textAlign: 'center' });
+ },
+};
+
+export const SecondaryColor: Story = {
+ ...Default,
+ render: () => (
+ <Section.Root color="secondary" fullWidth={false}>
+ Supporting section content
+ </Section.Root>
+ ),
+};
+
+const handleEdit = fn();
+
+export const WithAdornment: Story = {
+ ...WithDescription,
+ args: {
+ ...WithDescription.args,
+ adornment: <Button onClick={handleEdit}>Edit workspace</Button>,
+ },
+ play: async ({ canvasElement }) => {
+ const button = within(canvasElement).getByRole('button', {
+ name: 'Edit workspace',
+ });
+ handleEdit.mockClear();
+
+ await userEvent.click(button);
+ await expect(handleEdit).toHaveBeenCalledTimes(1);
+ await expect(button).toHaveFocus();
+ await userEvent.keyboard('{Enter}');
+ await expect(handleEdit).toHaveBeenCalledTimes(2);
+ },
+};
+
+export const LongDescription: Story = {
+ ...Default,
+ args: {
+ description:
+ 'Manage your workspace name, members, preferences, connected accounts, and notification settings. These settings apply to everyone in your workspace.',
+ descriptionLineClamp: 2,
+ },
+ parameters: { container: { width: 240 } },
+ play: async ({ canvasElement }) => {
+ const description = within(canvasElement).getByText(
+ 'Manage your workspace name, members, preferences, connected accounts, and notification settings. These settings apply to everyone in your workspace.',
+ );
+
+ await expect(getComputedStyle(description).webkitLineClamp).toBe('2');
+ await expect(description.scrollHeight).toBeGreaterThan(
+ description.clientHeight,
+ );
+ description.focus();
+ await expect(description).toHaveFocus();
+ const tooltip = await within(document.body).findByRole('tooltip');
+ await expect(tooltip).toHaveTextContent(
+ 'These settings apply to everyone in your workspace.',
+ );
+ await userEvent.keyboard('{Escape}');
+ },
+};
+
+export const Catalog: Story = {
+ decorators: [ComponentDecorator],
+ render: () => (
+ <Section.Root>
+ <Section.Header
+ title="Workspace settings"
+ description="Manage your workspace preferences."
+ />
+ <Section.Header
+ title="Team settings"
+ description="Manage your team preferences."
+ size="lg"
+ level={3}
+ />
+ </Section.Root>
+ ),
+};
+
+export const CatalogDark: Story = {
+ ...Catalog,
+ tags: ['!autodocs'],
+ globals: { colorScheme: 'dark' },
+};
diff --git a/packages/twenty-ui/src/components/Section/__tests__/SectionHeader.test.tsx b/packages/twenty-ui/src/components/Section/__tests__/SectionHeader.test.tsx
new file mode 100644
index 00000000000..1afe106812e
--- /dev/null
+++ b/packages/twenty-ui/src/components/Section/__tests__/SectionHeader.test.tsx
@@ -0,0 +1,59 @@
+import { Section } from '@ui/components/Section/Section';
+import { render, screen } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+
+import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
+
+import styles from '../SectionHeader.module.scss';
+
+runComponentConformance({
+ name: 'Section.Header',
+ element: <Section.Header title="Workspace" description="Manage your team" />,
+ ownClassName: styles.header,
+ refInstanceOf: HTMLDivElement,
+ renderPropTagName: 'header',
+});
+
+describe('Section.Header', () => {
+ it('associates ordinary description text with the requested heading level', () => {
+ render(
+ <Section.Header
+ title="Workspace"
+ description="Manage your team"
+ level={3}
+ size="lg"
+ />,
+ );
+
+ const heading = screen.getByRole('heading', {
+ name: 'Workspace',
+ level: 3,
+ });
+
+ expect(screen.getAllByRole('heading')).toHaveLength(1);
+ expect(heading).toHaveAccessibleDescription('Manage your team');
+ expect(heading).toHaveAttribute('data-size', 'lg');
+ });
+
+ it('accepts rich descriptions and omits their association when cleared', () => {
+ const { rerender } = render(
+ <Section.Header
+ title="Workspace"
+ description={
+ <span>
+ Manage <strong>your team</strong>
+ </span>
+ }
+ />,
+ );
+
+ expect(screen.getByRole('heading')).toHaveAccessibleDescription(
+ 'Manage your team',
+ );
+
+ rerender(<Section.Header title="Workspace" description="" />);
+
+ expect(screen.getByRole('heading')).not.toHaveAttribute('aria-describedby');
+ expect(screen.queryByText('your team')).not.toBeInTheDocument();
+ });
+});
diff --git a/packages/twenty-ui/src/components/Section/__tests__/SectionRoot.test.tsx b/packages/twenty-ui/src/components/Section/__tests__/SectionRoot.test.tsx
new file mode 100644
index 00000000000..02a51357c1a
--- /dev/null
+++ b/packages/twenty-ui/src/components/Section/__tests__/SectionRoot.test.tsx
@@ -0,0 +1,13 @@
+import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
+
+import { Section } from '../Section';
+
+import styles from '../SectionRoot.module.scss';
+
+runComponentConformance({
+ name: 'Section.Root',
+ element: <Section.Root>Workspace settings</Section.Root>,
+ ownClassName: styles.root,
+ refInstanceOf: HTMLDivElement,
+ renderPropTagName: 'section',
+});
diff --git a/packages/twenty-ui/src/components/Section/internal/SectionHeader.tsx b/packages/twenty-ui/src/components/Section/internal/SectionHeader.tsx
new file mode 100644
index 00000000000..85a41438ba4
--- /dev/null
+++ b/packages/twenty-ui/src/components/Section/internal/SectionHeader.tsx
@@ -0,0 +1,72 @@
+import { useRender } from '@base-ui/react/use-render';
+import { isNonEmptyString, isString } from '@sniptt/guards';
+import { clsx } from 'clsx';
+import { useId } from 'react';
+
+import { OverflowingTextWithTooltip } from '@ui/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
+import { Heading } from '@ui/primitives/typography/Heading/Heading';
+import { isDefined } from '@ui/utilities/utils/isDefined';
+
+import { type SectionHeaderProps } from '../types/SectionHeaderProps';
+
+import styles from '../SectionHeader.module.scss';
+
+export const SectionHeader = ({
+ title,
+ description,
+ adornment,
+ level = 2,
+ size = 'md',
+ color = 'primary',
+ descriptionLineClamp = 5,
+ render,
+ ref,
+ className,
+ ...props
+}: SectionHeaderProps) => {
+ const descriptionId = useId();
+ const hasDescription = isString(description)
+ ? isNonEmptyString(description)
+ : isDefined(description) && description !== false;
+
+ return useRender({
+ render,
+ ref,
+ props: {
+ ...props,
+ className: clsx(styles.header, className),
+ children: (
+ <>
+ <div className={styles.titleRow}>
+ <Heading
+ level={level}
+ size={size}
+ color={color}
+ className={styles.title}
+ aria-describedby={hasDescription ? descriptionId : undefined}
+ >
+ {title}
+ </Heading>
+ {isDefined(adornment) && (
+ <div className={styles.adornment}>{adornment}</div>
+ )}
+ </div>
+ {hasDescription && (
+ <div id={descriptionId} className={styles.description}>
+ {isString(description) ? (
+ <OverflowingTextWithTooltip
+ text={description}
+ displayedMaxRows={descriptionLineClamp}
+ isTooltipMultiline
+ isFocusable
+ />
+ ) : (
+ description
+ )}
+ </div>
+ )}
+ </>
+ ),
+ },
+ });
+};
diff --git a/packages/twenty-ui/src/components/Section/internal/SectionRoot.tsx b/packages/twenty-ui/src/components/Section/internal/SectionRoot.tsx
new file mode 100644
index 00000000000..7aab645f593
--- /dev/null
+++ b/packages/twenty-ui/src/components/Section/internal/SectionRoot.tsx
@@ -0,0 +1,26 @@
+import { useRender } from '@base-ui/react/use-render';
+import { clsx } from 'clsx';
+
+import { type SectionRootProps } from '../types/SectionRootProps';
+
+import styles from '../SectionRoot.module.scss';
+
+export const SectionRoot = ({
+ align = 'left',
+ color = 'primary',
+ fullWidth = true,
+ className,
+ render,
+ ref,
+ ...props
+}: SectionRootProps) =>
+ useRender({
+ render,
+ ref,
+ props: {
+ ...props,
+ 'data-align': align,
+ 'data-color': color,
+ className: clsx(styles.root, fullWidth && styles.fullWidth, className),
+ },
+ });
diff --git a/packages/twenty-ui/src/components/Section/types/SectionHeaderProps.ts b/packages/twenty-ui/src/components/Section/types/SectionHeaderProps.ts
new file mode 100644
index 00000000000..f749f9bdc0e
--- /dev/null
+++ b/packages/twenty-ui/src/components/Section/types/SectionHeaderProps.ts
@@ -0,0 +1,15 @@
+import { type useRender } from '@base-ui/react/use-render';
+import { type ReactNode } from 'react';
+
+import { type HeadingProps } from '@ui/primitives/typography/Heading/types/HeadingProps';
+
+export type SectionHeaderProps = Omit<
+ useRender.ComponentProps<'div'>,
+ 'title' | 'children' | 'color'
+> &
+ Pick<HeadingProps, 'level' | 'size' | 'color'> & {
+ title: ReactNode;
+ description?: ReactNode;
+ adornment?: ReactNode;
+ descriptionLineClamp?: number;
+ };
diff --git a/packages/twenty-ui/src/components/Section/types/SectionRootProps.ts b/packages/twenty-ui/src/components/Section/types/SectionRootProps.ts
new file mode 100644
index 00000000000..8d94abd6b5d
--- /dev/null
+++ b/packages/twenty-ui/src/components/Section/types/SectionRootProps.ts
@@ -0,0 +1,9 @@
+import { type useRender } from '@base-ui/react/use-render';
+
+import { type HeadingProps } from '@ui/primitives/typography/Heading/types/HeadingProps';
+
+export type SectionRootProps = Omit<useRender.ComponentProps<'div'>, 'color'> &
+ Pick<HeadingProps, 'color'> & {
+ align?: 'left' | 'center';
+ fullWidth?: boolean;
+ };
diff --git a/packages/twenty-ui/src/components/index.ts b/packages/twenty-ui/src/components/index.ts
index de147dca0fc..76addaac8b0 100644
--- a/packages/twenty-ui/src/components/index.ts
+++ b/packages/twenty-ui/src/components/index.ts
@@ -12,3 +12,6 @@ export type { IconButtonProps } from './IconButton/types/IconButtonProps';
export { LightButton } from './LightButton/LightButton';
export type { LightButtonProps } from './LightButton/types/LightButtonProps';
export { MainButton } from './MainButton/MainButton';
+export { Section } from './Section/Section';
+export type { SectionHeaderProps } from './Section/types/SectionHeaderProps';
+export type { SectionRootProps } from './Section/types/SectionRootProps';
diff --git a/packages/twenty-ui/src/icon/components/__stories__/IconDictionary.stories.tsx b/packages/twenty-ui/src/icon/components/__stories__/IconDictionary.stories.tsx
index 249e8de2071..953cef32bda 100644
--- a/packages/twenty-ui/src/icon/components/__stories__/IconDictionary.stories.tsx
+++ b/packages/twenty-ui/src/icon/components/__stories__/IconDictionary.stories.tsx
@@ -1,3 +1,4 @@
+import { Section } from '@ui/components/Section/Section';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import * as publicIconExports from '@ui/icon';
@@ -7,7 +8,7 @@ import {
} from '@ui/icon/constants/TwentyIconDictionary';
import { type IconComponent } from '@ui/icon/types/IconComponent';
import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
-import { H2Title } from '@ui/primitives/typography/H2Title/H2Title';
+
import { Text } from '@ui/primitives/typography/Text/Text';
import styles from './IconDictionary.stories.module.scss';
@@ -21,7 +22,10 @@ const IconDictionary = () => (
<div className={styles.dictionary}>
{TWENTY_ICON_DICTIONARY_CATEGORIES.map((category) => (
<section className={styles.category} key={category.key}>
- <H2Title className={styles.categoryTitle} title={category.label} />
+ <Section.Header
+ className={styles.categoryTitle}
+ title={category.label}
+ />
{TWENTY_ICON_DICTIONARY.filter(
(entry) => entry.category === category.key,
).map((entry) => {
diff --git a/packages/twenty-ui/src/primitives/layout/Section/Section.module.scss b/packages/twenty-ui/src/primitives/layout/Section/Section.module.scss
deleted file mode 100644
index 120ebb16e84..00000000000
--- a/packages/twenty-ui/src/primitives/layout/Section/Section.module.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-.section {
- width: auto;
-}
-
-.fullWidth {
- width: 100%;
-}
-
-.left {
- text-align: left;
-}
-
-.center {
- text-align: center;
-}
-
-.primary {
- color: var(--t-font-color-primary);
-}
-
-.secondary {
- color: var(--t-font-color-secondary);
-}
-
-.tertiary {
- color: var(--t-font-color-tertiary);
-}
diff --git a/packages/twenty-ui/src/primitives/layout/Section/Section.module.scss.d.ts b/packages/twenty-ui/src/primitives/layout/Section/Section.module.scss.d.ts
deleted file mode 100644
index b3cc91a7d51..00000000000
--- a/packages/twenty-ui/src/primitives/layout/Section/Section.module.scss.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-declare const classNames: {
- readonly section: 'section';
- readonly fullWidth: 'fullWidth';
- readonly left: 'left';
- readonly center: 'center';
- readonly primary: 'primary';
- readonly secondary: 'secondary';
- readonly tertiary: 'tertiary';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/layout/Section/Section.tsx b/packages/twenty-ui/src/primitives/layout/Section/Section.tsx
deleted file mode 100644
index 1eec1d53411..00000000000
--- a/packages/twenty-ui/src/primitives/layout/Section/Section.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { clsx } from 'clsx';
-import { type ReactNode } from 'react';
-
-import styles from './Section.module.scss';
-
-type SectionProps = {
- children: ReactNode;
- className?: string;
- alignment?: SectionAlignment;
- fullWidth?: boolean;
- fontColor?: SectionFontColor;
-};
-
-export enum SectionAlignment {
- Left = 'left',
- Center = 'center',
-}
-
-export enum SectionFontColor {
- Primary = 'primary',
- Secondary = 'secondary',
- Tertiary = 'tertiary',
-}
-
-export const Section = ({
- children,
- className,
- alignment = SectionAlignment.Left,
- fullWidth = true,
- fontColor = SectionFontColor.Primary,
-}: SectionProps) => {
- return (
- <div
- className={clsx(
- styles.section,
- styles[alignment],
- styles[fontColor],
- fullWidth && styles.fullWidth,
- className,
- )}
- >
- {children}
- </div>
- );
-};
diff --git a/packages/twenty-ui/src/primitives/layout/Section/__stories__/Section.stories.tsx b/packages/twenty-ui/src/primitives/layout/Section/__stories__/Section.stories.tsx
deleted file mode 100644
index 314f4399382..00000000000
--- a/packages/twenty-ui/src/primitives/layout/Section/__stories__/Section.stories.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { ComponentDecorator } from '@ui/testing';
-
-import {
- Section,
- SectionAlignment,
- SectionFontColor,
-} from '@ui/primitives/layout/Section/Section';
-
-const meta: Meta<typeof Section> = {
- title: 'UI/Layout/Section',
- component: Section,
- decorators: [ComponentDecorator],
-};
-
-export default meta;
-type Story = StoryObj<typeof Section>;
-
-export const Default: Story = {
- args: {
- children: 'Section content goes here',
- },
-};
-
-export const Centered: Story = {
- args: {
- children: 'Centered section content',
- alignment: SectionAlignment.Center,
- },
-};
-
-export const SecondaryColor: Story = {
- args: {
- children: 'Secondary font color section',
- fontColor: SectionFontColor.Secondary,
- },
-};
diff --git a/packages/twenty-ui/src/primitives/layout/index.ts b/packages/twenty-ui/src/primitives/layout/index.ts
index 86c82b2b4d7..5a2f1b62fda 100644
--- a/packages/twenty-ui/src/primitives/layout/index.ts
+++ b/packages/twenty-ui/src/primitives/layout/index.ts
@@ -23,5 +23,4 @@ export { AutogrowWrapper } from './AutogrowWrapper/AutogrowWrapper';
export { HorizontalSeparator } from './HorizontalSeparator/HorizontalSeparator';
export { useResizeHandle } from './ResizeHandle/hooks/useResizeHandle';
export { ResizeHandle } from './ResizeHandle/ResizeHandle';
-export { SectionAlignment, SectionFontColor, Section } from './Section/Section';
export { TextDirectionProvider } from './TextDirectionProvider/TextDirectionProvider';
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss b/packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss
index 60139a632bc..205863ae961 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss
+++ b/packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.module.scss
@@ -1,3 +1,4 @@
.title {
+ line-height: inherit;
margin-bottom: var(--t-spacing-2);
}
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx b/packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx
index 699a2a74c68..b1e2b3c6d60 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/MenuPicker/__stories__/MenuPicker.stories.tsx
@@ -1,9 +1,9 @@
+import { Heading } from '@ui/primitives/typography/Heading/Heading';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { IconChartPie } from '@ui/icon';
import { MenuPicker } from '@ui/primitives/navigation/MenuPicker/MenuPicker';
import { A11Y_DEFER_COLOR_CONTRAST, ComponentDecorator } from '@ui/testing';
import { type ReactNode } from 'react';
-import { H3Title } from '@ui/primitives/typography/H3Title/H3Title';
import styles from './MenuPicker.stories.module.scss';
@@ -54,7 +54,11 @@ export const WithoutLabel: Story = {
};
const SectionTitle = ({ children }: { children?: ReactNode }) => {
- return <H3Title className={styles.title} title={children} />;
+ return (
+ <Heading className={styles.title} level={3} size="lg">
+ {children}
+ </Heading>
+ );
};
export const AllStates: Story = {
diff --git a/packages/twenty-ui/src/primitives/surfaces/Dialog/Dialog.tsx b/packages/twenty-ui/src/primitives/surfaces/Dialog/Dialog.tsx
new file mode 100644
index 00000000000..f671ae39624
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/Dialog.tsx
@@ -0,0 +1,5 @@
+import { DialogTitle } from './internal/DialogTitle';
+
+export const Dialog = {
+ Title: DialogTitle,
+};
diff --git a/packages/twenty-ui/src/primitives/surfaces/Dialog/DialogTitle.module.scss b/packages/twenty-ui/src/primitives/surfaces/Dialog/DialogTitle.module.scss
new file mode 100644
index 00000000000..b1a2dd1eafe
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/DialogTitle.module.scss
@@ -0,0 +1,4 @@
+.title {
+ margin-block-end: var(--t-spacing-4);
+ text-align: center;
+}
diff --git a/packages/twenty-ui/src/primitives/typography/H3Title/H3Title.module.scss.d.ts b/packages/twenty-ui/src/primitives/surfaces/Dialog/DialogTitle.module.scss.d.ts
similarity index 53%
rename from packages/twenty-ui/src/primitives/typography/H3Title/H3Title.module.scss.d.ts
rename to packages/twenty-ui/src/primitives/surfaces/Dialog/DialogTitle.module.scss.d.ts
index 1b98f93c04c..08ba7f87baf 100644
--- a/packages/twenty-ui/src/primitives/typography/H3Title/H3Title.module.scss.d.ts
+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/DialogTitle.module.scss.d.ts
@@ -1,6 +1,4 @@
declare const classNames: {
- readonly container: 'container';
readonly title: 'title';
- readonly description: 'description';
};
export default classNames;
diff --git a/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.stories.tsx b/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.stories.tsx
new file mode 100644
index 00000000000..18266961558
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.stories.tsx
@@ -0,0 +1,66 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, within } from 'storybook/test';
+
+import { Modal } from '@ui/primitives/surfaces/Modal/Modal';
+import { Text } from '@ui/primitives/typography/Text/Text';
+import { ComponentDecorator } from '@ui/testing';
+
+import { Dialog } from '../Dialog';
+
+const meta: Meta<typeof Dialog.Title> = {
+ title: 'UI/Surfaces/Dialog',
+ component: Dialog.Title,
+ decorators: [ComponentDecorator],
+ args: { children: 'Grant credits' },
+ render: (args) => (
+ <Modal isOpen padding="large" autoHeight>
+ <Dialog.Title {...args} />
+ <Text>Add credits to this workspace.</Text>
+ </Modal>
+ ),
+};
+
+export default meta;
+
+type Story = StoryObj<typeof Dialog.Title>;
+
+export const Documentation: Story = {
+ play: async () => {
+ const dialog = within(document.body).getByRole('dialog', {
+ name: 'Grant credits',
+ });
+ const title = within(dialog).getByRole('heading', { level: 2 });
+
+ const titleStyle = getComputedStyle(title);
+
+ await expect(title).toHaveAttribute('data-size', 'lg');
+ await expect(titleStyle.marginBlockEnd).toBe('16px');
+ await expect(titleStyle.textAlign).toBe('center');
+ await expect(dialog).toHaveAttribute('aria-labelledby', title.id);
+ },
+};
+
+export const CustomTitle: Story = {
+ args: {
+ level: 3,
+ size: 'sm',
+ style: { marginBlockEnd: 24, textAlign: 'left' },
+ },
+ play: async () => {
+ const title = within(document.body).getByRole('heading', {
+ name: 'Grant credits',
+ level: 3,
+ });
+
+ const titleStyle = getComputedStyle(title);
+
+ await expect(title).toHaveAttribute('data-size', 'sm');
+ await expect(titleStyle.marginBlockEnd).toBe('24px');
+ await expect(titleStyle.textAlign).toBe('left');
+ },
+};
+
+export const Dark: Story = {
+ ...Documentation,
+ globals: { colorScheme: 'dark' },
+};
diff --git a/packages/twenty-ui/src/primitives/surfaces/Dialog/__tests__/DialogTitle.test.tsx b/packages/twenty-ui/src/primitives/surfaces/Dialog/__tests__/DialogTitle.test.tsx
new file mode 100644
index 00000000000..6642954e397
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/__tests__/DialogTitle.test.tsx
@@ -0,0 +1,47 @@
+import { Dialog as DialogPrimitive } from '@base-ui/react/dialog';
+import { render, screen } from '@testing-library/react';
+import { type ReactNode } from 'react';
+import { expect, it } from 'vitest';
+
+import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
+import { Modal } from '@ui/primitives/surfaces/Modal/Modal';
+import { ThemeProvider } from '@ui/theme-constants/ThemeProvider';
+
+import { Dialog } from '../Dialog';
+
+import styles from '../DialogTitle.module.scss';
+
+const DialogRootWrapper = ({ children }: { children: ReactNode }) => (
+ <DialogPrimitive.Root>{children}</DialogPrimitive.Root>
+);
+
+runComponentConformance({
+ name: 'Dialog.Title',
+ element: <Dialog.Title>Grant credits</Dialog.Title>,
+ ownClassName: styles.title,
+ refInstanceOf: HTMLHeadingElement,
+ wrapper: DialogRootWrapper,
+});
+
+it('labels the modal and keeps the title level independent of its size', () => {
+ render(
+ <ThemeProvider colorScheme="light">
+ <Modal isOpen>
+ <Dialog.Title level={3} size="sm">
+ Grant credits
+ </Dialog.Title>
+ </Modal>
+ </ThemeProvider>,
+ );
+
+ const heading = screen.getByRole('heading', {
+ name: 'Grant credits',
+ level: 3,
+ });
+
+ expect(heading).toHaveAttribute('data-size', 'sm');
+ expect(screen.getByRole('dialog', { name: 'Grant credits' })).toHaveAttribute(
+ 'aria-labelledby',
+ heading.id,
+ );
+});
diff --git a/packages/twenty-ui/src/primitives/surfaces/Dialog/internal/DialogTitle.tsx b/packages/twenty-ui/src/primitives/surfaces/Dialog/internal/DialogTitle.tsx
new file mode 100644
index 00000000000..0e00befca21
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/internal/DialogTitle.tsx
@@ -0,0 +1,23 @@
+import { Dialog as DialogPrimitive } from '@base-ui/react/dialog';
+
+import { Heading } from '@ui/primitives/typography/Heading/Heading';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
+
+import { type DialogTitleProps } from '../types/DialogTitleProps';
+
+import styles from '../DialogTitle.module.scss';
+
+export const DialogTitle = ({
+ level = 2,
+ size = 'lg',
+ color = 'primary',
+ className,
+ render,
+ ...props
+}: DialogTitleProps) => (
+ <DialogPrimitive.Title
+ {...props}
+ className={mergeClassNames(styles.title, className)}
+ render={<Heading level={level} size={size} color={color} render={render} />}
+ />
+);
diff --git a/packages/twenty-ui/src/primitives/surfaces/Dialog/types/DialogTitleProps.ts b/packages/twenty-ui/src/primitives/surfaces/Dialog/types/DialogTitleProps.ts
new file mode 100644
index 00000000000..ecb5ec5a3de
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/types/DialogTitleProps.ts
@@ -0,0 +1,6 @@
+import { type Dialog as DialogPrimitive } from '@base-ui/react/dialog';
+
+import { type HeadingProps } from '@ui/primitives/typography/Heading/types/HeadingProps';
+
+export type DialogTitleProps = Omit<DialogPrimitive.Title.Props, 'color'> &
+ Pick<HeadingProps, 'level' | 'size' | 'color'>;
diff --git a/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.module.scss b/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.module.scss
index 0a70c803f22..14ae9aa02fc 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.module.scss
+++ b/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.module.scss
@@ -1,7 +1,3 @@
-.centeredTitle {
- text-align: center;
-}
-
.sectionContainer {
margin-bottom: var(--t-spacing-6);
}
diff --git a/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.module.scss.d.ts b/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.module.scss.d.ts
index d66bb74eaf1..a66148ad167 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.module.scss.d.ts
+++ b/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.module.scss.d.ts
@@ -1,5 +1,4 @@
declare const classNames: {
- readonly centeredTitle: 'centeredTitle';
readonly sectionContainer: 'sectionContainer';
};
export default classNames;
diff --git a/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.tsx b/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.tsx
index 896e9a320cf..9fec5e8e4d5 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.tsx
@@ -1,14 +1,11 @@
+import { Section } from '@ui/components/Section/Section';
+import { Dialog } from '@ui/primitives/surfaces/Dialog/Dialog';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useState } from 'react';
import { IconX } from '@ui/icon';
-import { H1Title, H1TitleFontColor, H2Title } from '@ui/primitives/typography';
+
import { Button } from '@ui/primitives/input';
import { IconButton } from '@ui/components';
-import {
- Section,
- SectionAlignment,
- SectionFontColor,
-} from '@ui/primitives/layout';
import { A11Y_DEFER_COLOR_CONTRAST, ComponentDecorator } from '@ui/testing';
import { Modal } from '@ui/primitives/surfaces/Modal/Modal';
@@ -58,16 +55,16 @@ export const Default: Story = {
ariaLabel="Edit workspace"
>
<ModalHeader>
- <H2Title
+ <Section.Header
title="Edit workspace"
description="Update your workspace settings"
/>
</ModalHeader>
<ModalContent>
- <Section>
+ <Section.Root>
Workspace name and subdomain can be changed from the settings panel.
These changes will be reflected across all members.
- </Section>
+ </Section.Root>
</ModalContent>
<ModalFooter>
<Button variant="outline">{'Cancel'}</Button>
@@ -102,23 +99,17 @@ export const Confirmation: Story = {
isOpen={isOpen}
padding={padding}
overlay={overlay}
- ariaLabel="Delete record?"
smallBorderRadius={smallBorderRadius}
narrowWidth={narrowWidth}
autoHeight={autoHeight}
gap={gap}
>
- <div className={styles.centeredTitle}>
- <H1Title title="Delete record?" fontColor={H1TitleFontColor.Primary} />
- </div>
+ <Dialog.Title>Delete record?</Dialog.Title>
<div className={styles.sectionContainer}>
- <Section
- alignment={SectionAlignment.Center}
- fontColor={SectionFontColor.Primary}
- >
+ <Section.Root align="center" color="primary">
This action cannot be undone. The record and all of its data will be
permanently removed.
- </Section>
+ </Section.Root>
</div>
<Button fullWidth variant="outline" style={{ justifyContent: 'center' }}>
{'Cancel'}
@@ -151,10 +142,10 @@ export const Small: Story = {
ariaLabel="Archive item"
>
<ModalHeader>
- <H2Title title="Archive item" />
+ <Section.Header title="Archive item" />
</ModalHeader>
<ModalContent>
- <Section>Are you sure you want to archive this item?</Section>
+ <Section.Root>Are you sure you want to archive this item?</Section.Root>
</ModalContent>
<ModalFooter>
<Button variant="outline">{'No'}</Button>
@@ -183,16 +174,16 @@ export const ExtraLarge: Story = {
ariaLabel="Import contacts"
>
<ModalHeader>
- <H2Title
+ <Section.Header
title="Import contacts"
description="Upload a CSV file to import your contacts"
/>
</ModalHeader>
<ModalContent>
- <Section>
+ <Section.Root>
The file should include columns for name, email, phone, and company.
Drag and drop your CSV file here, or click to browse.
- </Section>
+ </Section.Root>
</ModalContent>
<ModalFooter>
<Button variant="outline">{'Cancel'}</Button>
@@ -234,7 +225,7 @@ const InteractiveModal = () => {
onBackdropMouseDown={() => setIsOpen(false)}
>
<ModalHeader>
- <H2Title title="Create record" />
+ <Section.Header title="Create record" />
<IconButton
aria-label="Close"
variant="ghost"
@@ -245,10 +236,10 @@ const InteractiveModal = () => {
</IconButton>
</ModalHeader>
<ModalContent>
- <Section>
+ <Section.Root>
Fill in the details below to create a new record. All fields are
optional.
- </Section>
+ </Section.Root>
</ModalContent>
<ModalFooter>
<Button onClick={() => setIsOpen(false)} variant="outline">
diff --git a/packages/twenty-ui/src/primitives/surfaces/index.ts b/packages/twenty-ui/src/primitives/surfaces/index.ts
index 2cba3b89772..75ddf2cac6e 100644
--- a/packages/twenty-ui/src/primitives/surfaces/index.ts
+++ b/packages/twenty-ui/src/primitives/surfaces/index.ts
@@ -22,6 +22,8 @@ export { Card } from './Card/Card';
export { CardContent } from './CardContent/CardContent';
export { CardFooter } from './CardFooter/CardFooter';
export { CardHeader } from './CardHeader/CardHeader';
+export { Dialog } from './Dialog/Dialog';
+export type { DialogTitleProps } from './Dialog/types/DialogTitleProps';
export { Menu } from './Menu/Menu';
export type { MenuActionItemProps } from './Menu/types/MenuActionItemProps';
export type { MenuAlign } from './Menu/types/MenuAlign';
diff --git a/packages/twenty-ui/src/primitives/typography/H1Title/H1Title.module.scss b/packages/twenty-ui/src/primitives/typography/H1Title/H1Title.module.scss
deleted file mode 100644
index cae007191ca..00000000000
--- a/packages/twenty-ui/src/primitives/typography/H1Title/H1Title.module.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.title {
- font-size: var(--t-font-size-lg);
- font-weight: var(--t-font-weight-semi-bold);
- line-height: var(--t-text-line-height-md);
- margin: 0;
- margin-bottom: var(--t-spacing-4);
-}
-
-.primary {
- color: var(--t-font-color-primary);
-}
-
-.secondary {
- color: var(--t-font-color-secondary);
-}
-
-.tertiary {
- color: var(--t-font-color-tertiary);
-}
diff --git a/packages/twenty-ui/src/primitives/typography/H1Title/H1Title.module.scss.d.ts b/packages/twenty-ui/src/primitives/typography/H1Title/H1Title.module.scss.d.ts
deleted file mode 100644
index d2e27896d41..00000000000
--- a/packages/twenty-ui/src/primitives/typography/H1Title/H1Title.module.scss.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-declare const classNames: {
- readonly title: 'title';
- readonly primary: 'primary';
- readonly secondary: 'secondary';
- readonly tertiary: 'tertiary';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/typography/H1Title/H1Title.tsx b/packages/twenty-ui/src/primitives/typography/H1Title/H1Title.tsx
deleted file mode 100644
index b1fe71dd4f7..00000000000
--- a/packages/twenty-ui/src/primitives/typography/H1Title/H1Title.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { type ReactNode } from 'react';
-import { clsx } from 'clsx';
-
-import styles from './H1Title.module.scss';
-
-type H1TitleProps = {
- title: ReactNode;
- fontColor?: H1TitleFontColor;
- className?: string;
-};
-
-export enum H1TitleFontColor {
- Primary = 'primary',
- Secondary = 'secondary',
- Tertiary = 'tertiary',
-}
-
-const fontColorClassNames: Record<H1TitleFontColor, string> = {
- [H1TitleFontColor.Primary]: styles.primary,
- [H1TitleFontColor.Secondary]: styles.secondary,
- [H1TitleFontColor.Tertiary]: styles.tertiary,
-};
-
-export const H1Title = ({
- title,
- fontColor = H1TitleFontColor.Tertiary,
- className,
-}: H1TitleProps) => {
- return (
- <h2
- className={clsx(styles.title, fontColorClassNames[fontColor], className)}
- >
- {title}
- </h2>
- );
-};
diff --git a/packages/twenty-ui/src/primitives/typography/H1Title/__stories__/H1Title.stories.tsx b/packages/twenty-ui/src/primitives/typography/H1Title/__stories__/H1Title.stories.tsx
deleted file mode 100644
index e84d65912e5..00000000000
--- a/packages/twenty-ui/src/primitives/typography/H1Title/__stories__/H1Title.stories.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-
-import { A11Y_DEFER_COLOR_CONTRAST } from '@ui/testing/a11yParameters';
-import { CatalogDecorator } from '@ui/testing/decorators/CatalogDecorator';
-import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
-import { type CatalogStory } from '@ui/testing/types/CatalogStory';
-
-import {
- H1Title,
- H1TitleFontColor,
-} from '@ui/primitives/typography/H1Title/H1Title';
-
-const meta: Meta<typeof H1Title> = {
- title: 'UI/Typography/H1Title',
- component: H1Title,
- decorators: [ComponentDecorator],
-};
-
-export default meta;
-
-type Story = StoryObj<typeof H1Title>;
-
-const args = {
- title: 'Title',
- fontColor: H1TitleFontColor.Primary,
-};
-
-export const Default: Story = {
- args,
- decorators: [ComponentDecorator],
-};
-
-export const Catalog: CatalogStory<Story, typeof H1Title> = {
- args,
- decorators: [CatalogDecorator],
- parameters: {
- a11y: A11Y_DEFER_COLOR_CONTRAST,
- catalog: {
- dimensions: [
- {
- name: 'FontColor',
- values: Object.values(H1TitleFontColor),
- props: (fontColor: H1TitleFontColor) => ({ fontColor }),
- },
- ],
- },
- },
-};
diff --git a/packages/twenty-ui/src/primitives/typography/H2Title/H2Title.module.scss b/packages/twenty-ui/src/primitives/typography/H2Title/H2Title.module.scss
deleted file mode 100644
index 6c86e03d1d7..00000000000
--- a/packages/twenty-ui/src/primitives/typography/H2Title/H2Title.module.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-.container {
- display: flex;
- flex-direction: column;
- margin-bottom: var(--t-spacing-4);
-}
-
-.titleContainer {
- align-items: center;
- display: flex;
- justify-content: space-between;
-}
-
-.title {
- color: var(--t-font-color-primary);
- font-size: var(--t-font-size-md);
- font-weight: var(--t-font-weight-semi-bold);
- margin: 0;
-}
-
-.description {
- color: var(--t-font-color-tertiary);
- font-size: var(--t-font-size-md);
- font-weight: var(--t-font-weight-regular);
- line-height: var(--t-text-line-height-lg);
- margin: 0;
- margin-top: var(--t-spacing-2);
-}
diff --git a/packages/twenty-ui/src/primitives/typography/H2Title/H2Title.module.scss.d.ts b/packages/twenty-ui/src/primitives/typography/H2Title/H2Title.module.scss.d.ts
deleted file mode 100644
index 6f9a3f97b1b..00000000000
--- a/packages/twenty-ui/src/primitives/typography/H2Title/H2Title.module.scss.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-declare const classNames: {
- readonly container: 'container';
- readonly titleContainer: 'titleContainer';
- readonly title: 'title';
- readonly description: 'description';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/typography/H2Title/H2Title.tsx b/packages/twenty-ui/src/primitives/typography/H2Title/H2Title.tsx
deleted file mode 100644
index eadb5cf5c82..00000000000
--- a/packages/twenty-ui/src/primitives/typography/H2Title/H2Title.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { clsx } from 'clsx';
-
-import { OverflowingTextWithTooltip } from '@ui/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
-
-import styles from './H2Title.module.scss';
-
-type H2TitleProps = {
- title: string;
- description?: string;
- adornment?: React.ReactNode;
- className?: string;
-};
-
-export const H2Title = ({
- title,
- description,
- adornment,
- className,
-}: H2TitleProps) => {
- return (
- <div className={clsx(styles.container, className)}>
- <div className={styles.titleContainer}>
- <h2 className={styles.title}>{title}</h2>
- {adornment}
- </div>
- {description && (
- <h3 className={styles.description}>
- <OverflowingTextWithTooltip
- text={description}
- displayedMaxRows={5}
- isTooltipMultiline={true}
- />
- </h3>
- )}
- </div>
- );
-};
diff --git a/packages/twenty-ui/src/primitives/typography/H2Title/__stories__/H2Title.stories.tsx b/packages/twenty-ui/src/primitives/typography/H2Title/__stories__/H2Title.stories.tsx
deleted file mode 100644
index ec24d1302af..00000000000
--- a/packages/twenty-ui/src/primitives/typography/H2Title/__stories__/H2Title.stories.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-
-import { A11Y_DEFER_COLOR_CONTRAST } from '@ui/testing/a11yParameters';
-import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
-
-import { H2Title } from '@ui/primitives/typography/H2Title/H2Title';
-
-const args = {
- title: 'Sub title',
- description: 'Lorem ipsum dolor sit amet',
-};
-
-const meta: Meta<typeof H2Title> = {
- title: 'UI/Typography/H2Title',
- component: H2Title,
- decorators: [ComponentDecorator],
- args: {
- title: args.title,
- },
-};
-
-export default meta;
-
-type Story = StoryObj<typeof H2Title>;
-
-export const Default: Story = {
- decorators: [ComponentDecorator],
-};
-
-export const WithDescription: Story = {
- parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },
- args,
- decorators: [ComponentDecorator],
-};
diff --git a/packages/twenty-ui/src/primitives/typography/H3Title/H3Title.module.scss b/packages/twenty-ui/src/primitives/typography/H3Title/H3Title.module.scss
deleted file mode 100644
index a0751fdd94a..00000000000
--- a/packages/twenty-ui/src/primitives/typography/H3Title/H3Title.module.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.container {
- display: flex;
- flex-direction: column;
-}
-
-.title {
- color: var(--t-font-color-primary);
- font-size: var(--t-font-size-lg);
- font-weight: var(--t-font-weight-semi-bold);
- margin: 0;
-}
-
-.description {
- color: var(--t-font-color-tertiary);
- font-size: var(--t-font-size-md);
- font-weight: var(--t-font-weight-regular);
- margin: 0;
- margin-top: var(--t-spacing-2);
-}
diff --git a/packages/twenty-ui/src/primitives/typography/H3Title/H3Title.tsx b/packages/twenty-ui/src/primitives/typography/H3Title/H3Title.tsx
deleted file mode 100644
index a88dde8417c..00000000000
--- a/packages/twenty-ui/src/primitives/typography/H3Title/H3Title.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { type ReactNode } from 'react';
-import { clsx } from 'clsx';
-
-import { OverflowingTextWithTooltip } from '@ui/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
-
-import styles from './H3Title.module.scss';
-
-type H3TitleProps = {
- title: ReactNode;
- description?: string;
- className?: string;
-};
-
-export const H3Title = ({ title, description, className }: H3TitleProps) => {
- return (
- <div className={clsx(styles.container, className)}>
- <h3 className={styles.title}>{title}</h3>
- {description && (
- // Design rule: Never set a description for H3 if there are any H2 in the page
- // (in that case, each H2 must have its own description)
- <h4 className={styles.description}>
- <OverflowingTextWithTooltip
- text={description}
- displayedMaxRows={2}
- isTooltipMultiline={true}
- />
- </h4>
- )}
- </div>
- );
-};
diff --git a/packages/twenty-ui/src/primitives/typography/H3Title/__stories__/H3Title.stories.tsx b/packages/twenty-ui/src/primitives/typography/H3Title/__stories__/H3Title.stories.tsx
deleted file mode 100644
index 0dfc6388d70..00000000000
--- a/packages/twenty-ui/src/primitives/typography/H3Title/__stories__/H3Title.stories.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-
-import { ComponentDecorator } from '@ui/testing/decorators/ComponentDecorator';
-
-import { H3Title } from '@ui/primitives/typography/H3Title/H3Title';
-
-const meta: Meta<typeof H3Title> = {
- title: 'UI/Typography/H3Title',
- component: H3Title,
- decorators: [ComponentDecorator],
- args: {
- title: 'H3 title',
- },
-};
-
-export default meta;
-
-type Story = StoryObj<typeof H3Title>;
-
-export const Default: Story = {
- decorators: [ComponentDecorator],
-};
diff --git a/packages/twenty-ui/src/primitives/typography/Heading/Heading.module.scss b/packages/twenty-ui/src/primitives/typography/Heading/Heading.module.scss
new file mode 100644
index 00000000000..bc66fd45bce
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/typography/Heading/Heading.module.scss
@@ -0,0 +1,35 @@
+.heading {
+ font-family: inherit;
+ font-weight: var(--t-font-weight-semi-bold);
+ line-height: var(--t-text-line-height-md);
+ margin: 0;
+ overflow-wrap: anywhere;
+
+ &:where([data-size='xs']) {
+ font-size: var(--t-font-size-xs);
+ }
+
+ &:where([data-size='sm']) {
+ font-size: var(--t-font-size-sm);
+ }
+
+ &:where([data-size='md']) {
+ font-size: var(--t-font-size-md);
+ }
+
+ &:where([data-size='lg']) {
+ font-size: var(--t-font-size-lg);
+ }
+
+ &:where([data-color='primary']) {
+ color: var(--t-font-color-primary);
+ }
+
+ &:where([data-color='secondary']) {
+ color: var(--t-font-color-secondary);
+ }
+
+ &:where([data-color='tertiary']) {
+ color: var(--t-font-color-tertiary);
+ }
+}
diff --git a/packages/twenty-ui/src/primitives/typography/Heading/Heading.module.scss.d.ts b/packages/twenty-ui/src/primitives/typography/Heading/Heading.module.scss.d.ts
new file mode 100644
index 00000000000..c6139d3f059
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/typography/Heading/Heading.module.scss.d.ts
@@ -0,0 +1,4 @@
+declare const styles: {
+ readonly heading: string;
+};
+export default styles;
diff --git a/packages/twenty-ui/src/primitives/typography/Heading/Heading.tsx b/packages/twenty-ui/src/primitives/typography/Heading/Heading.tsx
new file mode 100644
index 00000000000..f52b50a5366
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/typography/Heading/Heading.tsx
@@ -0,0 +1,27 @@
+import { useRender } from '@base-ui/react/use-render';
+import { clsx } from 'clsx';
+
+import { type HeadingProps } from './types/HeadingProps';
+
+import styles from './Heading.module.scss';
+
+export const Heading = ({
+ level = 2,
+ size = 'md',
+ color = 'primary',
+ render,
+ ref,
+ className,
+ ...props
+}: HeadingProps) =>
+ useRender({
+ defaultTagName: `h${level}`,
+ render,
+ ref,
+ props: {
+ ...props,
+ 'data-size': size,
+ 'data-color': color,
+ className: clsx(styles.heading, className),
+ },
+ });
diff --git a/packages/twenty-ui/src/primitives/typography/Heading/__stories__/Heading.stories.tsx b/packages/twenty-ui/src/primitives/typography/Heading/__stories__/Heading.stories.tsx
new file mode 100644
index 00000000000..0b5b22be3bb
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/typography/Heading/__stories__/Heading.stories.tsx
@@ -0,0 +1,70 @@
+import { Section } from '@ui/components/Section/Section';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, within } from 'storybook/test';
+
+import { ComponentDecorator } from '@ui/testing';
+
+import { Heading } from '../Heading';
+
+const meta: Meta<typeof Heading> = {
+ title: 'UI/Typography/Heading',
+ component: Heading,
+ args: { children: 'Workspace settings' },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof Heading>;
+
+export const Default: Story = {
+ decorators: [ComponentDecorator],
+};
+
+export const Documentation: Story = {
+ ...Default,
+};
+
+export const SemanticLevel: Story = {
+ decorators: [ComponentDecorator],
+ args: { level: 3, size: 'lg' },
+ play: async ({ canvasElement }) => {
+ const heading = within(canvasElement).getByRole('heading', {
+ name: 'Workspace settings',
+ level: 3,
+ });
+
+ await expect(heading).toHaveAttribute('data-size', 'lg');
+ await expect(getComputedStyle(heading).marginBlockEnd).toBe('0px');
+ },
+};
+
+const HEADING_SIZES = ['xs', 'sm', 'md', 'lg'] as const;
+const HEADING_COLORS = ['primary', 'secondary'] as const;
+
+export const Catalog: Story = {
+ decorators: [ComponentDecorator],
+ render: () => (
+ <Section.Root>
+ {HEADING_COLORS.map((color) => (
+ <Section.Root key={color}>
+ {HEADING_SIZES.map((size) => (
+ <Heading
+ key={size}
+ size={size}
+ color={color}
+ style={{ marginBlockEnd: 'var(--t-spacing-4)' }}
+ >
+ {size} {color} heading
+ </Heading>
+ ))}
+ </Section.Root>
+ ))}
+ </Section.Root>
+ ),
+};
+
+export const CatalogDark: Story = {
+ ...Catalog,
+ tags: ['!autodocs'],
+ globals: { colorScheme: 'dark' },
+};
diff --git a/packages/twenty-ui/src/primitives/typography/Heading/__tests__/Heading.test.tsx b/packages/twenty-ui/src/primitives/typography/Heading/__tests__/Heading.test.tsx
new file mode 100644
index 00000000000..67fc990b767
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/typography/Heading/__tests__/Heading.test.tsx
@@ -0,0 +1,32 @@
+import { render, screen } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+
+import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
+
+import { Heading } from '../Heading';
+import styles from '../Heading.module.scss';
+
+runComponentConformance({
+ name: 'Heading',
+ element: <Heading>Workspace</Heading>,
+ ownClassName: styles.heading,
+ refInstanceOf: HTMLHeadingElement,
+});
+
+describe('Heading', () => {
+ it.each([1, 2, 3, 4, 5, 6] as const)(
+ 'renders level %i independently of its visual size',
+ (level) => {
+ render(
+ <Heading level={level} size="sm" color="secondary">
+ Workspace
+ </Heading>,
+ );
+
+ const heading = screen.getByRole('heading', { name: 'Workspace', level });
+
+ expect(heading).toHaveAttribute('data-size', 'sm');
+ expect(heading).toHaveAttribute('data-color', 'secondary');
+ },
+ );
+});
diff --git a/packages/twenty-ui/src/primitives/typography/Heading/types/HeadingProps.ts b/packages/twenty-ui/src/primitives/typography/Heading/types/HeadingProps.ts
new file mode 100644
index 00000000000..3cf7f16d9cc
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/typography/Heading/types/HeadingProps.ts
@@ -0,0 +1,7 @@
+import { type useRender } from '@base-ui/react/use-render';
+
+export type HeadingProps = Omit<useRender.ComponentProps<'h2'>, 'color'> & {
+ level?: 1 | 2 | 3 | 4 | 5 | 6;
+ size?: 'xs' | 'sm' | 'md' | 'lg';
+ color?: 'primary' | 'secondary' | 'tertiary';
+};
diff --git a/packages/twenty-ui/src/primitives/typography/index.ts b/packages/twenty-ui/src/primitives/typography/index.ts
index aea9b3a90c1..9ea72a657f9 100644
--- a/packages/twenty-ui/src/primitives/typography/index.ts
+++ b/packages/twenty-ui/src/primitives/typography/index.ts
@@ -7,9 +7,8 @@
* |___/
*/
-export { H1TitleFontColor, H1Title } from './H1Title/H1Title';
-export { H2Title } from './H2Title/H2Title';
-export { H3Title } from './H3Title/H3Title';
+export { Heading } from './Heading/Heading';
+export type { HeadingProps } from './Heading/types/HeadingProps';
export type { LabelVariant } from './Label/Label';
export { Label } from './Label/Label';
export { LinkifiedText } from './LinkifiedText/LinkifiedText';